aboutsummaryrefslogtreecommitdiff
path: root/window-more.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-11-21 19:53:57 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-11-21 19:53:57 +0000
commitd0984b890b84c2fac9cdcfbc44121c1171e06531 (patch)
treeee40b26aed2bac391ea3b2189fcabcf1534cf330 /window-more.c
parentacb3661b66195ea4a5ee1305c58ba8a52f62a686 (diff)
downloadrtmux-d0984b890b84c2fac9cdcfbc44121c1171e06531.tar.gz
rtmux-d0984b890b84c2fac9cdcfbc44121c1171e06531.tar.bz2
rtmux-d0984b890b84c2fac9cdcfbc44121c1171e06531.zip
Sort out cursors with a new flag - BACKGROUND - for window modes. Free text on more exit.
Diffstat (limited to 'window-more.c')
-rw-r--r--window-more.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/window-more.c b/window-more.c
index 2dd657ec..00ace798 100644
--- a/window-more.c
+++ b/window-more.c
@@ -1,4 +1,4 @@
-/* $Id: window-more.c,v 1.1 2007-11-21 19:44:05 nicm Exp $ */
+/* $Id: window-more.c,v 1.2 2007-11-21 19:53:56 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -73,6 +73,8 @@ window_more_init(struct window *w)
w->modedata = data = xmalloc(sizeof *data);
ARRAY_INIT(&data->list);
data->top = 0;
+
+ w->screen.mode |= MODE_BACKGROUND;
}
void
@@ -167,7 +169,7 @@ void
window_more_key(struct window *w, int key)
{
struct window_more_mode_data *data = w->modedata;
- u_int top, sy;
+ u_int top, sy, i;
sy = screen_size_y(&w->screen);
@@ -176,9 +178,15 @@ window_more_key(struct window *w, int key)
switch (key) {
case 'Q':
case 'q':
+ for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
+ xfree(ARRAY_ITEM(&data->list, i));
+ ARRAY_FREE(&data->list);
+
w->mode = NULL;
xfree(w->modedata);
+ w->screen.mode &= ~MODE_BACKGROUND;
+
recalculate_sizes();
server_redraw_window_all(w);
return;
@@ -243,7 +251,6 @@ window_more_up_1(struct window *w)
window_more_draw_position(w, &ctx);
window_more_draw_line(w, &ctx, 1);
screen_draw_stop(&ctx);
- input_store_zero(c->out, CODE_CURSOROFF);
size = BUFFER_USED(c->out) - size;
hdr.type = MSG_DATA;
@@ -284,7 +291,6 @@ window_more_down_1(struct window *w)
window_more_draw_line(w, &ctx, screen_last_y(s));
window_more_draw_position(w, &ctx);
screen_draw_stop(&ctx);
- input_store_zero(c->out, CODE_CURSOROFF);
size = BUFFER_USED(c->out) - size;
hdr.type = MSG_DATA;