Le Sat, 18 Feb 2006 13:32:59 +0900, dans son message intitulé Re: [e-devel]
tonight patches, Carsten Haitzler (The Rasterman) <[EMAIL PROTECTED]> a eu le
courage de nous raconter :
> On Mon, 6 Feb 2006 23:47:11 +0100 ilLogict <[EMAIL PROTECTED]> babbled:
>
> > Hello !
> >
> > Patches for tonight :
> > >e_border_menu_hide_stacking_maximize.patch: don't show «Stacking» and
> > «Maximize» entries in border menu when anyway submenu will not be shown
> > >ecore_codepage_i18n.patch: strangely, even if manual says so, XLookupString
> > doesn't always return iso8859-1 strings, i have utf-8 strings
> > (LC_ALL=en_US.UTF-8). Don't know if it's correct, needs testing (tested
> > with utf-8, iso8859-1, iso8859-15 locales, but don't know for others)
> > >e_various_typos.patch: corrects some typos ("Ok"→"OK" for consistency,
> > "singal"→"signal"…)
>
> merci! :)
>
> --
> ------------- Codito, ergo sum - "I code, therefore I am" --------------
> The Rasterman (Carsten Haitzler) [EMAIL PROTECTED]
> 裸好多
> Tokyo, Japan (東京 日本)
Hello!
De rien, c'est toujours un plaisir ! ;D (You're welcome, it's always a
pleasure! ;D)
So here are some more :)
>e_config-missing_wheel_binding.patch: there is one mouse wheel binding missing
>in default config (scroll left) :)
>e_menu_mouse_creation_bug.patch: when creating a menu with mouse, the first
>item is hilighted then unhilighted, now nothing happens
>e_keybindings_work.patch: make the keybindings config dialog actually work
>(apply new and save them)
Cheers!
ilLogict
Index: e_config.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.146
diff -u -r1.146 e_config.c
--- e_config.c 19 Feb 2006 23:53:35 -0000 1.146
+++ e_config.c 20 Feb 2006 20:25:52 -0000
@@ -1486,6 +1486,16 @@
eb = E_NEW(E_Config_Binding_Wheel, 1);
eb->context = E_BINDING_CONTEXT_CONTAINER;
+ eb->direction = 1;
+ eb->z = -1;
+ eb->modifiers = E_BINDING_MODIFIER_NONE;
+ eb->any_mod = 1;
+ eb->action = evas_stringshare_add("desk_linear_flip_by");
+ eb->params = evas_stringshare_add("-1");
+ e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb);
+
+ eb = E_NEW(E_Config_Binding_Wheel, 1);
+ eb->context = E_BINDING_CONTEXT_CONTAINER;
eb->direction = 0;
eb->z = 1;
eb->modifiers = E_BINDING_MODIFIER_NONE;
Index: e_menu.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.49
diff -u -r1.49 e_menu.c
--- e_menu.c 10 Feb 2006 12:21:22 -0000 1.49
+++ e_menu.c 20 Feb 2006 20:25:54 -0000
@@ -249,12 +249,10 @@
m->cur.y = y;
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
m->cur.y = y + h - m->cur.h;
- _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_RIGHT:
m->cur.x = x + w;
m->cur.y = y ;
- _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_UP:
_e_menu_realize(m);
@@ -262,7 +260,6 @@
if ((m->cur.x + m->cur.w) > (m->zone->x + m->zone->w))
m->cur.x = x + w - m->cur.w;
m->cur.y = y - m->cur.h;
- _e_menu_activate_last();
break;
case E_MENU_POP_DIRECTION_DOWN:
_e_menu_realize(m);
@@ -272,7 +269,6 @@
m->cur.y = y + h;
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
m->cur.y = y + h - m->cur.h;
- _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_AUTO:
_e_menu_auto_place(m, x, y, w, h);
@@ -282,8 +278,6 @@
m->cur.y = y + h;
break;
}
- pmi = _e_menu_item_active_get();
- if (pmi) e_menu_item_active_set(pmi, 0);
}
EAPI void
Index: e_int_config_keybindings.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.2
diff -u -r1.2 e_int_config_keybindings.c
--- e_int_config_keybindings.c 19 Feb 2006 16:34:22 -0000 1.2
+++ e_int_config_keybindings.c 20 Feb 2006 20:25:53 -0000
@@ -237,8 +237,8 @@
{"Switch To Desktop", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
{"Run Command", "exebuf", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
- {"Exit \'E\'", "exit", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
- {"Restart \'E\'", "restart", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
+ {"Exit Enlightenment", "exit", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
+ {"Restart Enlightenment", "restart", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
{"Show Main Menu", "menu_show", "main", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
@@ -514,6 +514,8 @@
_keybind_delete_keybinding(cfdata);
}
+
+ e_managers_keys_ungrab();
// here the removing of the old keybindings goes
while (e_config->key_bindings)
{
@@ -525,6 +527,8 @@
if (eb->key) evas_stringshare_del(eb->key);
if (eb->action) evas_stringshare_del(eb->action);
if (eb->params) evas_stringshare_del(eb->params);
+ e_bindings_key_del(eb->context, eb->key, eb->modifiers,
+ eb->any_mod, eb->action, eb->params);
E_FREE(eb);
}
@@ -553,12 +557,16 @@
bk2->params = bk->params == NULL ? NULL :
(char *)evas_stringshare_add(bk->params);
e_config->key_bindings = evas_list_append(e_config->key_bindings, bk2);
+ e_bindings_key_add(bk->context, bk->key, bk->modifiers,
+ bk->any_mod, bk->action, bk->params);
}
}
}
}
}
+ e_managers_keys_grab();
+ e_config_save_queue();
return 1;
}
