e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move global queue_up to Mode struct. 

SVN revision: 9665
This commit is contained in:
Kim Woelders 2004-04-09 12:59:56 +00:00
parent 8559aa14be
commit 6eb7db0cff
19 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/E.h
View File

@ -1242,6 +1242,8 @@ typedef struct
EConf;
/* State parameters */
#define DRAW_QUEUE_ENABLE 1
typedef struct
{
struct
@ -1299,6 +1301,7 @@ typedef struct
Window last_bpress;
int last_button;
Time last_time;
char queue_up;
}
EMode;
@ -2785,8 +2788,6 @@ extern Window init_win_ext;
#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;

6
src/actions.c
View File

@ -2619,13 +2619,13 @@ doBackgroundSet(EWin * edummy, const void *params)
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();

60
src/borders.c
View File

@ -563,11 +563,11 @@ AddToFamily(Window win)
/* 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 @@ AddToFamily(Window win)
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 @@ AddToFamily(Window win)
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 @@ AddToFamily(Window win)
}
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 @@ AddInternalToFamily(Window win, const char *bname, int type, void *ptr,
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 @@ CalcEwinSizes(EWin * ewin)
{
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 @@ InstantShadeEwin(EWin * ewin, int force)
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 @@ InstantShadeEwin(EWin * ewin, int force)
break;
}
PropagateShapes(ewin->win);
queue_up = pq;
Mode.queue_up = pq;
HintsSetWindowState(ewin);
if (Mode.mode == MODE_NONE)
{
@ -2447,8 +2447,8 @@ InstantUnShadeEwin(EWin * ewin)
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 @@ InstantUnShadeEwin(EWin * ewin)
break;
}
PropagateShapes(ewin->win);
queue_up = pq;
Mode.queue_up = pq;
HintsSetWindowState(ewin);
if (Mode.mode == MODE_NONE)
{
@ -2535,8 +2535,8 @@ ShadeEwin(EWin * ewin)
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 @@ ShadeEwin(EWin * ewin)
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 @@ UnShadeEwin(EWin * ewin)
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 @@ UnShadeEwin(EWin * ewin)
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)
{

6
src/coords.c
View File

@ -97,11 +97,11 @@ SetCoords(EWin * ewin)
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;
}

14
src/dialog.c
View File

@ -680,8 +680,8 @@ ShowDialog(Dialog * d)
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 @@ ShowDialog(Dialog * d)
XSync(disp, False);
DialogRedraw(d);
queue_up = pq;
Mode.queue_up = pq;
}
void
@ -1622,7 +1622,7 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h)
{
int state;
if (queue_up)
if (Mode.queue_up)
{
DrawQueue *dq;
@ -1811,10 +1811,10 @@ DialogItemsRealize(Dialog * d)
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;
}

14
src/draw.c
View File

@ -50,8 +50,8 @@ HandleDrawQueue()
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 @@ HandleDrawQueue()
Efree(lst);
}
queue_up = p_queue;
Mode.queue_up = p_queue;
EDBUG_RETURN_;
}
@ -1382,8 +1382,8 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
}
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 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
}
done:
queue_up = pq;
Mode.queue_up = pq;
EDBUG_RETURN_;
}
@ -1816,7 +1816,7 @@ PropagateShapes(Window win)
XWindowAttributes att;
EDBUG(6, "PropagateShapes");
if (queue_up)
if (Mode.queue_up)
{
DrawQueue *dq;

1
src/globals.c
View File

@ -51,7 +51,6 @@ Window init_win2 = 0;
Window init_win_ext = 0;
char themepath[FILEPATH_LEN_MAX];
char queue_up;
char no_overwrite = 0;
char clickmenu = 0;
int child_count = 0;

2
src/iclass.c
View File

@ -729,7 +729,7 @@ IclassApply(ImageClass * iclass, Window win, int w, int h, int active,
if ((w < 0) || (h < 0))
EDBUG_RETURN_;
if (queue_up)
if (Mode.queue_up)
{
DrawQueue *dq;

12
src/iconify.c
View File

@ -584,8 +584,8 @@ IconboxShow(Iconbox * ib)
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 @@ IconboxShow(Iconbox * ib)
ShowEwin(ewin);
}
queue_up = pq;
Mode.queue_up = pq;
}
void
@ -2058,8 +2058,8 @@ IconboxRedraw(Iconbox * ib)
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 @@ IconboxRedraw(Iconbox * ib)
ICCCM_GetShapeInfo(ib->ewin);
PropagateShapes(ib->ewin->win);
queue_up = pq;
Mode.queue_up = pq;
}
static void

18
src/ipc.c
View File

@ -1425,12 +1425,12 @@ IPC_TextClass(const char *params, Client * c)
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 @@ IPC_ImageClass(const char *params, Client * c)
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 @@ IPC_ImageClass(const char *params, Client * c)
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); ??? */

6
src/main.c
View File

@ -275,9 +275,9 @@ main(int argc, char **argv)
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 @@ main(int argc, char **argv)
/* 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)

12
src/menus.c
View File

@ -752,8 +752,8 @@ MenuRealize(Menu * m)
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 @@ MenuRealize(Menu * m)
}
EResizeWindow(disp, m->win, mmw, mmh);
queue_up = pq;
Mode.queue_up = pq;
EDBUG_RETURN_;
}
@ -866,8 +866,8 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape)
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 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape)
if ((shape) && (m->style->use_item_bg))
PropagateShapes(m->win);
queue_up = pq;
Mode.queue_up = pq;
EDBUG_RETURN_;
}

4
src/moveresize.c
View File

@ -271,7 +271,7 @@ ActionResizeStart(EWin * ewin, const void *params, int hv)
FX_Pause();
GrabX();
}
queue_up = 0;
Mode.queue_up = 0;
SoundPlay("SOUND_RESIZE_START");
UnGrabTheButtons();
GrabConfineThePointer(root.win);
@ -347,7 +347,7 @@ ActionResizeEnd(EWin * ewin)
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,

28
src/pager.c
View File

@ -212,12 +212,12 @@ PagerCreate(void)
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 @@ PagerEwinMoveResize(EWin * ewin, int resize)
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 @@ PagerEwinMoveResize(EWin * ewin, int resize)
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 @@ PagerShow(Pager * p)
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 @@ PagerShow(Pager * p)
AddItem(p, "PAGER", p->win, LIST_TYPE_PAGER);
}
queue_up = pq;
Mode.queue_up = pq;
}
void
@ -602,7 +602,7 @@ PagerRedraw(Pager * p, char newbg)
if (!Conf.pagers.enable || Mode.mode == MODE_DESKSWITCH)
return;
if (queue_up)
if (Mode.queue_up)
{
DrawQueue *dq;
@ -771,7 +771,7 @@ PagerForceUpdate(Pager * p)
if (!Conf.pagers.enable || Mode.mode == MODE_DESKSWITCH)
return;
if (queue_up)
if (Mode.queue_up)
{
DrawQueue *dq;
@ -1124,7 +1124,7 @@ PagerShowHi(Pager * p, EWin * ewin, int x, int y, int w, int h)
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 @@ PagerShowHi(Pager * p, EWin * ewin, int x, int y, int w, int h)
{
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 @@ PagerShowHi(Pager * p, EWin * ewin, int x, int y, int w, int h)
p->hi_ewin = ewin;
done:
queue_up = pq;
Mode.queue_up = pq;
}
static void

12
src/progress.c
View File

@ -93,13 +93,13 @@ SetProgressbar(Progressbar * p, int progress)
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 @@ ShowProgressbar(Progressbar * p)
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 @@ ShowProgressbar(Progressbar * p)
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_;
}

6
src/startup.c
View File

@ -211,11 +211,11 @@ CreateStartupDisplay(char start)
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)

2
src/tclass.c
View File

@ -197,7 +197,7 @@ TclassApply(ImageClass * iclass, Window win, int w, int h, int active,
if ((!iclass) || (!tclass) || (!win) || (w < 1) || (h < 1))
EDBUG_RETURN_;
if (queue_up)
if (Mode.queue_up)
{
DrawQueue *dq;

6
src/tooltips.c
View File

@ -125,8 +125,8 @@ ShowToolTip(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
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 @@ ShowToolTip(ToolTip * tt, const char *text, ActionClass * ac, int x, int y)
}
}
queue_up = pq;
Mode.queue_up = pq;
tt->visible = 1;
if (heights)
Efree(heights);

6
src/warp.c
View File

@ -185,8 +185,8 @@ WarpFocusShowTitle(EWin * ewin)
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 @@ WarpFocusShowTitle(EWin * ewin)
}
PropagateShapes(warpFocusTitleWindow);
queue_up = pq;
Mode.queue_up = pq;
XFlush(disp);
warpFocusTitleShowing = 1;
}