Compare commits
No commits in common. "master" and "5.8" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
||||||
/compile_commands.json
|
|
||||||
/build
|
|
||||||
/.cache
|
|
||||||
68
.hgtags
Normal file
68
.hgtags
Normal file
|
|
@ -0,0 +1,68 @@
|
||||||
|
d31b5ad96b0ba7b5b0a30928fcf000428339a577 0.1
|
||||||
|
0a6472e2203994bc5738d40a340d26f7ec9d6062 0.2
|
||||||
|
7e66082e5092fb0bccd18a3695a0bec52c80fdb2 0.3
|
||||||
|
eb3165734f00fe7f7da8aeebaed00e60a57caac9 0.4
|
||||||
|
22213b9a2114167ee8ba019a012e27da0422a61a 0.5
|
||||||
|
c11f86db4550cac5d0a648a3fe4d6d3b9a4fcf7e 0.6
|
||||||
|
3fb41412e2492f66476d92ce8f007a8b48fb1d2a 0.7
|
||||||
|
cd15de32e173f8ce97bfe1c9b6607937b59056b4 0.8
|
||||||
|
fae61afa861755636c4a1070694209ace8efbb6c 0.9
|
||||||
|
bbc98e77ae89a7c9232a5be0835f60ea00d8036e 1.0
|
||||||
|
44a55e6e46bf6c231780b09d919977d6f01083de 1.1
|
||||||
|
e3179ce2b90451d2807cd53b589d768412b8666b 1.2
|
||||||
|
f5f5cbf016a94b48a8fe9c47f0736e96d166d5d4 1.3
|
||||||
|
3cff9403766bf83a9fc2a0aef230115d68de2a8e 1.4
|
||||||
|
728c9089b079721b43c3347124639a29baa22a97 1.5
|
||||||
|
ad3fa2d185426c51fd5deceae809770363f8d33c 1.6
|
||||||
|
4dbdb61c8b8ce21dee5c7050a6b103855964ed20 1.7
|
||||||
|
d5ad819f2a66a40fa75dd2e44429f3bfc884d07b 1.7.1
|
||||||
|
c71952fa3c7ca848ec38a6923b5c6d0e18fff431 1.8
|
||||||
|
a5567a0d30112822db2627a04a2e7aa3b6c38148 1.9
|
||||||
|
12deea36603da407e3f32640048846a3bd74a9ec 2.0
|
||||||
|
a2c465098a3b972bbed00feda9804b6aae1e9531 2.1
|
||||||
|
7e92f58754ae6edb3225f26d754bd89c1ff458cf 2.2
|
||||||
|
719b37b37b0df829d7cf017ac70e353088fe5849 2.3
|
||||||
|
32b246925086910d63147483160281a91a47479f 2.4
|
||||||
|
dcbbfabc8ecc5f33a6cc950584de87da1a368045 2.5
|
||||||
|
c7f84f23ec5aef29988dcdc4ec22a7352ee8f58e 2.5.1
|
||||||
|
5308dd22b6ee8e3218c81d9e7e4125f235bb5778 2.6
|
||||||
|
21951c0dfbae5af68ed77821a4d87253ee91803f 2.7
|
||||||
|
107719a9ce3bd0c79f9f1f626596eb338a276561 2.8
|
||||||
|
3a5910fac3ccb522a98aeeba7af7008530b25092 2.9
|
||||||
|
76b58d21ea98257c05565a3b9c850b9b26a32968 3.0
|
||||||
|
e1c8bef05e6e48df4f26471ea0712aa43ab9d949 3.1
|
||||||
|
4ce65f61f01b055fa6c2901c6d2527ef741aa4bf 3.2
|
||||||
|
f2cabc83a18f9b5b548159329ddd4dee904fa31f 3.2.1
|
||||||
|
d3876aa792923f9a95f7ad0c7f0134533404df35 3.2.2
|
||||||
|
0f91934037b04221ff5d1ba3a6c39c1ff26e3661 3.3
|
||||||
|
9ede7b2d2450537e750d5505789fbe63960e97e6 3.4
|
||||||
|
63ad05e7f9e1f4f1881fb02f529cb6c6ae81e693 3.5
|
||||||
|
75b1b25fe0d7e29400baf30568153f668324928b 3.6
|
||||||
|
20ec6976cee1fcfee0c2f354ae382ee3f9f68efa 3.6.1
|
||||||
|
baee494346e520f8dee2cee9491b8350064770d2 3.7
|
||||||
|
2ea201354cf016407ea93e1e390d1422940d29b0 3.8
|
||||||
|
55478328b2422c700c5404a774c85e77322f41a3 3.9
|
||||||
|
018c3846842291cb6c009dc087e7fe2f0ef53bea 4.0
|
||||||
|
00f4180df72b49aadb2933804fde4bfb33e5666d 4.1
|
||||||
|
c13cb8c6b7a56af74cc88346e71d2490470b546f 4.2
|
||||||
|
e0ec0d5d8b1ef3ee04a83c7c0fee5853aa2ac6a6 4.3
|
||||||
|
408014d2126153d2b0fce26a13ba707db222b7b9 4.4
|
||||||
|
7c117df5d202530e85066d8b1ab02cef605c79ad 4.4.1
|
||||||
|
2acc60d6dfe28c101a8cd44a8aa710a38ae3607c 4.5
|
||||||
|
bcd7e18e196a00cc2e97ff3a4a58f3cdaba13856 4.6
|
||||||
|
d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
|
||||||
|
607015ddb091d49cbd3457af41713691aa69f4d6 4.8
|
||||||
|
22c669b2dd3673785c3476b9976da21e8783f745 4.9
|
||||||
|
06eb9644e2dad7667d97495eb7d7bc62aa0429e8 5.0
|
||||||
|
ce355cea9bb89e162f61913737a46908cdfa7e45 5.1
|
||||||
|
e4bcaca8e6ef13d2c3b81f1218ad15e5da4d68bd 5.2
|
||||||
|
4004d61160355d869a7d2672561caad440751ba0 5.3
|
||||||
|
335301ed102fec9b1a15d06bfa0184d53b38fa54 5.3.1
|
||||||
|
8b7836a471f8f9ee61bec980df00971888d76343 5.4
|
||||||
|
85a78d8afa0fe8b106a8223b5327e5bddb5dd5e3 5.4.1
|
||||||
|
deaa276abac17ca08fbeb936916e4c8292d293a4 5.5
|
||||||
|
5550702215773aad462f22a774dced9b87437c51 5.6
|
||||||
|
e47a47bd3ed42fd3cf023572147b75ebc2adef82 5.6.1
|
||||||
|
257403d4cd962cac03344a871ea56cc742bae38e 5.7
|
||||||
|
48c3f87c335d6606e55fbae97267fa6b39ca56e0 5.7.1
|
||||||
|
15761ac5e2f1e9010900f891616a24a22d82f128 5.7.2
|
||||||
97
BUGS
Normal file
97
BUGS
Normal file
|
|
@ -0,0 +1,97 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
18:17 < Biolunar> when i change my resolution in dwm (to a smaller one) and then back to the native, the top bar is not repainted. that's since 5.7.2, in 5.6 it worked fine
|
||||||
|
18:19 < Biolunar> is it just happening to me or a (known) bug?
|
||||||
|
18:24 < Biolunar> and in addition, mplayers fullscreen is limited to the small resolution after i changed it back to the native
|
||||||
|
|
||||||
|
reproducible with xrandr -s but not with --output and --mode, strange
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
> enternotify is handled even when the entered window is already focused
|
||||||
|
> (eg moving the mouse to the bar and back, scrolling on the border..)
|
||||||
|
>
|
||||||
|
> focusing might be expensive for some clients (eg dim/light up)
|
||||||
|
>
|
||||||
|
> a possible solution is to modify enternotify:
|
||||||
|
>
|
||||||
|
> + c = wintoclient(ev->window);
|
||||||
|
> if((m = wintomon(ev->window)) && m != selmon) {
|
||||||
|
> unfocus(selmon->sel);
|
||||||
|
> selmon = m;
|
||||||
|
> }
|
||||||
|
> + else if (c == selmon->sel || c == NULL)
|
||||||
|
> + return;
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
> another corner case:
|
||||||
|
|
||||||
|
a tiled client can be resized with mod+right click, but it only works
|
||||||
|
on the main monitor
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
dmenu appears on the monitor where the pointer is and not on selmon
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
yet another corner case:
|
||||||
|
open a terminal, focus another monitor, but without moving the mouse
|
||||||
|
pointer there
|
||||||
|
if there is no client on the other monitor to get the focus, then the
|
||||||
|
terminal will be unfocused but it will accept input
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Donald Allen reported this:
|
||||||
|
|
||||||
|
starting emacs from dmenu in archlinux results in missing configure of emacs, but mod1-space or mod1-shift-space fix this problem. this problem is new and did not happen in 1.6 xorg servers
|
||||||
|
|
||||||
|
Starting emacs from xterm doesnt show this problem, he uses tag 8 for emacs
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
2009/12/7 Alexandr Krylovskiy <wing_AT_tversu.ru>:
|
||||||
|
> Fullscreen mode with flash applications (youtube, for example) doesn't
|
||||||
|
> work properly neither in tiled nor in floating mode.
|
||||||
|
> Fullscreen window closes immediately after opening.
|
||||||
|
|
||||||
|
This is a known bug (for some curiosity I received the same report via
|
||||||
|
privmail from 2 other people within one week, really strange).
|
||||||
|
The quick fix is commenting out the code in lines 817/818 in hg tip
|
||||||
|
dwm. I cannot confirm this has no side effects (I think it does) and I
|
||||||
|
will address this issue shortly with a real fix.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
SDL seems to not like non-reparenting WMs:
|
||||||
|
|
||||||
|
> I would like to mention SDL problems, however SDL is not crucial to
|
||||||
|
> me anymore; people that really care about it should speak up and
|
||||||
|
> propose dwm / SDL patch or cooperation scheme in that matter.
|
||||||
|
|
||||||
|
Patching SDL, bugging them?
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
voltaic reports this:
|
||||||
|
|
||||||
|
When I use two monitors, one larger in resolution than the other, the
|
||||||
|
bar is drawn using the smaller x-dimension on both screens. I think
|
||||||
|
what's happening is that there are two bars drawn, but the short bar
|
||||||
|
is always on top of the long bar such that I can't see the information
|
||||||
|
under the short bar. If I switch to the small screen, hide the short
|
||||||
|
bar, and then switch to the large screen, the long bar is drawn
|
||||||
|
correctly.
|
||||||
|
|
||||||
|
A similar problem occurs when I have started dwm on a small resolution
|
||||||
|
monitor (laptop screen) and then I switch to a large external display.
|
||||||
|
When I do this, the bar itself is drawn for the original smaller
|
||||||
|
resolution, but the information to be printed on the bar is
|
||||||
|
right-aligned for a longer bar. So what I see is a bar that has the
|
||||||
|
right hand side of it cut-off. See attached screenshot.
|
||||||
|
|
||||||
|
I am using standard options for xrandr such as --output VGA1 --auto, etc.
|
||||||
|
|
||||||
|
---
|
||||||
17
LICENSE
17
LICENSE
|
|
@ -1,23 +1,16 @@
|
||||||
MIT/X Consortium License
|
MIT/X Consortium License
|
||||||
|
|
||||||
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
|
© 2006-2010 Anselm R Garbe <anselm@garbe.us>
|
||||||
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
|
|
||||||
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
||||||
© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
|
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
|
||||||
|
© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
|
||||||
© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
|
© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
|
||||||
© 2007-2009 Christof Musik <christof at sendfax dot de>
|
© 2007-2009 Christof Musik <christof at sendfax dot de>
|
||||||
© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
|
|
||||||
© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
|
© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
|
||||||
|
© 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
|
||||||
© 2008 Martin Hurton <martin dot hurton at gmail dot com>
|
© 2008 Martin Hurton <martin dot hurton at gmail dot com>
|
||||||
© 2008 Neale Pickett <neale dot woozle dot org>
|
© 2008 Neale Pickett <neale dot woozle dot org>
|
||||||
© 2009 Mate Nagy <mnagy at port70 dot net>
|
© 2009 Mate Nagy <mnagy@port70.net>
|
||||||
© 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
|
|
||||||
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
|
|
||||||
© 2011 Christoph Lohmann <20h@r-36.net>
|
|
||||||
© 2015-2016 Quentin Rameau <quinq@fifth.space>
|
|
||||||
© 2015-2016 Eric Pruitt <eric.pruitt@gmail.com>
|
|
||||||
© 2016-2017 Markus Teich <markus.teich@stusta.mhn.de>
|
|
||||||
© 2020-2022 Chris Down <chris@chrisdown.name>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
copy of this software and associated documentation files (the "Software"),
|
copy of this software and associated documentation files (the "Software"),
|
||||||
|
|
|
||||||
68
Makefile
68
Makefile
|
|
@ -3,36 +3,58 @@
|
||||||
|
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
SRC = drw.c dwm.c util.c
|
SRC = dwm.c
|
||||||
OBJ = $(patsubst %.c,build/obj/%.c.o,$(SRC))
|
OBJ = ${SRC:.c=.o}
|
||||||
|
|
||||||
all: build/dwm compile_commands.json
|
all: options dwm
|
||||||
|
|
||||||
build/obj/%.c.o: %.c
|
options:
|
||||||
mkdir -p $(dir $@)
|
@echo dwm build options:
|
||||||
${CC} -c ${CFLAGS} -o $@ $<
|
@echo "CFLAGS = ${CFLAGS}"
|
||||||
|
@echo "LDFLAGS = ${LDFLAGS}"
|
||||||
|
@echo "CC = ${CC}"
|
||||||
|
|
||||||
build/dwm: ${OBJ}
|
.c.o:
|
||||||
${CC} -o $@ ${OBJ} ${LDFLAGS}
|
@echo CC $<
|
||||||
|
@${CC} -c ${CFLAGS} $<
|
||||||
|
|
||||||
|
${OBJ}: config.h config.mk
|
||||||
|
|
||||||
|
config.h:
|
||||||
|
@echo creating $@ from config.def.h
|
||||||
|
@cp config.def.h $@
|
||||||
|
|
||||||
|
dwm: ${OBJ}
|
||||||
|
@echo CC -o $@
|
||||||
|
@${CC} -o $@ ${OBJ} ${LDFLAGS}
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
|
@echo cleaning
|
||||||
|
@rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
|
||||||
|
|
||||||
|
dist: clean
|
||||||
|
@echo creating dist tarball
|
||||||
|
@mkdir -p dwm-${VERSION}
|
||||||
|
@cp -R LICENSE Makefile README config.def.h config.mk \
|
||||||
|
dwm.1 ${SRC} dwm-${VERSION}
|
||||||
|
@tar -cf dwm-${VERSION}.tar dwm-${VERSION}
|
||||||
|
@gzip dwm-${VERSION}.tar
|
||||||
|
@rm -rf dwm-${VERSION}
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
||||||
cp -f build/dwm ${DESTDIR}${PREFIX}/bin
|
@mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||||
chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
|
@cp -f dwm ${DESTDIR}${PREFIX}/bin
|
||||||
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
|
||||||
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
|
||||||
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||||
cp dwm.desktop /usr/share/xsessions/dwm.desktop
|
@sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||||
|
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/dwm \
|
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
|
||||||
${DESTDIR}${MANPREFIX}/man1/dwm.1 \
|
@rm -f ${DESTDIR}${PREFIX}/bin/dwm
|
||||||
/usr/share/xsessions/dwm.desktop
|
@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
|
||||||
|
@rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||||
|
|
||||||
compile_commands.json:
|
.PHONY: all options clean dist install uninstall
|
||||||
compiledb -n make
|
|
||||||
|
|
||||||
.PHONY: all clean dist install uninstall
|
|
||||||
|
|
|
||||||
8
README
8
README
|
|
@ -18,6 +18,9 @@ necessary as root):
|
||||||
|
|
||||||
make clean install
|
make clean install
|
||||||
|
|
||||||
|
If you are going to use the default bluegray color scheme it is highly
|
||||||
|
recommended to also install the bluegray files shipped in the dextra package.
|
||||||
|
|
||||||
|
|
||||||
Running dwm
|
Running dwm
|
||||||
-----------
|
-----------
|
||||||
|
|
@ -35,9 +38,10 @@ the DISPLAY environment variable is set correctly, e.g.:
|
||||||
In order to display status info in the bar, you can do something
|
In order to display status info in the bar, you can do something
|
||||||
like this in your .xinitrc:
|
like this in your .xinitrc:
|
||||||
|
|
||||||
while xsetroot -name "`date` `uptime | sed 's/.*,//'`"
|
while true
|
||||||
do
|
do
|
||||||
sleep 1
|
xsetroot -name "`date` `uptime | sed 's/.*,//'`"
|
||||||
|
sleep 1
|
||||||
done &
|
done &
|
||||||
exec dwm
|
exec dwm
|
||||||
|
|
||||||
|
|
|
||||||
102
config.def.h
Normal file
102
config.def.h
Normal file
|
|
@ -0,0 +1,102 @@
|
||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/* appearance */
|
||||||
|
static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
|
||||||
|
static const char normbordercolor[] = "#cccccc";
|
||||||
|
static const char normbgcolor[] = "#cccccc";
|
||||||
|
static const char normfgcolor[] = "#000000";
|
||||||
|
static const char selbordercolor[] = "#0066ff";
|
||||||
|
static const char selbgcolor[] = "#0066ff";
|
||||||
|
static const char selfgcolor[] = "#ffffff";
|
||||||
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
static const Bool showbar = True; /* False means no bar */
|
||||||
|
static const Bool topbar = True; /* False means bottom bar */
|
||||||
|
|
||||||
|
/* tagging */
|
||||||
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||||
|
|
||||||
|
static const Rule rules[] = {
|
||||||
|
/* class instance title tags mask isfloating monitor */
|
||||||
|
{ "Gimp", NULL, NULL, 0, True, -1 },
|
||||||
|
{ "Firefox", NULL, NULL, 1 << 8, False, -1 },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* layout(s) */
|
||||||
|
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||||
|
static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
|
||||||
|
|
||||||
|
static const Layout layouts[] = {
|
||||||
|
/* symbol arrange function */
|
||||||
|
{ "[]=", tile }, /* first entry is default */
|
||||||
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
|
{ "[M]", monocle },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* key definitions */
|
||||||
|
#define MODKEY Mod1Mask
|
||||||
|
#define TAGKEYS(KEY,TAG) \
|
||||||
|
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||||
|
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||||
|
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||||
|
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
||||||
|
|
||||||
|
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||||
|
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||||
|
|
||||||
|
/* commands */
|
||||||
|
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
|
||||||
|
static const char *termcmd[] = { "uxterm", NULL };
|
||||||
|
|
||||||
|
static Key keys[] = {
|
||||||
|
/* modifier key function argument */
|
||||||
|
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
||||||
|
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||||
|
{ MODKEY, XK_b, togglebar, {0} },
|
||||||
|
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||||
|
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||||
|
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
||||||
|
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
||||||
|
{ MODKEY, XK_Return, zoom, {0} },
|
||||||
|
{ MODKEY, XK_Tab, view, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
||||||
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
||||||
|
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
||||||
|
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||||
|
TAGKEYS( XK_1, 0)
|
||||||
|
TAGKEYS( XK_2, 1)
|
||||||
|
TAGKEYS( XK_3, 2)
|
||||||
|
TAGKEYS( XK_4, 3)
|
||||||
|
TAGKEYS( XK_5, 4)
|
||||||
|
TAGKEYS( XK_6, 5)
|
||||||
|
TAGKEYS( XK_7, 6)
|
||||||
|
TAGKEYS( XK_8, 7)
|
||||||
|
TAGKEYS( XK_9, 8)
|
||||||
|
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* button definitions */
|
||||||
|
/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||||
|
static Button buttons[] = {
|
||||||
|
/* click event mask button function argument */
|
||||||
|
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||||
|
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||||
|
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||||
|
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||||
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||||
|
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||||
|
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||||
|
{ ClkTagBar, 0, Button1, view, {0} },
|
||||||
|
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||||
|
};
|
||||||
|
|
||||||
162
config.h
162
config.h
|
|
@ -1,162 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#ifndef _H_DWM_CONF
|
|
||||||
#define _H_DWM_CONF
|
|
||||||
|
|
||||||
#include "dwm.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
const int startwithgaps[] = { 1 }; /* 1 means gaps are used by default, this can be customized for each tag */
|
|
||||||
const unsigned int gappx[] = { 10 }; /* default gap between windows in pixels, this can be customized for each tag */
|
|
||||||
const unsigned int snap = 32; /* snap pixel */
|
|
||||||
const int showbar = 1; /* 0 means no bar */
|
|
||||||
const int topbar = 0; /* 0 means bottom bar */
|
|
||||||
const char *fonts[] = { "monospace:size=10" };
|
|
||||||
const char dmenufont[] = "monospace:size=10";
|
|
||||||
|
|
||||||
const char* THEME_BW[][3] = {
|
|
||||||
[SchemeNorm] = {"#aaaaaa", "#181818", "#181818"},
|
|
||||||
[SchemeSel] = {"#aaaaaa", "#3f3f3f", "#3f3f3f"},
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
const char* THEME_DEFAULT[][3] = {
|
|
||||||
/* text inactive tag/status bar border */
|
|
||||||
[SchemeNorm] = { "#bbbbbb", "#222222", "#444444" },
|
|
||||||
/* text active tag/middle bar border*/
|
|
||||||
[SchemeSel] = { "#eeeeee", "#005577", "#005577" },
|
|
||||||
};
|
|
||||||
|
|
||||||
#define colors THEME_BW
|
|
||||||
|
|
||||||
/* tagging */
|
|
||||||
const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
|
||||||
|
|
||||||
const Rule rules[] = {
|
|
||||||
/* xprop(1):
|
|
||||||
* WM_CLASS(STRING) = instance, class
|
|
||||||
* WM_NAME(STRING) = title
|
|
||||||
*/
|
|
||||||
/* class instance title tags mask isfloating monitor */
|
|
||||||
{ "Gimp", NULL, NULL, 0, 1, -1 },
|
|
||||||
{ "Firefox", NULL, NULL, 1 << 2, 0, -1 },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* layout(s) */
|
|
||||||
const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
|
||||||
const int nmaster = 1; /* number of clients in master area */
|
|
||||||
const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
|
||||||
const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
|
||||||
|
|
||||||
const Layout layouts[] = {
|
|
||||||
/* symbol arrange function */
|
|
||||||
{ "[T]", tile }, /* first entry is default */
|
|
||||||
{ "[F]", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
#define MODKEY Mod4Mask
|
|
||||||
#define TAGKEYS(KEY,TAG) \
|
|
||||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/bash", "-c", cmd, NULL } }
|
|
||||||
|
|
||||||
const char* upvol[] = { "/usr/bin/pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL };
|
|
||||||
const char* downvol[] = { "/usr/bin/pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL };
|
|
||||||
const char* mutevol[] = { "/usr/bin/pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL };
|
|
||||||
const char* light_up[] = { "/usr/bin/light", "-A", "5", NULL };
|
|
||||||
const char* light_down[] = { "/usr/bin/light", "-U", "5", NULL };
|
|
||||||
const char* rofi[] = { "rofi", "-modi", "drun", "-show", "drun", "-config", "~/.config/rofi/rofidmenu.rasi", NULL };
|
|
||||||
|
|
||||||
/* commands spawned when clicking statusbar, the mouse button pressed is exported as BUTTON */
|
|
||||||
const StatusCmd statuscmds[] = {
|
|
||||||
{ "notify-send Mouse$BUTTON", 1 },
|
|
||||||
};
|
|
||||||
const char *statuscmd[] = { "/bin/sh", "-c", NULL, NULL };
|
|
||||||
|
|
||||||
const Key keys[] = {
|
|
||||||
/* modifier key function argument */
|
|
||||||
|
|
||||||
{ MODKEY, XK_w, spawn, { .v = (const char*[]){"firefox", NULL} } },
|
|
||||||
{ MODKEY, XK_n, spawn, { .v = (const char*[]){"thunar", NULL} } },
|
|
||||||
{ MODKEY, XK_Return, spawn, { .v = (const char*[]){"alacritty", NULL} } },
|
|
||||||
{ 0, XF86XK_AudioPlay, spawn, { .v = (const char*[]){"firefox", NULL} } },
|
|
||||||
{ 0, XK_Print, spawn, { .v = (const char*[]){"flameshot", "gui", NULL} } },
|
|
||||||
{ 0, XF86XK_AudioStop, spawn, { .v = (const char*[]){"playerctl", "play-pause", NULL} } },
|
|
||||||
{ 0, XF86XK_AudioNext, spawn, { .v = (const char*[]){"playerctl", "next", NULL} } },
|
|
||||||
{ 0, XF86XK_AudioPrev, spawn, { .v = (const char*[]){"playerctl", "previous", NULL} } },
|
|
||||||
{ MODKEY, XK_d, spawn, { .v = rofi } },
|
|
||||||
{ 0, XF86XK_AudioRaiseVolume, spawn, { .v = upvol } },
|
|
||||||
{ 0, XF86XK_AudioLowerVolume, spawn, { .v = downvol } },
|
|
||||||
{ 0, XF86XK_AudioMute, spawn, { .v = mutevol } },
|
|
||||||
{ 0, XF86XK_MonBrightnessUp, spawn, { .v = light_up } },
|
|
||||||
{ 0, XF86XK_MonBrightnessDown, spawn, { .v = light_down} },
|
|
||||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
|
||||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
|
||||||
{ MODKEY, XK_f, togglefullscr, {0} },
|
|
||||||
{ MODKEY, XK_Tab, view, {0} }, // Switch windows
|
|
||||||
{ MODKEY, XK_q, killclient, {0} }, // Kill prog
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XK_s, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_e, quit, {0}},
|
|
||||||
TAGKEYS( XK_1, 0)
|
|
||||||
TAGKEYS( XK_2, 1)
|
|
||||||
TAGKEYS( XK_3, 2)
|
|
||||||
TAGKEYS( XK_4, 3)
|
|
||||||
TAGKEYS( XK_5, 4)
|
|
||||||
TAGKEYS( XK_6, 5)
|
|
||||||
TAGKEYS( XK_7, 6)
|
|
||||||
TAGKEYS( XK_8, 7)
|
|
||||||
TAGKEYS( XK_9, 8)
|
|
||||||
|
|
||||||
// { MODKEY, XK_minus, setgaps, {.i = -5 } },
|
|
||||||
// { MODKEY, XK_equal, setgaps, {.i = +5 } },
|
|
||||||
// { MODKEY|ShiftMask, XK_minus, setgaps, {.i = GAP_RESET } },
|
|
||||||
// { MODKEY|ShiftMask, XK_equal, setgaps, {.i = GAP_TOGGLE} },
|
|
||||||
|
|
||||||
|
|
||||||
// ????????????????????????????//
|
|
||||||
// { MODKEY, XK_comma, focusmon, {.i = -1 } },
|
|
||||||
// { MODKEY, XK_period, focusmon, {.i = +1 } },
|
|
||||||
// { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
|
||||||
// { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
|
||||||
|
|
||||||
// { MODKEY, XK_b, togglebar, {0} }, // stupid
|
|
||||||
// { MODKEY, XK_Return, zoom, {0} },
|
|
||||||
// { MODKEY, XK_d, incnmaster, {.i = -1 } },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* button definitions */
|
|
||||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
|
||||||
const Button buttons[] = {
|
|
||||||
/* click event mask button function argument */
|
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
|
||||||
{ ClkStatusText, 0, Button1, spawn, {.v = statuscmd } },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = statuscmd } },
|
|
||||||
{ ClkStatusText, 0, Button3, spawn, {.v = statuscmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
|
||||||
{ ClkTagBar, 0, Button1, view, {0} },
|
|
||||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
26
config.mk
26
config.mk
|
|
@ -1,5 +1,5 @@
|
||||||
# dwm version
|
# dwm version
|
||||||
VERSION = 6.5
|
VERSION = 5.8
|
||||||
|
|
||||||
# Customize below to fit your system
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
|
@ -10,26 +10,20 @@ MANPREFIX = ${PREFIX}/share/man
|
||||||
X11INC = /usr/X11R6/include
|
X11INC = /usr/X11R6/include
|
||||||
X11LIB = /usr/X11R6/lib
|
X11LIB = /usr/X11R6/lib
|
||||||
|
|
||||||
# Xinerama, comment if you don't want it
|
# Xinerama
|
||||||
XINERAMALIBS = -lXinerama
|
XINERAMALIBS = -L${X11LIB} -lXinerama
|
||||||
XINERAMAFLAGS = -DXINERAMA
|
XINERAMAFLAGS = -DXINERAMA
|
||||||
|
|
||||||
# freetype
|
|
||||||
FREETYPELIBS = -lfontconfig -lXft
|
|
||||||
FREETYPEINC = /usr/include/freetype2
|
|
||||||
# OpenBSD (uncomment)
|
|
||||||
#FREETYPEINC = ${X11INC}/freetype2
|
|
||||||
#MANPREFIX = ${PREFIX}/man
|
|
||||||
|
|
||||||
# includes and libs
|
# includes and libs
|
||||||
INCS = -I${X11INC} -I${FREETYPEINC}
|
INCS = -I. -I/usr/include -I${X11INC}
|
||||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
||||||
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
|
#CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
|
||||||
LDFLAGS = ${LIBS}
|
LDFLAGS = -g ${LIBS}
|
||||||
|
#LDFLAGS = -s ${LIBS}
|
||||||
|
|
||||||
# Solaris
|
# Solaris
|
||||||
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
||||||
|
|
|
||||||
450
drw.c
450
drw.c
|
|
@ -1,450 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
#define UTF_INVALID 0xFFFD
|
|
||||||
#define UTF_SIZ 4
|
|
||||||
|
|
||||||
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
|
||||||
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
|
||||||
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
|
||||||
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
|
||||||
|
|
||||||
static long
|
|
||||||
utf8decodebyte(const char c, size_t *i)
|
|
||||||
{
|
|
||||||
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
|
|
||||||
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
|
|
||||||
return (unsigned char)c & ~utfmask[*i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
utf8validate(long *u, size_t i)
|
|
||||||
{
|
|
||||||
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
for (i = 1; *u > utfmax[i]; ++i)
|
|
||||||
;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
utf8decode(const char *c, long *u, size_t clen)
|
|
||||||
{
|
|
||||||
size_t i, j, len, type;
|
|
||||||
long udecoded;
|
|
||||||
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
if (!clen)
|
|
||||||
return 0;
|
|
||||||
udecoded = utf8decodebyte(c[0], &len);
|
|
||||||
if (!BETWEEN(len, 1, UTF_SIZ))
|
|
||||||
return 1;
|
|
||||||
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
|
||||||
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
|
||||||
if (type)
|
|
||||||
return j;
|
|
||||||
}
|
|
||||||
if (j < len)
|
|
||||||
return 0;
|
|
||||||
*u = udecoded;
|
|
||||||
utf8validate(u, len);
|
|
||||||
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
Drw *
|
|
||||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
Drw *drw = ecalloc(1, sizeof(Drw));
|
|
||||||
|
|
||||||
drw->dpy = dpy;
|
|
||||||
drw->screen = screen;
|
|
||||||
drw->root = root;
|
|
||||||
drw->w = w;
|
|
||||||
drw->h = h;
|
|
||||||
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
|
|
||||||
drw->gc = XCreateGC(dpy, root, 0, NULL);
|
|
||||||
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
|
||||||
|
|
||||||
return drw;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
if (!drw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
drw->w = w;
|
|
||||||
drw->h = h;
|
|
||||||
if (drw->drawable)
|
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
|
||||||
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_free(Drw *drw)
|
|
||||||
{
|
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
|
||||||
XFreeGC(drw->dpy, drw->gc);
|
|
||||||
drw_fontset_free(drw->fonts);
|
|
||||||
free(drw);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This function is an implementation detail. Library users should use
|
|
||||||
* drw_fontset_create instead.
|
|
||||||
*/
|
|
||||||
static Fnt *
|
|
||||||
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
|
||||||
{
|
|
||||||
Fnt *font;
|
|
||||||
XftFont *xfont = NULL;
|
|
||||||
FcPattern *pattern = NULL;
|
|
||||||
|
|
||||||
if (fontname) {
|
|
||||||
/* Using the pattern found at font->xfont->pattern does not yield the
|
|
||||||
* same substitution results as using the pattern returned by
|
|
||||||
* FcNameParse; using the latter results in the desired fallback
|
|
||||||
* behaviour whereas the former just results in missing-character
|
|
||||||
* rectangles being drawn, at least with some fonts. */
|
|
||||||
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else if (fontpattern) {
|
|
||||||
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from pattern.\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
die("no font specified.");
|
|
||||||
}
|
|
||||||
|
|
||||||
font = ecalloc(1, sizeof(Fnt));
|
|
||||||
font->xfont = xfont;
|
|
||||||
font->pattern = pattern;
|
|
||||||
font->h = xfont->ascent + xfont->descent;
|
|
||||||
font->dpy = drw->dpy;
|
|
||||||
|
|
||||||
return font;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
xfont_free(Fnt *font)
|
|
||||||
{
|
|
||||||
if (!font)
|
|
||||||
return;
|
|
||||||
if (font->pattern)
|
|
||||||
FcPatternDestroy(font->pattern);
|
|
||||||
XftFontClose(font->dpy, font->xfont);
|
|
||||||
free(font);
|
|
||||||
}
|
|
||||||
|
|
||||||
Fnt*
|
|
||||||
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
|
|
||||||
{
|
|
||||||
Fnt *cur, *ret = NULL;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!drw || !fonts)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 1; i <= fontcount; i++) {
|
|
||||||
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
|
|
||||||
cur->next = ret;
|
|
||||||
ret = cur;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (drw->fonts = ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_fontset_free(Fnt *font)
|
|
||||||
{
|
|
||||||
if (font) {
|
|
||||||
drw_fontset_free(font->next);
|
|
||||||
xfont_free(font);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
|
||||||
{
|
|
||||||
if (!drw || !dest || !clrname)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
|
||||||
DefaultColormap(drw->dpy, drw->screen),
|
|
||||||
clrname, dest))
|
|
||||||
die("error, cannot allocate color '%s'", clrname);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
|
||||||
* returned color scheme when done using it. */
|
|
||||||
Clr *
|
|
||||||
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
Clr *ret;
|
|
||||||
|
|
||||||
/* need at least two colors for a scheme */
|
|
||||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < clrcount; i++)
|
|
||||||
drw_clr_create(drw, &ret[i], clrnames[i]);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_setfontset(Drw *drw, Fnt *set)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->fonts = set;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_setscheme(Drw *drw, Clr *scm)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->scheme = scm;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
|
|
||||||
{
|
|
||||||
if (!drw || !drw->scheme)
|
|
||||||
return;
|
|
||||||
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
|
|
||||||
if (filled)
|
|
||||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
||||||
else
|
|
||||||
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
|
|
||||||
{
|
|
||||||
int i, ty, ellipsis_x = 0;
|
|
||||||
unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
|
|
||||||
XftDraw *d = NULL;
|
|
||||||
Fnt *usedfont, *curfont, *nextfont;
|
|
||||||
int utf8strlen, utf8charlen, render = x || y || w || h;
|
|
||||||
long utf8codepoint = 0;
|
|
||||||
const char *utf8str;
|
|
||||||
FcCharSet *fccharset;
|
|
||||||
FcPattern *fcpattern;
|
|
||||||
FcPattern *match;
|
|
||||||
XftResult result;
|
|
||||||
int charexists = 0, overflow = 0;
|
|
||||||
/* keep track of a couple codepoints for which we have no match. */
|
|
||||||
enum { nomatches_len = 64 };
|
|
||||||
static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches;
|
|
||||||
static unsigned int ellipsis_width = 0;
|
|
||||||
|
|
||||||
if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!render) {
|
|
||||||
w = invert ? invert : ~invert;
|
|
||||||
} else {
|
|
||||||
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
|
|
||||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
||||||
d = XftDrawCreate(drw->dpy, drw->drawable,
|
|
||||||
DefaultVisual(drw->dpy, drw->screen),
|
|
||||||
DefaultColormap(drw->dpy, drw->screen));
|
|
||||||
x += lpad;
|
|
||||||
w -= lpad;
|
|
||||||
}
|
|
||||||
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
if (!ellipsis_width && render)
|
|
||||||
ellipsis_width = drw_fontset_getwidth(drw, "...");
|
|
||||||
while (1) {
|
|
||||||
ew = ellipsis_len = utf8strlen = 0;
|
|
||||||
utf8str = text;
|
|
||||||
nextfont = NULL;
|
|
||||||
while (*text) {
|
|
||||||
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
|
|
||||||
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
|
|
||||||
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
|
|
||||||
if (charexists) {
|
|
||||||
drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
|
|
||||||
if (ew + ellipsis_width <= w) {
|
|
||||||
/* keep track where the ellipsis still fits */
|
|
||||||
ellipsis_x = x + ew;
|
|
||||||
ellipsis_w = w - ew;
|
|
||||||
ellipsis_len = utf8strlen;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ew + tmpw > w) {
|
|
||||||
overflow = 1;
|
|
||||||
/* called from drw_fontset_getwidth_clamp():
|
|
||||||
* it wants the width AFTER the overflow
|
|
||||||
*/
|
|
||||||
if (!render)
|
|
||||||
x += tmpw;
|
|
||||||
else
|
|
||||||
utf8strlen = ellipsis_len;
|
|
||||||
} else if (curfont == usedfont) {
|
|
||||||
utf8strlen += utf8charlen;
|
|
||||||
text += utf8charlen;
|
|
||||||
ew += tmpw;
|
|
||||||
} else {
|
|
||||||
nextfont = curfont;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (overflow || !charexists || nextfont)
|
|
||||||
break;
|
|
||||||
else
|
|
||||||
charexists = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (utf8strlen) {
|
|
||||||
if (render) {
|
|
||||||
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
|
|
||||||
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
|
|
||||||
usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
|
|
||||||
}
|
|
||||||
x += ew;
|
|
||||||
w -= ew;
|
|
||||||
}
|
|
||||||
if (render && overflow)
|
|
||||||
drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
|
|
||||||
|
|
||||||
if (!*text || overflow) {
|
|
||||||
break;
|
|
||||||
} else if (nextfont) {
|
|
||||||
charexists = 0;
|
|
||||||
usedfont = nextfont;
|
|
||||||
} else {
|
|
||||||
/* Regardless of whether or not a fallback font is found, the
|
|
||||||
* character must be drawn. */
|
|
||||||
charexists = 1;
|
|
||||||
|
|
||||||
for (i = 0; i < nomatches_len; ++i) {
|
|
||||||
/* avoid calling XftFontMatch if we know we won't find a match */
|
|
||||||
if (utf8codepoint == nomatches.codepoint[i])
|
|
||||||
goto no_match;
|
|
||||||
}
|
|
||||||
|
|
||||||
fccharset = FcCharSetCreate();
|
|
||||||
FcCharSetAddChar(fccharset, utf8codepoint);
|
|
||||||
|
|
||||||
if (!drw->fonts->pattern) {
|
|
||||||
/* Refer to the comment in xfont_create for more information. */
|
|
||||||
die("the first font in the cache must be loaded from a font string.");
|
|
||||||
}
|
|
||||||
|
|
||||||
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
|
|
||||||
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
|
|
||||||
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
|
|
||||||
|
|
||||||
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(fcpattern);
|
|
||||||
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
|
|
||||||
|
|
||||||
FcCharSetDestroy(fccharset);
|
|
||||||
FcPatternDestroy(fcpattern);
|
|
||||||
|
|
||||||
if (match) {
|
|
||||||
usedfont = xfont_create(drw, NULL, match);
|
|
||||||
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
|
|
||||||
for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
|
|
||||||
; /* NOP */
|
|
||||||
curfont->next = usedfont;
|
|
||||||
} else {
|
|
||||||
xfont_free(usedfont);
|
|
||||||
nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
|
|
||||||
no_match:
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (d)
|
|
||||||
XftDrawDestroy(d);
|
|
||||||
|
|
||||||
return x + (render ? w : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
|
|
||||||
{
|
|
||||||
if (!drw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
|
|
||||||
XSync(drw->dpy, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int
|
|
||||||
drw_fontset_getwidth(Drw *drw, const char *text)
|
|
||||||
{
|
|
||||||
if (!drw || !drw->fonts || !text)
|
|
||||||
return 0;
|
|
||||||
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int
|
|
||||||
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
|
|
||||||
{
|
|
||||||
unsigned int tmp = 0;
|
|
||||||
if (drw && drw->fonts && text && n)
|
|
||||||
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
|
|
||||||
return MIN(n, tmp);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
|
|
||||||
{
|
|
||||||
XGlyphInfo ext;
|
|
||||||
|
|
||||||
if (!font || !text)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
|
|
||||||
if (w)
|
|
||||||
*w = ext.xOff;
|
|
||||||
if (h)
|
|
||||||
*h = font->h;
|
|
||||||
}
|
|
||||||
|
|
||||||
Cur *
|
|
||||||
drw_cur_create(Drw *drw, int shape)
|
|
||||||
{
|
|
||||||
Cur *cur;
|
|
||||||
|
|
||||||
if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
cur->cursor = XCreateFontCursor(drw->dpy, shape);
|
|
||||||
|
|
||||||
return cur;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
drw_cur_free(Drw *drw, Cur *cursor)
|
|
||||||
{
|
|
||||||
if (!cursor)
|
|
||||||
return;
|
|
||||||
|
|
||||||
XFreeCursor(drw->dpy, cursor->cursor);
|
|
||||||
free(cursor);
|
|
||||||
}
|
|
||||||
80
drw.h
80
drw.h
|
|
@ -1,80 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
#ifndef _H_DRW
|
|
||||||
#define _H_DRW
|
|
||||||
|
|
||||||
#include <signal.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <X11/cursorfont.h>
|
|
||||||
#include <X11/keysym.h>
|
|
||||||
#include <X11/Xatom.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xproto.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
#ifdef XINERAMA
|
|
||||||
#include <X11/extensions/Xinerama.h>
|
|
||||||
#endif /* XINERAMA */
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
Cursor cursor;
|
|
||||||
} Cur;
|
|
||||||
|
|
||||||
typedef struct Fnt {
|
|
||||||
Display *dpy;
|
|
||||||
unsigned int h;
|
|
||||||
XftFont *xfont;
|
|
||||||
FcPattern *pattern;
|
|
||||||
struct Fnt *next;
|
|
||||||
} Fnt;
|
|
||||||
|
|
||||||
enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
|
|
||||||
typedef XftColor Clr;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int w, h;
|
|
||||||
Display *dpy;
|
|
||||||
int screen;
|
|
||||||
Window root;
|
|
||||||
Drawable drawable;
|
|
||||||
GC gc;
|
|
||||||
Clr *scheme;
|
|
||||||
Fnt *fonts;
|
|
||||||
} Drw;
|
|
||||||
|
|
||||||
/* Drawable abstraction */
|
|
||||||
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
|
|
||||||
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
|
||||||
void drw_free(Drw *drw);
|
|
||||||
|
|
||||||
/* Fnt abstraction */
|
|
||||||
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
|
|
||||||
void drw_fontset_free(Fnt* set);
|
|
||||||
unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
|
|
||||||
unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
|
|
||||||
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
|
|
||||||
|
|
||||||
/* Colorscheme abstraction */
|
|
||||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
|
||||||
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
|
||||||
|
|
||||||
/* Cursor abstraction */
|
|
||||||
Cur *drw_cur_create(Drw *drw, int shape);
|
|
||||||
void drw_cur_free(Drw *drw, Cur *cursor);
|
|
||||||
|
|
||||||
/* Drawing context manipulation */
|
|
||||||
void drw_setfontset(Drw *drw, Fnt *set);
|
|
||||||
void drw_setscheme(Drw *drw, Clr *scm);
|
|
||||||
|
|
||||||
/* Drawing functions */
|
|
||||||
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
|
|
||||||
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
|
|
||||||
|
|
||||||
/* Map functions */
|
|
||||||
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
42
dwm.1
42
dwm.1
|
|
@ -10,9 +10,8 @@ and floating layouts. Either layout can be applied dynamically, optimising the
|
||||||
environment for the application in use and the task performed.
|
environment for the application in use and the task performed.
|
||||||
.P
|
.P
|
||||||
In tiled layouts windows are managed in a master and stacking area. The master
|
In tiled layouts windows are managed in a master and stacking area. The master
|
||||||
area on the left contains one window by default, and the stacking area on the
|
area contains the window which currently needs most attention, whereas the
|
||||||
right contains all other windows. The number of master area windows can be
|
stacking area contains all other windows. In monocle layout all windows are
|
||||||
adjusted from zero to an arbitrary number. In monocle layout all windows are
|
|
||||||
maximised to the screen size. In floating layout windows can be resized and
|
maximised to the screen size. In floating layout windows can be resized and
|
||||||
moved freely. Dialog windows are always managed floating, regardless of the
|
moved freely. Dialog windows are always managed floating, regardless of the
|
||||||
layout applied.
|
layout applied.
|
||||||
|
|
@ -33,7 +32,7 @@ dwm draws a small border around windows to indicate the focus state.
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
.TP
|
.TP
|
||||||
.B \-v
|
.B \-v
|
||||||
prints version information to stderr, then exits.
|
prints version information to standard output, then exits.
|
||||||
.SH USAGE
|
.SH USAGE
|
||||||
.SS Status bar
|
.SS Status bar
|
||||||
.TP
|
.TP
|
||||||
|
|
@ -58,12 +57,7 @@ click on a tag label adds/removes that tag to/from the focused window.
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-Shift\-Return
|
.B Mod1\-Shift\-Return
|
||||||
Start
|
Start
|
||||||
.BR st(1).
|
.BR uxterm (1).
|
||||||
.TP
|
|
||||||
.B Mod1\-p
|
|
||||||
Spawn
|
|
||||||
.BR dmenu(1)
|
|
||||||
for launching other programs.
|
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-,
|
.B Mod1\-,
|
||||||
Focus previous screen, if any.
|
Focus previous screen, if any.
|
||||||
|
|
@ -98,27 +92,18 @@ Focus next window.
|
||||||
.B Mod1\-k
|
.B Mod1\-k
|
||||||
Focus previous window.
|
Focus previous window.
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-i
|
.B Mod1\-h
|
||||||
Increase number of windows in master area.
|
Decrease master area size.
|
||||||
.TP
|
|
||||||
.B Mod1\-d
|
|
||||||
Decrease number of windows in master area.
|
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-l
|
.B Mod1\-l
|
||||||
Increase master area size.
|
Increase master area size.
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-h
|
|
||||||
Decrease master area size.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Return
|
.B Mod1\-Return
|
||||||
Zooms/cycles focused window to/from master area (tiled layouts only).
|
Zooms/cycles focused window to/from master area (tiled layouts only).
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-Shift\-c
|
.B Mod1\-Shift\-c
|
||||||
Close focused window.
|
Close focused window.
|
||||||
.TP
|
.TP
|
||||||
.B Mod1\-Shift\-f
|
|
||||||
Toggle fullscreen for focused window.
|
|
||||||
.TP
|
|
||||||
.B Mod1\-Shift\-space
|
.B Mod1\-Shift\-space
|
||||||
Toggle focused window between tiled and floating state.
|
Toggle focused window between tiled and floating state.
|
||||||
.TP
|
.TP
|
||||||
|
|
@ -159,9 +144,8 @@ Resize focused window while dragging. Tiled windows will be toggled to the float
|
||||||
dwm is customized by creating a custom config.h and (re)compiling the source
|
dwm is customized by creating a custom config.h and (re)compiling the source
|
||||||
code. This keeps it fast, secure and simple.
|
code. This keeps it fast, secure and simple.
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
.BR dmenu (1),
|
.BR dmenu (1)
|
||||||
.BR st (1)
|
.SH BUGS
|
||||||
.SH ISSUES
|
|
||||||
Java applications which use the XToolkit/XAWT backend may draw grey windows
|
Java applications which use the XToolkit/XAWT backend may draw grey windows
|
||||||
only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
|
only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
|
||||||
JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
|
JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
|
||||||
|
|
@ -175,5 +159,11 @@ or
|
||||||
(to pretend that a non-reparenting window manager is running that the
|
(to pretend that a non-reparenting window manager is running that the
|
||||||
XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable
|
XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable
|
||||||
.BR _JAVA_AWT_WM_NONREPARENTING=1 .
|
.BR _JAVA_AWT_WM_NONREPARENTING=1 .
|
||||||
.SH BUGS
|
.P
|
||||||
Send all bug reports with a patch to hackers@suckless.org.
|
GTK 2.10.9+ versions contain a broken
|
||||||
|
.BR Save\-As
|
||||||
|
file dialog implementation,
|
||||||
|
which requests to reconfigure its window size in an endless loop. However, its
|
||||||
|
window is still respondable during this state, so you can simply ignore the flicker
|
||||||
|
until a new GTK version appears, which will fix this bug, approximately
|
||||||
|
GTK 2.10.12+ versions.
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
# copy to /usr/share/xsessions/dwm.desktop
|
|
||||||
|
|
||||||
[Desktop Entry]
|
|
||||||
Encoding=UTF-8
|
|
||||||
Name=dwm
|
|
||||||
Comment=Dynamic window manager
|
|
||||||
Exec=dwm
|
|
||||||
Icon=dwm
|
|
||||||
Type=XSession
|
|
||||||
292
dwm.h
292
dwm.h
|
|
@ -1,292 +0,0 @@
|
||||||
#ifndef _H_DWM
|
|
||||||
#define _H_DWM
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <locale.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <X11/cursorfont.h>
|
|
||||||
#include <X11/keysym.h>
|
|
||||||
#include <X11/XF86keysym.h>
|
|
||||||
#include <X11/Xatom.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xproto.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
#ifdef XINERAMA
|
|
||||||
#include <X11/extensions/Xinerama.h>
|
|
||||||
#endif /* XINERAMA */
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
|
|
||||||
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
|
|
||||||
#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
|
|
||||||
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
|
|
||||||
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
|
|
||||||
#define LENGTH(X) (sizeof X / sizeof X[0])
|
|
||||||
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
|
|
||||||
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
|
||||||
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
|
||||||
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
||||||
|
|
||||||
#define GAP_TOGGLE 100
|
|
||||||
#define GAP_RESET 0
|
|
||||||
|
|
||||||
/* enums */
|
|
||||||
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
||||||
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
|
||||||
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|
||||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
|
||||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
|
||||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
|
||||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
|
||||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
|
||||||
|
|
||||||
typedef union {
|
|
||||||
int i;
|
|
||||||
unsigned int ui;
|
|
||||||
float f;
|
|
||||||
const void *v;
|
|
||||||
} Arg;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int click;
|
|
||||||
unsigned int mask;
|
|
||||||
unsigned int button;
|
|
||||||
void (*func)(const Arg *arg);
|
|
||||||
const Arg arg;
|
|
||||||
} Button;
|
|
||||||
|
|
||||||
typedef struct Monitor Monitor;
|
|
||||||
typedef struct Client Client;
|
|
||||||
struct Client {
|
|
||||||
char name[256];
|
|
||||||
float mina, maxa;
|
|
||||||
int x, y, w, h;
|
|
||||||
int oldx, oldy, oldw, oldh;
|
|
||||||
int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
|
|
||||||
int bw, oldbw;
|
|
||||||
unsigned int tags;
|
|
||||||
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
|
|
||||||
Client *next;
|
|
||||||
Client *snext;
|
|
||||||
Monitor *mon;
|
|
||||||
Window win;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int mod;
|
|
||||||
KeySym keysym;
|
|
||||||
void (*func)(const Arg *);
|
|
||||||
const Arg arg;
|
|
||||||
} Key;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
const char *symbol;
|
|
||||||
void (*arrange)(Monitor *);
|
|
||||||
} Layout;
|
|
||||||
|
|
||||||
typedef struct Pertag Pertag;
|
|
||||||
|
|
||||||
struct Monitor {
|
|
||||||
char ltsymbol[16];
|
|
||||||
float mfact;
|
|
||||||
int nmaster;
|
|
||||||
int num;
|
|
||||||
int by; /* bar geometry */
|
|
||||||
int mx, my, mw, mh; /* screen size */
|
|
||||||
int wx, wy, ww, wh; /* window area */
|
|
||||||
unsigned int seltags;
|
|
||||||
unsigned int sellt;
|
|
||||||
unsigned int tagset[2];
|
|
||||||
int showbar;
|
|
||||||
int topbar;
|
|
||||||
Client *clients;
|
|
||||||
Client *sel;
|
|
||||||
Client *stack;
|
|
||||||
Monitor *next;
|
|
||||||
Window barwin;
|
|
||||||
const Layout *lt[2];
|
|
||||||
Pertag *pertag;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
const char *class;
|
|
||||||
const char *instance;
|
|
||||||
const char *title;
|
|
||||||
unsigned int tags;
|
|
||||||
int isfloating;
|
|
||||||
int monitor;
|
|
||||||
} Rule;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
const char *cmd;
|
|
||||||
int id;
|
|
||||||
} StatusCmd;
|
|
||||||
|
|
||||||
/* function declarations */
|
|
||||||
void applyrules(Client *c);
|
|
||||||
int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
|
||||||
void arrange(Monitor *m);
|
|
||||||
void arrangemon(Monitor *m);
|
|
||||||
void attach(Client *c);
|
|
||||||
void attachstack(Client *c);
|
|
||||||
void buttonpress(XEvent *e);
|
|
||||||
void checkotherwm(void);
|
|
||||||
void cleanup(void);
|
|
||||||
void cleanupmon(Monitor *mon);
|
|
||||||
void clientmessage(XEvent *e);
|
|
||||||
void configure(Client *c);
|
|
||||||
void configurenotify(XEvent *e);
|
|
||||||
void configurerequest(XEvent *e);
|
|
||||||
Monitor *createmon(void);
|
|
||||||
void destroynotify(XEvent *e);
|
|
||||||
void detach(Client *c);
|
|
||||||
void detachstack(Client *c);
|
|
||||||
Monitor *dirtomon(int dir);
|
|
||||||
void drawbar(Monitor *m);
|
|
||||||
void drawbars(void);
|
|
||||||
void enternotify(XEvent *e);
|
|
||||||
void expose(XEvent *e);
|
|
||||||
void focus(Client *c);
|
|
||||||
void focusin(XEvent *e);
|
|
||||||
void focusmon(const Arg *arg);
|
|
||||||
void focusstack(const Arg *arg);
|
|
||||||
Atom getatomprop(Client *c, Atom prop);
|
|
||||||
int getrootptr(int *x, int *y);
|
|
||||||
long getstate(Window w);
|
|
||||||
int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|
||||||
void grabbuttons(Client *c, int focused);
|
|
||||||
void grabkeys(void);
|
|
||||||
void incnmaster(const Arg *arg);
|
|
||||||
void keypress(XEvent *e);
|
|
||||||
void killclient(const Arg *arg);
|
|
||||||
void manage(Window w, XWindowAttributes *wa);
|
|
||||||
void mappingnotify(XEvent *e);
|
|
||||||
void maprequest(XEvent *e);
|
|
||||||
void monocle(Monitor *m);
|
|
||||||
void motionnotify(XEvent *e);
|
|
||||||
void movemouse(const Arg *arg);
|
|
||||||
Client *nexttiled(Client *c);
|
|
||||||
void pop(Client *c);
|
|
||||||
void propertynotify(XEvent *e);
|
|
||||||
void quit(const Arg *arg);
|
|
||||||
Monitor *recttomon(int x, int y, int w, int h);
|
|
||||||
void resize(Client *c, int x, int y, int w, int h, int interact);
|
|
||||||
void resizeclient(Client *c, int x, int y, int w, int h);
|
|
||||||
void resizemouse(const Arg *arg);
|
|
||||||
void restack(Monitor *m);
|
|
||||||
void run(void);
|
|
||||||
void runAutostart(void);
|
|
||||||
void scan(void);
|
|
||||||
int sendevent(Client *c, Atom proto);
|
|
||||||
void sendmon(Client *c, Monitor *m);
|
|
||||||
void setclientstate(Client *c, long state);
|
|
||||||
void setfocus(Client *c);
|
|
||||||
void setfullscreen(Client *c, int fullscreen);
|
|
||||||
void setgaps(const Arg *arg);
|
|
||||||
void setlayout(const Arg *arg);
|
|
||||||
void setmfact(const Arg *arg);
|
|
||||||
void setup(void);
|
|
||||||
void seturgent(Client *c, int urg);
|
|
||||||
void showhide(Client *c);
|
|
||||||
void spawn(const Arg *arg);
|
|
||||||
void tag(const Arg *arg);
|
|
||||||
void tagmon(const Arg *arg);
|
|
||||||
void tile(Monitor *m);
|
|
||||||
void togglebar(const Arg *arg);
|
|
||||||
void togglefloating(const Arg *arg);
|
|
||||||
void togglefullscr(const Arg *arg);
|
|
||||||
void toggletag(const Arg *arg);
|
|
||||||
void toggleview(const Arg *arg);
|
|
||||||
void unfocus(Client *c, int setfocus);
|
|
||||||
void unmanage(Client *c, int destroyed);
|
|
||||||
void unmapnotify(XEvent *e);
|
|
||||||
void updatebarpos(Monitor *m);
|
|
||||||
void updatebars(void);
|
|
||||||
void updateclientlist(void);
|
|
||||||
int updategeom(void);
|
|
||||||
void updatenumlockmask(void);
|
|
||||||
void updatesizehints(Client *c);
|
|
||||||
void updatestatus(void);
|
|
||||||
void updatetitle(Client *c);
|
|
||||||
void updatewindowtype(Client *c);
|
|
||||||
void updatewmhints(Client *c);
|
|
||||||
void view(const Arg *arg);
|
|
||||||
Client *wintoclient(Window w);
|
|
||||||
Monitor *wintomon(Window w);
|
|
||||||
int xerror(Display *dpy, XErrorEvent *ee);
|
|
||||||
int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
||||||
int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
||||||
void zoom(const Arg *arg);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
const char broken[] = "broken";
|
|
||||||
char stext[256];
|
|
||||||
int screen;
|
|
||||||
int sw, sh; /* X display screen geometry width, height */
|
|
||||||
int bh; /* bar height */
|
|
||||||
int lrpad; /* sum of left and right padding for text */
|
|
||||||
int (*xerrorxlib)(Display *, XErrorEvent *);
|
|
||||||
unsigned int numlockmask = 0;
|
|
||||||
void (*handler[LASTEvent]) (XEvent *) = {
|
|
||||||
[ButtonPress] = buttonpress,
|
|
||||||
[ClientMessage] = clientmessage,
|
|
||||||
[ConfigureRequest] = configurerequest,
|
|
||||||
[ConfigureNotify] = configurenotify,
|
|
||||||
[DestroyNotify] = destroynotify,
|
|
||||||
[EnterNotify] = enternotify,
|
|
||||||
[Expose] = expose,
|
|
||||||
[FocusIn] = focusin,
|
|
||||||
[KeyPress] = keypress,
|
|
||||||
[MappingNotify] = mappingnotify,
|
|
||||||
[MapRequest] = maprequest,
|
|
||||||
[MotionNotify] = motionnotify,
|
|
||||||
[PropertyNotify] = propertynotify,
|
|
||||||
[UnmapNotify] = unmapnotify
|
|
||||||
};
|
|
||||||
Atom wmatom[WMLast], netatom[NetLast];
|
|
||||||
int running = 1;
|
|
||||||
Cur *cursor[CurLast];
|
|
||||||
Clr **scheme;
|
|
||||||
Display *dpy;
|
|
||||||
Drw *drw;
|
|
||||||
Monitor *mons, *selmon;
|
|
||||||
Window root, wmcheckwin;
|
|
||||||
int statusw;
|
|
||||||
int statuscmdn;
|
|
||||||
char lastbutton[] = "-";
|
|
||||||
|
|
||||||
/* configuration, allows nested code to access above variables */
|
|
||||||
|
|
||||||
struct Pertag {
|
|
||||||
unsigned int curtag, prevtag; /* current and previous tag */
|
|
||||||
int nmasters[10]; /* number of windows in master area */
|
|
||||||
float mfacts[10]; /* mfacts per tag */
|
|
||||||
unsigned int sellts[10]; /* selected layouts */
|
|
||||||
const Layout *ltidxs[10][2]; /* matrix of tags and layouts indexes */
|
|
||||||
int showbars[10]; /* display bar for the current tag */
|
|
||||||
|
|
||||||
int drawwithgaps[10]; /* gaps toggle for each tag */
|
|
||||||
int gappx[10]; /* gaps for each tag */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
|
||||||
struct NumTags { char limitexceeded[10 > 31 ? -1 : 1]; };
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
From eea13010ffc3983392857ee1e3804e3aa1064d7a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Soenke Lambert <s.lambert@mittwald.de>
|
|
||||||
Date: Wed, 13 Oct 2021 18:21:09 +0200
|
|
||||||
Subject: [PATCH] Fullscreen current window with [Alt]+[Shift]+[f]
|
|
||||||
|
|
||||||
This actually fullscreens a window, instead of just hiding the statusbar
|
|
||||||
and applying the monocle layout.
|
|
||||||
---
|
|
||||||
config.def.h | 1 +
|
|
||||||
dwm.1 | 3 +++
|
|
||||||
dwm.c | 8 ++++++++
|
|
||||||
3 files changed, 12 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1c0b587..8cd3204 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -78,6 +78,7 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
+ { MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
|
||||||
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
|
||||||
diff --git a/dwm.1 b/dwm.1
|
|
||||||
index 13b3729..a368d05 100644
|
|
||||||
--- a/dwm.1
|
|
||||||
+++ b/dwm.1
|
|
||||||
@@ -116,6 +116,9 @@ Zooms/cycles focused window to/from master area (tiled layouts only).
|
|
||||||
.B Mod1\-Shift\-c
|
|
||||||
Close focused window.
|
|
||||||
.TP
|
|
||||||
+.B Mod1\-Shift\-f
|
|
||||||
+Toggle fullscreen for focused window.
|
|
||||||
+.TP
|
|
||||||
.B Mod1\-Shift\-space
|
|
||||||
Toggle focused window between tiled and floating state.
|
|
||||||
.TP
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 4465af1..c1b899a 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -211,6 +211,7 @@ static void tagmon(const Arg *arg);
|
|
||||||
static void tile(Monitor *);
|
|
||||||
static void togglebar(const Arg *arg);
|
|
||||||
static void togglefloating(const Arg *arg);
|
|
||||||
+static void togglefullscr(const Arg *arg);
|
|
||||||
static void toggletag(const Arg *arg);
|
|
||||||
static void toggleview(const Arg *arg);
|
|
||||||
static void unfocus(Client *c, int setfocus);
|
|
||||||
@@ -1719,6 +1720,13 @@ togglefloating(const Arg *arg)
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+togglefullscr(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ if(selmon->sel)
|
|
||||||
+ setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
toggletag(const Arg *arg)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
2.30.2
|
|
||||||
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
commit 5918623c5bd7fda155bf9dc3d33890c4ae1722d0
|
|
||||||
Author: Simon Bremer <simon.bremer@tum.de>
|
|
||||||
Date: Thu Dec 22 17:31:07 2016 +0100
|
|
||||||
|
|
||||||
Applied and fixed autostart patch for previous version;
|
|
||||||
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index d27cb67..066ed71 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -194,6 +194,7 @@ static void resizeclient(Client *c, int x, int y, int w, int h);
|
|
||||||
static void resizemouse(const Arg *arg);
|
|
||||||
static void restack(Monitor *m);
|
|
||||||
static void run(void);
|
|
||||||
+static void runAutostart(void);
|
|
||||||
static void scan(void);
|
|
||||||
static int sendevent(Client *c, Atom proto);
|
|
||||||
static void sendmon(Client *c, Monitor *m);
|
|
||||||
@@ -1386,6 +1387,12 @@ run(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
+runAutostart(void) {
|
|
||||||
+ system("cd ~/.dwm; ./autostart_blocking.sh");
|
|
||||||
+ system("cd ~/.dwm; ./autostart.sh &");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
scan(void)
|
|
||||||
{
|
|
||||||
unsigned int i, num;
|
|
||||||
@@ -2145,6 +2152,7 @@ main(int argc, char *argv[])
|
|
||||||
checkotherwm();
|
|
||||||
setup();
|
|
||||||
scan();
|
|
||||||
+ runAutostart();
|
|
||||||
run();
|
|
||||||
cleanup();
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
|
|
@ -1,352 +0,0 @@
|
||||||
diff -pu dwm.git/config.def.h dwm.functionalgapspertag/config.def.h
|
|
||||||
--- dwm.git/config.def.h 2021-02-27 21:17:53.862314811 -0600
|
|
||||||
+++ dwm.functionalgapspertag/config.def.h 2021-03-01 15:40:07.312696974 -0600
|
|
||||||
@@ -2,6 +2,8 @@
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
+static const int startwithgaps[] = { 0 }; /* 1 means gaps are used by default, this can be customized for each tag */
|
|
||||||
+static const unsigned int gappx[] = { 10 }; /* default gap between windows in pixels, this can be customized for each tag */
|
|
||||||
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 */
|
|
||||||
@@ -84,6 +86,10 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
|
||||||
+ { MODKEY, XK_minus, setgaps, {.i = -5 } },
|
|
||||||
+ { MODKEY, XK_equal, setgaps, {.i = +5 } },
|
|
||||||
+ { MODKEY|ShiftMask, XK_minus, setgaps, {.i = GAP_RESET } },
|
|
||||||
+ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = GAP_TOGGLE} },
|
|
||||||
TAGKEYS( XK_1, 0)
|
|
||||||
TAGKEYS( XK_2, 1)
|
|
||||||
TAGKEYS( XK_3, 2)
|
|
||||||
diff -pu dwm.git/dwm.c dwm.functionalgapspertag/dwm.c
|
|
||||||
--- dwm.git/dwm.c 2021-02-27 21:17:53.862314811 -0600
|
|
||||||
+++ dwm.functionalgapspertag/dwm.c 2021-03-01 17:10:10.402964866 -0600
|
|
||||||
@@ -57,6 +57,9 @@
|
|
||||||
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
||||||
|
|
||||||
+#define GAP_TOGGLE 100
|
|
||||||
+#define GAP_RESET 0
|
|
||||||
+
|
|
||||||
/* enums */
|
|
||||||
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
||||||
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
|
||||||
@@ -111,6 +114,8 @@ typedef struct {
|
|
||||||
void (*arrange)(Monitor *);
|
|
||||||
} Layout;
|
|
||||||
|
|
||||||
+typedef struct Pertag Pertag;
|
|
||||||
+
|
|
||||||
struct Monitor {
|
|
||||||
char ltsymbol[16];
|
|
||||||
float mfact;
|
|
||||||
@@ -130,6 +135,7 @@ struct Monitor {
|
|
||||||
Monitor *next;
|
|
||||||
Window barwin;
|
|
||||||
const Layout *lt[2];
|
|
||||||
+ Pertag *pertag;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
@@ -200,6 +206,7 @@ static void sendmon(Client *c, Monitor *
|
|
||||||
static void setclientstate(Client *c, long state);
|
|
||||||
static void setfocus(Client *c);
|
|
||||||
static void setfullscreen(Client *c, int fullscreen);
|
|
||||||
+static void setgaps(const Arg *arg);
|
|
||||||
static void setlayout(const Arg *arg);
|
|
||||||
static void setmfact(const Arg *arg);
|
|
||||||
static void setup(void);
|
|
||||||
@@ -272,6 +279,18 @@ static Window root, wmcheckwin;
|
|
||||||
/* configuration, allows nested code to access above variables */
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
+struct Pertag {
|
|
||||||
+ unsigned int curtag, prevtag; /* current and previous tag */
|
|
||||||
+ int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
|
|
||||||
+ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
|
|
||||||
+ unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
|
|
||||||
+ const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */
|
|
||||||
+ int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
|
|
||||||
+
|
|
||||||
+ int drawwithgaps[LENGTH(tags) + 1]; /* gaps toggle for each tag */
|
|
||||||
+ int gappx[LENGTH(tags) + 1]; /* gaps for each tag */
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
|
||||||
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
|
||||||
|
|
||||||
@@ -632,6 +651,7 @@ Monitor *
|
|
||||||
createmon(void)
|
|
||||||
{
|
|
||||||
Monitor *m;
|
|
||||||
+ unsigned int i;
|
|
||||||
|
|
||||||
m = ecalloc(1, sizeof(Monitor));
|
|
||||||
m->tagset[0] = m->tagset[1] = 1;
|
|
||||||
@@ -642,6 +662,26 @@ createmon(void)
|
|
||||||
m->lt[0] = &layouts[0];
|
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
|
||||||
+ m->pertag = ecalloc(1, sizeof(Pertag));
|
|
||||||
+ m->pertag->curtag = m->pertag->prevtag = 1;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i <= LENGTH(tags); i++) {
|
|
||||||
+ m->pertag->nmasters[i] = m->nmaster;
|
|
||||||
+ m->pertag->mfacts[i] = m->mfact;
|
|
||||||
+
|
|
||||||
+ m->pertag->ltidxs[i][0] = m->lt[0];
|
|
||||||
+ m->pertag->ltidxs[i][1] = m->lt[1];
|
|
||||||
+ m->pertag->sellts[i] = m->sellt;
|
|
||||||
+
|
|
||||||
+ m->pertag->showbars[i] = m->showbar;
|
|
||||||
+ if (i > 0) {
|
|
||||||
+ m->pertag->drawwithgaps[i] = startwithgaps[(i - 1) % LENGTH(gappx)];
|
|
||||||
+ m->pertag->gappx[i] = gappx[(i - 1) % LENGTH(gappx)];
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ m->pertag->drawwithgaps[0] = startwithgaps[0];
|
|
||||||
+ m->pertag->gappx[0] = gappx[0];
|
|
||||||
+
|
|
||||||
return m;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -797,6 +837,12 @@ focus(Client *c)
|
|
||||||
attachstack(c);
|
|
||||||
grabbuttons(c, 1);
|
|
||||||
XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
|
|
||||||
+ if (!selmon->pertag->drawwithgaps[selmon->pertag->curtag] && !c->isfloating) {
|
|
||||||
+ XWindowChanges wc;
|
|
||||||
+ wc.sibling = selmon->barwin;
|
|
||||||
+ wc.stack_mode = Below;
|
|
||||||
+ XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
|
|
||||||
+ }
|
|
||||||
setfocus(c);
|
|
||||||
} else {
|
|
||||||
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
|
|
||||||
@@ -967,7 +1013,7 @@ grabkeys(void)
|
|
||||||
void
|
|
||||||
incnmaster(const Arg *arg)
|
|
||||||
{
|
|
||||||
- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
|
|
||||||
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1113,7 +1159,10 @@ monocle(Monitor *m)
|
|
||||||
if (n > 0) /* override layout symbol */
|
|
||||||
snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
|
|
||||||
for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
|
|
||||||
- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
||||||
+ if (selmon->pertag->drawwithgaps[selmon->pertag->curtag])
|
|
||||||
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
||||||
+ else
|
|
||||||
+ resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -1283,6 +1332,15 @@ resizeclient(Client *c, int x, int y, in
|
|
||||||
c->oldw = c->w; c->w = wc.width = w;
|
|
||||||
c->oldh = c->h; c->h = wc.height = h;
|
|
||||||
wc.border_width = c->bw;
|
|
||||||
+ if (!selmon->pertag->drawwithgaps[selmon->pertag->curtag] && /* this is the noborderfloatingfix patch, slightly modified so that it will work if, and only if, gaps are disabled. */
|
|
||||||
+ (((nexttiled(c->mon->clients) == c && !nexttiled(c->next)) /* these two first lines are the only ones changed. if you are manually patching and have noborder installed already, just change these lines; or conversely, just remove this section if the noborder patch is not desired;) */
|
|
||||||
+ || &monocle == c->mon->lt[c->mon->sellt]->arrange))
|
|
||||||
+ && !c->isfullscreen && !c->isfloating
|
|
||||||
+ && NULL != c->mon->lt[c->mon->sellt]->arrange) {
|
|
||||||
+ c->w = wc.width += c->bw * 2;
|
|
||||||
+ c->h = wc.height += c->bw * 2;
|
|
||||||
+ wc.border_width = 0;
|
|
||||||
+ }
|
|
||||||
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
|
|
||||||
configure(c);
|
|
||||||
XSync(dpy, False);
|
|
||||||
@@ -1499,12 +1557,35 @@ setfullscreen(Client *c, int fullscreen)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
+setgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ switch(arg->i)
|
|
||||||
+ {
|
|
||||||
+ case GAP_TOGGLE:
|
|
||||||
+ selmon->pertag->drawwithgaps[selmon->pertag->curtag] = !selmon->pertag->drawwithgaps[selmon->pertag->curtag];
|
|
||||||
+ break;
|
|
||||||
+ case GAP_RESET:
|
|
||||||
+ if (selmon->pertag->curtag > 0)
|
|
||||||
+ selmon->pertag->gappx[selmon->pertag->curtag] = gappx[selmon->pertag->curtag - 1 % LENGTH(gappx)];
|
|
||||||
+ else
|
|
||||||
+ selmon->pertag->gappx[0] = gappx[0];
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ if (selmon->pertag->gappx[selmon->pertag->curtag] + arg->i < 0)
|
|
||||||
+ selmon->pertag->gappx[selmon->pertag->curtag] = 0;
|
|
||||||
+ else
|
|
||||||
+ selmon->pertag->gappx[selmon->pertag->curtag] += arg->i;
|
|
||||||
+ }
|
|
||||||
+ arrange(selmon);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
setlayout(const Arg *arg)
|
|
||||||
{
|
|
||||||
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
|
|
||||||
- selmon->sellt ^= 1;
|
|
||||||
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
|
|
||||||
if (arg && arg->v)
|
|
||||||
- selmon->lt[selmon->sellt] = (Layout *)arg->v;
|
|
||||||
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
|
|
||||||
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
|
|
||||||
if (selmon->sel)
|
|
||||||
arrange(selmon);
|
|
||||||
@@ -1523,7 +1604,7 @@ setmfact(const Arg *arg)
|
|
||||||
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
|
|
||||||
if (f < 0.05 || f > 0.95)
|
|
||||||
return;
|
|
||||||
- selmon->mfact = f;
|
|
||||||
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1680,29 +1761,48 @@ tile(Monitor *m)
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
-
|
|
||||||
- if (n > m->nmaster)
|
|
||||||
- mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
- else
|
|
||||||
- mw = m->ww;
|
|
||||||
- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
- if (i < m->nmaster) {
|
|
||||||
- h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
||||||
- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- if (my + HEIGHT(c) < m->wh)
|
|
||||||
- my += HEIGHT(c);
|
|
||||||
- } else {
|
|
||||||
- h = (m->wh - ty) / (n - i);
|
|
||||||
- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- if (ty + HEIGHT(c) < m->wh)
|
|
||||||
- ty += HEIGHT(c);
|
|
||||||
- }
|
|
||||||
+ if (m->pertag->drawwithgaps[m->pertag->curtag]) { /* draw with fullgaps logic */
|
|
||||||
+ if (n > m->nmaster)
|
|
||||||
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
+ else
|
|
||||||
+ mw = m->ww - m->pertag->gappx[m->pertag->curtag];
|
|
||||||
+ for (i = 0, my = ty = m->pertag->gappx[m->pertag->curtag], c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->pertag->gappx[m->pertag->curtag];
|
|
||||||
+ resize(c, m->wx + m->pertag->gappx[m->pertag->curtag], m->wy + my, mw - (2*c->bw) - m->pertag->gappx[m->pertag->curtag], h - (2*c->bw), 0);
|
|
||||||
+ if (my + HEIGHT(c) + m->pertag->gappx[m->pertag->curtag] < m->wh)
|
|
||||||
+ my += HEIGHT(c) + m->pertag->gappx[m->pertag->curtag];
|
|
||||||
+ } else {
|
|
||||||
+ h = (m->wh - ty) / (n - i) - m->pertag->gappx[m->pertag->curtag];
|
|
||||||
+ resize(c, m->wx + mw + m->pertag->gappx[m->pertag->curtag], m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->pertag->gappx[m->pertag->curtag], h - (2*c->bw), 0);
|
|
||||||
+ if (ty + HEIGHT(c) + m->pertag->gappx[m->pertag->curtag] < m->wh)
|
|
||||||
+ ty += HEIGHT(c) + m->pertag->gappx[m->pertag->curtag];
|
|
||||||
+ }
|
|
||||||
+ } else { /* draw with singularborders logic */
|
|
||||||
+ if (n > m->nmaster)
|
|
||||||
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
+ else
|
|
||||||
+ mw = m->ww;
|
|
||||||
+ for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ if (n == 1)
|
|
||||||
+ resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
|
|
||||||
+ else
|
|
||||||
+ resize(c, m->wx - c->bw, m->wy + my, mw - c->bw, h - c->bw, False);
|
|
||||||
+ my += HEIGHT(c) - c->bw;
|
|
||||||
+ } else {
|
|
||||||
+ h = (m->wh - ty) / (n - i);
|
|
||||||
+ resize(c, m->wx + mw - c->bw, m->wy + ty, m->ww - mw, h - c->bw, False);
|
|
||||||
+ ty += HEIGHT(c) - c->bw;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
togglebar(const Arg *arg)
|
|
||||||
{
|
|
||||||
- selmon->showbar = !selmon->showbar;
|
|
||||||
+ selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
|
|
||||||
updatebarpos(selmon);
|
|
||||||
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
|
||||||
arrange(selmon);
|
|
||||||
@@ -1741,9 +1841,33 @@ void
|
|
||||||
toggleview(const Arg *arg)
|
|
||||||
{
|
|
||||||
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
|
|
||||||
+ int i;
|
|
||||||
|
|
||||||
if (newtagset) {
|
|
||||||
selmon->tagset[selmon->seltags] = newtagset;
|
|
||||||
+
|
|
||||||
+ if (newtagset == ~0) {
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+ selmon->pertag->curtag = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* test if the user did not select the same tag */
|
|
||||||
+ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+ for (i = 0; !(newtagset & 1 << i); i++) ;
|
|
||||||
+ selmon->pertag->curtag = i + 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* apply settings for this view */
|
|
||||||
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
|
|
||||||
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
|
|
||||||
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
|
|
||||||
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
|
|
||||||
+ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
|
|
||||||
+
|
|
||||||
+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
|
|
||||||
+ togglebar(NULL);
|
|
||||||
+
|
|
||||||
focus(NULL);
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
@@ -2038,11 +2162,37 @@ updatewmhints(Client *c)
|
|
||||||
void
|
|
||||||
view(const Arg *arg)
|
|
||||||
{
|
|
||||||
+ int i;
|
|
||||||
+ unsigned int tmptag;
|
|
||||||
+
|
|
||||||
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
|
|
||||||
return;
|
|
||||||
selmon->seltags ^= 1; /* toggle sel tagset */
|
|
||||||
- if (arg->ui & TAGMASK)
|
|
||||||
+ if (arg->ui & TAGMASK) {
|
|
||||||
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+
|
|
||||||
+ if (arg->ui == ~0)
|
|
||||||
+ selmon->pertag->curtag = 0;
|
|
||||||
+ else {
|
|
||||||
+ for (i = 0; !(arg->ui & 1 << i); i++) ;
|
|
||||||
+ selmon->pertag->curtag = i + 1;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ tmptag = selmon->pertag->prevtag;
|
|
||||||
+ selmon->pertag->prevtag = selmon->pertag->curtag;
|
|
||||||
+ selmon->pertag->curtag = tmptag;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
|
|
||||||
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
|
|
||||||
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
|
|
||||||
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
|
|
||||||
+ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
|
|
||||||
+
|
|
||||||
+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
|
|
||||||
+ togglebar(NULL);
|
|
||||||
+
|
|
||||||
focus(NULL);
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
@ -1,167 +0,0 @@
|
||||||
From 02c4a28dd7f3a88eef3a4e533ace35f79cf09d57 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Bylinka <daniel.bylinka@gmail.com>
|
|
||||||
Date: Fri, 2 Apr 2021 19:34:38 +0200
|
|
||||||
Subject: [PATCH] [statuscmd] Run shell commands based on mouse location and
|
|
||||||
button
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 10 ++++++-
|
|
||||||
dwm.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
|
||||||
2 files changed, 81 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1c0b587..8f88366 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -59,6 +59,12 @@ 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 };
|
|
||||||
|
|
||||||
+/* commands spawned when clicking statusbar, the mouse button pressed is exported as BUTTON */
|
|
||||||
+static const StatusCmd statuscmds[] = {
|
|
||||||
+ { "notify-send Mouse$BUTTON", 1 },
|
|
||||||
+};
|
|
||||||
+static const char *statuscmd[] = { "/bin/sh", "-c", NULL, NULL };
|
|
||||||
+
|
|
||||||
static Key keys[] = {
|
|
||||||
/* modifier key function argument */
|
|
||||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
|
||||||
@@ -103,7 +109,9 @@ static Button buttons[] = {
|
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
|
||||||
- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
|
||||||
+ { ClkStatusText, 0, Button1, spawn, {.v = statuscmd } },
|
|
||||||
+ { ClkStatusText, 0, Button2, spawn, {.v = statuscmd } },
|
|
||||||
+ { ClkStatusText, 0, Button3, spawn, {.v = statuscmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index b0b3466..eb478a5 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -141,6 +141,11 @@ typedef struct {
|
|
||||||
int monitor;
|
|
||||||
} Rule;
|
|
||||||
|
|
||||||
+typedef struct {
|
|
||||||
+ const char *cmd;
|
|
||||||
+ int id;
|
|
||||||
+} StatusCmd;
|
|
||||||
+
|
|
||||||
/* function declarations */
|
|
||||||
static void applyrules(Client *c);
|
|
||||||
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
|
||||||
@@ -238,6 +243,9 @@ static void zoom(const Arg *arg);
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
static char stext[256];
|
|
||||||
+static int statusw;
|
|
||||||
+static int statuscmdn;
|
|
||||||
+static char lastbutton[] = "-";
|
|
||||||
static int screen;
|
|
||||||
static int sw, sh; /* X display screen geometry width, height */
|
|
||||||
static int bh, blw = 0; /* bar geometry */
|
|
||||||
@@ -440,8 +448,27 @@ buttonpress(XEvent *e)
|
|
||||||
arg.ui = 1 << i;
|
|
||||||
} else if (ev->x < x + blw)
|
|
||||||
click = ClkLtSymbol;
|
|
||||||
- else if (ev->x > selmon->ww - (int)TEXTW(stext))
|
|
||||||
+ else if (ev->x > selmon->ww - statusw) {
|
|
||||||
+ char *text, *s, ch;
|
|
||||||
+ *lastbutton = '0' + ev->button;
|
|
||||||
+
|
|
||||||
+ x = selmon->ww - statusw;
|
|
||||||
click = ClkStatusText;
|
|
||||||
+
|
|
||||||
+ statuscmdn = 0;
|
|
||||||
+ for (text = s = stext; *s && x <= ev->x; s++) {
|
|
||||||
+ if ((unsigned char)(*s) < ' ') {
|
|
||||||
+ ch = *s;
|
|
||||||
+ *s = '\0';
|
|
||||||
+ x += TEXTW(text) - lrpad;
|
|
||||||
+ *s = ch;
|
|
||||||
+ text = s + 1;
|
|
||||||
+ if (x >= ev->x)
|
|
||||||
+ break;
|
|
||||||
+ statuscmdn = ch;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
click = ClkWinTitle;
|
|
||||||
} else if ((c = wintoclient(ev->window))) {
|
|
||||||
@@ -704,9 +731,24 @@ drawbar(Monitor *m)
|
|
||||||
|
|
||||||
/* draw status first so it can be overdrawn by tags later */
|
|
||||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
|
||||||
+ char *text, *s, ch;
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
||||||
- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
|
||||||
+
|
|
||||||
+ x = 0;
|
|
||||||
+ for (text = s = stext; *s; s++) {
|
|
||||||
+ if ((unsigned char)(*s) < ' ') {
|
|
||||||
+ ch = *s;
|
|
||||||
+ *s = '\0';
|
|
||||||
+ tw = TEXTW(text) - lrpad;
|
|
||||||
+ drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0);
|
|
||||||
+ x += tw;
|
|
||||||
+ *s = ch;
|
|
||||||
+ text = s + 1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ tw = TEXTW(text) - lrpad + 2;
|
|
||||||
+ drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0);
|
|
||||||
+ tw = statusw;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (c = m->clients; c; c = c->next) {
|
|
||||||
@@ -1645,6 +1687,17 @@ spawn(const Arg *arg)
|
|
||||||
if (fork() == 0) {
|
|
||||||
if (dpy)
|
|
||||||
close(ConnectionNumber(dpy));
|
|
||||||
+ if (arg->v == statuscmd) {
|
|
||||||
+ for (int i = 0; i < LENGTH(statuscmds); i++) {
|
|
||||||
+ if (statuscmdn == statuscmds[i].id) {
|
|
||||||
+ statuscmd[2] = statuscmds[i].cmd;
|
|
||||||
+ setenv("BUTTON", lastbutton, 1);
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (!statuscmd[2])
|
|
||||||
+ exit(EXIT_SUCCESS);
|
|
||||||
+ }
|
|
||||||
setsid();
|
|
||||||
execvp(((char **)arg->v)[0], (char **)arg->v);
|
|
||||||
fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
|
|
||||||
@@ -1990,8 +2043,23 @@ updatesizehints(Client *c)
|
|
||||||
void
|
|
||||||
updatestatus(void)
|
|
||||||
{
|
|
||||||
- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
|
||||||
+ if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) {
|
|
||||||
strcpy(stext, "dwm-"VERSION);
|
|
||||||
+ statusw = TEXTW(stext) - lrpad + 2;
|
|
||||||
+ } else {
|
|
||||||
+ char *text, *s, ch;
|
|
||||||
+ statusw = 0;
|
|
||||||
+ for (text = s = stext; *s; s++) {
|
|
||||||
+ if ((unsigned char)(*s) < ' ') {
|
|
||||||
+ ch = *s;
|
|
||||||
+ *s = '\0';
|
|
||||||
+ statusw += TEXTW(text) - lrpad;
|
|
||||||
+ *s = ch;
|
|
||||||
+ text = s + 1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ statusw += TEXTW(text) - lrpad + 2;
|
|
||||||
+ }
|
|
||||||
drawbar(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.0
|
|
||||||
|
|
||||||
42
transient.c
42
transient.c
|
|
@ -1,42 +0,0 @@
|
||||||
/* cc transient.c -o transient -lX11 */
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
|
|
||||||
int main(void) {
|
|
||||||
Display *d;
|
|
||||||
Window r, f, t = None;
|
|
||||||
XSizeHints h;
|
|
||||||
XEvent e;
|
|
||||||
|
|
||||||
d = XOpenDisplay(NULL);
|
|
||||||
if (!d)
|
|
||||||
exit(1);
|
|
||||||
r = DefaultRootWindow(d);
|
|
||||||
|
|
||||||
f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0);
|
|
||||||
h.min_width = h.max_width = h.min_height = h.max_height = 400;
|
|
||||||
h.flags = PMinSize | PMaxSize;
|
|
||||||
XSetWMNormalHints(d, f, &h);
|
|
||||||
XStoreName(d, f, "floating");
|
|
||||||
XMapWindow(d, f);
|
|
||||||
|
|
||||||
XSelectInput(d, f, ExposureMask);
|
|
||||||
while (1) {
|
|
||||||
XNextEvent(d, &e);
|
|
||||||
|
|
||||||
if (t == None) {
|
|
||||||
sleep(5);
|
|
||||||
t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0);
|
|
||||||
XSetTransientForHint(d, t, f);
|
|
||||||
XStoreName(d, t, "transient");
|
|
||||||
XMapWindow(d, t);
|
|
||||||
XSelectInput(d, t, ExposureMask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
XCloseDisplay(d);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
36
util.c
36
util.c
|
|
@ -1,36 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
void
|
|
||||||
die(const char *fmt, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
vfprintf(stderr, fmt, ap);
|
|
||||||
va_end(ap);
|
|
||||||
|
|
||||||
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
|
|
||||||
fputc(' ', stderr);
|
|
||||||
perror(NULL);
|
|
||||||
} else {
|
|
||||||
fputc('\n', stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void *
|
|
||||||
ecalloc(size_t nmemb, size_t size)
|
|
||||||
{
|
|
||||||
void *p;
|
|
||||||
|
|
||||||
if (!(p = calloc(nmemb, size)))
|
|
||||||
die("calloc:");
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
8
util.h
8
util.h
|
|
@ -1,8 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
|
||||||
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
|
||||||
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
|
|
||||||
|
|
||||||
void die(const char *fmt, ...);
|
|
||||||
void *ecalloc(size_t nmemb, size_t size);
|
|
||||||
Loading…
Reference in New Issue
Block a user