struct _E_Config_Dialog_Data
{
- Evas *evas, *dlg_evas;
+ Evas *evas, *dlg_evas;
Evas_Object *layout_list, *used_list;
Evas_Object *dmodel_list, *model_list, *variant_list;
Evas_Object *btn_add, *btn_del, *btn_up, *btn_down;
Ecore_Timer *fill_delay;
Ecore_Timer *dlg_fill_delay;
- Eina_List *cfg_layouts;
- Eina_List *cfg_options;
- const char *default_model;
+ Eina_List *cfg_layouts;
+ Eina_List *cfg_options;
+ const char *default_model;
- int only_label;
+ int only_label;
- E_Dialog *dlg_add_new;
+ E_Dialog *dlg_add_new;
};
typedef struct _E_XKB_Dialog_Option
{
- int enabled;
+ int enabled;
const char *name;
} E_XKB_Dialog_Option;
/* Local prototypes */
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static void _cb_add(void *data, void *data2 __UNUSED__);
-static void _cb_del(void *data, void *data2 __UNUSED__);
+static void _cb_add(void *data, void *data2 __UNUSED__);
+static void _cb_del(void *data, void *data2 __UNUSED__);
-static void _cb_up(void *data, void *data2 __UNUSED__);
-static void _cb_dn(void *data, void *data2 __UNUSED__);
+static void _cb_up(void *data, void *data2 __UNUSED__);
+static void _cb_dn(void *data, void *data2 __UNUSED__);
-static void _dlg_add_cb_ok(void *data, E_Dialog *dlg);
-static void _dlg_add_cb_cancel(void *data, E_Dialog *dlg);
+static void _dlg_add_cb_ok(void *data, E_Dialog *dlg);
+static void _dlg_add_cb_cancel(void *data, E_Dialog *dlg);
-static E_Dialog *_dlg_add_new(E_Config_Dialog_Data *cfdata);
+static E_Dialog *_dlg_add_new(E_Config_Dialog_Data *cfdata);
-static void _dlg_add_cb_del(void *obj);
+static void _dlg_add_cb_del(void *obj);
-static Eina_Bool _cb_dlg_fill_delay(void *data);
+static Eina_Bool _cb_dlg_fill_delay(void *data);
-static void _cb_layout_select(void *data);
-static void _cb_used_select (void *data);
+static void _cb_layout_select(void *data);
+static void _cb_used_select(void *data);
-static Eina_Bool _cb_fill_delay(void *data);
+static Eina_Bool _cb_fill_delay(void *data);
/* Externals */
return NULL;
if (!(v = E_NEW(E_Config_Dialog_View, 1))) return NULL;
- v->create_cfdata = _create_data;
- v->free_cfdata = _free_data;
+ v->create_cfdata = _create_data;
+ v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create;
- v->basic.apply_cfdata = _basic_apply;
+ v->basic.apply_cfdata = _basic_apply;
cfd = e_config_dialog_new(con, _("Keyboard Settings"), "E",
"keyboard_and_mouse/xkbswitch",
cfdata->cfg_layouts = NULL;
EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
{
- nl = E_NEW(E_Config_XKB_Layout, 1);
- nl->name = eina_stringshare_add(cl->name);
- nl->model = eina_stringshare_add(cl->model);
+ nl = E_NEW(E_Config_XKB_Layout, 1);
+ nl->name = eina_stringshare_add(cl->name);
+ nl->model = eina_stringshare_add(cl->model);
nl->variant = eina_stringshare_add(cl->variant);
cfdata->cfg_layouts = eina_list_append(cfdata->cfg_layouts, nl);
/* Initialize options */
- cfdata->only_label = e_config->xkb.only_label;
+ cfdata->only_label = e_config->xkb.only_label;
cfdata->cfg_options = NULL;
lll = e_config->xkb.used_options;
EINA_LIST_FOREACH(cfdata->cfg_layouts, l, cl)
{
- nl = E_NEW(E_Config_XKB_Layout, 1);
- nl->name = eina_stringshare_add(cl->name);
- nl->model = eina_stringshare_add(cl->model);
+ nl = E_NEW(E_Config_XKB_Layout, 1);
+ nl->name = eina_stringshare_add(cl->name);
+ nl->model = eina_stringshare_add(cl->model);
nl->variant = eina_stringshare_add(cl->variant);
e_config->xkb.used_layouts =
oc = E_NEW(E_Config_XKB_Option, 1);
oc->name = eina_stringshare_add(od->name);
e_config->xkb.used_options = eina_list_append(e_config->xkb.used_options, oc);
- }
+ }
e_xkb_update(-1);
_xkb_update_icon(0);
{
/* Holds the dialog contents, displays a toolbar on the top */
Evas_Object *mainn = e_widget_toolbook_add(evas, 24, 24);
- {
- /* Holds the used layouts ilist and the button table */
- Evas_Object *layoutss;
- Evas_Object *modelss;
- Evas_Object *options;
-
- layoutss = e_widget_list_add(evas, 0, 0);
- {
- /* Holds the used layouts */
- Evas_Object *configs;
- Evas_Object *buttons;
-
- configs = e_widget_ilist_add(evas, 32, 32, NULL);
-
- {
- e_widget_size_min_set(configs, 220, 160);
- e_widget_ilist_go(configs);
-
- e_widget_list_object_append(layoutss, configs, 1, 1, 0.5);
- cfdata->used_list = configs;
- }
-
- /* Holds the buttons */
- buttons = e_widget_table_add(evas, 1);
- {
- cfdata->btn_up = e_widget_button_add(evas, _("Up"), "go-up", _cb_up, cfdata, NULL);
- {
- e_widget_disabled_set(cfdata->btn_up, EINA_TRUE);
- e_widget_table_object_append(buttons, cfdata->btn_up, 0, 0, 1, 1, 1, 1, 1, 0);
- }
-
- cfdata->btn_down = e_widget_button_add(evas, _("Down"), "go-down", _cb_dn, cfdata, NULL);
- {
- e_widget_disabled_set(cfdata->btn_down, EINA_TRUE);
- e_widget_table_object_append(buttons, cfdata->btn_down, 1, 0, 1, 1, 1, 1, 1, 0);
- }
-
- cfdata->btn_add = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
- {
- e_widget_table_object_append(buttons, cfdata->btn_add, 0, 1, 1, 1, 1, 1, 1, 0);
- }
-
- cfdata->btn_del = e_widget_button_add(evas, _("Remove"), "list-remove", _cb_del, cfdata, NULL);
- {
- e_widget_disabled_set(cfdata->btn_del, EINA_TRUE);
- e_widget_table_object_append(buttons, cfdata->btn_del, 1, 1, 1, 1, 1, 1, 1, 0);
- }
-
- e_widget_list_object_append(layoutss, buttons, 1, 0, 1);
- }
-
- e_widget_toolbook_page_append(mainn, NULL, _("Configurations"), layoutss, 1, 1, 1, 1, 0.5, 0.0);
- }
-
- /* Holds the default models */
- modelss = e_widget_ilist_add(evas, 32, 32, &cfdata->default_model);
- {
- e_widget_size_min_set(modelss, 220, 160);
- cfdata->dmodel_list = modelss;
-
- e_widget_toolbook_page_append(mainn, NULL, _("Models"), modelss, 1, 1, 1, 1, 0.5, 0.0);
- }
-
- /* Holds the options */
- options = e_widget_list_add(evas, 0, 0);
- {
- E_XKB_Option *option;
- E_XKB_Option_Group *group;
- Eina_List *l, *ll, *lll;
- Evas_Coord mw, mh;
- Evas_Object *general;
- Evas_Object *scroller;
-
- general = e_widget_framelist_add(evas, _("Gadgets"), 0);
- {
- Evas_Object *only_label = e_widget_check_add(evas, _("Label only"), &(cfdata->only_label));
- {
- e_widget_framelist_object_append(general, only_label);
- }
- e_widget_list_object_append(options, general, 1, 1, 0.0);
- }
-
- lll = cfdata->cfg_options;
-
- EINA_LIST_FOREACH(optgroups, l, group)
- {
- Evas_Object *grp = e_widget_framelist_add(evas, group->description, 0);
-
- EINA_LIST_FOREACH(group->options, ll, option)
- {
- Evas_Object *chk = e_widget_check_add(evas, option->description,
- &(((E_XKB_Dialog_Option *)
- eina_list_data_get(lll))->enabled));
- e_widget_framelist_object_append(grp, chk);
- lll = eina_list_next(lll);
- }
- e_widget_list_object_append(options, grp, 1, 1, 0.0);
- }
-
- e_widget_size_min_get(options, &mw, &mh);
-
- if (mw < 220) mw = 220;
- if (mh < 160) mh = 160;
-
- evas_object_resize(options, mw, mh);
-
- scroller = e_widget_scrollframe_simple_add(evas, options);
- e_widget_size_min_set(scroller, 220, 160);
-
- e_widget_toolbook_page_append(mainn, NULL, _("Options"), scroller, 1, 1, 1, 1, 0.5, 0.0);
- }
-
- /* Display the first page by default */
- e_widget_toolbook_page_show(mainn, 0);
- }
+ {
+ /* Holds the used layouts ilist and the button table */
+ Evas_Object *layoutss;
+ Evas_Object *modelss;
+ Evas_Object *options;
+
+ layoutss = e_widget_list_add(evas, 0, 0);
+ {
+ /* Holds the used layouts */
+ Evas_Object *configs;
+ Evas_Object *buttons;
+
+ configs = e_widget_ilist_add(evas, 32, 32, NULL);
+
+ {
+ e_widget_size_min_set(configs, 220, 160);
+ e_widget_ilist_go(configs);
+
+ e_widget_list_object_append(layoutss, configs, 1, 1, 0.5);
+ cfdata->used_list = configs;
+ }
+
+ /* Holds the buttons */
+ buttons = e_widget_table_add(evas, 1);
+ {
+ cfdata->btn_up = e_widget_button_add(evas, _("Up"), "go-up", _cb_up, cfdata, NULL);
+ {
+ e_widget_disabled_set(cfdata->btn_up, EINA_TRUE);
+ e_widget_table_object_append(buttons, cfdata->btn_up, 0, 0, 1, 1, 1, 1, 1, 0);
+ }
+
+ cfdata->btn_down = e_widget_button_add(evas, _("Down"), "go-down", _cb_dn, cfdata, NULL);
+ {
+ e_widget_disabled_set(cfdata->btn_down, EINA_TRUE);
+ e_widget_table_object_append(buttons, cfdata->btn_down, 1, 0, 1, 1, 1, 1, 1, 0);
+ }
+
+ cfdata->btn_add = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
+ {
+ e_widget_table_object_append(buttons, cfdata->btn_add, 0, 1, 1, 1, 1, 1, 1, 0);
+ }
+
+ cfdata->btn_del = e_widget_button_add(evas, _("Remove"), "list-remove", _cb_del, cfdata, NULL);
+ {
+ e_widget_disabled_set(cfdata->btn_del, EINA_TRUE);
+ e_widget_table_object_append(buttons, cfdata->btn_del, 1, 1, 1, 1, 1, 1, 1, 0);
+ }
+
+ e_widget_list_object_append(layoutss, buttons, 1, 0, 1);
+ }
+
+ e_widget_toolbook_page_append(mainn, NULL, _("Configurations"), layoutss, 1, 1, 1, 1, 0.5, 0.0);
+ }
+
+ /* Holds the default models */
+ modelss = e_widget_ilist_add(evas, 32, 32, &cfdata->default_model);
+ {
+ e_widget_size_min_set(modelss, 220, 160);
+ cfdata->dmodel_list = modelss;
+
+ e_widget_toolbook_page_append(mainn, NULL, _("Models"), modelss, 1, 1, 1, 1, 0.5, 0.0);
+ }
+
+ /* Holds the options */
+ options = e_widget_list_add(evas, 0, 0);
+ {
+ E_XKB_Option *option;
+ E_XKB_Option_Group *group;
+ Eina_List *l, *ll, *lll;
+ Evas_Coord mw, mh;
+ Evas_Object *general;
+ Evas_Object *scroller;
+
+ general = e_widget_framelist_add(evas, _("Gadgets"), 0);
+ {
+ Evas_Object *only_label = e_widget_check_add(evas, _("Label only"), &(cfdata->only_label));
+ {
+ e_widget_framelist_object_append(general, only_label);
+ }
+ e_widget_list_object_append(options, general, 1, 1, 0.0);
+ }
+
+ lll = cfdata->cfg_options;
+
+ EINA_LIST_FOREACH(optgroups, l, group)
+ {
+ Evas_Object *grp = e_widget_framelist_add(evas, group->description, 0);
+
+ EINA_LIST_FOREACH(group->options, ll, option)
+ {
+ Evas_Object *chk = e_widget_check_add(evas, option->description,
+ &(((E_XKB_Dialog_Option *)
+ eina_list_data_get(lll))->enabled));
+ e_widget_framelist_object_append(grp, chk);
+ lll = eina_list_next(lll);
+ }
+ e_widget_list_object_append(options, grp, 1, 1, 0.0);
+ }
+
+ e_widget_size_min_get(options, &mw, &mh);
+
+ if (mw < 220) mw = 220;
+ if (mh < 160) mh = 160;
+
+ evas_object_resize(options, mw, mh);
+
+ scroller = e_widget_scrollframe_simple_add(evas, options);
+ e_widget_size_min_set(scroller, 220, 160);
+
+ e_widget_toolbook_page_append(mainn, NULL, _("Options"), scroller, 1, 1, 1, 1, 0.5, 0.0);
+ }
+
+ /* Display the first page by default */
+ e_widget_toolbook_page_show(mainn, 0);
+ }
/* The main evas */
cfdata->evas = evas;
/* The main toolbook, holds the lists and tabs */
mainn = e_widget_toolbook_add(evas, 24, 24);
- {
- /* Holds the available layouts */
- Evas_Object *available = e_widget_ilist_add(evas, 32, 32, NULL);
- Evas_Object *modelss;
- Evas_Object *variants;
-
- {
- e_widget_size_min_set(available, 220, 160);
- e_widget_ilist_go(available);
- e_widget_toolbook_page_append(mainn, NULL, _("Available"), available, 1, 1, 1, 1, 0.5, 0.0);
- cfdata->layout_list = available;
- }
-
- /* Holds the available models */
- modelss = e_widget_ilist_add(evas, 32, 32, NULL);
- {
- e_widget_toolbook_page_append(mainn, NULL, _("Model"), modelss, 1, 1, 1, 1, 0.5, 0.0);
- cfdata->model_list = modelss;
- }
-
- /* Holds the available variants */
- variants = e_widget_ilist_add(evas, 32, 32, NULL);
- {
- e_widget_toolbook_page_append(mainn, NULL, _("Variant"), variants, 1, 1, 1, 1, 0.5, 0.0);
- cfdata->variant_list = variants;
- }
- e_widget_toolbook_page_show(mainn, 0);
- }
+ {
+ /* Holds the available layouts */
+ Evas_Object *available = e_widget_ilist_add(evas, 32, 32, NULL);
+ Evas_Object *modelss;
+ Evas_Object *variants;
+
+ {
+ e_widget_size_min_set(available, 220, 160);
+ e_widget_ilist_go(available);
+ e_widget_toolbook_page_append(mainn, NULL, _("Available"), available, 1, 1, 1, 1, 0.5, 0.0);
+ cfdata->layout_list = available;
+ }
+
+ /* Holds the available models */
+ modelss = e_widget_ilist_add(evas, 32, 32, NULL);
+ {
+ e_widget_toolbook_page_append(mainn, NULL, _("Model"), modelss, 1, 1, 1, 1, 0.5, 0.0);
+ cfdata->model_list = modelss;
+ }
+
+ /* Holds the available variants */
+ variants = e_widget_ilist_add(evas, 32, 32, NULL);
+ {
+ e_widget_toolbook_page_append(mainn, NULL, _("Variant"), variants, 1, 1, 1, 1, 0.5, 0.0);
+ cfdata->variant_list = variants;
+ }
+ e_widget_toolbook_page_show(mainn, 0);
+ }
e_widget_size_min_get(mainn, &mw, &mh);
- e_dialog_content_set(dlg, mainn, mw, mh);
+ e_dialog_content_set(dlg, mainn, mw, mh);
cfdata->dlg_evas = evas;
_dlg_add_cb_ok(void *data __UNUSED__, E_Dialog *dlg)
{
E_Config_Dialog_Data *cfdata = dlg->data;
- E_Config_XKB_Layout *cl;
+ E_Config_XKB_Layout *cl;
char buf[4096];
/* Configuration information */
const char *layout = e_widget_ilist_selected_value_get(cfdata->layout_list);
const char *variant = e_widget_ilist_selected_value_get(cfdata->variant_list);
/* The new configuration */
- cl = E_NEW(E_Config_XKB_Layout, 1);
- cl->name = eina_stringshare_add(layout);
- cl->model = eina_stringshare_add(model);
+ cl = E_NEW(E_Config_XKB_Layout, 1);
+ cl->name = eina_stringshare_add(layout);
+ cl->model = eina_stringshare_add(model);
cl->variant = eina_stringshare_add(variant);
cfdata->cfg_layouts = eina_list_append(cfdata->cfg_layouts, cl);
edje_freeze();
e_widget_ilist_freeze(cfdata->used_list);
- {
- Evas_Object *ic = e_icon_add(cfdata->evas);
- const char *name = cl->name;
+ {
+ Evas_Object *ic = e_icon_add(cfdata->evas);
+ const char *name = cl->name;
- e_xkb_e_icon_flag_setup(ic, name);
- snprintf(buf, sizeof(buf), "%s (%s, %s)",
- cl->name, cl->model, cl->variant);
- e_widget_ilist_append_full(cfdata->used_list, ic, NULL, buf,
- _cb_used_select, cfdata, NULL);
- }
+ e_xkb_e_icon_flag_setup(ic, name);
+ snprintf(buf, sizeof(buf), "%s (%s, %s)",
+ cl->name, cl->model, cl->variant);
+ e_widget_ilist_append_full(cfdata->used_list, ic, NULL, buf,
+ _cb_used_select, cfdata, NULL);
+ }
- e_widget_ilist_go (cfdata->used_list);
+ e_widget_ilist_go(cfdata->used_list);
e_widget_ilist_thaw(cfdata->used_list);
edje_thaw();
evas_event_thaw(cfdata->evas);
edje_freeze();
e_widget_ilist_freeze(cfdata->layout_list);
- e_widget_ilist_clear (cfdata->layout_list);
+ e_widget_ilist_clear(cfdata->layout_list);
EINA_LIST_FOREACH(layouts, l, layout)
{
_cb_layout_select, cfdata, layout->name);
}
- e_widget_ilist_go (cfdata->layout_list);
+ e_widget_ilist_go(cfdata->layout_list);
e_widget_ilist_thaw(cfdata->layout_list);
edje_thaw();
return;
if (!(layout = eina_list_search_unsorted
- (layouts, layout_sort_by_name_cb,
+ (layouts, layout_sort_by_name_cb,
e_widget_ilist_nth_value_get(cfdata->layout_list, n)
- ))) return;
+ ))) return;
/* Update the lists */
evas_event_freeze(cfdata->dlg_evas);
EINA_LIST_FOREACH(layout->variants, l, variant)
{
- snprintf(buf, sizeof(buf), "%s (%s)", variant->name, variant->description);
+ snprintf(buf, sizeof(buf), "%s (%s)", variant->name, variant->description);
e_widget_ilist_append(cfdata->variant_list, NULL, buf, NULL, cfdata, variant->name);
}
edje_thaw();
evas_event_thaw(cfdata->dlg_evas);
- e_widget_ilist_selected_set(cfdata->model_list, 0);
+ e_widget_ilist_selected_set(cfdata->model_list, 0);
e_widget_ilist_selected_set(cfdata->variant_list, 0);
e_dialog_button_disable_num_set(cfdata->dlg_add_new, 0, 0);
cl->name, cl->model, cl->variant);
e_widget_ilist_append_full(cfdata->used_list, ic, NULL, buf,
_cb_used_select, cfdata, NULL);
- }
+ }
e_widget_ilist_go(cfdata->used_list);
e_widget_ilist_thaw(cfdata->used_list);
if (n == (c - 1))
{
- e_widget_disabled_set(cfdata->btn_up, EINA_FALSE);
- e_widget_disabled_set(cfdata->btn_down, EINA_TRUE );
+ e_widget_disabled_set(cfdata->btn_up, EINA_FALSE);
+ e_widget_disabled_set(cfdata->btn_down, EINA_TRUE);
}
else if (n == 0)
{
- e_widget_disabled_set(cfdata->btn_up, EINA_TRUE );
+ e_widget_disabled_set(cfdata->btn_up, EINA_TRUE);
e_widget_disabled_set(cfdata->btn_down, EINA_FALSE);
}
else
{
- e_widget_disabled_set(cfdata->btn_up, EINA_FALSE);
+ e_widget_disabled_set(cfdata->btn_up, EINA_FALSE);
e_widget_disabled_set(cfdata->btn_down, EINA_FALSE);
}
}
+
#include "e_mod_main.h"
#include "e_mod_parse.h"
-
/* GADCON */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
-static void _gc_shutdown(E_Gadcon_Client *gcc);
-static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
-static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
-static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__);
-static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static const char *_gc_label(const E_Gadcon_Client_Class *client_class);
+static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__);
+static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
/* 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 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_lmenu_post(void *data, E_Menu *menu __UNUSED__);
-static void _e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__);
+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 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_lmenu_post(void *data, E_Menu *menu __UNUSED__);
+static void _e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__);
/* Static variables
* The static variables specific to the current code unit.
/* GADGET INSTANCE */
-typedef struct _Instance
+typedef struct _Instance
{
E_Gadcon_Client *gcc;
-
- Evas_Object *o_xkbswitch;
- Evas_Object *o_xkbflag;
-
- E_Menu *lmenu;
+
+ Evas_Object *o_xkbswitch;
+ Evas_Object *o_xkbflag;
+
+ E_Menu *lmenu;
} Instance;
/* LIST OF INSTANCES */
/* CONFIG STRUCTURE */
Xkb _xkb = { NULL, NULL, NULL };
-static const E_Gadcon_Client_Class _gc_class =
+static const E_Gadcon_Client_Class _gc_class =
{
GADCON_CLIENT_CLASS_VERSION,
- "xkbswitch",
- {
- _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, NULL
- },
+ "xkbswitch",
+ {
+ _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, NULL
+ },
E_GADCON_CLIENT_STYLE_PLAIN
};
-EAPI E_Module_Api e_modapi =
+EAPI E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
"XKB Switcher"
* menus, finds the rules file, initializes gadget icon.
*/
EAPI void *
-e_modapi_init(E_Module *m)
+e_modapi_init(E_Module *m)
{
/* Menus and dialogs */
- e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"),
+ e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"),
NULL, "preferences-behavior");
e_configure_registry_item_add("keyboard_and_mouse/xkbswitch", 110,
- _("Keyboard"), NULL,
- "preferences-desktop-keyboard",
+ _("Keyboard"), NULL,
+ "preferences-desktop-keyboard",
_xkb_cfg_dialog);
_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);
/* Gadcon */
e_gadcon_provider_register(&_gc_class);
return m;
if (_xkb.evh) ecore_event_handler_del(_xkb.evh);
if (_xkb.cfd) e_object_del(E_OBJECT(_xkb.cfd));
- _xkb.cfd = NULL;
+ _xkb.cfd = NULL;
_xkb.module = NULL;
e_gadcon_provider_unregister(&_gc_class);
-
+
return 1;
}
Instance *inst;
Eina_List *l;
E_Config_XKB_Layout *layout;
- const char *name=NULL;
+ const char *name = NULL;
int grp = -1;
-
+
if (!e_config->xkb.used_layouts) return;
- INF("ui: %d",cur_group);
+ INF("ui: %d", cur_group);
EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, layout)
{
- grp++;
- if (cur_group == grp) name = layout->name;
+ grp++;
+ if (cur_group == grp) name = layout->name;
}
if ((name) && (strchr(name, '/'))) name = strchr(name, '/') + 1;
-
+
if (e_config->xkb.only_label)
{
EINA_LIST_FOREACH(instances, l, inst)
evas_object_del(inst->o_xkbflag);
inst->o_xkbflag = NULL;
}
- e_theme_edje_object_set(inst->o_xkbswitch,
- "base/theme/modules/xkbswitch",
+ e_theme_edje_object_set(inst->o_xkbswitch,
+ "base/theme/modules/xkbswitch",
"modules/xkbswitch/noflag");
edje_object_part_text_set(inst->o_xkbswitch,
"e.text.label", name);
if (!inst->o_xkbflag)
inst->o_xkbflag = e_icon_add(inst->gcc->gadcon->evas);
e_theme_edje_object_set(inst->o_xkbswitch,
- "base/theme/modules/xkbswitch",
+ "base/theme/modules/xkbswitch",
"modules/xkbswitch/main");
e_xkb_e_icon_flag_setup(inst->o_xkbflag, name);
edje_object_part_swallow(inst->o_xkbswitch, "e.swallow.flag",
/* LOCAL STATIC FUNCTIONS */
static E_Gadcon_Client *
-_gc_init(E_Gadcon *gc, const char *gcname, const char *id, const char *style)
+_gc_init(E_Gadcon *gc, const char *gcname, const char *id, const char *style)
{
- Instance *inst;
+ Instance *inst;
const char *name;
-
+
if (e_config->xkb.used_layouts)
- name = ((E_Config_XKB_Layout*)
+ name = ((E_Config_XKB_Layout *)
eina_list_data_get(e_config->xkb.used_layouts))->name;
else name = NULL;
/* The gadget */
inst->o_xkbswitch = edje_object_add(gc->evas);
if (e_config->xkb.only_label)
- e_theme_edje_object_set(inst->o_xkbswitch,
- "base/theme/modules/xkbswitch",
+ e_theme_edje_object_set(inst->o_xkbswitch,
+ "base/theme/modules/xkbswitch",
"modules/xkbswitch/noflag");
else
e_theme_edje_object_set(inst->o_xkbswitch,
- "base/theme/modules/xkbswitch",
+ "base/theme/modules/xkbswitch",
"modules/xkbswitch/main");
edje_object_part_text_set(inst->o_xkbswitch, "e.text.label",
e_xkb_layout_name_reduce(name));
inst->o_xkbflag);
}
else inst->o_xkbflag = NULL;
- /* e_config->xkb.used_layout */
+ /* e_config->xkb.used_layout */
/* Hook some menus */
evas_object_event_callback_add(inst->o_xkbswitch, EVAS_CALLBACK_MOUSE_DOWN,
_e_xkb_cb_mouse_down, inst);
/* Make the list know about the instance */
instances = eina_list_append(instances, inst);
-
+
return inst->gcc;
}
static void
-_gc_shutdown(E_Gadcon_Client *gcc)
+_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
if (!(inst = gcc->data)) return;
instances = eina_list_remove(instances, inst);
-
- if (inst->lmenu)
+
+ if (inst->lmenu)
{
e_menu_post_deactivate_callback_set(inst->lmenu, NULL, NULL);
e_object_del(E_OBJECT(inst->lmenu));
inst->lmenu = NULL;
}
- if (inst->o_xkbswitch)
+ if (inst->o_xkbswitch)
{
evas_object_event_callback_del(inst->o_xkbswitch,
- EVAS_CALLBACK_MOUSE_DOWN,
+ EVAS_CALLBACK_MOUSE_DOWN,
_e_xkb_cb_mouse_down);
evas_object_del(inst->o_xkbswitch);
evas_object_del(inst->o_xkbflag);
}
static void
-_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
{
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
static const char *
-_gc_id_new(const E_Gadcon_Client_Class *client_class)
+_gc_id_new(const E_Gadcon_Client_Class *client_class)
{
static char buf[4096];
- snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
+ snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
eina_list_count(instances) + 1);
return buf;
}
static Evas_Object *
-_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
{
Evas_Object *o;
char buf[PATH_MAX];
-
+
snprintf(buf, sizeof(buf), "%s/e-module-xkbswitch.edj", _xkb.module->dir);
o = edje_object_add(evas);
edje_object_file_set(o, buf, "icon");
_xkb_update_icon((int)(intptr_t)data);
return ECORE_CALLBACK_PASS_ON;
}
-static Eina_Bool
-_xkb_changed_state(void *data __UNUSED__,int type __UNUSED__,void *event __UNUSED__)
+
+static Eina_Bool
+_xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
- Ecore_X_Event_Xkb *ev=(Ecore_X_Event_Xkb *)event;
+ Ecore_X_Event_Xkb *ev = (Ecore_X_Event_Xkb *)event;
- INF("xkb group %d",ev->group);
+ INF("xkb group %d", ev->group);
e_config->xkb.cur_group = ev->group;
_xkb_update_icon(ev->group);
- return ECORE_CALLBACK_PASS_ON;
+ return ECORE_CALLBACK_PASS_ON;
}
+
#if 0
static int
_xkb_menu_items_sort(const void *data1, const void *data2)
const E_Config_XKB_Layout *cl1 = data1;
const E_Config_XKB_Layout *cl2 = data2;
int v;
-
+
v = strcmp(cl1->name, cl2->name);
if (!v) v = strcmp(cl1->model, cl2->model);
if (!v) v = strcmp(cl1->variant, cl2->variant);
return v;
}
+
#endif
static void
-_e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
+_e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
{
Evas_Event_Mouse_Down *ev = event;
Instance *inst = data;
E_Menu *m;
-
+
if (!inst) return;
-
+
if (ev->button == 3) /* Right-click utility menu */
{
int x, y;
E_Menu_Item *mi;
-
+
/* The menu and menu item */
m = e_menu_new();
mi = e_menu_item_new(m);
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set(mi, _e_xkb_cb_menu_configure, NULL);
/* Append into the util menu */
- m = e_gadcon_client_util_menu_items_append(inst->gcc,
- m, 0);
+ m = e_gadcon_client_util_menu_items_append(inst->gcc,
+ m, 0);
/* Coords */
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
NULL, NULL);
/* Activate - we show the menu relative to the gadget */
e_menu_activate_mouse(m,
e_util_zone_current_get(e_manager_current_get()),
- (x + ev->output.x), (y + ev->output.y), 1, 1,
+ (x + ev->output.x), (y + ev->output.y), 1, 1,
E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
{
Evas_Coord x, y, w, h;
int cx, cy;
-
+
/* Coordinates and sizing */
evas_object_geometry_get(inst->o_xkbswitch, &x, &y, &w, &h);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy,
int dir;
char buf[4096];
int grp = -1;
-
+
mi = e_menu_item_new(inst->lmenu);
-
+
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set(mi, _e_xkb_cb_menu_configure, NULL);
EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
{
const char *name = cl->name;
-
+
mi = e_menu_item_new(inst->lmenu);
-
+
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
grp++;
(mi, (grp == e_config->xkb.cur_group) ? 1 : 0);
e_xkb_flag_file_get(buf, sizeof(buf), name);
e_menu_item_icon_file_set(mi, buf);
- snprintf(buf, sizeof(buf), "%s (%s, %s)", cl->name,
+ snprintf(buf, sizeof(buf), "%s (%s, %s)", cl->name,
cl->model, cl->variant);
e_menu_item_label_set(mi, buf);
e_menu_item_callback_set(mi, _e_xkb_cb_lmenu_set, cl);
}
-
-
+
/* Deactivate callback */
e_menu_post_deactivate_callback_set(inst->lmenu,
_e_xkb_cb_lmenu_post, inst);
- /* Proper menu orientation */
- switch (inst->gcc->gadcon->orient)
+ /* Proper menu orientation */
+ switch (inst->gcc->gadcon->orient)
{
case E_GADCON_ORIENT_TOP:
dir = E_MENU_POP_DIRECTION_DOWN;
break;
+
case E_GADCON_ORIENT_BOTTOM:
dir = E_MENU_POP_DIRECTION_UP;
break;
+
case E_GADCON_ORIENT_LEFT:
dir = E_MENU_POP_DIRECTION_RIGHT;
break;
+
case E_GADCON_ORIENT_RIGHT:
dir = E_MENU_POP_DIRECTION_LEFT;
break;
+
case E_GADCON_ORIENT_CORNER_TL:
dir = E_MENU_POP_DIRECTION_DOWN;
break;
+
case E_GADCON_ORIENT_CORNER_TR:
dir = E_MENU_POP_DIRECTION_DOWN;
break;
+
case E_GADCON_ORIENT_CORNER_BL:
dir = E_MENU_POP_DIRECTION_UP;
break;
+
case E_GADCON_ORIENT_CORNER_BR:
dir = E_MENU_POP_DIRECTION_UP;
break;
+
case E_GADCON_ORIENT_CORNER_LT:
dir = E_MENU_POP_DIRECTION_RIGHT;
break;
+
case E_GADCON_ORIENT_CORNER_RT:
dir = E_MENU_POP_DIRECTION_LEFT;
break;
+
case E_GADCON_ORIENT_CORNER_LB:
dir = E_MENU_POP_DIRECTION_RIGHT;
break;
+
case E_GADCON_ORIENT_CORNER_RB:
dir = E_MENU_POP_DIRECTION_LEFT;
break;
+
case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_HORIZ:
case E_GADCON_ORIENT_VERT:
default:
- dir = E_MENU_POP_DIRECTION_AUTO;
+ dir = E_MENU_POP_DIRECTION_AUTO;
break;
}
-
+
e_gadcon_locked_set(inst->gcc->gadcon, 1);
-
+
/* We display not relatively to the gadget, but similarly to
* the start menu - thus the need for direction etc.
*/
e_menu_activate_mouse(inst->lmenu,
e_util_zone_current_get
- (e_manager_current_get()),
+ (e_manager_current_get()),
x, y, w, h, dir, ev->timestamp);
- }
+ }
}
else if (ev->button == 2) /* Middle click */
e_xkb_layout_next();
}
static void
-_e_xkb_cb_lmenu_post(void *data, E_Menu *menu __UNUSED__)
+_e_xkb_cb_lmenu_post(void *data, E_Menu *menu __UNUSED__)
{
Instance *inst = data;
}
static void
-_e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__)
+_e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__)
{
Eina_List *l;
void *ndata;
{
e_xkb_update(cur_group);
_xkb_update_icon(cur_group);
- }
+ }
}
+
projects / platform / upstream / enlightenment.git / commitdiff