Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3199
Modified Files:
session.c
Log Message:
Sync OpenBSD patchset 723:
Rename activity->alert in a couple of functions for consistency.
Index: session.c
===================================================================
RCS file: /cvsroot/tmux/tmux/session.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- session.c 26 Dec 2009 23:45:21 -0000 1.74
+++ session.c 22 Jun 2010 23:22:31 -0000 1.75
@@ -31,8 +31,8 @@
struct sessions dead_sessions;
struct session_groups session_groups;
-struct winlink *session_next_activity(struct session *, struct winlink *);
-struct winlink *session_previous_activity(struct session *, struct winlink *);
+struct winlink *session_next_alert(struct session *, struct winlink *);
+struct winlink *session_previous_alert(struct session *, struct winlink *);
void
session_alert_cancel(struct session *s, struct winlink *wl)
@@ -309,7 +309,7 @@
}
struct winlink *
-session_next_activity(struct session *s, struct winlink *wl)
+session_next_alert(struct session *s, struct winlink *wl)
{
while (wl != NULL) {
if (session_alert_has(s, wl, WINDOW_BELL))
@@ -325,7 +325,7 @@
/* Move session to next window. */
int
-session_next(struct session *s, int activity)
+session_next(struct session *s, int alert)
{
struct winlink *wl;
@@ -333,11 +333,11 @@
return (-1);
wl = winlink_next(s->curw);
- if (activity)
- wl = session_next_activity(s, wl);
+ if (alert)
+ wl = session_next_alert(s, wl);
if (wl == NULL) {
wl = RB_MIN(winlinks, &s->windows);
- if (activity && ((wl = session_next_activity(s, wl)) == NULL))
+ if (alert && ((wl = session_next_alert(s, wl)) == NULL))
return (-1);
}
if (wl == s->curw)
@@ -350,7 +350,7 @@
}
struct winlink *
-session_previous_activity(struct session *s, struct winlink *wl)
+session_previous_alert(struct session *s, struct winlink *wl)
{
while (wl != NULL) {
if (session_alert_has(s, wl, WINDOW_BELL))
@@ -366,7 +366,7 @@
/* Move session to previous window. */
int
-session_previous(struct session *s, int activity)
+session_previous(struct session *s, int alert)
{
struct winlink *wl;
@@ -374,11 +374,11 @@
return (-1);
wl = winlink_previous(s->curw);
- if (activity)
- wl = session_previous_activity(s, wl);
+ if (alert)
+ wl = session_previous_alert(s, wl);
if (wl == NULL) {
wl = RB_MAX(winlinks, &s->windows);
- if (activity && (wl = session_previous_activity(s, wl)) == NULL)
+ if (alert && (wl = session_previous_alert(s, wl)) == NULL)
return (-1);
}
if (wl == s->curw)
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
