summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/actions.c2
-rw-r--r--src/split.c10
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 82c23bc..8116386 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2001-06-10 shawn <sabetts@diggin.lamenet.tmp>
+ * src/actions.c (cmd_generate): return if there is no current
+ window.
+
+ * src/split.c (split_frame): empty frames can be split.
+
* src/main.c (rp_rat_bits): remove
(rp_rat_mask_bits): remove include <X11/cursorfont.h>
(sighandler): only increment kill_signalled
diff --git a/src/actions.c b/src/actions.c
index de2a2c9..3e30693 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -363,6 +363,8 @@ cmd_generate (void *data)
XEvent ev1, ev;
ev = rp_current_event;
+ if (current_window() == NULL) return;
+
PRINT_DEBUG ("type==%d\n", ev.xkey.type);
PRINT_DEBUG ("serial==%ld\n", ev.xkey.serial);
PRINT_DEBUG ("send_event==%d\n", ev.xkey.send_event);
diff --git a/src/split.c b/src/split.c
index b14dca3..053ef5b 100644
--- a/src/split.c
+++ b/src/split.c
@@ -185,9 +185,6 @@ split_frame (rp_window_frame *frame, int way)
rp_window *win;
rp_window_frame *new_frame;
- /* You can't split a frame unless it has a window in it. */
- if (!frame->win) return;
-
new_frame = xmalloc (sizeof (rp_window_frame));
/* append the new frame to the list */
@@ -236,8 +233,11 @@ split_frame (rp_window_frame *frame, int way)
}
/* resize the existing frame */
- maximize (frame->win);
- XRaiseWindow (dpy, frame->win->w);
+ if (frame->win)
+ {
+ maximize (frame->win);
+ XRaiseWindow (dpy, frame->win->w);
+ }
show_frame_indicator();
}