Branch :
| Author | Commit | Date | CI | Message |
|---|---|---|---|---|
| 9bd55b55 | 2012-07-23 23:10:07 | makekeys: Add top_srcdir to include path Fixes distcheck with no /usr/include/xkbcommon. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 5e164ff1 | 2012-07-23 00:41:27 | build: drop the include/ directory The include/ dir is somewhat redundant and makes it just a bit harder to handle the -I directives from out side of automake; without it the default $(top_buildir) just works. Here's also some further justifications I found: http://smcv.pseudorandom.co.uk/2008/09/pc-uninstalled/ Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 9308a460 | 2012-07-17 10:20:15 | Run source tree through uncrustify .uncrustify.cfg committed for future reference also, but had to manually fix up a few things: it really likes justifying struct initialisers. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 58b030bb | 2012-05-20 20:39:35 | Move XKB_KEY_NoSymbol to xkbcommon-keysyms.h This avoids a couple of special cases in the code, and is more consistent. Since anyone who includes xkbcommon.h also gets xkbcommon-keysyms.h, and anyone who include xkbcommon-keysyms.h would want NoSymbol anyway, there's no down side. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 6433d72e | 2012-05-09 20:12:12 | Merge remote-tracking branch 'krh/keysyms' Conflicts: src/keysym.c src/misc.c src/text.h src/xkbcomp/expr.c src/xkbcomp/parser.y src/xkbcomp/parseutils.c src/xkbcomp/symbols.c Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| ace1e5df | 2012-05-09 09:05:00 | Use our own keysyms | ||
| bdbb3ac4 | 2012-05-08 11:46:58 | makekeys: fix cross-compilation makekeys must be built with the build-native compiler, not with $(CC) which is the cross-compiler. The only sane way to achieve this seems to be to use a separate Makefile.am for it. This patch fixes the problem apparently caused by: commit b5efe41f190cbb76eb1ca8ddf0c96990ddb83704 Author: Ran Benita <ran234@gmail.com> Date: Sat Mar 24 04:48:31 2012 +0200 Make build non-recursive There is no such thing as makekeys_makekeys_CC in automake. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com> | ||
| 5c5f7fcb | 2012-04-01 16:48:34 | makekeys: use correct format strings The new glibc (2.15) appear to cause trouble, particularly the sscanf call, where makekeys will output empty hash tables. Using the appropriate macros from inttypes.h makes it work again. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 9813778e | 2012-04-01 16:57:31 | makekeys: free strings before exiting Just to make valgrind happy. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| b5efe41f | 2012-03-24 04:48:31 | Make build non-recursive Unify all the different Makefile.am into a single short top level one (the test/Makefile.am file is left intact though). This makes the build system simpler to look and should encourage unifying more currently-disparate code. Some further motivation can be found in this page: http://www.flameeyes.eu/autotools-mythbuster/automake/nonrecursive.html Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 602e8780 | 2012-03-24 13:27:48 | Define our own NoSymbol value and use it Since we have our own xkb_keysym_t type, it makes sense to have our own NoSymbol value instead of the one from X11/X.h. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 55b76a63 | 2012-03-27 14:05:14 | Add include/ to makekeys include path Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| f52671a4 | 2012-03-24 12:31:55 | Remove a few remaining uses of the KeySym type Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 0d8874d0 | 2012-02-26 00:03:24 | makekeys: update to match the rest of libX11 makekeys This integrates two commits from libX11: ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba XStringToKeysym: Special case for XF86 keysyms Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being XF86foo. So, if we get to the bottom of XStringToKeysym and haven't found our XF86_foo, try it again as XF86foo. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 00175397480b76d32bf82b0c7c94c91a2a95954e makekeys: Scan vendor keysyms as well as core Since we can't really live without vendor keysyms, scan them all in to generate ks_tables.h, rather than only doing the core ones, and leaving the vendor syms to be manually synchronised with XKeysymDB. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Notice that the xkey.sh test is changed to match libX11 behavior, i.e. XKeysymToString(0x1008FE20) -> "XF86Ungrab" as opposed to "XF86_Ungrab". Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| ad4f195e | 2012-02-25 23:17:47 | makekeys: Receive the keysym files as arguments Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 0e98541f | 2012-02-25 21:13:26 | When makekeys fails to find a good hash, print error instead of divide-by-zero This matches commit 78a894231ae8ec4959007b6d9b8d2a15d6333a1e from libX11: Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 04e687c9 | 2012-02-25 21:09:28 | makekeys: Fix build/target word size mismatch when cross-compiling This matches commit 24283d40b1e4314c6647dda49d2a159833341a8b from libX11: Since makekeys is built using build environment's compiler and runs natively, we have to make sure that the size of the Signature type is the same on both the native environment and the target, otherwise we get mismatches upon running X, and some LSB test failures (xts5). Use an unsigned 32-bit integer on all platforms. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| a48ddb5d | 2012-02-24 15:55:45 | makekeys: clear const and shadow warnings The name 'index' is used by the standard library, so use 'ndx' like some other files. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 6a3b38b1 | 2012-02-24 15:51:31 | Remove ancient compatibility check Other headers include malloc just fine. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| fdf7e8f6 | 2012-02-24 15:53:08 | makekeys: make buf local to main() All the functions already accept it as a parameter. This clears -Wshadow warnings. Signed-off-by: Ran Benita <ran234@gmail.com> | ||
| 69e52ad9 | 2010-12-09 16:22:17 | config: makekeys prog should stand alone in the makekeys directory This program is a utility to generated a header file. The header file it generates should not be located in the directory where this utility program is compiled. Move the /makekeys dir as a sibling of /src. This reduces the number of bi-directional relationships between directories. Make corresponding makefiles simplifications. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> |