Compare commits

...

6 Commits

Author SHA1 Message Date
e7cf0ce701 systemd-logind command insteat off elogind 2021-06-29 20:34:32 +02:00
03724032ff more hotkeys 2021-02-04 09:33:53 +01:00
cd360851b3 more desktops 2021-01-24 13:42:16 +01:00
d0299fe6f4 updated upstream 2020-11-22 13:30:02 +01:00
473053afbb screenshot hotkey 2020-11-22 13:27:36 +01:00
61bb8b2241 Fix x coordinate calculation in buttonpress. 2020-08-21 16:13:22 +02:00
2 changed files with 43 additions and 12 deletions

View File

@ -1,5 +1,6 @@
/* See LICENSE file for copyright and license details. */
#include <string.h>
#include <X11/XF86keysym.h>
/* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
@ -20,7 +21,7 @@ static const char *colors[][3] = {
};
/* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "dc", "KP", "m", "g", "rss", "t", "w" };
static const Rule rules[] = {
/* xprop(1):
@ -29,11 +30,19 @@ static const Rule rules[] = {
*/
/* class instance title tags mask isfloating isterminal noswallow monitor */
{ "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
//{ "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
{"KeePassXC",NULL, NULL, 1 << 8, 0, 0, 0, -1},
{NULL, "noSwallow",NULL, 0, 0, 0, 1, -1},
{NULL, NULL, "newsboat", 1 << 11, 0, 0, 0, -1},
{NULL, NULL, "vimpc", 1 << 9, 0, 0, 0, -1},
{NULL, NULL, "Discord Updater",1 << 7, 0, 0, 0, -1},
{NULL, NULL, "Discord", 1 << 7, 0, 0, 0, -1},
{ "St", NULL, NULL, 0, 0, 1, 0, -1 },
{"MultiMC5", NULL, NULL, 1 << 10, 0, 0, 0, -1},
{"Minecraft", "Minecraft", NULL, 1 << 10, 0, 0, 0, -1},
{NULL, NULL, "Steam", 1 << 10, 1, 0, 0, -1},
{"Steam", NULL, NULL, 1 << 10, 1, 0, 0, -1},
{ "St", NULL, NULL, 0, 0, 1, 0, -1},
{"Microsoft Teams - Preview", NULL, NULL, 1 << 12, 0, 0, 0, -1},
{"Rambox", NULL, NULL, 1 << 13, 0, 0, 0, -1},
};
/* layout(s) */
@ -61,15 +70,22 @@ static const Layout layouts[] = {
/* 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 *dmenucmd[] = { "dmenu", "-i", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
static char dmenucmdstr[256] = "--dmenu=\"";
static const char *j4_dmenu_desktopcmd[] = {"j4-dmenu-desktop", dmenucmdstr, NULL};
static const char *termcmd[] = { "st", NULL };
static const char *termcmd[] = { "st", "-f", "Liberation Mono:size=10.5", NULL };
static const char *firefoxcmd[] = {"firefox", NULL};
static const char *sleepcmd[] = {"loginctl", "suspend", NULL};
static const char *shutdowncmd[] = {"loginctl", "poweroff", NULL};
static const char *lockcmd[] = {"loginctl", "lock-session", NULL};
static const char *rebootcmd[] = {"loginctl", "reboot", NULL};
static const char *sleepcmd[] = {"systemctl", "suspend", NULL};
static const char *shutdowncmd[] = {"systemctl", "poweroff", NULL};
static const char *lockcmd[] = {"systemctl", "lock-session", NULL};
static const char *rebootcmd[] = {"systemctl", "reboot", NULL};
static const char *screenshotcmd[] = {"screenshot", NULL};
static const char *mpcTogglecmd[] = {"mpc", "toggle", NULL};
static const char *mpcNextcmd[] = {"mpc", "next", NULL};
static const char *mpcPrevcmd[] = {"mpc", "prev", NULL};
static const char *mpcBegincmd[] = {"mpc", "seek", "0", NULL};
static const char *droidcamTogglecmd[] = {"droidcamToggle", NULL};
static const char *dummycmd[] = {"echo", "-n", NULL};
static Key keys[] = {
/* modifier key function argument */
@ -80,6 +96,14 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_h, spawn, {.v = shutdowncmd}},
{ MODKEY|ShiftMask, XK_l, spawn, {.v = lockcmd}},
{ MODKEY|ShiftMask, XK_r, spawn, {.v = rebootcmd}},
{ MODKEY, XK_s, spawn, {.v = screenshotcmd}},
{ 0, XF86XK_AudioPlay,spawn, {.v = mpcTogglecmd}},
{ 0, XF86XK_AudioNext,spawn, {.v = mpcNextcmd}},
{ 0, XF86XK_AudioPrev,spawn, {.v = mpcPrevcmd}},
{ 0, XF86XK_AudioStop,spawn, {.v = mpcBegincmd}},
{ MODKEY, XK_x, spawn, {.v = droidcamTogglecmd}},
{ MODKEY, XK_odiaeresis, spawn, {.v = dummycmd}},
{ MODKEY, XK_m, spawn, {.v = dummycmd}},
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
@ -108,8 +132,13 @@ static Key keys[] = {
TAGKEYS( XK_5, 4)
TAGKEYS( XK_6, 5)
TAGKEYS( XK_7, 6)
TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8)
TAGKEYS( XK_e, 7)
TAGKEYS( XK_w, 8)
TAGKEYS( XK_y, 9)
TAGKEYS( XK_g, 10)
TAGKEYS( XK_u, 11)
TAGKEYS( XK_z, 12)
TAGKEYS( XK_a, 13)
{ MODKEY|ShiftMask, XK_q, quit, {0} },
};
@ -129,10 +158,12 @@ static Button buttons[] = {
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
};
#include <stdio.h>
void config_start() {
for (unsigned i = 0; dmenucmd[i] != NULL; ++i) {
strcat(dmenucmdstr, dmenucmd[i]);
strcat(dmenucmdstr, "\" \"");
}
dmenucmdstr[strlen(dmenucmdstr) - 2] = '\0';
//printf("%s\n", dmenucmdstr);
}

2
dwm.c
View File

@ -510,7 +510,7 @@ buttonpress(XEvent *e)
arg.ui = 1 << i;
} else if (ev->x < x + blw)
click = ClkLtSymbol;
else if (ev->x > selmon->ww - TEXTW(stext))
else if (ev->x > selmon->ww - (int)TEXTW(stext))
click = ClkStatusText;
else
click = ClkWinTitle;