Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x.c ecore_x_icccm.c
Log Message:
i can't believe that didnt segv! fixed.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- Ecore_X.h 23 Nov 2004 15:17:54 -0000 1.73
+++ Ecore_X.h 24 Nov 2004 07:27:57 -0000 1.74
@@ -1021,11 +1021,12 @@
Ecore_X_Event_Mask all;
Ecore_X_Event_Mask no_propagate;
} event_mask;
+ Ecore_X_Gravity window_gravity;
+ Ecore_X_Gravity pixel_gravity;
+ Ecore_X_Colormap colormap;
/* FIXME: missing
* Colormap comormap;
* int map_installed;
- * int bit_gravity;
- * int win_gravity;
* Screen *screen;
* Visual *visual;
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- ecore_x.c 30 Oct 2004 19:27:13 -0000 1.49
+++ ecore_x.c 24 Nov 2004 07:27:57 -0000 1.50
@@ -921,6 +921,9 @@
att_ret->event_mask.mine = 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->window_gravity = att.win_gravity;
+ att_ret->pixel_gravity = att.win_gravity;
+ att_ret->colormap = att.colormap;
return 1;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_icccm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_x_icccm.c 23 Nov 2004 15:17:56 -0000 1.6
+++ ecore_x_icccm.c 24 Nov 2004 07:27:58 -0000 1.7
@@ -261,22 +261,22 @@
int stepx = 1, stepy = 1;
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 (*request_pos) *request_pos = 1;
+ if (request_pos) *request_pos = 1;
}
else
{
- if (*request_pos) *request_pos = 0;
+ if (request_pos) *request_pos = 0;
}
if (hint.flags & PWinGravity)
{
- if (*gravity) *gravity = hint.win_gravity;
+ if (gravity) *gravity = hint.win_gravity;
}
else
{
- if (*gravity) *gravity = ECORE_X_GRAVITY_NW;
+ if (gravity) *gravity = ECORE_X_GRAVITY_NW;
}
if (hint.flags & PMinSize)
{
@@ -359,7 +359,7 @@
{
XTextProperty xprop;
- if (XGetWMName(_ecore_x_disp, win, &xprop))
+ if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success)
{
if (xprop.value)
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
