diff options
| -rw-r--r-- | include/X11/extensions/XInput2.h | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/XExtInt.c | 1 | ||||
| -rw-r--r-- | src/XIFreeEvent.c | 53 |
4 files changed, 57 insertions, 1 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index cbc7fcc..60138b1 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -287,6 +287,7 @@ extern XIDeviceInfo* XIQueryDevice( ); extern void XIFreeDeviceInfo(XIDeviceInfo *info); +extern void XIFreeEventData(XIEvent *ev); _XFUNCPROTOEND diff --git a/src/Makefile.am b/src/Makefile.am index d37cd81..b1ad736 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,8 @@ libXi_la_SOURCES = \ XISelEv.c \ XIint.h \ XIQueryVersion.c \ - XIQueryDevice.c + XIQueryDevice.c \ + XIFreeEvent.c libXi_la_LIBADD = $(XI_LIBS) diff --git a/src/XExtInt.c b/src/XExtInt.c index 99d80ab..b9f10fe 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -869,6 +869,7 @@ static int count_bits(unsigned char* ptr, int len) return bits; } +/* Keep this in sync with XIFreeEventData() */ static int wireToDeviceEvent(xXIDeviceEvent *in, XIDeviceEvent* out) { diff --git a/src/XIFreeEvent.c b/src/XIFreeEvent.c new file mode 100644 index 0000000..2dd0100 --- /dev/null +++ b/src/XIFreeEvent.c @@ -0,0 +1,53 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#include <X11/Xlibint.h> +#include <X11/extensions/XInput2.h> + +/** + * Free memory associated with the given event, but not the event itself. + */ +void +XIFreeEventData(XIEvent *event) +{ + if (event->type != GenericEvent) + return; + + switch(event->evtype) + { + case XI_Motion: + case XI_ButtonPress: + case XI_ButtonRelease: + case XI_KeyPress: + case XI_KeyRelease: + { + XIDeviceEvent *ev = (XIDeviceEvent*)event; + free(ev->buttons); + free(ev->valuators); + free(ev->mods); + free(ev->group); + } + break; + } +} |