enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

don't listen to e kbd layout change event, only watch global event. also don't update gadget icons repeatedly or change them if re-setting current layout 

SVN revision: 77729
This commit is contained in:
Mike Blumenkrantz 2012-10-10 09:07:25 +00:00
parent e32b918e43
commit f8717d093c
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/xkbswitch/e_mod_main.c
View File

@ -11,7 +11,6 @@ static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __U
static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas); static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
/* EVENTS */ /* EVENTS */
static Eina_Bool _xkb_changed(void *data, int type, void *event_info);
static Eina_Bool _xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event); static Eina_Bool _xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event);
static void _e_xkb_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event); static void _e_xkb_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event);
static void _e_xkb_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi __UNUSED__); static void _e_xkb_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi __UNUSED__);
@ -30,6 +29,7 @@ typedef struct _Instance
Evas_Object *o_xkbswitch; Evas_Object *o_xkbswitch;
Evas_Object *o_xkbflag; Evas_Object *o_xkbflag;
Eina_Stringshare *cur_layout;
E_Menu *lmenu; E_Menu *lmenu;
} Instance; } Instance;
@ -91,7 +91,6 @@ e_modapi_init(E_Module *m)
"preferences-desktop-keyboard", "preferences-desktop-keyboard",
_xkb_cfg_dialog); _xkb_cfg_dialog);
_xkb.module = m; _xkb.module = m;
_xkb.evh = ecore_event_handler_add(E_EVENT_XKB_CHANGED, _xkb_changed, NULL);
ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY, _xkb_changed_state, NULL); ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY, _xkb_changed_state, NULL);
if (!e_config->xkb.default_model) e_config->xkb.default_model = eina_stringshare_add("default"); if (!e_config->xkb.default_model) e_config->xkb.default_model = eina_stringshare_add("default");
if (!e_config->xkb.used_layouts) _e_xkb_default_add(); if (!e_config->xkb.used_layouts) _e_xkb_default_add();
@ -152,6 +151,8 @@ _xkb_update_icon(int cur_group)
{ {
EINA_LIST_FOREACH(instances, l, inst) EINA_LIST_FOREACH(instances, l, inst)
{ {
if (e_config->xkb.cur_layout == inst->cur_layout) continue;
eina_stringshare_replace(&inst->cur_layout, e_config->xkb.cur_layout);
if (inst->o_xkbflag) if (inst->o_xkbflag)
{ {
evas_object_del(inst->o_xkbflag); evas_object_del(inst->o_xkbflag);
@ -168,6 +169,8 @@ _xkb_update_icon(int cur_group)
{ {
EINA_LIST_FOREACH(instances, l, inst) EINA_LIST_FOREACH(instances, l, inst)
{ {
if (e_config->xkb.cur_layout == inst->cur_layout) continue;
eina_stringshare_replace(&inst->cur_layout, e_config->xkb.cur_layout);
if (!inst->o_xkbflag) if (!inst->o_xkbflag)
inst->o_xkbflag = e_icon_add(inst->gcc->gadcon->evas); inst->o_xkbflag = e_icon_add(inst->gcc->gadcon->evas);
e_theme_edje_object_set(inst->o_xkbswitch, e_theme_edje_object_set(inst->o_xkbswitch,
@ -200,6 +203,7 @@ _gc_init(E_Gadcon *gc, const char *gcname, const char *id, const char *style)
inst = E_NEW(Instance, 1); inst = E_NEW(Instance, 1);
/* The gadget */ /* The gadget */
inst->o_xkbswitch = edje_object_add(gc->evas); inst->o_xkbswitch = edje_object_add(gc->evas);
inst->cur_layout = eina_stringshare_ref(name);
if (e_config->xkb.only_label) if (e_config->xkb.only_label)
e_theme_edje_object_set(inst->o_xkbswitch, e_theme_edje_object_set(inst->o_xkbswitch,
"base/theme/modules/xkbswitch", "base/theme/modules/xkbswitch",
@ -255,6 +259,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
evas_object_del(inst->o_xkbswitch); evas_object_del(inst->o_xkbswitch);
evas_object_del(inst->o_xkbflag); evas_object_del(inst->o_xkbflag);
} }
eina_stringshare_del(inst->cur_layout);
E_FREE(inst); E_FREE(inst);
} }
@ -293,13 +298,6 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
return o; return o;
} }
static Eina_Bool
_xkb_changed(void *data __UNUSED__, int type __UNUSED__, void *event_info __UNUSED__)
{
_xkb_update_icon((int)(intptr_t)data);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool static Eina_Bool
_xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) _xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{ {
@ -522,11 +520,10 @@ _e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED_
grp++; grp++;
if (ndata == data) cur_group = grp; if (ndata == data) cur_group = grp;
} }
if (cur_group != -1) if (cur_group == -1) return;
{ if (cl->name == e_xkb_layout_get()) return;
e_xkb_layout_set(cl->name); e_xkb_layout_set(cl->name);
eina_stringshare_replace(&e_config->xkb.selected_layout, cl->name); eina_stringshare_replace(&e_config->xkb.selected_layout, cl->name);
_xkb_update_icon(cur_group); _xkb_update_icon(cur_group);
}
} }