diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-13 00:07:34 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-13 00:07:34 +0000 |
commit | 9c3bbf44c14a9d2822704c1114b07a2ce8cf4110 (patch) | |
tree | fcde4a2027137e06644d97b9f235660578ffe155 /epan/dissectors/x11-enum.h | |
parent | 20a52095aaf4d007d123547190927048849aaf82 (diff) |
From Peter Harris:
An enum name collision was recently added to the upstream XCB/proto.
Avoid the collision by putting enum names into their proper namespace.
After applying that, regenerate the X11 dissector.
svn path=/trunk/; revision=41514
Diffstat (limited to 'epan/dissectors/x11-enum.h')
-rw-r--r-- | epan/dissectors/x11-enum.h | 164 |
1 files changed, 94 insertions, 70 deletions
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h index 889f981efa..e259353779 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.6-26-gfb2af7c */ + using xcbproto version 1.7-3-g12cb81c */ /* $Id$ */ /* @@ -25,19 +25,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -static const value_string x11_enum_PictType[] = { +static const value_string x11_enum_render_PictType[] = { { 0, "Indexed" }, { 1, "Direct" }, { 0, NULL }, }; -static const value_string x11_enum_Redirect[] = { +static const value_string x11_enum_composite_Redirect[] = { { 0, "Automatic" }, { 1, "Manual" }, { 0, NULL }, }; -static const value_string x11_enum_ReportLevel[] = { +static const value_string x11_enum_damage_ReportLevel[] = { { 0, "RawRectangles" }, { 1, "DeltaRectangles" }, { 2, "BoundingBox" }, @@ -45,12 +45,12 @@ static const value_string x11_enum_ReportLevel[] = { { 0, NULL }, }; -static const value_string x11_enum_Region[] = { +static const value_string x11_enum_xfixes_Region[] = { { 0, "None" }, { 0, NULL }, }; -static const value_string x11_enum_DPMSMode[] = { +static const value_string x11_enum_dpms_DPMSMode[] = { { 0, "On" }, { 1, "Standby" }, { 2, "Suspend" }, @@ -58,7 +58,7 @@ static const value_string x11_enum_DPMSMode[] = { { 0, NULL }, }; -static const value_string x11_enum_Attachment[] = { +static const value_string x11_enum_dri2_Attachment[] = { { 0, "BufferFrontLeft" }, { 1, "BufferBackLeft" }, { 2, "BufferFrontRight" }, @@ -69,15 +69,24 @@ static const value_string x11_enum_Attachment[] = { { 7, "BufferFakeFrontLeft" }, { 8, "BufferFakeFrontRight" }, { 9, "BufferDepthStencil" }, + { 10, "BufferHiz" }, { 0, NULL }, }; -static const value_string x11_enum_DriverType[] = { +static const value_string x11_enum_dri2_DriverType[] = { { 0, "DRI" }, + { 1, "VDPAU" }, { 0, NULL }, }; -static const value_string x11_enum_SetConfig[] = { +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" }, @@ -85,7 +94,7 @@ static const value_string x11_enum_SetConfig[] = { { 0, NULL }, }; -static const value_string x11_enum_SubPixel[] = { +static const value_string x11_enum_render_SubPixel[] = { { 0, "Unknown" }, { 1, "HorizontalRGB" }, { 2, "HorizontalBGR" }, @@ -95,26 +104,26 @@ static const value_string x11_enum_SubPixel[] = { { 0, NULL }, }; -static const value_string x11_enum_Connection[] = { +static const value_string x11_enum_randr_Connection[] = { { 0, "Connected" }, { 1, "Disconnected" }, { 2, "Unknown" }, { 0, NULL }, }; -static const value_string x11_enum_PropMode[] = { +static const value_string x11_enum_xproto_PropMode[] = { { 0, "Replace" }, { 1, "Prepend" }, { 2, "Append" }, { 0, NULL }, }; -static const value_string x11_enum_GetPropertyType[] = { +static const value_string x11_enum_xproto_GetPropertyType[] = { { 0, "Any" }, { 0, NULL }, }; -static const value_string x11_enum_Atom[] = { +static const value_string x11_enum_xproto_Atom[] = { { 0, "Any" }, { 1, "PRIMARY" }, { 2, "SECONDARY" }, @@ -187,20 +196,20 @@ static const value_string x11_enum_Atom[] = { { 0, NULL }, }; -static const value_string x11_enum_Property[] = { +static const value_string x11_enum_xproto_Property[] = { { 0, "NewValue" }, { 1, "Delete" }, { 0, NULL }, }; -static const value_string x11_enum_Notify[] = { +static const value_string x11_enum_randr_Notify[] = { { 0, "CrtcChange" }, { 1, "OutputChange" }, { 2, "OutputProperty" }, { 0, NULL }, }; -static const value_string x11_enum_PictOp[] = { +static const value_string x11_enum_render_PictOp[] = { { 0, "Clear" }, { 1, "Src" }, { 2, "Dst" }, @@ -239,22 +248,37 @@ static const value_string x11_enum_PictOp[] = { { 41, "ConjointAtop" }, { 42, "ConjointAtopReverse" }, { 43, "ConjointXor" }, - { 0, NULL }, -}; - -static const value_string x11_enum_Picture[] = { + { 48, "Multiply" }, + { 49, "Screen" }, + { 50, "Overlay" }, + { 51, "Darken" }, + { 52, "Lighten" }, + { 53, "ColorDodge" }, + { 54, "ColorBurn" }, + { 55, "HardLight" }, + { 56, "SoftLight" }, + { 57, "Difference" }, + { 58, "Exclusion" }, + { 59, "HSLHue" }, + { 60, "HSLSaturation" }, + { 61, "HSLColor" }, + { 62, "HSLLuminosity" }, + { 0, NULL }, +}; + +static const value_string x11_enum_render_Picture[] = { { 0, "None" }, { 0, NULL }, }; -static const value_string x11_enum_SK[] = { +static const value_string x11_enum_shape_SK[] = { { 0, "Bounding" }, { 1, "Clip" }, { 2, "Input" }, { 0, NULL }, }; -static const value_string x11_enum_SO[] = { +static const value_string x11_enum_shape_SO[] = { { 0, "Set" }, { 1, "Union" }, { 2, "Intersect" }, @@ -263,7 +287,7 @@ static const value_string x11_enum_SO[] = { { 0, NULL }, }; -static const value_string x11_enum_ClipOrdering[] = { +static const value_string x11_enum_xproto_ClipOrdering[] = { { 0, "Unsorted" }, { 1, "YSorted" }, { 2, "YXSorted" }, @@ -271,18 +295,18 @@ static const value_string x11_enum_ClipOrdering[] = { { 0, NULL }, }; -static const value_string x11_enum_Pixmap[] = { +static const value_string x11_enum_xproto_Pixmap[] = { { 0, "None" }, { 0, NULL }, }; -static const value_string x11_enum_VALUETYPE[] = { +static const value_string x11_enum_sync_VALUETYPE[] = { { 0, "Absolute" }, { 1, "Relative" }, { 0, NULL }, }; -static const value_string x11_enum_TESTTYPE[] = { +static const value_string x11_enum_sync_TESTTYPE[] = { { 0, "PositiveTransition" }, { 1, "NegativeTransition" }, { 2, "PositiveComparison" }, @@ -290,44 +314,44 @@ static const value_string x11_enum_TESTTYPE[] = { { 0, NULL }, }; -static const value_string x11_enum_ALARMSTATE[] = { +static const value_string x11_enum_sync_ALARMSTATE[] = { { 0, "Active" }, { 1, "Inactive" }, { 2, "Destroyed" }, { 0, NULL }, }; -static const value_string x11_enum_SaveSetMode[] = { +static const value_string x11_enum_xfixes_SaveSetMode[] = { { 0, "Insert" }, { 1, "Delete" }, { 0, NULL }, }; -static const value_string x11_enum_SaveSetTarget[] = { +static const value_string x11_enum_xfixes_SaveSetTarget[] = { { 0, "Nearest" }, { 1, "Root" }, { 0, NULL }, }; -static const value_string x11_enum_SaveSetMapping[] = { +static const value_string x11_enum_xfixes_SaveSetMapping[] = { { 0, "Map" }, { 1, "Unmap" }, { 0, NULL }, }; -static const value_string x11_enum_SelectionEvent[] = { +static const value_string x11_enum_xfixes_SelectionEvent[] = { { 0, "SetSelectionOwner" }, { 1, "SelectionWindowDestroy" }, { 2, "SelectionClientClose" }, { 0, NULL }, }; -static const value_string x11_enum_CursorNotify[] = { +static const value_string x11_enum_xfixes_CursorNotify[] = { { 0, "DisplayCursor" }, { 0, NULL }, }; -static const value_string x11_enum_DeviceUse[] = { +static const value_string x11_enum_xinput_DeviceUse[] = { { 0, "IsXPointer" }, { 1, "IsXKeyboard" }, { 2, "IsXExtensionDevice" }, @@ -336,7 +360,7 @@ static const value_string x11_enum_DeviceUse[] = { { 0, NULL }, }; -static const value_string x11_enum_InputClass[] = { +static const value_string x11_enum_xinput_InputClass[] = { { 0, "Key" }, { 1, "Button" }, { 2, "Valuator" }, @@ -347,13 +371,13 @@ static const value_string x11_enum_InputClass[] = { { 0, NULL }, }; -static const value_string x11_enum_ValuatorMode[] = { +static const value_string x11_enum_xinput_ValuatorMode[] = { { 0, "Relative" }, { 1, "Absolute" }, { 0, NULL }, }; -static const value_string x11_enum_GrabStatus[] = { +static const value_string x11_enum_xproto_GrabStatus[] = { { 0, "Success" }, { 1, "AlreadyGrabbed" }, { 2, "InvalidTime" }, @@ -362,29 +386,29 @@ static const value_string x11_enum_GrabStatus[] = { { 0, NULL }, }; -static const value_string x11_enum_PropagateMode[] = { +static const value_string x11_enum_xinput_PropagateMode[] = { { 0, "AddToList" }, { 1, "DeleteFromList" }, { 0, NULL }, }; -static const value_string x11_enum_Time[] = { +static const value_string x11_enum_xproto_Time[] = { { 0, "CurrentTime" }, { 0, NULL }, }; -static const value_string x11_enum_GrabMode[] = { +static const value_string x11_enum_xproto_GrabMode[] = { { 0, "Sync" }, { 1, "Async" }, { 0, NULL }, }; -static const value_string x11_enum_Grab[] = { +static const value_string x11_enum_xproto_Grab[] = { { 0, "Any" }, { 0, NULL }, }; -static const value_string x11_enum_DeviceInputMode[] = { +static const value_string x11_enum_xinput_DeviceInputMode[] = { { 0, "AsyncThisDevice" }, { 1, "SyncThisDevice" }, { 2, "ReplayThisDevice" }, @@ -394,7 +418,7 @@ static const value_string x11_enum_DeviceInputMode[] = { { 0, NULL }, }; -static const value_string x11_enum_InputFocus[] = { +static const value_string x11_enum_xproto_InputFocus[] = { { 0, "None" }, { 1, "PointerRoot" }, { 2, "Parent" }, @@ -402,19 +426,19 @@ static const value_string x11_enum_InputFocus[] = { { 0, NULL }, }; -static const value_string x11_enum_MappingStatus[] = { +static const value_string x11_enum_xproto_MappingStatus[] = { { 0, "Success" }, { 1, "Busy" }, { 2, "Failure" }, { 0, NULL }, }; -static const value_string x11_enum_Window[] = { +static const value_string x11_enum_xproto_Window[] = { { 0, "None" }, { 0, NULL }, }; -static const value_string x11_enum_NotifyDetail[] = { +static const value_string x11_enum_xproto_NotifyDetail[] = { { 0, "Ancestor" }, { 1, "Virtual" }, { 2, "Inferior" }, @@ -426,7 +450,7 @@ static const value_string x11_enum_NotifyDetail[] = { { 0, NULL }, }; -static const value_string x11_enum_NotifyMode[] = { +static const value_string x11_enum_xproto_NotifyMode[] = { { 0, "Normal" }, { 1, "Grab" }, { 2, "Ungrab" }, @@ -434,35 +458,35 @@ static const value_string x11_enum_NotifyMode[] = { { 0, NULL }, }; -static const value_string x11_enum_AXFBOpt[] = { +static const value_string x11_enum_xkb_AXFBOpt[] = { { 0, NULL }, }; -static const value_string x11_enum_AXSKOpt[] = { +static const value_string x11_enum_xkb_AXSKOpt[] = { { 0, NULL }, }; -static const value_string x11_enum_IMFlag[] = { +static const value_string x11_enum_xkb_IMFlag[] = { { 0, NULL }, }; -static const value_string x11_enum_IMGroupsWhich[] = { +static const value_string x11_enum_xkb_IMGroupsWhich[] = { { 0, NULL }, }; -static const value_string x11_enum_SetOfGroup[] = { +static const value_string x11_enum_xkb_SetOfGroup[] = { { 0, NULL }, }; -static const value_string x11_enum_IMModsWhich[] = { +static const value_string x11_enum_xkb_IMModsWhich[] = { { 0, NULL }, }; -static const value_string x11_enum_BoolCtrl[] = { +static const value_string x11_enum_xkb_BoolCtrl[] = { { 0, NULL }, }; -static const value_string x11_enum_DoodadType[] = { +static const value_string x11_enum_xkb_DoodadType[] = { { 1, "Outline" }, { 2, "Solid" }, { 3, "Text" }, @@ -471,13 +495,13 @@ static const value_string x11_enum_DoodadType[] = { { 0, NULL }, }; -static const value_string x11_enum_LedClass[] = { +static const value_string x11_enum_xkb_LedClass[] = { { 768, "DfltXIClass" }, { 1280, "AllXIClasses" }, { 0, NULL }, }; -static const value_string x11_enum_ID[] = { +static const value_string x11_enum_xkb_ID[] = { { 256, "UseCoreKbd" }, { 512, "UseCorePtr" }, { 768, "DfltXIClass" }, @@ -488,7 +512,7 @@ static const value_string x11_enum_ID[] = { { 0, NULL }, }; -static const value_string x11_enum_SAType[] = { +static const value_string x11_enum_xkb_SAType[] = { { 0, "NoAction" }, { 1, "SetMods" }, { 2, "LatchMods" }, @@ -513,7 +537,7 @@ static const value_string x11_enum_SAType[] = { { 0, NULL }, }; -static const value_string x11_enum_SAValWhat[] = { +static const value_string x11_enum_xkb_SAValWhat[] = { { 0, "IgnoreVal" }, { 1, "SetValMin" }, { 2, "SetValCenter" }, @@ -523,15 +547,15 @@ static const value_string x11_enum_SAValWhat[] = { { 0, NULL }, }; -static const value_string x11_enum_EventType[] = { +static const value_string x11_enum_xkb_EventType[] = { { 0, NULL }, }; -static const value_string x11_enum_MapPart[] = { +static const value_string x11_enum_xkb_MapPart[] = { { 0, NULL }, }; -static const value_string x11_enum_Group[] = { +static const value_string x11_enum_xkb_Group[] = { { 0, "1" }, { 1, "2" }, { 2, "3" }, @@ -539,43 +563,43 @@ static const value_string x11_enum_Group[] = { { 0, NULL }, }; -static const value_string x11_enum_BellClassResult[] = { +static const value_string x11_enum_xkb_BellClassResult[] = { { 0, "KbdFeedbackClass" }, { 5, "BellFeedbackClass" }, { 0, NULL }, }; -static const value_string x11_enum_LedClassResult[] = { +static const value_string x11_enum_xkb_LedClassResult[] = { { 0, "KbdFeedbackClass" }, { 4, "LedFeedbackClass" }, { 0, NULL }, }; -static const value_string x11_enum_ImageFormatInfoType[] = { +static const value_string x11_enum_xv_ImageFormatInfoType[] = { { 0, "RGB" }, { 1, "YUV" }, { 0, NULL }, }; -static const value_string x11_enum_ImageOrder[] = { +static const value_string x11_enum_xproto_ImageOrder[] = { { 0, "LSBFirst" }, { 1, "MSBFirst" }, { 0, NULL }, }; -static const value_string x11_enum_ImageFormatInfoFormat[] = { +static const value_string x11_enum_xv_ImageFormatInfoFormat[] = { { 0, "Packed" }, { 1, "Planar" }, { 0, NULL }, }; -static const value_string x11_enum_ScanlineOrder[] = { +static const value_string x11_enum_xv_ScanlineOrder[] = { { 0, "TopToBottom" }, { 1, "BottomToTop" }, { 0, NULL }, }; -static const value_string x11_enum_VideoNotifyReason[] = { +static const value_string x11_enum_xv_VideoNotifyReason[] = { { 0, "Started" }, { 1, "Stopped" }, { 2, "Busy" }, @@ -584,7 +608,7 @@ static const value_string x11_enum_VideoNotifyReason[] = { { 0, NULL }, }; -static const value_string x11_enum_GrabPortStatus[] = { +static const value_string x11_enum_xv_GrabPortStatus[] = { { 0, "Success" }, { 1, "BadExtension" }, { 2, "AlreadyGrabbed" }, |