From 45e3694d529b052f4122262c9bdff5476219b2b4 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 23 Jan 2012 08:33:10 +0100 Subject: git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 --- libX11/specs/XKB/ch21.xml | 232 ++++++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 109 deletions(-) (limited to 'libX11/specs/XKB/ch21.xml') diff --git a/libX11/specs/XKB/ch21.xml b/libX11/specs/XKB/ch21.xml index bd5738991..7b2c653ba 100644 --- a/libX11/specs/XKB/ch21.xml +++ b/libX11/specs/XKB/ch21.xml @@ -225,15 +225,16 @@ same bits are used to indicate the specific information desired in many of the functions described subsequently in this section. - +
XkbDeviceInfoRec Mask Bits - - - - - + + + + + + - + Name XkbDeviceInfoRec Fields Effected Value @@ -241,7 +242,7 @@ functions described subsequently in this section. - + XkbXI_KeyboardsMask (1L << 0) @@ -251,7 +252,7 @@ Clients can use all Xkb requests and events with devices supported by the input device extension. - + XkbXI_ButtonActionsMask num_btns @@ -264,7 +265,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorNamesMask leds->names (1L <<2) @@ -274,7 +275,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorMapsMask leds->maps (1L <<3) @@ -284,7 +285,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorStateMask leds->state (1L <<4) @@ -294,7 +295,7 @@ KeyClass input extension devices. - + XkbXI_IndicatorsMask sz_leds @@ -303,42 +304,42 @@ KeyClass (0x1c) -XkbXI_IndicatorNamesMask | -XkbXI_IndicatorMapsMask | -XkbXI_IndicatorStateMask +XkbXI_IndicatorNames­Mask | +XkbXI_IndicatorMaps­Mask | +XkbXI_IndicatorState­Mask - + XkbXI_UnsupportedFeaturesMask unsupported (1L <<15) - + XkbXI_AllDeviceFeaturesMask Those selected by Value column masks (0x1e) -XkbXI_IndicatorsMask | -XkbSI_ButtonActionsMask +XkbXI_Indicators­Mask | +XkbSI_ButtonActions­Mask - + XkbXI_AllFeaturesMask Those selected by Value column masks (0x1f) -XkbSI_AllDeviceFeaturesMask | -XkbSI_KeyboardsMask +XkbSI_AllDevice­FeaturesMask | +XkbSI_Keyboards­Mask - + XkbXI_AllDetailsMask Those selected by Value column masks (0x801f) -XkbXI_AllFeaturesMask | -XkbXI_UnsupportedFeaturesMask +XkbXI_AllFeatures­Mask | +XkbXI_Unsupported­FeaturesMask @@ -376,10 +377,11 @@ KeyClass - - + + + - + XkbDeviceInfoPtr XkbGetDeviceInfo @@ -388,20 +390,20 @@ dpy , which, device_spec, ind_class, ind_id) - + Display * dpy ; /* connection to X server */ - + unsigned int which; /* mask indicating information to return */ - + unsigned int device_spec @@ -410,14 +412,14 @@ XkbUseCoreKbd */ - + unsigned int ind_class ; /* feedback class for indicator requests */ - + unsigned int ind_id @@ -613,10 +615,11 @@ XkbGetDeviceButtonActions. - - + + + - + Status XkbGetDeviceButtonActions @@ -625,20 +628,20 @@ dpy, device_info, all_buttons, first_button, num_buttons ) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure to update with results */ - + Bool all_buttons @@ -647,13 +650,13 @@ True => get information for all buttons */ - + unsigned int first_button; /* number of first button for which info is desired */ - + unsigned int num_buttons; /* number of buttons for which info is desired */ @@ -746,10 +749,11 @@ of an input extension device, use XkbGetDeviceLedInfo. - - + + + - + Status XkbGetDeviceLedInfo @@ -758,33 +762,33 @@ dpy, device_i nfo, led_class, led_id, which) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure to update with results */ - + unsigned int led_class ; /* LED feedback class assigned by input extension */ - + unsigned int led_id; /* LED feedback ID assigned by input extension */ - + unsigned int which; /* mask indicating desired information */ @@ -934,30 +938,31 @@ XkbDeviceInfoRec - - + + + - + XkbDeviceInfoPtr XkbAllocDeviceInfo (device_spec, n_buttons, sz_leds) - + unsigned int device_spec; /* device ID with which structure will be used */ - + unsigned int n_buttons ; /* number of button actions to allocate space for*/ - + unsigned int sz_leds @@ -1004,24 +1009,25 @@ XkbDeviceLedInfoRec - - + + + - + Status XkbAllocDeviceLedInfo (devi, num_needed) - + XkbDeviceInfoPtr device_info ; /* structure in which to allocate LED space */ - + int num_needed @@ -1060,30 +1066,31 @@ XkbDeviceLedInfoRec - - + + + - + XkbDeviceLedInfoPtr XkbAddDeviceLedInfo (device_info, led_class, led_id) - + XkbDeviceInfoPtr device_info; /* structure in which to add LED info */ - + unsigned int led_class ; /* input extension class for LED device of interest */ - + unsigned int led_id @@ -1154,23 +1161,24 @@ XkbDeviceInfoRec - - + + + - + Status XkbResizeDeviceButtonActions (device_info, new_total) - + XkbDeviceInfoPtr device_info; /* structure in which to allocate button actions */ - + unsigned int new_total @@ -1217,24 +1225,25 @@ XkbDeviceInfoRec - - + + + - + void XkbFreeDeviceInfo (device_info, which, free_all) - + XkbDeviceInfoPtr device_info; /* pointer to XkbDeviceInfoRec in which to free items */ - + unsigned int which @@ -1243,7 +1252,7 @@ device_info to free */ - + Bool free_all @@ -1379,10 +1388,11 @@ use XkbSetDeviceInfo. - - + + + - + Bool XkbSetDeviceInfo @@ -1391,21 +1401,21 @@ dpy , which, device_info) - + Display * dpy ; /* connection to X server */ - + unsigned int which ; /* mask indicating characteristics to modify */ - + XkbDeviceInfoPtr device_info; /* structure defining the device and modifications */ @@ -1577,10 +1587,11 @@ XkbSetDeviceButtonActions. - - + + + - + Bool XkbSetDeviceButtonActions @@ -1589,26 +1600,26 @@ dpy , device, first_button, num_buttons, actions) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure defining the device and modifications */ - + unsigned int first_button; /* number of first button to update, 0 relative */ - + unsigned int num_buttons; /* number of buttons to update */ @@ -1842,10 +1853,11 @@ XkbExtensionDeviceNotify - - + + + - + void XkbNoteDeviceChanges @@ -1854,21 +1866,21 @@ old, new, wanted ) - + XkbDeviceChangesPtr old ; /* structure tracking state changes */ - + XkbExtensionDeviceNotifyEvent * new ; /* event indicating state changes */ - + unsigned int wanted @@ -1921,10 +1933,11 @@ XkbGetDeviceInfoChanges. - - + + + - + Status XkbGetDeviceInfoChanges @@ -1935,20 +1948,20 @@ device_info , changes) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info; /* structure to update with results */ - + XkbDeviceChangesPtr changes @@ -1985,10 +1998,11 @@ XkbDeviceChangesRec, use XkbChangeDeviceInfo. - - + + + - + Bool XkbChangeDeviceInfo @@ -1997,21 +2011,21 @@ dpy, device_info, changes ) - + Display * dpy ; /* connection to X server */ - + XkbDeviceInfoPtr device_info ; /* local copy of device state and configuration */ - + XkbDeviceChangesPtr changes -- cgit v1.2.3