forked from e16/e16
1
0
Fork 0

Eliminate GetWinDepth().

SVN revision: 15008
This commit is contained in:
Kim Woelders 2005-05-29 09:34:58 +00:00
parent 2cb4df9350
commit d04f70aca9
4 changed files with 7 additions and 19 deletions

View File

@ -2289,7 +2289,6 @@ int EFreeGC(GC gc);
void ESetColor(XColor * pxc, int r, int g, int b);
void EGetColor(const XColor * pxc, int *pr, int *pg, int *pb);
int GetWinDepth(Window win);
Window WindowAtXY_0(Window base, int bx, int by, int x, int y);
Window WindowAtXY(int x, int y);
Bool PointerAt(int *x, int *y);

View File

@ -90,7 +90,7 @@ FX_ripple_timeout(int val, void *data)
fx_ripple_above =
ECreatePixmap(fx_ripple_win, VRoot.w, fx_ripple_waterh * 2,
GetWinDepth(fx_ripple_win));
VRoot.depth);
if (gc)
EFreeGC(gc);
if (gc1)
@ -534,8 +534,7 @@ FX_Wave_timeout(int val, void *data)
fx_wave_win = DeskGetCurrentRoot();
fx_wave_above =
ECreatePixmap(fx_wave_win, VRoot.w, FX_WAVE_WATERH * 2,
GetWinDepth(fx_wave_win));
ECreatePixmap(fx_wave_win, VRoot.w, FX_WAVE_WATERH * 2, VRoot.depth);
if (gc)
EFreeGC(gc);
if (gc1)

View File

@ -384,7 +384,7 @@ TextstateDrawText(TextState * ts, Window win, const char *text, int x, int y,
if (ts->style.orientation != FONT_TO_RIGHT)
drawable =
ECreatePixmap(VRoot.win, wid + 2, ascent + descent + 2,
GetWinDepth(win));
VRoot.depth);
else
drawable = win;
TextDrawRotTo(win, &drawable, xx - 1, yy - 1 - ascent, wid + 2,
@ -525,8 +525,8 @@ TextstateDrawText(TextState * ts, Window win, const char *text, int x, int y,
if (ts->style.orientation != FONT_TO_RIGHT)
drawable =
ECreatePixmap(VRoot.win, ret2.width + 2,
ret2.height + 2, GetWinDepth(win));
ECreatePixmap(VRoot.win, ret2.width + 2, ret2.height + 2,
VRoot.depth);
else
drawable = win;
TextDrawRotTo(win, &drawable, xx - 1,
@ -622,7 +622,7 @@ TextstateDrawText(TextState * ts, Window win, const char *text, int x, int y,
if (ts->style.orientation != FONT_TO_RIGHT)
drawable =
ECreatePixmap(VRoot.win, wid + 2, ascent + descent + 2,
GetWinDepth(win));
VRoot.depth);
else
drawable = win;
TextDrawRotTo(win, &drawable, xx - 1, yy - ascent - 1, wid + 2,
@ -718,7 +718,7 @@ TextstateDrawText(TextState * ts, Window win, const char *text, int x, int y,
if (ts->style.orientation != FONT_TO_RIGHT)
drawable =
ECreatePixmap(VRoot.win, wid + 2, ascent + descent + 2,
GetWinDepth(win));
VRoot.depth);
else
drawable = win;
TextDrawRotTo(win, &drawable, xx - 1, yy - ascent - 1, wid + 2,

10
src/x.c
View File

@ -1241,16 +1241,6 @@ ESync(void)
XSync(disp, False);
}
int
GetWinDepth(Window win)
{
Window w1;
int x, y, w, h, b, d;
EGetGeometry(win, &w1, &x, &y, &w, &h, &b, &d);
return d;
}
Window
WindowAtXY_0(Window base, int bx, int by, int x, int y)
{