jsuya
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas/evas_events - modified unsigned char -> Eina_Bool for some fields in the Evas_Key_Grab structure. 

removed white spaces and fixed indent also



SVN revision: 65092
This commit is contained in:
ChunEon Park 2011-11-12 08:06:30 +00:00
parent 6dbe2c7443
commit 0bc308dcd7
3 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -1226,7 +1226,7 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
{
if (g->just_added)
{
g->just_added = 0;
g->just_added = EINA_FALSE;
continue;
}
if (g->delete_me) continue;
@ -1310,7 +1310,7 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
{
if (g->just_added)
{
g->just_added = 0;
g->just_added = EINA_FALSE;
continue;
}
if (g->delete_me) continue;

136
legacy/evas/src/lib/canvas/evas_key_grab.c
View File

@ -7,11 +7,11 @@
/* 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;
@ -24,55 +24,55 @@ evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modi
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;
@ -80,12 +80,12 @@ evas_key_grab_find(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask mod
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;
}
@ -97,24 +97,23 @@ evas_object_grabs_cleanup(Evas_Object *obj)
{
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);
}
}
}
@ -141,17 +140,18 @@ evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask m
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
@ -168,11 +168,11 @@ evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
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);

6
legacy/evas/src/lib/include/evas_private.h
View File

@ -181,9 +181,9 @@ struct _Evas_Key_Grab
Evas_Modifier_Mask modifiers;
Evas_Modifier_Mask not_modifiers;
Evas_Object *object;
unsigned char exclusive : 1;
unsigned char just_added : 1;
unsigned char delete_me : 1;
Eina_Bool exclusive : 1;
Eina_Bool just_added : 1;
Eina_Bool delete_me : 1;
};
struct _Evas_Intercept_Func