mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-18 20:10:29 +01:00
Use W_KeycodeToKeysym instead of XkbKeycodeToKeysym
This patch replaces XkbKeycodeToKeysym by our own function W_KeycodeToKeysym.
This commit is contained in:
committed by
Carlos R. Mafra
parent
bc56db0776
commit
9f8dc6f5dc
@@ -38,6 +38,7 @@
|
||||
#include <X11/XKBlib.h>
|
||||
|
||||
#include <WINGs/WUtil.h>
|
||||
#include <WINGs/WINGsP.h>
|
||||
#include <wraster.h>
|
||||
|
||||
#include "window.h"
|
||||
@@ -840,7 +841,7 @@ char *GetShortcutKey(WShortKey key)
|
||||
}
|
||||
}
|
||||
|
||||
key_name = XKeysymToString(XkbKeycodeToKeysym(dpy, key.keycode, 0, 0));
|
||||
key_name = XKeysymToString(W_KeycodeToKeysym(dpy, key.keycode, 0));
|
||||
if (!key_name)
|
||||
return NULL;
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ Perpetrator: Sudish Joseph <sj@eng.mindspring.net>, Sept. 1997. */
|
||||
#include <X11/XKBlib.h>
|
||||
|
||||
#include <WINGs/WUtil.h>
|
||||
#include <WINGs/WINGsP.h>
|
||||
#include "WindowMaker.h"
|
||||
#include "xmodifier.h"
|
||||
|
||||
@@ -174,7 +175,7 @@ static void x_reset_modifier_mapping(Display * display)
|
||||
}
|
||||
|
||||
code = x_modifier_keymap->modifiermap[modifier_index * mkpm + modifier_key];
|
||||
sym = (code ? XkbKeycodeToKeysym(display, code, 0, column) : NoSymbol);
|
||||
sym = (code ? W_KeycodeToKeysym(display, code, column) : NoSymbol);
|
||||
|
||||
if (sym == last_sym)
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user