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/ch13.xml | 625 +++++++++++++++++++++++++--------------------- 1 file changed, 338 insertions(+), 287 deletions(-) (limited to 'libX11/specs/XKB/ch13.xml') diff --git a/libX11/specs/XKB/ch13.xml b/libX11/specs/XKB/ch13.xml index 101003817..ed6066d10 100644 --- a/libX11/specs/XKB/ch13.xml +++ b/libX11/specs/XKB/ch13.xml @@ -557,19 +557,22 @@ type fields are shown in Table 13.1. - +
Doodad Types - - + + + + + - + Doodad Structure Type - + indicator doodad @@ -580,7 +583,7 @@ XkbIndicatorDoodadRec XkbIndicatorDoodad - + outline doodad @@ -591,7 +594,7 @@ XkbShapeDoodadRec XkbOutlineDoodad - + solid doodad @@ -602,7 +605,7 @@ XkbShapeDoodadRec XkbSolidDoodad - + text doodad @@ -613,7 +616,7 @@ XkbTextDoodadRec XkbTextDoodad - + logo doodad @@ -1091,10 +1094,11 @@ To load a keyboard geometry if you already have the keyboard description, use - - + + + - + Status XkbGetGeometry @@ -1105,14 +1109,14 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb @@ -1150,10 +1154,11 @@ XkbGetNamedGeometry. - - + + + - + Status XkbGetNamedGeometry @@ -1166,21 +1171,21 @@ dpy ) - + Display * dpy ; /* connection to the X server */ - + XkbDescPtr xkb ; /* keyboard description into which the geometry should be loaded */ - + Atom name @@ -1235,10 +1240,11 @@ XkbComputeShapeTop. - - + + + - + Bool XkbComputeShapeTop @@ -1249,14 +1255,14 @@ shape ) - + XkbShapePtr shape ; /* shape to be examined */ - + XkbBoundsPtr bounds_rtrn @@ -1312,10 +1318,11 @@ shape, use XkbComputeShapeBounds. - - + + + - + Bool XkbComputeShapeBounds @@ -1324,7 +1331,7 @@ shape ) - + XkbShapePtr shape @@ -1365,10 +1372,11 @@ To update the bounding box of a row, use XkbComputeRowBounds - - + + + - + Bool XkbComputeRowBounds @@ -1381,7 +1389,7 @@ geom ) - + XkbGeometryPtr geom @@ -1390,14 +1398,14 @@ section */ - + XkbSectionPtr section ; /* section that contains the row */ - + XkbRowPtr row @@ -1432,10 +1440,11 @@ that section. To update the bounding box of a section, use - - + + + - + Bool XkbComputeSectionBounds @@ -1446,7 +1455,7 @@ geom ) - + XkbGeometryPtr geom @@ -1455,7 +1464,7 @@ section */ - + XkbSectionPtr section @@ -1491,10 +1500,11 @@ XkbFindOverlayForKey. - - + + + - + char * XkbFindOverlayForKey @@ -1507,7 +1517,7 @@ geom ) - + XkbGeometryPtr geom @@ -1516,14 +1526,14 @@ section */ - + XkbSectionPtr section ; /* section to be searched for matching keys */ - + char * under @@ -1581,10 +1591,11 @@ XkbAddGeomProperty - - + + + - + XkbPropertyPtr XkbAddGeomProperty @@ -1597,21 +1608,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + char * name ; /* name of the new property */ - + char * value @@ -1650,10 +1661,11 @@ XkbAddGeomKeyAlias - - + + + - + XkbKeyAliasPtr XkbAddGeomKeyAlias @@ -1664,21 +1676,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + char * alias ; /* alias to be added */ - + char * real @@ -1712,10 +1724,11 @@ XkbAddGeomColor - - + + + - + XkbColorPtr XkbAddGeomColor @@ -1728,21 +1741,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + char * spec ; /* color to be added */ - + unsigned int pixel @@ -1790,10 +1803,11 @@ XkbAddGeomOutline. - - + + + - + XkbOutlinePtr XkbAddGeomOutline @@ -1804,14 +1818,14 @@ shape ) - + XkbShapePtr shape ; /* shape to be updated */ - + int sz_points @@ -1847,10 +1861,11 @@ XkbAddGeomShape - - + + + - + XkbShapePtr XkbAddGeomShape @@ -1863,21 +1878,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + Atom name ; /* name of the new shape */ - + int sz_outlines @@ -1919,10 +1934,11 @@ XkbAddGeomKey - - + + + - + XkbKeyPtr XkbAddGeomKey @@ -1931,7 +1947,7 @@ row ) - + XkbRowPtr row @@ -1966,10 +1982,11 @@ XkbAddGeomSection - - + + + - + XkbSectionPtr XkbAddGeomSection @@ -1986,35 +2003,35 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be updated */ - + Atom name ; /* name of the new section */ - + int sz_rows ; /* number of rows to reserve in the section */ - + int sz_doodads ; /* number of doodads to reserve in the section */ - + int sz_overlays @@ -2061,10 +2078,11 @@ XkbAddGeomRow - - + + + - + XkbRowPtr XkbAddGeomRow @@ -2075,14 +2093,14 @@ section ) - + XkbSectionPtr section ; /* section to be updated */ - + int sz_keys @@ -2121,10 +2139,11 @@ XkbAddGeomDoodad - - + + + - + XkbDoodadPtr XkbAddGeomDoodad @@ -2137,21 +2156,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to which the doodad is added */ - + XkbSectionPtr section ; /* section, if any, to which the doodad is added */ - + Atom name @@ -2206,10 +2225,11 @@ XkbAddGeomOverlay - - + + + - + XkbOverlayPtr XkbAddGeomOverlay @@ -2222,21 +2242,21 @@ section ) - + XkbSectionPtr section ; /* section to which an overlay will be added */ - + Atom name ; /* name of the overlay */ - + int sz_rows @@ -2274,10 +2294,11 @@ XkbAddGeomOverlayRow - - + + + - + XkbOverlayRowPtr XkbAddGeomOverlayRow @@ -2288,14 +2309,14 @@ overlay ) - + XkbOverlayPtr overlay ; /* overlay to be updated */ - + XkbRowPtr row_under @@ -2304,7 +2325,7 @@ overlay overlays */ - + int sz_keys @@ -2345,10 +2366,11 @@ XkbAddGeomOverlayKey - - + + + - + XkbOverlayKeyPtr XkbAddGeomOverlayKey @@ -2359,21 +2381,21 @@ overlay ) - + XkbOverlayPtr overlay ; /* overlay to be updated */ - + XkbRowPtr row ; /* row in overlay to be updated */ - + char * under @@ -2443,10 +2465,11 @@ XkbAllocGeomOutlines. - - + + + - + Status XkbAllocGeomOutlines @@ -2457,14 +2480,14 @@ shape ) - + XkbShapePtr shape ; /* shape for which outlines should be allocated */ - + int num_needed @@ -2494,10 +2517,11 @@ XkbFreeGeomOutlines - - + + + - + void XkbFreeGeomOutlines @@ -2512,28 +2536,28 @@ shape ) - + XkbShapePtr shape ; /* shape in which outlines should be freed */ - + int first ; /* first outline to be freed */ - + int count ; /* number of outlines to be freed */ - + Bool free_all; @@ -2561,10 +2585,11 @@ XkbAllocGeomKeys. - - + + + - + Status XkbAllocGeomKeys @@ -2575,14 +2600,14 @@ row ) - + XkbRowPtr row ; /* row to which keys should be allocated */ - + int num_needed @@ -2609,10 +2634,11 @@ XkbFreeGeomKeys - - + + + - + void XkbFreeGeomKeys @@ -2627,28 +2653,28 @@ row ) - + XkbRowPtr row ; /* row in which keys should be freed */ - + int first ; /* first key to be freed */ - + int count ; /* number of keys to be freed */ - + Bool free_all; @@ -2677,10 +2703,11 @@ XkbAllocGeomProps - - + + + - + Status XkbAllocGeomProps @@ -2691,14 +2718,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which properties should be allocated */ - + int num_needed @@ -2731,10 +2758,11 @@ XkbFreeGeomProperties - - + + + - + void XkbFreeGeomProperties @@ -2749,28 +2777,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which properties should be freed */ - + int first ; /* first property to be freed */ - + int count ; /* number of properties to be freed */ - + Bool free_all; @@ -2799,10 +2827,11 @@ XkbAllocGeomKeyAliases - - + + + - + Status XkbAllocGeomKeyAliases @@ -2813,14 +2842,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which key aliases should be allocated */ - + int num_needed @@ -2850,10 +2879,11 @@ XkbFreeGeomKeyAliases - - + + + - + void XkbFreeGeomKeyAliases @@ -2868,28 +2898,28 @@ free_all ) - + XkbGeometryPtr geom ; /* geometry in which key aliases should be freed */ - + int first ; /* first key alias to be freed */ - + int count ; /* number of key aliases to be freed */ - + Bool free_all; @@ -2922,10 +2952,11 @@ XkbAllocGeomColors - - + + + - + Status XkbAllocGeomColors @@ -2936,14 +2967,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which colors should be allocated */ - + int num_needed @@ -2974,10 +3005,11 @@ XkbFreeGeomColors - - + + + - + void XkbFreeGeomColors @@ -2992,28 +3024,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which colors should be freed */ - + int first ; /* first color to be freed */ - + int count ; /* number of colors to be freed */ - + Bool free_all; @@ -3042,10 +3074,11 @@ XkbAllocGeomPoints - - + + + - + Status XkbAllocGeomPoints @@ -3056,14 +3089,14 @@ outline ) - + XkbOutlinePtr outline ; /* outline for which points should be allocated */ - + int num_needed @@ -3093,10 +3126,11 @@ XkbFreeGeomPoints - - + + + - + void XkbFreeGeomPoints @@ -3111,28 +3145,28 @@ outline ) - + XkbOutlinePtr outline ; /* outline in which points should be freed */ - + int first ; /* first point to be freed. */ - + int count ; /* number of points to be freed */ - + Bool free_all; @@ -3162,10 +3196,11 @@ XkbAllocGeomShapes - - + + + - + Status XkbAllocGeomShapes @@ -3176,14 +3211,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which shapes should be allocated */ - + int num_needed @@ -3213,10 +3248,11 @@ XkbFreeGeomShapes - - + + + - + void XkbFreeGeomShapes @@ -3231,28 +3267,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which shapes should be freed */ - + int first ; /* first shape to be freed */ - + int count ; /* number of shapes to be freed */ - + Bool free_all; @@ -3282,10 +3318,11 @@ XkbAllocGeomSections - - + + + - + Status XkbAllocGeomSections @@ -3296,14 +3333,14 @@ geom ) - + XkbGeometryPtr geom ; /*geometry for which sections should be allocated */ - + int num_needed @@ -3330,10 +3367,11 @@ XkbFreeGeomSections - - + + + - + void XkbFreeGeomSections @@ -3348,28 +3386,28 @@ geom ) - + XkbGeometryPtr geom ; /* geometry in which sections should be freed */ - + int first ; /* first section to be freed. */ - + int count ; /* number of sections to be freed */ - + Bool free_all; @@ -3399,10 +3437,11 @@ XkbAllocGeomRows - - + + + - + Status XkbAllocGeomRows @@ -3413,14 +3452,14 @@ section ) - + XkbSectionPtr section ; /* section for which rows should be allocated */ - + int num_needed @@ -3447,10 +3486,11 @@ XkbFreeGeomRows - - + + + - + void XkbFreeGeomRows @@ -3465,28 +3505,28 @@ section ) - + XkbSectionPtr section ; /* section in which rows should be freed */ - + int first ; /* first row to be freed. */ - + int count ; /* number of rows to be freed */ - + Bool free_all; @@ -3516,10 +3556,11 @@ XkbAllocGeomOverlays - - + + + - + Status XkbAllocGeomOverlays @@ -3530,14 +3571,14 @@ section ) - + XkbSectionPtr section ; /* section for which overlays should be allocated */ - + int num_needed @@ -3564,10 +3605,11 @@ XkbFreeGeomOverlays - - + + + - + void XkbFreeGeomOverlays @@ -3582,28 +3624,28 @@ section ) - + XkbSectionPtr section ; /* section in which overlays should be freed */ - + int first ; /* first overlay to be freed. */ - + int count ; /* number of overlays to be freed */ - + Bool free_all; @@ -3633,10 +3675,11 @@ XkbAllocGeomOverlayRows - - + + + - + Status XkbAllocGeomOverlayRows @@ -3647,14 +3690,14 @@ overlay ) - + XkbSectionPtr overlay ; /* section for which rows should be allocated */ - + int num_needed @@ -3681,10 +3724,11 @@ XkbFreeGeomOverlayRows - - + + + - + void XkbFreeGeomOverlayRows @@ -3699,28 +3743,28 @@ overlay ) - + XkbSectionPtr overlay ; /* section in which rows should be freed */ - + int first ; /* first row to be freed. */ - + int count ; /* number of rows to be freed */ - + Bool free_all; @@ -3750,10 +3794,11 @@ XkbAllocGeomOverlayKeys - - + + + - + Status XkbAllocGeomOverlayKeys @@ -3764,14 +3809,14 @@ row ) - + XkbRowPtr row ; /* section for which rows should be allocated */ - + int num_needed @@ -3798,10 +3843,11 @@ XkbFreeGeomOverlayKeys - - + + + - + void XkbFreeGeomOverlayKeys @@ -3816,28 +3862,28 @@ row ) - + XkbRowPtr row ; /* row in which keys should be freed */ - + int first ; /* first key to be freed. */ - + int count ; /* number of keys to be freed */ - + Bool free_all; @@ -3867,10 +3913,11 @@ XkbAllocGeomDoodads - - + + + - + Status XkbAllocGeomDoodads @@ -3881,14 +3928,14 @@ geom ) - + XkbGeometryPtr geom ; /* geometry for which doodads should be allocated */ - + int num_needed @@ -3916,10 +3963,11 @@ XkbAllocGeomSectionDoodads - - + + + - + Status XkbAllocGeomSectionDoodads @@ -3930,14 +3978,14 @@ section ) - + XkbSectionPtr section ; /* section for which doodads should be allocated */ - + int num_needed @@ -3965,10 +4013,11 @@ XkbFreeGeomDoodads - - + + + - + void XkbFreeGeomDoodads @@ -3981,21 +4030,21 @@ doodads ) - + XkbDoodadPtr doodads ; /* doodads to be freed */ - + int count ; /* number of doodads to be freed */ - + Bool free_all; @@ -4026,10 +4075,11 @@ XkbAllocGeometry - - + + + - + Status XkbAllocGeometry @@ -4040,14 +4090,14 @@ xkb ) - + XkbDescPtr xkb ; /* keyboard description for which geometry is to be allocated */ - + XkbGeometrySizesPtr sizes @@ -4078,10 +4128,11 @@ XkbFreeGeometry - - + + + - + void XkbFreeGeometry @@ -4094,21 +4145,21 @@ geom ) - + XkbGeometryPtr geom ; /* geometry to be freed */ - + unsigned int which ; /* mask of geometry components to be freed */ - + Bool free_all; -- cgit v1.2.3