libxkbcommon: Changes to 'ubuntu'
ChangeLog | 117 +++++++++++++++++++++++++++++++++++++
configure.ac | 6 +
debian/changelog | 17 +++++
debian/control | 2
include/X11/extensions/XKBcommon.h | 6 +
src/atom.c | 22 +++---
src/xkbcomp/action.c | 4 -
src/xkbcomp/compat.c | 4 -
src/xkbcomp/geometry.c | 58 +++++++++---------
src/xkbcomp/indicators.c | 2
src/xkbcomp/keycodes.c | 4 -
src/xkbcomp/keytypes.c | 12 +--
src/xkbcomp/parseutils.h | 2
src/xkbcomp/symbols.c | 31 ++++-----
src/xkbcomp/vmod.c | 2
src/xkbcomp/xkbcomp.c | 6 +
src/xkbcomp/xkbparse.y | 29 ++++-----
src/xkbcomp/xkbscan.l | 3
src/xkbmisc.h | 3
xkbcommon.pc.in | 2
20 files changed, 239 insertions(+), 93 deletions(-)
New commits:
commit df50b2ba85a8861a5560ebb73c8c613bec677f18
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 3 21:44:29 2012 +0200
update the changelog, release
diff --git a/debian/changelog b/debian/changelog
index 7c1f15d..2f5ef2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxkbcommon (0.1.0~1-0ubuntu1) precise; urgency=low
+
+ * Merge from Debian git. Remaining Ubuntu changes:
+ - Make explicit that this is an experimental package
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 03 Jan 2012 21:43:00 +0200
+
libxkbcommon (0.1.0~1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
commit 04a02cc6ddb5875d695f630eec98bbed212f1001
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 3 21:40:07 2012 +0200
fix the debian revision
diff --git a/debian/changelog b/debian/changelog
index 73aae6f..621ca46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxkbcommon (0.1.0~1-2) UNRELEASED; urgency=low
+libxkbcommon (0.1.0~1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Fix short description for libxkbcommon-dev.
commit be68e77dd87571f9f03e252d43849068bf47e142
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 3 21:27:28 2012 +0200
bump the snapshot revision
diff --git a/debian/changelog b/debian/changelog
index 460df16..73aae6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxkbcommon (0.1.0~0-2) UNRELEASED; urgency=low
+libxkbcommon (0.1.0~1-2) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Fix short description for libxkbcommon-dev.
commit 23cfbefa97b0a6509f0a24c494b888cc07165a48
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 3 21:24:34 2012 +0200
update the changelogs
diff --git a/ChangeLog b/ChangeLog
index d0536a5..3e20193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,120 @@
+commit c19661b965c0058a525f439abd7ac4c5a3532c7d
+Author: Pekka Paalanen <ppaalanen@gmail.com>
+Date: Fri Dec 16 12:52:00 2011 +0000
+
+ Add xkbc_free_keymap helper
+
+ 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>
+
+commit 99e29de22d40c5c9161a0fd28fa2a9c75328386a
+Author: Rob Bradford <rob@linux.intel.com>
+Date: Thu Oct 27 14:30:21 2011 +0100
+
+ xkbcomp: Copy the string into the buffer rather than updating pointer
+
+ 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)
+
+commit f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Fri Jun 3 17:19:09 2011 +0200
+
+ Add prototype for CheckDefaultMap().
+
+ 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>
+
+commit 05f5be9f6d3b8dfbb3af3eeb2b26800ea0515de2
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Mon Apr 4 09:21:55 2011 -0400
+
+ Also update required kbproto version in .pc.in file
+
+commit 9dd7dc6d8884a4e02527ef16c299c6253ea468b9
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Fri Mar 18 00:33:48 2011 -0400
+
+ configure: Lower kbproto requirement to 1.0.4
+
+ There's nothing in 1.0.5 that we need.
+
+commit dd0e8b70fb11a19887f8d05d1ed0c10921424a43
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Sat Jan 29 14:06:39 2011 -0500
+
+ Revert "config: remove incorrectly implemented visibility compiler option"
+
+ 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>
+
+commit 621c2a7a8c4a14a5ddfdd6add735b78efd950f2b
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Sat Jan 29 14:24:46 2011 +0100
+
+ Get rid of unneeded <X11/Xlib.h> include.
+
+ 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>
+
+commit a63e82be2a63d82b5b3802ae40efae2538461512
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Fri Dec 17 21:14:54 2010 -0500
+
+ Rename XkbcInternAtom() to xkb_intern_atom() and export
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+
commit b9b0011994c2887625cdb23633d67a8fefd6b7cb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 11 19:25:09 2010 -0500
diff --git a/debian/changelog b/debian/changelog
index fc2f697..460df16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
libxkbcommon (0.1.0~0-2) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* Fix short description for libxkbcommon-dev.
+ [ Timo Aaltonen ]
+ * Merge master up to c19661b965.
+
-- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 16:21:08 +0200
libxkbcommon (0.1.0~0-1) experimental; urgency=low
commit c19661b965c0058a525f439abd7ac4c5a3532c7d
Author: Pekka Paalanen <ppaalanen@gmail.com>
Date: Fri Dec 16 12:52:00 2011 +0000
Add xkbc_free_keymap helper
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>
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 4e6058c..b353759 100644
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -795,6 +795,9 @@ xkb_compile_keymap_from_file(FILE *inputFile, const char *mapName);
_X_EXPORT extern struct xkb_desc *
xkb_compile_keymap_from_string(const char *string, const char *mapName);
+_X_EXPORT extern void
+xkb_free_keymap(struct xkb_desc *xkb);
+
_X_EXPORT extern struct xkb_component_list *
xkb_list_components(struct xkb_component_names * ptrns, int *maxMatch);
diff --git a/src/xkbcomp/xkbcomp.c b/src/xkbcomp/xkbcomp.c
index 63858a0..cc3b52d 100644
--- a/src/xkbcomp/xkbcomp.c
+++ b/src/xkbcomp/xkbcomp.c
@@ -324,3 +324,9 @@ xkb_compile_keymap_from_file(FILE *inputFile, const char *mapName)
return compile_keymap(file, mapName);
}
+
+void
+xkb_free_keymap(struct xkb_desc *xkb)
+{
+ XkbcFreeKeyboard(xkb, 0, True);
+}
commit 99e29de22d40c5c9161a0fd28fa2a9c75328386a
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Oct 27 14:30:21 2011 +0100
xkbcomp: Copy the string into the buffer rather than updating pointer
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)
diff --git a/src/xkbcomp/xkbscan.l b/src/xkbcomp/xkbscan.l
index 5ffec1b..bc0a849 100644
--- a/src/xkbcomp/xkbscan.l
+++ b/src/xkbcomp/xkbscan.l
@@ -196,7 +196,8 @@ yyerror(const char *s)
void setScanState(char *file, int lineno)
{
yylineno = 1;
- scanFile = file;
+ strncpy(scanFile, file, 1023);
+ scanFile[1023]='\0';
}
int
commit 674d03cabc638626a5f4f2d7c23702170d07b54a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 16:22:09 2011 +0200
Fix short description for libxkbcommon-dev.
diff --git a/debian/changelog b/debian/changelog
index 896f239..fc2f697 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxkbcommon (0.1.0~0-2) UNRELEASED; urgency=low
+
+ * Fix short description for libxkbcommon-dev.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 16:21:08 +0200
+
libxkbcommon (0.1.0~0-1) experimental; urgency=low
* Initial release (Closes: #611401):
diff --git a/debian/control b/debian/control
index ca77051..52f2b89 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Depends:
libxkbcommon0 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
-Description: library interface to the XKB compiler - shared library
+Description: library interface to the XKB compiler - development files
libxkbcommon aims at replacing xkbcomp, the XKB compiler.
.
This is an experimental library, and its ABI/API is likely to change
commit f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 17:19:09 2011 +0200
Add prototype for CheckDefaultMap().
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>
diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h
index 9cf5097..c0a78df 100644
--- a/src/xkbcomp/parseutils.h
+++ b/src/xkbcomp/parseutils.h
@@ -179,6 +179,8 @@ extern int XKBParseFile(FILE * /* file */ ,
extern int XKBParseString(const char *string, XkbFile ** pRtrn);
+extern void CheckDefaultMap(XkbFile * maps);
+
extern XkbFile *CreateXKBFile(int /* type */ ,
char * /* name */ ,
ParseCommon * /* defs */ ,
commit 05f5be9f6d3b8dfbb3af3eeb2b26800ea0515de2
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Apr 4 09:21:55 2011 -0400
Also update required kbproto version in .pc.in file
diff --git a/xkbcommon.pc.in b/xkbcommon.pc.in
index 0891944..5872327 100644
--- a/xkbcommon.pc.in
+++ b/xkbcommon.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: xkbcommon
Description: XKB API common to servers and clients
Version: @PACKAGE_VERSION@
-Requires: xproto kbproto >= 1.0.5
+Requires: xproto kbproto >= 1.0.4
Cflags: -I${includedir}
Libs: -L${libdir} -lxkbcommon
commit 9dd7dc6d8884a4e02527ef16c299c6253ea468b9
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Mar 18 00:33:48 2011 -0400
configure: Lower kbproto requirement to 1.0.4
There's nothing in 1.0.5 that we need.
diff --git a/configure.ac b/configure.ac
index 6b695b9..e6a8f15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ if test "x$GCC" = xyes ; then
fi
# Obtain protocols headers include directives
-PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.5])
+PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4])
# Obtain the path to the X Window System Core Protocol
AC_MSG_CHECKING([for X11 includedir])
commit dd0e8b70fb11a19887f8d05d1ed0c10921424a43
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Sat Jan 29 14:06:39 2011 -0500
Revert "config: remove incorrectly implemented visibility compiler option"
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>
diff --git a/configure.ac b/configure.ac
index 0026441..6b695b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,10 @@ if test "x$CC_FOR_BUILD" = x; then
fi
fi
+if test "x$GCC" = xyes ; then
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+fi
+
# Obtain protocols headers include directives
PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.5])
commit 621c2a7a8c4a14a5ddfdd6add735b78efd950f2b
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jan 29 14:24:46 2011 +0100
Get rid of unneeded <X11/Xlib.h> include.
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>
diff --git a/src/xkbcomp/xkbparse.y b/src/xkbcomp/xkbparse.y
index be525a3..bc581db 100644
--- a/src/xkbcomp/xkbparse.y
+++ b/src/xkbcomp/xkbparse.y
@@ -95,7 +95,6 @@
#endif
#include "parseutils.h"
#include "xkbmisc.h"
-#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <stdlib.h>
commit a63e82be2a63d82b5b3802ae40efae2538461512
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Dec 17 21:14:54 2010 -0500
Rename XkbcInternAtom() to xkb_intern_atom() and export
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 9a42834..4e6058c 100644
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -780,6 +780,9 @@ typedef const char *(*GetAtomValueFuncPtr)(uint32_t atom);
_X_EXPORT extern void
xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value);
+_X_EXPORT extern uint32_t
+xkb_intern_atom(const char *name);
+
_X_EXPORT extern struct xkb_desc *
xkb_compile_keymap_from_rules(const struct xkb_rule_names *rules);
diff --git a/src/atom.c b/src/atom.c
index fb3cae4..51352bb 100644
--- a/src/atom.c
+++ b/src/atom.c
@@ -129,14 +129,22 @@ XkbcAtomGetString(uint32_t atom)
return ret ? strdup(ret) : NULL;
}
-static uint32_t
-_XkbcMakeAtom(const char *string, unsigned len, Bool makeit)
+uint32_t
+xkb_intern_atom(const char *string)
{
NodePtr *np;
unsigned i;
int comp;
unsigned int fp = 0;
+ unsigned len;
+ int makeit = True;
+
+ if (!string)
+ return None;
+ if (do_intern_atom)
+ return do_intern_atom(string);
+ len = strlen(string);
np = &atomRoot;
for (i = 0; i < (len + 1) / 2; i++) {
fp = fp * 27 + string[i];
@@ -208,13 +216,3 @@ _XkbcMakeAtom(const char *string, unsigned len, Bool makeit)
else
return None;
}
-
-uint32_t
-XkbcInternAtom(const char *name, Bool onlyIfExists)
-{
- if (!name)
- return None;
- if (do_intern_atom)
- return do_intern_atom(name);
- return _XkbcMakeAtom(name, strlen(name), !onlyIfExists);
-}
diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index d0b5860..0466dbe 100644
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -1461,12 +1461,12 @@ ActionsInit(void)
constTrue.common.next = NULL;
constTrue.op = ExprIdent;
constTrue.type = TypeBoolean;
- constTrue.value.str = XkbcInternAtom("true", False);
+ constTrue.value.str = xkb_intern_atom("true");
constFalse.common.stmtType = StmtExpr;
constFalse.common.next = NULL;
constFalse.op = ExprIdent;
constFalse.type = TypeBoolean;
- constFalse.value.str = XkbcInternAtom("false", False);
+ constFalse.value.str = xkb_intern_atom("false");
actionsInitialized = 1;
}
return;
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index af231ff..8749b5b 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -840,8 +840,8 @@ CompileCompatMap(XkbFile *file, struct xkb_desc * xkb, unsigned merge,
{
if (XkbcAllocNames(xkb, XkbCompatNameMask, 0, 0) == Success)
xkb->names->compat =
- XkbcInternAtom(info.name, False);
- else
+ xkb_intern_atom(info.name);
+ else
{
WSGO("Couldn't allocate space for compat name\n");
ACTION("Name \"%s\" (from %s) NOT assigned\n",
diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index af26942..ae3f6bc 100644
--- a/src/xkbcomp/geometry.c
+++ b/src/xkbcomp/geometry.c
@@ -541,7 +541,7 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info)
{
*si = info->dfltSection;
si->defs.defined &= ~_GS_Default;
- si->name = XkbcInternAtom("unknown", False);
+ si->name = xkb_intern_atom("unknown");
si->priority = info->nextPriority++;
if (info->nextPriority > XkbGeomMaxPriority)
info->nextPriority = XkbGeomMaxPriority;
@@ -553,7 +553,7 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info)
si->defs.merge = info->merge;
si->defs.next = NULL;
si->geometry = info;
- si->name = XkbcInternAtom("default", False);
+ si->name = xkb_intern_atom("default");
InitRowInfo(&si->dfltRow, si, info);
}
return;
@@ -585,7 +585,7 @@ ClearSectionInfo(SectionInfo * si, GeometryInfo * info)
{
si->defs.defined &= ~_GS_Default;
- si->name = XkbcInternAtom("default", False);
+ si->name = xkb_intern_atom("default");
si->top = si->left = 0;
si->width = si->height = 0;
si->angle = 0;
@@ -1487,7 +1487,7 @@ SetShapeDoodadField(DoodadInfo * di,
info->errorCount++;
return ReportBadType(typeName, field, ddText(di), "string");
}
- di->shape = XkbcInternAtom(tmp.str, False);
+ di->shape = xkb_intern_atom(tmp.str);
di->defs.defined |= _GD_Shape;
return True;
}
@@ -1620,7 +1620,7 @@ SetTextDoodadField(DoodadInfo * di,
return ReportBadType(typeName, field, ddText(di), "string");
}
di->defs.defined |= def;
- *pField.str = XkbcInternAtom(tmp.str, False);
+ *pField.str = xkb_intern_atom(tmp.str);
}
else
{
@@ -1671,17 +1671,17 @@ SetIndicatorDoodadField(DoodadInfo * di,
if (uStrCaseCmp(field, "oncolor") == 0)
{
di->defs.defined |= _GD_Color;
- di->color = XkbcInternAtom(tmp.str, False);
+ di->color = xkb_intern_atom(tmp.str);
}
else if (uStrCaseCmp(field, "offcolor") == 0)
{
di->defs.defined |= _GD_OffColor;
- di->offColor = XkbcInternAtom(tmp.str, False);
+ di->offColor = xkb_intern_atom(tmp.str);
}
else if (uStrCaseCmp(field, "shape") == 0)
{
di->defs.defined |= _GD_Shape;
- di->shape = XkbcInternAtom(tmp.str, False);
+ di->shape = xkb_intern_atom(tmp.str);
}
return True;
}
@@ -1742,7 +1742,7 @@ SetLogoDoodadField(DoodadInfo * di,
info->errorCount++;
return ReportBadType(typeName, field, ddText(di), "string");
}
- di->shape = XkbcInternAtom(tmp.str, False);
+ di->shape = xkb_intern_atom(tmp.str);
di->defs.defined |= _GD_Shape;
return True;
}
@@ -1843,7 +1843,7 @@ SetDoodadField(DoodadInfo * di,
return ReportBadType("doodad", field, ddText(di), "string");
}
di->defs.defined |= _GD_Color;
- di->color = XkbcInternAtom(tmp.str, False);
+ di->color = xkb_intern_atom(tmp.str);
free(tmp.str);
return True;
}
@@ -2045,7 +2045,7 @@ SetKeyField(KeyInfo * key,
return ReportBadType("key", field, keyText(key), "string");
}
key->defs.defined |= _GK_Shape;
- key->shape = XkbcInternAtom(tmp.str, False);
+ key->shape = xkb_intern_atom(tmp.str);
free(tmp.str);
}
else if ((uStrCaseCmp(field, "color") == 0) ||
@@ -2062,7 +2062,7 @@ SetKeyField(KeyInfo * key,
return ReportBadType("key", field, keyText(key), "string");
}
key->defs.defined |= _GK_Color;
- key->color = XkbcInternAtom(tmp.str, False);
+ key->color = xkb_intern_atom(tmp.str);
free(tmp.str);
}
else if ((uStrCaseCmp(field, "name") == 0)
@@ -2308,7 +2308,7 @@ HandleGeometryVar(VarDef * stmt, struct xkb_desc * xkb, GeometryInfo * info)
ret = ReportBadType("keyboard", field.str, "geometry", "string");
}
else {
- info->baseColor = XkbcInternAtom(tmp.str, False);
+ info->baseColor = xkb_intern_atom(tmp.str);
free(tmp.str);
ret = True;
}
@@ -2328,7 +2328,7 @@ HandleGeometryVar(VarDef * stmt, struct xkb_desc * xkb, GeometryInfo * info)
ret = ReportBadType("keyboard", field.str, "geometry", "string");
}
else {
- info->labelColor = XkbcInternAtom(tmp.str, False);
+ info->labelColor = xkb_intern_atom(tmp.str);
free(tmp.str);
ret = True;
}
@@ -2383,7 +2383,7 @@ HandleGeometryVar(VarDef * stmt, struct xkb_desc * xkb, GeometryInfo * info)
ret = ReportBadType("keyboard", field.str, "geometry", "string");
}
else {
- *pField = XkbcInternAtom(tmp.str, False);
+ *pField = xkb_intern_atom(tmp.str);
free(tmp.str);
}
free(field.str);
@@ -3019,7 +3019,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No color for doodad %s\n", ddText(di));
ACTION("Using black\n");
}
- di->color = XkbcInternAtom("black", False);
+ di->color = xkb_intern_atom("black");
}
break;
case XkbTextDoodad:
@@ -3038,7 +3038,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No color specified for doodad %s\n", ddText(di));
ACTION("Using black\n");
}
- di->color = XkbcInternAtom("black", False);
+ di->color = xkb_intern_atom("black");
}
if ((di->defs.defined & _GD_FontSpec) != 0)
{
@@ -3061,7 +3061,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No font specified for doodad %s\n", ddText(di));
ACTION("Using \"%s\"\n", DFLT_FONT);
}
- di->font = XkbcInternAtom(DFLT_FONT, False);
+ di->font = xkb_intern_atom(DFLT_FONT);
}
if ((di->defs.defined & _GD_FontSlant) == 0)
{
@@ -3070,7 +3070,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No font slant for text doodad %s\n", ddText(di));
ACTION("Using \"%s\"\n", DFLT_SLANT);
}
- di->fontSlant = XkbcInternAtom(DFLT_SLANT, False);
+ di->fontSlant = xkb_intern_atom(DFLT_SLANT);
}
if ((di->defs.defined & _GD_FontWeight) == 0)
{
@@ -3079,7 +3079,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No font weight for text doodad %s\n", ddText(di));
ACTION("Using \"%s\"\n", DFLT_WEIGHT);
}
- di->fontWeight = XkbcInternAtom(DFLT_WEIGHT, False);
+ di->fontWeight = xkb_intern_atom(DFLT_WEIGHT);
}
if ((di->defs.defined & _GD_FontSetWidth) == 0)
{
@@ -3088,7 +3088,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No font set width for text doodad %s\n", ddText(di));
ACTION("Using \"%s\"\n", DFLT_SET_WIDTH);
}
- di->fontSetWidth = XkbcInternAtom(DFLT_SET_WIDTH, False);
+ di->fontSetWidth = xkb_intern_atom(DFLT_SET_WIDTH);
}
if ((di->defs.defined & _GD_FontVariant) == 0)
{
@@ -3097,7 +3097,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No font variant for text doodad %s\n", ddText(di));
ACTION("Using \"%s\"\n", DFLT_VARIANT);
}
- di->fontVariant = XkbcInternAtom(DFLT_VARIANT, False);
+ di->fontVariant = xkb_intern_atom(DFLT_VARIANT);
}
if ((di->defs.defined & _GD_FontEncoding) == 0)
{
@@ -3106,7 +3106,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No font encoding for doodad %s\n", ddText(di));
ACTION("Using \"%s\"\n", DFLT_ENCODING);
}
- di->fontEncoding = XkbcInternAtom(DFLT_ENCODING, False);
+ di->fontEncoding = xkb_intern_atom(DFLT_ENCODING);
}
if ((di->defs.defined & _GD_FontSize) == 0)
{
@@ -3193,7 +3193,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(di));
ACTION("Using green\n");
}
- di->color = XkbcInternAtom("green", False);
+ di->color = xkb_intern_atom("green");
}
if ((di->defs.defined & _GD_OffColor) == 0)
{
@@ -3203,7 +3203,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(di));
ACTION("Using black\n");
}
- di->offColor = XkbcInternAtom("black", False);
+ di->offColor = xkb_intern_atom("black");
}
break;
case XkbLogoDoodad:
@@ -3240,7 +3240,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN("No color for doodad %s\n", ddText(di));
ACTION("Using black\n");
}
- di->color = XkbcInternAtom("black", False);
+ di->color = xkb_intern_atom("black");
}
break;
default:
@@ -3654,7 +3654,7 @@ CompileGeometry(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
geom->height_mm = info.heightMM;
if (info.name != NULL)
{
- geom->name = XkbcInternAtom(info.name, False);
+ geom->name = xkb_intern_atom(info.name);
if (XkbcAllocNames(xkb, XkbGeometryNameMask, 0, 0) == Success)
xkb->names->geometry = geom->name;
}
@@ -3671,9 +3671,9 @@ CompileGeometry(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
XkbcAddGeomColor(geom, "white", geom->num_colors);
if (info.baseColor == None)
- info.baseColor = XkbcInternAtom("white", False);
+ info.baseColor = xkb_intern_atom("white");
if (info.labelColor == None)
- info.labelColor = XkbcInternAtom("black", False);
+ info.labelColor = xkb_intern_atom("black");
geom->base_color =
XkbcAddGeomColor(geom, XkbcAtomText(info.baseColor),
geom->num_colors);
diff --git a/src/xkbcomp/indicators.c b/src/xkbcomp/indicators.c
index 8e5781e..2b6c169 100644
--- a/src/xkbcomp/indicators.c
+++ b/src/xkbcomp/indicators.c
@@ -47,7 +47,7 @@
void
ClearIndicatorMapInfo(LEDInfo * info)
{
- info->name = XkbcInternAtom("default", False);
+ info->name = xkb_intern_atom("default");
info->indicator = _LED_NotBound;
info->flags = info->which_mods = info->real_mods = 0;
info->vmods = 0;
diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 6aba4c6..9892024 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -727,7 +727,7 @@ HandleIndicatorNameDef(IndicatorNameDef * def,
info->errorCount++;
return ReportBadType("indicator", "name", buf, "string");
}
- ii.name = XkbcInternAtom(tmp.str, False);
+ ii.name = xkb_intern_atom(tmp.str);
free(tmp.str);
ii.virtual = def->virtual;
if (!AddIndicatorName(info, &ii))
@@ -845,7 +845,7 @@ CompileKeycodes(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
== Success)
{
register int i;
- xkb->names->keycodes = XkbcInternAtom(info.name, False);
+ xkb->names->keycodes = xkb_intern_atom(info.name);
for (i = info.computedMin; i <= info.computedMax; i++)
{
LongToKeyName(info.names[i], xkb->names->keys[i].name);
diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 846dba5..d83f5c3 100644
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -108,10 +108,10 @@ uint32_t tok_KEYPAD;
static void
InitKeyTypesInfo(KeyTypesInfo * info, struct xkb_desc * xkb, KeyTypesInfo * from)
{
- tok_ONE_LEVEL = XkbcInternAtom("ONE_LEVEL", False);
- tok_TWO_LEVEL = XkbcInternAtom("TWO_LEVEL", False);
- tok_ALPHABETIC = XkbcInternAtom("ALPHABETIC", False);
- tok_KEYPAD = XkbcInternAtom("KEYPAD", False);
+ tok_ONE_LEVEL = xkb_intern_atom("ONE_LEVEL");
+ tok_TWO_LEVEL = xkb_intern_atom("TWO_LEVEL");
+ tok_ALPHABETIC = xkb_intern_atom("ALPHABETIC");
+ tok_KEYPAD = xkb_intern_atom("KEYPAD");
info->name = strdup("default");
info->errorCount = 0;
info->stdPresent = 0;
@@ -839,7 +839,7 @@ SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value)
ACTION("Ignoring illegal level name definition\n");
return False;
}
- level_name = XkbcInternAtom(rtrn.str, False);
+ level_name = xkb_intern_atom(rtrn.str);
free(rtrn.str);
return AddLevelName(type, level, level_name, True, True);
}
@@ -1195,7 +1195,7 @@ CompileKeyTypes(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
if (info.name != NULL)
{
if (XkbcAllocNames(xkb, XkbTypesNameMask, 0, 0) == Success)
- xkb->names->types = XkbcInternAtom(info.name, False);
+ xkb->names->types = xkb_intern_atom(info.name);
else
{
WSGO("Couldn't allocate space for types name\n");
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index d5057a6..30005b9 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -244,9 +244,9 @@ InitSymbolsInfo(SymbolsInfo * info, struct xkb_desc * xkb)
{
register int i;
- tok_ONE_LEVEL = XkbcInternAtom("ONE_LEVEL", False);
- tok_TWO_LEVEL = XkbcInternAtom("TWO_LEVEL", False);
- tok_KEYPAD = XkbcInternAtom("KEYPAD", False);
+ tok_ONE_LEVEL = xkb_intern_atom("ONE_LEVEL");
+ tok_TWO_LEVEL = xkb_intern_atom("TWO_LEVEL");
+ tok_KEYPAD = xkb_intern_atom("KEYPAD");
info->name = NULL;
info->explicit_group = 0;
info->errorCount = 0;
@@ -1139,7 +1139,7 @@ SetSymbolsField(KeyInfo * key,
}
if (arrayNdx == NULL)
{
- key->dfltType = XkbcInternAtom(tmp.str, False);
+ key->dfltType = xkb_intern_atom(tmp.str);
key->defs.defined |= _Key_Type_Dflt;
}
else if (!ExprResolveInteger(arrayNdx, &ndx, SimpleLookup,
@@ -1162,7 +1162,7 @@ SetSymbolsField(KeyInfo * key,
}
else
{
- key->types[ndx.uval - 1] = XkbcInternAtom(tmp.str, False);
+ key->types[ndx.uval - 1] = xkb_intern_atom(tmp.str);
key->typesDefined |= (1 << (ndx.uval - 1));
}
free(tmp.str);
@@ -1404,7 +1404,7 @@ SetGroupName(SymbolsInfo * info, ExprDef * arrayNdx, ExprDef * value)
return False;
}
info->groupNames[tmp.uval - 1 + info->explicit_group] =
- XkbcInternAtom(name.str, False);
+ xkb_intern_atom(name.str);
return True;
}
@@ -1796,23 +1796,23 @@ FindAutomaticType(int width, uint32_t * syms, uint32_t * typeNameRtrn,
*autoType = False;
if ((width == 1) || (width == 0))
{
- *typeNameRtrn = XkbcInternAtom("ONE_LEVEL", False);
+ *typeNameRtrn = xkb_intern_atom("ONE_LEVEL");
*autoType = True;
}
else if (width == 2)
{
if (syms && XkbcKSIsLower(syms[0]) && XkbcKSIsUpper(syms[1]))
{
- *typeNameRtrn = XkbcInternAtom("ALPHABETIC", False);
+ *typeNameRtrn = xkb_intern_atom("ALPHABETIC");
}
else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
{
- *typeNameRtrn = XkbcInternAtom("KEYPAD", False);
+ *typeNameRtrn = xkb_intern_atom("KEYPAD");
*autoType = True;
}
else
{
- *typeNameRtrn = XkbcInternAtom("TWO_LEVEL", False);
+ *typeNameRtrn = xkb_intern_atom("TWO_LEVEL");
*autoType = True;
}
}
@@ -1821,15 +1821,14 @@ FindAutomaticType(int width, uint32_t * syms, uint32_t * typeNameRtrn,
if (syms && XkbcKSIsLower(syms[0]) && XkbcKSIsUpper(syms[1]))
if (XkbcKSIsLower(syms[2]) && XkbcKSIsUpper(syms[3]))
*typeNameRtrn =
- XkbcInternAtom("FOUR_LEVEL_ALPHABETIC", False);
+ xkb_intern_atom("FOUR_LEVEL_ALPHABETIC");
else
- *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_SEMIALPHABETIC",
- False);
+ *typeNameRtrn = xkb_intern_atom("FOUR_LEVEL_SEMIALPHABETIC");
else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
- *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_KEYPAD", False);
+ *typeNameRtrn = xkb_intern_atom("FOUR_LEVEL_KEYPAD");
else
- *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL", False);
+ *typeNameRtrn = xkb_intern_atom("FOUR_LEVEL");
/* XXX: why not set autoType here? */
}
return ((width >= 0) && (width <= 4));
Reply to: