ecore-evas-fb: This patch fixes a bug in ecore_evas_fb.c introduced by the big eina

list conversion. The bug resulted in no input devices where added when
using framebuffer. This patch also cleans up some related NULL
checks that are not needed any more.

Signed-off-by: Lars Munch <lars@segv.dk>


SVN revision: 40224
This commit is contained in:
Lars Munch 2009-04-19 15:47:32 +00:00 committed by Michael Lauer
parent 8801b817ea
commit bb74cf5f48
1 changed files with 32 additions and 43 deletions

View File

@ -87,12 +87,10 @@ _ecore_evas_fb_lose(void *data __UNUSED__)
ee = (Ecore_Evas *)l;
ee->visible = 0;
}
if (ecore_evas_input_devices)
{
EINA_LIST_FOREACH(ecore_evas_input_devices, ll, dev)
ecore_fb_input_device_listen(dev, 0);
}
}
static void
_ecore_evas_fb_gain(void *data __UNUSED__)
@ -112,12 +110,10 @@ _ecore_evas_fb_gain(void *data __UNUSED__)
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
}
if (ecore_evas_input_devices)
{
EINA_LIST_FOREACH(ecore_evas_input_devices, ll, dev)
ecore_fb_input_device_listen(dev, 1);
}
}
static int
_ecore_evas_event_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
@ -289,8 +285,6 @@ _ecore_evas_fb_init(int w, int h)
caps = ecore_fb_input_device_cap_get(device);
if (ecore_evas_input_devices)
{
/* Mouse */
#ifdef HAVE_TSLIB
if (caps & ECORE_FB_INPUT_DEVICE_CAP_RELATIVE)
@ -323,7 +317,6 @@ _ecore_evas_fb_init(int w, int h)
}
}
}
}
if (!mouse_handled)
{
if (ecore_fb_ts_init())
@ -486,6 +479,7 @@ static void
_ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
{
Eina_List *l;
Ecore_Fb_Input_Device *dev;
int resized = 0;
if (((ee->prop.fullscreen) && (on)) ||
@ -521,14 +515,9 @@ _ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
}
ee->prop.fullscreen = on;
/* rescale the input device area */
if (ecore_evas_input_devices)
{
Ecore_Fb_Input_Device *dev;
EINA_LIST_FOREACH(ecore_evas_input_devices, l, dev)
ecore_fb_input_device_axis_size_set(dev, ee->w, ee->h);
}
/* rescale the input device area */
if (resized)
{
if (ee->func.fn_resize) ee->func.fn_resize(ee);