forked from enlightenment/enlightenment
parent
b4e713d4b7
commit
27e182fb59
|
@ -785,3 +785,4 @@ _cb_used_select(void *data)
|
|||
e_widget_disabled_set(cfdata->btn_down, EINA_FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#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);
|
||||
|
@ -283,6 +282,7 @@ _xkb_changed(void *data __UNUSED__, int type __UNUSED__, void *event_info __UNUS
|
|||
_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__)
|
||||
{
|
||||
|
@ -293,6 +293,7 @@ _xkb_changed_state(void *data __UNUSED__,int type __UNUSED__,void *event __UNUSE
|
|||
_xkb_update_icon(ev->group);
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int
|
||||
_xkb_menu_items_sort(const void *data1, const void *data2)
|
||||
|
@ -306,6 +307,7 @@ _xkb_menu_items_sort(const void *data1, const void *data2)
|
|||
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)
|
||||
|
@ -394,7 +396,6 @@ _e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
|
|||
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);
|
||||
|
@ -404,39 +405,51 @@ _e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE
|
|||
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:
|
||||
|
@ -496,3 +509,4 @@ _e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED_
|
|||
_xkb_update_icon(cur_group);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -91,7 +91,8 @@ parse_rules(void)
|
|||
free(tmp);
|
||||
|
||||
p += strlen(model->name);
|
||||
while (p[0] == ' ') ++p;
|
||||
while (p[0] == ' ')
|
||||
++p;
|
||||
|
||||
model->description = eina_stringshare_add(p);
|
||||
|
||||
|
@ -127,7 +128,8 @@ parse_rules(void)
|
|||
free(tmp);
|
||||
|
||||
p += strlen(layout->name);
|
||||
while (p[0] == ' ') ++p;
|
||||
while (p[0] == ' ')
|
||||
++p;
|
||||
|
||||
variant = E_NEW(E_XKB_Variant, 1);
|
||||
variant->name = eina_stringshare_add("basic");
|
||||
|
@ -173,7 +175,8 @@ parse_rules(void)
|
|||
layout->variants = eina_list_append(layout->variants, variant);
|
||||
|
||||
p += strlen(variant->name);
|
||||
while (p[0] == ' ') ++p;
|
||||
while (p[0] == ' ')
|
||||
++p;
|
||||
p += strlen(tok);
|
||||
p += 2;
|
||||
|
||||
|
@ -208,7 +211,8 @@ parse_rules(void)
|
|||
name = strtok(tmp, " ");
|
||||
|
||||
p += strlen(name);
|
||||
while (p[0] == ' ') ++p;
|
||||
while (p[0] == ' ')
|
||||
++p;
|
||||
|
||||
/* skip "grp" options for switching kbd layouts */
|
||||
//if (strncmp(name, "grp", 3))
|
||||
|
@ -223,7 +227,8 @@ parse_rules(void)
|
|||
if (strstr(p, " "))
|
||||
{
|
||||
p = strstr(p, " ");
|
||||
while (p[0] == ' ') ++p;
|
||||
while (p[0] == ' ')
|
||||
++p;
|
||||
}
|
||||
|
||||
group->description = eina_stringshare_add(p);
|
||||
|
@ -333,3 +338,4 @@ layout_sort_by_name_cb(const void *data1, const void *data2)
|
|||
|
||||
return strcmp(l1->name, l2);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue