* 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".

1 files changed, 7 insertions, 1 deletions

diff --git a/src/data.h b/src/data.h
index 5f97c99..06f028b 100644
--- a/src/data.h
+++ b/src/data.h
@@ -130,7 +130,7 @@ extern rp_window_frame *rp_current_frame;
 extern screen_info *screens;
 extern int num_screens;
 
-extern XEvent *rp_current_event;
+extern XEvent rp_current_event;
 
 extern Display *dpy;
 extern Atom rp_restart;
@@ -172,4 +172,10 @@ struct modifier_info
 /* Keeps track of which mod mask each modifier is under. */
 extern struct modifier_info rp_modifier_info;
 
+/* nonzero if an alarm signal was raised. This means ratpoison should
+   hide its popup windows. */
+extern int alarm_signalled;
+extern int kill_signalled;
+extern int hup_signalled;
+
 #endif /* _RATPOISON_DATA_H */