Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h backgrounds.c borders.c desktops.c dialog.c draw.c
events.c ewin-ops.c iclass.c iconify.c main.c menus.c
moveresize.c pager.c tclass.c warp.c
Log Message:
Draw queue is now obsolete.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -3 -r1.429 -r1.430
--- E.h 14 May 2005 19:03:30 -0000 1.429
+++ E.h 14 May 2005 19:40:13 -0000 1.430
@@ -990,9 +990,6 @@
}
EConf;
-/* State parameters */
-#define DRAW_QUEUE_ENABLE 1
-
typedef struct
{
struct
@@ -1087,7 +1084,6 @@
unsigned int last_button;
unsigned int last_keycode;
char double_click;
- char queue_up;
}
EMode;
@@ -1122,42 +1118,6 @@
#define DIALOG_BUTTON_APPLY 3
#define DIALOG_BUTTON_CLOSE 4
-/* Disable, but Keep around a bit longer */
-#define USE_DQ_ICLASS 0
-#define USE_DQ_TCLASS 0
-#define USE_DQ_SHAPE 0
-#define USE_DQ_DIALOG 0
-#define USE_DQ_PAGER 0
-
-typedef struct _drawqueue
-{
- void (*func) (struct _drawqueue *);
- Window win;
- int x, y, w, h;
-#if USE_DQ_ICLASS
- ImageClass *iclass;
- int image_type;
- int active, sticky, state, expose;
-#endif
-#if USE_DQ_TCLASS
- TextClass *tclass;
- char *text;
-#endif
-#if USE_DQ_SHAPE
- char shape_propagate;
-#endif
-#if USE_DQ_PAGER
- Pager *pager;
- Pager *redraw_pager;
- char newbg;
-#endif
-#if USE_DQ_DIALOG
- Dialog *d;
- DItem *di;
-#endif
-}
-DrawQueue;
-
typedef struct _rectbox
{
void *data;
@@ -1283,8 +1243,7 @@
void EwinBorderSelect(EWin * ewin);
void EwinBorderDetach(EWin * ewin);
void EwinBorderSetTo(EWin * ewin, const Border * b);
-void EwinBorderDraw(EWin * ewin, int do_shape, int do_paint,
- int queue_off);
+void EwinBorderDraw(EWin * ewin, int do_shape, int do_paint);
void EwinBorderCalcSizes(EWin * ewin);
void EwinBorderMinShadeSize(EWin * ewin, int *mw, int *mh);
void EwinBorderUpdateInfo(EWin * ewin);
@@ -1515,10 +1474,6 @@
void DockIt(EWin * ewin);
void DockDestroy(EWin * ewin);
-/* draw.c */
-void HandleDrawQueue(void);
-char IsPropagateEwinOnQueue(EWin * ewin);
-
Imlib_Image *ELoadImage(const char *file);
void DrawEwinShape(EWin * ewin, int md, int x, int y, int w,
int h, char firstlast);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- backgrounds.c 7 May 2005 11:19:55 -0000 1.27
+++ backgrounds.c 14 May 2005 19:40:14 -0000 1.28
@@ -1388,7 +1388,6 @@
BackgroundImagesKeep(tmp_bg, 0);
}
- HandleDrawQueue();
autosave();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -3 -r1.260 -r1.261
--- borders.c 12 May 2005 23:09:17 -0000 1.260
+++ borders.c 14 May 2005 19:40:14 -0000 1.261
@@ -47,7 +47,7 @@
void
EwinBorderUpdateState(EWin * ewin)
{
- EwinBorderDraw(ewin, 0, 0, 0);
+ EwinBorderDraw(ewin, 0, 0);
}
static void
@@ -156,31 +156,24 @@
}
void
-EwinBorderDraw(EWin * ewin, int do_shape, int do_paint, int queue_off)
+EwinBorderDraw(EWin * ewin, int do_shape, int do_paint)
{
- int i, pq;
+ int i;
if (!ewin)
return;
#if 0 /* Debug */
- Eprintf("EwinBorderDraw %#lx %s d=%d s=%d p=%d q=%d\n",
+ Eprintf("EwinBorderDraw %#lx %s d=%d s=%d p=%d\n",
EwinGetClientWin(ewin), EoGetName(ewin), EoGetDesk(ewin), do_shape,
- do_paint, queue_off);
+ do_paint);
#endif
- pq = Mode.queue_up;
- if (queue_off)
- Mode.queue_up = 0;
-
for (i = 0; i < ewin->border->num_winparts; i++)
BorderWinpartITclassApply(ewin, i, do_shape || do_paint);
if (do_shape || !ewin->shapedone || ewin->border->changes_shape)
EwinPropagateShapes(ewin);
-
- if (queue_off)
- Mode.queue_up = pq;
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- desktops.c 12 May 2005 16:50:51 -0000 1.145
+++ desktops.c 14 May 2005 19:40:33 -0000 1.146
@@ -1045,8 +1045,6 @@
Mode.mode = MODE_NONE;
ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
-
- HandleDrawQueue();
}
static void
@@ -1191,10 +1189,7 @@
DesksStackingCheck();
FocusNewDesk();
if (Mode.mode == MODE_NONE)
- {
- ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
- HandleDrawQueue();
- }
+ ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
HintsSetCurrentDesktop();
ESync();
}
@@ -1221,10 +1216,7 @@
DesksStackingCheck();
FocusNewDesk();
if (Mode.mode == MODE_NONE)
- {
- ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
- HandleDrawQueue();
- }
+ ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
HintsSetCurrentDesktop();
ESync();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- dialog.c 14 May 2005 16:46:01 -0000 1.110
+++ dialog.c 14 May 2005 19:40:33 -0000 1.111
@@ -562,7 +562,6 @@
void
ShowDialog(Dialog * d)
{
- char pq;
int i, w, h, mw, mh;
EWin *ewin;
@@ -627,9 +626,6 @@
d->h = h;
EResizeWindow(d->win, w, h);
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
ewin = AddInternalToFamily(d->win, "DIALOG", EWIN_TYPE_DIALOG, d,
DialogEwinInit);
if (ewin)
@@ -657,7 +653,6 @@
ESync();
DialogRedraw(d);
- Mode.queue_up = pq;
}
void
@@ -1765,15 +1760,10 @@
static void
DialogItemsRealize(Dialog * d)
{
- char pq;
-
if (!d->item)
return;
DialogRealizeItem(d, d->item);
- pq = Mode.queue_up;
- Mode.queue_up = 0;
DialogDrawItems(d, d->item, 0, 0, 99999, 99999);
- Mode.queue_up = pq;
d->w = d->item->w + d->iclass->padding.left + d->iclass->padding.right;
d->h = d->item->h + d->iclass->padding.top + d->iclass->padding.bottom;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- draw.c 14 May 2005 19:03:32 -0000 1.69
+++ draw.c 14 May 2005 19:40:33 -0000 1.70
@@ -24,273 +24,6 @@
#include <sys/ipc.h>
#include <sys/shm.h>
-void
-HandleDrawQueue()
-{
- DrawQueue **lst = NULL, *dq;
- int i, num;
- char already, p_queue;
-
- switch (Mode.mode)
- {
- case MODE_MOVE_PENDING:
- case MODE_MOVE:
- if (Conf.movres.mode_move > 0)
- return;
- break;
- case MODE_RESIZE:
- case MODE_RESIZE_H:
- case MODE_RESIZE_V:
- if (Conf.movres.mode_resize > 0)
- return;
- break;
- }
-
- p_queue = Mode.queue_up;
- Mode.queue_up = 0;
- num = 0;
- /* find all DRAW queue entries most recent first and add them to the */
- /* end of the draw list array if there are no previous entries for that */
- /* draw type and that window in the array */
- while ((dq =
- (DrawQueue *) RemoveItem(NULL, 0, LIST_FINDBY_NONE, LIST_TYPE_DRAW)))
- {
- already = 0;
-
-#if USE_DQ_DIALOG
- if (dq->d)
- {
- for (i = 0; i < num; i++)
- {
- if ((lst[i]->d == dq->d) && DialogItem(dq->d) &&
- /*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di))
- {
- if (dq->x < lst[i]->x)
- {
- lst[i]->w += (lst[i]->x - dq->x);
- lst[i]->x = dq->x;
- }
- if ((lst[i]->x + lst[i]->w) < (dq->x + dq->w))
- lst[i]->w +=
- (dq->x + dq->w) - (lst[i]->x + lst[i]->w);
- if (dq->y < lst[i]->y)
- {
- lst[i]->h += (lst[i]->y - dq->y);
- lst[i]->y = dq->y;
- }
- if ((lst[i]->y + lst[i]->h) < (dq->y + dq->h))
- lst[i]->h +=
- (dq->y + dq->h) - (lst[i]->y + lst[i]->h);
- already = 1;
- break;
- }
- }
- }
-#endif
-#if USE_DQ_SHAPE
- else if (dq->shape_propagate)
- {
- for (i = 0; i < num; i++)
- {
- if ((lst[i]->win == dq->win) && (lst[i]->shape_propagate))
- {
- already = 1;
- break;
- }
- }
- }
-#endif
-#if USE_DQ_TCLASS
- else if (dq->text)
- {
- for (i = 0; i < num; i++)
- {
- if ((lst[i]->win == dq->win) && (lst[i]->text))
- {
- already = 1;
- break;
- }
- }
- }
-#endif
-#if USE_DQ_ICLASS
- else if (dq->iclass)
- {
- for (i = 0; i < num; i++)
- {
- if ((lst[i]->win == dq->win) && (!lst[i]->shape_propagate)
- && (!lst[i]->text))
- {
- already = 1;
- break;
- }
- }
- }
-#endif
-#if USE_DQ_PAGER
- if (dq->pager)
- {
- for (i = 0; i < num; i++)
- {
- if ((lst[i]->win == dq->win) && (lst[i]->pager))
- {
- already = 1;
- break;
- }
- }
- }
- else if (dq->redraw_pager)
- {
- for (i = 0; i < num; i++)
- {
- if ((lst[i]->win == dq->win) && (lst[i]->redraw_pager))
- {
- switch (lst[i]->newbg)
- {
- case 0:
- if (dq->newbg == 1)
- lst[i]->newbg = 1;
- else if (dq->newbg == 2)
- lst[i]->newbg = 1;
- break;
- case 1:
- break;
- case 2:
- if (dq->newbg == 1)
- lst[i]->newbg = 1;
- else if (dq->newbg == 0)
- lst[i]->newbg = 1;
- break;
- case 3:
- if (dq->newbg == 1)
- lst[i]->newbg = 1;
- else if (dq->newbg == 0)
- lst[i]->newbg = 0;
- else if (dq->newbg == 2)
- lst[i]->newbg = 2;
- break;
- default:
- break;
- }
- already = 1;
- break;
- }
- }
- }
-#endif
-
- if (already)
- {
- if (dq)
- {
-#if USE_DQ_ICLASS
- if (dq->iclass)
- dq->iclass->ref_count--;
-#endif
-#if USE_DQ_TCLASS
- if (dq->tclass)
- dq->tclass->ref_count--;
- if (dq->text)
- Efree(dq->text);
-#endif
- Efree(dq);
- }
- }
- else
- {
- num++;
- lst = Erealloc(lst, num * sizeof(DrawQueue *));
- lst[num - 1] = dq;
- }
- }
- /* go thru the list in chronological order (ie reverse) and do the draws */
- if (lst)
- {
- for (i = num - 1; i >= 0; i--)
- {
- dq = lst[i];
-
-#if USE_DQ_DIALOG
- if (dq->d)
- {
-/* printf("D %x\n", dq->d->ewin->client.win); */
- if (FindItem
- ((char *)(dq->d), 0, LIST_FINDBY_POINTER,
- LIST_TYPE_DIALOG))
- DialogDrawItems(dq->d, dq->di, dq->x, dq->y, dq->w, dq->h);
- }
-#endif
-#if USE_DQ_SHAPE
- else if (dq->shape_propagate)
- {
-/* printf("S %x\n", dq->win); */
- if (WinExists(dq->win))
- PropagateShapes(dq->win);
- }
-#endif
-#if USE_DQ_TCLASS
- else if (dq->text)
- {
-/* printf("T %x\n", dq->win); */
- if (WinExists(dq->win))
- TextclassApply(dq->iclass, dq->win, dq->w, dq->h,
- dq->active, dq->sticky, dq->state,
- dq->expose, dq->tclass, dq->text);
- Efree(dq->text);
- }
-#endif
-#if USE_DQ_ICLASS
- else if (dq->iclass)
- {
-/* printf("I %x\n", dq->win); */
- if (WinExists(dq->win))
- ImageclassApply(dq->iclass, dq->win, dq->w, dq->h,
- dq->active, dq->sticky, dq->state, 0,
- dq->image_type);
- }
-#endif
-#if USE_DQ_PAGER
- if (dq->pager)
- {
-/* printf("P %x\n", dq->win); */
- if (FindItem
- ((char *)(dq->pager), 0, LIST_FINDBY_POINTER,
- LIST_TYPE_PAGER))
- dq->func(dq);
- }
- else if (dq->redraw_pager)
- {
-/* printf("p %x\n", dq->win); */
- if (FindItem
- ((char *)(dq->redraw_pager), 0, LIST_FINDBY_POINTER,
- LIST_TYPE_PAGER))
- dq->func(dq);
- }
-#endif
-#if USE_DQ_ICLASS
- if (dq->iclass)
- dq->iclass->ref_count--;
-#endif
-#if USE_DQ_TCLASS
- if (dq->tclass)
- dq->tclass->ref_count--;
-#endif
- Efree(dq);
- }
- Efree(lst);
- }
-
- Mode.queue_up = p_queue;
-}
-
-char
-IsPropagateEwinOnQueue(EWin * ewin)
-{
- if (FindItem(NULL, EoGetWin(ewin), LIST_FINDBY_ID, LIST_TYPE_DRAW))
- return 1;
- return 0;
-}
-
static void
EFillPixmap(Window win, Pixmap pmap, int x, int y, int w, int h)
{
@@ -901,7 +634,7 @@
static Pixmap b1 = 0, b2 = 0, b3 = 0;
static Font font = 0;
int bpp;
- char str[32], pq;
+ char str[32];
char check_move = 0;
for (i = 0; i < ewin->num_groups; i++)
@@ -930,8 +663,6 @@
pw = w;
ph = h;
- pq = Mode.queue_up;
- Mode.queue_up = 0;
switch (md)
{
@@ -1214,7 +945,7 @@
EUngrabServer();
DrawEwinShape(ewin, Conf.movres.mode_move, x, y, w, h,
firstlast);
- goto done;
+ return;
}
EFillPixmap(VRoot.win, root_pi->pmap, x1, y1, EoGetW(ewin),
EoGetH(ewin));
@@ -1355,9 +1086,6 @@
if (firstlast == 2)
CoordsHide();
}
-
- done:
- Mode.queue_up = pq;
}
Imlib_Image *
@@ -1396,19 +1124,7 @@
XWindowAttributes att;
#if 0
- Eprintf("PropagateShapes(%d): %#lx\n", Mode.queue_up, win);
-#endif
-#if USE_DQ_SHAPE
- if (Mode.queue_up)
- {
- DrawQueue *dq;
-
- dq = Ecalloc(1, sizeof(DrawQueue));
- dq->win = win;
- dq->shape_propagate = 1;
- AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
- return;
- }
+ Eprintf("PropagateShapes: %#lx\n", win);
#endif
if (!EGetGeometry(win, &rt, &x, &y, &w, &h, &d, &d))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- events.c 14 May 2005 16:46:02 -0000 1.88
+++ events.c 14 May 2005 19:40:34 -0000 1.89
@@ -646,16 +646,15 @@
evq_num = 0;
count = EventsProcess(&evq_ptr, &evq_num);
- HandleDrawQueue();
DialogsCheckUpdate();
+ ModulesSignal(ESIGNAL_IDLE, NULL);
+
XFlush(disp);
pcount = count;
evq_num = 0;
count = EventsProcess(&evq_ptr, &evq_num);
- ModulesSignal(ESIGNAL_IDLE, NULL);
-
if (count > 0)
XFlush(disp);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewin-ops.c 14 May 2005 13:01:45 -0000 1.35
+++ ewin-ops.c 14 May 2005 19:40:34 -0000 1.36
@@ -228,7 +228,7 @@
return;
if (TransparencyEnabled())
- EwinBorderDraw(ewin, 0, 1, 0); /* Update the border */
+ EwinBorderDraw(ewin, 0, 1); /* Update the border */
if (ewin->Refresh)
ewin->Refresh(ewin);
@@ -462,7 +462,7 @@
Mode.mode == MODE_DESKSWITCH) /* && (move || resize) */ )
{
if (TransparencyEnabled())
- EwinBorderDraw(ewin, resize, 1, 0); /* Update the border */
+ EwinBorderDraw(ewin, resize, 1); /* Update the border */
if (ewin->MoveResize)
ewin->MoveResize(ewin, resize);
@@ -748,7 +748,6 @@
XSetWindowAttributes att;
int x, y, w, h;
int b, d;
- char pq;
if ((ewin->border->border.left == 0) && (ewin->border->border.right == 0)
&& (ewin->border->border.top == 0) && (ewin->border->border.bottom ==
0))
@@ -758,9 +757,6 @@
if (ewin->shaded && !force)
return;
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
x = EoGetX(ewin);
y = EoGetY(ewin);
w = EoGetW(ewin);
@@ -799,8 +795,6 @@
break;
}
- Mode.queue_up = pq;
-
ewin->shaded = 2;
EoMoveResize(ewin, x, y, w, h);
EMoveResizeWindow(ewin->win_container, -30, -30, 1, 1);
@@ -815,16 +809,12 @@
{
XSetWindowAttributes att;
int x, y, w, h;
- char pq;
if (GetZoomEWin() == ewin)
return;
if (!ewin->shaded)
return;
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
x = EoGetX(ewin);
y = EoGetY(ewin);
w = EoGetW(ewin);
@@ -861,8 +851,6 @@
break;
}
- Mode.queue_up = pq;
-
/* Reset gravity */
att.win_gravity = NorthWestGravity;
EChangeWindowAttributes(ewin->client.win, CWWinGravity, &att);
@@ -880,7 +868,6 @@
XSetWindowAttributes att;
int x, y, w, h;
int i, j, k, speed, a, b, c, d, ww, hh;
- char pq;
if ((ewin->border->border.left == 0) && (ewin->border->border.right == 0)
&& (ewin->border->border.top == 0) && (ewin->border->border.bottom ==
0))
@@ -892,9 +879,6 @@
if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS")))
return;
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
speed = Conf.shadespeed;
x = EoGetX(ewin);
@@ -1061,8 +1045,6 @@
break;
}
- Mode.queue_up = pq;
-
ewin->shaded = 2;
EMoveResizeWindow(ewin->win_container, -30, -30, 1, 1);
if (ewin->client.shaped)
@@ -1085,16 +1067,12 @@
XSetWindowAttributes att;
int x, y, w, h;
int i, j, k, speed, a, b, c, d;
- char pq;
if (GetZoomEWin() == ewin)
return;
if (!ewin->shaded || ewin->iconified)
return;
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
speed = Conf.shadespeed;
x = EoGetX(ewin);
@@ -1286,8 +1264,6 @@
break;
}
- Mode.queue_up = pq;
-
/* Reset gravity */
att.win_gravity = NorthWestGravity;
EChangeWindowAttributes(ewin->client.win, CWWinGravity, &att);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- iclass.c 8 May 2005 20:26:49 -0000 1.63
+++ iclass.c 14 May 2005 19:40:34 -0000 1.64
@@ -1018,37 +1018,6 @@
if (w <= 0 || h <= 0)
return;
-#if USE_DQ_ICLASS /* Try not using the draw queue here. */
- if (Mode.queue_up)
- {
- DrawQueue *dq;
-
- dq = Emalloc(sizeof(DrawQueue));
- dq->win = win;
- dq->iclass = ic;
- if (dq->iclass)
- dq->iclass->ref_count++;
- dq->w = w;
- dq->h = h;
- dq->active = active;
- dq->sticky = sticky;
- dq->state = state;
- dq->expose = expose;
- dq->tclass = NULL;
- dq->text = NULL;
- dq->shape_propagate = 0;
- dq->pager = NULL;
- dq->redraw_pager = NULL;
- dq->d = NULL;
- dq->di = NULL;
- dq->x = 0;
- dq->y = 0;
- dq->image_type = image_type;
- AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
- return;
- }
-#endif
-
if (!is)
is = ImageclassGetImageState(ic, state, active, sticky);
if (!is)
@@ -1362,7 +1331,6 @@
char param1[FILEPATH_LEN_MAX];
char param2[FILEPATH_LEN_MAX];
char param3[FILEPATH_LEN_MAX];
- char pq;
ImageClass *ic;
if (!params)
@@ -1477,10 +1445,7 @@
w = (int)strtol(atword(params, 5), (char **)NULL, 0);
h = (int)strtol(hptr, (char **)NULL, 0);
}
- pq = Mode.queue_up;
- Mode.queue_up = 0;
ImageclassApply(ic, win, w, h, 0, 0, st, 0, ST_UNKNWN);
- Mode.queue_up = pq;
}
}
else if (!strcmp(param2, "apply_copy"))
@@ -1512,11 +1477,8 @@
w = (int)strtol(atword(params, 5), (char **)NULL, 0);
h = (int)strtol(hptr, (char **)NULL, 0);
- pq = Mode.queue_up;
- Mode.queue_up = 0;
ImageclassApplyCopy(ic, win, w, h, 0, 0, st,
&pmm, 1, ST_UNKNWN);
- Mode.queue_up = pq;
IpcPrintf("0x%08x 0x%08x\n",
(unsigned)pmm.pmap, (unsigned)pmm.mask);
/* FreePmapMask(&pmm); ??? */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- iconify.c 14 May 2005 09:19:52 -0000 1.146
+++ iconify.c 14 May 2005 19:40:34 -0000 1.147
@@ -561,11 +561,8 @@
static void
IconboxShow(Iconbox * ib)
{
- EWin *ewin = NULL;
- char pq;
-
- pq = Mode.queue_up;
- Mode.queue_up = 0;
+ EWin *ewin;
+ int w, h;
if (ib->type == IB_TYPE_ICONBOX)
{
@@ -580,32 +577,29 @@
ewin = AddInternalToFamily(ib->win, "ICONBOX", EWIN_TYPE_ICONBOX, ib,
IconboxEwinInit);
- if (ewin)
- {
- int w, h;
-
- ib->ewin = ewin;
+ if (!ewin)
+ return;
- IB_Reconfigure(ib);
+ ib->ewin = ewin;
- w = ewin->client.w;
- h = ewin->client.h;
- ewin->client.w = 1;
- ewin->client.h = 1;
- if (ewin->client.already_placed)
- {
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
- }
- else
- {
- EwinStick(ewin);
- ResizeEwin(ewin, w, h);
- MoveEwin(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
- }
+ IB_Reconfigure(ib);
- ShowEwin(ewin);
+ w = ewin->client.w;
+ h = ewin->client.h;
+ ewin->client.w = 1;
+ ewin->client.h = 1;
+ if (ewin->client.already_placed)
+ {
+ MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
}
- Mode.queue_up = pq;
+ else
+ {
+ EwinStick(ewin);
+ ResizeEwin(ewin, w, h);
+ MoveEwin(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
+ }
+
+ ShowEwin(ewin);
}
#if 0
@@ -1734,7 +1728,6 @@
static void
IconboxRedraw(Iconbox * ib)
{
- char pq;
char was_shaded = 0;
int i, x, y, w, h;
ImageClass *ib_ic_cover;
@@ -1821,9 +1814,6 @@
if (was_shaded)
EwinShade(ib->ewin);
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
IB_FixPos(ib);
IB_DrawScroll(ib);
@@ -1971,8 +1961,6 @@
ICCCM_GetShapeInfo(ib->ewin);
ib->ewin->shapedone = 0;
EwinPropagateShapes(ib->ewin);
-
- Mode.queue_up = pq;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- main.c 7 May 2005 11:19:59 -0000 1.126
+++ main.c 14 May 2005 19:40:34 -0000 1.127
@@ -268,7 +268,6 @@
/* sync just to make sure */
ESync();
- Mode.queue_up = DRAW_QUEUE_ENABLE;
/* let's make sure we set this up and go to our desk anyways */
DeskGoto(DesksGetCurrent());
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -3 -r1.192 -r1.193
--- menus.c 14 May 2005 09:19:52 -0000 1.192
+++ menus.c 14 May 2005 19:40:34 -0000 1.193
@@ -638,7 +638,7 @@
int maxx1, maxx2, w, h, x, y, r, mmw, mmh;
int iw, ih;
Imlib_Image *im;
- char pq, has_i, has_s;
+ char has_i, has_s;
if (!m->style)
return;
@@ -752,8 +752,6 @@
mmw = 0;
mmh = 0;
- pq = Mode.queue_up;
- Mode.queue_up = 0;
nmaxy = 3 * VRoot.h / (4 * maxh + 1);
if (m->style->maxy && nmaxy > m->style->maxy)
@@ -843,8 +841,6 @@
m->w = mmw;
m->h = mmh;
EResizeWindow(m->win, mmw, mmh);
-
- Mode.queue_up = pq;
}
static void
@@ -888,10 +884,6 @@
MenuDrawItem(Menu * m, MenuItem * mi, char shape)
{
PmapMask *mi_pmm;
- char pq;
-
- pq = Mode.queue_up;
- Mode.queue_up = 0;
mi_pmm = &(mi->pmm[(int)(mi->state)]);
@@ -962,8 +954,6 @@
GrabKeyboard(m->win);
}
}
-
- Mode.queue_up = pq;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- moveresize.c 7 May 2005 11:19:59 -0000 1.40
+++ moveresize.c 14 May 2005 19:40:34 -0000 1.41
@@ -270,8 +270,6 @@
if (Conf.movres.mode_resize > 0)
EGrabServer();
- Mode.queue_up = 0;
-
if (grab)
{
GrabPointerRelease();
@@ -376,7 +374,6 @@
EUngrabServer();
return 0;
}
- Mode.queue_up = DRAW_QUEUE_ENABLE;
Mode.mode = MODE_NONE;
DrawEwinShape(ewin, Conf.movres.mode_resize, ewin->shape_x, ewin->shape_y,
ewin->client.w, ewin->client.h, 2);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- pager.c 14 May 2005 19:03:33 -0000 1.136
+++ pager.c 14 May 2005 19:40:34 -0000 1.137
@@ -56,9 +56,6 @@
#define PAGER_EVENT_MOTION 0
#define PAGER_EVENT_MOUSE_IN 1
-#if USE_DQ_PAGER
-static void PagerDrawQueueCallback(DrawQueue * dq);
-#endif
static void PagerEwinUpdateFromPager(Pager * p, EWin * ewin);
static void PagerHiwinHide(Pager * p);
static void PagerEventMainWin(XEvent * ev, void *prm);
@@ -71,7 +68,6 @@
{
Pager *p;
int ax, ay;
- char pq;
ImageClass *ic;
XSetWindowAttributes attr;
static char did_dialog = 0;
@@ -101,13 +97,10 @@
p->update_phase = 0;
p->ewin = NULL;
p->sel_win = ECreateWindow(p->win, 0, 0, p->w / ax, p->h / ay, 0);
- pq = Mode.queue_up;
- Mode.queue_up = 0;
ic = ImageclassFind("PAGER_SEL", 0);
if (ic)
ImageclassApply(ic, p->sel_win, p->w / ax, p->h / ay, 0, 0, STATE_NORMAL,
0, ST_PAGER);
- Mode.queue_up = pq;
return p;
}
@@ -336,21 +329,6 @@
if (!Conf.pagers.enable || Mode.mode == MODE_DESKSWITCH)
return;
-#if USE_DQ_PAGER
- if (Mode.queue_up)
- {
- DrawQueue *dq;
-
- dq = Ecalloc(1, sizeof(DrawQueue));
- dq->func = PagerDrawQueueCallback;
- dq->win = p->win;
- dq->redraw_pager = p;
- dq->newbg = newbg;
- AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
- return;
- }
-#endif
-
/* Desk may be gone */
if (p->desktop >= DesksGetNumber())
return;
@@ -511,20 +489,6 @@
if (!Conf.pagers.enable || Mode.mode == MODE_DESKSWITCH)
return;
-#if USE_DQ_PAGER
- if (Mode.queue_up)
- {
- DrawQueue *dq;
-
- dq = Ecalloc(1, sizeof(DrawQueue));
- dq->func = PagerDrawQueueCallback;
- dq->win = p->win;
- dq->pager = p;
- AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
- return;
- }
-#endif
-
/* Desk may be gone */
if (p->desktop >= DesksGetNumber())
return;
@@ -552,24 +516,12 @@
PagerEwinUpdateFromPager(p, lst[i]);
}
-#if USE_DQ_PAGER
-static void
-PagerDrawQueueCallback(DrawQueue * dq)
-{
- if (dq->pager)
- PagerForceUpdate(dq->pager);
- else if (dq->redraw_pager)
- PagerRedraw(dq->redraw_pager, dq->newbg);
-}
-#endif
-
static void
PagerEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
Pager *p = ewin->data;
int w, h;
int ax, ay, cx, cy;
- char pq;
ImageClass *ic;
EWin *const *lst;
int i, num;
@@ -605,8 +557,7 @@
p->ewin->client.aspect_min = aspect * ((double)ax / (double)ay);
p->ewin->client.aspect_max = aspect * ((double)ax / (double)ay);
}
- pq = Mode.queue_up;
- Mode.queue_up = 0;
+
ic = ImageclassFind("PAGER_SEL", 0);
if (ic)
{
@@ -615,7 +566,6 @@
ImageclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL, 0,
ST_PAGER);
}
- Mode.queue_up = pq;
lst = EwinListGetForDesk(&num, p->desktop);
for (i = 0; i < num; i++)
@@ -658,7 +608,6 @@
{
EWin *ewin = NULL;
char s[4096];
- char pq;
if (!Conf.pagers.enable)
return;
@@ -672,9 +621,6 @@
Esnprintf(s, sizeof(s), "%i", p->desktop);
HintsSetWindowClass(p->win, s, "Enlightenment_Pager");
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
ewin =
AddInternalToFamily(p->win, "PAGER", EWIN_TYPE_PAGER, p, PagerEwinInit);
if (ewin)
@@ -728,8 +674,6 @@
}
AddItem(p, "PAGER", p->win, LIST_TYPE_PAGER);
}
-
- Mode.queue_up = pq;
}
static Pager **
@@ -2350,9 +2294,7 @@
if (!Conf.pagers.enable)
break;
Conf.pagers.enable = 0;
- Mode.queue_up = 0;
PagersShow(1);
- Mode.queue_up = DRAW_QUEUE_ENABLE;
break;
case ESIGNAL_IDLE:
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tclass.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- tclass.c 19 Mar 2005 16:40:17 -0000 1.32
+++ tclass.c 14 May 2005 19:40:35 -0000 1.33
@@ -439,42 +439,6 @@
if ((!iclass) || (!tclass) || (!text) || (!win) || (w < 1) || (h < 1))
return;
-#if USE_DQ_TCLASS /* Try not using the draw queue here. */
- if (Mode.queue_up)
- {
- DrawQueue *dq;
-
- dq = Emalloc(sizeof(DrawQueue));
- dq->win = win;
- dq->iclass = iclass;
- if (dq->iclass)
- dq->iclass->ref_count++;
- dq->w = w;
- dq->h = h;
- dq->active = active;
- dq->sticky = sticky;
- dq->state = state;
- dq->expose = expose;
- dq->tclass = tclass;
- if (dq->tclass)
- dq->tclass->ref_count++;
- if (text)
- dq->text = Estrdup(text);
- else
- dq->text = NULL;
- dq->w = w;
- dq->shape_propagate = 0;
- dq->pager = NULL;
- dq->redraw_pager = NULL;
- dq->d = NULL;
- dq->di = NULL;
- dq->x = 0;
- dq->y = 0;
- AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
- return;
- }
-#endif
-
XClearWindow(disp, win);
TextDraw(tclass, win, active, sticky, state, text, iclass->padding.left,
@@ -514,7 +478,6 @@
char param1[FILEPATH_LEN_MAX];
char param2[FILEPATH_LEN_MAX];
char param3[FILEPATH_LEN_MAX];
- char pq;
TextClass *tc;
if (!params)
@@ -593,11 +556,8 @@
else if (!strcmp(param3, "disabled"))
state = STATE_DISABLED;
txt = atword(params, 7);
- pq = Mode.queue_up;
- Mode.queue_up = 0;
if (txt)
TextDraw(tc, win, 0, 0, state, txt, x, y, 99999, 99999, 17, 0);
- Mode.queue_up = pq;
}
}
else if (!strcmp(param2, "query_size"))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- warp.c 7 May 2005 11:20:01 -0000 1.62
+++ warp.c 14 May 2005 19:40:35 -0000 1.63
@@ -62,7 +62,6 @@
{
TextClass *tc;
ImageClass *ic;
- char pq;
int i, x, y, w, h, num, ww, hh;
static int mw, mh, tw, th;
char s[1024];
@@ -93,9 +92,6 @@
TooltipsEnable(0);
}
- pq = Mode.queue_up;
- Mode.queue_up = 0;
-
if (!warpFocusWindow->shown)
{
EWin **lst;
@@ -207,7 +203,6 @@
}
PropagateShapes(warpFocusWindow->win);
- Mode.queue_up = pq;
EFlush();
}
-------------------------------------------------------
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=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
