diff options
| author | sabetts <sabetts> | 2001-10-18 07:51:59 +0000 |
|---|---|---|
| committer | sabetts <sabetts> | 2001-10-18 07:51:59 +0000 |
| commit | 6ddaccd940d82362ead59ee4f5d21b3feb3d57fc (patch) | |
| tree | 104db9ae26790178183e001d9d17c80bc92079cf /src/events.c | |
| parent | 9784bfc548debcf70cdfd202abec95be539a32fd (diff) | |
| download | ratpoison-6ddaccd940d82362ead59ee4f5d21b3feb3d57fc.zip | |
* src/split.h (find_last_frame): new prototype
* src/split.c (update_last_access): new function
(find_last_frame): likewise
(split_frame): update the new frame's last_access field
(set_active_frame): update the new current frame's last_access field
* src/input.h (x11_mask_to_rp_mask): new prototype
(rp_mask_to_x11_mask): likewise
* src/input.c (x11_mask_to_rp_mask): new function
(rp_mask_to_x11_mask): likewise
* src/events.c (handle_key): convert X11 modifier masks to rp
modifier masks where appropriate.
* src/actions.h (cmd_focuslast): new prototype
* src/actions.c (initialize_default_keybindings): new keybinding
for "focuslast"
(cmd_focuslast): new function
(user_command): new command "focuslast"
Diffstat (limited to 'src/events.c')
| -rw-r--r-- | src/events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/events.c b/src/events.c index 1421b2d..efdc860 100644 --- a/src/events.c +++ b/src/events.c @@ -412,7 +412,7 @@ handle_key (screen_info *s) read_key (&keysym, &mod, NULL, 0); - if ((key_action = find_keybinding (keysym, mod))) + if ((key_action = find_keybinding (keysym, x11_mask_to_rp_mask (mod)))) { char *result; XSetInputFocus (dpy, fwin, revert, CurrentTime); @@ -427,7 +427,7 @@ handle_key (screen_info *s) /* No key match, notify user. */ XSetInputFocus (dpy, fwin, revert, CurrentTime); - keysym_name = keysym_to_string (keysym, mod); + keysym_name = keysym_to_string (keysym, x11_mask_to_rp_mask (mod)); marked_message_printf (0, 0, " %s unbound key ", keysym_name); free (keysym_name); } @@ -454,7 +454,7 @@ key_press (XEvent *ev) modifier = ev->xkey.state; cook_keycode ( &ev->xkey, &ks, &modifier, NULL, 0, 1); - if (ks == prefix_key.sym && (modifier == prefix_key.state)) + if (ks == prefix_key.sym && (x11_mask_to_rp_mask (modifier) == prefix_key.state)) { handle_key (s); } |