Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h desktops.c ewins.c focus.c stacking.c
Log Message:
Fix some more click-raises issues.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -3 -r1.518 -r1.519
--- E.h 1 Dec 2005 17:00:24 -0000 1.518
+++ E.h 8 Dec 2005 18:45:39 -0000 1.519
@@ -873,7 +873,6 @@
#define FOCUS_CLICK 12
void FocusEnable(int on);
-void FocusEwinSetGrabs(EWin * ewin);
void FocusToEWin(EWin * ewin, int why);
void FocusHandleEnter(EWin * ewin, XEvent * ev);
void FocusHandleLeave(EWin * ewin, XEvent * ev);
@@ -881,6 +880,7 @@
void FocusHandleClick(EWin * ewin, Window win);
void FocusNewDeskBegin(void);
void FocusNewDesk(void);
+void FocusGrabsUpdate(void);
/* fonts.c */
int FontConfigLoad(FILE * fs);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -3 -r1.211 -r1.212
--- desktops.c 6 Dec 2005 19:09:47 -0000 1.211
+++ desktops.c 8 Dec 2005 18:45:40 -0000 1.212
@@ -1505,6 +1505,7 @@
{
dsk->stack.update_client_list = 0;
HintsSetClientStacking();
+ FocusGrabsUpdate();
}
dsk->stack.dirty = 0;
dsk->stack.latest = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -3 -r1.133 -r1.134
--- ewins.c 27 Nov 2005 13:11:05 -0000 1.133
+++ ewins.c 8 Dec 2005 18:45:41 -0000 1.134
@@ -306,8 +306,6 @@
if (!ewin->props.no_button_grabs)
GrabButtonGrabs(ewin);
- FocusEwinSetGrabs(ewin);
-
if (ewin->state.shaded)
EwinInstantShade(ewin, 1);
@@ -1340,8 +1338,6 @@
if (lst)
Efree(lst);
- FocusEwinSetGrabs(ewin);
-
if (call_depth == 1)
ModulesSignal(ESIGNAL_EWIN_CHANGE, ewin);
@@ -1375,8 +1371,6 @@
if (lst)
Efree(lst);
- FocusEwinSetGrabs(ewin);
-
if (call_depth == 1)
ModulesSignal(ESIGNAL_EWIN_CHANGE, ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- focus.c 19 Nov 2005 20:43:09 -0000 1.135
+++ focus.c 8 Dec 2005 18:45:41 -0000 1.136
@@ -34,6 +34,7 @@
static char focus_inhibit = 1;
static char focus_is_set = 0;
+static char focus_pending_update_grabs = 0;
static int focus_pending_why = 0;
static EWin *focus_pending_ewin = NULL;
static EWin *focus_pending_new = NULL;
@@ -201,7 +202,7 @@
FocusToEWin(ewin, FOCUS_PREV);
}
-void
+static void
FocusEwinSetGrabs(EWin * ewin)
{
int set = 0;
@@ -249,7 +250,7 @@
ewin->state.active = active;
EwinBorderUpdateState(ewin);
- FocusEwinSetGrabs(ewin);
+ FocusGrabsUpdate();
if (active && ewin->state.attention)
{
@@ -259,7 +260,7 @@
}
static void
-FocusFix(void)
+doFocusGrabsUpdate(void)
{
EWin *const *lst, *ewin;
int i, num;
@@ -270,6 +271,13 @@
ewin = lst[i];
FocusEwinSetGrabs(ewin);
}
+ focus_pending_update_grabs = 0;
+}
+
+void
+FocusGrabsUpdate(void)
+{
+ focus_pending_update_grabs = 1;
}
static void
@@ -605,9 +613,6 @@
RaiseEwin(ewin);
FocusToEWin(ewin, FOCUS_CLICK);
- /* Remove grabs if on top of stacking list */
- FocusEwinSetGrabs(ewin);
-
/* allow click to pass thorugh */
if (EventDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusHandleClick %#lx %#lx\n", win,
@@ -670,7 +675,7 @@
Conf.warplist.icon_mode = tmp_warp_icon_mode;
Conf.focus.clickraises = tmp_clickalways;
- FocusFix();
+ FocusGrabsUpdate();
}
autosave();
}
@@ -879,9 +884,10 @@
break;
case ESIGNAL_IDLE:
- if (focus_inhibit || !focus_pending_why)
- break;
- FocusSet();
+ if (!focus_inhibit && focus_pending_why)
+ FocusSet();
+ if (focus_pending_update_grabs)
+ doFocusGrabsUpdate();
break;
}
}
@@ -962,7 +968,7 @@
if (Conf.focus.mode != mode)
{
Conf.focus.mode = mode;
- FocusFix();
+ FocusGrabsUpdate();
autosave();
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/stacking.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- stacking.c 30 Oct 2005 19:40:49 -0000 1.30
+++ stacking.c 8 Dec 2005 18:45:41 -0000 1.31
@@ -475,6 +475,8 @@
continue;
if (eo->ilayer > eox->ilayer)
continue;
+ if (EwinGetTransientFor((EWin *) eo) == _EwinGetClientXwin(ewin))
+ continue;
return eo == eox;
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
