aboutsummaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-05-19 13:32:55 +0000
committerTiago Cunha <tcunha@gmx.com>2009-05-19 13:32:55 +0000
commit80af85a102bcb4c91d6ce08102131a4654212d80 (patch)
treeb207ee59eea50f38dd6df496710a4897157dd748 /session.c
parenta385f757925110af9cc54c5d55298ede22e55e97 (diff)
downloadrtmux-80af85a102bcb4c91d6ce08102131a4654212d80.tar.gz
rtmux-80af85a102bcb4c91d6ce08102131a4654212d80.tar.bz2
rtmux-80af85a102bcb4c91d6ce08102131a4654212d80.zip
- New window option monitor-content to search for a string in a window, and
highlight the status line if it matches. - To make this possible, the function cmd_find_window_search from cmd-find-window.c had to be moved to window.c and renamed window_pane_search. - While there use three new functions in server.c to check for bell, activity, and content, to avoid too much nesting.
Diffstat (limited to 'session.c')
-rw-r--r--session.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/session.c b/session.c
index 21eb8148..0a004677 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.56 2009-05-04 17:58:27 nicm Exp $ */
+/* $Id: session.c,v 1.57 2009-05-19 13:32:55 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -266,6 +266,8 @@ session_next_activity(struct session *s, struct winlink *wl)
break;
if (session_alert_has(s, wl, WINDOW_ACTIVITY))
break;
+ if (session_alert_has(s, wl, WINDOW_CONTENT))
+ break;
wl = winlink_next(&s->windows, wl);
}
return (wl);
@@ -305,6 +307,8 @@ session_previous_activity(struct session *s, struct winlink *wl)
break;
if (session_alert_has(s, wl, WINDOW_ACTIVITY))
break;
+ if (session_alert_has(s, wl, WINDOW_CONTENT))
+ break;
wl = winlink_previous(&s->windows, wl);
}
return (wl);