Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_dialog.c e_includes.h e_manager.c
Added Files:
e_apps_cache.c e_apps_cache.h
Log Message:
shift-tab to go back
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- Makefile.am 22 Sep 2005 05:52:37 -0000 1.46
+++ Makefile.am 24 Sep 2005 10:29:31 -0000 1.47
@@ -72,7 +72,8 @@
e_dialog.h \
e_configure.h \
e_about.h \
-e_theme_about.h
+e_theme_about.h \
+e_apps_cache.h
enlightenment_SOURCES = \
e_main.c \
@@ -133,6 +134,7 @@
e_configure.c \
e_about.c \
e_theme_about.c \
+e_apps_cache.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@
@cf_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_dialog.c 24 Sep 2005 03:24:37 -0000 1.17
+++ e_dialog.c 24 Sep 2005 10:29:31 -0000 1.18
@@ -31,6 +31,7 @@
E_Dialog *dia;
E_Manager *man;
Evas_Object *o;
+ Evas_Modifier_Mask mask;
if (!con)
{
@@ -76,9 +77,15 @@
o = evas_object_rectangle_add(e_win_evas_get(dia->win));
dia->event_object = o;
- evas_object_key_grab(o, "Tab", 0, 0, 0);
- evas_object_key_grab(o, "Return", 0, 0, 0);
- evas_object_key_grab(o, "space", 0, 0, 0);
+ mask = 0;
+ evas_object_key_grab(o, "Tab", mask, ~mask, 0);
+ mask = evas_key_modifier_mask_get(e_win_evas_get(dia->win), "Shift");
+ evas_object_key_grab(o, "Tab", mask, ~mask, 0);
+ mask = 0;
+ evas_object_key_grab(o, "Return", mask, ~mask, 0);
+ mask = 0;
+ evas_object_key_grab(o, "space", mask, ~mask, 0);
+
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_e_dialog_cb_key_down, dia);
dia->focused = NULL;
@@ -252,28 +259,22 @@
{
if (dia->focused && dia->buttons)
{
- if (dia->focused->next)
+ E_Dialog_Button *db;
+
+ db = dia->focused->data;
+ edje_object_signal_emit(db->obj, "unfocus", "");
+ if
(evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(dia->win)),
"Shift"))
{
- E_Dialog_Button *db;
-
- db = dia->focused->data;
- edje_object_signal_emit(db->obj, "unfocus", "");
-
- dia->focused = dia->focused->next;
- db = dia->focused->data;
- edje_object_signal_emit(db->obj, "focus", "");
+ if (dia->focused->prev) dia->focused = dia->focused->prev;
+ else dia->focused = evas_list_last(dia->buttons);
}
else
{
- E_Dialog_Button *db;
-
- db = dia->focused->data;
- edje_object_signal_emit(db->obj, "unfocus", "");
-
- dia->focused = dia->buttons;
- db = evas_list_data(dia->focused);
- edje_object_signal_emit(db->obj, "focus", "");
+ if (dia->focused->next) dia->focused = dia->focused->next;
+ else dia->focused = dia->buttons;
}
+ db = evas_list_data(dia->focused);
+ edje_object_signal_emit(db->obj, "focus", "");
}
else
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_includes.h 22 Sep 2005 05:52:37 -0000 1.33
+++ e_includes.h 24 Sep 2005 10:29:31 -0000 1.34
@@ -59,3 +59,4 @@
#include "e_configure.h"
#include "e_about.h"
#include "e_theme_about.h"
+#include "e_apps_cache.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_manager.c 24 Sep 2005 09:04:39 -0000 1.40
+++ e_manager.c 24 Sep 2005 10:29:31 -0000 1.41
@@ -480,7 +480,7 @@
man = data;
e = ev;
- printf("KEY %s [win=%x event_win=%x]\n", e->keyname, e->win, e->event_win);
+// printf("KEY %s [win=%x event_win=%x]\n", e->keyname, e->win,
e->event_win);
if (e->event_win != man->root) return 1;
if (e_bindings_key_down_event_handle(E_BINDING_CONTEXT_MANAGER,
E_OBJECT(man), ev))
return 0;
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
