Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h backgrounds.c dialog.c draw.c ewin-ops.c iconify.c menus.c
pager.c x.c
Log Message:
Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -3 -r1.432 -r1.433
--- E.h 21 May 2005 20:58:17 -0000 1.432
+++ E.h 21 May 2005 21:49:36 -0000 1.433
@@ -786,7 +786,6 @@
int shape_x, shape_y, shape_w, shape_h;
int req_x, req_y;
void (*MoveResize) (EWin * ewin, int resize);
- void (*Refresh) (EWin * ewin);
void (*Close) (EWin * ewin);
};
@@ -1574,7 +1573,6 @@
#define EWIN_CHANGE_OPACITY (1<<5)
void EwinShapeSet(EWin * ewin);
-void EwinRefresh(EWin * ewin);
void EwinFloatAt(EWin * ewin, int x, int y);
void EwinUnfloatAt(EWin * ewin, int desk, int x, int y);
void RaiseEwin(EWin * ewin);
@@ -2293,7 +2291,6 @@
int GetWinDepth(Window win);
Window GetWinParent(Window win);
-int WinExists(Window win);
Window WinGetParent(Window win);
Window WindowAtXY_0(Window base, int bx, int by, int x, int y);
Window WindowAtXY(int x, int y);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- backgrounds.c 14 May 2005 19:40:14 -0000 1.28
+++ backgrounds.c 21 May 2005 21:49:36 -0000 1.29
@@ -461,11 +461,9 @@
GC gc;
int rt;
- if (!WinExists(win))
+ if (!EGetGeometry(win, NULL, NULL, NULL, &rw, &rh, NULL, &depth))
return;
- EGetGeometry(win, NULL, NULL, NULL, &rw, &rh, NULL, &depth);
-
imlib_context_set_drawable(win);
EAllocColor(&bg->bg_solid);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- dialog.c 17 May 2005 21:07:33 -0000 1.113
+++ dialog.c 21 May 2005 21:49:36 -0000 1.114
@@ -529,12 +529,6 @@
}
static void
-DialogEwinRefresh(EWin * ewin)
-{
- DialogEwinMoveResize(ewin, 0);
-}
-
-static void
DialogEwinClose(EWin * ewin)
{
DialogDestroy(ewin->data);
@@ -550,7 +544,6 @@
d->ewin = ewin;
ewin->MoveResize = DialogEwinMoveResize;
- ewin->Refresh = DialogEwinRefresh;
ewin->Close = DialogEwinClose;
ewin->client.width.min = ewin->client.width.max = ewin->client.w = d->w;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- draw.c 21 May 2005 20:58:18 -0000 1.74
+++ draw.c 21 May 2005 21:49:36 -0000 1.75
@@ -61,18 +61,8 @@
ECreatePixImg(Window win, int w, int h)
{
XGCValues gcv;
- int bpp;
PixImg *pi;
- if (VRoot.depth <= 8)
- bpp = 1;
- else if (VRoot.depth <= 16)
- bpp = 2;
- else if (VRoot.depth <= 24)
- bpp = 3;
- else
- bpp = 4;
-
pi = Emalloc(sizeof(PixImg));
if (!pi)
return NULL;
@@ -633,7 +623,6 @@
int x1, y1, w1, h1, i, j, pw, ph, dx, dy;
static Pixmap b1 = 0, b2 = 0, b3 = 0;
static Font font = 0;
- int bpp;
char str[32];
char check_move = 0;
@@ -644,23 +633,11 @@
break;
}
- if ((md == 5)
- && ((Mode.mode == MODE_RESIZE) || (Mode.mode == MODE_RESIZE_H)
- || (Mode.mode == MODE_RESIZE_V) || (ewin->groups && check_move)))
+ if ((md == 5) &&
+ ((Mode.mode == MODE_RESIZE) || (Mode.mode == MODE_RESIZE_H) ||
+ (Mode.mode == MODE_RESIZE_V) || (ewin->groups && check_move)))
md = 0;
- if (md == 5)
- {
- if (VRoot.depth <= 8)
- bpp = 1;
- else if (VRoot.depth <= 16)
- bpp = 2;
- else if (VRoot.depth <= 24)
- bpp = 3;
- else
- bpp = 4;
- }
-
pw = w;
ph = h;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewin-ops.c 21 May 2005 20:58:18 -0000 1.38
+++ ewin-ops.c 21 May 2005 21:49:36 -0000 1.39
@@ -221,19 +221,6 @@
MoveEwin(ewin, x, y);
}
-void
-EwinRefresh(EWin * ewin)
-{
- if (!ewin)
- return;
-
- if (TransparencyEnabled())
- EwinBorderDraw(ewin, 0, 1); /* Update the border */
-
- if (ewin->Refresh)
- ewin->Refresh(ewin);
-}
-
static void
EwinDetermineArea(EWin * ewin)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- iconify.c 21 May 2005 20:58:18 -0000 1.149
+++ iconify.c 21 May 2005 21:49:36 -0000 1.150
@@ -513,21 +513,6 @@
}
static void
-IconboxEwinRefresh(EWin * ewin)
-{
- Iconbox *ib = ewin->data;
-
- if (!ib)
- return;
-
- if (!TransparencyEnabled())
- return;
-
- ib->force_update = 1;
- IconboxRedraw(ib);
-}
-
-static void
IconboxEwinClose(EWin * ewin)
{
IconboxDestroy(ewin->data, 0);
@@ -540,7 +525,6 @@
ewin->data = (Iconbox *) ptr;
ewin->MoveResize = IconboxEwinMoveResize;
- ewin->Refresh = IconboxEwinRefresh;
ewin->Close = IconboxEwinClose;
ewin->skiptask = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -3 -r1.194 -r1.195
--- menus.c 21 May 2005 20:58:18 -0000 1.194
+++ menus.c 21 May 2005 21:49:36 -0000 1.195
@@ -191,12 +191,6 @@
}
static void
-MenuEwinRefresh(EWin * ewin)
-{
- MenuEwinMoveResize(ewin, 0);
-}
-
-static void
MenuEwinClose(EWin * ewin)
{
if ((Menu *) (ewin->data) == active_menu)
@@ -217,7 +211,6 @@
ewin->data = ptr;
ewin->MoveResize = MenuEwinMoveResize;
- ewin->Refresh = MenuEwinRefresh;
ewin->Close = MenuEwinClose;
ewin->skiptask = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- pager.c 14 May 2005 20:48:29 -0000 1.139
+++ pager.c 21 May 2005 21:49:36 -0000 1.140
@@ -573,11 +573,6 @@
}
static void
-PagerEwinRefresh(EWin * ewin __UNUSED__)
-{
-}
-
-static void
PagerEwinClose(EWin * ewin)
{
PagerDestroy(ewin->data);
@@ -590,7 +585,6 @@
ewin->data = ptr;
ewin->MoveResize = PagerEwinMoveResize;
- ewin->Refresh = PagerEwinRefresh;
ewin->Close = PagerEwinClose;
ewin->skiptask = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- x.c 21 May 2005 20:58:18 -0000 1.91
+++ x.c 21 May 2005 21:49:36 -0000 1.92
@@ -1230,17 +1230,6 @@
return d;
}
-int
-WinExists(Window win)
-{
- Window w1;
- int x, y, w, h, b, d;
-
- if (EGetGeometry(win, &w1, &x, &y, &w, &h, &b, &d))
- return 1;
- return 0;
-}
-
Window
WinGetParent(Window win)
{
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
