From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :

The XKEYBOARD extension is a pain in the... so XCB had to grow new ways to
describe the protocol.

This patch adds support to the Wireshark dissector, so it can successfully
process the XCB description of the XKEYBOARD extension.

Without this patch, "make x11-dissector" chokes on the current xcbproto from
git.

Also update the script to deal with the new mesa directory structure.

svn path=/trunk/; revision=32520

1 files changed, 206 insertions, 2 deletions

diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index c8f9e59b23..03b2f03633 100644
--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version 1.5-5-g4f4d43e */
+   using xcbproto version 1.6-4-g2d873a3 */
 /* $Id$ */
 
 /*
@@ -58,6 +58,25 @@ static const value_string x11_enum_DPMSMode[] = {
 	{   0, NULL },
 };
 
+static const value_string x11_enum_Attachment[] = {
+	{   0, "BufferFrontLeft" },
+	{   1, "BufferBackLeft" },
+	{   2, "BufferFrontRight" },
+	{   3, "BufferBackRight" },
+	{   4, "BufferDepth" },
+	{   5, "BufferStencil" },
+	{   6, "BufferAccum" },
+	{   7, "BufferFakeFrontLeft" },
+	{   8, "BufferFakeFrontRight" },
+	{   9, "BufferDepthStencil" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_DriverType[] = {
+	{   0, "DRI" },
+	{   0, NULL },
+};
+
 static const value_string x11_enum_SetConfig[] = {
 	{   0, "Success" },
 	{   1, "InvalidConfigTime" },
@@ -96,7 +115,75 @@ static const value_string x11_enum_GetPropertyType[] = {
 };
 
 static const value_string x11_enum_Atom[] = {
-	{   0, "None" },
+	{   0, "Any" },
+	{   1, "PRIMARY" },
+	{   2, "SECONDARY" },
+	{   3, "ARC" },
+	{   4, "ATOM" },
+	{   5, "BITMAP" },
+	{   6, "CARDINAL" },
+	{   7, "COLORMAP" },
+	{   8, "CURSOR" },
+	{   9, "CUT_BUFFER0" },
+	{  10, "CUT_BUFFER1" },
+	{  11, "CUT_BUFFER2" },
+	{  12, "CUT_BUFFER3" },
+	{  13, "CUT_BUFFER4" },
+	{  14, "CUT_BUFFER5" },
+	{  15, "CUT_BUFFER6" },
+	{  16, "CUT_BUFFER7" },
+	{  17, "DRAWABLE" },
+	{  18, "FONT" },
+	{  19, "INTEGER" },
+	{  20, "PIXMAP" },
+	{  21, "POINT" },
+	{  22, "RECTANGLE" },
+	{  23, "RESOURCE_MANAGER" },
+	{  24, "RGB_COLOR_MAP" },
+	{  25, "RGB_BEST_MAP" },
+	{  26, "RGB_BLUE_MAP" },
+	{  27, "RGB_DEFAULT_MAP" },
+	{  28, "RGB_GRAY_MAP" },
+	{  29, "RGB_GREEN_MAP" },
+	{  30, "RGB_RED_MAP" },
+	{  31, "STRING" },
+	{  32, "VISUALID" },
+	{  33, "WINDOW" },
+	{  34, "WM_COMMAND" },
+	{  35, "WM_HINTS" },
+	{  36, "WM_CLIENT_MACHINE" },
+	{  37, "WM_ICON_NAME" },
+	{  38, "WM_ICON_SIZE" },
+	{  39, "WM_NAME" },
+	{  40, "WM_NORMAL_HINTS" },
+	{  41, "WM_SIZE_HINTS" },
+	{  42, "WM_ZOOM_HINTS" },
+	{  43, "MIN_SPACE" },
+	{  44, "NORM_SPACE" },
+	{  45, "MAX_SPACE" },
+	{  46, "END_SPACE" },
+	{  47, "SUPERSCRIPT_X" },
+	{  48, "SUPERSCRIPT_Y" },
+	{  49, "SUBSCRIPT_X" },
+	{  50, "SUBSCRIPT_Y" },
+	{  51, "UNDERLINE_POSITION" },
+	{  52, "UNDERLINE_THICKNESS" },
+	{  53, "STRIKEOUT_ASCENT" },
+	{  54, "STRIKEOUT_DESCENT" },
+	{  55, "ITALIC_ANGLE" },
+	{  56, "X_HEIGHT" },
+	{  57, "QUAD_WIDTH" },
+	{  58, "WEIGHT" },
+	{  59, "POINT_SIZE" },
+	{  60, "RESOLUTION" },
+	{  61, "COPYRIGHT" },
+	{  62, "NOTICE" },
+	{  63, "FONT_NAME" },
+	{  64, "FAMILY_NAME" },
+	{  65, "FULL_NAME" },
+	{  66, "CAP_HEIGHT" },
+	{  67, "WM_CLASS" },
+	{  68, "WM_TRANSIENT_FOR" },
 	{   0, NULL },
 };
 
@@ -347,6 +434,123 @@ static const value_string x11_enum_NotifyMode[] = {
 	{   0, NULL },
 };
 
+static const value_string x11_enum_AXFBOpt[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_AXSKOpt[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_IMFlag[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_IMGroupsWhich[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_SetOfGroup[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_IMModsWhich[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_BoolCtrl[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_DoodadType[] = {
+	{   1, "Outline" },
+	{   2, "Solid" },
+	{   3, "Text" },
+	{   4, "Indicator" },
+	{   5, "Logo" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_LedClass[] = {
+	{ 768, "DfltXIClass" },
+	{ 1280, "AllXIClasses" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_ID[] = {
+	{ 256, "UseCoreKbd" },
+	{ 512, "UseCorePtr" },
+	{ 768, "DfltXIClass" },
+	{ 1024, "DfltXIId" },
+	{ 1280, "AllXIClass" },
+	{ 1536, "AllXIId" },
+	{ 65280, "XINone" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_SAType[] = {
+	{   0, "NoAction" },
+	{   1, "SetMods" },
+	{   2, "LatchMods" },
+	{   3, "LockMods" },
+	{   4, "SetGroup" },
+	{   5, "LatchGroup" },
+	{   6, "LockGroup" },
+	{   7, "MovePtr" },
+	{   8, "PtrBtn" },
+	{   9, "LockPtrBtn" },
+	{  10, "SetPtrDflt" },
+	{  11, "ISOLock" },
+	{  12, "Terminate" },
+	{  13, "SwitchScreen" },
+	{  14, "SetControls" },
+	{  15, "LockControls" },
+	{  16, "ActionMessage" },
+	{  17, "RedirectKey" },
+	{  18, "DeviceBtn" },
+	{  19, "LockDeviceBtn" },
+	{  20, "DeviceValuator" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_SAValWhat[] = {
+	{   0, "IgnoreVal" },
+	{   1, "SetValMin" },
+	{   2, "SetValCenter" },
+	{   3, "SetValMax" },
+	{   4, "SetValRelative" },
+	{   5, "SetValAbsolute" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_EventType[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_MapPart[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_Group[] = {
+	{   0, "1" },
+	{   1, "2" },
+	{   2, "3" },
+	{   3, "4" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_BellClassResult[] = {
+	{   0, "KbdFeedbackClass" },
+	{   5, "BellFeedbackClass" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_LedClassResult[] = {
+	{   0, "KbdFeedbackClass" },
+	{   4, "LedFeedbackClass" },
+	{   0, NULL },
+};
+
 static const value_string x11_enum_ImageFormatInfoType[] = {
 	{   0, "RGB" },
 	{   1, "YUV" },