/* Evas and then a linked lists of grabs for that key and what */
/* modifiers/not_modifers they use */
-static Evas_Key_Grab *evas_key_grab_new (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive);
-static Evas_Key_Grab *evas_key_grab_find (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive);
+static Evas_Key_Grab *evas_key_grab_new (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
+static Evas_Key_Grab *evas_key_grab_find (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
static Evas_Key_Grab *
-evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive)
+evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
{
/* MEM OK */
Evas_Key_Grab *g;
g->exclusive = exclusive;
g->keyname = strdup(keyname);
if (obj->layer->evas->walking_grabs)
- g->just_added = 1;
+ g->just_added = EINA_TRUE;
if (!g->keyname)
{
- if (!evas_mem_free(strlen(keyname) + 1))
- {
- free(g);
- return NULL;
- }
- g->keyname = strdup(keyname);
- if (!g->keyname)
- {
- free(g);
- return NULL;
- }
+ if (!evas_mem_free(strlen(keyname) + 1))
+ {
+ free(g);
+ return NULL;
+ }
+ g->keyname = strdup(keyname);
+ if (!g->keyname)
+ {
+ free(g);
+ return NULL;
+ }
}
g->object->grabs = eina_list_append(g->object->grabs, g);
if (eina_error_get())
{
- MERR_BAD();
- evas_mem_free(sizeof(Eina_List));
- g->object->grabs = eina_list_append(g->object->grabs, g);
- if (eina_error_get())
- {
- MERR_FATAL();
- free(g->keyname);
- free(g);
- return NULL;
- }
+ MERR_BAD();
+ evas_mem_free(sizeof(Eina_List));
+ g->object->grabs = eina_list_append(g->object->grabs, g);
+ if (eina_error_get())
+ {
+ MERR_FATAL();
+ free(g->keyname);
+ free(g);
+ return NULL;
+ }
}
obj->layer->evas->grabs = eina_list_append(obj->layer->evas->grabs, g);
if (eina_error_get())
{
- MERR_BAD();
- evas_mem_free(sizeof(Eina_List));
- obj->layer->evas->grabs = eina_list_append(obj->layer->evas->grabs, g);
- if (eina_error_get())
- {
- MERR_FATAL();
- g->object->grabs = eina_list_remove(g->object->grabs, g);
- free(g->keyname);
- free(g);
- return NULL;
- }
+ MERR_BAD();
+ evas_mem_free(sizeof(Eina_List));
+ obj->layer->evas->grabs = eina_list_append(obj->layer->evas->grabs, g);
+ if (eina_error_get())
+ {
+ MERR_FATAL();
+ g->object->grabs = eina_list_remove(g->object->grabs, g);
+ free(g->keyname);
+ free(g);
+ return NULL;
+ }
}
return g;
}
static Evas_Key_Grab *
-evas_key_grab_find(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive)
+evas_key_grab_find(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
{
/* MEM OK */
Eina_List *l;
EINA_LIST_FOREACH(obj->layer->evas->grabs, l, g)
{
- if ((g->modifiers == modifiers) &&
- (g->not_modifiers == not_modifiers) &&
- (!strcmp(g->keyname, keyname)))
- {
- if ((exclusive) || (obj == g->object)) return g;
- }
+ if ((g->modifiers == modifiers) &&
+ (g->not_modifiers == not_modifiers) &&
+ (!strcmp(g->keyname, keyname)))
+ {
+ if ((exclusive) || (obj == g->object)) return g;
+ }
}
return NULL;
}
{
if (obj->layer->evas->walking_grabs)
{
- Eina_List *l;
- Evas_Key_Grab *g;
+ Eina_List *l;
+ Evas_Key_Grab *g;
- EINA_LIST_FOREACH(obj->grabs, l, g)
- g->delete_me = 1;
+ EINA_LIST_FOREACH(obj->grabs, l, g)
+ g->delete_me = EINA_TRUE;
}
else
{
- while (obj->grabs)
- {
- Evas_Key_Grab *g;
-
- g = obj->grabs->data;
- if (g->keyname) free(g->keyname);
- free(g);
- obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g);
- obj->grabs = eina_list_remove(obj->grabs, g);
- }
+ while (obj->grabs)
+ {
+ Evas_Key_Grab *g = obj->grabs->data;
+ if (g->keyname) free(g->keyname);
+ free(g);
+ obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs,
+ g);
+ obj->grabs = eina_list_remove(obj->grabs, g);
+ }
}
}
Evas_Key_Grab *g;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
- return 0;
+ return EINA_FALSE;
MAGIC_CHECK_END();
- if (!keyname) return 0;
+ if (!keyname) return EINA_FALSE;
if (exclusive)
{
- g = evas_key_grab_find(obj, keyname, modifiers, not_modifiers, exclusive);
- if (g) return 0;
+ g = evas_key_grab_find(obj, keyname, modifiers, not_modifiers,
+ exclusive);
+ if (g) return EINA_FALSE;
}
g = evas_key_grab_new(obj, keyname, modifiers, not_modifiers, exclusive);
- if (!g) return 0;
- return 1;
+ if (!g) return EINA_FALSE;
+ return EINA_TRUE;
}
EAPI void
if (!g) return;
if (g->object->layer->evas->walking_grabs)
{
- if (!g->delete_me)
- {
- g->object->layer->evas->delete_grabs++;
- g->delete_me = 1;
- }
+ if (!g->delete_me)
+ {
+ g->object->layer->evas->delete_grabs++;
+ g->delete_me = EINA_TRUE;
+ }
}
else
evas_key_grab_free(g->object, keyname, modifiers, not_modifiers);