diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-26 22:05:53 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-20 01:36:55 -0500 |
| commit | 759e9f58a8cc02b78bc85b4454f133544e3ac36e (patch) | |
| tree | 9bd7220b7df84482ad8b580d55e3287843b20ce2 /openbox/event.c | |
| parent | 1aac72bc4cfffdd816347d305624b15d0ae2112e (diff) | |
change openbox to use the libotk's keyboard.[ch] stuff instead of the old modkeys.[ch] and some of translate.[ch]
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/openbox/event.c b/openbox/event.c index 83be0541..79ead346 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -31,17 +31,16 @@ #include "menu.h" #include "menuframe.h" #include "keyboard.h" -#include "modkeys.h" #include "mouse.h" #include "focus.h" #include "focus_cycle.h" #include "moveresize.h" #include "group.h" #include "stacking.h" -#include "translate.h" #include "ping.h" #include "obt/display.h" #include "obt/prop.h" +#include "obt/keyboard.h" #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -259,10 +258,10 @@ static void event_hack_mods(XEvent *e) switch (e->type) { case ButtonPress: case ButtonRelease: - e->xbutton.state = modkeys_only_modifier_masks(e->xbutton.state); + e->xbutton.state = obt_keyboard_only_modmasks(e->xbutton.state); break; case KeyPress: - e->xkey.state = modkeys_only_modifier_masks(e->xkey.state); + e->xkey.state = obt_keyboard_only_modmasks(e->xkey.state); break; case KeyRelease: #ifdef XKB @@ -274,14 +273,14 @@ static void event_hack_mods(XEvent *e) else #endif { - e->xkey.state = modkeys_only_modifier_masks(e->xkey.state); + e->xkey.state = obt_keyboard_only_modmasks(e->xkey.state); /* remove from the state the mask of the modifier key being released, if it is a modifier key being released that is */ - e->xkey.state &= ~modkeys_keycode_to_mask(e->xkey.keycode); + e->xkey.state &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode); } break; case MotionNotify: - e->xmotion.state = modkeys_only_modifier_masks(e->xmotion.state); + e->xmotion.state = obt_keyboard_only_modmasks(e->xmotion.state); /* compress events */ { XEvent ce; @@ -1676,7 +1675,7 @@ static gboolean event_handle_menu_keyboard(XEvent *ev) keycode = ev->xkey.keycode; state = ev->xkey.state; - unikey = translate_unichar(keycode); + unikey = obt_keyboard_keycode_to_unichar(keycode); frame = find_active_or_last_menu(); if (frame == NULL) |