Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: E.h backgrounds.c desktops.c ewins.c glwin.c icccm.c pager.c setup.c Log Message: Eliminate redundant RRoot variables. =================================================================== RCS file: /cvs/e/e16/e/src/E.h,v retrieving revision 1.610 retrieving revision 1.611 diff -u -3 -r1.610 -r1.611 --- E.h 24 Mar 2008 09:47:49 -0000 1.610 +++ E.h 24 Mar 2008 10:24:27 -0000 1.611 @@ -210,14 +210,10 @@ #include "etypes.h" typedef struct { - Window xwin; Win win; - Visual *vis; - int depth; - Colormap cmap; - int scr; - int w, h; } RealRoot; + +#define RROOT RRoot.win typedef struct { Window xwin; =================================================================== RCS file: /cvs/e/e16/e/src/backgrounds.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -3 -r1.105 -r1.106 --- backgrounds.c 23 Mar 2008 11:54:22 -0000 1.105 +++ backgrounds.c 24 Mar 2008 10:24:27 -0000 1.106 @@ -532,7 +532,7 @@ * invalid one from a previous session. */ pmap = ECreatePixmap(win, w, h, 0); - if (win == RRoot.win && pmap == Mode.root.ext_pmap) + if (win == RROOT && pmap == Mode.root.ext_pmap) { EFreePixmap(pmap); pmap = ECreatePixmap(win, w, h, 0); =================================================================== RCS file: /cvs/e/e16/e/src/desktops.c,v retrieving revision 1.281 retrieving revision 1.282 diff -u -3 -r1.281 -r1.282 --- desktops.c 23 Mar 2008 11:54:23 -0000 1.281 +++ desktops.c 24 Mar 2008 10:24:28 -0000 1.282 @@ -1869,17 +1869,8 @@ if (root) { -#if 0 - RRoot.w = DisplayWidth(disp, RRoot.scr); - RRoot.h = DisplayHeight(disp, RRoot.scr); - - if (w != RRoot.w || h != RRoot.h) - Eprintf - ("DeskRootResize (root): Screen size mismatch: root=%dx%d event=%dx%d\n", - RRoot.w, RRoot.h, w, h); -#endif - RRoot.w = w; - RRoot.h = h; + WinGetW(RROOT) = w; + WinGetH(RROOT) = h; } if (w == VRoot.w && h == VRoot.h) =================================================================== RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.224 retrieving revision 1.225 diff -u -3 -r1.224 -r1.225 --- ewins.c 24 Mar 2008 09:47:50 -0000 1.224 +++ ewins.c 24 Mar 2008 10:24:28 -0000 1.225 @@ -2190,7 +2190,7 @@ /* This makes E determine the client window stacking at exit */ EwinInstantUnShade(ewin); - EReparentWindow(EwinGetClientWin(ewin), RRoot.win, + EReparentWindow(EwinGetClientWin(ewin), RROOT, ewin->client.x, ewin->client.y); } } =================================================================== RCS file: /cvs/e/e16/e/src/glwin.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- glwin.c 23 Mar 2008 11:54:23 -0000 1.9 +++ glwin.c 24 Mar 2008 10:24:28 -0000 1.10 @@ -631,7 +631,7 @@ int x, y; #if 0 - win = RRoot.win; + win = RROOT; #else win = VRoot.win; #endif =================================================================== RCS file: /cvs/e/e16/e/src/icccm.c,v retrieving revision 1.142 retrieving revision 1.143 diff -u -3 -r1.142 -r1.143 --- icccm.c 24 Mar 2008 09:47:50 -0000 1.142 +++ icccm.c 24 Mar 2008 10:24:28 -0000 1.143 @@ -283,7 +283,7 @@ ev.xconfigure.y = ewin->client.y; #endif if (Mode.wm.window) - XTranslateCoordinates(disp, VRoot.xwin, RRoot.xwin, + ETranslateCoordinates(VRoot.win, RROOT, ev.xconfigure.x, ev.xconfigure.y, &ev.xconfigure.x, &ev.xconfigure.y, &child); ev.xconfigure.width = ewin->client.w; =================================================================== RCS file: /cvs/e/e16/e/src/pager.c,v retrieving revision 1.262 retrieving revision 1.263 diff -u -3 -r1.262 -r1.263 --- pager.c 23 Mar 2008 11:54:24 -0000 1.262 +++ pager.c 24 Mar 2008 10:24:28 -0000 1.263 @@ -1535,7 +1535,7 @@ else if (!in_vroot) { /* Move back to real root */ - EwinReparent(ewin, RRoot.win); + EwinReparent(ewin, RROOT); } else { =================================================================== RCS file: /cvs/e/e16/e/src/setup.c,v retrieving revision 1.189 retrieving revision 1.190 diff -u -3 -r1.189 -r1.190 --- setup.c 1 Mar 2008 16:38:58 -0000 1.189 +++ setup.c 24 Mar 2008 10:24:28 -0000 1.190 @@ -119,23 +119,16 @@ XSetIOErrorHandler((XIOErrorHandler) HandleXIOError); /* Root defaults */ - RRoot.scr = DefaultScreen(disp); - RRoot.xwin = DefaultRootWindow(disp); - RRoot.w = DisplayWidth(disp, RRoot.scr); - RRoot.h = DisplayHeight(disp, RRoot.scr); - RRoot.vis = DefaultVisual(disp, RRoot.scr); - RRoot.depth = DefaultDepth(disp, RRoot.scr); - RRoot.cmap = DefaultColormap(disp, RRoot.scr); - RRoot.win = ERegisterWindow(RRoot.xwin, NULL); + RROOT = ERegisterWindow(DefaultRootWindow(disp), NULL); - VRoot.xwin = RRoot.xwin; - VRoot.vis = RRoot.vis; - VRoot.depth = RRoot.depth; - VRoot.cmap = RRoot.cmap; + VRoot.xwin = WinGetXwin(RROOT); + VRoot.vis = WinGetVisual(RROOT); + VRoot.depth = WinGetDepth(RROOT); + VRoot.cmap = WinGetCmap(RROOT); if (Mode.wm.window) { - VRoot.win = ECreateWindow(RRoot.win, 0, 0, VRoot.w, VRoot.h, 0); + VRoot.win = ECreateWindow(RROOT, 0, 0, VRoot.w, VRoot.h, 0); VRoot.xwin = WinGetXwin(VRoot.win); /* Enable eesh and edox to pix up the virtual root */ @@ -145,9 +138,9 @@ else { /* Running E normally on the root window */ - VRoot.win = RRoot.win; - VRoot.w = RRoot.w; - VRoot.h = RRoot.h; + VRoot.win = RROOT; + VRoot.w = WinGetW(RROOT); + VRoot.h = WinGetH(RROOT); } /* Initialise event handling */ ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs