im.pidgin.pidgin: 2a30e00005809366a1e544824043c204cd66c1a1

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2a30e00005809366a1e544824043c204cd66c1a1
Ancestor: 8fa8d1ac381cffb7bd0d248780d753b7056d8a43
Author: sadrul at pidgin.im
Date: 2007-11-23T04:04:33
Branch: im.pidgin.pidgin

Modified files:
        finch/libgnt/gntwm.c

ChangeLog: 

Switch to 'normal' state when: switching windows or workspaces, closing
window or getting the action/window lists.

-------------- next part --------------
============================================================
--- finch/libgnt/gntwm.c	b97e4eaef92e5bca804e30dc4634fed47b749e1f
+++ finch/libgnt/gntwm.c	e9067557d773b963285eb7247a26f512852ad2c0
@@ -81,6 +81,7 @@ static int widestringwidth(wchar_t *wide
 static int widestringwidth(wchar_t *wide);
 #endif
 
+static void ensure_normal_mode(GntWM *wm);
 static gboolean write_already(gpointer data);
 static int write_timeout;
 static time_t last_active_time;
@@ -392,6 +393,10 @@ switch_window(GntWM *wm, int direction)
 	if (!wm->cws->ordered || !wm->cws->ordered->next)
 		return;
 
+	if (wm->mode != GNT_KP_MODE_NORMAL) {
+		ensure_normal_mode(wm);
+	}
+
 	w = wm->cws->ordered->data;
 	pos = g_list_index(wm->cws->list, w);
 	pos += direction;
@@ -503,6 +508,7 @@ window_close(GntBindable *bindable, GLis
 
 	if (wm->cws->ordered) {
 		gnt_widget_destroy(wm->cws->ordered->data);
+		ensure_normal_mode(wm);
 	}
 
 	return TRUE;
@@ -522,6 +528,7 @@ setup__list(GntWM *wm)
 setup__list(GntWM *wm)
 {
 	GntWidget *tree, *win;
+	ensure_normal_mode(wm);
 	win = wm->_list.window = gnt_box_new(FALSE, FALSE);
 	gnt_box_set_toplevel(GNT_BOX(win), TRUE);
 	gnt_box_set_pad(GNT_BOX(win), 0);
@@ -972,6 +979,16 @@ window_reverse(GntWidget *win, gboolean 
 	update_screen(wm);
 }
 
+static void
+ensure_normal_mode(GntWM *wm)
+{
+	if (wm->mode != GNT_KP_MODE_NORMAL) {
+		if (wm->cws->ordered)
+			window_reverse(wm->cws->ordered->data, FALSE, wm);
+		wm->mode = GNT_KP_MODE_NORMAL;
+	}
+}
+
 static gboolean
 start_move(GntBindable *bindable, GList *null)
 {
@@ -1453,6 +1470,7 @@ gnt_wm_switch_workspace(GntWM *wm, gint 
 	if (wm->_list.window) {
 		gnt_widget_destroy(wm->_list.window);
 	}
+	ensure_normal_mode(wm);
 	gnt_ws_hide(wm->cws, wm->nodes);
 	wm->cws = s;
 	gnt_ws_show(wm->cws, wm->nodes);