Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ewins.c icccm.c snaps.c
Log Message:
Tweaks.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -3 -r1.385 -r1.386
--- E.h 6 Mar 2005 11:16:49 -0000 1.385
+++ E.h 6 Mar 2005 11:40:54 -0000 1.386
@@ -1574,7 +1574,6 @@
EWin *GetFocusEwin(void);
EWin *GetContextEwin(void);
void SetContextEwin(EWin * ewin);
-void EwinDetermineArea(EWin * ewin);
void EwinPropagateShapes(EWin * ewin);
void AddToFamily(EWin * ewin, Window win);
EWin *AddInternalToFamily(Window win, const char *bname, int
type,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewins.c 6 Mar 2005 11:17:04 -0000 1.26
+++ ewins.c 6 Mar 2005 11:40:55 -0000 1.27
@@ -380,7 +380,7 @@
Mode.context_ewin = ewin;
}
-void
+static void
EwinDetermineArea(EWin * ewin)
{
int ax, ay;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- icccm.c 6 Mar 2005 11:17:04 -0000 1.87
+++ icccm.c 6 Mar 2005 11:40:55 -0000 1.88
@@ -548,6 +548,8 @@
return s;
}
+#define TryGroup(e) (((e)->client.group != None) && ((e)->client.group !=
(e)->client.win))
+
void
ICCCM_GetInfo(EWin * ewin, Atom atom_change)
{
@@ -559,7 +561,7 @@
_EFREE(ewin->icccm.wm_res_class);
if (XGetClassHint(disp, ewin->client.win, &hint) ||
- XGetClassHint(disp, ewin->client.group, &hint))
+ (TryGroup(ewin) && XGetClassHint(disp, ewin->client.group, &hint)))
{
ewin->icccm.wm_res_name = Estrdup(hint.res_name);
ewin->icccm.wm_res_class = Estrdup(hint.res_class);
@@ -576,7 +578,7 @@
ecore_x_window_prop_string_list_get(ewin->client.win,
ECORE_X_ATOM_WM_COMMAND,
&(ewin->icccm.wm_command_argc));
- if (!ewin->icccm.wm_command && ewin->client.win != ewin->client.group)
+ if (!ewin->icccm.wm_command && TryGroup(ewin))
ewin->icccm.wm_command_argv =
ecore_x_window_prop_string_list_get(ewin->client.group,
ECORE_X_ATOM_WM_COMMAND,
@@ -594,7 +596,7 @@
ewin->icccm.wm_machine =
ecore_x_window_prop_string_get(ewin->client.win,
ECORE_X_ATOM_WM_CLIENT_MACHINE);
- if (!ewin->icccm.wm_machine && ewin->client.win != ewin->client.group)
+ if (!ewin->icccm.wm_machine && TryGroup(ewin))
ewin->icccm.wm_machine =
ecore_x_window_prop_string_get(ewin->client.group,
ECORE_X_ATOM_WM_CLIENT_MACHINE);
@@ -607,7 +609,7 @@
ewin->icccm.wm_icon_name =
ecore_x_window_prop_string_get(ewin->client.win,
ECORE_X_ATOM_WM_ICON_NAME);
- if (!ewin->icccm.wm_icon_name && ewin->client.win != ewin->client.group)
+ if (!ewin->icccm.wm_icon_name && TryGroup(ewin))
ewin->icccm.wm_icon_name =
ecore_x_window_prop_string_get(ewin->client.group,
ECORE_X_ATOM_WM_ICON_NAME);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/snaps.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- snaps.c 4 Mar 2005 22:31:56 -0000 1.84
+++ snaps.c 6 Mar 2005 11:40:56 -0000 1.85
@@ -1404,8 +1404,10 @@
ewin->client.x = sn->x;
ewin->client.y = sn->y;
ewin->client.grav = NorthWestGravity;
+#if 0 /* No, do later in EwinDetermineArea() */
ewin->area_x = sn->area_x;
ewin->area_y = sn->area_y;
+#endif
if (!EoIsSticky(ewin))
{
DeskGetArea(EoGetDesk(ewin), &ax, &ay);
-------------------------------------------------------
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://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
