aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x11.c
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2008-10-24 18:45:03 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2008-10-24 18:45:03 +0000
commit72a1dee137aea5edd43db1bec9940815ca7e7814 (patch)
tree5cb3e1c353a6b2507462b2fc4318b2e658c1568e /epan/dissectors/packet-x11.c
parent76e85936c3f86d7ada7981b9d761790f8dc16aa2 (diff)
From Tom Hughes:
The attached patch extends the X11 protocol dissector to decode MappingNotify events. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26540 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-x11.c')
-rw-r--r--epan/dissectors/packet-x11.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 420a8f95dd..ca0dd5d21b 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -575,6 +575,13 @@ static const value_string visibility_state_vals[] = {
{ 0, NULL }
};
+static const value_string mapping_request_vals[] = {
+ { 0, "MappingModifier" },
+ { 1, "MappingKeyboard" },
+ { 2, "MappingPointer" },
+ { 0, NULL }
+};
+
/* Requestcodes. From <X11/Xproto.h>. */
#define X_CreateWindow 1
#define X_ChangeWindowAttributes 2
@@ -5215,6 +5222,14 @@ dissect_x11_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
case MappingNotify:
+ UNUSED(1);
+ CARD16(event_sequencenumber);
+ ENUM8(mapping_request);
+ CARD8(first_keycode);
+ CARD8(count);
+ UNUSED(25);
+ break;
+
default:
break;
}