Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_int_config_keybindings.c
Log Message:
* Allow the E_EVENT_FOCUS_IN/OUT to be sent iff the focus is set explicitly.
Otherwise, the event is set on each focus callback, not even if the border
already has focus.
* Do not like autoapply in keybinding dialog. :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -3 -r1.489 -r1.490
--- e_border.c 22 May 2006 20:28:32 -0000 1.489
+++ e_border.c 27 May 2006 17:09:08 -0000 1.490
@@ -1291,12 +1291,17 @@
focused = bd;
//printf("set focused to %p\n", focused);
- ev = calloc(1, sizeof(E_Event_Border_Focus_In));
- ev->border = bd;
- e_object_ref(E_OBJECT(bd));
-
- ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
- _e_border_event_border_focus_in_free, NULL);
+ if (focus && set)
+ {
+ // Let send the focus event iff the focus is set explicitly,
+ // not via callback
+ ev = calloc(1, sizeof(E_Event_Border_Focus_In));
+ ev->border = bd;
+ e_object_ref(E_OBJECT(bd));
+
+ ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
+ _e_border_event_border_focus_in_free, NULL);
+ }
}
else if ((!bd->focused) && (focused == bd))
{
@@ -1304,13 +1309,18 @@
focused = NULL;
//printf("set focused to %p\n", focused);
-
- ev = calloc(1, sizeof(E_Event_Border_Focus_Out));
- ev->border = bd;
- e_object_ref(E_OBJECT(bd));
- ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
- _e_border_event_border_focus_out_free, NULL);
+ if (set)
+ {
+ // Let send the focus event iff the focus is set explicitly,
+ // not via callback
+ ev = calloc(1, sizeof(E_Event_Border_Focus_Out));
+ ev->border = bd;
+ e_object_ref(E_OBJECT(bd));
+
+ ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
+ _e_border_event_border_focus_out_free, NULL);
+ }
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_int_config_keybindings.c 22 May 2006 20:28:32 -0000 1.24
+++ e_int_config_keybindings.c 27 May 2006 17:09:08 -0000 1.25
@@ -311,7 +311,7 @@
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
- //v->override_auto_apply = 1;
+ v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Key Binding Settings"), NULL, 0, v, NULL);
return cfd;
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs