[ekg2-commit] ekg2: themes.c (HEAD) windows.c (HEAD) [peres]

[CVS commit]

Module name:	ekg2
Changes by:	peres	2007-10-08 10:39:35

Modified files:
	themes.c windows.c

Log message:
More friendly w->act masks.

Index: themes.c
===================================================================
RCS file: /home/cvs/ekg2/ekg/themes.c,v
diff -d -u -r1.208 -r1.209
--- themes.c	16 Sep 2007 09:07:04 -0000	1.208
+++ themes.c	8 Oct 2007 08:39:35 -0000	1.209
@@ -638,9 +638,9 @@
 	if (w != window_current && !w->floating) {
 		int oldact = w->act;
 		if (separate)
-			w->act = 2 | (w->act & 4);
+			w->act = 2 | (w->act & ~3);
 		else if ((w->act & 3) != 2)
-			w->act = 1 | (w->act & 4);
+			w->act = 1 | (w->act & ~3);
 
 		if (oldact != w->act)					/* emit UI_WINDOW_ACT_CHANGED only when w->act changed */
 			query_emit_id(NULL, UI_WINDOW_ACT_CHANGED);

Index: windows.c
===================================================================
RCS file: /home/cvs/ekg2/ekg/windows.c,v
diff -d -u -r1.89 -r1.90
--- windows.c	29 Aug 2007 07:36:23 -0000	1.89
+++ windows.c	8 Oct 2007 08:39:35 -0000	1.90
@@ -210,7 +210,7 @@
 	
 		window_current = w;
 
-		w->act &= 4;
+		w->act &= ~3;
 		if (w->target && w->session && (u=userlist_find(w->session, w->target)) && (u->xstate & EKG_XSTATE_BLINK)) 
 			u->xstate &= ~EKG_XSTATE_BLINK;