ChangeLog revision b60292e0
1b60292e0Smrgcommit 2abe23d23d3755335c10ff573e4e1f93b682e9d9 2b60292e0SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 3b60292e0SmrgDate: Fri Jun 8 09:10:03 2018 +1000 4b60292e0Smrg 5b60292e0Smrg xkbcomp 1.4.2 6b60292e0Smrg 7b60292e0Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 8b60292e0Smrg 9b60292e0Smrgcommit 5bc2849273a224a2df593b7e8df31f0bde666482 10b60292e0SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 11b60292e0SmrgDate: Thu Jun 7 11:25:01 2018 +1000 12b60292e0Smrg 13b60292e0Smrg Ignore xkb_keycodes.maximum of > 255 14b60292e0Smrg 15b60292e0Smrg Continuation from 7fdfabd75 "keycodes: Ignore high keycodes" 16b60292e0Smrg 17b60292e0Smrg A keymap with a key > 255 will have a xkb_keycodes.maximum of that keycode. 18b60292e0Smrg Let's not throw a fatal error on that, just crop it back to the maximum of 19b60292e0Smrg 255. This doesn't set the "high_keycode_warned" on purpose so we get this for 20b60292e0Smrg the first key that actually matters. 21b60292e0Smrg 22b60292e0Smrg Reproducible with xkeyboard-config 2.24 which has a maximum of 374. 23b60292e0Smrg 24b60292e0Smrg https://bugzilla.redhat.com/show_bug.cgi?id=1587998 25b60292e0Smrg 26b60292e0Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 27b60292e0Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 28b60292e0Smrg 295c4ee2b5Smrgcommit 34842845b191082fd1cfff3b7038332cdcadb825 305c4ee2b5SmrgAuthor: Adam Jackson <ajax@redhat.com> 315c4ee2b5SmrgDate: Thu Mar 1 11:15:18 2018 -0500 325c4ee2b5Smrg 335c4ee2b5Smrg xkbcomp 1.4.1 345c4ee2b5Smrg 355c4ee2b5Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 365c4ee2b5Smrg 375c4ee2b5Smrgcommit 993d4916a92b56b5043cf0b90f550568c817ad2b 385c4ee2b5SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 395c4ee2b5SmrgDate: Tue Feb 13 13:48:46 2018 +1000 405c4ee2b5Smrg 415c4ee2b5Smrg pkgconfig: add the exec_prefix substitution 425c4ee2b5Smrg 435c4ee2b5Smrg bindir gets replaced with: 445c4ee2b5Smrg bindir=${exec_prefix}/bin 455c4ee2b5Smrg but exec_prefix isn't set so we end up with an invalid bindir. 465c4ee2b5Smrg 475c4ee2b5Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 485c4ee2b5Smrg Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> 495c4ee2b5Smrg 505c4ee2b5Smrgcommit 3e2a6ad4edfbf21c3f76f8319f0039b7f589944f 515c4ee2b5SmrgAuthor: Adam Jackson <ajax@redhat.com> 525c4ee2b5SmrgDate: Mon Nov 6 12:54:41 2017 -0500 535c4ee2b5Smrg 545c4ee2b5Smrg pkgconfig: Add our bindir to xkbcomp.pc 555c4ee2b5Smrg 565c4ee2b5Smrg Reviewed-by: Daniel Stone <daniels@collabora.com> 575c4ee2b5Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 585c4ee2b5Smrg 59f757b1e9Smrgcommit 3fcd5f4490adee266eb4c0110d058c7f4e515e36 60f757b1e9SmrgAuthor: Daniel Stone <daniels@collabora.com> 61f757b1e9SmrgDate: Mon May 1 15:59:28 2017 +0100 62f757b1e9Smrg 63f757b1e9Smrg xkbcomp 1.4.0 64f757b1e9Smrg 65f757b1e9Smrg Signed-off-by: Daniel Stone <daniels@collabora.com> 66f757b1e9Smrg 67f757b1e9Smrgcommit 7fdfabd753a39dbdcfcfa65ec33d0192448119d8 68f757b1e9SmrgAuthor: Daniel Stone <daniels@collabora.com> 69f757b1e9SmrgDate: Thu Apr 6 15:52:10 2017 +0100 70f757b1e9Smrg 71f757b1e9Smrg keycodes: Ignore high keycodes 72f757b1e9Smrg 73f757b1e9Smrg Rather than throwing a fatal error when a keycode definition exceeds the 74f757b1e9Smrg declared maximum (i.e. 255), just ignore the definition and continue. 75f757b1e9Smrg 76f757b1e9Smrg This allows xkeyboard-config to start shipping datasets including high 77f757b1e9Smrg keycodes, which will work in xkbcommon as it ignores explicit range 78f757b1e9Smrg declarations. 79f757b1e9Smrg 80f757b1e9Smrg Signed-off-by: Daniel Stone <daniels@collabora.com> 81f757b1e9Smrg Reviewed-by: Ran Benita <ran234@gmail.com> 82f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 83f757b1e9Smrg Reported-by: Christian Kellner <gicmo@gnome.org> 84f757b1e9Smrg 85f757b1e9Smrgcommit 9f1e3e8c8914b349b9b52501bb4acadedb31081d 86f757b1e9SmrgAuthor: Mihail Konev <k.mvc@ya.ru> 87f757b1e9SmrgDate: Thu Jan 26 14:00:21 2017 +1000 88f757b1e9Smrg 89f757b1e9Smrg autogen: add default patch prefix 90f757b1e9Smrg 91f757b1e9Smrg Signed-off-by: Mihail Konev <k.mvc@ya.ru> 92f757b1e9Smrg 93f757b1e9Smrgcommit 6f16a2e38667bea33e0cb566734a87c2b92c9391 94f757b1e9SmrgAuthor: Emil Velikov <emil.l.velikov@gmail.com> 95f757b1e9SmrgDate: Mon Mar 9 12:00:52 2015 +0000 96f757b1e9Smrg 97f757b1e9Smrg autogen.sh: use quoted string variables 98f757b1e9Smrg 99f757b1e9Smrg Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 100f757b1e9Smrg fall-outs, when they contain space. 101f757b1e9Smrg 102f757b1e9Smrg Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 103f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 104f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 105f757b1e9Smrg 106f757b1e9Smrgcommit bbc55549ee44830747eccfadd61df3ed38a99202 107f757b1e9SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 108f757b1e9SmrgDate: Tue Jan 24 10:32:07 2017 +1000 109f757b1e9Smrg 110f757b1e9Smrg autogen.sh: use exec instead of waiting for configure to finish 111f757b1e9Smrg 112f757b1e9Smrg Syncs the invocation of configure with the one from the server. 113f757b1e9Smrg 114f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 115f757b1e9Smrg Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 116f757b1e9Smrg 117f757b1e9Smrgcommit 8995ac58e15595de9158c2d8df9e02b0c925e8f4 118f757b1e9SmrgAuthor: Ran Benita <ran234@gmail.com> 119f757b1e9SmrgDate: Wed Jan 6 21:32:52 2016 +0100 120f757b1e9Smrg 121f757b1e9Smrg When a file contains several maps, look for a default map 122f757b1e9Smrg 123f757b1e9Smrg Rather than always taking the first one in the file. This is exactly the 124f757b1e9Smrg intended use of the 'default' flag. 125f757b1e9Smrg 126f757b1e9Smrg Note that pretty much the same code is duplicated in xkbcomp.c when 127f757b1e9Smrg compiling a single file from the command line, but there it is 128f757b1e9Smrg implemented correctly (look for XkbLC_Default). 129f757b1e9Smrg 130f757b1e9Smrg https://bugs.freedesktop.org/show_bug.cgi?id=69950 131f757b1e9Smrg 132f757b1e9Smrg Signed-off-by: Ran Benita <ran234@gmail.com> 133f757b1e9Smrg Tested-by: Benno Schulenberg <bensberg@justemail.net> 134f757b1e9Smrg Acked-by: Sergey Udaltsov <sergey.udaltsov@gmail.com> 135f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 136f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 137f757b1e9Smrg 138f757b1e9Smrgcommit bf4d7d059daf5c6f81d70f8d3e5e2a87265381b7 139f757b1e9SmrgAuthor: Benno Schulenberg <bensberg@justemail.net> 140f757b1e9SmrgDate: Thu Sep 11 22:04:21 2014 +0200 141f757b1e9Smrg 142f757b1e9Smrg When overriding a key, adjust also its number of levels (#57242). 143f757b1e9Smrg 144f757b1e9Smrg Specifying an explicit key type when overriding a key should adjust 145f757b1e9Smrg the number of levels to that of the specified type. This gets rid of 146f757b1e9Smrg the age-old warning of the right Alt key being ONE_LEVEL but having 147f757b1e9Smrg two symbols assigned. 148f757b1e9Smrg 149f757b1e9Smrg Fixes bug #57242 <http://bugs.freedesktop.org/show_bug.cgi?id=57242>. 150f757b1e9Smrg 151f757b1e9Smrg Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 152f757b1e9Smrg Reviewed-by: Ran Benita <ran234@gmail.com> 153f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 154f757b1e9Smrg 1553fb1fa07Smrgcommit f909259b1da70bc145f19e5ce595c8e945a2a808 1563fb1fa07SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1573fb1fa07SmrgDate: Thu Nov 5 12:19:22 2015 +1000 1583fb1fa07Smrg 1593fb1fa07Smrg xkbcomp 1.3.1 1603fb1fa07Smrg 1613fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1623fb1fa07Smrg 1633fb1fa07Smrgcommit 26d1c57a938ce5c0d4fd9d645ace25308e6a7070 1643fb1fa07SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1653fb1fa07SmrgDate: Tue Nov 3 09:01:19 2015 +1000 1663fb1fa07Smrg 1673fb1fa07Smrg symbols: increase the warning level for shortening a key type 1683fb1fa07Smrg 1693fb1fa07Smrg Any use of the german keyboard layout or anything else using 1703fb1fa07Smrg level3(ralt_switch) produces the warning 1713fb1fa07Smrg Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols 1723fb1fa07Smrg Ignoring extra symbols 1733fb1fa07Smrg This warning is meaningless, the default definition for RALT comes from 1743fb1fa07Smrg pc(pc105) including altwin(meta_alt) which defines it as TWO_LEVEL 1753fb1fa07Smrg and { Alt_R, Meta_R }. Including level3(ralt_switch) correctly sets it as 1763fb1fa07Smrg ONE_LEVEL but now we get the warning. That makes users file bug reports and we 1773fb1fa07Smrg can't be having that, can we? 1783fb1fa07Smrg 1793fb1fa07Smrg Up the warning level for this case to one past the default. The warning is 1803fb1fa07Smrg only useful when you're testing a new keyboard layout or trying to fix an 1813fb1fa07Smrg actual bug with missing symbols. And then you can run xkbcomp with -w10. 1823fb1fa07Smrg No need to spam the log on every server startup. 1833fb1fa07Smrg 1843fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1853fb1fa07Smrg Reviewed-by: Hans de Goede <hdegoede@redhat.com> 1863fb1fa07Smrg 1873fb1fa07Smrgcommit 511adde23a0518db0379b444580b63edcb9138a8 1883fb1fa07SmrgAuthor: Matthew Green <mrg@NetBSD.org> 1893fb1fa07SmrgDate: Tue Jul 28 17:53:48 2015 +0200 1903fb1fa07Smrg 1913fb1fa07Smrg Adjust a NUL-string assignment to avoid const issues. 1923fb1fa07Smrg 1933fb1fa07Smrg Signed-off-by: Thomas Klausner <wiz@NetBSD.org> 1943fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1953fb1fa07Smrg 1963fb1fa07Smrgcommit 1ae525b3d236b59e6437b2b5433d460e18370973 1973fb1fa07SmrgAuthor: Jon TURNEY <jon.turney@dronecode.org.uk> 1983fb1fa07SmrgDate: Tue Mar 17 15:19:10 2015 +0000 1993fb1fa07Smrg 2003fb1fa07Smrg Define WIN32_LEAN_AND_MEAN when building on Win32 2013fb1fa07Smrg 2023fb1fa07Smrg w32api/rpcnndr.h (included by windows.h) uses TypeString as the name of a structure member. 2033fb1fa07Smrg 2043fb1fa07Smrg xkbcomp.h defines it as a macro for a constant. 2053fb1fa07Smrg 2063fb1fa07Smrg Define WIN32_LEAN_AND_MEAN to avoid this clash. 2073fb1fa07Smrg 2083fb1fa07Smrg Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> 2093fb1fa07Smrg Reviewed-by: David Macek <david.macek.0@gmail.com> 2103fb1fa07Smrg 2113fb1fa07Smrgcommit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99 2123fb1fa07SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2133fb1fa07SmrgDate: Tue Mar 3 16:24:50 2015 -0800 2143fb1fa07Smrg 2153fb1fa07Smrg Stop including <X11/Xalloca.h> in parseutils.c 2163fb1fa07Smrg 2173fb1fa07Smrg I can not find any point in our git history at which alloca() or the 2183fb1fa07Smrg Xalloca.h macros ALLOCATE_LOCAL() & DEALLOCATE_LOCAL() were actually 2193fb1fa07Smrg used in this source file. 2203fb1fa07Smrg 2213fb1fa07Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2223fb1fa07Smrg 223c82dfdfbSmrgcommit 1e8ee9d0aad072f04186df84752f5636340574e0 224c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 225c82dfdfbSmrgDate: Fri Nov 21 08:18:41 2014 +1000 226c82dfdfbSmrg 227c82dfdfbSmrg xkbcomp 1.3.0 228c82dfdfbSmrg 229c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 230c82dfdfbSmrg 231c82dfdfbSmrgcommit 978998a1fe0a78829452f5432efe1b74c5049de4 232c82dfdfbSmrgAuthor: Vincent Lefevre <vincent@vinc17.net> 233c82dfdfbSmrgDate: Mon Oct 27 10:50:30 2014 +0100 234c82dfdfbSmrg 235c82dfdfbSmrg xkbcomp: Improved -w option parsing 236c82dfdfbSmrg 237c82dfdfbSmrg This patch improves -w option parsing even further, for cases like 238c82dfdfbSmrg "xkbcomp -w6 4.xkb out.xkb" (which were not handled by the fix of 239c82dfdfbSmrg the warning level is still optional (set to 0 if not present), and 240c82dfdfbSmrg errors like "xkbcomp -wfoo in out" are detected and reported. 241c82dfdfbSmrg 242c82dfdfbSmrg https://bugs.freedesktop.org/show_bug.cgi?id=66344 243c82dfdfbSmrg 244c82dfdfbSmrg Signed-off-by: Vincent Lefevre <vincent@vinc17.net> 245c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 246c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 247c82dfdfbSmrg 248c82dfdfbSmrgcommit d4e02a09258063c6d024c3ccd42d6b22212e6e18 249c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 250c82dfdfbSmrgDate: Sat Mar 8 19:04:24 2014 -0800 251c82dfdfbSmrg 252c82dfdfbSmrg Initialize nMatch even if WIN32 is defined 253c82dfdfbSmrg 254c82dfdfbSmrg Flagged by cppcheck 1.64: 255c82dfdfbSmrg Checking app/xkbcomp/listing.c: WIN32... 256c82dfdfbSmrg [app/xkbcomp/listing.c:335]: (error) Uninitialized variable: nMatch 257c82dfdfbSmrg 258c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 259c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 260c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 261c82dfdfbSmrg 262c82dfdfbSmrgcommit 7606a46b922dfdb0627f1af6ab1432ae88c79d66 263c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 264c82dfdfbSmrgDate: Sat Mar 8 19:01:12 2014 -0800 265c82dfdfbSmrg 266c82dfdfbSmrg Remove useless assignment to 'outline' variable 267c82dfdfbSmrg 268c82dfdfbSmrg Flagged by cppcheck 1.64: 269c82dfdfbSmrg [app/xkbcomp/geometry.c:2426] -> [app/xkbcomp/geometry.c:2427]: 270c82dfdfbSmrg (performance) Variable 'outline' is reassigned a value before 271c82dfdfbSmrg the old one has been used. 272c82dfdfbSmrg 273c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 274c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 275c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 276c82dfdfbSmrg 277c82dfdfbSmrgcommit 6c2d3b0891f7be6ef4895be75188aa1c6f530bfc 278c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 279c82dfdfbSmrgDate: Sat Mar 8 18:50:22 2014 -0800 280c82dfdfbSmrg 281c82dfdfbSmrg Don't dereference the pointer whose allocation failed 282c82dfdfbSmrg 283c82dfdfbSmrg Flagged by cppcheck 1.64: 284c82dfdfbSmrg [app/xkbcomp/keycodes.c:264] -> [app/xkbcomp/keycodes.c:262]: 285c82dfdfbSmrg (warning) Possible null pointer dereference: new - otherwise it 286c82dfdfbSmrg is redundant to check it against null. 287c82dfdfbSmrg [app/xkbcomp/keytypes.c:600] -> [app/xkbcomp/keytypes.c:597]: 288c82dfdfbSmrg (warning) Possible null pointer dereference: old - otherwise it 289c82dfdfbSmrg is redundant to check it against null. 290c82dfdfbSmrg 291c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 292c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 293c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 294c82dfdfbSmrg 295c82dfdfbSmrgcommit 50ebe95a32dc59b1de899ef08f72462055b04065 296c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 297c82dfdfbSmrgDate: Sat Mar 8 18:46:11 2014 -0800 298c82dfdfbSmrg 299c82dfdfbSmrg Remove useless checks for NULL before free in OverlayKeyCreate() 300c82dfdfbSmrg 301c82dfdfbSmrg There is no need to ensure the pointers passed to free are not NULL, 302c82dfdfbSmrg especially right after passing them to strncpy without checking for 303c82dfdfbSmrg NULL. 304c82dfdfbSmrg 305c82dfdfbSmrg Flagged by cppcheck 1.64: 306c82dfdfbSmrg [app/xkbcomp/parseutils.c:557] -> [app/xkbcomp/parseutils.c:559]: 307c82dfdfbSmrg (warning) Possible null pointer dereference: over - otherwise it 308c82dfdfbSmrg is redundant to check it against null. 309c82dfdfbSmrg [app/xkbcomp/parseutils.c:558] -> [app/xkbcomp/parseutils.c:561]: 310c82dfdfbSmrg (warning) Possible null pointer dereference: under - otherwise it 311c82dfdfbSmrg is redundant to check it against null. 312c82dfdfbSmrg 313c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 314c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 315c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 316c82dfdfbSmrg 317c82dfdfbSmrgcommit 31b90ee4ffc774e0da540277907fc5540c0b012c 318c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 319c82dfdfbSmrgDate: Mon Feb 3 07:24:22 2014 +1000 320c82dfdfbSmrg 321c82dfdfbSmrg man: replace default include directory with the one from configure 322c82dfdfbSmrg 323c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 324c82dfdfbSmrg Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 325c82dfdfbSmrg 326c82dfdfbSmrgcommit e3e6e938535532bfad175c1635256ab7fb3ac943 327c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 328c82dfdfbSmrgDate: Sun Oct 20 12:36:31 2013 -0700 329c82dfdfbSmrg 330c82dfdfbSmrg Fix many const char * warnings from gcc 331c82dfdfbSmrg 332c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 333c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 334c82dfdfbSmrg 335c82dfdfbSmrgcommit 2458580ac95c550217b3376c46eecb2cca646241 336c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 337c82dfdfbSmrgDate: Sun Oct 20 11:52:43 2013 -0700 338c82dfdfbSmrg 339c82dfdfbSmrg Convert remaining sprintf calls to snprintf 340c82dfdfbSmrg 341c82dfdfbSmrg Most were fixed length or length checked anyway, this just saves time 342c82dfdfbSmrg doublechecking that. (A few could be replaced by asprintf, but we 343c82dfdfbSmrg don't have a copy guaranteed to be reachable from this program yet.) 344c82dfdfbSmrg 345c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 346c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 347c82dfdfbSmrg 348c82dfdfbSmrgcommit 3ed68e06cb45fb526b09e4c7b7c3d60de552b2b3 349c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 350c82dfdfbSmrgDate: Sun Oct 20 12:49:31 2013 -0700 351c82dfdfbSmrg 352c82dfdfbSmrg Remove unused uASSERT macro 353c82dfdfbSmrg 354c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 355c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 356c82dfdfbSmrg 357c82dfdfbSmrgcommit c936bd4315a7dc78de074ac89c5a4d12813421be 358c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 359c82dfdfbSmrgDate: Sun Oct 20 11:58:56 2013 -0700 360c82dfdfbSmrg 361c82dfdfbSmrg Remove unused function entry/exit tracking framework 362c82dfdfbSmrg 363c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 364c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 365c82dfdfbSmrg 366c82dfdfbSmrgcommit 839ccda42d8b088d94324cd77c4be954859914d3 367c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 368c82dfdfbSmrgDate: Wed Aug 28 15:20:56 2013 +1000 369c82dfdfbSmrg 370c82dfdfbSmrg compat: don't warn about redefinition when nothing is defined yet 371c82dfdfbSmrg 372c82dfdfbSmrg info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that 373c82dfdfbSmrg is the case, otherwise any "group 2 = ..." statement will cause an error. 374c82dfdfbSmrg 375c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 376c82dfdfbSmrg 377c82dfdfbSmrgcommit 24d18e0a844041ef82441adb16aa18cc4b4814ae 378c82dfdfbSmrgAuthor: Benno Schulenberg <bensberg@justemail.net> 379c82dfdfbSmrgDate: Wed Aug 28 20:03:30 2013 +0200 380c82dfdfbSmrg 381c82dfdfbSmrg Making sure that a copied string is always null-terminated (#66345). 382c82dfdfbSmrg 383c82dfdfbSmrg A more minimalistic and formally correct solution. 384c82dfdfbSmrg This amends and extends the previous fix for bug #66345, 385c82dfdfbSmrg fixing not just yyGetKeyName() but also yyGetString(). 386c82dfdfbSmrg 387c82dfdfbSmrg Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 388c82dfdfbSmrg 389c82dfdfbSmrg Fixes a typo from cdcd552 (should be sizeof - 1, not sizeof -i). 390c82dfdfbSmrg Code flows that i is at most sizeof(scanBuf) - 1, so last is not needed. 391c82dfdfbSmrg 392c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 393c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 394c82dfdfbSmrg 395c82dfdfbSmrgcommit 0ebdf47fd4bc434ac3d2339544c022a869510738 396c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 397c82dfdfbSmrgDate: Thu Jul 11 13:53:31 2013 +1000 398c82dfdfbSmrg 399c82dfdfbSmrg Parse -w1 flag correctly (#66344) 400c82dfdfbSmrg 401c82dfdfbSmrg if the flag is "-w", then argv[i][1] is 'w' and unlikely to be a digit. 402c82dfdfbSmrg Access [2] instead, which is either \0 or an actual digit. 403c82dfdfbSmrg 404c82dfdfbSmrg X.Org Bug 66344 <http://bugs.freedesktop.org/show_bug.cgi?id=66344> 405c82dfdfbSmrg 406c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 407c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 408c82dfdfbSmrg Reviewed-by: Matt Dew <marcoz@osource.org> 409c82dfdfbSmrg 410c82dfdfbSmrgcommit cdcd552041fc1325a2a81e3374fadb0dd15950dc 411c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 412c82dfdfbSmrgDate: Thu Jul 11 13:26:18 2013 +1000 413c82dfdfbSmrg 414c82dfdfbSmrg Always terminate the scanBuf string (#66345) 415c82dfdfbSmrg 416c82dfdfbSmrg If a key name exceeds 4 characters, the content of scanBuf is not 417c82dfdfbSmrg null-terminated, giving error messages like 418c82dfdfbSmrg 419c82dfdfbSmrg syntax error: line 7 of test.xkb 420c82dfdfbSmrg last scanned symbol is: FOOBARm 421c82dfdfbSmrg Errors encountered in test.xkb; not compiled. 422c82dfdfbSmrg 423c82dfdfbSmrg (last character of the preceding 'maximum' statement in this case) 424c82dfdfbSmrg 425c82dfdfbSmrg X.Org Bug 66345 <http://bugs.freedesktop.org/show_bug.cgi?id=66345> 426c82dfdfbSmrg 427c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 428c82dfdfbSmrg 429c82dfdfbSmrgcommit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d 430c82dfdfbSmrgAuthor: Laura <lmemsm@gmail.com> 431c82dfdfbSmrgDate: Fri Mar 15 11:21:26 2013 +0000 432c82dfdfbSmrg 433c82dfdfbSmrg Add #include <stdlib.h> to xkbscan.c 434c82dfdfbSmrg 435c82dfdfbSmrg This fixes an issue with _exit not declared when building xkbcomp 436c82dfdfbSmrg version 1.2.4 natively on Windows using MinGW32 (version 4.7.2) 437c82dfdfbSmrg from www.mingw.org. 438c82dfdfbSmrg 439c82dfdfbSmrg https://bugs.freedesktop.org/show_bug.cgi?id=62365 440c82dfdfbSmrg 441c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 442c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 443c82dfdfbSmrg 444c82dfdfbSmrgcommit ed582f4fccd4e23abcfba8b3b03649fea6414f44 445c82dfdfbSmrgAuthor: Thomas Klausner <wiz@NetBSD.org> 446c82dfdfbSmrgDate: Sun Jun 2 22:22:36 2013 +0200 447c82dfdfbSmrg 448c82dfdfbSmrg Protect config.h like usual. 449c82dfdfbSmrg 450c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 451c82dfdfbSmrg 452c82dfdfbSmrgcommit c66de126ad10a7220ab74e52fb7cc81b6d8b0993 453c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 454c82dfdfbSmrgDate: Tue May 21 15:19:35 2013 +1000 455c82dfdfbSmrg 456c82dfdfbSmrg man: document -help/-?, -em1, -emp, -eml 457c82dfdfbSmrg 458c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 459c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 460c82dfdfbSmrg 461c82dfdfbSmrgcommit a4ff0f0eee046be846cc0f46edaba48b765e50d3 462c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 463c82dfdfbSmrgDate: Tue Apr 9 11:29:15 2013 +1000 464c82dfdfbSmrg 465c82dfdfbSmrg Use DEBUG, not DEBUG_ON to determine whether debugging is enabled 466c82dfdfbSmrg 467c82dfdfbSmrg Nothing else looks at DEBUG_ON. 468c82dfdfbSmrg 469c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 470c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 471c82dfdfbSmrg 472c82dfdfbSmrgcommit 705b9bbb426410f9510601c7010da51184919b36 473c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 474c82dfdfbSmrgDate: Tue Jan 22 22:39:19 2013 -0800 475c82dfdfbSmrg 476c82dfdfbSmrg config: Add missing AC_CONFIG_SRCDIR 477c82dfdfbSmrg 478c82dfdfbSmrg Regroup AC statements under the Autoconf initialization section. 479c82dfdfbSmrg Regroup AM statements under the Automake initialization section. 480c82dfdfbSmrg 481c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 482c82dfdfbSmrg 483c82dfdfbSmrgcommit ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa 484c82dfdfbSmrgAuthor: Colin Walters <walters@verbum.org> 485c82dfdfbSmrgDate: Wed Jan 16 13:02:57 2013 -0500 486c82dfdfbSmrg 487c82dfdfbSmrg autogen.sh: Honor NOCONFIGURE=1 488c82dfdfbSmrg 489c82dfdfbSmrg See http://people.gnome.org/~walters/docs/build-api.txt 490c82dfdfbSmrg 491c82dfdfbSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 492c82dfdfbSmrg 493c82dfdfbSmrgcommit 0522fab51eec0aa3e623aa17c5b7ea3aa6dfec45 494c82dfdfbSmrgAuthor: Adam Jackson <ajax@redhat.com> 495c82dfdfbSmrgDate: Wed Jan 16 13:01:21 2013 -0500 496c82dfdfbSmrg 497c82dfdfbSmrg configure: Drop AM_MAINTAINER_MODE 498c82dfdfbSmrg 499c82dfdfbSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 500c82dfdfbSmrg 501c82dfdfbSmrgcommit e4f767913338052527538d429931e8abd8c3fb88 502c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 503c82dfdfbSmrgDate: Fri Jan 4 18:37:45 2013 -0800 504c82dfdfbSmrg 505c82dfdfbSmrg unifdef -U__UNIXOS2__ 506c82dfdfbSmrg 507c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 508c82dfdfbSmrg 509c82dfdfbSmrgcommit bd1103ef3cfef9cfed645566f944a69e7ca568b4 510c82dfdfbSmrgAuthor: Ryan Pavlik <rpavlik@iastate.edu> 511c82dfdfbSmrgDate: Wed Oct 26 12:17:44 2011 -0500 512c82dfdfbSmrg 513c82dfdfbSmrg Include Xwindows.h rather than windows.h 514c82dfdfbSmrg 515c82dfdfbSmrg Include the specially wrapped windows.h in Xwindows.h, rather than 516c82dfdfbSmrg including it directly to avoid compilation errors due to clashing 517c82dfdfbSmrg definitions 518c82dfdfbSmrg 519c82dfdfbSmrg Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu> 520c82dfdfbSmrg Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> 521c82dfdfbSmrg Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 522c82dfdfbSmrg 523c82dfdfbSmrgcommit a68c5b7b29eb1433b1be73b50c4248e10eab8e64 524c82dfdfbSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 525c82dfdfbSmrgDate: Thu Nov 1 16:37:03 2012 +1100 526c82dfdfbSmrg 527c82dfdfbSmrg Reset scan state when opening a new file 528c82dfdfbSmrg 529c82dfdfbSmrg When we opened a new file after encountering a parse error, we weren't 530c82dfdfbSmrg resetting our scan state, and continued to read out of the old buffer 531c82dfdfbSmrg rather than that of the new file. 532c82dfdfbSmrg 533c82dfdfbSmrg Fixes a regression introduced in 9887842e ('Use fread() instead of 534c82dfdfbSmrg getc()'). 535c82dfdfbSmrg 536c82dfdfbSmrg Test case: 537c82dfdfbSmrg xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*" 538c82dfdfbSmrg The Makefiles in that tree would cause parse errors, the resulting directory 539c82dfdfbSmrg file is incomplete (down from ~12000 to ~230 lines). 540c82dfdfbSmrg 541c82dfdfbSmrg Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 542c82dfdfbSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 543c82dfdfbSmrg 544c82dfdfbSmrgcommit e119cbec7e750ffc4d4bd08b577db2c697035a30 545c82dfdfbSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 546c82dfdfbSmrgDate: Wed Oct 31 12:40:49 2012 +1100 547c82dfdfbSmrg 548c82dfdfbSmrg Add parsing support for multiple keysyms per level 549c82dfdfbSmrg 550c82dfdfbSmrg Parse, but ignore, level definitions in the form of: 551c82dfdfbSmrg key <FOO> { [ normal_sym, { M, U, L, T, I, S, Y, M } ] }; 552c82dfdfbSmrg 553c82dfdfbSmrg normal_sym will be carried, but the latter will be turned into NoSymbol. 554c82dfdfbSmrg 555c82dfdfbSmrg http://bugs.freedesktop.org/show_bug.cgi?id=25025 556c82dfdfbSmrg 557c82dfdfbSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 558c82dfdfbSmrg 5591d8c7986Smrgcommit f2eff337176551f643e35c54c1e1ca0a78df69c6 5601d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 5611d8c7986SmrgDate: Thu Mar 22 22:02:56 2012 -0700 5621d8c7986Smrg 5631d8c7986Smrg xkbcomp 1.2.4 5641d8c7986Smrg 5651d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 5661d8c7986Smrg 5671d8c7986Smrgcommit b4fafc4fa7edc4c04c3c0affae0d7f79a63e8d2f 5681d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 5691d8c7986SmrgDate: Wed Dec 28 20:57:55 2011 -0800 5701d8c7986Smrg 5711d8c7986Smrg Delete redundant redeclarations of extern Atoms in symbols.c 5721d8c7986Smrg 5731d8c7986Smrg Fixes gcc warnings of: 5741d8c7986Smrg 5751d8c7986Smrg symbols.c:43: warning: redundant redeclaration of 'tok_ONE_LEVEL' 5761d8c7986Smrg tokens.h:99: warning: previous declaration of 'tok_ONE_LEVEL' was here 5771d8c7986Smrg symbols.c:44: warning: redundant redeclaration of 'tok_TWO_LEVEL' 5781d8c7986Smrg tokens.h:100: warning: previous declaration of 'tok_TWO_LEVEL' was here 5791d8c7986Smrg symbols.c:45: warning: redundant redeclaration of 'tok_KEYPAD' 5801d8c7986Smrg tokens.h:102: warning: previous declaration of 'tok_KEYPAD' was here 5811d8c7986Smrg 5821d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 5831d8c7986Smrg 5841d8c7986Smrgcommit 3835cae3cb1ad1073cbb2711f938beb878b4986c 5851d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 5861d8c7986SmrgDate: Wed Dec 28 20:53:45 2011 -0800 5871d8c7986Smrg 5881d8c7986Smrg Make sure to leave room for trailing nil byte in yyGetNumber 5891d8c7986Smrg 5901d8c7986Smrg ...though really, by the time you've added 1023 digits to the number 5911d8c7986Smrg you want to parse, you've got much bigger problems than an off-by-one 5921d8c7986Smrg error in your buffer count. 5931d8c7986Smrg 5941d8c7986Smrg Fixes parfait warnings: 5951d8c7986Smrg Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 5961d8c7986Smrg Array size is 1024 bytes, nInBuf >= 1 and nInBuf <= 1024 5971d8c7986Smrg at line 625 of xkbscan.c in function 'yyGetNumber'. 5981d8c7986Smrg Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 5991d8c7986Smrg Array size is 1024 bytes, nInBuf <= 1025 6001d8c7986Smrg at line 632 of xkbscan.c in function 'yyGetNumber'. 6011d8c7986Smrg 6021d8c7986Smrg [ This bug was found by the Parfait 0.4.2 bug checking tool. 6031d8c7986Smrg For more information see http://labs.oracle.com/projects/parfait/ ] 6041d8c7986Smrg 6051d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 6061d8c7986Smrg 6071d8c7986Smrgcommit 1447071942dbbbfc37b08417c74c8a1d302c1626 6081d8c7986SmrgAuthor: Andreas Wettstein <wettstein509@solnet.ch> 6091d8c7986SmrgDate: Fri Dec 2 20:10:06 2011 +0000 6101d8c7986Smrg 6111d8c7986Smrg include resets group compatibility modifiers #43091 6121d8c7986Smrg 6131d8c7986Smrg This change makes sure that include does not overwrite previous 6141d8c7986Smrg compatibility modifier settings when the included files does not 6151d8c7986Smrg explicitly specify them. 6161d8c7986Smrg 6171d8c7986Smrg Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> 6181d8c7986Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 6191d8c7986Smrg 6201d8c7986Smrgcommit 5fd14db5b2cc0c2c43f7a1ddefd6f9991eb1dcc2 6211d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 6221d8c7986SmrgDate: Fri Nov 11 11:18:43 2011 -0800 6231d8c7986Smrg 6241d8c7986Smrg Silence -Wparentheses-equality 6251d8c7986Smrg 6261d8c7986Smrg warning: equality comparison with extraneous parentheses [-Wparentheses-equality] 6271d8c7986Smrg 6281d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 6291d8c7986Smrg 6301d8c7986Smrgcommit 6099655a4bbe1fd3e26b8afd2b91888ad2766086 6311d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 6321d8c7986SmrgDate: Fri Nov 11 11:17:38 2011 -0800 6331d8c7986Smrg 6341d8c7986Smrg Silence -Wshadow warnings 6351d8c7986Smrg 6361d8c7986Smrg warning: declaration shadows a local variable [-Wshadow] 6371d8c7986Smrg 6381d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 6391d8c7986Smrg 6401d8c7986Smrgcommit b7e88debd937be147d3581b9c8720c0bfe354052 6411d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 6421d8c7986SmrgDate: Fri Nov 11 11:13:42 2011 -0800 6431d8c7986Smrg 6441d8c7986Smrg Correct our zeroing out of the row in InitRowInfo 6451d8c7986Smrg 6461d8c7986Smrg geometry.c:369:20: warning: argument to 'sizeof' in '__builtin___memset_chk' call is the same 6471d8c7986Smrg pointer type 'RowInfo *' (aka 'struct _RowInfo *') as the destination; expected 'RowInfo' 6481d8c7986Smrg (aka 'struct _RowInfo') or an explicit length [-Wsizeof-pointer-memaccess] 6491d8c7986Smrg bzero(row, sizeof(RowInfo *)); 6501d8c7986Smrg ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ 6511d8c7986Smrg 6521d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 6531d8c7986Smrg 6541d8c7986Smrgcommit 33b5c9413463613d341d15184b34a4f4c4e70e56 6551d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 6561d8c7986SmrgDate: Fri Nov 11 11:12:22 2011 -0800 6571d8c7986Smrg 6581d8c7986Smrg Fix -Wformat warnings 6591d8c7986Smrg 6601d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 6611d8c7986Smrg 6621d8c7986Smrgcommit b9f6482d5fc413222334c2370ef8b9693f4b50fd 6631d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 6641d8c7986SmrgDate: Fri Nov 11 11:07:30 2011 -0800 6651d8c7986Smrg 6661d8c7986Smrg Add missing _X_NORETURN to uFatalError 6671d8c7986Smrg 6681d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 6691d8c7986Smrg 6701d8c7986Smrgcommit 8ea06128c70b07c265a217222f2a245aad4bfce4 6711d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 6721d8c7986SmrgDate: Fri Nov 11 11:06:02 2011 -0800 6731d8c7986Smrg 6741d8c7986Smrg Include strings.h for strcasecmp and string.h for strdup 6751d8c7986Smrg 6761d8c7986Smrg Our minimum requirement for X11 is currently Unix98. Unix98 provides 6771d8c7986Smrg strcasecmp in <strings.h>. This commit fixes implicit declarations 6781d8c7986Smrg of this function on systems that closely adhere to the standard. 6791d8c7986Smrg 6801d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 6811d8c7986Smrg 6821d8c7986Smrgcommit 89c8317ad84386f69d31f38dcddbc7ff0abffb31 6831d8c7986SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 6841d8c7986SmrgDate: Tue Jul 5 08:23:37 2011 +1000 6851d8c7986Smrg 6861d8c7986Smrg Add .pc file for version export 6871d8c7986Smrg 6881d8c7986Smrg Exports xkbcomp version and the xkb base directory. 6891d8c7986Smrg 6901d8c7986Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 6911d8c7986Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 6921d8c7986Smrg Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 6931d8c7986Smrg 6941d8c7986Smrgcommit cdb8677f370b34a3a523a32ae0023c7e8c0c965c 6951d8c7986SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 6961d8c7986SmrgDate: Wed Jun 22 10:41:33 2011 +1000 6971d8c7986Smrg 6981d8c7986Smrg Print version number on -version. 6991d8c7986Smrg 7001d8c7986Smrg This commit isn't playing the WARN/M/M1 macro game. Version numbers to to 7011d8c7986Smrg stdout, full stop. 7021d8c7986Smrg 7031d8c7986Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 7041d8c7986Smrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 7051d8c7986Smrg 706690143ccSmrgcommit cef4ba4b8fdc9a5439f71437c08cf690a750bd6b 707690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 708690143ccSmrgDate: Tue Jun 21 16:04:45 2011 +0100 709690143ccSmrg 710690143ccSmrg Bump to 1.2.3 711690143ccSmrg 712690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 713690143ccSmrg 714690143ccSmrgcommit 3caab5aa37decb7b5dc1642a0452efc3e1f5100e 715690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 716690143ccSmrgDate: Tue Jun 21 15:55:59 2011 +0100 717690143ccSmrg 718690143ccSmrg Interp: Allow explicit Any/NoSymbol mappings 719690143ccSmrg 720690143ccSmrg Brown paper bag in full effect. 721690143ccSmrg 722690143ccSmrg The previous fix, while crushing the previous problem where an unknown 723690143ccSmrg keysym for an interp def would lead to every key matching it, also 724690143ccSmrg ignored explicit Any+AnyOfOrNone(All) mappings. 725690143ccSmrg 726690143ccSmrg Such as the one xkeyboard-config relied on for Control to actually 727690143ccSmrg update the modifier state. 728690143ccSmrg 729690143ccSmrg Fix this by allowing mappings explicitly declared as Any/NoSymbol, while 730690143ccSmrg ignoring only those with failed keysym lookups. Unfortunately, due to 731690143ccSmrg the structure of the parser, it's a deeply inelegant fix. 732690143ccSmrg 733690143ccSmrg Verified with a quick check of all layouts (albeit using default 734690143ccSmrg variants only) in xkeyboard-config that this results in no changes to 735690143ccSmrg the output at all, compared to xkbcomp 1.1.1. 736690143ccSmrg 737690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 738690143ccSmrg 739690143ccSmrgcommit b34af8b0aec3a1dfc58f9732996274cbf2646a53 740690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 741690143ccSmrgDate: Tue Jun 21 15:55:28 2011 +0100 742690143ccSmrg 743690143ccSmrg Constify LookupKeysym input argument 744690143ccSmrg 745690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 746690143ccSmrg 747690143ccSmrgcommit e68a8ef1067f98056237d8067052e2a0d9896133 748690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 749690143ccSmrgDate: Tue Jun 21 14:06:05 2011 +0100 750690143ccSmrg 751690143ccSmrg Bump to 1.2.2 752690143ccSmrg 753690143ccSmrg Emergency bugfix for the syminterp declarations. They've been broken 754690143ccSmrg since the beginning of time, but I guess we just haven't added new 755690143ccSmrg interpreted symbols since around then. 756690143ccSmrg 757690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 758690143ccSmrg 759690143ccSmrgcommit 2a473b906943ffd807ad81960c47530ee7ae9a60 760690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 761690143ccSmrgDate: Tue Jun 21 14:03:53 2011 +0100 762690143ccSmrg 763690143ccSmrg Interp: Ignore NoSymbol definitions 764690143ccSmrg 765690143ccSmrg A NoSymbol syminterp leads to a Any+AnyOfOrAll(None) definition, which 766690143ccSmrg is never what anyone would actually ever want in a sym interp. The 767690143ccSmrg failure mode here was: 768690143ccSmrg interpret XF86SomeKeysymYouDontHaveYet { 769690143ccSmrg action=Something() 770690143ccSmrg } 771690143ccSmrg leading to: 772690143ccSmrg interpret Any+AnyOfOrAll(None) { 773690143ccSmrg action=Something() 774690143ccSmrg } 775690143ccSmrg leading to every single non-action key triggering your shiny new action 776690143ccSmrg that was only supposed to come from a new keysym. 777690143ccSmrg 778690143ccSmrg At least you could VT switch or zap, I guess. 779690143ccSmrg 780690143ccSmrg Later, more invasive, revisions will bring a more useful error message. 781690143ccSmrg 782690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 783690143ccSmrg 784690143ccSmrgcommit a2816345e58c88f5806a5c6df310c7d9c62264f0 785690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 786690143ccSmrgDate: Tue Jun 21 14:03:12 2011 +0100 787690143ccSmrg 788690143ccSmrg Interp: Don't make modifier lookup failure fatal 789690143ccSmrg 790690143ccSmrg If we can't look up a modifier in a SymInterp declaration, don't make 791690143ccSmrg that fatal enough to kill the entire file, just ignore it and move on. 792690143ccSmrg 793690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 794690143ccSmrg 795690143ccSmrgcommit c7a42b364f0ca06d9859945fa11664d0e0ea2742 796690143ccSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 797690143ccSmrgDate: Tue Mar 8 08:16:35 2011 -0500 798690143ccSmrg 799690143ccSmrg config: move pre-processor flags to AM_CPPFLAGS 800690143ccSmrg 801690143ccSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 802690143ccSmrg 803690143ccSmrgcommit 7899a1f4745c8d111dab4dd3abc2b59b40ecdcbc 804690143ccSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 805690143ccSmrgDate: Tue Mar 8 08:02:54 2011 -0500 806690143ccSmrg 807690143ccSmrg config: let Automake handle Yacc dist and cleaning 808690143ccSmrg 809690143ccSmrg BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake. 810690143ccSmrg 811690143ccSmrg Automake generates all the rules to handle building, 812690143ccSmrg distribution and cleaning. 813690143ccSmrg 814690143ccSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 815690143ccSmrg 816690143ccSmrgcommit 137418c63d01d5db0dcaed257d7a26865efa53ae 817690143ccSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 818690143ccSmrgDate: Tue Jun 7 23:47:32 2011 -0700 819690143ccSmrg 820690143ccSmrg Replace repeated checks for gcc with _X_ATTRIBUTE_PRINTF from xproto 821690143ccSmrg 822690143ccSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 823690143ccSmrg Reviewed-by: Mark Kettenis <kettenis@openbsd.org> 824690143ccSmrg 825690143ccSmrgcommit a2877e92bd9f9c1532b5cd12cc484ff3cdbc6a0a 826690143ccSmrgAuthor: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 827690143ccSmrgDate: Fri Apr 1 20:26:30 2011 +1100 828690143ccSmrg 829690143ccSmrg xkbcomp: Stop possible overflow in yyGetnumber. #31647 830690143ccSmrg 831690143ccSmrg Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=31647 832690143ccSmrg 833690143ccSmrg Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 834690143ccSmrg Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> 835690143ccSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 836690143ccSmrg 837690143ccSmrgcommit 0b8527a3836cde77269461e22844857bf33e0aea 838690143ccSmrgAuthor: Julien Cristau <jcristau@debian.org> 839690143ccSmrgDate: Sun Feb 13 13:03:05 2011 +0100 840690143ccSmrg 841690143ccSmrg Inline the oiText macro in the only place it's used 842690143ccSmrg 843690143ccSmrg Gets rid of a compiler warning: 844690143ccSmrg geometry.c: In function 'HandleOverlayDef': 845690143ccSmrg geometry.c:2578: warning: the address of 'ol' will always evaluate as 'true' 846690143ccSmrg 847690143ccSmrg X.Org bug#34219 <https://bugs.freedesktop.org/show_bug.cgi?id=34219> 848690143ccSmrg 849690143ccSmrg Signed-off-by: Julien Cristau <jcristau@debian.org> 850690143ccSmrg Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> 851690143ccSmrg 85207d2e718Smrgcommit c8375bcb7eb9f86ca1534cdf1143e91372d0499e 85307d2e718SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 85407d2e718SmrgDate: Fri Feb 11 09:06:04 2011 +1000 85507d2e718Smrg 85607d2e718Smrg xkbcomp 1.2.1 85707d2e718Smrg 85807d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 85907d2e718Smrg 86007d2e718Smrgcommit ab5371cefe2b7438b74338f71ff890e0e868b3df 86107d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 86207d2e718SmrgDate: Wed Jan 19 10:06:56 2011 -0500 86307d2e718Smrg 86407d2e718Smrg config: move man pages into their own directory 86507d2e718Smrg 86607d2e718Smrg Use services provided by XORG_MANPAGE_SECTIONS. 86707d2e718Smrg Use standard Makefile for man pages. 86807d2e718Smrg 86907d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 87007d2e718Smrg 87107d2e718Smrgcommit 9ce8e2f42ab7695b5165ff0a3d892df96a3c3f01 87207d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 87307d2e718SmrgDate: Thu Jan 13 11:15:47 2011 -0500 87407d2e718Smrg 87507d2e718Smrg man: remove trailing spaces and tabs 87607d2e718Smrg 87707d2e718Smrg Using s/[ \t]*$// 87807d2e718Smrg 87907d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 88007d2e718Smrg 88107d2e718Smrgcommit 5ecf21cc130d7a45cb5e82e9c2c3025edee5d74f 88207d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 88307d2e718SmrgDate: Wed Jan 12 16:28:02 2011 -0500 88407d2e718Smrg 88507d2e718Smrg config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS 88607d2e718Smrg 88707d2e718Smrg This silences an Autoconf warning 88807d2e718Smrg 88907d2e718Smrgcommit e27e8c2a15ddcf51b2ea58f8eced7f035aa1301e 89007d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 89107d2e718SmrgDate: Wed Jan 12 15:29:50 2011 -0500 89207d2e718Smrg 89307d2e718Smrg config: replace deprecated AC_HELP_STRING with AS_HELP_STRING 89407d2e718Smrg 89507d2e718Smrg This silences an Automake warning. 89607d2e718Smrg 89707d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 89807d2e718Smrg 89907d2e718Smrgcommit f524cfae6951442c9a9da65ef317b9c04199500f 90007d2e718SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 90107d2e718SmrgDate: Tue Jan 4 00:05:18 2011 -0800 90207d2e718Smrg 90307d2e718Smrg Remove out-of-date copies of README.config & README.enhancing 90407d2e718Smrg 90507d2e718Smrg The up-to-date master copies of those documents are found in the 90607d2e718Smrg xorg-docs module, and posted on the X.Org website. 90707d2e718Smrg 90807d2e718Smrg Also, x-docs.org no longer carries X11 docs, so point to X.Org's 90907d2e718Smrg website instead in the README. 91007d2e718Smrg 91107d2e718Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 91207d2e718Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 91307d2e718Smrg 91407d2e718Smrgcommit cc55d8f5ab021861308b071aab9c03016be15187 91507d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 91607d2e718SmrgDate: Sun Oct 31 20:35:24 2010 -0400 91707d2e718Smrg 91807d2e718Smrg config: replace AC_CHECK_FILE with test -f as it fails to cross-compile 91907d2e718Smrg 92007d2e718Smrg Testing for the presence of xkbparse.c is legitimate as this is a build 92107d2e718Smrg file, but the Autoconf macro assumes it is testing on the host system 92207d2e718Smrg and fails. 92307d2e718Smrg 92407d2e718Smrg Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> 92507d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 92607d2e718Smrg 92707d2e718Smrgcommit 1d59f5b0387b18028017cfab4e55b703417dd735 92807d2e718SmrgAuthor: Dirk Wallenstein <halsmit@t-online.de> 92907d2e718SmrgDate: Fri Oct 29 13:08:25 2010 +0200 93007d2e718Smrg 93107d2e718Smrg man: Improve description of device selection option 93207d2e718Smrg 93307d2e718Smrg The device selection option takes effect when loading keymaps, too. 93407d2e718Smrg 93507d2e718Smrg Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 93607d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 93707d2e718Smrg 93807d2e718Smrgcommit 281c7744f682c1ba4f44c0ee22f9bf7188c14fe6 93907d2e718SmrgAuthor: Dirk Wallenstein <halsmit@t-online.de> 94007d2e718SmrgDate: Fri Oct 29 11:35:10 2010 +0200 94107d2e718Smrg 94207d2e718Smrg Allow uploading a keymap to a single device 94307d2e718Smrg 94407d2e718Smrg Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 94507d2e718Smrg Reviewed-by: Julien Cristau <jcristau@debian.org> 94607d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 94707d2e718Smrg 94883e5f723Smrgcommit 851a5f6e0c1b2a98d4714d95e40198ab5dc61607 94983e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 95083e5f723SmrgDate: Sat Oct 30 09:59:52 2010 -0700 95183e5f723Smrg 95283e5f723Smrg xkbcomp 1.2.0 95383e5f723Smrg 95483e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 95583e5f723Smrg 95683e5f723Smrgcommit 87576c9ebf0f28d66833bb28a8199df1aa01f693 95783e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 95883e5f723SmrgDate: Thu Sep 23 20:29:57 2010 -0700 95983e5f723Smrg 96083e5f723Smrg config: Remove unnecessary calls from configure.ac 96183e5f723Smrg 96283e5f723Smrg AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now 96383e5f723Smrg PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables 96483e5f723Smrg 96583e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 96683e5f723Smrg 96783e5f723Smrgcommit d083293a4e227e9dd27f74cde391fde4c5824b0c 96883e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 96983e5f723SmrgDate: Thu Sep 23 20:29:14 2010 -0700 97083e5f723Smrg 97183e5f723Smrg config: upgrade to util-macros 1.8 for additional man page support 97283e5f723Smrg 97383e5f723Smrg Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS 97483e5f723Smrg The value of MAN_SUBST is the same for all X.Org packages. 97583e5f723Smrg 97683e5f723Smrg Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS 97783e5f723Smrg The existing statement can now be removed from the configuration file. 97883e5f723Smrg 97983e5f723Smrg Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) 98083e5f723Smrg Enables silent rule and use platform appropriate version of sed. 98183e5f723Smrg 98283e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 98383e5f723Smrg 98483e5f723Smrgcommit 8f13f1af68fc55b7567a4eb4462a0c911722a3c4 98583e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 98683e5f723SmrgDate: Tue Jul 20 18:45:18 2010 -0400 98783e5f723Smrg 98883e5f723Smrg config: update AC_PREREQ statement to 2.60 98983e5f723Smrg 99083e5f723Smrg Unrelated to the previous patches, the new value simply reflects 99183e5f723Smrg the reality that the minimum level for autoconf to configure 99283e5f723Smrg all x.org modules is 2.60 dated June 2006. 99383e5f723Smrg 99483e5f723Smrg ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz 99583e5f723Smrg 99683e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 99783e5f723Smrg 99883e5f723Smrgcommit 988eb0e121c0f2c992031002acb7274c2026764b 99983e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 100083e5f723SmrgDate: Mon Jul 12 10:53:34 2010 +0100 100183e5f723Smrg 100283e5f723Smrg config: allow to build tarball when yacc is missing 100383e5f723Smrg 100483e5f723Smrg Autoconf does not handle this scenario as well as Automake does. 100583e5f723Smrg If xkbparse.c is already there, do not abort the configuration 100683e5f723Smrg if yacc is missing as it is not needed. 100783e5f723Smrg 100883e5f723Smrg If both xkbparse.c and yacc are missing, abort configuration. 100983e5f723Smrg Yacc is a required tool to build the package. 101083e5f723Smrg 101183e5f723Smrg Reported-by: Julien Cristau <jcristau@debian.org> 101283e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 101383e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 101483e5f723Smrg 101583e5f723Smrgcommit 446d226f85433aeb45834b65f966397ad6fbb17f 101683e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 101783e5f723SmrgDate: Mon Jul 12 10:37:49 2010 +0100 101883e5f723Smrg 101983e5f723Smrg limits.h is mandated by C89, no need to check for it 102083e5f723Smrg 102183e5f723Smrg Alan Coopersmith pointed out that C89 mandates limits.h, so for once in 102283e5f723Smrg X's life, checking for a system header is just being unnecessarily 102383e5f723Smrg paranoid. 102483e5f723Smrg 102583e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 102683e5f723Smrg 102783e5f723Smrgcommit 61b3d4b024d8146cb0e7659aa958045ceb72c482 102883e5f723SmrgAuthor: Julien Cristau <jcristau@debian.org> 102983e5f723SmrgDate: Mon Jul 12 10:28:32 2010 +0100 103083e5f723Smrg 103183e5f723Smrg Fix signedness issue with getc() return value 103283e5f723Smrg 103383e5f723Smrg getc() and ungetc() return and take, respectively, an int rather than a 103483e5f723Smrg char to allow for error values as well. Oops. 103583e5f723Smrg 103683e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 103783e5f723Smrg 103883e5f723Smrgcommit a281386fa887e6bf4110840779aed46dd0ac89b6 103983e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 104083e5f723SmrgDate: Fri Jul 9 19:34:29 2010 +0100 104183e5f723Smrg 104283e5f723Smrg Fix parsing of 0x1a2b3c4d-style symbols 104383e5f723Smrg 104483e5f723Smrg Raw keysyms were not getting parsed correctly, due to forgetting to add 104583e5f723Smrg the code to libX11, forgetting to add the backwards-compat code for old 104683e5f723Smrg libX11s, and then stuffing the lexing up anyway. Yeesh. 104783e5f723Smrg 104883e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 104983e5f723Smrg 105083e5f723Smrgcommit 0b04ecbb7a6afb223c91d3b15baab0bc48542281 105183e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 105283e5f723SmrgDate: Tue Jun 15 19:26:19 2010 +0100 105383e5f723Smrg 105483e5f723Smrg Fix gcc warnings 105583e5f723Smrg 105683e5f723Smrg It was right too: printf was being misused in some spots. 105783e5f723Smrg 105883e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 105983e5f723Smrg 106083e5f723Smrgcommit 41b0857c8c1179b87a26888588cbfff28f8bb0d6 106183e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 106283e5f723SmrgDate: Tue Jun 8 15:11:19 2010 +0100 106383e5f723Smrg 106483e5f723Smrg Don't malloc() and free() most scanned symbols 106583e5f723Smrg 106683e5f723Smrg Use a constant buffer. Sigh. 106783e5f723Smrg 106883e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 106983e5f723Smrg 107083e5f723Smrgcommit 7f7a57c75beb5e1dfb53351e490ef00a324b2727 107183e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 107283e5f723SmrgDate: Tue Jun 8 12:14:00 2010 +0100 107383e5f723Smrg 107483e5f723Smrg Fix compilation with DEBUG 107583e5f723Smrg 107683e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 107783e5f723Smrg 107883e5f723Smrgcommit 9887842e33174a6e98675b912e419c711dd20c0f 107983e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 108083e5f723SmrgDate: Mon Jun 7 22:45:13 2010 +0100 108183e5f723Smrg 108283e5f723Smrg Use fread() instead of getc() 108383e5f723Smrg 108483e5f723Smrg So, it turns out that if you're parsing a fairly large amount of data, 108583e5f723Smrg using getc() to get all the input rather than, say, read(), is some kind 108683e5f723Smrg of remarkably daft and unperformant idea. 108783e5f723Smrg 108883e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 108983e5f723Smrg 109083e5f723Smrgcommit 02de53d767b20bab1517b4e8a3e7eb3b9e7f15be 109183e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 109283e5f723SmrgDate: Mon Jun 7 22:43:01 2010 +0100 109383e5f723Smrg 109483e5f723Smrg Lazy keysym parsing (avoid XStringToKeysym) 109583e5f723Smrg 109683e5f723Smrg Instead of calling XStringToKeysym on every keysym we parse, store it as 109783e5f723Smrg a string until we need to store it in an actual keymap. 109883e5f723Smrg 109983e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 110083e5f723Smrg 110183e5f723Smrgcommit 07cc4d60dea2b4c947fed45b082edae4a53b186a 110283e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 110383e5f723SmrgDate: Wed Jun 2 15:23:58 2010 -0400 110483e5f723Smrg 110583e5f723Smrg config: add check for yacc to insure it is installed #27973 110683e5f723Smrg 110783e5f723Smrg Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" 110883e5f723Smrg as a last resort, even if no programs have been found. Improve error 110983e5f723Smrg checking by issuing an error message if yacc is not found. The module 111083e5f723Smrg cannot build anyway. 111183e5f723Smrg 111283e5f723Smrg Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 111383e5f723Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 111483e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 111583e5f723Smrg 111683e5f723Smrgcommit 7888738047e9f1545aa1905b4a2a0654686f49a8 111783e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 111883e5f723SmrgDate: Thu Feb 11 10:08:07 2010 -0500 111983e5f723Smrg 112083e5f723Smrg config: move CWARNFLAGS from configure.ac to Makefile.am 112183e5f723Smrg 112283e5f723Smrg Compiler warning flags should be explicitly set in the makefile 112383e5f723Smrg rather than being merged with other packages compiler flags. 112483e5f723Smrg 112583e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 112683e5f723Smrg 112783e5f723Smrgcommit ba906359da32644b40b3a8a71e77d3cabca56efe 112883e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 112983e5f723SmrgDate: Thu Nov 26 09:19:54 2009 -0500 113083e5f723Smrg 113183e5f723Smrg Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES 113283e5f723Smrg 113383e5f723Smrg Now that the INSTALL file is generated. 113483e5f723Smrg Allows running make maintainer-clean. 113583e5f723Smrg 113683e5f723Smrgcommit 667f0a0e5d3143533cbbe5979ef82c13cfa62c3a 113783e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 113883e5f723SmrgDate: Wed Oct 28 14:09:08 2009 -0400 113983e5f723Smrg 114083e5f723Smrg INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 114183e5f723Smrg 114283e5f723Smrg Add missing INSTALL file. Use standard GNU file on building tarball 114383e5f723Smrg README may have been updated 114483e5f723Smrg Remove AUTHORS file as it is empty and no content available yet. 114583e5f723Smrg Remove NEWS file as it is empty and no content available yet. 114683e5f723Smrg 114783e5f723Smrgcommit 4b7c8a8ef337614c831b2555afeb6d89dbc14fb1 114883e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 114983e5f723SmrgDate: Tue Oct 27 15:07:25 2009 -0400 115083e5f723Smrg 115183e5f723Smrg Deploy the new XORG_DEFAULT_OPTIONS #24242 115283e5f723Smrg 115383e5f723Smrg This macro aggregate a number of existing macros that sets commmon 115483e5f723Smrg X.Org components configuration options. It shields the configuration file from 115583e5f723Smrg future changes. 115683e5f723Smrg 115783e5f723Smrgcommit 5fa9ef7e5e87f875dd92cc33403cebf6c60c557f 115883e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 115983e5f723SmrgDate: Mon Oct 26 22:08:39 2009 -0400 116083e5f723Smrg 116183e5f723Smrg Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 116283e5f723Smrg 116383e5f723Smrg ChangeLog filename is known to Automake and requires no further 116483e5f723Smrg coding in the makefile. 116583e5f723Smrg 116683e5f723Smrgcommit b3a52787e0dad42ea7e8da26926b9533b1ecab84 116783e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 116883e5f723SmrgDate: Thu Oct 22 12:34:15 2009 -0400 116983e5f723Smrg 117083e5f723Smrg .gitignore: use common defaults with custom section # 24239 117183e5f723Smrg 117283e5f723Smrg Using common defaults will reduce errors and maintenance. 117383e5f723Smrg Only the very small or inexistent custom section need periodic maintenance 117483e5f723Smrg when the structure of the component changes. Do not edit defaults. 117583e5f723Smrg 117683e5f723Smrgcommit fa7e3ff7b49f76294aa14aa8bf1b8adbceb5d340 117783e5f723SmrgAuthor: Jeremy Huddleston <jeremyhu@freedesktop.org> 117883e5f723SmrgDate: Wed Oct 21 12:47:21 2009 -0700 117983e5f723Smrg 118083e5f723Smrg This is not a GNU project, so declare it foreign. 118183e5f723Smrg 118283e5f723Smrg On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: 118383e5f723Smrg > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: 118483e5f723Smrg > > I noticed an INSTALL file in xlsclients and libXvMC today, and it 118583e5f723Smrg > > was quite annoying to work around since 'autoreconf -fvi' replaces 118683e5f723Smrg > > it and git wants to commit it. Should these files even be in git? 118783e5f723Smrg > > Can I nuke them for the betterment of humanity and since they get 118883e5f723Smrg > > created by autoreconf anyways? 118983e5f723Smrg > 119083e5f723Smrg > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 119183e5f723Smrg 119283e5f723Smrg As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with 119383e5f723Smrg AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation 119483e5f723Smrg of the INSTALL file. It is also part of the 24206 solution. 119583e5f723Smrg 119683e5f723Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> 119783e5f723Smrg 11985fac8b10Smrgcommit a5160032d7e46473b8702b87a546071fc0c0978c 11995fac8b10SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 12005fac8b10SmrgDate: Sat Oct 3 21:12:47 2009 +1000 12015fac8b10Smrg 12025fac8b10Smrg xkbcomp 1.1.1 12035fac8b10Smrg 12045fac8b10Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 12055fac8b10Smrg 12065fac8b10Smrgcommit a36ca5ba61e2b97398a79713922644fee1a263d1 12075fac8b10SmrgAuthor: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 12085fac8b10SmrgDate: Wed Aug 5 17:16:16 2009 +0300 12095fac8b10Smrg 12105fac8b10Smrg xkbcomp: Remove output file if closing fails. 12115fac8b10Smrg 12125fac8b10Smrg Without the fix xkbcomp may leave a truncated file in the filesystem 12135fac8b10Smrg if there is not enough disk space. Using the truncated file leads to 12145fac8b10Smrg problems. 12155fac8b10Smrg 12165fac8b10Smrg Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 12175fac8b10Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 12185fac8b10Smrg 121934345a63Smrgcommit 2cc1dc9a327a5100043d3d54e899b98b81cdf5f5 122034345a63SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 122134345a63SmrgDate: Thu Jul 9 08:34:21 2009 +1000 122234345a63Smrg 122334345a63Smrg Bump to 1.1.0. 122434345a63Smrg 122534345a63Smrgcommit eeaa4aec798ef045d0b3b9de3c25932b85b9ac3d 122634345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 122734345a63SmrgDate: Mon May 11 09:39:03 2009 -0700 122834345a63Smrg 122934345a63Smrg Use temporary buffer for generating Uxxx names to avoid overflow 123034345a63Smrg 123134345a63Smrg Instead of sprintf()'ing a 4 character string to a char [4] buffer, 123234345a63Smrg and leaving the trailing '\0' to overwrite into the next entry, 123334345a63Smrg snprintf() to a 5 character temp buffer and memcpy the 4 characters 123434345a63Smrg to the right place. 123534345a63Smrg 123634345a63Smrg Fixes parfait errors: 123734345a63Smrg Error: Buffer overflow at xkbcomp-1.0.4/misc.c:393 123834345a63Smrg in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 123934345a63Smrg In sprintf related dereference of xkb->names->keys[i].name 124034345a63Smrg with index not less than '4' 124134345a63Smrg Destination array size is 4 bytes, data to be written is 4 bytes 124234345a63Smrg Error: Buffer overflow at xkbcomp-1.0.4/misc.c:402 124334345a63Smrg in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 124434345a63Smrg In sprintf related dereference of xkb->names->keys[i].name 124534345a63Smrg with index not less than '4' 124634345a63Smrg Destination array size is 4 bytes, data to be written is 4 bytes 124734345a63Smrg 124834345a63Smrg [This bug was found by the Parfait bug checking tool. 124934345a63Smrg For more information see http://research.sun.com/projects/parfait ] 125034345a63Smrg 125134345a63Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 125234345a63Smrg 125334345a63Smrgcommit 2fd42dae8840089727f95211abdb86316e566afd 125434345a63SmrgAuthor: Dan Nicholson <dbn.lists@gmail.com> 125534345a63SmrgDate: Sat Mar 7 16:36:51 2009 -0800 125634345a63Smrg 125734345a63Smrg Allow the default XKB config root to be set from configure 125834345a63Smrg 125934345a63Smrg The default was hardcoded in the Makefile as $(datadir)/share/X11/xkb. 126034345a63Smrg This could cause a problem if you are installing xkbcomp to an alternate 126134345a63Smrg location but want to continue using the system's XKB data. 126234345a63Smrg 126334345a63Smrg Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> 126434345a63Smrg 126534345a63Smrgcommit 3b816fe819bd849acdbabcfba769041bd3eab753 126634345a63SmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 126734345a63SmrgDate: Thu Jan 22 02:45:20 2009 -0200 126834345a63Smrg 126934345a63Smrg Correct a remaining of a wrong change to make some DEBUG_VAR's static. 127034345a63Smrg 127134345a63Smrgcommit f099da35386cf63d4935ba2613409ff28b3d7ea5 127234345a63SmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 127334345a63SmrgDate: Wed Jan 21 20:43:28 2009 -0200 127434345a63Smrg 127534345a63Smrg Correct make distcheck and most gcc and sparse warnings. 127634345a63Smrg 127734345a63Smrg Remaining warnings are due to macros that check address or vectors 127834345a63Smrg on the stack and auto generated yacc code. 127934345a63Smrg 128034345a63Smrg Compiled with default flags and also as: 128134345a63Smrg % make CFLAGS=-DENTRY_TRACKING_ON -DDEBUG_ON -DASSERTIONS_ON 128234345a63Smrg to ensure the "simplification" of code like: 128334345a63Smrg foo.c: 128434345a63Smrg <hash>define DEBUG_VAR foo_VAR 128534345a63Smrg <hash>include "foo.h" 128634345a63Smrg ... 128734345a63Smrg foo.h: 128834345a63Smrg <hash>ifdef DEBUG_VAR_NOT_LOCAL 128934345a63Smrg extern 129034345a63Smrg <hash>endif 129134345a63Smrg int DEBUG_VAR; 129234345a63Smrg ... 129334345a63Smrg did not change the author's "intended" logic. 129434345a63Smrg 129534345a63Smrgcommit 82cebb165b22d5409c9d4d31554a8da0c867e0d3 129634345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 129734345a63SmrgDate: Wed Sep 10 17:48:29 2008 +0930 129834345a63Smrg 129934345a63Smrg Check for NULL strings before calling strdup. 130034345a63Smrg 130134345a63Smrg Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> 130234345a63Smrg 130334345a63Smrgcommit a82e1dcc8ad095581402d05e5d1ae1bbf3646954 130434345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 130534345a63SmrgDate: Fri Sep 5 15:07:13 2008 -0700 130634345a63Smrg 130734345a63Smrg sprintf -> snprintf conversions 130834345a63Smrg 130934345a63Smrgcommit d2d06305e1834548edd8a647564efa222a511b53 131034345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 131134345a63SmrgDate: Fri Sep 5 14:44:51 2008 -0700 131234345a63Smrg 131334345a63Smrg Remove #if 0'd typedef that appears nowhere else. 131434345a63Smrg 131534345a63Smrgcommit acd277d7fd48ccfd8ef2ca052b4e144ee95a5d94 131634345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 131734345a63SmrgDate: Fri Sep 5 14:32:15 2008 -0700 131834345a63Smrg 131934345a63Smrg Remove X_NOT_POSIX #ifdefs 132034345a63Smrg 132134345a63Smrg POSIX.1-1990 is well below the current minimum bar 132234345a63Smrg 132334345a63Smrgcommit 37b62a26716d3abf2ae07dd88cf54bc04d980bd8 132434345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 132534345a63SmrgDate: Fri Sep 5 14:22:33 2008 -0700 132634345a63Smrg 132734345a63Smrg Check for strdup & strcasecmp before assuming we need to provide our own 132834345a63Smrg 132934345a63Smrgcommit 36fecff588199a3a6c007f09ff709f3148d40f77 133034345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 133134345a63SmrgDate: Tue Aug 19 16:33:03 2008 +0930 133234345a63Smrg 133334345a63Smrg Don't overwrite previously assigned type indices with useless ones. 133434345a63Smrg 133534345a63Smrg The default type for a key with no levels is ONE_LEVEL. 133634345a63Smrg Let's not overwrite the kt_index with this default type if we have previously 133734345a63Smrg assigned a real type. 133834345a63Smrg 133934345a63Smrg Reproduceable by running setxkbmap -layout "ru(phonetic),us", the first group 134034345a63Smrg is assigned ONE_LEVEL and shift stops working. 134134345a63Smrg 134234345a63Smrg Red Hat Bug #436626 <https://bugzilla.redhat.com/show_bug.cgi?id=436626> 134334345a63Smrg 134434345a63Smrgcommit d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c 134534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 134634345a63SmrgDate: Tue Aug 19 14:36:13 2008 +0930 134734345a63Smrg 134834345a63Smrg Remove unused merge parameter from HandleKeyNameVar. 134934345a63Smrg 135034345a63Smrgcommit 391ea45b2cadc7faeb6acb5d9ec7b405d67d46fd 135134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 135234345a63SmrgDate: Tue Aug 19 14:35:39 2008 +0930 135334345a63Smrg 135434345a63Smrg Don't pass useless handlers around in HandleIncludeKeycodes. 135534345a63Smrg 135634345a63Smrg What use is a handler if we only ever use one function anyway? 135734345a63Smrg 135834345a63Smrgcommit f05f20fd203afdadbcd571023ed31638ccda1f88 135934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 136034345a63SmrgDate: Thu Aug 21 17:28:22 2008 +0930 136134345a63Smrg 136234345a63Smrg More comments. 136334345a63Smrg 136434345a63Smrgcommit 1aad2a5d8ede9fe5212a4e6087fbe34aa170ac54 136534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 136634345a63SmrgDate: Mon Aug 18 16:28:44 2008 +0930 136734345a63Smrg 136834345a63Smrg Remove useless longestPath variable. 136934345a63Smrg 137034345a63Smrgcommit 7aef93914e1d6446f64aa42eafa18375c2cb4bed 137134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 137234345a63SmrgDate: Mon Aug 18 14:05:33 2008 +0930 137334345a63Smrg 137434345a63Smrg Silence valgrind warnings. 137534345a63Smrg 137634345a63Smrg "Conditional jump or move depends on uninitialised value(s)" 137734345a63Smrg 137834345a63Smrgcommit eb18e9176841b3ea64c497f1919686e134713eb6 137934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 138034345a63SmrgDate: Mon Aug 11 18:01:48 2008 +0930 138134345a63Smrg 138234345a63Smrg Add some explanatory comments 138334345a63Smrg 138434345a63Smrgcommit 9b877d83947708259252275e14f6995dcf7c29ce 138534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 138634345a63SmrgDate: Mon Aug 11 16:20:22 2008 +0930 138734345a63Smrg 138834345a63Smrg If we're not using XkbDesc, don't require it as a parameter. 138934345a63Smrg 139034345a63Smrgcommit ca32570cf16494fb8e0577de8b05ba18cb927ce1 139134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 139234345a63SmrgDate: Mon Aug 11 15:47:09 2008 +0930 139334345a63Smrg 139434345a63Smrg Indent fixes. 139534345a63Smrg 139634345a63Smrg indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h 139734345a63Smrg 139834345a63Smrgcommit 12e8f5e5b3f33dbd1290c76dd0d6a4cf832993d7 139934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 140034345a63SmrgDate: Mon Aug 11 15:40:03 2008 +0930 140134345a63Smrg 140234345a63Smrg Add a few explanatory comments. 140334345a63Smrg 140434345a63Smrgcommit de48206e7fe2206542313a2d1d1ea3c40b06114b 140534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 140634345a63SmrgDate: Mon Aug 11 15:14:31 2008 +0930 140734345a63Smrg 140834345a63Smrg Remove RCS tags. 140934345a63Smrg 141034345a63Smrgcommit 8eb2e1fcd08a05f296a31dbadde1ec3cc84d8e28 141134345a63SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 141234345a63SmrgDate: Mon May 12 23:25:47 2008 +0200 141334345a63Smrg 141434345a63Smrg Minimal man page addition for new -i option. 141534345a63Smrg 141634345a63Smrgcommit 12df85eb5b08d5fb815b0965714f120b05c6c670 141734345a63SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 141834345a63SmrgDate: Fri May 9 21:09:44 2008 +0300 141934345a63Smrg 142034345a63Smrg Bump to 1.0.5 142134345a63Smrg 1422f46a6179Smrgcommit 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d 1423f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1424f46a6179SmrgDate: Thu Apr 17 00:52:29 2008 +0300 1425f46a6179Smrg 1426f46a6179Smrg Don't scan paths which make NO SENSE WHATSOEVER TO SCAN 1427f46a6179Smrg 1428f46a6179Smrg Hey, I wonder if we have XKB files in our directory! I wonder if we 1429f46a6179Smrg haven't bothered with a structure, and let's try to open a file called 1430f46a6179Smrg 'misc' in someone's home directory! What a surprise, it's not a valid 1431f46a6179Smrg XKB file! Let's fail miserably! 1432f46a6179Smrg 1433f46a6179Smrg SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR. 1434f46a6179Smrg 1435f46a6179Smrgcommit a3a05fd489a9a35942a4419c537634e796dbebd1 1436f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1437f46a6179SmrgDate: Thu Apr 17 00:50:07 2008 +0300 1438f46a6179Smrg 1439f46a6179Smrg xkbcomp: Take a device ID argument 1440f46a6179Smrg 1441f46a6179Smrg Allows the user to set maps (or whatever) on arbitrary devices. 1442f46a6179Smrg 1443f46a6179Smrgcommit be084fbeba28312fc5102e98d64726464032c3e8 1444f46a6179SmrgAuthor: Adam Jackson <ajax@redhat.com> 1445f46a6179SmrgDate: Thu Mar 6 17:13:42 2008 -0500 1446f46a6179Smrg 1447f46a6179Smrg xkbcomp 1.0.4 1448f46a6179Smrg 1449f46a6179Smrgcommit c1cc023fc50ce3a4a23f4682ebefd2301fd13170 1450f46a6179SmrgAuthor: Adam Jackson <ajax@redhat.com> 1451f46a6179SmrgDate: Fri Feb 29 15:30:34 2008 -0500 1452f46a6179Smrg 1453f46a6179Smrg Bug #7645: Fix a conditional that always evaluates to FALSE. 1454f46a6179Smrg 1455f46a6179Smrg Since it's if (0 || foo), simplify to if (foo). 1456f46a6179Smrg 1457f46a6179Smrgcommit 3f8bd7e68d0028bce5075124a32cc004166486c6 1458f46a6179SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 1459f46a6179SmrgDate: Tue Jan 22 16:05:14 2008 -0800 1460f46a6179Smrg 1461f46a6179Smrg Bug 14185: MAINTAINERCLEANFILES multiply defined in Makefile.am 1462f46a6179Smrg 1463f46a6179Smrg <http://bugs.freedesktop.org/show_bug.cgi?id=14185> 1464f46a6179Smrg 1465f46a6179Smrgcommit 2421069a3686f7bff702383675fdb77be108021e 1466f46a6179SmrgAuthor: Matthieu Herrb <matthieu@bluenote.herrb.com> 1467f46a6179SmrgDate: Sun Jan 6 11:40:30 2008 +0100 1468f46a6179Smrg 1469f46a6179Smrg Revert "Also mark xkbparse.h as a generated file." 1470f46a6179Smrg Apparently only yacc generates it. 1471f46a6179Smrg 1472f46a6179Smrg This reverts commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002. 1473f46a6179Smrg 1474f46a6179Smrgcommit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002 1475f46a6179SmrgAuthor: Matthieu Herrb <matthieu@bluenote.herrb.com> 1476f46a6179SmrgDate: Sun Jan 6 11:17:07 2008 +0100 1477f46a6179Smrg 1478f46a6179Smrg Also mark xkbparse.h as a generated file. 1479f46a6179Smrg 1480f46a6179Smrgcommit 686e8b6d33602f5fb7de7a768e532a4ac8090c26 1481f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 1482f46a6179SmrgDate: Thu Dec 6 16:37:18 2007 -0500 1483f46a6179Smrg 1484f46a6179Smrg Replace static ChangeLog with dist-hook to generate from git log 1485f46a6179Smrg 1486f46a6179Smrgcommit 6aae208fe5bd8f71757c294a441d7c599a1ec4a1 1487f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1488f46a6179SmrgDate: Sun Sep 23 20:15:47 2007 +0200 1489f46a6179Smrg 1490f46a6179Smrg Ignore *.o and ylwrap. 1491f46a6179Smrg 1492f46a6179Smrgcommit 829cb75130d1edd88fa1d33e277f49167daedacf 1493f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1494f46a6179SmrgDate: Sun Sep 23 20:15:13 2007 +0200 1495f46a6179Smrg 1496f46a6179Smrg Fixed a bunch of const correctness bugs. 1497f46a6179Smrg 1498f46a6179Smrgcommit e8ffa513a109209849b11a3c608356cc28314a8e 1499f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1500f46a6179SmrgDate: Sun Sep 23 17:50:41 2007 +0200 1501f46a6179Smrg 1502f46a6179Smrg Fixed an invalid memory access. 1503f46a6179Smrg 1504f46a6179Smrg Some keynames are less than 3 characters long (not counting the 1505f46a6179Smrg terminator). We're now also initializing all of the keyName array. 1506f46a6179Smrg 1507f46a6179Smrgcommit dfa65b0c8df6a6aab4f86c32a0acb41f44201e7c 1508f46a6179SmrgAuthor: Daniel Drake <ddrake@brontes3d.com> 1509f46a6179SmrgDate: Mon May 21 13:41:00 2007 -0800 1510f46a6179Smrg 1511f46a6179Smrg Bug #11025: xkbcomp COPYING file 1512f46a6179Smrg 1513f46a6179Smrg X.Org Bugzilla #11025 <https://bugs.freedesktop.org/show_bug.cgi?id=11025> 1514f46a6179Smrg 1515f46a6179Smrgcommit 3ca028cf767258fd62fb7a1b0eb22d13d333a3ae 1516f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 1517f46a6179SmrgDate: Mon Sep 3 05:51:25 2007 -0400 1518f46a6179Smrg 1519f46a6179Smrg Add *~ to .gitignore to skip patch/emacs droppings 1520f46a6179Smrg 1521f46a6179Smrgcommit b00e474ca8dbbb0166f2108e4b08cc3f9c36c735 1522f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 1523f46a6179SmrgDate: Thu Aug 23 19:24:52 2007 -0400 1524f46a6179Smrg 1525f46a6179Smrg Rename .cvsignore to .gitignore 1526f46a6179Smrg 1527f46a6179Smrgcommit 313a2748d3dff872e067d515d6deabe1bbd56fbe 1528f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1529f46a6179SmrgDate: Wed Nov 8 16:30:57 2006 +0200 1530f46a6179Smrg 1531f46a6179Smrg bump to 1.0.3 1532f46a6179Smrg 1533f46a6179Smrgcommit 337ed258a1cd3f5a16fa69ef15e98781e76f63a1 1534f46a6179SmrgAuthor: Etsushi Kato <ek.kato@gmail.com> 1535f46a6179SmrgDate: Wed Nov 8 16:29:16 2006 +0200 1536f46a6179Smrg 1537f46a6179Smrg compat: avoid use of uninitialised variable (bug #8846) 1538f46a6179Smrg si.interp.match may be unused, so just clobber it, which means we don't 1539f46a6179Smrg end up with stuff like LevelOneOnlyMask wandering in. 1540f46a6179Smrg 1541f46a6179Smrgcommit d920bbadb94684287f70e50ded2a35d65186c188 1542f46a6179SmrgAuthor: Andriy Gapon <avg@icyb.net.ua> 1543f46a6179SmrgDate: Sun Oct 29 02:59:53 2006 +0300 1544f46a6179Smrg 1545f46a6179Smrg parser: accept negative numbers in geometry co-ordinates (bug #8763) 1546f46a6179Smrg Accept negative co-ordinates for geometry, per the spec. 1547f46a6179Smrg 1548f46a6179Smrgcommit 0e8fd676de161ba52bb4544f8641be756bc580a1 1549f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1550f46a6179SmrgDate: Wed Apr 26 23:41:58 2006 +0000 1551f46a6179Smrg 1552f46a6179Smrg Bump to 1.0.2 1553f46a6179Smrg 1554f46a6179Smrgcommit 58c77c8db1bfdc739fac7b100fb813028d0449c7 1555f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1556f46a6179SmrgDate: Mon Apr 3 11:28:43 2006 +0000 1557f46a6179Smrg 1558f46a6179Smrg Bug #4851: Fix up have-no-file test. 1559f46a6179Smrg 1560f46a6179Smrgcommit 02d32f8dbc79116d33ef428d5b064009cdd6a06e 1561f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1562f46a6179SmrgDate: Wed Dec 21 02:29:51 2005 +0000 1563f46a6179Smrg 1564f46a6179Smrg Update package version for X11R7 release. 1565f46a6179Smrg 1566f46a6179Smrgcommit 836db774d1f08a050af8717c4c8501f337f36281 1567f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1568f46a6179SmrgDate: Mon Dec 19 16:22:44 2005 +0000 1569f46a6179Smrg 1570f46a6179Smrg Stub COPYING files 1571f46a6179Smrg 1572f46a6179Smrgcommit e9f680c5654cd93d30b16bc4b626ae5b25f84e87 1573f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1574f46a6179SmrgDate: Thu Dec 15 00:24:08 2005 +0000 1575f46a6179Smrg 1576f46a6179Smrg Update package version number for final X11R7 release candidate. 1577f46a6179Smrg 1578f46a6179Smrgcommit b158f550fce661d67604f4a23d33a9f3b7bc22a1 1579f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1580f46a6179SmrgDate: Tue Dec 6 22:48:22 2005 +0000 1581f46a6179Smrg 1582f46a6179Smrg Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 1583f46a6179Smrg 1584f46a6179Smrgcommit f1370c50b199c3c8b2760ebf0228d741855390d7 1585f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1586f46a6179SmrgDate: Sat Dec 3 05:49:24 2005 +0000 1587f46a6179Smrg 1588f46a6179Smrg Update package version number for X11R7 RC3 release. 1589f46a6179Smrg 1590f46a6179Smrgcommit 8eb3737f5bce19b89c80d9ab256204f0fa62529b 1591f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1592f46a6179SmrgDate: Mon Nov 28 22:01:43 2005 +0000 1593f46a6179Smrg 1594f46a6179Smrg Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 1595f46a6179Smrg update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 1596f46a6179Smrg 1597f46a6179Smrgcommit f19c3028c34a0dba4ffb9ae19c13421e7ff0ff12 1598f46a6179SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1599f46a6179SmrgDate: Mon Nov 21 10:35:01 2005 +0000 1600f46a6179Smrg 1601f46a6179Smrg Another pass at .cvsignores for apps. 1602f46a6179Smrg 1603f46a6179Smrgcommit 3ada747f1cb5400404e4b63430f7a817dbf0c4cb 1604f46a6179SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1605f46a6179SmrgDate: Sun Nov 20 22:08:53 2005 +0000 1606f46a6179Smrg 1607f46a6179Smrg Add/improve .cvsignore files for apps. 1608f46a6179Smrg 1609f46a6179Smrgcommit 4eeb611f17bdc01f7a6cb4db3f0997ce5ecc6361 1610f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1611f46a6179SmrgDate: Wed Oct 19 02:47:54 2005 +0000 1612f46a6179Smrg 1613f46a6179Smrg Update package version number for RC1 release. 1614f46a6179Smrg 1615f46a6179Smrgcommit 958d09064c96cb50df6f92bfb8d4754c87451920 1616f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1617f46a6179SmrgDate: Mon Oct 17 23:56:23 2005 +0000 1618f46a6179Smrg 1619f46a6179Smrg Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to 1620f46a6179Smrg work better with BSD make 1621f46a6179Smrg 1622f46a6179Smrgcommit 950fba3262905c58891773a8795305e685dc1cb3 1623f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1624f46a6179SmrgDate: Sat Oct 15 19:32:52 2005 +0000 1625f46a6179Smrg 1626f46a6179Smrg Have generated files be cleaned by maintainer in order to pass 1627f46a6179Smrg check-tarball test. 1628f46a6179Smrg 1629f46a6179Smrgcommit a83e4bb777d6f9b1b42a7fb3ff84a5e0d7e123c7 1630f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1631f46a6179SmrgDate: Fri Oct 14 00:25:46 2005 +0000 1632f46a6179Smrg 1633f46a6179Smrg Use sed to fill in variables in man page 1634f46a6179Smrg 1635f46a6179Smrgcommit 8c0d310c1acccc424dae29554a5075f9b339e95f 1636f46a6179SmrgAuthor: Kristian Høgsberg <krh@redhat.com> 1637f46a6179SmrgDate: Thu Sep 1 19:37:02 2005 +0000 1638f46a6179Smrg 1639f46a6179Smrg Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right 1640f46a6179Smrg place. 1641f46a6179Smrg 1642f46a6179Smrgcommit fabda6a820bdccae85a7c22ad0b30f089952606b 1643f46a6179SmrgAuthor: Keith Packard <keithp@keithp.com> 1644f46a6179SmrgDate: Tue Aug 2 18:03:01 2005 +0000 1645f46a6179Smrg 1646f46a6179Smrg Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are 1647f46a6179Smrg regenerated after 'make clean' and to make parallel builds work right. 1648f46a6179Smrg 1649f46a6179Smrgcommit 35e0b7ef41ffe1f17ad8f21dbda10267961231ea 1650f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1651f46a6179SmrgDate: Fri Jul 29 21:22:35 2005 +0000 1652f46a6179Smrg 1653f46a6179Smrg Various changes preparing packages for RC0: 1654f46a6179Smrg - Verify and update package version numbers as needed 1655f46a6179Smrg - Implement versioning scheme 1656f46a6179Smrg - Change bug address to point to bugzilla bug entry form 1657f46a6179Smrg - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 1658f46a6179Smrg reenable it) 1659f46a6179Smrg - Fix makedepend to use pkgconfig and pass distcheck 1660f46a6179Smrg - Update build script to build macros first 1661f46a6179Smrg - Update modular Xorg version 1662f46a6179Smrg 1663f46a6179Smrgcommit e447fee50a8014b5281a5abfcc5e468f8cc130ca 1664f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1665f46a6179SmrgDate: Fri Jul 22 15:08:19 2005 +0000 1666f46a6179Smrg 1667f46a6179Smrg Use YACC to compile xkbparse.y. 1668f46a6179Smrg 1669f46a6179Smrgcommit 34cd161f5947b4dc185356bc65653717f56ced00 1670f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1671f46a6179SmrgDate: Wed Jul 20 19:31:57 2005 +0000 1672f46a6179Smrg 1673f46a6179Smrg Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global 1674f46a6179Smrg configure cache, you cache it, and the cached value is probably wrong. 1675f46a6179Smrg 1676f46a6179Smrgcommit 8335e5fa471e25675c6a369ec2348883953fcdd0 1677f46a6179SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1678f46a6179SmrgDate: Sat Jul 16 20:56:47 2005 +0000 1679f46a6179Smrg 1680f46a6179Smrg Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am 1681f46a6179Smrg 1682f46a6179Smrgcommit d7b3354575f31caa9044b6c5f7aee4f010f6192a 1683f46a6179SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1684f46a6179SmrgDate: Fri Jul 15 18:02:35 2005 +0000 1685f46a6179Smrg 1686f46a6179Smrg Build system for xkbcomp 1687f46a6179Smrg 1688f46a6179Smrgcommit 59e48918e7c252926bb5e51a077bcbc8a7eec829 1689f46a6179SmrgAuthor: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> 1690f46a6179SmrgDate: Mon Nov 15 15:06:52 2004 +0000 1691f46a6179Smrg 1692f46a6179Smrg Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added 1693f46a6179Smrg mingw (Win32) port 1694f46a6179Smrg 1695f46a6179Smrgcommit 0336e043fab6f2a8828d90bc9eef2e23878f6dd1 1696f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1697f46a6179SmrgDate: Fri Sep 3 23:41:22 2004 +0000 1698f46a6179Smrg 1699f46a6179Smrg Update formatted docs. 1700f46a6179Smrg 1701f46a6179Smrgcommit 20240438ef9d3a6c66443ca9f095a2766ef6ed4e 1702f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1703f46a6179SmrgDate: Fri Apr 23 19:54:50 2004 +0000 1704f46a6179Smrg 1705f46a6179Smrg Merging XORG-CURRENT into trunk 1706f46a6179Smrg 1707f46a6179Smrgcommit a3729a9f9fcda07b233f434266148c8751684347 1708f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1709f46a6179SmrgDate: Sun Mar 14 08:35:25 2004 +0000 1710f46a6179Smrg 1711f46a6179Smrg Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 1712f46a6179Smrg 1713f46a6179Smrgcommit 37a1152a4024fb799fe1272ce378e6c7c97ee951 1714f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1715f46a6179SmrgDate: Wed Mar 3 12:13:08 2004 +0000 1716f46a6179Smrg 1717f46a6179Smrg Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 1718f46a6179Smrg 1719f46a6179Smrgcommit 55f40d0286d0e2e4b1602f983b749352188c3ec4 1720f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1721f46a6179SmrgDate: Thu Feb 26 13:36:25 2004 +0000 1722f46a6179Smrg 1723f46a6179Smrg readding XFree86's cvs IDs 1724f46a6179Smrg 1725f46a6179Smrgcommit 2a95cda1d358fc309c78dc5201a1dbacaba9d0bf 1726f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1727f46a6179SmrgDate: Thu Feb 26 09:24:08 2004 +0000 1728f46a6179Smrg 1729f46a6179Smrg Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 1730f46a6179Smrg 1731f46a6179Smrgcommit dbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2 1732f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1733f46a6179SmrgDate: Thu Jan 29 08:09:12 2004 +0000 1734f46a6179Smrg 1735f46a6179Smrg Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 1736f46a6179Smrg 1737f46a6179Smrgcommit 8aa5bcfe58d3776746d7b0d627f2fb8744fb0817 1738f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1739f46a6179SmrgDate: Fri Dec 19 20:55:58 2003 +0000 1740f46a6179Smrg 1741f46a6179Smrg XFree86 4.3.99.902 (RC 2) 1742f46a6179Smrg 1743f46a6179Smrgcommit 37ebbbe7b11febaf548006a9b73db0eebf79881a 1744f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1745f46a6179SmrgDate: Tue Nov 25 19:29:13 2003 +0000 1746f46a6179Smrg 1747f46a6179Smrg XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 1748f46a6179Smrg 1749f46a6179Smrgcommit 287ac4c6af61d8f9f95cd3b3219c979e1329a2fe 1750f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1751f46a6179SmrgDate: Fri Nov 14 16:49:22 2003 +0000 1752f46a6179Smrg 1753f46a6179Smrg XFree86 4.3.0.1 1754f46a6179Smrg 1755f46a6179Smrgcommit 262961d88faf67f69f4630acb8234a4f2c5a6e80 1756f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1757f46a6179SmrgDate: Fri Nov 14 16:49:22 2003 +0000 1758f46a6179Smrg 1759f46a6179Smrg Initial revision 1760f46a6179Smrg 1761f46a6179Smrgcommit 2af3aabf0e7eb1514d39b29a6b58fcd0d4de41d1 1762f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1763f46a6179SmrgDate: Fri Nov 14 15:54:54 2003 +0000 1764f46a6179Smrg 1765f46a6179Smrg R6.6 is the Xorg base-line 1766