Don't trigger window activity if window is already visible in some

other split window.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@592 dbcabf3a-b0e7-0310-adc4-f8d773084564

5 files changed, 57 insertions, 8 deletions

diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 873b4be6..de779725 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -19,27 +19,28 @@ irssi_LDADD = \
 
 irssi_SOURCES = \
         gui-entry.c \
-        mainwindows.c \
         gui-printtext.c \
         gui-readline.c \
 	gui-special-vars.c \
-        statusbar.c \
-        statusbar-items.c \
         gui-textwidget.c \
         gui-windows.c \
+        mainwindows.c \
+        mainwindow-activity.c \
+        statusbar.c \
+        statusbar-items.c \
         irssi.c \
 	module-formats.c \
         screen.c
 
 noinst_HEADERS = \
         gui-entry.h \
-        mainwindows.h \
         gui-printtext.h \
         gui-readline.h \
 	gui-special-vars.h \
-        statusbar.h \
         gui-textwidget.h \
         gui-windows.h \
+        mainwindows.h \
+        statusbar.h \
         screen.h \
 	module.h \
 	module-formats.h
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 287a254b..9a014c60 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -43,6 +43,9 @@
 void irc_init(void);
 void irc_deinit(void);
 
+void mainwindow_activity_init(void);
+void mainwindow_activity_deinit(void);
+
 #ifdef HAVE_PERL
 void irssi_perl_init(void);
 void irssi_perl_deinit(void);
@@ -82,7 +85,6 @@ static void textui_init(void)
 	irssi_gui = IRSSI_GUI_TEXT;
 	core_init();
 	irc_init();
-	//silc_init();
 	fe_common_core_init();
 	fe_common_irc_init();
 
@@ -101,6 +103,7 @@ static void textui_finish_init(void)
 	gui_special_vars_init();
 	gui_textwidget_init();
 	mainwindows_init();
+	mainwindow_activity_init();
 	gui_windows_init();
 	statusbar_init();
 
@@ -129,6 +132,7 @@ static void textui_deinit(void)
 	gui_printtext_deinit();
 	gui_readline_deinit();
 	gui_windows_deinit();
+	mainwindow_activity_deinit();
 	mainwindows_deinit();
 	gui_entry_deinit();
 	deinit_screen();
diff --git a/src/fe-text/mainwindow-activity.c b/src/fe-text/mainwindow-activity.c
new file mode 100644
index 00000000..2e801d71
--- /dev/null
+++ b/src/fe-text/mainwindow-activity.c
@@ -0,0 +1,43 @@
+/*
+ mainwindow-activity.c : irssi
+
+    Copyright (C) 2000 Timo Sirainen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "module.h"
+#include "signals.h"
+
+#include "windows.h"
+#include "gui-windows.h"
+
+static void sig_activity(WINDOW_REC *window)
+{
+	if (is_window_visible(window))
+                signal_stop();
+}
+
+void mainwindow_activity_init(void)
+{
+	signal_add_first("window hilight", (SIGNAL_FUNC) sig_activity);
+	signal_add_first("window activity", (SIGNAL_FUNC) sig_activity);
+}
+
+void mainwindow_activity_deinit(void)
+{
+	signal_remove("window hilight", (SIGNAL_FUNC) sig_activity);
+	signal_remove("window activity", (SIGNAL_FUNC) sig_activity);
+}
diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 260b4dad..c1164054 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1,7 +1,7 @@
 /*
- gui-mainwindows.c : irssi
+ mainwindows.c : irssi
 
-    Copyright (C) 1999 Timo Sirainen
+    Copyright (C) 1999-2000 Timo Sirainen
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/fe-text/mainwindows.h b/src/fe-text/mainwindows.h
index db4eda57..bad52393 100644
--- a/src/fe-text/mainwindows.h
+++ b/src/fe-text/mainwindows.h
@@ -2,6 +2,7 @@
 #define __MAINWINDOWS_H
 
 #include "windows.h"
+#include "screen.h"
 
 typedef struct {
 	WINDOW_REC *active;