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

Sun Feb 20 18:10:30 GMT 2000 

(gilbertt)

Don't kill meeeee!

;)

People keep asking for this, so I added an option to "Focus Settings",
called "Show sticky windows in focus list". Its selected by default, but if
you deselect it, your ALT+TAB list won't show sticky windows. Keeps loggers
and gkrellm etc out of it...

Feel free to revert the commit if it's inappropriate...


SVN revision: 2110
This commit is contained in:
Tom Gilbert 2000-02-20 18:16:48 +00:00
parent 62423d7e4d
commit 36de08deae
28 changed files with 178 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ChangeLog
View File

@ -4221,3 +4221,20 @@ Default behaviour is not changed, the setting is saved and loaded correctly.
*Clenches and awaits cl00batting*
-------------------------------------------------------------------------------
Sun Feb 20 18:10:30 GMT 2000
(gilbertt)
Don't kill meeeee!
;)
People keep asking for this, so I added an option to "Focus Settings",
called "Show sticky windows in focus list". Its selected by default, but if
you deselect it, your ALT+TAB list won't show sticky windows. Keeps loggers
and gkrellm etc out of it...
Feel free to revert the commit if it's inappropriate...

27
src/E.h
View File

@ -1188,6 +1188,7 @@ typedef struct _emode
char menuslide;
char menusonscreen;
char warpmenus;
char warpsticky;
char numdesktops;
char transientsfollowleader;
char switchfortransientmap;
@ -1963,12 +1964,12 @@ void IclassApplyCopy(ImageClass * iclass, Window win, int w,
/* draw.c functions */
void HandleDrawQueue(void);
char IsPropagateEwinOnQueue(EWin * ewin);
void EFillPixmap(Window win, Pixmap pmap, int x, int y,
void EFillPixmap(Window win, Pixmap pmap, int x, int y, int w,
int w, int h);
void EPastePixmap(Window win, Pixmap pmap, int x, int y,
int h);
void EPastePixmap(Window win, Pixmap pmap, int x, int y, int w,
int w, int h);
int h);
void EBlendRemoveShape(EWin * ewin, Pixmap pmap, int x, int y);
PixImg *ECreatePixImg(Window win, int w, int h);
void EDestroyPixImg(PixImg * pi);
@ -2202,9 +2203,9 @@ TextState *CreateTextState(void);
void TclassPopulate(TextClass * tclass);
void TclassApply(ImageClass * iclass, Window win, int w,
int h, int active, int sticky,
int state, char expose,
int state, char expose, TextClass * tclass,
TextClass * tclass, char *text);
char *text);
void HandleClientMessage(XEvent * ev);
void HandleFocusWindowIn(Window win);
@ -2379,8 +2380,8 @@ void ModifyCMClass(char *name,
int rnum, unsigned char *rpx,
unsigned char *rpy, int gnum,
unsigned char *gpx, unsigned char *gpy,
int bnum, unsigned char *bpx,
unsigned char *bpy);
/* config.c functions */
@ -2507,9 +2508,9 @@ Iconbox *SelectIconboxForEwin(EWin * ewin);
/* slideouts.c functions */
void SlideWindowSizeTo(Window win, int fx, int fy,
int tx, int ty,
int fw, int fh,
int fw, int fh, int tw, int th,
int tw, int th, int speed);
int speed);
Slideout *CreateSlideout(char *name, char dir);
void ShowSlideout(Slideout * s, Window win);
void HideSlideout(Slideout * s, Window w);
@ -2768,9 +2769,9 @@ void Quicksort(void **a, int l, int r,
Dialog *CreateDialog(char *name);
void DialogBindKey(Dialog * d, char *key,
void (*func) (int val, void *data),
void (*func) (int val, void *data), int val,
int val, void *data);
void *data);
void FreeDButton(DButton * db);
void FreeDialog(Dialog * d);
void DialogSetText(Dialog * d, char *text);
@ -2803,9 +2804,9 @@ void DialogItemSetPadding(DItem * di, int left, int right,
void DialogItemSetFill(DItem * di, char fill_h, char fill_v);
void DialogItemSetAlign(DItem * di, int align_h, int align_v);
void DialogRealizeItem(Dialog * d, DItem * di);
void DialogDrawItems(Dialog * d, DItem * di, int x, int y,
void DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w,
int w, int h);
int h);
void DialogItemsRealize(Dialog * d);
void DialogItemButtonSetText(DItem * di, char *text);
void DialogItemCheckButtonSetText(DItem * di, char *text);

20
src/actions.c
View File

@ -53,9 +53,10 @@ RefreshScreen(void)
attr.save_under = False;
attr.backing_store = NotUseful;
win = XCreateWindow(disp, root.win, 0, 0, root.w, root.h, 0, CopyFromParent,
CopyFromParent, CopyFromParent,
CWBackingStore | CWSaveUnder, &attr);
win =
XCreateWindow(disp, root.win, 0, 0, root.w, root.h, 0, CopyFromParent,
CopyFromParent, CopyFromParent,
CWBackingStore | CWSaveUnder, &attr);
XMapRaised(disp, win);
XDestroyWindow(disp, win);
XFlush(disp);
@ -114,12 +115,11 @@ GrabButtonGrabs(EWin * ewin)
XGrabButton(disp, button,
mod | mask_mod_combos[i],
ewin->pager->hi_win, False, mask,
GrabModeSync, GrabModeAsync,
None, None);
GrabModeSync, GrabModeAsync, None,
None);
XGrabButton(disp, button, mod | mask_mod_combos[i],
ewin->win, False, mask,
GrabModeSync, GrabModeAsync, None,
None);
ewin->win, False, mask, GrabModeSync,
GrabModeAsync, None, None);
}
}
}
@ -2537,8 +2537,8 @@ doScrollWindows(void *params)
for (i = 0; i < num; i++)
{
if ((lst[i]->desktop == desks.current) &&
(!lst[i]->sticky) && (!lst[i]->floating) &&
(!lst[i]->fixedpos))
(!lst[i]->sticky) && (!lst[i]->floating)
&& (!lst[i]->fixedpos))
MoveEwin(lst[i], lst[i]->x + x, lst[i]->y + y);
}
Efree(lst);

3
src/areas.c
View File

@ -452,8 +452,7 @@ SetCurrentArea(int ax, int ay)
lst[i]->client.w, lst[i]->client.h,
4);
else
DrawEwinShape(lst[i], mode.movemode,
x, y,
DrawEwinShape(lst[i], mode.movemode, x, y,
lst[i]->client.w, lst[i]->client.h,
0);
if (mode.flipp)

10
src/borders.c
View File

@ -268,8 +268,8 @@ void
SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty,
int num_wins, int speed)
{
int k, spd, *x = NULL, *y = NULL, min, tmpx, tmpy, tmpw,
tmph, i;
int k, spd, *x = NULL, *y =
NULL, min, tmpx, tmpy, tmpw, tmph, i;
struct timeval timev1, timev2;
int dsec, dusec;
double tm;
@ -1162,8 +1162,10 @@ CalcEwinWinpart(EWin * ewin, int i)
ewin->bits[topleft].w) >> 10) +
ewin->border->part[i].geom.topleft.x.absolute +
ewin->bits[topleft].x;
y = ((ewin->border->part[i].geom.topleft.y.percent *
ewin->bits[topleft].h) >> 10) +
y =
((ewin->
border->part[i].geom.topleft.y.percent *
ewin->bits[topleft].h) >> 10) +
ewin->border->part[i].geom.topleft.y.absolute +
ewin->bits[topleft].y;
}

4
src/buttons.c
View File

@ -92,8 +92,8 @@ CreateButton(char *name, ImageClass * iclass, ActionClass * aclass,
ECreateWindow(desks.desk[desk % ENLIGHTENMENT_CONF_NUM_DESKTOPS].win,
-100, -100, 50, 50, 0);
XSelectInput(disp, b->win,
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask |
ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask
| ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
PointerMotionMask);
b->x = -1;
b->y = -1;

1
src/conf.h
View File

@ -115,6 +115,7 @@
#define CONTROL_PAGER_TITLE 1352
#define CONTROL_RAISE_AFTER_NEXT_FOCUS 1353
#define CONTROL_DISPLAY_WARP 1354
#define CONTROL_WARPSTICKY 667
#define CONTROL_WARP_AFTER_NEXT_FOCUS 1355
#define CONTROL_PAGER_SCANSPEED 1356
#define CONTROL_ICONTEXT 1357

16
src/config.c
View File

@ -721,6 +721,9 @@ Config_Control(FILE * ConfigFile)
case CONTROL_WARPMENUS:
mode.warpmenus = i2;
break;
case CONTROL_WARPSTICKY:
mode.warpsticky = i2;
break;
case DESKTOP_HIQUALITYBG:
desks.hiqualitybg = i2;
break;
@ -1392,9 +1395,9 @@ Config_Button(FILE * ConfigFile)
char ontop = 0;
int flags = 0, minw = 1, maxw = 99999, minh = 1;
int maxh = 99999, xo = 0, yo = 0, xa = 0;
int xr = 0, ya = 0, yr = 0, xsr = 0, xsa = 0, ysr = 0,
int xr = 0, ya = 0, yr = 0, xsr = 0, xsa = 0, ysr = 0, ysa =
ysa = 0;
0;
char simg = 0;
int desk = 0;
char sticky = 0;
@ -3589,8 +3592,8 @@ FindFile(char *file)
}
Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
#else
Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
file);
Esnprintf(s, sizeof(s), "%s/config/%s",
__XOS2RedirRoot(ENLIGHTENMENT_ROOT), file);
#endif
if (isfile(s))
EDBUG_RETURN(duplicate(s));
@ -3655,8 +3658,8 @@ FindNoThemeFile(char *file)
}
Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
#else
Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
file);
Esnprintf(s, sizeof(s), "%s/config/%s",
__XOS2RedirRoot(ENLIGHTENMENT_ROOT), file);
#endif
if (isfile(s))
EDBUG_RETURN(duplicate(s));
@ -3877,6 +3880,7 @@ SaveUserControlConfig(FILE * autosavefile)
fprintf(autosavefile, "350 %i\n", (int)mode.animate_shading);
fprintf(autosavefile, "351 %i\n", (int)mode.menusonscreen);
fprintf(autosavefile, "666 %i\n", (int)mode.warpmenus);
fprintf(autosavefile, "667 %i\n", (int)mode.warpsticky);
fprintf(autosavefile, "1350 %i\n", (int)mode.user_bg);
fprintf(autosavefile, "1351 %i\n", (int)mode.pager_zoom);
fprintf(autosavefile, "1352 %i\n", (int)mode.pager_title);

4
src/dialog.c
View File

@ -1236,8 +1236,8 @@ DialogRealizeItem(Dialog * d, DItem * di)
rows = 1;
if ((cols > 0) && (rows > 0))
{
int i, *col_size, *row_size = NULL, r = 0,
c = 0, x = 0, y = 0;
int i, *col_size, *row_size = NULL, r = 0, c =
0, x = 0, y = 0;
col_size = Emalloc(sizeof(int) * cols);
row_size = Erealloc(row_size, sizeof(int));

12
src/draw.c
View File

@ -106,16 +106,16 @@ HandleDrawQueue()
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);
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);
lst[i]->h +=
(dq->y + dq->h) - (lst[i]->y + lst[i]->h);
already = 1;
i = num;
}
@ -437,8 +437,8 @@ EBlendRemoveShape(EWin * ewin, Pixmap pmap, int x, int y)
}
void
EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y,
int w, int h)
EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x,
int y, int w, int h)
{
int ox, oy;
int i, j;

15
src/evhandlers.c
View File

@ -914,8 +914,8 @@ HandleMotion(XEvent * ev)
if (!FindItem((char *)p->hi_ewin, 0,
LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
p->hi_ewin = NULL;
if ((p->hi_ewin) && (!p->hi_ewin->pager) &&
(!p->hi_ewin->fixedpos))
if ((p->hi_ewin) && (!p->hi_ewin->pager)
&& (!p->hi_ewin->fixedpos))
{
Window dw;
int px, py;
@ -1642,7 +1642,9 @@ HandleMouseDown(XEvent * ev)
if (mode.tooltips)
DoIn("TOOLTIP_TIMEOUT", mode.tiptime, ToolTipTimeout, 0, NULL);
if ((((float)(ev->xbutton.time - last_time) / 1000) < mode_double_click_time)
if (
(((float)(ev->xbutton.time - last_time) / 1000) <
mode_double_click_time)
&& ((int)(ev->xbutton.button) == (int)(last_button)))
double_click = 1;
last_time = ev->xbutton.time;
@ -2241,8 +2243,8 @@ HandleMouseUp(XEvent * ev)
XSendEvent(disp, buttons[i]->inside_win, False,
ButtonReleaseMask, ev);
mode.button = buttons[i];
if ((buttons[i]->state == STATE_CLICKED) &&
(!buttons[i]->left))
if ((buttons[i]->state == STATE_CLICKED)
&& (!buttons[i]->left))
buttons[i]->state = STATE_HILITED;
else
buttons[i]->state = STATE_NORMAL;
@ -2531,7 +2533,8 @@ HandleMouseUp(XEvent * ev)
nx = (int)ev->xbutton.x_root -
desks.desk[desks.current].x -
((int)p->hi_ewin->w / 2);
ny = (int)ev->xbutton.y_root -
ny =
(int)ev->xbutton.y_root -
desks.desk[desks.current].y -
((int)p->hi_ewin->h / 2);
GetAreaSize(&ax, &ay);

3
src/fx.c
View File

@ -61,7 +61,8 @@ static FXHandler fx_handlers[] = {
FX_Ripple_Init, FX_Ripple_Desk, FX_Ripple_Quit, FX_Ripple_Pause,
0, 0},
{"raindrops",
FX_Raindrops_Init, FX_Raindrops_Desk, FX_Raindrops_Quit, FX_Raindrops_Pause,
FX_Raindrops_Init, FX_Raindrops_Desk, FX_Raindrops_Quit,
FX_Raindrops_Pause,
0, 0},
{"waves",
FX_Waves_Init, FX_Waves_Desk, FX_Waves_Quit, FX_Waves_Pause,

4
src/icccm.c
View File

@ -1180,8 +1180,8 @@ ICCCM_SetEInfo(EWin * ewin)
c[5] = ewin->shaded;
c[6] = ewin->client.w;
c[7] = ewin->client.h;
XChangeProperty(disp, ewin->client.win, a, XA_CARDINAL, 32, PropModeReplace,
(unsigned char *)c, 9);
XChangeProperty(disp, ewin->client.win, a, XA_CARDINAL, 32,
PropModeReplace, (unsigned char *)c, 9);
XChangeProperty(disp, ewin->client.win, aa, XA_STRING, 8, PropModeReplace,
(unsigned char *)ewin->border->name,
strlen(ewin->border->name) + 1);

12
src/iclass.c
View File

@ -36,12 +36,12 @@ CreateIclass()
i->name = NULL;
i->external = 0;
i->norm.normal = i->norm.hilited = i->norm.clicked = i->norm.disabled = NULL;
i->active.normal = i->active.hilited = i->active.clicked
= i->active.disabled = NULL;
i->sticky.normal = i->sticky.hilited = i->sticky.clicked
= i->sticky.disabled = NULL;
i->sticky_active.normal = i->sticky_active.hilited
= i->sticky_active.clicked = i->sticky_active.disabled = NULL;
i->active.normal = i->active.hilited = i->active.clicked =
i->active.disabled = NULL;
i->sticky.normal = i->sticky.hilited = i->sticky.clicked =
i->sticky.disabled = NULL;
i->sticky_active.normal = i->sticky_active.hilited =
i->sticky_active.clicked = i->sticky_active.disabled = NULL;
i->padding.left = 0;
i->padding.right = 0;
i->padding.top = 0;

4
src/ipc.c
View File

@ -3434,8 +3434,8 @@ IPC_FX(char *params, Client * c)
mode.sound = 0;
lst = (SoundClass **) ListItemType(&num,
LIST_TYPE_SCLASS);
lst =
(SoundClass **) ListItemType(&num, LIST_TYPE_SCLASS);
if (lst)
{
for (i = 0; i < num; i++)

17
src/kde.c
View File

@ -363,15 +363,15 @@ KDE_AddModule(Window win)
strlen(lst[i]->client.title) + 1);
if (lst[i]->sticky)
{
if (!getSimpleHint(lst[i]->client.win,
KDE_WIN_STICKY))
if (!getSimpleHint
(lst[i]->client.win, KDE_WIN_STICKY))
setSimpleHint(lst[i]->client.win,
KDE_WIN_STICKY, 1);
}
else
{
if (getSimpleHint(lst[i]->client.win,
KDE_WIN_STICKY))
if (getSimpleHint
(lst[i]->client.win, KDE_WIN_STICKY))
setSimpleHint(lst[i]->client.win,
KDE_WIN_STICKY, 0);
}
@ -564,11 +564,10 @@ KDE_Init(void)
False);
KDE_MODULE_WIN_RAISE = XInternAtom(disp, "KWM_MODULE_WIN_RAISE", False);
KDE_MODULE_WIN_LOWER = XInternAtom(disp, "KWM_MODULE_WIN_LOWER", False);
KDE_MODULE_WIN_ACTIVATE = XInternAtom(disp, "KWM_MODULE_WIN_ACTIVATE",
False);
KDE_MODULE_WIN_ICON_CHANGE = XInternAtom(disp,
"KWM_MODULE_WIN_ICON_CHANGE",
False);
KDE_MODULE_WIN_ACTIVATE =
XInternAtom(disp, "KWM_MODULE_WIN_ACTIVATE", False);
KDE_MODULE_WIN_ICON_CHANGE =
XInternAtom(disp, "KWM_MODULE_WIN_ICON_CHANGE", False);
KDE_MODULE_DOCKWIN_ADD =
XInternAtom(disp, "KWM_MODULE_DOCKWIN_ADD", False);
KDE_MODULE_DOCKWIN_REMOVE =

18
src/menus.c
View File

@ -673,9 +673,9 @@ AddTitleToMenu(Menu * menu, char *title)
void
RealizeMenu(Menu * m)
{
int i, maxh = 0, maxw = 0, maxx1, maxx2, w, h, x, y, r,
int i, maxh = 0, maxw =
mmw, mmh;
0, maxx1, maxx2, w, h, x, y, r, mmw, mmh;
unsigned int iw, ih;
ImlibImage *im;
XSetWindowAttributes att;
@ -952,9 +952,9 @@ DrawMenuItem(Menu * m, MenuItem * mi, char shape)
}
if ((m->style->tclass) && (mi->text))
{
TextDraw(m->style->tclass, mi->pmap[(int)(mi->state)], 0, 0, mi->state,
mi->text, mi->text_x, mi->text_y, mi->text_w, mi->text_h, 17,
m->style->tclass->justification);
TextDraw(m->style->tclass, mi->pmap[(int)(mi->state)], 0, 0,
mi->state, mi->text, mi->text_x, mi->text_y, mi->text_w,
mi->text_h, 17, m->style->tclass->justification);
}
if (mi->text)
{
@ -1090,8 +1090,8 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibImage *im2;
ImlibColor icl;
char tile = 1, keep_asp = 0;
int width, height, scalex = 0,
scaley = 0;
int width, height, scalex =
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
int maxw = 48, maxh = 48;
int justx = 512, justy = 512;
@ -1323,8 +1323,8 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibImage *im2;
ImlibColor icl;
char tile = 1, keep_asp = 0;
int width, height, scalex = 0,
scaley = 0;
int width, height, scalex =
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
int maxw = 48, maxh = 48;

8
src/pager.c
View File

@ -28,8 +28,8 @@ static void PagerUpdateTimeout(int val, void *data);
#define SNAP mode.pager_snap
void
PagerScaleLine(Pixmap dest, Window src, int dx, int dy, int sw, int pw, int sy,
int sh)
PagerScaleLine(Pixmap dest, Window src, int dx, int dy, int sw, int pw,
int sy, int sh)
{
static GC gc = 0;
XGCValues gcv;
@ -213,8 +213,8 @@ PagerScaleLine(Pixmap dest, Window src, int dx, int dy, int sw, int pw, int sy,
}
void
PagerScaleRect(Pixmap dest, Window src, int sx, int sy, int dx, int dy, int sw,
int sh, int dw, int dh)
PagerScaleRect(Pixmap dest, Window src, int sx, int sy, int dx, int dy,
int sw, int sh, int dw, int dh)
{
static GC gc = 0, gc2 = 0;
XGCValues gcv;

27
src/settings.c
View File

@ -324,6 +324,7 @@ static char tmp_warp_focus;
static char tmp_warp_after_focus;
static char tmp_raise_after_focus;
static char tmp_display_warp;
static char tmp_warpsticky;
static char tmp_clickalways;
static void CB_ConfigureFocus(int val, void *data);
@ -342,6 +343,7 @@ CB_ConfigureFocus(int val, void *data)
mode.warp_after_next_focus = tmp_warp_after_focus;
mode.raise_after_next_focus = tmp_raise_after_focus;
mode.display_warp = tmp_display_warp;
mode.warpsticky = tmp_warpsticky;
#endif /* WITH_TARTY_WARP */
mode.clickalways = tmp_clickalways;
FixFocus();
@ -374,6 +376,7 @@ SettingsFocus(void)
tmp_raise_after_focus = mode.raise_after_next_focus;
tmp_warp_after_focus = mode.warp_after_next_focus;
tmp_display_warp = mode.display_warp;
tmp_warpsticky = mode.warpsticky;
#endif /* WITH_TARTY_WARP */
tmp_clickalways = mode.clickalways;
@ -502,6 +505,14 @@ SettingsFocus(void)
DialogItemCheckButtonSetState(di, tmp_display_warp);
DialogItemCheckButtonSetPtr(di, &tmp_display_warp);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Include sticky windows in focus list"));
DialogItemCheckButtonSetState(di, tmp_warpsticky);
DialogItemCheckButtonSetPtr(di, &tmp_warpsticky);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
@ -2750,8 +2761,8 @@ BGSettingsGoTo(Background * bg)
CB_DesktopMiniDisplayRedraw(0, bg_mini_disp);
BG_RedrawView(0);
for (x = 0; x < 10; x++)
DialogDrawItems(bg_sel_dialog, tmp_w[x],
0, 0, 99999, 99999);
DialogDrawItems(bg_sel_dialog, tmp_w[x], 0, 0, 99999,
99999);
Efree(bglist);
tmp_bg_selected = -1;
return;
@ -3908,8 +3919,8 @@ SettingsGroups(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_BORDER,
&(tmp_cfg.set_border));
DialogItemSetCallback(di, &GroupFeatureChangeCallback,
GROUP_FEATURE_BORDER, &(tmp_cfg.set_border));
DialogItemCheckButtonSetText(di, _("Changing Border Style"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].set_border);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.set_border));
@ -3918,8 +3929,8 @@ SettingsGroups(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_ICONIFY,
&(tmp_cfg.iconify));
DialogItemSetCallback(di, &GroupFeatureChangeCallback,
GROUP_FEATURE_ICONIFY, &(tmp_cfg.iconify));
DialogItemCheckButtonSetText(di, _("Iconifying"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].iconify);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.iconify));
@ -3978,8 +3989,8 @@ SettingsGroups(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_MIRROR,
&(tmp_cfg.mirror));
DialogItemSetCallback(di, &GroupFeatureChangeCallback,
GROUP_FEATURE_MIRROR, &(tmp_cfg.mirror));
DialogItemCheckButtonSetText(di, _("Mirror Shade/Iconify/Stick"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].mirror);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.mirror));

11
src/setup.c
View File

@ -556,6 +556,7 @@ SetupX()
mode.display_warp = 0;
#endif /* WITH_TARTY_WARP */
mode.warp_on_next_focus = 0;
mode.warpsticky = 1;
mode.edge_flip_resistance = 15;
mode.context_ewin = NULL;
mode.moveresize_pending_ewin = NULL;
@ -806,9 +807,9 @@ MakeExtInitWin(void)
attr.background_pixel = 0;
attr.save_under = True;
win = XCreateWindow(d2, root.win, 0, 0, root.w, root.h, 0, root.depth,
InputOutput, root.vis, CWOverrideRedirect | CWSaveUnder |
CWBackingStore | CWColormap | CWBackPixel |
CWBorderPixel, &attr);
InputOutput, root.vis,
CWOverrideRedirect | CWSaveUnder | CWBackingStore |
CWColormap | CWBackPixel | CWBorderPixel, &attr);
pmap = ECreatePixmap(d2, win, root.w, root.h, root.depth);
gcv.subwindow_mode = IncludeInferiors;
gc = XCreateGC(d2, win, GCSubwindowMode, &gcv);
@ -898,8 +899,8 @@ MakeExtInitWin(void)
pmap = Imlib_move_image(imd, im);
mask = Imlib_move_mask(imd, im);
Imlib_destroy_image(imd, im);
EShapeCombineMask(d2, w2, ShapeBounding, 0, 0,
mask, ShapeSet);
EShapeCombineMask(d2, w2, ShapeBounding, 0, 0, mask,
ShapeSet);
ESetWindowBackgroundPixmap(d2, w2, pmap);
Imlib_free_pixmap(imd, pmap);
XClearWindow(d2, w2);

32
src/size.c
View File

@ -69,8 +69,8 @@ MaxHeight(EWin * ewin, char *resize_type)
if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1))
y1 = lst[i]->y + lst[i]->h;
else if (((y + h) <= lst[i]->y) &&
(y2 >= lst[i]->y))
else if (((y + h) <= lst[i]->y)
&& (y2 >= lst[i]->y))
y2 = lst[i]->y;
}
}
@ -112,8 +112,8 @@ MaxHeight(EWin * ewin, char *resize_type)
if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1))
y1 = lst[i]->y + lst[i]->h;
else if (((y + h) <= lst[i]->y) &&
(y2 >= lst[i]->y))
else if (((y + h) <= lst[i]->y)
&& (y2 >= lst[i]->y))
y2 = lst[i]->y;
}
}
@ -190,8 +190,8 @@ MaxWidth(EWin * ewin, char *resize_type)
if (((lst[i]->x + lst[i]->w) <= x) &&
((lst[i]->x + lst[i]->w) >= x1))
x1 = lst[i]->x + lst[i]->w;
else if (((x + w) <= lst[i]->x) &&
(x2 >= lst[i]->x))
else if (((x + w) <= lst[i]->x)
&& (x2 >= lst[i]->x))
x2 = lst[i]->x;
}
}
@ -233,8 +233,8 @@ MaxWidth(EWin * ewin, char *resize_type)
if (((lst[i]->x + lst[i]->w) <= x) &&
((lst[i]->x + lst[i]->w) >= x1))
x1 = lst[i]->x + lst[i]->w;
else if (((x + w) <= lst[i]->x) &&
(x2 >= lst[i]->x))
else if (((x + w) <= lst[i]->x)
&& (x2 >= lst[i]->x))
x2 = lst[i]->x;
}
}
@ -317,8 +317,8 @@ MaxSize(EWin * ewin, char *resize_type)
if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1))
y1 = lst[i]->y + lst[i]->h;
else if (((y + h) <= lst[i]->y) &&
(y2 >= lst[i]->y))
else if (((y + h) <= lst[i]->y)
&& (y2 >= lst[i]->y))
y2 = lst[i]->y;
}
}
@ -337,8 +337,8 @@ MaxSize(EWin * ewin, char *resize_type)
if (((lst[i]->x + lst[i]->w) <= x) &&
((lst[i]->x + lst[i]->w) >= x1))
x1 = lst[i]->x + lst[i]->w;
else if (((x + w) <= lst[i]->x) &&
(x2 >= lst[i]->x))
else if (((x + w) <= lst[i]->x)
&& (x2 >= lst[i]->x))
x2 = lst[i]->x;
}
}
@ -386,8 +386,8 @@ MaxSize(EWin * ewin, char *resize_type)
if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1))
y1 = lst[i]->y + lst[i]->h;
else if (((y + h) <= lst[i]->y) &&
(y2 >= lst[i]->y))
else if (((y + h) <= lst[i]->y)
&& (y2 >= lst[i]->y))
y2 = lst[i]->y;
}
}
@ -406,8 +406,8 @@ MaxSize(EWin * ewin, char *resize_type)
if (((lst[i]->x + lst[i]->w) <= x) &&
((lst[i]->x + lst[i]->w) >= x1))
x1 = lst[i]->x + lst[i]->w;
else if (((x + w) <= lst[i]->x) &&
(x2 >= lst[i]->x))
else if (((x + w) <= lst[i]->x)
&& (x2 >= lst[i]->x))
x2 = lst[i]->x;
}
}

8
src/snaps.c
View File

@ -940,8 +940,8 @@ LoadSnapInfo(void)
if ((res_w - sn->w) <= 0)
sn->x = 0;
else
sn->x = (sn->x * (root.w - sn->w)) /
(res_w - sn->w);
sn->x =
(sn->x * (root.w - sn->w)) / (res_w - sn->w);
}
else
{
@ -956,8 +956,8 @@ LoadSnapInfo(void)
if ((res_h - sn->h) <= 0)
sn->y = 0;
else
sn->y = (sn->y * (root.h - sn->h)) /
(res_h - sn->h);
sn->y =
(sn->y * (root.h - sn->h)) / (res_h - sn->h);
}
else
{

8
src/tclass.c
View File

@ -33,10 +33,10 @@ CreateTclass()
EDBUG_RETURN(NULL);
t->name = NULL;
t->norm.normal = t->norm.hilited = t->norm.clicked = t->norm.disabled = NULL;
t->active.normal = t->active.hilited = t->active.clicked
= t->active.disabled = NULL;
t->sticky.normal = t->sticky.hilited = t->sticky.clicked
= t->sticky.disabled = NULL;
t->active.normal = t->active.hilited = t->active.clicked =
t->active.disabled = NULL;
t->sticky.normal = t->sticky.hilited = t->sticky.clicked =
t->sticky.disabled = NULL;
t->sticky_active.normal = t->sticky_active.hilited =
t->sticky_active.clicked = t->sticky_active.disabled = NULL;
t->justification = 512;

4
src/theme.c
View File

@ -30,8 +30,8 @@ extern char *__XOS2RedirRoot(const char *);
char *
append_merge_dir(char *dir, char ***list, int *count)
{
char s[FILEPATH_LEN_MAX], ss[FILEPATH_LEN_MAX], **str = NULL,
*def = NULL;
char s[FILEPATH_LEN_MAX], ss[FILEPATH_LEN_MAX], **str =
NULL, *def = NULL;
char already, *tmp, *tmp2, ok;
int i, j, num;

6
src/tooltips.c
View File

@ -24,9 +24,9 @@
#include "conf.h"
ToolTip *
CreateToolTip(char *name, ImageClass * ic0, ImageClass * ic1, ImageClass * ic2,
ImageClass * ic3, ImageClass * ic4, TextClass * tclass,
int dist, ImageClass * tooltippic)
CreateToolTip(char *name, ImageClass * ic0, ImageClass * ic1,
ImageClass * ic2, ImageClass * ic3, ImageClass * ic4,
TextClass * tclass, int dist, ImageClass * tooltippic)
{
ToolTip *tt;

13
src/ttfont.c
View File

@ -134,8 +134,8 @@ calc_size(Efont * f, int *width, int *height, char *text)
}
static void
render_text(TT_Raster_Map * rmap, TT_Raster_Map * rchr, Efont * f, char *text,
int *xor, int *yor)
render_text(TT_Raster_Map * rmap, TT_Raster_Map * rchr, Efont * f,
char *text, int *xor, int *yor)
{
TT_Glyph_Metrics metrics;
TT_Instance_Metrics imetrics;
@ -467,8 +467,8 @@ handle_x_error(Display * d, XErrorEvent * ev)
}
void
EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
Efont * font, Visual * vis, Colormap cm)
EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y,
char *text, Efont * font, Visual * vis, Colormap cm)
{
XImage *xim;
XShmSegmentInfo shminfo;
@ -500,8 +500,9 @@ EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
x_error = 0;
is_pixmap = 1;
EGetGeometry(disp, win, &chld, &rx, &rx,
(unsigned int *)&xatt.width, (unsigned int *)&xatt.height,
(unsigned int *)&rx, (unsigned int *)&xatt.depth);
(unsigned int *)&xatt.width,
(unsigned int *)&xatt.height, (unsigned int *)&rx,
(unsigned int *)&xatt.depth);
XFlush(disp);
if (x_error)
{

7
src/warp.c
View File

@ -141,8 +141,11 @@ WarpFocus(int delta)
(ewin->x + ewin->w > 0) && (ewin->x < root.w) &&
(ewin->y + ewin->h > 0) && (ewin->y < root.h) &&
(!ewin->skipfocus) && (!ewin->shaded) &&
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
* (ewin->client.mwm_decor_border) */
(!ewin->menu) && (!ewin->pager) &&
!(ewin->sticky && !mode.warpsticky) &&
(!ewin->ibox) && (!ewin->iconified)
/*&& (ewin->client.mwm_decor_title) &&
* (ewin->client.mwm_decor_border) */
)
AddItem(ewin, "", 0, LIST_TYPE_WARP_RING);
}

3
src/x.c
View File

@ -40,8 +40,7 @@ EFreePixmap(Display * display, Pixmap pixmap)
XFreePixmap(display, pixmap);
}
Window
ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
Window ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
{
EXID *xid;
Window win;