aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/x11-extension-implementation.h
AgeCommit message (Collapse)AuthorFilesLines
2015-10-20X11 generator: avoid extraneous parens in conditionals.Jeff Morriss1-182/+182
This is to avoid complaints from clang of the form: wireshark/epan/dissectors/x11-extension-implementation.h:17021:18: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if ((f_class_id == 0)) { ~~~~~~~~~~~^~~~ Change-Id: I91d629ad47677b71909d7da517c4a6198c276186 Reviewed-on: https://code.wireshark.org/review/11186 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-19x11: update X11 from last mesa and xcbAlexis La Goutte1-150/+1092
Change-Id: Ic3567b4789385a29bb420fba5c56bd5fecbb6a22 Reviewed-on: https://code.wireshark.org/review/11114 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-106/+106
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the *other* generator for the X11 header files; we manually fix the file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: I3dd46025b2ae461e63034b36ab11cdbc9380b696 Reviewed-on: https://code.wireshark.org/review/8263 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-22Regenerate the X11 dissector with the latest mesa, xcb, and process-x11-xcb.plJeff Morriss1-108/+111
Change-Id: Ie05f9b780011b215ca3ad3293b3daefbcbee68ce Reviewed-on: https://code.wireshark.org/review/3789 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-12X11: Update generated dissectorPeter Harris1-20/+28
Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198 Signed-off-by: Peter Harris <pharris@opentext.com> Reviewed-on: https://code.wireshark.org/review/2148 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-1/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-19Some patches from Peter Harris:Jeff Morriss1-6/+51
[PATCH 1/5] X11 dissector: Sort declarations This prevents pointless changes showing up in the diff when evaluating unrelated changes to the generator. See http://search.cpan.org/dist/perl-5.18.0/pod/perldelta.pod#Hash_randomization [PATCH 2/5] X11 dissector: Silence warnings on perl 5.18, prevent 5.20 Perl 5.18 retroactively marked "given/when" experimental, with a promise to remove or dramatically change it in 5.20. Since there is no perl 5.20 yet, there is no way to make this script compatible with it. [PATCH 3/5] X11 dissector: Support variable_param (at least for glCallLists) (This patch makes the change in r54232 unnecessary by using the previously- unused variable.) [PATCH 4/5] X11 dissector: Remove obsolete TODO item This item was done in r53531 PATCH 09/11 svn path=/trunk/; revision=54242
2013-12-18Regenerate the X11 dissector in order to pick up the change from r54232. ↵Jeff Morriss1-1/+1
Also update to the latest mesa (though this resulted in no changes). svn path=/trunk/; revision=54240
2013-11-24Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.Jeff Morriss1-1/+1
Also, as per Peter Harris' request, update copyright date. svn path=/trunk/; revision=53545
2013-11-24Some patches from Peter Harris to make it possible to build the X11 dissectorJeff Morriss1-8384/+5013
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
2013-11-13Wrap GCC pragma in an #ifdef to make it compile when we're not using GCC.Jeff Morriss1-0/+2
Again, change manually applied to the .h file. svn path=/trunk/; revision=53299
2013-11-13Use a gcc pragma to stop the (pages of) warnings coming out ofJeff Morriss1-0/+2
x11-extensions-implementation.h . This change was manually applied to the .h file as I can't currently rebuild the X11 dissector. svn path=/trunk/; revision=53298
2013-09-08Add filterable expert info to generated X11 dissector. I didn't regenerate ↵Michael Mann1-1/+1
the dissector files, but did manually update the source (tools/process-x11-xcb.pl) so any future regeneration won't lose the changes. svn path=/trunk/; revision=51834
2013-02-23Update x11-dissectors with last mesa trunk ( snb-magic-14719-g2fa9e4c ) and ↵Alexis La Goutte1-454/+670
xcbproto trunk ( 1.8-2-gc0d65da ) svn path=/trunk/; revision=47837
2012-05-12A routine that processes a struct_XXX() won't necessarily use itsGuy Harris1-103/+103
encoding argument; mark it as (potentially) unused. svn path=/trunk/; revision=42609
2012-05-12Get rid of remaining Booleans-as-encoding-arguments inGuy Harris1-8601/+8601
proto_tree_add_item() calls. Updated tools/process-x11-xcb.pl to support different encoding values for different fields. Replaced the "little_endian" Boolean value with a "byte_order" value containing the setting of the byte-order ENC_ bit. Regenerated X11 fields from current x.org git. svn path=/trunk/; revision=42601
2012-03-13From Peter Harris:Jeff Morriss1-165/+574
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
2011-05-14Rebuild the X11 dissector with the latest versions of xcbproto and mesa.Jeff Morriss1-9/+133
svn path=/trunk/; revision=37145
2010-06-03From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :Jeff Morriss1-11/+12
Mesa moved its API description file again. Also, while I'm here, I noticed that they stopped using signed tags, so add --tags to "git describe" for a better description of the mesa version used to build the X11 dissector. svn path=/trunk/; revision=33067
2010-04-20From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :Jeff Morriss1-15/+7728
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
2009-10-03From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4067 :Jeff Morriss1-365/+447
This patch adds enum support to x11-process-xcb.pl svn path=/trunk/; revision=30257
2009-09-12Move all of the scripts in epan/dissectors/ to tools/ .Jeff Morriss1-1/+1
Add a target ("x11-dissector") to build the X11 dissector. Put the X11-related files (back) in the source distribution. svn path=/trunk/; revision=29871
2009-09-11From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2981 :Jeff Morriss1-3/+4
Put the git version of mesa and xcbproto in the generated header files. From me: Don't use 'which' to find git--it wouldn't work on Windows. svn path=/trunk/; revision=29865
2009-09-11When pre-declaring variables, use the right type.Jeff Morriss1-17/+17
svn path=/trunk/; revision=29856
2009-09-11From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2981 :Jeff Morriss1-0/+21965
This patch adds extension support to the X11 dissector. I've removed the perl script from the make file, since the new one depends on perl 5.10, xcbproto (at least git as of today), and mesa (at least the mesa/src/mesa/glapi directory). It seemed easier to just add the generated header files to svn directly. svn path=/trunk/; revision=29854