qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x11proto 7.0.13. tested by naddy@ on a bulk ports build

Browse Source
This commit is contained in:
matthieu 2008-09-14 07:31:43 +00:00
parent 207eafb178
commit 25849b0cd5
16 changed files with 509 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
proto/x11proto/ChangeLog
View File

@ -1,3 +1,195 @@
commit 53859ee4e431c21000e282971894dbe9384ed205
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 17:17:38 2008 +0930
Bump to 7.0.13.
commit 44e458285bb2e7771963a9ab9b5f03d2fb48e611
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 15 16:41:08 2007 +0930
Add GenericEvent and xGenericEvent definitions.
(cherry picked from commit 8a96cdca08db2563e8c4c7c9a110a3ab6d973fcc)
commit 22878c30d21580146200c00070478f88d969bcaa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 15:02:41 2008 -0700
Apple: Added a comment to explain _DARWIN_C_SOURCE
commit e3035a7e6e56e01eb79478ea5342e032ec67a190
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 12:16:15 2008 -0700
Apple: Define _DARWIN_C_SOURCE otherwise _XOPEN_SOURCE, _POSIX_SOURCE, or _POSIX_C_SOURCE will cause fd_mask to not be defined due to the strict namespace
commit 05b119d78e1c6a4db563b2a976cee0173489f9b6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 11:36:03 2008 -0700
Apple: Cleaned up some Apple definitions
commit c879dab58f82f4789f27933c22706c84015f8684
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Apr 29 00:37:28 2008 +0100
avoid checking for fds_bits on mingw
commit 8642ec676db0dd875f4d3a97d8a3cdbf6843a985
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Sat Apr 26 18:21:41 2008 +0100
Use Sleep() instead of sleep() on windows
(was already done in Xwindows.h, just not Xw32defs.h)
commit a893a6ac5d9fdfe9a420d1812402a01904e6482b
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Sat Apr 26 08:52:29 2008 +0100
Use winsock2.h
commit c705bab0f6efcb6937b7ccc2fb415e701878fddb
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Mon Apr 21 21:27:26 2008 +0100
Added comment to slightly discourage the definition of ever more Unicode keysyms
commit 44e24a27bca023cf7b799f191fe6d52e12efbe5f
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Apr 12 15:48:46 2008 -0400
Add more dead key syms
Add dead keys to support input of the precomposed latin characters in
ISO 10747 which have ring, line, circumflex, tilde, breve or diaeresis
below.
This addresses: https://bugs.freedesktop.org/show_bug.cgi?id=15446
commit 07e83988ec0b1c9577646daca3943badd5dcc0d1
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Mar 6 11:34:17 2008 -0500
Fix typo in XF86Keysym.h
Fix typo reported in https://bugs.freedesktop.org/show_bug.cgi?id=11193
thereby making XF86Keysym.h match libX11’s XKeysymDB.
commit d34310efef11264ddff79320b8c6f03705b1208a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 5 22:09:16 2008 -0500
x11proto 7.0.12
commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Feb 10 19:07:49 2008 -0800
Fixed #ifdef checks that were using i386 to use __i386__
"""
It's simply obsolete, sloppy, compiler namespace pollution. The
compiler is not allowed to predefine symbols that might conflict with
ordinary identifiers. For backwards compatibility gcc currently
predefines i386 when compiling for x86 32-bit (but not 64-bit), but that
will go away. It is also not defined if you specify -ansi when invoking
the compiler, because then it is seriously standards compliant. Other
compilers shouldn't define it either. Correct code shouldn't rely on it
being defined. However __i386__ is safe and proper.
"""
commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 21:33:01 2007 -0800
Changed __DARWIN__ to __APPLE__
commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 30 18:44:49 2007 -0700
Make Xalloca.h work with Sun C++ compiler
commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Oct 30 18:40:47 2007 -0700
fd_mask needs to be defined on OS X, too
commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 24 12:28:25 2007 +0300
Check headers before testing for fds_bits access method (bug #8442)
HP-UX doesn't have sys/select.h, so make sure we don't overzealously include
headers when we try to find out how to use fds_bits.
commit 68e841fb4bf489531635e6bee70f041d2c3cb87c
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Sep 8 08:30:17 2007 -0400
bump to 7.0.11
commit 11fd082a384499c38065e06065bf80f244e9909a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 28 14:54:44 2007 -0700
Describe what XF86XK_Display does (or now is meant to do).
commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Aug 22 21:10:47 2007 -0400
Add dead_abovecomma and dead_abovereversedcomma
Also added aliases dead_psili and dead_dasia.
The UCS unifies Combining Psili and Combining Dasia with
Combining Comma Above and Combining Reversed Comma Above.
These two aliases mirror that unification.
commit ab74d270c76b17926504815ba43ee35b8b18d3be
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Aug 22 21:01:48 2007 -0400
Comment on the new locations of the files referenced in keysymdef.h
keysymdef.h has a comment from the monolithic days suggesting that
the file be kept in sync with mappings inxc/lib/X11/KeyBind.c and
the protocol specication in xc/doc/specs/XProtocol/X11.keysyms.
This commit adds pointers to the new locations of those two files.
commit 1edcfdb7f5c51e5c8014c56c4d5937337b7d4302
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Aug 21 00:10:08 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit d8a49874bbd05a927c42102c0c5c147cf72cb1dd
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:46:25 2007 +0100
bcopy needs definition in Xfuncs.h for Xming
commit 7505880329d6b81f0c77d6aaa3995390659d5c63
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue May 1 14:54:27 2007 +0200
Added some more files to .gitignore.
commit 0c55a57dca2e888ba089e280f62e1c5bb55db7d7
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue May 1 14:52:57 2007 +0200
Enable GCC's visibility attributes on GCC 4 or greater only.
commit 30f5eedf800f6683161fca9fc3e2d6ddc9ce0ac3
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Fri Feb 2 15:11:26 2007 -0500
Add keysym definitions from Jim Gettys.
commit 5951f0355c6b1c591241bccb2023e6c4d493e701 commit 5951f0355c6b1c591241bccb2023e6c4d493e701
Author: Daniel Stone <daniel@fooishbar.org> Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 16 01:09:50 2006 +0200 Date: Sat Dec 16 01:09:50 2006 +0200

3
proto/x11proto/X.h
View File

@ -216,7 +216,8 @@ are reserved in the protocol for errors and replies. */
#define ColormapNotify 32 #define ColormapNotify 32
#define ClientMessage 33 #define ClientMessage 33
#define MappingNotify 34 #define MappingNotify 34
#define LASTEvent 35 /* must be bigger than any event # */ #define GenericEvent 35
#define LASTEvent 36 /* must be bigger than any event # */
/* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer, /* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,

280
proto/x11proto/XF86keysym.h
View File

@ -27,154 +27,164 @@
* *
* Check in keysymdef.h for generic symbols before adding new XFree86-specific * Check in keysymdef.h for generic symbols before adding new XFree86-specific
* symbols here. * symbols here.
*
* X.Org will not be adding to the XF86 set of keysyms, though they have
* been adopted and are considered a "standard" part of X keysym definitions.
* XFree86 never properly commented these keysyms, so we have done our
* best to explain the semantic meaning of these keys.
*
* XFree86 has removed their mail archives of the period, that might have
* shed more light on some of these definitions. Until/unless we resurrect
* these archives, these are from memory and usage.
*/ */
/* Backlight controls. */ /* Backlight controls. */
#define XF86XK_MonBrightnessUp 0x1008FF02 #define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */
#define XF86XK_MonBrightnessDown 0x1008FF03 #define XF86XK_MonBrightnessDown 0x1008FF03 /* Monitor/panel brightness */
#define XF86XK_KbdLightOnOff 0x1008FF04 #define XF86XK_KbdLightOnOff 0x1008FF04 /* Keyboards may be lit */
#define XF86XK_KbdBrightnessUp 0x1008FF05 #define XF86XK_KbdBrightnessUp 0x1008FF05 /* Keyboards may be lit */
#define XF86XK_KbdBrightnessDown 0x1008FF06 #define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */
/* /*
* Keys found on some "Internet" keyboards. * Keys found on some "Internet" keyboards.
*/ */
#define XF86XK_Standby 0x1008FF10 #define XF86XK_Standby 0x1008FF10 /* System into standby mode */
#define XF86XK_AudioLowerVolume 0x1008FF11 #define XF86XK_AudioLowerVolume 0x1008FF11 /* Volume control down */
#define XF86XK_AudioMute 0x1008FF12 #define XF86XK_AudioMute 0x1008FF12 /* Mute sound from the system */
#define XF86XK_AudioRaiseVolume 0x1008FF13 #define XF86XK_AudioRaiseVolume 0x1008FF13 /* Volume control up */
#define XF86XK_AudioPlay 0x1008FF14 #define XF86XK_AudioPlay 0x1008FF14 /* Start playing of audio > */
#define XF86XK_AudioStop 0x1008FF15 #define XF86XK_AudioStop 0x1008FF15 /* Stop playing audio */
#define XF86XK_AudioPrev 0x1008FF16 #define XF86XK_AudioPrev 0x1008FF16 /* Previous track */
#define XF86XK_AudioNext 0x1008FF17 #define XF86XK_AudioNext 0x1008FF17 /* Next track */
#define XF86XK_HomePage 0x1008FF18 #define XF86XK_HomePage 0x1008FF18 /* Display user's home page */
#define XF86XK_Mail 0x1008FF19 #define XF86XK_Mail 0x1008FF19 /* Invoke user's mail program */
#define XF86XK_Start 0x1008FF1A #define XF86XK_Start 0x1008FF1A /* Start application */
#define XF86XK_Search 0x1008FF1B #define XF86XK_Search 0x1008FF1B /* Search */
#define XF86XK_AudioRecord 0x1008FF1C #define XF86XK_AudioRecord 0x1008FF1C /* Record audio application */
/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */ /* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
#define XF86XK_Calculator 0x1008FF1D #define XF86XK_Calculator 0x1008FF1D /* Invoke calculator program */
#define XF86XK_Memo 0x1008FF1E #define XF86XK_Memo 0x1008FF1E /* Invoke Memo taking program */
#define XF86XK_ToDoList 0x1008FF1F #define XF86XK_ToDoList 0x1008FF1F /* Invoke To Do List program */
#define XF86XK_Calendar 0x1008FF20 #define XF86XK_Calendar 0x1008FF20 /* Invoke Calendar program */
#define XF86XK_PowerDown 0x1008FF21 #define XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */
#define XF86XK_ContrastAdjust 0x1008FF22 #define XF86XK_ContrastAdjust 0x1008FF22 /* Adjust screen contrast */
#define XF86XK_RockerUp 0x1008FF23 #define XF86XK_RockerUp 0x1008FF23 /* Rocker switches exist up */
#define XF86XK_RockerDown 0x1008FF24 #define XF86XK_RockerDown 0x1008FF24 /* and down */
#define XF86XK_RockerEnter 0x1008FF25 #define XF86XK_RockerEnter 0x1008FF25 /* and let you press them */
/* Some more "Internet" keyboard symbols */ /* Some more "Internet" keyboard symbols */
#define XF86XK_Back 0x1008FF26 #define XF86XK_Back 0x1008FF26 /* Like back on a browser */
#define XF86XK_Forward 0x1008FF27 #define XF86XK_Forward 0x1008FF27 /* Like forward on a browser */
#define XF86XK_Stop 0x1008FF28 #define XF86XK_Stop 0x1008FF28 /* Stop current operation */
#define XF86XK_Refresh 0x1008FF29 #define XF86XK_Refresh 0x1008FF29 /* Refresh the page */
#define XF86XK_PowerOff 0x1008FF2A #define XF86XK_PowerOff 0x1008FF2A /* Power off system entirely */
#define XF86XK_WakeUp 0x1008FF2B #define XF86XK_WakeUp 0x1008FF2B /* Wake up system from sleep */
#define XF86XK_Eject 0x1008FF2C #define XF86XK_Eject 0x1008FF2C /* Eject device (e.g. DVD) */
#define XF86XK_ScreenSaver 0x1008FF2D #define XF86XK_ScreenSaver 0x1008FF2D /* Invoke screensaver */
#define XF86XK_WWW 0x1008FF2E #define XF86XK_WWW 0x1008FF2E /* Invoke web browser */
#define XF86XK_Sleep 0x1008FF2F #define XF86XK_Sleep 0x1008FF2F /* Put system to sleep */
#define XF86XK_Favorites 0x1008FF30 #define XF86XK_Favorites 0x1008FF30 /* Show favorite locations */
#define XF86XK_AudioPause 0x1008FF31 #define XF86XK_AudioPause 0x1008FF31 /* Pause audio playing */
#define XF86XK_AudioMedia 0x1008FF32 #define XF86XK_AudioMedia 0x1008FF32 /* Launch media collection app */
#define XF86XK_MyComputer 0x1008FF33 #define XF86XK_MyComputer 0x1008FF33 /* Display "My Computer" window */
#define XF86XK_VendorHome 0x1008FF34 #define XF86XK_VendorHome 0x1008FF34 /* Display vendor home web site */
#define XF86XK_LightBulb 0x1008FF35 #define XF86XK_LightBulb 0x1008FF35 /* Light bulb keys exist */
#define XF86XK_Shop 0x1008FF36 #define XF86XK_Shop 0x1008FF36 /* Display shopping web site */
#define XF86XK_History 0x1008FF37 #define XF86XK_History 0x1008FF37 /* Show history of web surfing */
#define XF86XK_OpenURL 0x1008FF38 #define XF86XK_OpenURL 0x1008FF38 /* Open selected URL */
#define XF86XK_AddFavorite 0x1008FF39 #define XF86XK_AddFavorite 0x1008FF39 /* Add URL to favorites list */
#define XF86XK_HotLinks 0x1008FF3A #define XF86XK_HotLinks 0x1008FF3A /* Show "hot" links */
#define XF86XK_BrightnessAdjust 0x1008FF3B #define XF86XK_BrightnessAdjust 0x1008FF3B /* Invoke brightness adj. UI */
#define XF86XK_Finance 0x1008FF3C #define XF86XK_Finance 0x1008FF3C /* Display financial site */
#define XF86XK_Community 0x1008FF3D #define XF86XK_Community 0x1008FF3D /* Display user's community */
#define XF86XK_AudioRewind 0x1008FF3E #define XF86XK_AudioRewind 0x1008FF3E /* "rewind" audio track */
#define XF86XK_XF86BackForward 0x1008FF3F #define XF86XK_BackForward 0x1008FF3F /* ??? */
#define XF86XK_Launch0 0x1008FF40 #define XF86XK_Launch0 0x1008FF40 /* Launch Application */
#define XF86XK_Launch1 0x1008FF41 #define XF86XK_Launch1 0x1008FF41 /* Launch Application */
#define XF86XK_Launch2 0x1008FF42 #define XF86XK_Launch2 0x1008FF42 /* Launch Application */
#define XF86XK_Launch3 0x1008FF43 #define XF86XK_Launch3 0x1008FF43 /* Launch Application */
#define XF86XK_Launch4 0x1008FF44 #define XF86XK_Launch4 0x1008FF44 /* Launch Application */
#define XF86XK_Launch5 0x1008FF45 #define XF86XK_Launch5 0x1008FF45 /* Launch Application */
#define XF86XK_Launch6 0x1008FF46 #define XF86XK_Launch6 0x1008FF46 /* Launch Application */
#define XF86XK_Launch7 0x1008FF47 #define XF86XK_Launch7 0x1008FF47 /* Launch Application */
#define XF86XK_Launch8 0x1008FF48 #define XF86XK_Launch8 0x1008FF48 /* Launch Application */
#define XF86XK_Launch9 0x1008FF49 #define XF86XK_Launch9 0x1008FF49 /* Launch Application */
#define XF86XK_LaunchA 0x1008FF4A #define XF86XK_LaunchA 0x1008FF4A /* Launch Application */
#define XF86XK_LaunchB 0x1008FF4B #define XF86XK_LaunchB 0x1008FF4B /* Launch Application */
#define XF86XK_LaunchC 0x1008FF4C #define XF86XK_LaunchC 0x1008FF4C /* Launch Application */
#define XF86XK_LaunchD 0x1008FF4D #define XF86XK_LaunchD 0x1008FF4D /* Launch Application */
#define XF86XK_LaunchE 0x1008FF4E #define XF86XK_LaunchE 0x1008FF4E /* Launch Application */
#define XF86XK_LaunchF 0x1008FF4F #define XF86XK_LaunchF 0x1008FF4F /* Launch Application */
#define XF86XK_ApplicationLeft 0x1008FF50 #define XF86XK_ApplicationLeft 0x1008FF50 /* switch to application, left */
#define XF86XK_ApplicationRight 0x1008FF51 #define XF86XK_ApplicationRight 0x1008FF51 /* switch to application, right*/
#define XF86XK_Book 0x1008FF52 #define XF86XK_Book 0x1008FF52 /* Launch bookreader */
#define XF86XK_CD 0x1008FF53 #define XF86XK_CD 0x1008FF53 /* Launch CD/DVD player */
#define XF86XK_Calculater 0x1008FF54 #define XF86XK_Calculater 0x1008FF54 /* Launch Calculater */
#define XF86XK_Clear 0x1008FF55 #define XF86XK_Clear 0x1008FF55 /* Clear window, screen */
#define XF86XK_Close 0x1008FF56 #define XF86XK_Close 0x1008FF56 /* Close window */
#define XF86XK_Copy 0x1008FF57 #define XF86XK_Copy 0x1008FF57 /* Copy selection */
#define XF86XK_Cut 0x1008FF58 #define XF86XK_Cut 0x1008FF58 /* Cut selection */
#define XF86XK_Display 0x1008FF59 #define XF86XK_Display 0x1008FF59 /* Output switch key */
#define XF86XK_DOS 0x1008FF5A #define XF86XK_DOS 0x1008FF5A /* Launch DOS (emulation) */
#define XF86XK_Documents 0x1008FF5B #define XF86XK_Documents 0x1008FF5B /* Open documents window */
#define XF86XK_Excel 0x1008FF5C #define XF86XK_Excel 0x1008FF5C /* Launch spread sheet */
#define XF86XK_Explorer 0x1008FF5D #define XF86XK_Explorer 0x1008FF5D /* Launch file explorer */
#define XF86XK_Game 0x1008FF5E #define XF86XK_Game 0x1008FF5E /* Launch game */
#define XF86XK_Go 0x1008FF5F #define XF86XK_Go 0x1008FF5F /* Go to URL */
#define XF86XK_iTouch 0x1008FF60 #define XF86XK_iTouch 0x1008FF60 /* Logitch iTouch- don't use */
#define XF86XK_LogOff 0x1008FF61 #define XF86XK_LogOff 0x1008FF61 /* Log off system */
#define XF86XK_Market 0x1008FF62 #define XF86XK_Market 0x1008FF62 /* ?? */
#define XF86XK_Meeting 0x1008FF63 #define XF86XK_Meeting 0x1008FF63 /* enter meeting in calendar */
#define XF86XK_MenuKB 0x1008FF65 #define XF86XK_MenuKB 0x1008FF65 /* distingush keyboard from PB */
#define XF86XK_MenuPB 0x1008FF66 #define XF86XK_MenuPB 0x1008FF66 /* distinuish PB from keyboard */
#define XF86XK_MySites 0x1008FF67 #define XF86XK_MySites 0x1008FF67 /* Favourites */
#define XF86XK_New 0x1008FF68 #define XF86XK_New 0x1008FF68 /* New (folder, document... */
#define XF86XK_News 0x1008FF69 #define XF86XK_News 0x1008FF69 /* News */
#define XF86XK_OfficeHome 0x1008FF6A #define XF86XK_OfficeHome 0x1008FF6A /* Office home (old Staroffice)*/
#define XF86XK_Open 0x1008FF6B #define XF86XK_Open 0x1008FF6B /* Open */
#define XF86XK_Option 0x1008FF6C #define XF86XK_Option 0x1008FF6C /* ?? */
#define XF86XK_Paste 0x1008FF6D #define XF86XK_Paste 0x1008FF6D /* Paste */
#define XF86XK_Phone 0x1008FF6E #define XF86XK_Phone 0x1008FF6E /* Launch phone; dial number */
#define XF86XK_Q 0x1008FF70 #define XF86XK_Q 0x1008FF70 /* Compaq's Q - don't use */
#define XF86XK_Reply 0x1008FF72 #define XF86XK_Reply 0x1008FF72 /* Reply e.g., mail */
#define XF86XK_Reload 0x1008FF73 #define XF86XK_Reload 0x1008FF73 /* Reload web page, file, etc. */
#define XF86XK_RotateWindows 0x1008FF74 #define XF86XK_RotateWindows 0x1008FF74 /* Rotate windows e.g. xrandr */
#define XF86XK_RotationPB 0x1008FF75 #define XF86XK_RotationPB 0x1008FF75 /* don't use */
#define XF86XK_RotationKB 0x1008FF76 #define XF86XK_RotationKB 0x1008FF76 /* don't use */
#define XF86XK_Save 0x1008FF77 #define XF86XK_Save 0x1008FF77 /* Save (file, document, state */
#define XF86XK_ScrollUp 0x1008FF78 #define XF86XK_ScrollUp 0x1008FF78 /* Scroll window/contents up */
#define XF86XK_ScrollDown 0x1008FF79 #define XF86XK_ScrollDown 0x1008FF79 /* Scrool window/contentd down */
#define XF86XK_ScrollClick 0x1008FF7A #define XF86XK_ScrollClick 0x1008FF7A /* Use XKB mousekeys instead */
#define XF86XK_Send 0x1008FF7B #define XF86XK_Send 0x1008FF7B /* Send mail, file, object */
#define XF86XK_Spell 0x1008FF7C #define XF86XK_Spell 0x1008FF7C /* Spell checker */
#define XF86XK_SplitScreen 0x1008FF7D #define XF86XK_SplitScreen 0x1008FF7D /* Split window or screen */
#define XF86XK_Support 0x1008FF7E #define XF86XK_Support 0x1008FF7E /* Get support (??) */
#define XF86XK_TaskPane 0x1008FF7F #define XF86XK_TaskPane 0x1008FF7F /* Show tasks */
#define XF86XK_Terminal 0x1008FF80 #define XF86XK_Terminal 0x1008FF80 /* Launch terminal emulator */
#define XF86XK_Tools 0x1008FF81 #define XF86XK_Tools 0x1008FF81 /* toolbox of desktop/app. */
#define XF86XK_Travel 0x1008FF82 #define XF86XK_Travel 0x1008FF82 /* ?? */
#define XF86XK_UserPB 0x1008FF84 #define XF86XK_UserPB 0x1008FF84 /* ?? */
#define XF86XK_User1KB 0x1008FF85 #define XF86XK_User1KB 0x1008FF85 /* ?? */
#define XF86XK_User2KB 0x1008FF86 #define XF86XK_User2KB 0x1008FF86 /* ?? */
#define XF86XK_Video 0x1008FF87 #define XF86XK_Video 0x1008FF87 /* Launch video player */
#define XF86XK_WheelButton 0x1008FF88 #define XF86XK_WheelButton 0x1008FF88 /* button from a mouse wheel */
#define XF86XK_Word 0x1008FF89 #define XF86XK_Word 0x1008FF89 /* Launch word processor */
#define XF86XK_Xfer 0x1008FF8A #define XF86XK_Xfer 0x1008FF8A
#define XF86XK_ZoomIn 0x1008FF8B #define XF86XK_ZoomIn 0x1008FF8B /* zoom in view, map, etc. */
#define XF86XK_ZoomOut 0x1008FF8C #define XF86XK_ZoomOut 0x1008FF8C /* zoom out view, map, etc. */
#define XF86XK_Away 0x1008FF8D #define XF86XK_Away 0x1008FF8D /* mark yourself as away */
#define XF86XK_Messenger 0x1008FF8E #define XF86XK_Messenger 0x1008FF8E /* as in instant messaging */
#define XF86XK_WebCam 0x1008FF8F #define XF86XK_WebCam 0x1008FF8F /* Launch web camera app. */
#define XF86XK_MailForward 0x1008FF90 #define XF86XK_MailForward 0x1008FF90 /* Forward in mail */
#define XF86XK_Pictures 0x1008FF91 #define XF86XK_Pictures 0x1008FF91 /* Show pictures */
#define XF86XK_Music 0x1008FF92 #define XF86XK_Music 0x1008FF92 /* Launch music application */
/* Keys for special action keys (hot keys) */ /* Keys for special action keys (hot keys) */
/* Virtual terminals on some operating systems */
#define XF86XK_Switch_VT_1 0x1008FE01 #define XF86XK_Switch_VT_1 0x1008FE01
#define XF86XK_Switch_VT_2 0x1008FE02 #define XF86XK_Switch_VT_2 0x1008FE02
#define XF86XK_Switch_VT_3 0x1008FE03 #define XF86XK_Switch_VT_3 0x1008FE03
@ -188,8 +198,8 @@
#define XF86XK_Switch_VT_11 0x1008FE0B #define XF86XK_Switch_VT_11 0x1008FE0B
#define XF86XK_Switch_VT_12 0x1008FE0C #define XF86XK_Switch_VT_12 0x1008FE0C
#define XF86XK_Ungrab 0x1008FE20 #define XF86XK_Ungrab 0x1008FE20 /* force ungrab */
#define XF86XK_ClearGrab 0x1008FE21 #define XF86XK_ClearGrab 0x1008FE21 /* kill application with grab */
#define XF86XK_Next_VMode 0x1008FE22 #define XF86XK_Next_VMode 0x1008FE22 /* next video mode available */
#define XF86XK_Prev_VMode 0x1008FE23 #define XF86XK_Prev_VMode 0x1008FE23 /* prev. video mode available */

9
proto/x11proto/Xalloca.h
View File

@ -62,7 +62,8 @@ from The Open Group.
#define XALLOCA_H 1 #define XALLOCA_H 1
#ifndef INCLUDE_ALLOCA_H #ifndef INCLUDE_ALLOCA_H
# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */ /* Need to add more here to match Imake *.cf's */
# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define INCLUDE_ALLOCA_H # define INCLUDE_ALLOCA_H
# endif # endif
#endif #endif
@ -111,16 +112,14 @@ from The Open Group.
* decide that you don't want to use alloca, you might want to fix it here. * decide that you don't want to use alloca, you might want to fix it here.
*/ */
/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
# ifndef __sgi /* IRIX 5/6 has definition */ # if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus)
# ifndef __QNX__
# define __Xnullarg /* as nothing */ # define __Xnullarg /* as nothing */
# ifndef X_NOT_STDC_ENV # ifndef X_NOT_STDC_ENV
extern void *alloca(__Xnullarg); extern void *alloca(__Xnullarg);
# else # else
extern char *alloca(__Xnullarg); extern char *alloca(__Xnullarg);
# endif # endif
# endif /* __QNX__ */ # endif /* !__sgi && !__QNX && !__cplusplus */
# endif /* __sgi */
# define ALLOCATE_LOCAL(size) alloca((int)(size)) # define ALLOCATE_LOCAL(size) alloca((int)(size))
# endif /* who does alloca */ # endif /* who does alloca */
# endif /* NCR */ # endif /* NCR */

19
proto/x11proto/Xfuncproto.h.in
View File

@ -85,24 +85,29 @@ in this Software without prior written authorization from The Open Group.
# define _X_ATTRIBUTE_PRINTF(x,y) # define _X_ATTRIBUTE_PRINTF(x,y)
#endif /* GNUC >= 4 */ #endif /* GNUC >= 4 */
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) #if defined(__GNUC__) && (__GNUC__ >= 4)
# define _X_EXPORT __attribute__((visibility("default"))) # define _X_EXPORT __attribute__((visibility("default")))
# define _X_HIDDEN __attribute__((visibility("hidden"))) # define _X_HIDDEN __attribute__((visibility("hidden")))
# define _X_INTERNAL __attribute__((visibility("internal"))) # define _X_INTERNAL __attribute__((visibility("internal")))
# define _X_LIKELY(x) __builtin_expect(!!(x), 1)
# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
# define _X_INLINE inline
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define _X_EXPORT __global # define _X_EXPORT __global
# define _X_HIDDEN __hidden # define _X_HIDDEN __hidden
# define _X_INTERNAL __hidden # define _X_INTERNAL __hidden
#else /* not gcc >= 4 and not Sun Studio >= 8 */
# define _X_EXPORT
# define _X_HIDDEN
# define _X_INTERNAL
#endif /* GNUC >= 4 */
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
# define _X_LIKELY(x) __builtin_expect(!!(x), 1)
# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
# define _X_INLINE inline
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define _X_LIKELY(x) (x) # define _X_LIKELY(x) (x)
# define _X_UNLIKELY(x) (x) # define _X_UNLIKELY(x) (x)
# define _X_INLINE inline # define _X_INLINE inline
#else /* not gcc >= 3.3 and not Sun Studio >= 8 */ #else /* not gcc >= 3.3 and not Sun Studio >= 8 */
# define _X_EXPORT
# define _X_HIDDEN
# define _X_INTERNAL
# define _X_LIKELY(x) (x) # define _X_LIKELY(x) (x)
# define _X_UNLIKELY(x) (x) # define _X_UNLIKELY(x) (x)
# define _X_INLINE # define _X_INLINE

4
proto/x11proto/Xfuncs.h
View File

@ -89,6 +89,10 @@ void bcopy();
#define atexit(f) on_exit(f, 0) #define atexit(f) on_exit(f, 0)
#endif #endif
#if defined WIN32 && defined __MINGW32__
#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
#endif
#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */ #endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
#endif /* _XFUNCS_H_ */ #endif /* _XFUNCS_H_ */

2
proto/x11proto/Xos.h
View File

@ -149,7 +149,7 @@ extern int sys_nerr;
*/ */
#if defined(X_NOT_POSIX) #if defined(X_NOT_POSIX)
#include <fcntl.h> #include <fcntl.h>
#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__) #if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef WIN32 #ifdef WIN32

2
proto/x11proto/Xos_r.h
View File

@ -237,7 +237,7 @@ extern void XtProcessUnlock(
#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API) #elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
/* Use regular, unsafe API. */ /* Use regular, unsafe API. */
# if defined(X_NOT_POSIX) && !defined(i386) && !defined(SYSV) # if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV)
extern struct passwd *getpwuid(), *getpwnam(); extern struct passwd *getpwuid(), *getpwnam();
# endif # endif
typedef int _Xgetpwparams; /* dummy */ typedef int _Xgetpwparams; /* dummy */

16
proto/x11proto/Xosdefs.h
View File

@ -86,7 +86,7 @@ in this Software without prior written authorization from The Open Group.
#endif #endif
#endif #endif
#ifdef i386 #ifdef __i386__
#ifdef SYSV #ifdef SYSV
#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \ #if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
!defined(__UNIXWARE__) && !defined(sun) !defined(__UNIXWARE__) && !defined(sun)
@ -133,8 +133,18 @@ in this Software without prior written authorization from The Open Group.
#define NULL_NOT_ZERO #define NULL_NOT_ZERO
#endif #endif
#ifdef __DARWIN__ #ifdef __APPLE__
#define NULL_NOT_ZERO #define NULL_NOT_ZERO
/* Defining any of these will sanitize the namespace to JUST want is defined by
* that particular standard. If that happens, we don't get some expected
* prototypes, typedefs, etc (like fd_mask). We can define _DARWIN_C_SOURCE to
* loosen our belts a tad.
*/
#if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
#define _DARWIN_C_SOURCE
#endif
#endif #endif
#ifdef __GNU__ #ifdef __GNU__
@ -156,7 +166,7 @@ in this Software without prior written authorization from The Open Group.
#endif #endif
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \ #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
|| defined(__Darwin__) || defined(__DragonFly__) || defined(__APPLE__) || defined(__DragonFly__)
# ifndef CSRG_BASED # ifndef CSRG_BASED
# define CSRG_BASED # define CSRG_BASED
# endif # endif

32
proto/x11proto/Xproto.h
View File

@ -1212,6 +1212,38 @@ typedef struct _xEvent {
} u; } u;
} xEvent; } xEvent;
/*********************************************************
*
* Generic event
*
* Those events are not part of the core protocol spec and can be used by
* various extensions.
* type is always GenericEvent
* extension is the minor opcode of the extension the event belongs to.
* evtype is the actual event type, unique __per extension__.
*
* GenericEvents can be longer than 32 bytes, with the length field
* specifying the number of 4 byte blocks after the first 32 bytes.
*
*
*/
typedef struct
{
BYTE type;
CARD8 extension;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD16 evtype B16;
CARD16 pad2 B16;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
CARD32 pad6 B32;
CARD32 pad7 B32;
} xGenericEvent;
/* KeymapNotify events are not included in the above union because they /* KeymapNotify events are not included in the above union because they
are different from all other events: they do not have a "detail" are different from all other events: they do not have a "detail"
or "sequenceNumber", so there is room for a 248-bit key mask. */ or "sequenceNumber", so there is room for a 248-bit key mask. */

2
proto/x11proto/Xw32defs.h
View File

@ -44,7 +44,7 @@ typedef char *caddr_t;
#define putenv _putenv #define putenv _putenv
#define read _read #define read _read
#define rmdir _rmdir #define rmdir _rmdir
#define sleep(x) _sleep((x) * 1000) #define sleep(x) Sleep((x) * 1000)
#define stat _stat #define stat _stat
#define sys_errlist _sys_errlist #define sys_errlist _sys_errlist
#define sys_nerr _sys_nerr #define sys_nerr _sys_nerr

2
proto/x11proto/Xwindows.h
View File

@ -66,7 +66,7 @@ The Open Group.
#define RT_CURSOR ((RESTYPE)5) #define RT_CURSOR ((RESTYPE)5)
#endif #endif
#define sleep(x) Sleep(1000*x) #define sleep(x) Sleep((x) * 1000)
#if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024) #if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024)
#undef PATH_MAX #undef PATH_MAX

2
proto/x11proto/Xwinsock.h
View File

@ -47,7 +47,7 @@ The Open Group.
#define ATOM wATOM #define ATOM wATOM
#define BYTE wBYTE #define BYTE wBYTE
#define FreeResource wFreeResource #define FreeResource wFreeResource
#include <winsock.h> #include <winsock2.h>
#undef Status #undef Status
#define Status int #define Status int
#undef BYTE #undef BYTE

30
proto/x11proto/configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.57]) AC_PREREQ([2.57])
AC_INIT([Xproto], [7.0.10], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AC_INIT([Xproto], [7.0.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER(do-not-use-config.h) AC_CONFIG_HEADER(do-not-use-config.h)
@ -32,8 +32,14 @@ AC_ARG_ENABLE(wide-prototypes,
[WIDEPROTO=$enableval], [WIDEPROTO=auto]) [WIDEPROTO=$enableval], [WIDEPROTO=auto])
AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h])
# Handle Xpoll.h.in # Handle Xpoll.h.in
fds_bits_found=false; # Avoid determining fds_bits on WIN32 hosts (not including cygwin)
case $host_os in
mingw*) fds_bits_found=true;;
*) fds_bits_found=false;;
esac
if test "x$fds_bits_found" = xfalse ; then if test "x$fds_bits_found" = xfalse ; then
AC_CHECK_MEMBER(fd_set.fds_bits, AC_CHECK_MEMBER(fd_set.fds_bits,
@ -42,8 +48,18 @@ if test "x$fds_bits_found" = xfalse ; then
USE_FDS_BITS="fds_bits" USE_FDS_BITS="fds_bits"
],, ],,
[ [
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> #include <sys/select.h>
#endif
]) ])
fi fi
@ -54,8 +70,18 @@ if test "x$fds_bits_found" = xfalse ; then
USE_FDS_BITS="__fds_bits" USE_FDS_BITS="__fds_bits"
],, ],,
[ [
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> #include <sys/select.h>
#endif
]) ])
fi fi

39
proto/x11proto/do-not-use-config.h.in
View File

@ -3,6 +3,42 @@
/* FUNCPROTO */ /* FUNCPROTO */
#undef FUNCPROTO #undef FUNCPROTO
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Narrow prototypes */ /* Narrow prototypes */
#undef NARROWPROTO #undef NARROWPROTO
@ -33,5 +69,8 @@
/* Patch version of this package */ /* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL #undef PACKAGE_VERSION_PATCHLEVEL
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION

33
proto/x11proto/keysymdef.h
View File

@ -56,7 +56,7 @@ SOFTWARE.
* engraving) of a keyboard layout. This file assigns mnemonic macro * engraving) of a keyboard layout. This file assigns mnemonic macro
* names for these keysyms. * names for these keysyms.
* *
* This file is also compiled (by xc/lib/X11/util/makekeys.c) into * This file is also compiled (by src/util/makekeys.c in libX11) into
* hash tables that can be accessed with X11 library functions such as * hash tables that can be accessed with X11 library functions such as
* XStringToKeysym() and XKeysymToString(). * XStringToKeysym() and XKeysymToString().
* *
@ -93,9 +93,26 @@ SOFTWARE.
* /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/ * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/
* /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/ * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/
* *
* Before adding new keysyms, please do consider the following: In
* addition to the keysym names defined in this file, the
* XStringToKeysym() and XKeysymToString() functions will also handle
* any keysym string of the form "U0020" to "U007E" and "U00A0" to
* "U10FFFF" for all possible Unicode characters. In other words,
* every possible Unicode character has already a keysym string
* defined algorithmically, even if it is not listed here. Therefore,
* defining an additional keysym macro is only necessary where a
* non-hexadecimal mnemonic name is needed, or where the new keysym
* does not represent any existing Unicode character.
*
* When adding new keysyms to this file, do not forget to also update the * When adding new keysyms to this file, do not forget to also update the
* mappings in xc/lib/X11/KeyBind.c and the protocol specification in * following:
* xc/doc/specs/XProtocol/X11.keysyms. *
* - the mappings in src/KeyBind.c in the repo
* git://anongit.freedesktop.org/xorg/lib/libX11
*
* - the protocol specification in specs/XProtocol/X11.keysyms
* in the repo git://anongit.freedesktop.org/xorg/doc/xorg-docs
*
*/ */
#define XK_VoidSymbol 0xffffff /* Void symbol */ #define XK_VoidSymbol 0xffffff /* Void symbol */
@ -384,6 +401,16 @@ SOFTWARE.
#define XK_dead_hook 0xfe61 #define XK_dead_hook 0xfe61
#define XK_dead_horn 0xfe62 #define XK_dead_horn 0xfe62
#define XK_dead_stroke 0xfe63 #define XK_dead_stroke 0xfe63
#define XK_dead_abovecomma 0xfe64
#define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */
#define XK_dead_abovereversedcomma 0xfe65
#define XK_dead_dasia 0xfe66 /* alias for dead_abovereversedcomma */
#define XK_dead_belowring 0xfe67
#define XK_dead_belowmacron 0xfe68
#define XK_dead_belowcircumflex 0xfe69
#define XK_dead_belowtilde 0xfe6a
#define XK_dead_belowbreve 0xfe6b
#define XK_dead_belowdiaeresis 0xfe6c
#define XK_First_Virtual_Screen 0xfed0 #define XK_First_Virtual_Screen 0xfed0
#define XK_Prev_Virtual_Screen 0xfed1 #define XK_Prev_Virtual_Screen 0xfed1