summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-12-20libXi 1.4.5libXi-1.4.5libXi-1.4-branchPeter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-12-20Don't use the protocol defines for 2.0 versioning.Peter Hutterer1-1/+1
Otherwise we run into the old problem again: recompiling libXi against newer inputproto headers will appear to change the version support, potentially causing errors or other misbehaviours. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit ca73cd3b7630e7eb7d26c61c4af10d35dbce5465)
2011-12-16libXi 1.4.4libXi-1.4.4Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-12-16Fix duplicate sizeof in copy_classesPeter Hutterer1-2/+2
sizeof(bla * sizeof()) is'nt right. Plus add some () to the next_block call too to emphasise that *nclasses is the multiplicator. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 6d6ae8fc8b9620bf864ac7dff8d818573eee3e4f)
2011-12-16man: passive grabs return the number of failed modifier combinationsPeter Hutterer2-2/+18
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 323730f7fa70190d2ea00e62c6964fee524ca430)
2011-12-16man: XIGrabButton returns error codes, not status codesPeter Hutterer1-2/+2
Reword slightly that the returned value is the error code for this particular grab. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 5189df57e18c79327848fb117a8ede59868c8fdb)
2011-12-16man: fix #include for XIGrabButtonPeter Hutterer1-1/+1
Reported-by: Matthias Clasen <mclasen@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 05aaf65b3b6b7dc7268137ce4ee516f08eefb62f)
2011-12-16Handle unknown device classes.Peter Hutterer2-11/+23
If the server sends an unknown device class in response to an XIQueryDevice call, no memory is allocated for these classes but we still write type and sourceid as well as setting to->classes[i]. The latter causes multiple classes to point to the same memory field. Move the common code of assigning these three into the respective class type handlers so to automatically skip any unknown classes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 91f928a70246c26cbee00bf59a8e318e9317142e)
2011-12-16man: fix typo in XIQueryDevice man pagePeter Hutterer1-1/+1
struct name is XIValuatorClassInfo. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 14f674296bc23b3cd50f6d302c3064250132c2c1)
2011-12-16man: Fix formatting in XGetFeedbackControlPeter Hutterer1-27/+28
Indent structs to make them more readable, make "Structures" header an actual header. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 653b45b7cc275a560c1ea213216a908c125e443d)
2011-06-07libXi 1.4.3libXi-1.4.3Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-07man: Fix typo in XIChangePropertyPeter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 938ef832b892fdefe0d5c2bb4510c91bbbccca9f)
2011-06-07man: Fix wrong event names in XIGrabButton.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 597a6a51721d30c4354d1133bb6da6bd2e12446e)
2011-06-07Use Data, not Data32 in XIPassiveGrabDevicePeter Hutterer1-2/+2
Data32 takes and iterates over an array of longs, thus skipping every 4 bytes on LP64. Here we only have arrays of ints, use the normal Data macro instead. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 9faab2bc0bdd4d98a04e572a7a5201bfcd3bdc70)
2011-06-07man: fix missing comma in XIGrabEnter man pagePeter Hutterer1-1/+1
(cherry picked from commit 67441d30df756eb715a262d3439865dedd4055e8)
2011-06-07man: fix typo, layout in XGetExtensionVersion.manPeter Hutterer1-5/+6
Fix a typo and move from MPX to XI2. Add a linebreak to make the depreciation separate from the function description. Changes in the second paragraph are just realignment due to the linebreak. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit aa2432240ad02c54280f2d11c007969c3eb9b79f)
2011-06-07XIChangeHierarchy: Return Success early if no actual changes are requested.Peter Hutterer2-1/+5
Do the same for negative num_changes. Found by static analyzer. Reported-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit cc6feecae23b321952921cf927bc965386844c8c)
2011-06-07Allocate enough memory for raw events + extra data.Peter Hutterer1-1/+1
Necessary space was calculated, but not actually used to allocate memory. As a result, valuator data would overwrite the allocated memory. ==4166== Invalid write of size 1 ==4166== at 0x4C29F04: memcpy (mc_replace_strmem.c:497) ==4166== by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0) ==4166== by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0) ==4166== by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0) ==4166== by 0x49C3E3: process_key (x11_be.c:1065) ==4166== by 0x49EA5C: event_key_release (x11_be.c:2201) ==4166== by 0x49DD6E: x11_be_process_events (x11_be.c:1892) ==4166== by 0x4A38F4: x11_be_main_loop (x11_be.c:4353) ==4166== by 0x4A39E1: x11_be_thread_main (x11_be.c:4385) ==4166== by 0x87549C9: start_thread (pthread_create.c:300) ==4166== by 0x8A516FC: clone (clone.S:112) ==4166== Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd ==4166== at 0x4C284A8: malloc (vg_replace_malloc.c:236) ==4166== by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0) ==4166== by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0) ==4166== by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0) ==4166== by 0x49C3E3: process_key (x11_be.c:1065) ==4166== by 0x49EA5C: event_key_release (x11_be.c:2201) ==4166== by 0x49DD6E: x11_be_process_events (x11_be.c:1892) ==4166== by 0x4A38F4: x11_be_main_loop (x11_be.c:4353) ==4166== by 0x4A39E1: x11_be_thread_main (x11_be.c:4385) ==4166== by 0x87549C9: start_thread (pthread_create.c:300) Reported-by: Roger Cruz <roger.cruz@virtualcomputer.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit af65475b1f6b7209750220a74aaad9968d54aaf7)
2011-06-07Fix XISelectEvents on 64 bits, strict alignement architectures.Matthieu Herrb1-1/+1
Use Data() to send the struct xXIEventMask on the wire instead of Data32() which expects a pointer to a 64bits value on LP64 architectures. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 18177afd4fb3934d0a9083c599fb96701eec2ad9)
2011-03-18configure.ac: 1.4.2libXi-1.4.2Jeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-17Force alignment with sizeof(Atom) for XIButtonClassInfoPeter Hutterer1-4/+14
The memory layout of an XIButtonClassInfo is [struct XIButtonClassInfo][mask][labels] With the mask being currently 4-byte aligned and labels a list of Atoms. On LP64, Atoms are 8 byte, leading to unaligned access for some mask lengths. Force the alignment to be sizeof(Atom). Reported-by: Christian Weisgerber <naddy@mips.inka.de> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Christian Weisgerber <naddy@mips.inka.de> Reviewed-by: Adam Jackson <ajax@redhat.com>
2011-03-08Don't discard extra data for passive grabs.Peter Hutterer1-1/+1
Failed modifier data was discarded, causing assertions inside xcb. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-03-08man: describe return value for XI2 passive grabbing calls.Peter Hutterer2-0/+12
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-03-03Rename XSetCPtr.c to XISetCPtr.c.Peter Hutterer2-2/+2
XISetClientPointer is an XI2.0 call and should be named accordingly. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-03-03Require XI 2 for all XI 2 calls.Peter Hutterer13-19/+19
Each XI2 call should check _XiCheckExtInit for XI version 2.0 or higher. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-02-23Fix typo in comment.Peter Hutterer1-1/+1
Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-23Fix invalid read in XIGrabDevice.Peter Hutterer1-2/+2
Miscalculation of length caused Data() to memcpy too many bytes. ==2865== Invalid read of size 1 ==2865== at 0x4A07480: memcpy (mc_replace_strmem.c:602) ==2865== by 0x544271E: XIGrabDevice (XIGrabDevice.c:69) ==2865== by 0x400B0A: main (gnome642481.c:56) ==2865== Address 0x642f614 is 0 bytes after a block of size 20 alloc'd ==2865== at 0x4A04896: calloc (vg_replace_malloc.c:418) ==2865== by 0x54425D3: XIGrabDevice (XIGrabDevice.c:65) ==2865== by 0x400B0A: main (gnome642481.c:56) SetReqLen() expects 4-byte units. Data() expects bytes. Gnome Bug 642481 <https://bugzilla.gnome.org/show_bug.cgi?id=642481> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-23Mark sourceid in Raw events as bug and force to 0..Peter Hutterer2-1/+2
The protocol does not provide a source ID for raw events, so this value is always 0. It shouldn't really be there, but the past is so hard to change. Reported-by: Mark Dokter <dokter@icg.tugraz.at> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-23man: note that callers of XIQueryPointer must free the button mask.Peter Hutterer1-0/+3
buttons_return->mask is allocated by the library and must be freed by the caller to avoid leaking. Reported-by: Matthias Clasen <mclasen@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-02config: comment, minor upgrade, quote and layout configure.acGaetan Nadon1-16/+18
Group statements per section as per Autoconf standard layout Quote statements where appropriate. Autoconf recommends not using dnl instead of # for comments Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. Use AC_PROG_LIBTOOL to replace the deprecated AM_PROG_LIBTOOL Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS Remove redundant AC_PROG_MAKE_SET included with AM_INIT_AUTOMAKE Remove redundant AC_CANONICAL_HOST included in XORG_DEFAULT_OPTIONS Add AC_CONFIG_SRCDIR([Makefile.am]) where missing Update minimum version of util-macros to at least 1.8. One or more of the above actions were applied No functional configuration changes This helps automated maintenance and release activities. Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-28config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERSGaetan Nadon1-1/+1
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-28config: remove already included AC_PROG_SED statementGaetan Nadon1-1/+0
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Use the appropriate platform version of sed Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-27config: remove AC_PROG_CC as it overrides AC_PROG_C_C99Gaetan Nadon1-1/+0
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_C_C99. This sets gcc with -std=gnu99. If AC_PROG_CC macro is called afterwards, it resets CC to gcc. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-26libXi 1.4.1libXi-1.4.1Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-26Fill in mods/group->effective in XIQueryPointer()Carlos Garnacho1-0/+3
the other XIModifierState/XIGroupState fields are being set correctly, but the "effective" field was being left as undefined memory. Signed-off-by: Carlos Garnacho <carlosg@gnome.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-01-11Fix passive grabs.Philipp Reh1-1/+1
_XIPassiveGrabDevice, which is called by alle the passive grab functions, wrongly returns an error when it shouldn't. The attached patch adds the missing "not" to properly test the error condition of _XReply. Signed-off-by: Philipp Reh <sefi@s-e-f-i.de> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-12-16Use docbookx.dtd version 4.3 for all docsPaulo Zanoni1-2/+2
Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-12-14WireToEvent: Set display member of all events as wellDaniel Stone1-0/+5
All events were getting random uninitialised garbage for display; fix that. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-11-09config: HTML file generation: use the installed copy of xorg.cssGaetan Nadon4-14/+4
Currenlty the xorg.css file is copied in each location where a DocBook/XML file resides. This produces about 70 copies in the $(docdir) install tree. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-11-03libXi 1.4libXi-1.4.0Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-11-03man: XGetDeviceProperty(3) has no parameter 'pending'.Peter Hutterer1-5/+0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-10-06Purge cvs tags.Jesse Adkins1-2/+0
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-07Fix typo when converting raw events from the wire.Carlos Garnacho1-1/+1
The raw values were being miscalculated, containing only the integral part of the FP3232, meanwhile normal valuators were mistakenly added the fractional part of its corresponding raw value. Signed-off-by: Carlos Garnacho <carlosg@gnome.org> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-03man: fix typo in XIQueryDevice docJulien Cristau1-3/+3
Don't pretend this is XIQueryPointer. Debian bug#598964 Reported-by: Joachim Breitner <nomeata@debian.org> Signed-off-by: Julien Cristau <jcristau@debian.org>
2010-08-26Fix build with gcc 2.95Matthieu Herrb1-1/+1
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-08-26man: improve readability of XAllowDeviceEvents.Peter Hutterer1-28/+28
Parse the options to event-mode as a list. This requires un-indenting the rest, otherwise the asciidoc/xmlto conversion will indent the trailing paragraphs more than the list Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-08-16man: add $(AM_V_GEN) for silent rules where missingGaetan Nadon1-6/+6
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-16man: whitespace managementGaetan Nadon1-72/+72
This style should make it easier to read filenames in a large list. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-16man: Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONSGaetan Nadon1-13/+3
The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-08-16man: add/change comments regarding the 3 step conversion from text sourceGaetan Nadon1-5/+12
In the hope of making it easier to learn. This makefile may serve as a reference. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 16:36:50 +0000