[PULL libxkbcommon] Some more fixes and minor enhancements

Ran Benita ran234 at gmail.com
Sat Mar 24 08:24:10 PDT 2012


There's some unrelated groups of commits here. I've tried to arrange
them such that they can be picked selectively if needed.

The following commits are simple bug fixes and cleanup:
      Mention xkb_state_new can return NULL
      Properly free xkb_state's
      Fix latin8 upper/lower case check
      Update gitignore for 'state' test
      Fix incorrect usage of && instead of &
      Add xkb test file to EXTRA_DIST
      Remove a few remaining uses of the KeySym type
      Remove remaining uses of X11/X.h modifier masks
      Fix a scanf type mismatch

These are meant to clean up the helper util files to something more
reasonable and less ancient-looking:
      Move utils.{c,h} to be used by the entire project
      Have a sane fallback strcasecmp
      Remove useless stuff from utils
      Rewrite recalloc to the correct type
      Remove some more useless stuff
      Move utility macro from XKBcommonint.h to utils.h
      Use strcasecmp consistently instead of uStrCaseCmp
      Remove logging implementation boilerplate

Fixes some warning, nice to have:
      Silence -Wcast-qual warnings
      Fix all -Wsign-compare warnings

Some changes to reduce libxkbcommon dependency on xproto a bit. Not
entirely sure if duplicating NoSymbol is the right thing, but did it
anyway.
      Define our own None atom value
      Duplicate the *MapIndex defines from X11/X.h
      Define our own NoSymbol value and use it
      Replace XKB_COMMON_ prefix with XKB_

This turns consolidated the makefiles to a single non recursive one. I
thought I'd give it a shot :)
      Make build non-recursive

And this is just to make my group switching work. Since it was #ifdef'ed
away, I assume it's not so simple, but from some testing I did it works.
      Handle group lock actions

(Sorry for the code-dump style of this; I can only work on this on the
weekend and holding off seems kinda silly.)

Thanks,
Ran

The following changes since commit 3d672fcfea6b823db4793b9ad1c3aadc4b547a08:

  Add LED state API (2012-03-22 14:32:53 +0000)

  [...]

are available in the git repository at:

  https://github.com/bluetech/libxkbcommon for-daniel

for you to fetch changes up to c91e5c2878b309d4972e7bbbb9ae688a9f279183:

  Handle group lock actions (2012-03-24 16:39:08 +0200)

----------------------------------------------------------------

 .gitignore                    |    2 +
 Makefile.am                   |   76 ++++++++++++-
 configure.ac                  |   14 +--
 include/Makefile.am           |    1 -
 include/xkbcommon/xkbcommon.h |   21 ++--
 makekeys/Makefile.am          |    8 --
 makekeys/makekeys.c           |   22 ++--
 src/Makefile.am               |   29 -----
 src/XKBcommonint.h            |   24 ++--
 src/alloc.c                   |   54 ++++-----
 src/atom.c                    |   12 +-
 src/geom.c                    |  176 ----------------------------
 src/keysym.c                  |   11 +-
 src/malloc.c                  |   59 +++++-----
 src/map.c                     |   22 ++--
 src/maprules.c                |   62 +++++-----
 src/misc.c                    |   48 ++++----
 src/state.c                   |   44 ++++++-
 src/text.c                    |    2 +-
 src/utils.c                   |  102 +++++++++++++++++
 src/utils.h                   |   87 ++++++++++++++
 src/xkballoc.h                |    5 +-
 src/xkbcomp/Makefile.am       |   37 ------
 src/xkbcomp/action.c          |   10 +-
 src/xkbcomp/compat.c          |   47 ++++----
 src/xkbcomp/expr.c            |   46 ++++----
 src/xkbcomp/indicators.c      |   35 +++---
 src/xkbcomp/keycodes.c        |   28 ++---
 src/xkbcomp/keytypes.c        |   42 +++----
 src/xkbcomp/misc.c            |    8 +-
 src/xkbcomp/misc.h            |    2 +-
 src/xkbcomp/parseutils.c      |   16 +--
 src/xkbcomp/symbols.c         |  132 ++++++++++-----------
 src/xkbcomp/utils.c           |  252 -----------------------------------------
 src/xkbcomp/utils.h           |  163 --------------------------
 src/xkbcomp/vmod.c            |    1 -
 src/xkbcomp/xkbcomp.c         |    7 +-
 src/xkbcomp/xkbcomp.h         |   16 +--
 src/xkbcomp/xkbparse.y        |    8 +-
 src/xkbcomp/xkbpath.c         |   22 ++--
 src/xkbcomp/xkbpath.h         |    1 -
 src/xkbcomp/xkbscan.l         |    3 +-
 src/xkbmisc.h                 |    3 +-
 src/xkbrules.h                |    3 -
 test/.gitignore               |    1 +
 test/Makefile.am              |    7 +-
 test/filecomp.c               |    4 +-
 test/namescomp.c              |    4 +-
 test/rulescomp.c              |    3 +-
 test/state.c                  |    4 +-
 test/xkey.c                   |    8 +-
 51 files changed, 705 insertions(+), 1089 deletions(-)
 delete mode 100644 include/Makefile.am
 create mode 100644 m4/.gitkeep
 delete mode 100644 makekeys/Makefile.am
 delete mode 100644 src/Makefile.am
 delete mode 100644 src/geom.c
 create mode 100644 src/utils.c
 create mode 100644 src/utils.h
 delete mode 100644 src/xkbcomp/Makefile.am
 delete mode 100644 src/xkbcomp/utils.c
 delete mode 100644 src/xkbcomp/utils.h


More information about the xorg-devel mailing list