forked from enlightenment/efl
Evas: Fixed some annoying Wshadow warnings.
SVN revision: 60305
This commit is contained in:
parent
cd91e94255
commit
80a5464888
|
@ -310,34 +310,34 @@ _post_up_handle(Evas *e, unsigned int timestamp, const void *data)
|
|||
if (copy) copy = eina_list_free(copy);
|
||||
if (e->pointer.inside)
|
||||
{
|
||||
Evas_Event_Mouse_In ev;
|
||||
Evas_Object *obj;
|
||||
Evas_Event_Mouse_In ev_in;
|
||||
Evas_Object *obj_itr;
|
||||
|
||||
_evas_object_event_new();
|
||||
|
||||
ev.buttons = e->pointer.button;
|
||||
ev.output.x = e->pointer.x;
|
||||
ev.output.y = e->pointer.y;
|
||||
ev.canvas.x = e->pointer.x;
|
||||
ev.canvas.y = e->pointer.y;
|
||||
ev.data = (void *)data;
|
||||
ev.modifiers = &(e->modifiers);
|
||||
ev.locks = &(e->locks);
|
||||
ev.timestamp = timestamp;
|
||||
ev.event_flags = EVAS_EVENT_FLAG_NONE;
|
||||
ev_in.buttons = e->pointer.button;
|
||||
ev_in.output.x = e->pointer.x;
|
||||
ev_in.output.y = e->pointer.y;
|
||||
ev_in.canvas.x = e->pointer.x;
|
||||
ev_in.canvas.y = e->pointer.y;
|
||||
ev_in.data = (void *)data;
|
||||
ev_in.modifiers = &(e->modifiers);
|
||||
ev_in.locks = &(e->locks);
|
||||
ev_in.timestamp = timestamp;
|
||||
ev_in.event_flags = EVAS_EVENT_FLAG_NONE;
|
||||
|
||||
EINA_LIST_FOREACH(ins, l, obj)
|
||||
EINA_LIST_FOREACH(ins, l, obj_itr)
|
||||
{
|
||||
ev.canvas.x = e->pointer.x;
|
||||
ev.canvas.y = e->pointer.y;
|
||||
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
|
||||
if (!eina_list_data_find(e->pointer.object.in, obj))
|
||||
ev_in.canvas.x = e->pointer.x;
|
||||
ev_in.canvas.y = e->pointer.y;
|
||||
_evas_event_havemap_adjust(obj_itr, &ev_in.canvas.x, &ev_in.canvas.y, obj_itr->mouse_grabbed);
|
||||
if (!eina_list_data_find(e->pointer.object.in, obj_itr))
|
||||
{
|
||||
if (!obj->mouse_in)
|
||||
if (!obj_itr->mouse_in)
|
||||
{
|
||||
obj->mouse_in = 1;
|
||||
obj_itr->mouse_in = 1;
|
||||
if (e->events_frozen <= 0)
|
||||
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
|
||||
evas_object_event_callback_call(obj_itr, EVAS_CALLBACK_MOUSE_IN, &ev_in);
|
||||
}
|
||||
}
|
||||
if (e->delete_me) break;
|
||||
|
|
|
@ -208,7 +208,7 @@ fb_list_modes(unsigned int *num_return)
|
|||
}
|
||||
|
||||
FB_Mode *
|
||||
fb_setmode(unsigned int width, unsigned int height, unsigned int depth, unsigned int refresh)
|
||||
fb_setmode(unsigned int width, unsigned int height, unsigned int pdepth, unsigned int refresh)
|
||||
{
|
||||
FB_Mode *modes, *mode = NULL;
|
||||
unsigned int i, num_modes;
|
||||
|
@ -220,10 +220,10 @@ fb_setmode(unsigned int width, unsigned int height, unsigned int depth, unsigned
|
|||
{
|
||||
if ((modes[i].width == width) &&
|
||||
(modes[i].height == height) &&
|
||||
(!depth || modes[i].fb_var.bits_per_pixel == depth) &&
|
||||
(!pdepth || modes[i].fb_var.bits_per_pixel == pdepth) &&
|
||||
(modes[i].refresh == refresh))
|
||||
{
|
||||
if (depth) modes[i].fb_var.bits_per_pixel = depth;
|
||||
if (pdepth) modes[i].fb_var.bits_per_pixel = pdepth;
|
||||
|
||||
if (ioctl(fb, FBIOPUT_VSCREENINFO, &modes[i].fb_var) == -1)
|
||||
perror("ioctl FBIOPUT_VSCREENINFO");
|
||||
|
@ -238,9 +238,9 @@ fb_setmode(unsigned int width, unsigned int height, unsigned int depth, unsigned
|
|||
}
|
||||
|
||||
FB_Mode *
|
||||
fb_changedepth(FB_Mode *cur_mode, unsigned int depth)
|
||||
fb_changedepth(FB_Mode *cur_mode, unsigned int pdepth)
|
||||
{
|
||||
cur_mode->fb_var.bits_per_pixel = depth;
|
||||
cur_mode->fb_var.bits_per_pixel = pdepth;
|
||||
|
||||
if (ioctl(fb, FBIOPUT_VSCREENINFO, &cur_mode->fb_var) == -1)
|
||||
perror("ioctl FBIOPUT_VSCREENINFO");
|
||||
|
@ -280,7 +280,7 @@ fb_changeres(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigne
|
|||
}
|
||||
|
||||
FB_Mode *
|
||||
fb_changemode(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigned int depth, unsigned int refresh)
|
||||
fb_changemode(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigned int pdepth, unsigned int refresh)
|
||||
{
|
||||
FB_Mode *modes;
|
||||
unsigned int i, num_modes;
|
||||
|
@ -292,10 +292,10 @@ fb_changemode(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsign
|
|||
{
|
||||
if ((modes[i].width == width) &&
|
||||
(modes[i].height == height) &&
|
||||
(!depth || modes[i].fb_var.bits_per_pixel == depth) &&
|
||||
(!pdepth || modes[i].fb_var.bits_per_pixel == pdepth) &&
|
||||
(modes[i].refresh == refresh))
|
||||
{
|
||||
if (depth) modes[i].fb_var.bits_per_pixel = depth;
|
||||
if (pdepth) modes[i].fb_var.bits_per_pixel = pdepth;
|
||||
|
||||
if (ioctl(fb, FBIOPUT_VSCREENINFO, &modes[i].fb_var) == -1)
|
||||
perror("ioctl FBIOPUT_VSCREENINFO");
|
||||
|
|
|
@ -429,7 +429,7 @@ eng_window_new(Display *disp,
|
|||
{
|
||||
XVisualInfo *vi;
|
||||
int vd;
|
||||
int alph, val, dbuf, stencil, depth;
|
||||
int alph, val, dbuf, stencil, tdepth;
|
||||
int rgba;
|
||||
|
||||
vi = glXGetVisualFromFBConfig(gw->disp, fbc[j]);
|
||||
|
@ -474,10 +474,10 @@ eng_window_new(Display *disp,
|
|||
if (val > stencil) continue;
|
||||
stencil = val;
|
||||
|
||||
depth = 0x7fff;
|
||||
tdepth = 0x7fff;
|
||||
glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_DEPTH_SIZE, &val);
|
||||
if (val > depth) continue;
|
||||
depth = val;
|
||||
if (val > tdepth) continue;
|
||||
tdepth = val;
|
||||
|
||||
glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_BIND_TO_MIPMAP_TEXTURE_EXT, &val);
|
||||
if (val < 0) continue;
|
||||
|
|
|
@ -367,11 +367,11 @@ evas_software_xlib_x_output_buffer_new(Display *d, Visual *v, int depth, int w,
|
|||
}
|
||||
|
||||
void
|
||||
evas_software_xlib_x_output_buffer_free(X_Output_Buffer *xob, int sync)
|
||||
evas_software_xlib_x_output_buffer_free(X_Output_Buffer *xob, int psync)
|
||||
{
|
||||
if (xob->shm_info)
|
||||
{
|
||||
if (sync) XSync(xob->display, False);
|
||||
if (psync) XSync(xob->display, False);
|
||||
XShmDetach(xob->display, xob->shm_info);
|
||||
XDestroyImage(xob->xim);
|
||||
shmdt(xob->shm_info->shmaddr);
|
||||
|
@ -387,13 +387,13 @@ evas_software_xlib_x_output_buffer_free(X_Output_Buffer *xob, int sync)
|
|||
}
|
||||
|
||||
void
|
||||
evas_software_xlib_x_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int sync)
|
||||
evas_software_xlib_x_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int psync)
|
||||
{
|
||||
if (xob->shm_info)
|
||||
{
|
||||
XShmPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y,
|
||||
xob->w, xob->h, False);
|
||||
if (sync) XSync(xob->display, False);
|
||||
if (psync) XSync(xob->display, False);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -102,7 +102,7 @@ _find_xob(Display *d, Visual *v, int depth, int w, int h, int shm, void *data)
|
|||
}
|
||||
|
||||
static void
|
||||
_unfind_xob(X_Output_Buffer *xob, int sync)
|
||||
_unfind_xob(X_Output_Buffer *xob, int psync)
|
||||
{
|
||||
if (xob->shm_info)
|
||||
{
|
||||
|
@ -123,16 +123,16 @@ _unfind_xob(X_Output_Buffer *xob, int sync)
|
|||
xob = xl->data;
|
||||
shmpool = eina_list_remove_list(shmpool, xl);
|
||||
shmsize -= xob->psize * xob->xim->depth / 8;
|
||||
evas_software_xlib_x_output_buffer_free(xob, sync);
|
||||
evas_software_xlib_x_output_buffer_free(xob, psync);
|
||||
}
|
||||
SHMPOOL_UNLOCK();
|
||||
}
|
||||
else
|
||||
evas_software_xlib_x_output_buffer_free(xob, sync);
|
||||
evas_software_xlib_x_output_buffer_free(xob, psync);
|
||||
}
|
||||
|
||||
static void
|
||||
_clear_xob(int sync)
|
||||
_clear_xob(int psync)
|
||||
{
|
||||
SHMPOOL_LOCK();
|
||||
while (shmpool)
|
||||
|
@ -141,7 +141,7 @@ _clear_xob(int sync)
|
|||
|
||||
xob = shmpool->data;
|
||||
shmpool = eina_list_remove_list(shmpool, shmpool);
|
||||
evas_software_xlib_x_output_buffer_free(xob, sync);
|
||||
evas_software_xlib_x_output_buffer_free(xob, psync);
|
||||
}
|
||||
shmsize = 0;
|
||||
SHMPOOL_UNLOCK();
|
||||
|
|
Loading…
Reference in New Issue