Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
focus.c
Log Message:
Make click-raises and click-to-focus independent options.
Make click-raises default.
Fix focusing focusclick windows in certain situations.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- focus.c 8 Dec 2005 18:45:41 -0000 1.136
+++ focus.c 22 Dec 2005 19:05:20 -0000 1.137
@@ -207,12 +207,9 @@
{
int set = 0;
- if (Conf.focus.mode == MODE_FOCUS_CLICK)
- {
- set = !ewin->state.active;
- }
- if (ewin->state.active && Conf.focus.clickraises &&
- !EwinListStackIsRaised(ewin))
+ if (((Conf.focus.mode == MODE_FOCUS_CLICK || ewin->props.focusclick) &&
+ !ewin->state.active) ||
+ (Conf.focus.clickraises && !EwinListStackIsRaised(ewin)))
set = 1;
if (set)
@@ -598,35 +595,20 @@
void
FocusHandleClick(EWin * ewin, Window win)
{
-#if 0
- EWin *ewin;
-
- ewin = EwinFindByChildren(win);
- if (!ewin)
- ewin = EwinFindByFrame(win);
- if (!ewin)
- return;
-#endif
+ if (Conf.focus.clickraises)
+ RaiseEwin(ewin);
- if ((Conf.focus.clickraises) || (Conf.focus.mode == MODE_FOCUS_CLICK))
- {
- RaiseEwin(ewin);
- FocusToEWin(ewin, FOCUS_CLICK);
+ if (Conf.focus.mode == MODE_FOCUS_CLICK || ewin->props.focusclick)
+ FocusToEWin(ewin, FOCUS_CLICK);
- /* allow click to pass thorugh */
- if (EventDebug(EDBUG_TYPE_GRABS))
- Eprintf("FocusHandleClick %#lx %#lx\n", win,
- _EwinGetContainerXwin(ewin));
- if (win == _EwinGetContainerXwin(ewin))
- {
- ESync();
- XAllowEvents(disp, ReplayPointer, CurrentTime);
- ESync();
- }
- }
- else if (ewin->props.focusclick)
- {
- FocusToEWin(ewin, FOCUS_CLICK);
+ /* Allow click to pass thorugh */
+ if (EventDebug(EDBUG_TYPE_GRABS))
+ Eprintf("FocusHandleClick %#lx %#lx\n", win,
_EwinGetContainerXwin(ewin));
+ if (win == _EwinGetContainerXwin(ewin))
+ {
+ ESync();
+ XAllowEvents(disp, ReplayPointer, CurrentTime);
+ ESync();
}
}
@@ -1007,7 +989,7 @@
static const CfgItem FocusCfgItems[] = {
CFG_ITEM_INT(Conf.focus, mode, MODE_FOCUS_SLOPPY),
- CFG_ITEM_BOOL(Conf.focus, clickraises, 0),
+ CFG_ITEM_BOOL(Conf.focus, clickraises, 1),
CFG_ITEM_BOOL(Conf.focus, transientsfollowleader, 1),
CFG_ITEM_BOOL(Conf.focus, switchfortransientmap, 1),
CFG_ITEM_BOOL(Conf.focus, all_new_windows_get_focus, 0),
-------------------------------------------------------
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
