Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Pontus Stenetorp
|
5687f46964 | |
Hiltjo Posthuma
|
061e9fe9a7 |
70
config.def.h
70
config.def.h
|
|
@ -5,9 +5,8 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
|||
static const unsigned int snap = 32; /* snap pixel */
|
||||
static const int showbar = 1; /* 0 means no bar */
|
||||
static const int topbar = 1; /* 0 means bottom bar */
|
||||
static const int focusonwheel = 0;
|
||||
static const char *fonts[] = { "Liberation Sans:style=regular:size=11:antialias=true:autohint=true", "Font Awesome 5 Free:size=11:antialias=true:autohint=true" };
|
||||
static const char dmenufont[] = "Liberation Mono:size=11";
|
||||
static const char *fonts[] = { "monospace:size=10" };
|
||||
static const char dmenufont[] = "monospace:size=10";
|
||||
static const char col_gray1[] = "#222222";
|
||||
static const char col_gray2[] = "#444444";
|
||||
static const char col_gray3[] = "#bbbbbb";
|
||||
|
|
@ -20,7 +19,7 @@ static const char *colors[][3] = {
|
|||
};
|
||||
|
||||
/* tagging */
|
||||
static const char *tags[] = { "", "", "", "", "", "", "7", "8", "" };
|
||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||
|
||||
static const Rule rules[] = {
|
||||
/* xprop(1):
|
||||
|
|
@ -29,24 +28,9 @@ static const Rule rules[] = {
|
|||
*/
|
||||
/* class instance title tags mask isfloating monitor */
|
||||
{ "Gimp", NULL, NULL, 0, 1, -1 },
|
||||
{ "Pale moon", "Navigator", NULL, 2, 0, -1 },
|
||||
{ "Pale moon", "Browser", NULL, 2, 1, -1 },
|
||||
{ "Pale moon", "Places", NULL, 2, 1, -1 },
|
||||
{ "Pale moon", "Toplevel", NULL, 2, 1, -1 },
|
||||
{ "Pale moon", "Devtools", NULL, 2, 1, -1 },
|
||||
{ "Pale moon", "DTA", NULL, 2, 1, -1 },
|
||||
{ "Pale moon", "Global", NULL, 2, 1, -1 },
|
||||
{ "Chromium-browser-chromium", "chromium-browser-chromium", NULL, 1<<5, 0, -1 },
|
||||
{ "TelegramDesktop", "telegram-desktop", "Media viewer", 0, 1, -1 },
|
||||
{ "TelegramDesktop", "telegram-desktop", NULL, 4, 0, -1 },
|
||||
{ "keepassxc", "KeePassXC", NULL, 0, 1, -1 },
|
||||
{ "mpv", NULL, NULL, 1<<3, 0, -1 },
|
||||
{ "floatalsamxr", NULL, NULL, 0, 1, -1 },
|
||||
{ "QjackCtl", "qjackctl", NULL, 0, 1, -1 },
|
||||
{ "Nextcloud", "nextcloud", NULL, 0, 1, -1 },
|
||||
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
|
||||
};
|
||||
|
||||
#include "layouts.c"
|
||||
/* layout(s) */
|
||||
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||
static const int nmaster = 1; /* number of clients in master area */
|
||||
|
|
@ -58,11 +42,10 @@ static const Layout layouts[] = {
|
|||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
{ "HHH", grid },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
#define MODKEY Mod4Mask
|
||||
#define MODKEY Mod1Mask
|
||||
#define TAGKEYS(KEY,TAG) \
|
||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
|
|
@ -72,44 +55,15 @@ static const Layout layouts[] = {
|
|||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||
|
||||
#include <X11/XF86keysym.h>
|
||||
|
||||
/* commands */
|
||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||
static const char *termcmd[] = { "st", NULL };
|
||||
/* alsa volume control */
|
||||
static const char *alsacmd[] = { "st", "-c", "floatalsamxr", "-e", "alsamixer", NULL };
|
||||
static const char *upvol[] = { "amixer", "set", "Master", "2+", NULL };
|
||||
static const char *downvol[] = { "amixer", "set", "Master", "2-", NULL };
|
||||
/* alsa muting/unmuting */
|
||||
static const char *mute[] = { "amixer", "-q", "set", "Master", "toggle", NULL };
|
||||
/* screenshot tools */
|
||||
static const char *scrallcmd[] = { "/home/celso/sources/scripts/prtscr/prtscra.sh", NULL };
|
||||
static const char *scrcurcmd[] = { "/home/celso/sources/scripts/prtscr/prtscrcr.sh", NULL };
|
||||
static const char *scrselcmd[] = { "/home/celso/sources/scripts/prtscr/prtscrsel.sh", NULL };
|
||||
/* browsers */
|
||||
static const char *palemooncmd[] = { "palemoon", NULL };
|
||||
static const char *chromiumcmd[] = { "chromium", NULL };
|
||||
static const char *nextcloudcmd[] = { "nextcloud", NULL };
|
||||
static const char *xfecmd[] = { "xfe", NULL };
|
||||
static const char *keepassxccmd[] = { "keepassxc", NULL };
|
||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||
static const char *termcmd[] = { "st", NULL };
|
||||
|
||||
static const Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||
{ 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol } },
|
||||
{ 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } },
|
||||
{ 0, XF86XK_AudioMute, spawn, {.v = mute } },
|
||||
{ 0, XK_Print, spawn, {.v = scrallcmd } },
|
||||
{ ShiftMask, XK_Print, spawn, {.v = scrcurcmd } },
|
||||
{ ControlMask, XK_Print, spawn, {.v = scrselcmd } },
|
||||
{ MODKEY, XK_s, spawn, {.v = palemooncmd } },
|
||||
{ MODKEY, XK_n, spawn, {.v = nextcloudcmd } },
|
||||
{ MODKEY, XK_c, spawn, {.v = chromiumcmd } },
|
||||
{ MODKEY|ShiftMask, XK_x, spawn, {.v = xfecmd } },
|
||||
{ MODKEY, XK_x, spawn, {.v = keepassxccmd } },
|
||||
{ MODKEY, XK_b, togglebar, {0} },
|
||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||
|
|
@ -123,7 +77,6 @@ static const Key keys[] = {
|
|||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY, XK_g, setlayout, {.v = &layouts[3]} },
|
||||
{ MODKEY, XK_space, setlayout, {0} },
|
||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
|
|
@ -132,14 +85,6 @@ static const Key keys[] = {
|
|||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||
{ MODKEY|ControlMask, XK_l, movekeyboard_x, {.i = 20}},
|
||||
{ MODKEY|ControlMask, XK_h, movekeyboard_x, {.i = -20}},
|
||||
{ MODKEY|ControlMask, XK_j, movekeyboard_y, {.i = 20}},
|
||||
{ MODKEY|ControlMask, XK_k, movekeyboard_y, {.i = -20}},
|
||||
{ MODKEY, XK_Right, viewnext, {0} },
|
||||
{ MODKEY, XK_Left, viewprev, {0} },
|
||||
{ MODKEY|ShiftMask, XK_Right, tagtonext, {0} },
|
||||
{ MODKEY|ShiftMask, XK_Left, tagtoprev, {0} },
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
|
|
@ -160,7 +105,6 @@ static const Button buttons[] = {
|
|||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||
{ ClkStatusText, 0, Button1, spawn, {.v = alsacmd } },
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
# dwm version
|
||||
VERSION = 6.4
|
||||
VERSION = 6.5
|
||||
|
||||
# Customize below to fit your system
|
||||
|
||||
# paths
|
||||
PREFIX = /usr
|
||||
PREFIX = /usr/local
|
||||
MANPREFIX = ${PREFIX}/share/man
|
||||
|
||||
X11INC = /usr/include/X11
|
||||
X11LIB = /usr/lib64
|
||||
X11INC = /usr/X11R6/include
|
||||
X11LIB = /usr/X11R6/lib
|
||||
|
||||
# Xinerama, comment if you don't want it
|
||||
XINERAMALIBS = -lXinerama
|
||||
|
|
|
|||
275
dwm.c
275
dwm.c
|
|
@ -163,6 +163,7 @@ static void detachstack(Client *c);
|
|||
static Monitor *dirtomon(int dir);
|
||||
static void drawbar(Monitor *m);
|
||||
static void drawbars(void);
|
||||
static void enternotify(XEvent *e);
|
||||
static void expose(XEvent *e);
|
||||
static void focus(Client *c);
|
||||
static void focusin(XEvent *e);
|
||||
|
|
@ -181,13 +182,10 @@ static void manage(Window w, XWindowAttributes *wa);
|
|||
static void mappingnotify(XEvent *e);
|
||||
static void maprequest(XEvent *e);
|
||||
static void monocle(Monitor *m);
|
||||
static void motionnotify(XEvent *e);
|
||||
static void movemouse(const Arg *arg);
|
||||
static void movekeyboard_x(const Arg *arg);
|
||||
static void movekeyboard_y(const Arg *arg);
|
||||
static unsigned int nexttag(void);
|
||||
static Client *nexttiled(Client *c);
|
||||
static void pop(Client *c);
|
||||
static unsigned int prevtag(void);
|
||||
static void propertynotify(XEvent *e);
|
||||
static void quit(const Arg *arg);
|
||||
static Monitor *recttomon(int x, int y, int w, int h);
|
||||
|
|
@ -210,8 +208,6 @@ static void showhide(Client *c);
|
|||
static void spawn(const Arg *arg);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void tagtonext(const Arg *arg);
|
||||
static void tagtoprev(const Arg *arg);
|
||||
static void tile(Monitor *m);
|
||||
static void togglebar(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
|
|
@ -231,8 +227,6 @@ static void updatetitle(Client *c);
|
|||
static void updatewindowtype(Client *c);
|
||||
static void updatewmhints(Client *c);
|
||||
static void view(const Arg *arg);
|
||||
static void viewnext(const Arg *arg);
|
||||
static void viewprev(const Arg *arg);
|
||||
static Client *wintoclient(Window w);
|
||||
static Monitor *wintomon(Window w);
|
||||
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||
|
|
@ -255,11 +249,13 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|||
[ConfigureRequest] = configurerequest,
|
||||
[ConfigureNotify] = configurenotify,
|
||||
[DestroyNotify] = destroynotify,
|
||||
[EnterNotify] = enternotify,
|
||||
[Expose] = expose,
|
||||
[FocusIn] = focusin,
|
||||
[KeyPress] = keypress,
|
||||
[MappingNotify] = mappingnotify,
|
||||
[MapRequest] = maprequest,
|
||||
[MotionNotify] = motionnotify,
|
||||
[PropertyNotify] = propertynotify,
|
||||
[UnmapNotify] = unmapnotify
|
||||
};
|
||||
|
|
@ -430,23 +426,16 @@ buttonpress(XEvent *e)
|
|||
|
||||
click = ClkRootWin;
|
||||
/* focus monitor if necessary */
|
||||
if ((m = wintomon(ev->window)) && m != selmon
|
||||
&& (focusonwheel || (ev->button != Button4 && ev->button != Button5))) {
|
||||
if ((m = wintomon(ev->window)) && m != selmon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
if (ev->window == selmon->barwin) {
|
||||
i = x = 0;
|
||||
unsigned int occ = 0;
|
||||
for(c = m->clients; c; c=c->next)
|
||||
occ |= c->tags;
|
||||
do {
|
||||
/* Do not reserve space for vacant tags */
|
||||
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
|
||||
continue;
|
||||
do
|
||||
x += TEXTW(tags[i]);
|
||||
} while (ev->x >= x && ++i < LENGTH(tags));
|
||||
while (ev->x >= x && ++i < LENGTH(tags));
|
||||
if (i < LENGTH(tags)) {
|
||||
click = ClkTagBar;
|
||||
arg.ui = 1 << i;
|
||||
|
|
@ -457,8 +446,8 @@ buttonpress(XEvent *e)
|
|||
else
|
||||
click = ClkWinTitle;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
if (focusonwheel || (ev->button != Button4 && ev->button != Button5))
|
||||
focus(c);
|
||||
focus(c);
|
||||
restack(selmon);
|
||||
XAllowEvents(dpy, ReplayPointer, CurrentTime);
|
||||
click = ClkClientWin;
|
||||
}
|
||||
|
|
@ -732,12 +721,13 @@ drawbar(Monitor *m)
|
|||
}
|
||||
x = 0;
|
||||
for (i = 0; i < LENGTH(tags); i++) {
|
||||
/* Do not draw vacant tags */
|
||||
if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
|
||||
continue;
|
||||
w = TEXTW(tags[i]);
|
||||
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
|
||||
if (occ & 1 << i)
|
||||
drw_rect(drw, x + boxs, boxs, boxw, boxw,
|
||||
m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
|
||||
urg & 1 << i);
|
||||
x += w;
|
||||
}
|
||||
w = TEXTW(m->ltsymbol);
|
||||
|
|
@ -767,6 +757,25 @@ drawbars(void)
|
|||
drawbar(m);
|
||||
}
|
||||
|
||||
void
|
||||
enternotify(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
XCrossingEvent *ev = &e->xcrossing;
|
||||
|
||||
if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
|
||||
return;
|
||||
c = wintoclient(ev->window);
|
||||
m = c ? c->mon : wintomon(ev->window);
|
||||
if (m != selmon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
selmon = m;
|
||||
} else if (!c || c == selmon->sel)
|
||||
return;
|
||||
focus(c);
|
||||
}
|
||||
|
||||
void
|
||||
expose(XEvent *e)
|
||||
{
|
||||
|
|
@ -1116,6 +1125,23 @@ monocle(Monitor *m)
|
|||
resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
||||
}
|
||||
|
||||
void
|
||||
motionnotify(XEvent *e)
|
||||
{
|
||||
static Monitor *mon = NULL;
|
||||
Monitor *m;
|
||||
XMotionEvent *ev = &e->xmotion;
|
||||
|
||||
if (ev->window != root)
|
||||
return;
|
||||
if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
mon = m;
|
||||
}
|
||||
|
||||
void
|
||||
movemouse(const Arg *arg)
|
||||
{
|
||||
|
|
@ -1176,115 +1202,6 @@ movemouse(const Arg *arg)
|
|||
}
|
||||
}
|
||||
|
||||
unsigned int
|
||||
nexttag(void)
|
||||
{
|
||||
unsigned int seltag = selmon->tagset[selmon->seltags];
|
||||
unsigned int usedtags = 0;
|
||||
Client *c = selmon->clients;
|
||||
|
||||
if (!c)
|
||||
return seltag;
|
||||
|
||||
/* skip vacant tags */
|
||||
do {
|
||||
usedtags |= c->tags;
|
||||
c = c->next;
|
||||
} while (c);
|
||||
|
||||
do {
|
||||
seltag = seltag == (1 << (LENGTH(tags) - 1)) ? 1 : seltag << 1;
|
||||
} while (!(seltag & usedtags));
|
||||
|
||||
return seltag;
|
||||
}
|
||||
|
||||
void
|
||||
movekeyboard_x(const Arg *arg){
|
||||
int ocx, ocy, nx, ny;
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
|
||||
if (!(c = selmon->sel))
|
||||
return;
|
||||
|
||||
if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
|
||||
return;
|
||||
|
||||
restack(selmon);
|
||||
|
||||
ocx = c->x;
|
||||
ocy = c->y;
|
||||
|
||||
nx = ocx + arg->i;
|
||||
ny = ocy;
|
||||
|
||||
if (abs(selmon->wx - nx) < snap)
|
||||
nx = selmon->wx;
|
||||
else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
|
||||
nx = selmon->wx + selmon->ww - WIDTH(c);
|
||||
|
||||
if (abs(selmon->wy - ny) < snap)
|
||||
ny = selmon->wy;
|
||||
else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
|
||||
ny = selmon->wy + selmon->wh - HEIGHT(c);
|
||||
|
||||
if (!c->isfloating)
|
||||
togglefloating(NULL);
|
||||
|
||||
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
||||
resize(c, nx, ny, c->w, c->h, 1);
|
||||
|
||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||
sendmon(c, m);
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
movekeyboard_y(const Arg *arg){
|
||||
int ocx, ocy, nx, ny;
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
|
||||
if (!(c = selmon->sel))
|
||||
return;
|
||||
|
||||
if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
|
||||
return;
|
||||
|
||||
restack(selmon);
|
||||
|
||||
ocx = c->x;
|
||||
ocy = c->y;
|
||||
|
||||
nx = ocx;
|
||||
ny = ocy + arg->i;
|
||||
|
||||
if (abs(selmon->wx - nx) < snap)
|
||||
nx = selmon->wx;
|
||||
else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
|
||||
nx = selmon->wx + selmon->ww - WIDTH(c);
|
||||
|
||||
if (abs(selmon->wy - ny) < snap)
|
||||
ny = selmon->wy;
|
||||
else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
|
||||
ny = selmon->wy + selmon->wh - HEIGHT(c);
|
||||
|
||||
if (!c->isfloating)
|
||||
togglefloating(NULL);
|
||||
|
||||
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
||||
resize(c, nx, ny, c->w, c->h, 1);
|
||||
|
||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||
sendmon(c, m);
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
Client *
|
||||
nexttiled(Client *c)
|
||||
{
|
||||
|
|
@ -1301,28 +1218,6 @@ pop(Client *c)
|
|||
arrange(c->mon);
|
||||
}
|
||||
|
||||
unsigned int
|
||||
prevtag(void)
|
||||
{
|
||||
unsigned int seltag = selmon->tagset[selmon->seltags];
|
||||
unsigned int usedtags = 0;
|
||||
Client *c = selmon->clients;
|
||||
if (!c)
|
||||
return seltag;
|
||||
|
||||
/* skip vacant tags */
|
||||
do {
|
||||
usedtags |= c->tags;
|
||||
c = c->next;
|
||||
} while (c);
|
||||
|
||||
do {
|
||||
seltag = seltag == 1 ? (1 << (LENGTH(tags) - 1)) : seltag >> 1;
|
||||
} while (!(seltag & usedtags));
|
||||
|
||||
return seltag;
|
||||
}
|
||||
|
||||
void
|
||||
propertynotify(XEvent *e)
|
||||
{
|
||||
|
|
@ -1406,14 +1301,9 @@ void
|
|||
resizemouse(const Arg *arg)
|
||||
{
|
||||
int ocx, ocy, nw, nh;
|
||||
int ocx2, ocy2, nx, ny;
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
XEvent ev;
|
||||
int horizcorner, vertcorner;
|
||||
int di;
|
||||
unsigned int dui;
|
||||
Window dummy;
|
||||
Time lasttime = 0;
|
||||
|
||||
if (!(c = selmon->sel))
|
||||
|
|
@ -1423,18 +1313,10 @@ resizemouse(const Arg *arg)
|
|||
restack(selmon);
|
||||
ocx = c->x;
|
||||
ocy = c->y;
|
||||
ocx2 = c->x + c->w;
|
||||
ocy2 = c->y + c->h;
|
||||
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||||
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
||||
return;
|
||||
if (!XQueryPointer (dpy, c->win, &dummy, &dummy, &di, &di, &nx, &ny, &dui))
|
||||
return;
|
||||
horizcorner = nx < c->w / 2;
|
||||
vertcorner = ny < c->h / 2;
|
||||
XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
|
||||
horizcorner ? (-c->bw) : (c->w + c->bw -1),
|
||||
vertcorner ? (-c->bw) : (c->h + c->bw -1));
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||
do {
|
||||
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
||||
switch(ev.type) {
|
||||
|
|
@ -1448,11 +1330,8 @@ resizemouse(const Arg *arg)
|
|||
continue;
|
||||
lasttime = ev.xmotion.time;
|
||||
|
||||
nx = horizcorner ? ev.xmotion.x : c->x;
|
||||
ny = vertcorner ? ev.xmotion.y : c->y;
|
||||
nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
|
||||
nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
|
||||
|
||||
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
||||
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
||||
if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
|
||||
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
||||
{
|
||||
|
|
@ -1461,13 +1340,11 @@ resizemouse(const Arg *arg)
|
|||
togglefloating(NULL);
|
||||
}
|
||||
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
||||
resize(c, nx, ny, nw, nh, 1);
|
||||
resize(c, c->x, c->y, nw, nh, 1);
|
||||
break;
|
||||
}
|
||||
} while (ev.type != ButtonRelease);
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
|
||||
horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||||
vertcorner ? (-c->bw) : (c->h + c->bw - 1));
|
||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||
XUngrabPointer(dpy, CurrentTime);
|
||||
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||
|
|
@ -1807,36 +1684,6 @@ tagmon(const Arg *arg)
|
|||
sendmon(selmon->sel, dirtomon(arg->i));
|
||||
}
|
||||
|
||||
void
|
||||
tagtonext(const Arg *arg)
|
||||
{
|
||||
unsigned int tmp;
|
||||
|
||||
if (selmon->sel == NULL)
|
||||
return;
|
||||
|
||||
if ((tmp = nexttag()) == selmon->tagset[selmon->seltags])
|
||||
return;
|
||||
|
||||
tag(&(const Arg){.ui = tmp });
|
||||
view(&(const Arg){.ui = tmp });
|
||||
}
|
||||
|
||||
void
|
||||
tagtoprev(const Arg *arg)
|
||||
{
|
||||
unsigned int tmp;
|
||||
|
||||
if (selmon->sel == NULL)
|
||||
return;
|
||||
|
||||
if ((tmp = prevtag()) == selmon->tagset[selmon->seltags])
|
||||
return;
|
||||
|
||||
tag(&(const Arg){.ui = tmp });
|
||||
view(&(const Arg){.ui = tmp });
|
||||
}
|
||||
|
||||
void
|
||||
tile(Monitor *m)
|
||||
{
|
||||
|
|
@ -2004,7 +1851,7 @@ updatebarpos(Monitor *m)
|
|||
}
|
||||
|
||||
void
|
||||
updateclientlist()
|
||||
updateclientlist(void)
|
||||
{
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
|
|
@ -2215,18 +2062,6 @@ view(const Arg *arg)
|
|||
arrange(selmon);
|
||||
}
|
||||
|
||||
void
|
||||
viewnext(const Arg *arg)
|
||||
{
|
||||
view(&(const Arg){.ui = nexttag()});
|
||||
}
|
||||
|
||||
void
|
||||
viewprev(const Arg *arg)
|
||||
{
|
||||
view(&(const Arg){.ui = prevtag()});
|
||||
}
|
||||
|
||||
Client *
|
||||
wintoclient(Window w)
|
||||
{
|
||||
|
|
|
|||
27
layouts.c
27
layouts.c
|
|
@ -1,27 +0,0 @@
|
|||
void
|
||||
grid(Monitor *m) {
|
||||
unsigned int i, n, cx, cy, cw, ch, aw, ah, cols, rows;
|
||||
Client *c;
|
||||
|
||||
for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next))
|
||||
n++;
|
||||
|
||||
/* grid dimensions */
|
||||
for(rows = 0; rows <= n/2; rows++)
|
||||
if(rows*rows >= n)
|
||||
break;
|
||||
cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
|
||||
|
||||
/* window geoms (cell height/width) */
|
||||
ch = m->wh / (rows ? rows : 1);
|
||||
cw = m->ww / (cols ? cols : 1);
|
||||
for(i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
|
||||
cx = m->wx + (i / rows) * cw;
|
||||
cy = m->wy + (i % rows) * ch;
|
||||
/* adjust height/width of last row/column's windows */
|
||||
ah = ((i + 1) % rows == 0) ? m->wh - ch * rows : 0;
|
||||
aw = (i >= rows * (cols - 1)) ? m->ww - cw * cols : 0;
|
||||
resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue