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

i can't believe that didnt segv! fixed. 

SVN revision: 12243
This commit is contained in:
Carsten Haitzler 2004-11-24 07:27:58 +00:00
parent edab59238a
commit c1618e59fc
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/ecore/src/lib/ecore_x/Ecore_X.h
View File

@ -1021,11 +1021,12 @@ int ecore_x_client_message8_send(Ecore_X_Window win, Ecore_X_Atom t
Ecore_X_Event_Mask all; Ecore_X_Event_Mask all;
Ecore_X_Event_Mask no_propagate; Ecore_X_Event_Mask no_propagate;
} event_mask; } event_mask;
Ecore_X_Gravity window_gravity;
Ecore_X_Gravity pixel_gravity;
Ecore_X_Colormap colormap;
/* FIXME: missing /* FIXME: missing
* Colormap comormap; * Colormap comormap;
* int map_installed; * int map_installed;
* int bit_gravity;
* int win_gravity;
* Screen *screen; * Screen *screen;
* Visual *visual; * Visual *visual;
*/ */

3
legacy/ecore/src/lib/ecore_x/ecore_x.c
View File

@ -921,6 +921,9 @@ ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att
att_ret->event_mask.mine = att.your_event_mask; att_ret->event_mask.mine = att.your_event_mask;
att_ret->event_mask.all = att.your_event_mask; att_ret->event_mask.all = att.your_event_mask;
att_ret->event_mask.no_propagate = att.do_not_propagate_mask; att_ret->event_mask.no_propagate = att.do_not_propagate_mask;
att_ret->window_gravity = att.win_gravity;
att_ret->pixel_gravity = att.win_gravity;
att_ret->colormap = att.colormap;
return 1; return 1;
} }

12
legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c
View File

@ -261,22 +261,22 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win,
int stepx = 1, stepy = 1; int stepx = 1, stepy = 1;
double mina = 0.0, maxa = 0.0; double mina = 0.0, maxa = 0.0;
if (!XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask)) return 0; if (XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask) < Success) return 0;
if ((hint.flags & USPosition) || ((hint.flags & PPosition))) if ((hint.flags & USPosition) || ((hint.flags & PPosition)))
{ {
if (*request_pos) *request_pos = 1; if (request_pos) *request_pos = 1;
} }
else else
{ {
if (*request_pos) *request_pos = 0; if (request_pos) *request_pos = 0;
} }
if (hint.flags & PWinGravity) if (hint.flags & PWinGravity)
{ {
if (*gravity) *gravity = hint.win_gravity; if (gravity) *gravity = hint.win_gravity;
} }
else else
{ {
if (*gravity) *gravity = ECORE_X_GRAVITY_NW; if (gravity) *gravity = ECORE_X_GRAVITY_NW;
} }
if (hint.flags & PMinSize) if (hint.flags & PMinSize)
{ {
@ -359,7 +359,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
{ {
XTextProperty xprop; XTextProperty xprop;
if (XGetWMName(_ecore_x_disp, win, &xprop)) if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success)
{ {
if (xprop.value) if (xprop.value)
{ {