summaryrefslogtreecommitdiff
path: root/src/actions.c
diff options
context:
space:
mode:
authorsabetts <sabetts>2001-06-11 01:27:49 +0000
committersabetts <sabetts>2001-06-11 01:27:49 +0000
commit6412fd18f057703fdaaebafc244cf9cb63e5a1f3 (patch)
treec41261fd06a93907f0b8d6ff4a2dc5e5efbca091 /src/actions.c
parent01a5139b845f89dd87ed971f2fd4d7c65055629e (diff)
downloadratpoison-6412fd18f057703fdaaebafc244cf9cb63e5a1f3.zip
* src/main.c (rp_rat_bits): remove
(rp_rat_mask_bits): remove include <X11/cursorfont.h> (sighandler): only increment kill_signalled (hup_handler): only increment hup_signalled (alrm_handler): only increment alarm_signalled (read_startup_files): use PRINT_ERROR for error messages. (init_rat_cursor): Use a standard X cursor for the screen's rat. * src/events.h (unmap_notify): remove prototype (delegate_event): likewise (key_press): likewise (keymapstate): likewise (map_request): likewise * src/events.c: includes <signal.h> <sys/time.h> and <error.h> (new_window): static function (unmap_notify): likewise (map_request): likewise (destroy_window): likewise (configure_notify): likewise (configure_request): likewise (key_press): likewise (property_notify): likewise (colormap_notify): likewise (delegate_event): likewise (get_event): new function (more_destroy_events): remove function (handle_events): call get_event. * src/data.h: rp_current_event is an XEvent dependant code updated. new globals alarm_signalled, kill_signalled, hup_signalled. * src/actions.c (initialize_default_keybindings): new bindings for "split" and "vsplit".
Diffstat (limited to 'src/actions.c')
-rw-r--r--src/actions.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/actions.c b/src/actions.c
index 9a2db18..de2a2c9 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -127,7 +127,9 @@ initialize_default_keybindings (void)
add_keybinding (XK_v, ControlMask, "version");
add_keybinding (XK_w, 0, "windows");
add_keybinding (XK_w, ControlMask, "windows");
- add_keybinding (XK_S, 0, "split");
+ add_keybinding (XK_s, 0, "split");
+ add_keybinding (XK_s, ControlMask, "split");
+ add_keybinding (XK_S, 0, "vsplit");
add_keybinding (XK_S, ControlMask, "vsplit");
add_keybinding (XK_Tab, 0, "focus");
add_keybinding (XK_Q, 0, "only");
@@ -359,7 +361,7 @@ void
cmd_generate (void *data)
{
XEvent ev1, ev;
- ev = *rp_current_event;
+ ev = rp_current_event;
PRINT_DEBUG ("type==%d\n", ev.xkey.type);
PRINT_DEBUG ("serial==%ld\n", ev.xkey.serial);