aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-04-02 21:11:52 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-04-02 21:11:52 +0000
commit15f24910235be301b785b5de760f42b01e1e00fd (patch)
tree189802410b0d097d255a5134b10df2059c3988a6
parentdbf52facd2fa678a9705428d881a9d99188d401d (diff)
downloadrtmux-15f24910235be301b785b5de760f42b01e1e00fd.tar.gz
rtmux-15f24910235be301b785b5de760f42b01e1e00fd.tar.bz2
rtmux-15f24910235be301b785b5de760f42b01e1e00fd.zip
Don't permit resizing except in manual mode.
-rw-r--r--cmd-resize-pane-down.c6
-rw-r--r--cmd-resize-pane-up.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/cmd-resize-pane-down.c b/cmd-resize-pane-down.c
index adb27089..7f85614c 100644
--- a/cmd-resize-pane-down.c
+++ b/cmd-resize-pane-down.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-resize-pane-down.c,v 1.7 2009-03-28 14:08:09 nicm Exp $ */
+/* $Id: cmd-resize-pane-down.c,v 1.8 2009-04-02 21:11:52 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -65,6 +65,10 @@ cmd_resize_pane_down_exec(struct cmd *self, struct cmd_ctx *ctx)
if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
return (-1);
+ if (wl->window->layout != 0) {
+ ctx->error(ctx, "window not in manual layout");
+ return (-1);
+ }
if (data->pane == -1)
wp = wl->window->active;
else {
diff --git a/cmd-resize-pane-up.c b/cmd-resize-pane-up.c
index 5c685c78..11d102b9 100644
--- a/cmd-resize-pane-up.c
+++ b/cmd-resize-pane-up.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-resize-pane-up.c,v 1.7 2009-03-28 14:08:09 nicm Exp $ */
+/* $Id: cmd-resize-pane-up.c,v 1.8 2009-04-02 21:11:52 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -65,6 +65,10 @@ cmd_resize_pane_up_exec(struct cmd *self, struct cmd_ctx *ctx)
if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
return (-1);
+ if (wl->window->layout != 0) {
+ ctx->error(ctx, "window not in manual layout");
+ return (-1);
+ }
if (data->pane == -1)
wp = wl->window->active;
else {