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

fix valgrind complaint (bad! its a string but its not 0 byte terminated!!! 

its just a data lump!).

compact the lists of child windows down based on results of scan of children.

printf--


SVN revision: 31979
This commit is contained in:
Carsten Haitzler 2007-10-05 12:39:06 +00:00
parent 7fb1a30d72
commit 35cd952691
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/ecore/src/lib/ecore_x/ecore_x_dnd.c
View File

@ -124,8 +124,9 @@ _ecore_x_dnd_converter_copy(char *target, void *data, int size, void **data_ret,
if (!data || !size)
return 0;
if (!(mystr = strdup(data)))
return 0;
mystr = calloc(1, size + 1);
if (!mystr) return 0;
memcpy(mystr, data, size);
if (XmbTextListToTextProperty(_ecore_x_disp, &mystr, 1, style, &text_prop) == Success)
{

28
legacy/ecore/src/lib/ecore_x/ecore_x_window.c
View File

@ -729,12 +729,11 @@ _ecore_x_window_tree_walk(Window win)
{
Window *list = NULL;
Window parent_win = 0, root_win = 0;
int i;
int i, j;
unsigned int num;
Shadow *s;
Shadow *s, **sl;
XWindowAttributes att;
printf("_ecore_x_window_tree_walk(%x)\n", win);
if (!XGetWindowAttributes(_ecore_x_disp, win, &att)) return NULL;
// if (att.class == InputOnly) return NULL;
if (att.map_state != IsViewable) return NULL;
@ -755,9 +754,30 @@ _ecore_x_window_tree_walk(Window win)
s->children_num = num;
for (i = 0; i < num; i++)
s->children[i] = _ecore_x_window_tree_walk(list[i]);
/* compress list down */
j = 0;
for (i = 0; i < num; i++)
{
if (s->children[i])
{
s->children[j] = s->children[i];
j++;
}
}
if (j == 0)
{
free(s->children);
s->children = NULL;
s->children_num = 0;
}
else
{
s->children_num = j;
sl = realloc(s->children, sizeof(Shadow *) * j);
if (sl) s->children = sl;
}
}
}
printf("ADD SHADOW %x %ix%i %i %i\n", s->win, s->w, s->h, s->x, s->y);
return s;
}