Revision: b4bb1a8dc6b3 Author: Muneyuki Noguchi <[email protected]> Date: Sun Apr 1 04:33:43 2012 Log: Don't use deprecated XKeycodeToKeysym().
* gtk2/immodule/key-util-gtk.c * xim/ximserver.cpp - Use XkbKeycodeToKeysym() instead of XKeycodeToKeysym(). http://code.google.com/p/uim/source/detail?r=b4bb1a8dc6b3 Modified: /gtk2/immodule/key-util-gtk.c /xim/ximserver.cpp ======================================= --- /gtk2/immodule/key-util-gtk.c Wed Jan 11 00:17:24 2012 +++ /gtk2/immodule/key-util-gtk.c Sun Apr 1 04:33:43 2012 @@ -47,7 +47,7 @@ #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> #include <X11/Xlib.h> -#include <X11/keysym.h> +#include <X11/XKBlib.h> #endif #ifdef GDK_WINDOWING_X11 @@ -341,7 +341,7 @@ KeySym ks; int index = 0; do { - ks = XKeycodeToKeysym(display, map->modifiermap[k], index); + ks = XkbKeycodeToKeysym(display, map->modifiermap[k], 0, index); index++; } while (!ks && index < keysyms_per_keycode); ======================================= --- /xim/ximserver.cpp Sat Feb 11 02:10:19 2012 +++ /xim/ximserver.cpp Sun Apr 1 04:33:43 2012 @@ -42,6 +42,7 @@ #include <X11/Xlib.h> #include <X11/Xatom.h> #include <X11/Xutil.h> +#include <X11/XKBlib.h> /* workaround for pre X11R6.7 */ #ifndef XK_KOREAN @@ -1471,8 +1472,8 @@ KeySym ks; int index = 0; do { - ks = XKeycodeToKeysym(XimServer::gDpy, - map->modifiermap[k], index); + ks = XkbKeycodeToKeysym(XimServer::gDpy, + map->modifiermap[k], 0, index); index++; } while (!ks && index < keysyms_per_keycode);
