summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-05xkbcomp: Silence warning of return of uninitialised valuefor-weston-0.85Rob Bradford1-1/+1
Some routes through HandleGeometryVar do not set a return value. Set a default value for the return variable to avoid returning an uninitialised value.
2011-12-16Add xkbc_free_keymap helperPekka Paalanen2-0/+9
Which just calls XkbcFreeKeyboard with the only arguments you'd ever pass it. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2011-10-27xkbcomp: Copy the string into the buffer rather than updating pointerRob Bradford1-1/+2
Avoids assigning the global pointer to a value that may only have a stack lifetime: Fixes valgrind warnings such as: ==24795== Invalid read of size 1 ==24795== at 0x4A06E9A: strcpy (mc_replace_strmem.c:311) ==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73) ==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829) ==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673) ==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211) ==24795== by 0x4E51A61: CompileKeymap (keymap.c:155) ==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236) ==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161) ==24795== by 0x405ED2: display_create (window.c:2007) ==24795== by 0x403732: main (desktop-shell.c:320) ==24795== Address 0x7fefff0a0 is just below the stack ptr. To suppress, use: --workaround-gcc296-bugs=yes ==24795== ==24795== Source and destination overlap in strcpy(0x7fefff430, 0x7fefff430) ==24795== at 0x4A06F3D: strcpy (mc_replace_strmem.c:311) ==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73) ==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829) ==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673) ==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211) ==24795== by 0x4E51A61: CompileKeymap (keymap.c:155) ==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236) ==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161) ==24795== by 0x405ED2: display_create (window.c:2007) ==24795== by 0x403732: main (desktop-shell.c:320)
2011-06-03Add prototype for CheckDefaultMap().Cyril Brulebois1-0/+2
Those warnings disappear accordingly: | CC parseutils.lo | parseutils.c:742: warning: no previous prototype for ‘CheckDefaultMap’ | CC xkbscan.lo | xkbscan.l: In function ‘XKBParseString’: | xkbscan.l:220: warning: implicit declaration of function ‘CheckDefaultMap’ | xkbscan.l:220: warning: nested extern declaration of ‘CheckDefaultMap’ Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-04-04Also update required kbproto version in .pc.in fileKristian Høgsberg1-1/+1
2011-03-18configure: Lower kbproto requirement to 1.0.4Kristian Høgsberg1-1/+1
There's nothing in 1.0.5 that we need.
2011-01-29Revert "config: remove incorrectly implemented visibility compiler option"Kristian Høgsberg1-0/+4
This reverts commit bf9fdceef63507da889a22eb1a583d2b6376f5ea. We really only want to expose symbols that we explicitly mark as part of the API. This may not work with other platforms or compilers, but the fact that private symbols are not available on Linux+GCC is enough of an incentive to not use those. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2011-01-29Get rid of unneeded <X11/Xlib.h> include.Cyril Brulebois1-1/+0
There's no need for this xlib include: | YACC xkbparse.c | CC xkbparse.lo | xkbparse.y:98:22: error: X11/Xlib.h: No such file or directory Signed-off-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2011-01-29Rename XkbcInternAtom() to xkb_intern_atom() and exportKristian Høgsberg12-88/+85
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2010-12-18config: update COPYING for software licensingGaetan Nadon1-0/+48
The Copyright statements must appear in full. When only the year was different, I added it in an existing Copyright statement. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: set the default xkb config root based on xkeyboard-config moduleGaetan Nadon1-1/+2
The default value ${dataroot}/X11/xkb only works if xkeyboard-config has created the keymaps in that directory. Let's obtain the true final value of where the keymaps are and use that as a default. In a production environment this is the only value that can work. This new default value also has the merit of making the 'check' target to work in distcheck which does not have a copy of the xkeyboard-config keymaps in its sandbox based on ${dataroot}/X11/xkb. The test data cannot find the "include" keymaps it needs. .../libxkbcommon-0.1.0/_inst/share/X11/xkb Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: distribute the .sh test programs and test dataGaetan Nadon1-0/+7
The test programs and the test data are required in the tarball and needed for distcheck. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: make it easier to add TEST programsGaetan Nadon1-16/+2
LDADD is a Makefile wide variable. Automake matches prog name with .c file by default Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: include: use nobase_include_HEADERSGaetan Nadon1-2/+1
Slightly simpler. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: add keysymdef and xf86keysym as dependencies of ks_tables.hGaetan Nadon1-1/+1
This would cover the scenario where these headers file are updated, for example, a new version is installed. Running 'make' again on libxkbcommon should rebuild ks_tables.h. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: makekeys prog should stand alone in the makekeys directoryGaetan Nadon8-18/+17
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>
2010-12-18config: use existing variables KEYSYMDEF_H and XF86KEYSYM_HGaetan Nadon2-4/+1
These automake variables are not currently used. The variable KS_HEADERS is not required anymore. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: remove incorrectly implemented visibility compiler optionGaetan Nadon1-4/+0
CFLAGS is a user variable which should never be set by the configuration. It allows the user to alter the configuration compiler options. The visibility is only set for GNU compiler, leaving libraries built with other compilers with the wrong visibility. All other xorg libraries set visibilty using _X_EXPORT or _X_HIDDEN. For the time being, all the symbols will have the default visibility which does not break anything. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: use xproto pkgconfig includex11dir variableGaetan Nadon1-7/+7
Rather than appending X11 to the include dir. It should be safe to use as it has been added in 2005. Use a local variable name matching the pkgconfig name. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-18config: relocate library functions check and commentGaetan Nadon1-12/+17
No functional changes. Follow Automake suggested order. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: remove PKG_PROG_PKG_CONFIG testGaetan Nadon1-15/+8
If pkg-config is missing, the configuration fails while initializing XORG_* macros: warning: PKG_PROG_PKG_CONFIG is m4_require'd but not m4_defun'd line 11622: PKG_PROG_PKG_CONFIG: command not found The output is sufficient to locate the problem. It is not possible, or very difficult, to not have pkg-config installed as the whole desktop and countless other software depends on it. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: let Automake handle Lex and Yacc dist and cleaningGaetan Nadon1-3/+0
BUILT_SOURCES and MAINTAINERCLEAN are not needed for lex and yacc Note that xkbscan was missing on those lines. Automake generates all the rules to handle building, distribution and cleaning. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: allow to build tarball when yacc is missingGaetan Nadon1-1/+7
Autoconf does not handle this scenario as well as Automake does. If xkbparse.c is already there, do not abort the configuration if yacc is missing as it is not needed. If both xkbparse.c and yacc are missing, abort configuration. Yacc is a required tool to build the package. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: add the default README file.Gaetan Nadon1-0/+23
Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: add the INSTALL target for installation instructionsGaetan Nadon1-4/+5
Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-08config: replace deprecated INCLUDES with AM_CPPFLAGSGaetan Nadon4-4/+4
Fixes automake warning. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: update subdirs .gitignoreGaetan Nadon3-3/+2
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: remove m4/.gitignore now that toplevel one handles it allGaetan Nadon2-4/+0
The -Im4 in Makefile.am will have to wait until the day there is an m4 macro checked-in git in the m4 directory. This does not prevent libtool to install its macros in m4. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: .gitignore: template with default values for components #24239Gaetan Nadon1-21/+76
This toplevel .gitignore covers all possible generated files from autotools, compiler, linker, etc... It has been in use for over a year in all xorg modules and has prevented a good number of patches. For example, in this module, src/stamp-h1 was not ignored even if the .gitignore had just been updated. Files with a .patch extension were not ignored which sometimes cause a patch to be checked-in git accidentally. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: remove AC_PROG_CC as it overrides AC_PROG_C_C99Gaetan Nadon1-1/+0
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_C_C99. This sets gcc with -std=gnu99. If AC_PROG_CC macro is called afterwards, it resets CC to gcc. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: initialize autoconf, automake and libtoolGaetan Nadon1-1/+8
Add missing AM_MAINTAINER_MODE, matching --enable-maintainer-mode option in autogen.sh. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: use XORG_DEFAULT_OPTION from util-macros version 1.8Gaetan Nadon1-9/+5
This will handle AM_SILENT_RULES such that it will not break on earlier Autoconf versions. It provides a host of other configuration items Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07config: set Autoconf minimum version required to 2.60Gaetan Nadon1-1/+1
This is the current minimum version required for all X.Org modules. The module can be configured with any higher version. Autoconf features from version > 2.60 cannot be used. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-11-11Update .gitignoreJan Engelhardt1-17/+17
Limit exclusion of files to their respective directory that they can appear in. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11xkbscan: resolve build warning/rpmlint errorJan Engelhardt2-3/+3
xkbscan.l: In function 'setScanState': xkbscan.l:201:1: warning: control reaches end of non-void function I: Program returns random data in a function E: libxkbcommon no-return-in-nonvoid-function xkbscan.l:201 Change return type of setScanState to void, since a return value is never used by its callers. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11build: run autoupdateJan Engelhardt1-3/+4
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11build: use proper quoting in autogen.shJan Engelhardt1-4/+4
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-11-11build: use AC_CONFIG_MACRO_DIR as per libtoolize warningJan Engelhardt3-0/+5
libtoolize: Consider adding "AC_CONFIG_MACRO_DIR([m4])" to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding "-I m4" to ACLOCAL_AMFLAGS in Makefile.am. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
2010-10-26Link with -no-undefinedJon TURNEY1-0/+1
Use -no-undefined to assure libtool that the libxkbcommon library has no unresolved symbols at link time, so that libtool will build a shared library on platforms require that all symbols are resolved when the library is linked. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-21Don't check for xlib, we don't need itKristian Høgsberg2-3/+2
2010-10-20Update xkb->ctrls->num_groups when copying the keysymsKristian Høgsberg1-0/+3
This used to be set when we read an XKM file.
2010-10-20Restore compatible action structsKristian Høgsberg3-73/+54
This unbreaks the X server code to serialize an xkb_desc, but loses the 32 bit vmod fields. Needs some work...
2010-10-20Use flex for generating the scanner, add support for parsing from stringsKristian Høgsberg10-804/+316
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2010-10-19Add struct xkb_stateKristian Høgsberg1-0/+36
2010-10-08Don't return a static buffer in public APIKristian Høgsberg4-27/+29
2010-10-08Pull in XKB_COMMON_* version of modifier masksKristian Høgsberg1-0/+12
This way we can use libxkbcommon without having to include X.h.
2010-09-27Dead code removal and static markupAdam Jackson32-1904/+67
Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-03Remove libxkbfile dependency for real this timeKristian Høgsberg3-19/+42
2010-08-29Use const char * in struct xkb_rule_namesKristian Høgsberg2-9/+9
2010-08-25Pull in a few #defines from libxkbfile and lower kbproto requirementKristian Høgsberg6-5/+21
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 04:20:44 +0000