Some patches from Peter Harris to make it possible to build the X11 dissector

again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.


Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

svn path=/trunk/; revision=53531

1 files changed, 210 insertions, 75 deletions

diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index fd2d05969b..4079c2a53c 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.8-2-gc0d65da */
+   using xcbproto version xcb-proto-1.9-11-g2817903 */
 /* $Id$ */
 
 /*
@@ -79,18 +79,10 @@ static const value_string x11_enum_dri2_DriverType[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_dri2_EventType[] = {
-	{   1, "ExchangeComplete" },
-	{   2, "BlitComplete" },
-	{   3, "FlipComplete" },
-	{   0, NULL },
-};
-
-static const value_string x11_enum_randr_SetConfig[] = {
-	{   0, "Success" },
-	{   1, "InvalidConfigTime" },
-	{   2, "InvalidTime" },
-	{   3, "Failed" },
+static const value_string x11_enum_randr_Connection[] = {
+	{   0, "Connected" },
+	{   1, "Disconnected" },
+	{   2, "Unknown" },
 	{   0, NULL },
 };
 
@@ -104,10 +96,44 @@ static const value_string x11_enum_render_SubPixel[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_randr_Connection[] = {
-	{   0, "Connected" },
-	{   1, "Disconnected" },
-	{   2, "Unknown" },
+static const value_string x11_enum_xproto_Property[] = {
+	{   0, "NewValue" },
+	{   1, "Delete" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_sync_VALUETYPE[] = {
+	{   0, "Absolute" },
+	{   1, "Relative" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_sync_TESTTYPE[] = {
+	{   0, "PositiveTransition" },
+	{   1, "NegativeTransition" },
+	{   2, "PositiveComparison" },
+	{   3, "NegativeComparison" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_present_CompleteKind[] = {
+	{   0, "Pixmap" },
+	{   1, "NotifyMSC" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_present_CompleteMode[] = {
+	{   0, "Copy" },
+	{   1, "Flip" },
+	{   2, "Skip" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_randr_SetConfig[] = {
+	{   0, "Success" },
+	{   1, "InvalidConfigTime" },
+	{   2, "InvalidTime" },
+	{   3, "Failed" },
 	{   0, NULL },
 };
 
@@ -196,16 +222,13 @@ static const value_string x11_enum_xproto_Atom[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xproto_Property[] = {
-	{   0, "NewValue" },
-	{   1, "Delete" },
-	{   0, NULL },
-};
-
 static const value_string x11_enum_randr_Notify[] = {
 	{   0, "CrtcChange" },
 	{   1, "OutputChange" },
 	{   2, "OutputProperty" },
+	{   3, "ProviderChange" },
+	{   4, "ProviderProperty" },
+	{   5, "ResourceChange" },
 	{   0, NULL },
 };
 
@@ -271,10 +294,17 @@ static const value_string x11_enum_render_Picture[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_shape_SK[] = {
-	{   0, "Bounding" },
-	{   1, "Clip" },
-	{   2, "Input" },
+static const value_string x11_enum_screensaver_Kind[] = {
+	{   0, "Blanked" },
+	{   1, "Internal" },
+	{   2, "External" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xproto_WindowClass[] = {
+	{   0, "CopyFromParent" },
+	{   1, "InputOutput" },
+	{   2, "InputOnly" },
 	{   0, NULL },
 };
 
@@ -287,6 +317,13 @@ static const value_string x11_enum_shape_SO[] = {
 	{   0, NULL },
 };
 
+static const value_string x11_enum_shape_SK[] = {
+	{   0, "Bounding" },
+	{   1, "Clip" },
+	{   2, "Input" },
+	{   0, NULL },
+};
+
 static const value_string x11_enum_xproto_ClipOrdering[] = {
 	{   0, "Unsorted" },
 	{   1, "YSorted" },
@@ -300,20 +337,6 @@ static const value_string x11_enum_xproto_Pixmap[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_sync_VALUETYPE[] = {
-	{   0, "Absolute" },
-	{   1, "Relative" },
-	{   0, NULL },
-};
-
-static const value_string x11_enum_sync_TESTTYPE[] = {
-	{   0, "PositiveTransition" },
-	{   1, "NegativeTransition" },
-	{   2, "PositiveComparison" },
-	{   3, "NegativeComparison" },
-	{   0, NULL },
-};
-
 static const value_string x11_enum_sync_ALARMSTATE[] = {
 	{   0, "Active" },
 	{   1, "Inactive" },
@@ -339,13 +362,6 @@ static const value_string x11_enum_xfixes_SaveSetMapping[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xfixes_SelectionEvent[] = {
-	{   0, "SetSelectionOwner" },
-	{   1, "SelectionWindowDestroy" },
-	{   2, "SelectionClientClose" },
-	{   0, NULL },
-};
-
 static const value_string x11_enum_xfixes_CursorNotify[] = {
 	{   0, "DisplayCursor" },
 	{   0, NULL },
@@ -426,6 +442,16 @@ static const value_string x11_enum_xproto_InputFocus[] = {
 	{   0, NULL },
 };
 
+static const value_string x11_enum_xinput_FeedbackClass[] = {
+	{   0, "Keyboard" },
+	{   1, "Pointer" },
+	{   2, "String" },
+	{   3, "Integer" },
+	{   4, "Led" },
+	{   5, "Bell" },
+	{   0, NULL },
+};
+
 static const value_string x11_enum_xproto_MappingStatus[] = {
 	{   0, "Success" },
 	{   1, "Busy" },
@@ -433,6 +459,92 @@ static const value_string x11_enum_xproto_MappingStatus[] = {
 	{   0, NULL },
 };
 
+static const value_string x11_enum_xinput_DeviceControl[] = {
+	{   1, "resolution" },
+	{   2, "abs_calib" },
+	{   3, "core" },
+	{   4, "enable" },
+	{   5, "abs_area" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_PropertyFormat[] = {
+	{   8, "8Bits" },
+	{  16, "16Bits" },
+	{  32, "32Bits" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_Device[] = {
+	{   0, "All" },
+	{   1, "AllMaster" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_HierarchyChangeType[] = {
+	{   1, "AddMaster" },
+	{   2, "RemoveMaster" },
+	{   3, "AttachSlave" },
+	{   4, "DetachSlave" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_DeviceClassType[] = {
+	{   0, "Key" },
+	{   1, "Button" },
+	{   2, "Valuator" },
+	{   3, "Scroll" },
+	{   8, "Touch" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_DeviceType[] = {
+	{   1, "MasterPointer" },
+	{   2, "MasterKeyboard" },
+	{   3, "SlavePointer" },
+	{   4, "SlaveKeyboard" },
+	{   5, "FloatingSlave" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_GrabOwner[] = {
+	{   0, "NoOwner" },
+	{   1, "Owner" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_EventMode[] = {
+	{   0, "AsyncDevice" },
+	{   1, "SyncDevice" },
+	{   2, "ReplayDevice" },
+	{   3, "AsyncPairedDevice" },
+	{   4, "AsyncPair" },
+	{   5, "SyncPair" },
+	{   6, "AcceptTouch" },
+	{   7, "RejectTouch" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_ModifierMask[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_GrabType[] = {
+	{   0, "Button" },
+	{   1, "Keycode" },
+	{   2, "Enter" },
+	{   3, "FocusIn" },
+	{   4, "TouchBegin" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xinput_GrabMode22[] = {
+	{   0, "Sync" },
+	{   1, "Async" },
+	{   2, "Touch" },
+	{   0, NULL },
+};
+
 static const value_string x11_enum_xproto_Window[] = {
 	{   0, "None" },
 	{   0, NULL },
@@ -458,44 +570,75 @@ static const value_string x11_enum_xproto_NotifyMode[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_AXFBOpt[] = {
+static const value_string x11_enum_xinput_DeviceChange[] = {
+	{   0, "Added" },
+	{   1, "Removed" },
+	{   2, "Enabled" },
+	{   3, "Disabled" },
+	{   4, "Unrecoverable" },
+	{   5, "ControlChanged" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_AXSKOpt[] = {
+static const value_string x11_enum_xinput_ChangeReason[] = {
+	{   1, "SlaveSwitch" },
+	{   2, "DeviceChange" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_IMFlag[] = {
+static const value_string x11_enum_xinput_NotifyMode[] = {
+	{   0, "Normal" },
+	{   1, "Grab" },
+	{   2, "Ungrab" },
+	{   3, "WhileGrabbed" },
+	{   4, "PassiveGrab" },
+	{   5, "PassiveUngrab" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_IMGroupsWhich[] = {
+static const value_string x11_enum_xinput_NotifyDetail[] = {
+	{   0, "Ancestor" },
+	{   1, "Virtual" },
+	{   2, "Inferior" },
+	{   3, "Nonlinear" },
+	{   4, "NonlinearVirtual" },
+	{   5, "Pointer" },
+	{   6, "PointerRoot" },
+	{   7, "None" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_SetOfGroup[] = {
+static const value_string x11_enum_xinput_PropertyFlag[] = {
+	{   0, "Deleted" },
+	{   1, "Created" },
+	{   2, "Modified" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_IMModsWhich[] = {
+static const value_string x11_enum_xinput_TouchOwnershipFlags[] = {
+	{   0, "None" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xkb_IMFlag[] = {
+	{   0, NULL },
+};
+
+static const value_string x11_enum_xkb_IMGroupsWhich[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_BoolCtrl[] = {
+static const value_string x11_enum_xkb_SetOfGroup[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_DoodadType[] = {
-	{   1, "Outline" },
-	{   2, "Solid" },
-	{   3, "Text" },
-	{   4, "Indicator" },
-	{   5, "Logo" },
+static const value_string x11_enum_xkb_IMModsWhich[] = {
 	{   0, NULL },
 };
 
 static const value_string x11_enum_xkb_LedClass[] = {
+	{   0, "KbdFeedbackClass" },
+	{   4, "LedFeedbackClass" },
 	{ 768, "DfltXIClass" },
 	{ 1280, "AllXIClasses" },
 	{   0, NULL },
@@ -547,11 +690,12 @@ static const value_string x11_enum_xkb_SAValWhat[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xkb_EventType[] = {
-	{   0, NULL },
-};
-
-static const value_string x11_enum_xkb_MapPart[] = {
+static const value_string x11_enum_xkb_SymInterpretMatch[] = {
+	{   0, "NoneOf" },
+	{   1, "AnyOfOrNone" },
+	{   2, "AnyOf" },
+	{   3, "AllOf" },
+	{   4, "Exactly" },
 	{   0, NULL },
 };
 
@@ -599,15 +743,6 @@ static const value_string x11_enum_xv_ScanlineOrder[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_xv_VideoNotifyReason[] = {
-	{   0, "Started" },
-	{   1, "Stopped" },
-	{   2, "Busy" },
-	{   3, "Preempted" },
-	{   4, "HardError" },
-	{   0, NULL },
-};
-
 static const value_string x11_enum_xv_GrabPortStatus[] = {
 	{   0, "Success" },
 	{   1, "BadExtension" },