Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c borders.c coords.c dialog.c draw.c globals.c
iclass.c iconify.c ipc.c main.c menus.c moveresize.c pager.c
progress.c startup.c tclass.c tooltips.c warp.c
Log Message:
Move global queue_up to Mode struct.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -3 -r1.242 -r1.243
--- E.h 9 Apr 2004 12:50:25 -0000 1.242
+++ E.h 9 Apr 2004 12:59:54 -0000 1.243
@@ -1242,6 +1242,8 @@
EConf;
/* State parameters */
+#define DRAW_QUEUE_ENABLE 1
+
typedef struct
{
struct
@@ -1299,6 +1301,7 @@
Window last_bpress;
int last_button;
Time last_time;
+ char queue_up;
}
EMode;
@@ -2785,8 +2788,6 @@
#define FILEPATH_LEN_MAX 4096
extern char themepath[FILEPATH_LEN_MAX];
-#define DRAW_QUEUE_ENABLE 1
-extern char queue_up;
extern char no_overwrite;
extern char clickmenu;
extern int child_count;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- actions.c 1 Apr 2004 22:41:19 -0000 1.151
+++ actions.c 9 Apr 2004 12:59:54 -0000 1.152
@@ -2619,13 +2619,13 @@
DesktopAccounting();
desks.desk[desk].viewable = view;
BGSettingsGoTo(bg);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
SetDesktopBg(desk, bg);
RefreshDesktop(desk);
RedrawPagersForDesktop(desk, 2);
ForceUpdatePagersForDesktop(desk);
- queue_up = pq;
+ Mode.queue_up = pq;
}
autosave();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- borders.c 9 Apr 2004 12:47:02 -0000 1.162
+++ borders.c 9 Apr 2004 12:59:54 -0000 1.163
@@ -563,11 +563,11 @@
/* if the window asked to be iconified at the start */
if (ewin->iconified)
{
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
DrawEwin(ewin);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
MoveEwinToDesktopAt(ewin, ewin->desktop, x, y);
RaiseEwin(ewin);
ShowEwin(ewin);
@@ -596,12 +596,12 @@
ewin->client.already_placed = 1;
x = Mode.x + 1;
y = Mode.y + 1;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
DrawEwin(ewin);
ICCCM_Configure(ewin);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
MoveEwinToDesktop(ewin, ewin->desktop);
RaiseEwin(ewin);
MoveEwin(ewin, x, y);
@@ -640,11 +640,11 @@
fx = root.w;
fy = (rand() % (root.h)) - ewin->h;
}
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
DrawEwin(ewin);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
MoveEwinToDesktop(ewin, ewin->desktop);
RaiseEwin(ewin);
MoveEwin(ewin, fx, fy);
@@ -654,11 +654,11 @@
}
else
{
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
DrawEwin(ewin);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
MoveEwinToDesktopAt(ewin, ewin->desktop, x, y);
RaiseEwin(ewin);
ShowEwin(ewin);
@@ -704,11 +704,11 @@
ICCCM_Configure(ewin);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
DrawEwin(ewin);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
UngrabX();
@@ -1093,10 +1093,10 @@
{
char pq;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
}
else
PropagateShapes(ewin->win);
@@ -2365,8 +2365,8 @@
if (ewin->shaded && !force)
EDBUG_RETURN_;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
switch (ewin->border->shadedir)
{
case 0:
@@ -2425,7 +2425,7 @@
break;
}
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
HintsSetWindowState(ewin);
if (Mode.mode == MODE_NONE)
{
@@ -2447,8 +2447,8 @@
EDBUG_RETURN_;
if (!ewin->shaded)
EDBUG_RETURN_;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
switch (ewin->border->shadedir)
{
case 0:
@@ -2503,7 +2503,7 @@
break;
}
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
HintsSetWindowState(ewin);
if (Mode.mode == MODE_NONE)
{
@@ -2535,8 +2535,8 @@
EDBUG_RETURN_;
if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS")))
EDBUG_RETURN_;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
speed = Conf.shadespeed;
spd = 32;
min = 2;
@@ -2766,7 +2766,7 @@
EShapeCombineShape(disp, ewin->win_container, ShapeBounding, 0, 0,
ewin->client.win, ShapeBounding, ShapeSet);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
HintsSetWindowState(ewin);
if (Mode.mode == MODE_NONE)
{
@@ -2792,8 +2792,8 @@
EDBUG_RETURN_;
if (!ewin->shaded)
EDBUG_RETURN_;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
speed = Conf.shadespeed;
spd = 32;
min = 2;
@@ -3032,7 +3032,7 @@
EShapeCombineShape(disp, ewin->win_container, ShapeBounding, 0, 0,
ewin->client.win, ShapeBounding, ShapeSet);
PropagateShapes(ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
HintsSetWindowState(ewin);
if (Mode.mode == MODE_NONE)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/coords.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- coords.c 20 Mar 2004 15:49:05 -0000 1.16
+++ coords.c 9 Apr 2004 12:59:54 -0000 1.17
@@ -97,11 +97,11 @@
EMapWindow(disp, c_win);
XRaiseWindow(disp, c_win);
EMoveResizeWindow(disp, c_win, cx, cy, cw, ch);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
IclassApply(ic, c_win, cw, ch, 1, 0, STATE_NORMAL, 0);
TclassApply(ic, c_win, cw, ch, 0, 0, STATE_NORMAL, 0, tc, s);
- queue_up = pq;
+ Mode.queue_up = pq;
XFlush(disp);
coords_visible = 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- dialog.c 7 Apr 2004 21:50:16 -0000 1.84
+++ dialog.c 9 Apr 2004 12:59:54 -0000 1.85
@@ -680,8 +680,8 @@
d->h = h;
EResizeWindow(disp, d->win, w, h);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
ewin = AddInternalToFamily(d->win, NULL, EWIN_TYPE_DIALOG, d,
DialogEwinInit);
@@ -713,7 +713,7 @@
XSync(disp, False);
DialogRedraw(d);
- queue_up = pq;
+ Mode.queue_up = pq;
}
void
@@ -1622,7 +1622,7 @@
{
int state;
- if (queue_up)
+ if (Mode.queue_up)
{
DrawQueue *dq;
@@ -1811,10 +1811,10 @@
if (!d->item)
return;
DialogRealizeItem(d, d->item);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
DialogDrawItems(d, d->item, 0, 0, 99999, 99999);
- queue_up = pq;
+ 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.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- draw.c 20 Mar 2004 15:58:44 -0000 1.43
+++ draw.c 9 Apr 2004 12:59:55 -0000 1.44
@@ -50,8 +50,8 @@
break;
}
- p_queue = queue_up;
- queue_up = 0;
+ 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 */
@@ -254,7 +254,7 @@
Efree(lst);
}
- queue_up = p_queue;
+ Mode.queue_up = p_queue;
EDBUG_RETURN_;
}
@@ -1382,8 +1382,8 @@
}
pw = w;
ph = h;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
switch (md)
{
case 0:
@@ -1773,7 +1773,7 @@
}
done:
- queue_up = pq;
+ Mode.queue_up = pq;
EDBUG_RETURN_;
}
@@ -1816,7 +1816,7 @@
XWindowAttributes att;
EDBUG(6, "PropagateShapes");
- if (queue_up)
+ if (Mode.queue_up)
{
DrawQueue *dq;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- globals.c 7 Apr 2004 14:32:34 -0000 1.35
+++ globals.c 9 Apr 2004 12:59:55 -0000 1.36
@@ -51,7 +51,6 @@
Window init_win_ext = 0;
char themepath[FILEPATH_LEN_MAX];
-char queue_up;
char no_overwrite = 0;
char clickmenu = 0;
int child_count = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- iclass.c 8 Apr 2004 12:54:45 -0000 1.33
+++ iclass.c 9 Apr 2004 12:59:55 -0000 1.34
@@ -729,7 +729,7 @@
if ((w < 0) || (h < 0))
EDBUG_RETURN_;
- if (queue_up)
+ if (Mode.queue_up)
{
DrawQueue *dq;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- iconify.c 7 Apr 2004 21:50:18 -0000 1.100
+++ iconify.c 9 Apr 2004 12:59:55 -0000 1.101
@@ -584,8 +584,8 @@
XTextProperty xtp;
char pq;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
xtp.encoding = XA_STRING;
xtp.format = 8;
xtp.value = (unsigned char *)("Iconbox");
@@ -626,7 +626,7 @@
ShowEwin(ewin);
}
- queue_up = pq;
+ Mode.queue_up = pq;
}
void
@@ -2058,8 +2058,8 @@
if (was_shaded)
ShadeEwin(ib->ewin);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
IB_CalcMax(ib);
IB_FixPos(ib);
@@ -2209,7 +2209,7 @@
ICCCM_GetShapeInfo(ib->ewin);
PropagateShapes(ib->ewin->win);
- queue_up = pq;
+ Mode.queue_up = pq;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- ipc.c 7 Apr 2004 14:32:34 -0000 1.149
+++ ipc.c 9 Apr 2004 12:59:55 -0000 1.150
@@ -1425,12 +1425,12 @@
else if (!strcmp(param3, "disabled"))
state = STATE_DISABLED;
txt = atword(params, 7);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
if (txt)
TextDraw(t, win, 0, 0, state, txt, x, y, 99999, 99999,
17, 0);
- queue_up = pq;
+ Mode.queue_up = pq;
}
}
else if (!strcmp(param2, "query_size"))
@@ -1764,10 +1764,10 @@
0);
h = (int)strtol(hptr, (char **)NULL, 0);
}
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
IclassApply(iclass, win, w, h, 0, 0, st, 0);
- queue_up = pq;
+ Mode.queue_up = pq;
}
}
else if (!strcmp(param2, "apply_copy"))
@@ -1805,11 +1805,11 @@
w = (int)strtol(atword(params, 5), (char **)NULL,
0);
h = (int)strtol(hptr, (char **)NULL, 0);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
IclassApplyCopy(iclass, win, w, h, 0, 0, st, &pmm,
1);
- queue_up = pq;
+ Mode.queue_up = pq;
Esnprintf(buf, sizeof(buf), "0x%08x 0x%08x",
(unsigned)pmm.pmap, (unsigned)pmm.mask);
/* FreePmapMask(&pmm); ??? */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- main.c 7 Apr 2004 14:32:35 -0000 1.84
+++ main.c 9 Apr 2004 12:59:55 -0000 1.85
@@ -275,9 +275,9 @@
if (Conf.pagers.enable)
{
Conf.pagers.enable = 0;
- queue_up = 0;
+ Mode.queue_up = 0;
EnableAllPagers();
- queue_up = DRAW_QUEUE_ENABLE;
+ Mode.queue_up = DRAW_QUEUE_ENABLE;
}
/* Kill the E process owning the "init window" */
@@ -289,7 +289,7 @@
/* sync just to make sure */
XSync(disp, False);
- queue_up = DRAW_QUEUE_ENABLE;
+ Mode.queue_up = DRAW_QUEUE_ENABLE;
/* hello! we don't have a resizemode of 5! */
if (Conf.resizemode == 5)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- menus.c 9 Apr 2004 12:54:42 -0000 1.119
+++ menus.c 9 Apr 2004 12:59:55 -0000 1.120
@@ -752,8 +752,8 @@
r = 0;
mmw = 0;
mmh = 0;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
for (i = 0; i < m->num; i++)
{
@@ -826,7 +826,7 @@
}
EResizeWindow(disp, m->win, mmw, mmh);
- queue_up = pq;
+ Mode.queue_up = pq;
EDBUG_RETURN_;
}
@@ -866,8 +866,8 @@
PmapMask *mi_pmm;
EDBUG(5, "MenuDrawItem");
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
mi_pmm = &(mi->pmm[(int)(mi->state)]);
if (Conf.theme.transparency || IclassIsTransparent(m->style->bg_iclass))
@@ -964,7 +964,7 @@
if ((shape) && (m->style->use_item_bg))
PropagateShapes(m->win);
- queue_up = pq;
+ Mode.queue_up = pq;
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- moveresize.c 8 Apr 2004 22:17:56 -0000 1.8
+++ moveresize.c 9 Apr 2004 12:59:55 -0000 1.9
@@ -271,7 +271,7 @@
FX_Pause();
GrabX();
}
- queue_up = 0;
+ Mode.queue_up = 0;
SoundPlay("SOUND_RESIZE_START");
UnGrabTheButtons();
GrabConfineThePointer(root.win);
@@ -347,7 +347,7 @@
ForceUpdatePagersForDesktop(desks.current);
EDBUG_RETURN(0);
}
- queue_up = DRAW_QUEUE_ENABLE;
+ Mode.queue_up = DRAW_QUEUE_ENABLE;
Mode.mode = MODE_NONE;
Mode.firstlast = 2;
DrawEwinShape(ewin, Conf.resizemode, ewin->x, ewin->y, ewin->client.w,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- pager.c 7 Apr 2004 21:50:19 -0000 1.81
+++ pager.c 9 Apr 2004 12:59:55 -0000 1.82
@@ -212,12 +212,12 @@
p->ewin = NULL;
p->border_name = NULL;
p->sel_win = ECreateWindow(p->win, 0, 0, p->w / ax, p->h / ay, 0);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
ic = FindItem("PAGER_SEL", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (ic)
IclassApply(ic, p->sel_win, p->w / ax, p->h / ay, 0, 0, STATE_NORMAL, 0);
- queue_up = pq;
+ Mode.queue_up = pq;
return p;
}
@@ -264,8 +264,8 @@
p->ewin->client.aspect_min = aspect * ((double)ax / (double)ay);
p->ewin->client.aspect_max = aspect * ((double)ax / (double)ay);
}
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
ic = FindItem("PAGER_SEL", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (ic)
{
@@ -275,7 +275,7 @@
p->dh);
IclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL, 0);
}
- queue_up = pq;
+ Mode.queue_up = pq;
lst = EwinListGetForDesktop(p->desktop, &num);
for (i = 0; i < num; i++)
@@ -335,8 +335,8 @@
xch->res_class = (char *)"Enlightenment_Pager";
XSetClassHint(disp, p->win, xch);
XFree(xch);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
MatchToSnapInfoPager(p);
ewin = AddInternalToFamily(p->win, (p->border_name) ? p->border_name :
"PAGER", EWIN_TYPE_PAGER, p, PagerEwinInit);
@@ -393,7 +393,7 @@
AddItem(p, "PAGER", p->win, LIST_TYPE_PAGER);
}
- queue_up = pq;
+ Mode.queue_up = pq;
}
void
@@ -602,7 +602,7 @@
if (!Conf.pagers.enable || Mode.mode == MODE_DESKSWITCH)
return;
- if (queue_up)
+ if (Mode.queue_up)
{
DrawQueue *dq;
@@ -771,7 +771,7 @@
if (!Conf.pagers.enable || Mode.mode == MODE_DESKSWITCH)
return;
- if (queue_up)
+ if (Mode.queue_up)
{
DrawQueue *dq;
@@ -1124,7 +1124,7 @@
if (Mode.cur_menu_depth) /* Don't show HiWin when menu is up */
return;
- pq = queue_up;
+ pq = Mode.queue_up;
p->hi_win_w = 2 * w;
p->hi_win_h = 2 * h;
@@ -1209,7 +1209,7 @@
{
int xx, yy, ww, hh, i;
- queue_up = 0;
+ Mode.queue_up = 0;
if (w > h)
{
for (i = w; i < (w * 2); i++)
@@ -1336,7 +1336,7 @@
p->hi_ewin = ewin;
done:
- queue_up = pq;
+ Mode.queue_up = pq;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/progress.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- progress.c 28 Feb 2004 15:14:01 -0000 1.13
+++ progress.c 9 Apr 2004 12:59:55 -0000 1.14
@@ -93,13 +93,13 @@
if (w > p->w)
w = p->w;
Esnprintf(s, sizeof(s), "%i%%", p->value);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
TclassApply(p->inc, p->n_win, p->h * 5, p->h, 0, 0, STATE_CLICKED, 0,
p->tnc, s);
IclassApply(p->inc, p->p_win, w, p->h, 1, 0, STATE_NORMAL, 0);
EResizeWindow(disp, p->p_win, w, p->h);
- queue_up = pq;
+ Mode.queue_up = pq;
XFlush(disp);
EDBUG_RETURN_;
@@ -117,8 +117,8 @@
w = 1;
if (w > p->w)
w = p->w;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
IclassApply(p->ic, p->win, p->w - (p->h * 5), p->h, 0, 0, STATE_NORMAL, 0);
IclassApply(p->inc, p->n_win, (p->h * 5), p->h, 0, 0, STATE_CLICKED, 0);
IclassApply(p->ipc, p->p_win, w, p->h, 1, 0, STATE_NORMAL, 0);
@@ -128,7 +128,7 @@
XSync(disp, False);
TclassApply(p->ic, p->win, p->w - (p->h * 5), p->h, 0, 0, STATE_NORMAL, 0,
p->tc, p->name);
- queue_up = pq;
+ Mode.queue_up = pq;
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- startup.c 21 Mar 2004 01:39:40 -0000 1.39
+++ startup.c 9 Apr 2004 12:59:55 -0000 1.40
@@ -211,11 +211,11 @@
EMapRaised(disp, b1);
EMapRaised(disp, b2);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
IclassApply(ic, b1, root.w, Conf.desks.dragbar_width, 0, 0, 0, 0);
IclassApply(ic, b2, root.w, Conf.desks.dragbar_width, 0, 0, 0, 0);
- queue_up = pq;
+ Mode.queue_up = pq;
SetBackgroundTo(win1, bg, 1);
SetBackgroundTo(win2, bg, 1);
if (bg->pmap)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tclass.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- tclass.c 29 Feb 2004 01:30:18 -0000 1.21
+++ tclass.c 9 Apr 2004 12:59:56 -0000 1.22
@@ -197,7 +197,7 @@
if ((!iclass) || (!tclass) || (!win) || (w < 1) || (h < 1))
EDBUG_RETURN_;
- if (queue_up)
+ if (Mode.queue_up)
{
DrawQueue *dq;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- tooltips.c 21 Mar 2004 01:41:00 -0000 1.60
+++ tooltips.c 9 Apr 2004 12:59:56 -0000 1.61
@@ -125,8 +125,8 @@
if (!tt)
EDBUG_RETURN_;
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
/* if we get an actionclass, look for tooltip action texts */
if (ac)
@@ -617,7 +617,7 @@
}
}
- queue_up = pq;
+ Mode.queue_up = pq;
tt->visible = 1;
if (heights)
Efree(heights);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- warp.c 8 Apr 2004 12:54:46 -0000 1.41
+++ warp.c 9 Apr 2004 12:59:56 -0000 1.42
@@ -185,8 +185,8 @@
if (!warpFocusTitleWindow)
warpFocusTitleWindow = ECreateWindow(root.win, 0, 0, 1, 1, 1);
- pq = queue_up;
- queue_up = 0;
+ pq = Mode.queue_up;
+ Mode.queue_up = 0;
XRaiseWindow(disp, warpFocusTitleWindow);
if (!warpFocusTitleShowing)
@@ -263,7 +263,7 @@
}
PropagateShapes(warpFocusTitleWindow);
- queue_up = pq;
+ Mode.queue_up = pq;
XFlush(disp);
warpFocusTitleShowing = 1;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
