← Back to branch summary

~pi-rho/tmux/master-sf-old

« back to all changes in this revision

Viewing changes to server-window.c

  • Committer: Thomas Adam
  • Date: 2015-05-13 08:44:11 UTC
  • mfrom: (0.1.1708)
  • Revision ID: git-v1:00471dc78358bde092df65de5e2c375bf9be7437
Merge branch 'obsd-master'

Show diffs side-by-side

added added

removed removed

Lines of Context:
server-window.c
77
77
                if (c->session != s || c->flags & CLIENT_CONTROL)
78
78
                        continue;
79
79
                if (!visual) {
80
 
                        if (c->session->curw->window == w || action == BELL_ANY)
 
80
                        if ((action == BELL_CURRENT &&
 
81
                            c->session->curw->window == w) ||
 
82
                            (action == BELL_OTHER &&
 
83
                            c->session->curw->window != w) ||
 
84
                            action == BELL_ANY)
81
85
                                tty_bell(&c->tty);
82
86
                        continue;
83
87
                }
84
 
                if (c->session->curw->window == w)
 
88
                if (action == BELL_CURRENT && c->session->curw->window == w)
85
89
                        status_message_set(c, "Bell in current window");
86
 
                else if (action == BELL_ANY)
 
90
                else if (action == BELL_ANY || (action == BELL_OTHER &&
 
91
                    c->session->curw->window != w))
87
92
                        status_message_set(c, "Bell in window %d", wl->idx);
88
93
        }
89
94