enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e comp x - fix property fetch to use int ptr from the start 

this clears up soem warnings and do the cast on providing the pointer
to ecore_x_window_prop_property_get() which since it has to allocate
the data will be fine for alignment anyway, so a void * cast will do.
This commit is contained in:
Carsten Haitzler 2017-02-12 14:57:57 +09:00
parent 16131b14f0
commit b40fd20fbc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_comp_x.c
View File

@ -4496,16 +4496,14 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
} }
if (cd->fetch_gtk_frame_extents) if (cd->fetch_gtk_frame_extents)
{ {
unsigned char *data; unsigned int *extents;
int count; int count;
if (ecore_x_window_prop_property_get(win, if (ecore_x_window_prop_property_get(win,
ATM_GTK_FRAME_EXTENTS, ATM_GTK_FRAME_EXTENTS,
ECORE_X_ATOM_CARDINAL, 32, ECORE_X_ATOM_CARDINAL, 32,
&data, &count)) (void *)(&extents), &count))
{ {
unsigned int *extents = (unsigned int*)data;
/* _GTK_FRAME_EXTENTS describes a region l/r/t/b pixels /* _GTK_FRAME_EXTENTS describes a region l/r/t/b pixels
* from the "window" object in which shadows will be drawn. * from the "window" object in which shadows will be drawn.
* this area should not be accounted for in sizing or * this area should not be accounted for in sizing or
@ -4517,7 +4515,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
(ec->x == ec->comp_data->initial_attributes.x) && (ec->x == ec->comp_data->initial_attributes.x) &&
(ec->y == ec->comp_data->initial_attributes.y)) (ec->y == ec->comp_data->initial_attributes.y))
e_comp_object_frame_xy_adjust(ec->frame, ec->x, ec->y, &ec->x, &ec->y); e_comp_object_frame_xy_adjust(ec->frame, ec->x, ec->y, &ec->x, &ec->y);
free(data); free(extents);
} }
cd->fetch_gtk_frame_extents = 0; cd->fetch_gtk_frame_extents = 0;
} }