Patching dwm 6.5 - colorbar fullgaps status2d
This commit is contained in:
parent
c492d94019
commit
88a680bc2c
38
dwm-6.5/LICENSE
Normal file
38
dwm-6.5/LICENSE
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
MIT/X Consortium License
|
||||||
|
|
||||||
|
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
|
||||||
|
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
|
||||||
|
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
||||||
|
© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
|
||||||
|
© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
|
||||||
|
© 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>
|
||||||
|
© 2008 Martin Hurton <martin dot hurton at gmail dot com>
|
||||||
|
© 2008 Neale Pickett <neale dot woozle dot org>
|
||||||
|
© 2009 Mate Nagy <mnagy at port70 dot 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
|
||||||
|
copy of this software and associated documentation files (the "Software"),
|
||||||
|
to deal in the Software without restriction, including without limitation
|
||||||
|
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
Software is furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
DEALINGS IN THE SOFTWARE.
|
||||||
45
dwm-6.5/Makefile
Normal file
45
dwm-6.5/Makefile
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
# dwm - dynamic window manager
|
||||||
|
# See LICENSE file for copyright and license details.
|
||||||
|
|
||||||
|
include config.mk
|
||||||
|
|
||||||
|
SRC = drw.c dwm.c util.c
|
||||||
|
OBJ = ${SRC:.c=.o}
|
||||||
|
|
||||||
|
all: dwm
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
${CC} -c ${CFLAGS} $<
|
||||||
|
|
||||||
|
${OBJ}: config.h config.mk
|
||||||
|
|
||||||
|
config.h:
|
||||||
|
cp config.def.h $@
|
||||||
|
|
||||||
|
dwm: ${OBJ}
|
||||||
|
${CC} -o $@ ${OBJ} ${LDFLAGS}
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz config.h
|
||||||
|
|
||||||
|
dist: clean
|
||||||
|
mkdir -p dwm-${VERSION}
|
||||||
|
cp -R LICENSE Makefile README config.def.h config.mk\
|
||||||
|
dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION}
|
||||||
|
tar -cf dwm-${VERSION}.tar dwm-${VERSION}
|
||||||
|
gzip dwm-${VERSION}.tar
|
||||||
|
rm -rf dwm-${VERSION}
|
||||||
|
|
||||||
|
install: all
|
||||||
|
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||||
|
cp -f dwm ${DESTDIR}${PREFIX}/bin
|
||||||
|
chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
|
||||||
|
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||||
|
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||||
|
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
rm -f ${DESTDIR}${PREFIX}/bin/dwm\
|
||||||
|
${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||||
|
|
||||||
|
.PHONY: all clean dist install uninstall
|
||||||
48
dwm-6.5/README
Normal file
48
dwm-6.5/README
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
dwm - dynamic window manager
|
||||||
|
============================
|
||||||
|
dwm is an extremely fast, small, and dynamic window manager for X.
|
||||||
|
|
||||||
|
|
||||||
|
Requirements
|
||||||
|
------------
|
||||||
|
In order to build dwm you need the Xlib header files.
|
||||||
|
|
||||||
|
|
||||||
|
Installation
|
||||||
|
------------
|
||||||
|
Edit config.mk to match your local setup (dwm is installed into
|
||||||
|
the /usr/local namespace by default).
|
||||||
|
|
||||||
|
Afterwards enter the following command to build and install dwm (if
|
||||||
|
necessary as root):
|
||||||
|
|
||||||
|
make clean install
|
||||||
|
|
||||||
|
|
||||||
|
Running dwm
|
||||||
|
-----------
|
||||||
|
Add the following line to your .xinitrc to start dwm using startx:
|
||||||
|
|
||||||
|
exec dwm
|
||||||
|
|
||||||
|
In order to connect dwm to a specific display, make sure that
|
||||||
|
the DISPLAY environment variable is set correctly, e.g.:
|
||||||
|
|
||||||
|
DISPLAY=foo.bar:1 exec dwm
|
||||||
|
|
||||||
|
(This will start dwm on display :1 of the host foo.bar.)
|
||||||
|
|
||||||
|
In order to display status info in the bar, you can do something
|
||||||
|
like this in your .xinitrc:
|
||||||
|
|
||||||
|
while xsetroot -name "`date` `uptime | sed 's/.*,//'`"
|
||||||
|
do
|
||||||
|
sleep 1
|
||||||
|
done &
|
||||||
|
exec dwm
|
||||||
|
|
||||||
|
|
||||||
|
Configuration
|
||||||
|
-------------
|
||||||
|
The configuration of dwm is done by creating a custom config.h
|
||||||
|
and (re)compiling the source code.
|
||||||
130
dwm-6.5/config.def.h
Normal file
130
dwm-6.5/config.def.h
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/* appearance */
|
||||||
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int gappx = 5; /* gaps between windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
||||||
|
static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
|
||||||
|
static const unsigned int systrayspacing = 2; /* systray spacing */
|
||||||
|
static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
||||||
|
static const int showsystray = 1; /* 0 means no systray */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
|
static const char dmenufont[] = "monospace:size=10";
|
||||||
|
|
||||||
|
static const char col_gray1[] = "#2E3440"; // #2E3440 #222222
|
||||||
|
static const char col_gray2[] = "#434C5E"; // #434C5E #444444
|
||||||
|
static const char col_gray3[] = "#D8DEE9"; // #D8DEE9 #bbbbbb
|
||||||
|
static const char col_gray4[] = "#ECEFF4"; // #ECEFF4 #EEEEEE
|
||||||
|
static const char col_cyan[] = "#8FBCBB"; // #8FBCBB #408977
|
||||||
|
static const char *colors[][3] = {
|
||||||
|
/* fg bg border */
|
||||||
|
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
||||||
|
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
||||||
|
[SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty}
|
||||||
|
[SchemeTagsSel] = { col_gray4, col_cyan, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty}
|
||||||
|
[SchemeTagsNorm] = { col_gray3, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty}
|
||||||
|
[SchemeInfoSel] = { col_gray4, col_cyan, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty}
|
||||||
|
[SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty}
|
||||||
|
};
|
||||||
|
|
||||||
|
/* tagging */
|
||||||
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||||
|
|
||||||
|
static 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 << 8, 0, -1 },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* layout(s) */
|
||||||
|
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||||
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
|
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
||||||
|
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
||||||
|
|
||||||
|
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 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 };
|
||||||
|
|
||||||
|
static const 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_i, incnmaster, {.i = +1 } },
|
||||||
|
{ MODKEY, XK_d, incnmaster, {.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 } },
|
||||||
|
{ MODKEY, XK_minus, setgaps, {.i = -1 } },
|
||||||
|
{ MODKEY, XK_equal, setgaps, {.i = +1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = 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|ShiftMask, XK_q, quit, {0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* button definitions */
|
||||||
|
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||||
|
static 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, 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} },
|
||||||
|
};
|
||||||
39
dwm-6.5/config.mk
Normal file
39
dwm-6.5/config.mk
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# dwm version
|
||||||
|
VERSION = 6.5
|
||||||
|
|
||||||
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
# paths
|
||||||
|
PREFIX = /usr/local
|
||||||
|
MANPREFIX = ${PREFIX}/share/man
|
||||||
|
|
||||||
|
X11INC = /usr/X11R6/include
|
||||||
|
X11LIB = /usr/X11R6/lib
|
||||||
|
|
||||||
|
# Xinerama, comment if you don't want it
|
||||||
|
XINERAMALIBS = -lXinerama
|
||||||
|
XINERAMAFLAGS = -DXINERAMA
|
||||||
|
|
||||||
|
# freetype
|
||||||
|
FREETYPELIBS = -lfontconfig -lXft
|
||||||
|
FREETYPEINC = /usr/include/freetype2
|
||||||
|
# OpenBSD (uncomment)
|
||||||
|
#FREETYPEINC = ${X11INC}/freetype2
|
||||||
|
#MANPREFIX = ${PREFIX}/man
|
||||||
|
|
||||||
|
# includes and libs
|
||||||
|
INCS = -I${X11INC} -I${FREETYPEINC}
|
||||||
|
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
||||||
|
|
||||||
|
# flags
|
||||||
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
|
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
||||||
|
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
|
||||||
|
LDFLAGS = ${LIBS}
|
||||||
|
|
||||||
|
# Solaris
|
||||||
|
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
||||||
|
#LDFLAGS = ${LIBS}
|
||||||
|
|
||||||
|
# compiler and linker
|
||||||
|
CC = cc
|
||||||
450
dwm-6.5/drw.c
Normal file
450
dwm-6.5/drw.c
Normal file
@ -0,0 +1,450 @@
|
|||||||
|
/* 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);
|
||||||
|
}
|
||||||
58
dwm-6.5/drw.h
Normal file
58
dwm-6.5/drw.h
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
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);
|
||||||
176
dwm-6.5/dwm.1
Normal file
176
dwm-6.5/dwm.1
Normal file
@ -0,0 +1,176 @@
|
|||||||
|
.TH DWM 1 dwm\-VERSION
|
||||||
|
.SH NAME
|
||||||
|
dwm \- dynamic window manager
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B dwm
|
||||||
|
.RB [ \-v ]
|
||||||
|
.SH DESCRIPTION
|
||||||
|
dwm is a dynamic window manager for X. It manages windows in tiled, monocle
|
||||||
|
and floating layouts. Either layout can be applied dynamically, optimising the
|
||||||
|
environment for the application in use and the task performed.
|
||||||
|
.P
|
||||||
|
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
|
||||||
|
right contains all other windows. The number of master area windows can be
|
||||||
|
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
|
||||||
|
moved freely. Dialog windows are always managed floating, regardless of the
|
||||||
|
layout applied.
|
||||||
|
.P
|
||||||
|
Windows are grouped by tags. Each window can be tagged with one or multiple
|
||||||
|
tags. Selecting certain tags displays all windows with these tags.
|
||||||
|
.P
|
||||||
|
Each screen contains a small status bar which displays all available tags, the
|
||||||
|
layout, the title of the focused window, and the text read from the root window
|
||||||
|
name property, if the screen is focused. A floating window is indicated with an
|
||||||
|
empty square and a maximised floating window is indicated with a filled square
|
||||||
|
before the windows title. The selected tags are indicated with a different
|
||||||
|
color. The tags of the focused window are indicated with a filled square in the
|
||||||
|
top left corner. The tags which are applied to one or more windows are
|
||||||
|
indicated with an empty square in the top left corner.
|
||||||
|
.P
|
||||||
|
dwm draws a small border around windows to indicate the focus state.
|
||||||
|
.SH OPTIONS
|
||||||
|
.TP
|
||||||
|
.B \-v
|
||||||
|
prints version information to stderr, then exits.
|
||||||
|
.SH USAGE
|
||||||
|
.SS Status bar
|
||||||
|
.TP
|
||||||
|
.B X root window name
|
||||||
|
is read and displayed in the status text area. It can be set with the
|
||||||
|
.BR xsetroot (1)
|
||||||
|
command.
|
||||||
|
.TP
|
||||||
|
.B Button1
|
||||||
|
click on a tag label to display all windows with that tag, click on the layout
|
||||||
|
label toggles between tiled and floating layout.
|
||||||
|
.TP
|
||||||
|
.B Button3
|
||||||
|
click on a tag label adds/removes all windows with that tag to/from the view.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Button1
|
||||||
|
click on a tag label applies that tag to the focused window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Button3
|
||||||
|
click on a tag label adds/removes that tag to/from the focused window.
|
||||||
|
.SS Keyboard commands
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-Return
|
||||||
|
Start
|
||||||
|
.BR st(1).
|
||||||
|
.TP
|
||||||
|
.B Mod1\-p
|
||||||
|
Spawn
|
||||||
|
.BR dmenu(1)
|
||||||
|
for launching other programs.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-,
|
||||||
|
Focus previous screen, if any.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-.
|
||||||
|
Focus next screen, if any.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-,
|
||||||
|
Send focused window to previous screen, if any.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-.
|
||||||
|
Send focused window to next screen, if any.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-b
|
||||||
|
Toggles bar on and off.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-t
|
||||||
|
Sets tiled layout.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-f
|
||||||
|
Sets floating layout.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-m
|
||||||
|
Sets monocle layout.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-space
|
||||||
|
Toggles between current and previous layout.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-j
|
||||||
|
Focus next window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-k
|
||||||
|
Focus previous window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-i
|
||||||
|
Increase number of windows in master area.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-d
|
||||||
|
Decrease number of windows in master area.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-l
|
||||||
|
Increase master area size.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-h
|
||||||
|
Decrease master area size.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Return
|
||||||
|
Zooms/cycles focused window to/from master area (tiled layouts only).
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-c
|
||||||
|
Close focused window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-space
|
||||||
|
Toggle focused window between tiled and floating state.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Tab
|
||||||
|
Toggles to the previously selected tags.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-[1..n]
|
||||||
|
Apply nth tag to focused window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-0
|
||||||
|
Apply all tags to focused window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Control\-Shift\-[1..n]
|
||||||
|
Add/remove nth tag to/from focused window.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-[1..n]
|
||||||
|
View all windows with nth tag.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-0
|
||||||
|
View all windows with any tag.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Control\-[1..n]
|
||||||
|
Add/remove all windows with nth tag to/from the view.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Shift\-q
|
||||||
|
Quit dwm.
|
||||||
|
.SS Mouse commands
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Button1
|
||||||
|
Move focused window while dragging. Tiled windows will be toggled to the floating state.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Button2
|
||||||
|
Toggles focused window between floating and tiled state.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Button3
|
||||||
|
Resize focused window while dragging. Tiled windows will be toggled to the floating state.
|
||||||
|
.SH CUSTOMIZATION
|
||||||
|
dwm is customized by creating a custom config.h and (re)compiling the source
|
||||||
|
code. This keeps it fast, secure and simple.
|
||||||
|
.SH SEE ALSO
|
||||||
|
.BR dmenu (1),
|
||||||
|
.BR st (1)
|
||||||
|
.SH ISSUES
|
||||||
|
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
|
||||||
|
JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
|
||||||
|
are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the
|
||||||
|
environment variable
|
||||||
|
.BR AWT_TOOLKIT=MToolkit
|
||||||
|
(to use the older Motif backend instead) or running
|
||||||
|
.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D
|
||||||
|
or
|
||||||
|
.B wmname LG3D
|
||||||
|
(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
|
||||||
|
.BR _JAVA_AWT_WM_NONREPARENTING=1 .
|
||||||
|
.SH BUGS
|
||||||
|
Send all bug reports with a patch to hackers@suckless.org.
|
||||||
2647
dwm-6.5/dwm.c
Normal file
2647
dwm-6.5/dwm.c
Normal file
File diff suppressed because it is too large
Load Diff
BIN
dwm-6.5/dwm.png
Normal file
BIN
dwm-6.5/dwm.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 373 B |
86
dwm-6.5/patches/done/dwm-colorbar-6.3.diff
Normal file
86
dwm-6.5/patches/done/dwm-colorbar-6.3.diff
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
From 647a2a56cf7cab6dea868f9800671770940ce3c3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alessandro Sisto <alessandro.sisto@studioform.net>
|
||||||
|
Date: Sun, 5 Jun 2022 12:03:43 +0200
|
||||||
|
Subject: [PATCH] colorbar
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 6 +++++-
|
||||||
|
dwm.c | 12 ++++++------
|
||||||
|
2 files changed, 11 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index a2ac963..56bc324 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -16,6 +16,11 @@ static const char *colors[][3] = {
|
||||||
|
/* fg bg border */
|
||||||
|
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
||||||
|
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
||||||
|
+ [SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty}
|
||||||
|
+ [SchemeTagsSel] = { col_gray4, col_cyan, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty}
|
||||||
|
+ [SchemeTagsNorm] = { col_gray3, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty}
|
||||||
|
+ [SchemeInfoSel] = { col_gray4, col_cyan, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty}
|
||||||
|
+ [SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty}
|
||||||
|
};
|
||||||
|
|
||||||
|
/* tagging */
|
||||||
|
@@ -113,4 +118,3 @@ static Button buttons[] = {
|
||||||
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||||
|
};
|
||||||
|
-
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index a96f33c..0eaa4cd 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -59,7 +59,7 @@
|
||||||
|
|
||||||
|
/* enums */
|
||||||
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
||||||
|
-enum { SchemeNorm, SchemeSel }; /* color schemes */
|
||||||
|
+enum { SchemeNorm, SchemeSel, SchemeStatus, SchemeTagsSel, SchemeTagsNorm, SchemeInfoSel, SchemeInfoNorm }; /* color schemes */
|
||||||
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||||
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||||
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||||
|
@@ -707,7 +707,7 @@ drawbar(Monitor *m)
|
||||||
|
|
||||||
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
- drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
+ drw_setscheme(drw, scheme[SchemeStatus]);
|
||||||
|
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||||
|
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
||||||
|
}
|
||||||
|
@@ -720,7 +720,7 @@ drawbar(Monitor *m)
|
||||||
|
x = 0;
|
||||||
|
for (i = 0; i < LENGTH(tags); i++) {
|
||||||
|
w = TEXTW(tags[i]);
|
||||||
|
- drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|
||||||
|
+ drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]);
|
||||||
|
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
|
||||||
|
if (occ & 1 << i)
|
||||||
|
drw_rect(drw, x + boxs, boxs, boxw, boxw,
|
||||||
|
@@ -729,17 +729,17 @@ drawbar(Monitor *m)
|
||||||
|
x += w;
|
||||||
|
}
|
||||||
|
w = blw = TEXTW(m->ltsymbol);
|
||||||
|
- drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
+ drw_setscheme(drw, scheme[SchemeTagsNorm]);
|
||||||
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
|
if ((w = m->ww - tw - x) > bh) {
|
||||||
|
if (m->sel) {
|
||||||
|
- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||||
|
+ drw_setscheme(drw, scheme[m == selmon ? SchemeInfoSel : SchemeInfoNorm]);
|
||||||
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
if (m->sel->isfloating)
|
||||||
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
||||||
|
} else {
|
||||||
|
- drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
+ drw_setscheme(drw, scheme[SchemeInfoNorm]);
|
||||||
|
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
||||||
94
dwm-6.5/patches/done/dwm-fullgaps-6.4.diff
Normal file
94
dwm-6.5/patches/done/dwm-fullgaps-6.4.diff
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
diff -up a/config.def.h b/config.def.h
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -2,6 +2,7 @@
|
||||||
|
|
||||||
|
/* appearance */
|
||||||
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
+static const unsigned int gappx = 5; /* gaps between windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
@@ -85,6 +86,9 @@ static const Key keys[] = {
|
||||||
|
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
||||||
|
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||||
|
+ { MODKEY, XK_minus, setgaps, {.i = -1 } },
|
||||||
|
+ { MODKEY, XK_equal, setgaps, {.i = +1 } },
|
||||||
|
+ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
|
||||||
|
TAGKEYS( XK_1, 0)
|
||||||
|
TAGKEYS( XK_2, 1)
|
||||||
|
TAGKEYS( XK_3, 2)
|
||||||
|
diff -up a/dwm.c b/dwm.c
|
||||||
|
--- a/dwm.c 2023-04-30
|
||||||
|
+++ b/dwm.c 2023-04-30
|
||||||
|
@@ -119,6 +119,7 @@ struct Monitor {
|
||||||
|
int by; /* bar geometry */
|
||||||
|
int mx, my, mw, mh; /* screen size */
|
||||||
|
int wx, wy, ww, wh; /* window area */
|
||||||
|
+ int gappx; /* gaps between windows */
|
||||||
|
unsigned int seltags;
|
||||||
|
unsigned int sellt;
|
||||||
|
unsigned int tagset[2];
|
||||||
|
@@ -200,6 +201,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);
|
||||||
|
@@ -641,6 +643,7 @@ createmon(void)
|
||||||
|
m->nmaster = nmaster;
|
||||||
|
m->showbar = showbar;
|
||||||
|
m->topbar = topbar;
|
||||||
|
+ m->gappx = gappx;
|
||||||
|
m->lt[0] = &layouts[0];
|
||||||
|
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
||||||
|
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
||||||
|
@@ -1508,6 +1511,16 @@ setfullscreen(Client *c, int fullscreen)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
+setgaps(const Arg *arg)
|
||||||
|
+{
|
||||||
|
+ if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
|
||||||
|
+ selmon->gappx = 0;
|
||||||
|
+ else
|
||||||
|
+ selmon->gappx += arg->i;
|
||||||
|
+ arrange(selmon);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
setlayout(const Arg *arg)
|
||||||
|
{
|
||||||
|
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
|
||||||
|
@@ -1697,18 +1710,18 @@ tile(Monitor *m)
|
||||||
|
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);
|
||||||
|
+ mw = m->ww - m->gappx;
|
||||||
|
+ for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
||||||
|
+ if (i < m->nmaster) {
|
||||||
|
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
|
||||||
|
+ resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0);
|
||||||
|
+ if (my + HEIGHT(c) + m->gappx < m->wh)
|
||||||
|
+ my += HEIGHT(c) + m->gappx;
|
||||||
|
} 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);
|
||||||
|
+ h = (m->wh - ty) / (n - i) - m->gappx;
|
||||||
|
+ resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0);
|
||||||
|
+ if (ty + HEIGHT(c) + m->gappx < m->wh)
|
||||||
|
+ ty += HEIGHT(c) + m->gappx;
|
||||||
|
}
|
||||||
|
}
|
||||||
879
dwm-6.5/patches/done/dwm-status2d-systray-6.4.diff
Normal file
879
dwm-6.5/patches/done/dwm-status2d-systray-6.4.diff
Normal file
@ -0,0 +1,879 @@
|
|||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 061ad66..a308a7e 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -3,6 +3,11 @@
|
||||||
|
/* appearance */
|
||||||
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
||||||
|
+static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
|
||||||
|
+static const unsigned int systrayspacing = 2; /* systray spacing */
|
||||||
|
+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
||||||
|
+static const int showsystray = 1; /* 0 means no systray */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
|
@@ -112,4 +117,3 @@ static const Button buttons[] = {
|
||||||
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||||
|
};
|
||||||
|
-
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index e5efb6a..79a46f5 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -57,12 +57,27 @@
|
||||||
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
||||||
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
||||||
|
|
||||||
|
+#define SYSTEM_TRAY_REQUEST_DOCK 0
|
||||||
|
+/* XEMBED messages */
|
||||||
|
+#define XEMBED_EMBEDDED_NOTIFY 0
|
||||||
|
+#define XEMBED_WINDOW_ACTIVATE 1
|
||||||
|
+#define XEMBED_FOCUS_IN 4
|
||||||
|
+#define XEMBED_MODALITY_ON 10
|
||||||
|
+#define XEMBED_MAPPED (1 << 0)
|
||||||
|
+#define XEMBED_WINDOW_ACTIVATE 1
|
||||||
|
+#define XEMBED_WINDOW_DEACTIVATE 2
|
||||||
|
+#define VERSION_MAJOR 0
|
||||||
|
+#define VERSION_MINOR 0
|
||||||
|
+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
|
||||||
|
+
|
||||||
|
/* enums */
|
||||||
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
||||||
|
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
||||||
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||||
|
+ NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
|
||||||
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||||
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||||
|
+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
||||||
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||||
|
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||||
|
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
@@ -141,6 +156,12 @@ typedef struct {
|
||||||
|
int monitor;
|
||||||
|
} Rule;
|
||||||
|
|
||||||
|
+typedef struct Systray Systray;
|
||||||
|
+struct Systray {
|
||||||
|
+ Window win;
|
||||||
|
+ Client *icons;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/* function declarations */
|
||||||
|
static void applyrules(Client *c);
|
||||||
|
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
||||||
|
@@ -163,6 +184,7 @@ static void detachstack(Client *c);
|
||||||
|
static Monitor *dirtomon(int dir);
|
||||||
|
static void drawbar(Monitor *m);
|
||||||
|
static void drawbars(void);
|
||||||
|
+static int drawstatusbar(Monitor *m, int bh, char* text);
|
||||||
|
static void enternotify(XEvent *e);
|
||||||
|
static void expose(XEvent *e);
|
||||||
|
static void focus(Client *c);
|
||||||
|
@@ -172,6 +194,7 @@ static void focusstack(const Arg *arg);
|
||||||
|
static Atom getatomprop(Client *c, Atom prop);
|
||||||
|
static int getrootptr(int *x, int *y);
|
||||||
|
static long getstate(Window w);
|
||||||
|
+static unsigned int getsystraywidth();
|
||||||
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
|
static void grabbuttons(Client *c, int focused);
|
||||||
|
static void grabkeys(void);
|
||||||
|
@@ -189,13 +212,16 @@ static void pop(Client *c);
|
||||||
|
static void propertynotify(XEvent *e);
|
||||||
|
static void quit(const Arg *arg);
|
||||||
|
static Monitor *recttomon(int x, int y, int w, int h);
|
||||||
|
+static void removesystrayicon(Client *i);
|
||||||
|
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||||
|
+static void resizebarwin(Monitor *m);
|
||||||
|
static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||||
|
static void resizemouse(const Arg *arg);
|
||||||
|
+static void resizerequest(XEvent *e);
|
||||||
|
static void restack(Monitor *m);
|
||||||
|
static void run(void);
|
||||||
|
static void scan(void);
|
||||||
|
-static int sendevent(Client *c, Atom proto);
|
||||||
|
+static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
|
||||||
|
static void sendmon(Client *c, Monitor *m);
|
||||||
|
static void setclientstate(Client *c, long state);
|
||||||
|
static void setfocus(Client *c);
|
||||||
|
@@ -207,6 +233,7 @@ static void seturgent(Client *c, int urg);
|
||||||
|
static void showhide(Client *c);
|
||||||
|
static void sigchld(int unused);
|
||||||
|
static void spawn(const Arg *arg);
|
||||||
|
+static Monitor *systraytomon(Monitor *m);
|
||||||
|
static void tag(const Arg *arg);
|
||||||
|
static void tagmon(const Arg *arg);
|
||||||
|
static void tile(Monitor *m);
|
||||||
|
@@ -224,20 +251,25 @@ static int updategeom(void);
|
||||||
|
static void updatenumlockmask(void);
|
||||||
|
static void updatesizehints(Client *c);
|
||||||
|
static void updatestatus(void);
|
||||||
|
+static void updatesystray(void);
|
||||||
|
+static void updatesystrayicongeom(Client *i, int w, int h);
|
||||||
|
+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
||||||
|
static void updatetitle(Client *c);
|
||||||
|
static void updatewindowtype(Client *c);
|
||||||
|
static void updatewmhints(Client *c);
|
||||||
|
static void view(const Arg *arg);
|
||||||
|
static Client *wintoclient(Window w);
|
||||||
|
static Monitor *wintomon(Window w);
|
||||||
|
+static Client *wintosystrayicon(Window w);
|
||||||
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
|
static void zoom(const Arg *arg);
|
||||||
|
|
||||||
|
/* variables */
|
||||||
|
+static Systray *systray = NULL;
|
||||||
|
static const char broken[] = "broken";
|
||||||
|
-static char stext[256];
|
||||||
|
+static char stext[1024];
|
||||||
|
static int screen;
|
||||||
|
static int sw, sh; /* X display screen geometry width, height */
|
||||||
|
static int bh; /* bar height */
|
||||||
|
@@ -258,9 +290,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
||||||
|
[MapRequest] = maprequest,
|
||||||
|
[MotionNotify] = motionnotify,
|
||||||
|
[PropertyNotify] = propertynotify,
|
||||||
|
+ [ResizeRequest] = resizerequest,
|
||||||
|
[UnmapNotify] = unmapnotify
|
||||||
|
};
|
||||||
|
-static Atom wmatom[WMLast], netatom[NetLast];
|
||||||
|
+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
||||||
|
static int running = 1;
|
||||||
|
static Cur *cursor[CurLast];
|
||||||
|
static Clr **scheme;
|
||||||
|
@@ -442,7 +475,7 @@ buttonpress(XEvent *e)
|
||||||
|
arg.ui = 1 << i;
|
||||||
|
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
||||||
|
click = ClkLtSymbol;
|
||||||
|
- else if (ev->x > selmon->ww - (int)TEXTW(stext))
|
||||||
|
+ else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
|
||||||
|
click = ClkStatusText;
|
||||||
|
else
|
||||||
|
click = ClkWinTitle;
|
||||||
|
@@ -485,9 +518,16 @@ cleanup(void)
|
||||||
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
|
while (mons)
|
||||||
|
cleanupmon(mons);
|
||||||
|
- for (i = 0; i < CurLast; i++)
|
||||||
|
+
|
||||||
|
+ if (showsystray) {
|
||||||
|
+ XUnmapWindow(dpy, systray->win);
|
||||||
|
+ XDestroyWindow(dpy, systray->win);
|
||||||
|
+ free(systray);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < CurLast; i++)
|
||||||
|
drw_cur_free(drw, cursor[i]);
|
||||||
|
- for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
+ for (i = 0; i < LENGTH(colors) + 1; i++)
|
||||||
|
free(scheme[i]);
|
||||||
|
free(scheme);
|
||||||
|
XDestroyWindow(dpy, wmcheckwin);
|
||||||
|
@@ -516,9 +556,58 @@ cleanupmon(Monitor *mon)
|
||||||
|
void
|
||||||
|
clientmessage(XEvent *e)
|
||||||
|
{
|
||||||
|
+ XWindowAttributes wa;
|
||||||
|
+ XSetWindowAttributes swa;
|
||||||
|
XClientMessageEvent *cme = &e->xclient;
|
||||||
|
Client *c = wintoclient(cme->window);
|
||||||
|
|
||||||
|
+ if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
||||||
|
+ /* add systray icons */
|
||||||
|
+ if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
||||||
|
+ if (!(c = (Client *)calloc(1, sizeof(Client))))
|
||||||
|
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
||||||
|
+ if (!(c->win = cme->data.l[2])) {
|
||||||
|
+ free(c);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ c->mon = selmon;
|
||||||
|
+ c->next = systray->icons;
|
||||||
|
+ systray->icons = c;
|
||||||
|
+ if (!XGetWindowAttributes(dpy, c->win, &wa)) {
|
||||||
|
+ /* use sane defaults */
|
||||||
|
+ wa.width = bh;
|
||||||
|
+ wa.height = bh;
|
||||||
|
+ wa.border_width = 0;
|
||||||
|
+ }
|
||||||
|
+ c->x = c->oldx = c->y = c->oldy = 0;
|
||||||
|
+ c->w = c->oldw = wa.width;
|
||||||
|
+ c->h = c->oldh = wa.height;
|
||||||
|
+ c->oldbw = wa.border_width;
|
||||||
|
+ c->bw = 0;
|
||||||
|
+ c->isfloating = True;
|
||||||
|
+ /* reuse tags field as mapped status */
|
||||||
|
+ c->tags = 1;
|
||||||
|
+ updatesizehints(c);
|
||||||
|
+ updatesystrayicongeom(c, wa.width, wa.height);
|
||||||
|
+ XAddToSaveSet(dpy, c->win);
|
||||||
|
+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
||||||
|
+ XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
||||||
|
+ /* use parents background color */
|
||||||
|
+ swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ /* FIXME not sure if I have to send these events, too */
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ setclientstate(c, NormalState);
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (!c)
|
||||||
|
return;
|
||||||
|
if (cme->message_type == netatom[NetWMState]) {
|
||||||
|
@@ -571,7 +660,7 @@ configurenotify(XEvent *e)
|
||||||
|
for (c = m->clients; c; c = c->next)
|
||||||
|
if (c->isfullscreen)
|
||||||
|
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||||
|
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
||||||
|
+ resizebarwin(m);
|
||||||
|
}
|
||||||
|
focus(NULL);
|
||||||
|
arrange(NULL);
|
||||||
|
@@ -656,6 +745,11 @@ destroynotify(XEvent *e)
|
||||||
|
|
||||||
|
if ((c = wintoclient(ev->window)))
|
||||||
|
unmanage(c, 1);
|
||||||
|
+ else if ((c = wintosystrayicon(ev->window))) {
|
||||||
|
+ removesystrayicon(c);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -696,10 +790,119 @@ dirtomon(int dir)
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int
|
||||||
|
+drawstatusbar(Monitor *m, int bh, char* stext) {
|
||||||
|
+ int ret, i, w, x, len;
|
||||||
|
+ short isCode = 0;
|
||||||
|
+ char *text;
|
||||||
|
+ char *p;
|
||||||
|
+
|
||||||
|
+ len = strlen(stext) + 1 ;
|
||||||
|
+ if (!(text = (char*) malloc(sizeof(char)*len)))
|
||||||
|
+ die("malloc");
|
||||||
|
+ p = text;
|
||||||
|
+ memcpy(text, stext, len);
|
||||||
|
+
|
||||||
|
+ /* compute width of the status text */
|
||||||
|
+ w = 0;
|
||||||
|
+ i = -1;
|
||||||
|
+ while (text[++i]) {
|
||||||
|
+ if (text[i] == '^') {
|
||||||
|
+ if (!isCode) {
|
||||||
|
+ isCode = 1;
|
||||||
|
+ text[i] = '\0';
|
||||||
|
+ w += TEXTW(text) - lrpad;
|
||||||
|
+ text[i] = '^';
|
||||||
|
+ if (text[++i] == 'f')
|
||||||
|
+ w += atoi(text + ++i);
|
||||||
|
+ } else {
|
||||||
|
+ isCode = 0;
|
||||||
|
+ text = text + i + 1;
|
||||||
|
+ i = -1;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (!isCode)
|
||||||
|
+ w += TEXTW(text) - lrpad;
|
||||||
|
+ else
|
||||||
|
+ isCode = 0;
|
||||||
|
+ text = p;
|
||||||
|
+
|
||||||
|
+ w += 2; /* 1px padding on both sides */
|
||||||
|
+ ret = m->ww - w;
|
||||||
|
+ x = m->ww - w - getsystraywidth();
|
||||||
|
+
|
||||||
|
+ drw_setscheme(drw, scheme[LENGTH(colors)]);
|
||||||
|
+ drw->scheme[ColFg] = scheme[SchemeNorm][ColFg];
|
||||||
|
+ drw->scheme[ColBg] = scheme[SchemeNorm][ColBg];
|
||||||
|
+ drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
|
+ x++;
|
||||||
|
+
|
||||||
|
+ /* process status text */
|
||||||
|
+ i = -1;
|
||||||
|
+ while (text[++i]) {
|
||||||
|
+ if (text[i] == '^' && !isCode) {
|
||||||
|
+ isCode = 1;
|
||||||
|
+
|
||||||
|
+ text[i] = '\0';
|
||||||
|
+ w = TEXTW(text) - lrpad;
|
||||||
|
+ drw_text(drw, x, 0, w, bh, 0, text, 0);
|
||||||
|
+
|
||||||
|
+ x += w;
|
||||||
|
+
|
||||||
|
+ /* process code */
|
||||||
|
+ while (text[++i] != '^') {
|
||||||
|
+ if (text[i] == 'c') {
|
||||||
|
+ char buf[8];
|
||||||
|
+ memcpy(buf, (char*)text+i+1, 7);
|
||||||
|
+ buf[7] = '\0';
|
||||||
|
+ drw_clr_create(drw, &drw->scheme[ColFg], buf);
|
||||||
|
+ i += 7;
|
||||||
|
+ } else if (text[i] == 'b') {
|
||||||
|
+ char buf[8];
|
||||||
|
+ memcpy(buf, (char*)text+i+1, 7);
|
||||||
|
+ buf[7] = '\0';
|
||||||
|
+ drw_clr_create(drw, &drw->scheme[ColBg], buf);
|
||||||
|
+ i += 7;
|
||||||
|
+ } else if (text[i] == 'd') {
|
||||||
|
+ drw->scheme[ColFg] = scheme[SchemeNorm][ColFg];
|
||||||
|
+ drw->scheme[ColBg] = scheme[SchemeNorm][ColBg];
|
||||||
|
+ } else if (text[i] == 'r') {
|
||||||
|
+ int rx = atoi(text + ++i);
|
||||||
|
+ while (text[++i] != ',');
|
||||||
|
+ int ry = atoi(text + ++i);
|
||||||
|
+ while (text[++i] != ',');
|
||||||
|
+ int rw = atoi(text + ++i);
|
||||||
|
+ while (text[++i] != ',');
|
||||||
|
+ int rh = atoi(text + ++i);
|
||||||
|
+
|
||||||
|
+ drw_rect(drw, rx + x, ry, rw, rh, 1, 0);
|
||||||
|
+ } else if (text[i] == 'f') {
|
||||||
|
+ x += atoi(text + ++i);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ text = text + i + 1;
|
||||||
|
+ i=-1;
|
||||||
|
+ isCode = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!isCode) {
|
||||||
|
+ w = TEXTW(text) - lrpad;
|
||||||
|
+ drw_text(drw, x, 0, w, bh, 0, text, 0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
+ free(p);
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
drawbar(Monitor *m)
|
||||||
|
{
|
||||||
|
- int x, w, tw = 0;
|
||||||
|
+ int x, w, tw = 0, stw = 0;
|
||||||
|
int boxs = drw->fonts->h / 9;
|
||||||
|
int boxw = drw->fonts->h / 6 + 2;
|
||||||
|
unsigned int i, occ = 0, urg = 0;
|
||||||
|
@@ -708,13 +911,15 @@ drawbar(Monitor *m)
|
||||||
|
if (!m->showbar)
|
||||||
|
return;
|
||||||
|
|
||||||
|
+ if(showsystray && m == systraytomon(m) && !systrayonleft)
|
||||||
|
+ stw = getsystraywidth();
|
||||||
|
+
|
||||||
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
- 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);
|
||||||
|
+ tw = m->ww - drawstatusbar(m, bh, stext);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ resizebarwin(m);
|
||||||
|
for (c = m->clients; c; c = c->next) {
|
||||||
|
occ |= c->tags;
|
||||||
|
if (c->isurgent)
|
||||||
|
@@ -735,7 +940,7 @@ drawbar(Monitor *m)
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
|
- if ((w = m->ww - tw - x) > bh) {
|
||||||
|
+ if ((w = m->ww - tw - stw - x) > bh) {
|
||||||
|
if (m->sel) {
|
||||||
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||||
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
@@ -746,7 +951,7 @@ drawbar(Monitor *m)
|
||||||
|
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||||
|
+ drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -783,8 +988,11 @@ expose(XEvent *e)
|
||||||
|
Monitor *m;
|
||||||
|
XExposeEvent *ev = &e->xexpose;
|
||||||
|
|
||||||
|
- if (ev->count == 0 && (m = wintomon(ev->window)))
|
||||||
|
+ if (ev->count == 0 && (m = wintomon(ev->window))) {
|
||||||
|
drawbar(m);
|
||||||
|
+ if (m == selmon)
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -870,9 +1078,17 @@ getatomprop(Client *c, Atom prop)
|
||||||
|
unsigned char *p = NULL;
|
||||||
|
Atom da, atom = None;
|
||||||
|
|
||||||
|
- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||||
|
+ /* FIXME getatomprop should return the number of items and a pointer to
|
||||||
|
+ * the stored data instead of this workaround */
|
||||||
|
+ Atom req = XA_ATOM;
|
||||||
|
+ if (prop == xatom[XembedInfo])
|
||||||
|
+ req = xatom[XembedInfo];
|
||||||
|
+
|
||||||
|
+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
|
||||||
|
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||||
|
atom = *(Atom *)p;
|
||||||
|
+ if (da == xatom[XembedInfo] && dl == 2)
|
||||||
|
+ atom = ((Atom *)p)[1];
|
||||||
|
XFree(p);
|
||||||
|
}
|
||||||
|
return atom;
|
||||||
|
@@ -906,6 +1122,16 @@ getstate(Window w)
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
+unsigned int
|
||||||
|
+getsystraywidth()
|
||||||
|
+{
|
||||||
|
+ unsigned int w = 0;
|
||||||
|
+ Client *i;
|
||||||
|
+ if(showsystray)
|
||||||
|
+ for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
|
||||||
|
+ return w ? w + systrayspacing : 1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
gettextprop(Window w, Atom atom, char *text, unsigned int size)
|
||||||
|
{
|
||||||
|
@@ -1008,7 +1234,8 @@ killclient(const Arg *arg)
|
||||||
|
{
|
||||||
|
if (!selmon->sel)
|
||||||
|
return;
|
||||||
|
- if (!sendevent(selmon->sel, wmatom[WMDelete])) {
|
||||||
|
+
|
||||||
|
+ if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
|
||||||
|
XGrabServer(dpy);
|
||||||
|
XSetErrorHandler(xerrordummy);
|
||||||
|
XSetCloseDownMode(dpy, DestroyAll);
|
||||||
|
@@ -1095,6 +1322,14 @@ maprequest(XEvent *e)
|
||||||
|
static XWindowAttributes wa;
|
||||||
|
XMapRequestEvent *ev = &e->xmaprequest;
|
||||||
|
|
||||||
|
+ Client *i;
|
||||||
|
+ if ((i = wintosystrayicon(ev->window))) {
|
||||||
|
+ sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
|
||||||
|
return;
|
||||||
|
if (!wintoclient(ev->window))
|
||||||
|
@@ -1216,7 +1451,18 @@ propertynotify(XEvent *e)
|
||||||
|
Window trans;
|
||||||
|
XPropertyEvent *ev = &e->xproperty;
|
||||||
|
|
||||||
|
- if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||||
|
+ if ((c = wintosystrayicon(ev->window))) {
|
||||||
|
+ if (ev->atom == XA_WM_NORMAL_HINTS) {
|
||||||
|
+ updatesizehints(c);
|
||||||
|
+ updatesystrayicongeom(c, c->w, c->h);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ updatesystrayiconstate(c, ev);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||||
|
updatestatus();
|
||||||
|
else if (ev->state == PropertyDelete)
|
||||||
|
return; /* ignore */
|
||||||
|
@@ -1266,6 +1512,19 @@ recttomon(int x, int y, int w, int h)
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+removesystrayicon(Client *i)
|
||||||
|
+{
|
||||||
|
+ Client **ii;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !i)
|
||||||
|
+ return;
|
||||||
|
+ for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
|
||||||
|
+ if (ii)
|
||||||
|
+ *ii = i->next;
|
||||||
|
+ free(i);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
|
{
|
||||||
|
@@ -1273,6 +1532,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
|
resizeclient(c, x, y, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+resizebarwin(Monitor *m) {
|
||||||
|
+ unsigned int w = m->ww;
|
||||||
|
+ if (showsystray && m == systraytomon(m) && !systrayonleft)
|
||||||
|
+ w -= getsystraywidth();
|
||||||
|
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
resizeclient(Client *c, int x, int y, int w, int h)
|
||||||
|
{
|
||||||
|
@@ -1345,6 +1612,19 @@ resizemouse(const Arg *arg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+resizerequest(XEvent *e)
|
||||||
|
+{
|
||||||
|
+ XResizeRequestEvent *ev = &e->xresizerequest;
|
||||||
|
+ Client *i;
|
||||||
|
+
|
||||||
|
+ if ((i = wintosystrayicon(ev->window))) {
|
||||||
|
+ updatesystrayicongeom(i, ev->width, ev->height);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
restack(Monitor *m)
|
||||||
|
{
|
||||||
|
@@ -1434,26 +1714,37 @@ setclientstate(Client *c, long state)
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
-sendevent(Client *c, Atom proto)
|
||||||
|
+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
|
||||||
|
{
|
||||||
|
int n;
|
||||||
|
- Atom *protocols;
|
||||||
|
+ Atom *protocols, mt;
|
||||||
|
int exists = 0;
|
||||||
|
XEvent ev;
|
||||||
|
|
||||||
|
- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
|
||||||
|
- while (!exists && n--)
|
||||||
|
- exists = protocols[n] == proto;
|
||||||
|
- XFree(protocols);
|
||||||
|
+ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
|
||||||
|
+ mt = wmatom[WMProtocols];
|
||||||
|
+ if (XGetWMProtocols(dpy, w, &protocols, &n)) {
|
||||||
|
+ while (!exists && n--)
|
||||||
|
+ exists = protocols[n] == proto;
|
||||||
|
+ XFree(protocols);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
+ else {
|
||||||
|
+ exists = True;
|
||||||
|
+ mt = proto;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (exists) {
|
||||||
|
ev.type = ClientMessage;
|
||||||
|
- ev.xclient.window = c->win;
|
||||||
|
- ev.xclient.message_type = wmatom[WMProtocols];
|
||||||
|
+ ev.xclient.window = w;
|
||||||
|
+ ev.xclient.message_type = mt;
|
||||||
|
ev.xclient.format = 32;
|
||||||
|
- ev.xclient.data.l[0] = proto;
|
||||||
|
- ev.xclient.data.l[1] = CurrentTime;
|
||||||
|
- XSendEvent(dpy, c->win, False, NoEventMask, &ev);
|
||||||
|
+ ev.xclient.data.l[0] = d0;
|
||||||
|
+ ev.xclient.data.l[1] = d1;
|
||||||
|
+ ev.xclient.data.l[2] = d2;
|
||||||
|
+ ev.xclient.data.l[3] = d3;
|
||||||
|
+ ev.xclient.data.l[4] = d4;
|
||||||
|
+ XSendEvent(dpy, w, False, mask, &ev);
|
||||||
|
}
|
||||||
|
return exists;
|
||||||
|
}
|
||||||
|
@@ -1467,7 +1758,7 @@ setfocus(Client *c)
|
||||||
|
XA_WINDOW, 32, PropModeReplace,
|
||||||
|
(unsigned char *) &(c->win), 1);
|
||||||
|
}
|
||||||
|
- sendevent(c, wmatom[WMTakeFocus]);
|
||||||
|
+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1555,22 +1846,32 @@ setup(void)
|
||||||
|
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
|
||||||
|
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
|
||||||
|
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
|
||||||
|
- netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
||||||
|
- netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
||||||
|
+ netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
||||||
|
+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
|
||||||
|
+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
|
||||||
|
+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
||||||
|
+ netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
|
||||||
|
+ netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
||||||
|
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
||||||
|
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
||||||
|
netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
|
||||||
|
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
||||||
|
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||||
|
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
||||||
|
- /* init cursors */
|
||||||
|
+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
||||||
|
+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
||||||
|
+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
||||||
|
+ /* init cursors */
|
||||||
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
||||||
|
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
||||||
|
cursor[CurMove] = drw_cur_create(drw, XC_fleur);
|
||||||
|
/* init appearance */
|
||||||
|
- scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
||||||
|
+ scheme = ecalloc(LENGTH(colors) + 1, sizeof(Clr *));
|
||||||
|
+ scheme[LENGTH(colors)] = drw_scm_create(drw, colors[0], 3);
|
||||||
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
||||||
|
+ /* init system tray */
|
||||||
|
+ updatesystray();
|
||||||
|
/* init bars */
|
||||||
|
updatebars();
|
||||||
|
updatestatus();
|
||||||
|
@@ -1699,7 +2000,18 @@ togglebar(const Arg *arg)
|
||||||
|
{
|
||||||
|
selmon->showbar = !selmon->showbar;
|
||||||
|
updatebarpos(selmon);
|
||||||
|
- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ if (showsystray) {
|
||||||
|
+ XWindowChanges wc;
|
||||||
|
+ if (!selmon->showbar)
|
||||||
|
+ wc.y = -bh;
|
||||||
|
+ else if (selmon->showbar) {
|
||||||
|
+ wc.y = 0;
|
||||||
|
+ if (!selmon->topbar)
|
||||||
|
+ wc.y = selmon->mh - bh;
|
||||||
|
+ }
|
||||||
|
+ XConfigureWindow(dpy, systray->win, CWY, &wc);
|
||||||
|
+ }
|
||||||
|
arrange(selmon);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1795,11 +2107,18 @@ unmapnotify(XEvent *e)
|
||||||
|
else
|
||||||
|
unmanage(c, 0);
|
||||||
|
}
|
||||||
|
+ else if ((c = wintosystrayicon(ev->window))) {
|
||||||
|
+ /* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
||||||
|
+ * _not_ destroy them. We map those windows back */
|
||||||
|
+ XMapRaised(dpy, c->win);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
updatebars(void)
|
||||||
|
{
|
||||||
|
+ unsigned int w;
|
||||||
|
Monitor *m;
|
||||||
|
XSetWindowAttributes wa = {
|
||||||
|
.override_redirect = True,
|
||||||
|
@@ -1810,10 +2129,15 @@ updatebars(void)
|
||||||
|
for (m = mons; m; m = m->next) {
|
||||||
|
if (m->barwin)
|
||||||
|
continue;
|
||||||
|
- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
|
||||||
|
+ w = m->ww;
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ w -= getsystraywidth();
|
||||||
|
+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
|
||||||
|
CopyFromParent, DefaultVisual(dpy, screen),
|
||||||
|
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
||||||
|
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ XMapRaised(dpy, systray->win);
|
||||||
|
XMapRaised(dpy, m->barwin);
|
||||||
|
XSetClassHint(dpy, m->barwin, &ch);
|
||||||
|
}
|
||||||
|
@@ -1990,6 +2314,125 @@ updatestatus(void)
|
||||||
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||||
|
strcpy(stext, "dwm-"VERSION);
|
||||||
|
drawbar(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystrayicongeom(Client *i, int w, int h)
|
||||||
|
+{
|
||||||
|
+ if (i) {
|
||||||
|
+ i->h = bh;
|
||||||
|
+ if (w == h)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ else if (h == bh)
|
||||||
|
+ i->w = w;
|
||||||
|
+ else
|
||||||
|
+ i->w = (int) ((float)bh * ((float)w / (float)h));
|
||||||
|
+ applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
|
||||||
|
+ /* force icons into the systray dimensions if they don't want to */
|
||||||
|
+ if (i->h > bh) {
|
||||||
|
+ if (i->w == i->h)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ else
|
||||||
|
+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
|
||||||
|
+ i->h = bh;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystrayiconstate(Client *i, XPropertyEvent *ev)
|
||||||
|
+{
|
||||||
|
+ long flags;
|
||||||
|
+ int code = 0;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
|
||||||
|
+ !(flags = getatomprop(i, xatom[XembedInfo])))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ if (flags & XEMBED_MAPPED && !i->tags) {
|
||||||
|
+ i->tags = 1;
|
||||||
|
+ code = XEMBED_WINDOW_ACTIVATE;
|
||||||
|
+ XMapRaised(dpy, i->win);
|
||||||
|
+ setclientstate(i, NormalState);
|
||||||
|
+ }
|
||||||
|
+ else if (!(flags & XEMBED_MAPPED) && i->tags) {
|
||||||
|
+ i->tags = 0;
|
||||||
|
+ code = XEMBED_WINDOW_DEACTIVATE;
|
||||||
|
+ XUnmapWindow(dpy, i->win);
|
||||||
|
+ setclientstate(i, WithdrawnState);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return;
|
||||||
|
+ sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
|
||||||
|
+ systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystray(void)
|
||||||
|
+{
|
||||||
|
+ XSetWindowAttributes wa;
|
||||||
|
+ XWindowChanges wc;
|
||||||
|
+ Client *i;
|
||||||
|
+ Monitor *m = systraytomon(NULL);
|
||||||
|
+ unsigned int x = m->mx + m->mw;
|
||||||
|
+ unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
|
||||||
|
+ unsigned int w = 1;
|
||||||
|
+
|
||||||
|
+ if (!showsystray)
|
||||||
|
+ return;
|
||||||
|
+ if (systrayonleft)
|
||||||
|
+ x -= sw + lrpad / 2;
|
||||||
|
+ if (!systray) {
|
||||||
|
+ /* init systray */
|
||||||
|
+ if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
|
||||||
|
+ die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
|
||||||
|
+ systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
|
||||||
|
+ wa.event_mask = ButtonPressMask | ExposureMask;
|
||||||
|
+ wa.override_redirect = True;
|
||||||
|
+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
|
||||||
|
+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
|
||||||
|
+ PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1);
|
||||||
|
+ XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
|
||||||
|
+ XMapRaised(dpy, systray->win);
|
||||||
|
+ XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
|
||||||
|
+ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
|
||||||
|
+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ fprintf(stderr, "dwm: unable to obtain system tray.\n");
|
||||||
|
+ free(systray);
|
||||||
|
+ systray = NULL;
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ for (w = 0, i = systray->icons; i; i = i->next) {
|
||||||
|
+ /* make sure the background color stays the same */
|
||||||
|
+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
|
||||||
|
+ XMapRaised(dpy, i->win);
|
||||||
|
+ w += systrayspacing;
|
||||||
|
+ i->x = w;
|
||||||
|
+ XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
|
||||||
|
+ w += i->w;
|
||||||
|
+ if (i->mon != m)
|
||||||
|
+ i->mon = m;
|
||||||
|
+ }
|
||||||
|
+ w = w ? w + systrayspacing : 1;
|
||||||
|
+ x -= w;
|
||||||
|
+ XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
|
||||||
|
+ wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
|
||||||
|
+ wc.stack_mode = Above; wc.sibling = m->barwin;
|
||||||
|
+ XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
|
||||||
|
+ XMapWindow(dpy, systray->win);
|
||||||
|
+ XMapSubwindows(dpy, systray->win);
|
||||||
|
+ /* redraw background */
|
||||||
|
+ XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
|
||||||
|
+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -2057,6 +2500,16 @@ wintoclient(Window w)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+Client *
|
||||||
|
+wintosystrayicon(Window w) {
|
||||||
|
+ Client *i = NULL;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !w)
|
||||||
|
+ return i;
|
||||||
|
+ for (i = systray->icons; i && i->win != w; i = i->next) ;
|
||||||
|
+ return i;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
Monitor *
|
||||||
|
wintomon(Window w)
|
||||||
|
{
|
||||||
|
@@ -2110,6 +2563,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+Monitor *
|
||||||
|
+systraytomon(Monitor *m) {
|
||||||
|
+ Monitor *t;
|
||||||
|
+ int i, n;
|
||||||
|
+ if(!systraypinning) {
|
||||||
|
+ if(!m)
|
||||||
|
+ return selmon;
|
||||||
|
+ return m == selmon ? m : NULL;
|
||||||
|
+ }
|
||||||
|
+ for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
|
||||||
|
+ for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
|
||||||
|
+ if(systraypinningfailfirst && n < systraypinning)
|
||||||
|
+ return mons;
|
||||||
|
+ return t;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
zoom(const Arg *arg)
|
||||||
|
{
|
||||||
288
dwm-6.5/patches/dwm-alpha-20230401-348f655.diff
Normal file
288
dwm-6.5/patches/dwm-alpha-20230401-348f655.diff
Normal file
@ -0,0 +1,288 @@
|
|||||||
|
From ad5887df95fda706291c81ee143d0786a1717b12 Mon Sep 17 00:00:00 2001
|
||||||
|
From: getimiskon <getimiskon@disroot.org>
|
||||||
|
Date: Sat, 1 Apr 2023 16:22:01 +0300
|
||||||
|
Subject: [PATCH] Allow dwm to have translucent bars, while keeping all the
|
||||||
|
text on it opaque, just like the alpha-patch for st. Updated for 348f655.
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 7 +++++++
|
||||||
|
config.mk | 2 +-
|
||||||
|
drw.c | 26 ++++++++++++-----------
|
||||||
|
drw.h | 9 +++++---
|
||||||
|
dwm.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++------
|
||||||
|
5 files changed, 81 insertions(+), 22 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 9efa774..8b3789a 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -12,11 +12,18 @@ static const char col_gray2[] = "#444444";
|
||||||
|
static const char col_gray3[] = "#bbbbbb";
|
||||||
|
static const char col_gray4[] = "#eeeeee";
|
||||||
|
static const char col_cyan[] = "#005577";
|
||||||
|
+static const unsigned int baralpha = 0xd0;
|
||||||
|
+static const unsigned int borderalpha = OPAQUE;
|
||||||
|
static const char *colors[][3] = {
|
||||||
|
/* fg bg border */
|
||||||
|
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
||||||
|
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
||||||
|
};
|
||||||
|
+static const unsigned int alphas[][3] = {
|
||||||
|
+ /* fg bg border*/
|
||||||
|
+ [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
||||||
|
+ [SchemeSel] = { OPAQUE, baralpha, borderalpha },
|
||||||
|
+};
|
||||||
|
|
||||||
|
/* tagging */
|
||||||
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||||
|
diff --git a/config.mk b/config.mk
|
||||||
|
index ba64d3d..d609c42 100644
|
||||||
|
--- a/config.mk
|
||||||
|
+++ b/config.mk
|
||||||
|
@@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2
|
||||||
|
|
||||||
|
# includes and libs
|
||||||
|
INCS = -I${X11INC} -I${FREETYPEINC}
|
||||||
|
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
||||||
|
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender
|
||||||
|
|
||||||
|
# flags
|
||||||
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
|
diff --git a/drw.c b/drw.c
|
||||||
|
index a58a2b4..d18e8d8 100644
|
||||||
|
--- a/drw.c
|
||||||
|
+++ b/drw.c
|
||||||
|
@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
|
||||||
|
}
|
||||||
|
|
||||||
|
Drw *
|
||||||
|
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
||||||
|
+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
||||||
|
{
|
||||||
|
Drw *drw = ecalloc(1, sizeof(Drw));
|
||||||
|
|
||||||
|
@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
|
||||||
|
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);
|
||||||
|
+ drw->visual = visual;
|
||||||
|
+ drw->depth = depth;
|
||||||
|
+ drw->cmap = cmap;
|
||||||
|
+ drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
|
||||||
|
+ drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
|
||||||
|
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
||||||
|
|
||||||
|
return drw;
|
||||||
|
@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
||||||
|
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));
|
||||||
|
+ drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -181,21 +184,22 @@ drw_fontset_free(Fnt *font)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
||||||
|
+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
|
||||||
|
{
|
||||||
|
if (!drw || !dest || !clrname)
|
||||||
|
return;
|
||||||
|
|
||||||
|
- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
||||||
|
- DefaultColormap(drw->dpy, drw->screen),
|
||||||
|
+ if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
|
||||||
|
clrname, dest))
|
||||||
|
die("error, cannot allocate color '%s'", clrname);
|
||||||
|
+
|
||||||
|
+ dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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)
|
||||||
|
+drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
Clr *ret;
|
||||||
|
@@ -205,7 +209,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
for (i = 0; i < clrcount; i++)
|
||||||
|
- drw_clr_create(drw, &ret[i], clrnames[i]);
|
||||||
|
+ drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -263,9 +267,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
|
||||||
|
} 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));
|
||||||
|
+ d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
|
||||||
|
x += lpad;
|
||||||
|
w -= lpad;
|
||||||
|
}
|
||||||
|
diff --git a/drw.h b/drw.h
|
||||||
|
index 6471431..2143533 100644
|
||||||
|
--- a/drw.h
|
||||||
|
+++ b/drw.h
|
||||||
|
@@ -20,6 +20,9 @@ typedef struct {
|
||||||
|
Display *dpy;
|
||||||
|
int screen;
|
||||||
|
Window root;
|
||||||
|
+ Visual *visual;
|
||||||
|
+ unsigned int depth;
|
||||||
|
+ Colormap cmap;
|
||||||
|
Drawable drawable;
|
||||||
|
GC gc;
|
||||||
|
Clr *scheme;
|
||||||
|
@@ -27,7 +30,7 @@ typedef struct {
|
||||||
|
} Drw;
|
||||||
|
|
||||||
|
/* Drawable abstraction */
|
||||||
|
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
|
||||||
|
+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap);
|
||||||
|
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
||||||
|
void drw_free(Drw *drw);
|
||||||
|
|
||||||
|
@@ -39,8 +42,8 @@ unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int
|
||||||
|
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);
|
||||||
|
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
|
||||||
|
+Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount);
|
||||||
|
|
||||||
|
/* Cursor abstraction */
|
||||||
|
Cur *drw_cur_create(Drw *drw, int shape);
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index c2bd871..3b34de8 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -56,6 +56,7 @@
|
||||||
|
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
||||||
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
||||||
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
||||||
|
+#define OPAQUE 0xffU
|
||||||
|
|
||||||
|
/* enums */
|
||||||
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
||||||
|
@@ -232,6 +233,7 @@ static Monitor *wintomon(Window w);
|
||||||
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
|
+static void xinitvisual();
|
||||||
|
static void zoom(const Arg *arg);
|
||||||
|
|
||||||
|
/* variables */
|
||||||
|
@@ -268,6 +270,11 @@ static Drw *drw;
|
||||||
|
static Monitor *mons, *selmon;
|
||||||
|
static Window root, wmcheckwin;
|
||||||
|
|
||||||
|
+static int useargb = 0;
|
||||||
|
+static Visual *visual;
|
||||||
|
+static int depth;
|
||||||
|
+static Colormap cmap;
|
||||||
|
+
|
||||||
|
/* configuration, allows nested code to access above variables */
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
@@ -1558,7 +1565,8 @@ setup(void)
|
||||||
|
sw = DisplayWidth(dpy, screen);
|
||||||
|
sh = DisplayHeight(dpy, screen);
|
||||||
|
root = RootWindow(dpy, screen);
|
||||||
|
- drw = drw_create(dpy, screen, root, sw, sh);
|
||||||
|
+ xinitvisual();
|
||||||
|
+ drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
|
||||||
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
||||||
|
die("no fonts could be loaded.");
|
||||||
|
lrpad = drw->fonts->h;
|
||||||
|
@@ -1586,7 +1594,7 @@ setup(void)
|
||||||
|
/* init appearance */
|
||||||
|
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
||||||
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
- scheme[i] = drw_scm_create(drw, colors[i], 3);
|
||||||
|
+ scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3);
|
||||||
|
/* init bars */
|
||||||
|
updatebars();
|
||||||
|
updatestatus();
|
||||||
|
@@ -1813,16 +1821,18 @@ updatebars(void)
|
||||||
|
Monitor *m;
|
||||||
|
XSetWindowAttributes wa = {
|
||||||
|
.override_redirect = True,
|
||||||
|
- .background_pixmap = ParentRelative,
|
||||||
|
+ .background_pixel = 0,
|
||||||
|
+ .border_pixel = 0,
|
||||||
|
+ .colormap = cmap,
|
||||||
|
.event_mask = ButtonPressMask|ExposureMask
|
||||||
|
};
|
||||||
|
XClassHint ch = {"dwm", "dwm"};
|
||||||
|
for (m = mons; m; m = m->next) {
|
||||||
|
if (m->barwin)
|
||||||
|
continue;
|
||||||
|
- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
|
||||||
|
- CopyFromParent, DefaultVisual(dpy, screen),
|
||||||
|
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
||||||
|
+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
|
||||||
|
+ InputOutput, visual,
|
||||||
|
+ CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
|
||||||
|
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||||
|
XMapRaised(dpy, m->barwin);
|
||||||
|
XSetClassHint(dpy, m->barwin, &ch);
|
||||||
|
@@ -2120,6 +2130,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+xinitvisual()
|
||||||
|
+{
|
||||||
|
+ XVisualInfo *infos;
|
||||||
|
+ XRenderPictFormat *fmt;
|
||||||
|
+ int nitems;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ XVisualInfo tpl = {
|
||||||
|
+ .screen = screen,
|
||||||
|
+ .depth = 32,
|
||||||
|
+ .class = TrueColor
|
||||||
|
+ };
|
||||||
|
+ long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
|
||||||
|
+
|
||||||
|
+ infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
|
||||||
|
+ visual = NULL;
|
||||||
|
+ for(i = 0; i < nitems; i ++) {
|
||||||
|
+ fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
|
||||||
|
+ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
|
||||||
|
+ visual = infos[i].visual;
|
||||||
|
+ depth = infos[i].depth;
|
||||||
|
+ cmap = XCreateColormap(dpy, root, visual, AllocNone);
|
||||||
|
+ useargb = 1;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ XFree(infos);
|
||||||
|
+
|
||||||
|
+ if (! visual) {
|
||||||
|
+ visual = DefaultVisual(dpy, screen);
|
||||||
|
+ depth = DefaultDepth(dpy, screen);
|
||||||
|
+ cmap = DefaultColormap(dpy, screen);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
zoom(const Arg *arg)
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
723
dwm-6.5/patches/dwm-alpha-systray-6.2.diff
Normal file
723
dwm-6.5/patches/dwm-alpha-systray-6.2.diff
Normal file
@ -0,0 +1,723 @@
|
|||||||
|
From 71e4f843ed84d2a6f86dc1aeb516adec5d222194 Mon Sep 17 00:00:00 2001
|
||||||
|
From: bakkeby <bakkeby@gmail.com>
|
||||||
|
Date: Tue, 7 Apr 2020 10:53:35 +0200
|
||||||
|
Subject: [PATCH 2/2] Adding systray patch
|
||||||
|
|
||||||
|
Refer to https://dwm.suckless.org/patches/systray/
|
||||||
|
---
|
||||||
|
config.def.h | 4 +
|
||||||
|
dwm.c | 411 ++++++++++++++++++++++++++++++++++++++++++++++++---
|
||||||
|
2 files changed, 391 insertions(+), 24 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 4f68fe8..1952613 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -5,6 +5,10 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
||||||
|
+static const unsigned int systrayspacing = 2; /* systray spacing */
|
||||||
|
+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
||||||
|
+static const int showsystray = 1; /* 0 means no systray */
|
||||||
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
|
static const char dmenufont[] = "monospace:size=10";
|
||||||
|
static const char col_gray1[] = "#222222";
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 20f8309..679beb0 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -59,12 +59,30 @@
|
||||||
|
|
||||||
|
#define OPAQUE 0xffU
|
||||||
|
|
||||||
|
+#define SYSTEM_TRAY_REQUEST_DOCK 0
|
||||||
|
+#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
|
||||||
|
+
|
||||||
|
+/* XEMBED messages */
|
||||||
|
+#define XEMBED_EMBEDDED_NOTIFY 0
|
||||||
|
+#define XEMBED_WINDOW_ACTIVATE 1
|
||||||
|
+#define XEMBED_FOCUS_IN 4
|
||||||
|
+#define XEMBED_MODALITY_ON 10
|
||||||
|
+
|
||||||
|
+#define XEMBED_MAPPED (1 << 0)
|
||||||
|
+#define XEMBED_WINDOW_ACTIVATE 1
|
||||||
|
+#define XEMBED_WINDOW_DEACTIVATE 2
|
||||||
|
+
|
||||||
|
+#define VERSION_MAJOR 0
|
||||||
|
+#define VERSION_MINOR 0
|
||||||
|
+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
|
||||||
|
+
|
||||||
|
/* enums */
|
||||||
|
+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
||||||
|
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 { NetSupported, NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayVisual,
|
||||||
|
+ NetWMName, NetWMState, NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMWindowTypeDock,
|
||||||
|
+ NetSystemTrayOrientationHorz, NetWMWindowTypeDialog, NetClientList, NetWMCheck, NetLast }; /* EWMH atoms */
|
||||||
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||||
|
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||||
|
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
@@ -143,6 +161,12 @@ typedef struct {
|
||||||
|
int monitor;
|
||||||
|
} Rule;
|
||||||
|
|
||||||
|
+typedef struct Systray Systray;
|
||||||
|
+struct Systray {
|
||||||
|
+ Window win;
|
||||||
|
+ Client *icons;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/* function declarations */
|
||||||
|
static void applyrules(Client *c);
|
||||||
|
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
||||||
|
@@ -171,9 +195,11 @@ static void focus(Client *c);
|
||||||
|
static void focusin(XEvent *e);
|
||||||
|
static void focusmon(const Arg *arg);
|
||||||
|
static void focusstack(const Arg *arg);
|
||||||
|
+static Atom getatomprop(Client *c, Atom prop);
|
||||||
|
static int getrootptr(int *x, int *y);
|
||||||
|
static long getstate(Window w);
|
||||||
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
|
+static unsigned int getsystraywidth();
|
||||||
|
static void grabbuttons(Client *c, int focused);
|
||||||
|
static void grabkeys(void);
|
||||||
|
static void incnmaster(const Arg *arg);
|
||||||
|
@@ -193,10 +219,12 @@ static Monitor *recttomon(int x, int y, int w, int h);
|
||||||
|
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||||
|
static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||||
|
static void resizemouse(const Arg *arg);
|
||||||
|
+static void removesystrayicon(Client *i);
|
||||||
|
+static void resizerequest(XEvent *e);
|
||||||
|
static void restack(Monitor *m);
|
||||||
|
static void run(void);
|
||||||
|
static void scan(void);
|
||||||
|
-static int sendevent(Client *c, Atom proto);
|
||||||
|
+static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
|
||||||
|
static void sendmon(Client *c, Monitor *m);
|
||||||
|
static void setclientstate(Client *c, long state);
|
||||||
|
static void setfocus(Client *c);
|
||||||
|
@@ -208,6 +236,7 @@ static void seturgent(Client *c, int urg);
|
||||||
|
static void showhide(Client *c);
|
||||||
|
static void sigchld(int unused);
|
||||||
|
static void spawn(const Arg *arg);
|
||||||
|
+static Monitor *systraytomon(Monitor *m);
|
||||||
|
static void tag(const Arg *arg);
|
||||||
|
static void tagmon(const Arg *arg);
|
||||||
|
static void tile(Monitor *);
|
||||||
|
@@ -225,12 +254,16 @@ static int updategeom(void);
|
||||||
|
static void updatenumlockmask(void);
|
||||||
|
static void updatesizehints(Client *c);
|
||||||
|
static void updatestatus(void);
|
||||||
|
+static void updatesystray(int updatebar);
|
||||||
|
+static void updatesystrayicongeom(Client *i, int w, int h);
|
||||||
|
+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
||||||
|
static void updatetitle(Client *c);
|
||||||
|
static void updatewindowtype(Client *c);
|
||||||
|
static void updatewmhints(Client *c);
|
||||||
|
static void view(const Arg *arg);
|
||||||
|
static Client *wintoclient(Window w);
|
||||||
|
static Monitor *wintomon(Window w);
|
||||||
|
+static Client *wintosystrayicon(Window w);
|
||||||
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
|
@@ -260,9 +293,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
||||||
|
[MapRequest] = maprequest,
|
||||||
|
[MotionNotify] = motionnotify,
|
||||||
|
[PropertyNotify] = propertynotify,
|
||||||
|
+ [ResizeRequest] = resizerequest,
|
||||||
|
[UnmapNotify] = unmapnotify
|
||||||
|
};
|
||||||
|
-static Atom wmatom[WMLast], netatom[NetLast];
|
||||||
|
+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
||||||
|
static int running = 1;
|
||||||
|
static Cur *cursor[CurLast];
|
||||||
|
static Clr **scheme;
|
||||||
|
@@ -271,6 +305,9 @@ static Drw *drw;
|
||||||
|
static Monitor *mons, *selmon;
|
||||||
|
static Window root, wmcheckwin;
|
||||||
|
|
||||||
|
+static Systray *systray = NULL;
|
||||||
|
+static unsigned long systrayorientation = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
|
||||||
|
+
|
||||||
|
static int useargb = 0;
|
||||||
|
static Visual *visual;
|
||||||
|
static int depth;
|
||||||
|
@@ -447,7 +484,7 @@ buttonpress(XEvent *e)
|
||||||
|
arg.ui = 1 << i;
|
||||||
|
} else if (ev->x < x + blw)
|
||||||
|
click = ClkLtSymbol;
|
||||||
|
- else if (ev->x > selmon->ww - TEXTW(stext))
|
||||||
|
+ else if (ev->x > selmon->ww - TEXTW(stext) - getsystraywidth())
|
||||||
|
click = ClkStatusText;
|
||||||
|
else
|
||||||
|
click = ClkWinTitle;
|
||||||
|
@@ -490,6 +527,13 @@ cleanup(void)
|
||||||
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
|
while (mons)
|
||||||
|
cleanupmon(mons);
|
||||||
|
+ if (showsystray) {
|
||||||
|
+ while (systray->icons)
|
||||||
|
+ removesystrayicon(systray->icons);
|
||||||
|
+ XUnmapWindow(dpy, systray->win);
|
||||||
|
+ XDestroyWindow(dpy, systray->win);
|
||||||
|
+ free(systray);
|
||||||
|
+ }
|
||||||
|
for (i = 0; i < CurLast; i++)
|
||||||
|
drw_cur_free(drw, cursor[i]);
|
||||||
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
@@ -520,9 +564,49 @@ cleanupmon(Monitor *mon)
|
||||||
|
void
|
||||||
|
clientmessage(XEvent *e)
|
||||||
|
{
|
||||||
|
+ XWindowAttributes wa;
|
||||||
|
+ XSetWindowAttributes swa;
|
||||||
|
XClientMessageEvent *cme = &e->xclient;
|
||||||
|
Client *c = wintoclient(cme->window);
|
||||||
|
|
||||||
|
+ if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
||||||
|
+ /* add systray icons */
|
||||||
|
+ if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
||||||
|
+ if (!(c = (Client *)calloc(1, sizeof(Client))))
|
||||||
|
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
||||||
|
+ if (!(c->win = cme->data.l[2])) {
|
||||||
|
+ free(c);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ c->mon = selmon;
|
||||||
|
+ c->next = systray->icons;
|
||||||
|
+ systray->icons = c;
|
||||||
|
+ XGetWindowAttributes(dpy, c->win, &wa);
|
||||||
|
+ c->x = c->oldx = c->y = c->oldy = 0;
|
||||||
|
+ c->w = c->oldw = wa.width;
|
||||||
|
+ c->h = c->oldh = wa.height;
|
||||||
|
+ c->oldbw = wa.border_width;
|
||||||
|
+ c->bw = 0;
|
||||||
|
+ c->isfloating = True;
|
||||||
|
+ /* reuse tags field as mapped status */
|
||||||
|
+ c->tags = 1;
|
||||||
|
+ updatesizehints(c);
|
||||||
|
+ updatesystrayicongeom(c, wa.width, wa.height);
|
||||||
|
+ XAddToSaveSet(dpy, c->win);
|
||||||
|
+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
||||||
|
+ XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
||||||
|
+ /* use parents background color */
|
||||||
|
+ swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+ setclientstate(c, NormalState);
|
||||||
|
+ updatesystray(1);
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (!c)
|
||||||
|
return;
|
||||||
|
if (cme->message_type == netatom[NetWMState]) {
|
||||||
|
@@ -660,6 +744,10 @@ destroynotify(XEvent *e)
|
||||||
|
|
||||||
|
if ((c = wintoclient(ev->window)))
|
||||||
|
unmanage(c, 1);
|
||||||
|
+ else if (showsystray && (c = wintosystrayicon(ev->window))) {
|
||||||
|
+ removesystrayicon(c);
|
||||||
|
+ updatesystray(1);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -703,17 +791,23 @@ dirtomon(int dir)
|
||||||
|
void
|
||||||
|
drawbar(Monitor *m)
|
||||||
|
{
|
||||||
|
- int x, w, sw = 0;
|
||||||
|
+ int x, w, sw = 0, stw = 0;
|
||||||
|
int boxs = drw->fonts->h / 9;
|
||||||
|
int boxw = drw->fonts->h / 6 + 2;
|
||||||
|
unsigned int i, occ = 0, urg = 0;
|
||||||
|
Client *c;
|
||||||
|
|
||||||
|
+ if (showsystray && m == systraytomon(m)) {
|
||||||
|
+ stw = getsystraywidth();
|
||||||
|
+ drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
+ drw_rect(drw, m->ww - stw, 0, stw, bh, 1, 1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||||
|
- drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
||||||
|
+ drw_text(drw, m->ww - sw - stw, 0, sw, bh, 0, stext, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (c = m->clients; c; c = c->next) {
|
||||||
|
@@ -736,7 +830,7 @@ drawbar(Monitor *m)
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
|
- if ((w = m->ww - sw - x) > bh) {
|
||||||
|
+ if ((w = m->ww - sw - stw - x) > bh) {
|
||||||
|
if (m->sel) {
|
||||||
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||||
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
@@ -757,6 +851,9 @@ drawbars(void)
|
||||||
|
|
||||||
|
for (m = mons; m; m = m->next)
|
||||||
|
drawbar(m);
|
||||||
|
+
|
||||||
|
+ if (showsystray && !systraypinning)
|
||||||
|
+ updatesystray(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -784,8 +881,12 @@ expose(XEvent *e)
|
||||||
|
Monitor *m;
|
||||||
|
XExposeEvent *ev = &e->xexpose;
|
||||||
|
|
||||||
|
- if (ev->count == 0 && (m = wintomon(ev->window)))
|
||||||
|
+ if (ev->count == 0 && (m = wintomon(ev->window))) {
|
||||||
|
drawbar(m);
|
||||||
|
+
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ updatesystray(0);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -871,9 +972,17 @@ getatomprop(Client *c, Atom prop)
|
||||||
|
unsigned char *p = NULL;
|
||||||
|
Atom da, atom = None;
|
||||||
|
|
||||||
|
- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||||
|
+ /* FIXME getatomprop should return the number of items and a pointer to
|
||||||
|
+ * the stored data instead of this workaround */
|
||||||
|
+ Atom req = XA_ATOM;
|
||||||
|
+ if (prop == xatom[XembedInfo])
|
||||||
|
+ req = xatom[XembedInfo];
|
||||||
|
+
|
||||||
|
+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
|
||||||
|
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||||
|
atom = *(Atom *)p;
|
||||||
|
+ if (da == xatom[XembedInfo] && dl == 2)
|
||||||
|
+ atom = ((Atom *)p)[1];
|
||||||
|
XFree(p);
|
||||||
|
}
|
||||||
|
return atom;
|
||||||
|
@@ -907,6 +1016,16 @@ getstate(Window w)
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
+unsigned int
|
||||||
|
+getsystraywidth()
|
||||||
|
+{
|
||||||
|
+ unsigned int w = 0;
|
||||||
|
+ Client *i;
|
||||||
|
+ if (showsystray)
|
||||||
|
+ for (i = systray->icons; i; w += i->w + systrayspacing, i = i->next);
|
||||||
|
+ return w ? w + systrayspacing : 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
gettextprop(Window w, Atom atom, char *text, unsigned int size)
|
||||||
|
{
|
||||||
|
@@ -1011,7 +1130,7 @@ killclient(const Arg *arg)
|
||||||
|
{
|
||||||
|
if (!selmon->sel)
|
||||||
|
return;
|
||||||
|
- if (!sendevent(selmon->sel, wmatom[WMDelete])) {
|
||||||
|
+ if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0, 0, 0)) {
|
||||||
|
XGrabServer(dpy);
|
||||||
|
XSetErrorHandler(xerrordummy);
|
||||||
|
XSetCloseDownMode(dpy, DestroyAll);
|
||||||
|
@@ -1100,6 +1219,12 @@ maprequest(XEvent *e)
|
||||||
|
static XWindowAttributes wa;
|
||||||
|
XMapRequestEvent *ev = &e->xmaprequest;
|
||||||
|
|
||||||
|
+ Client *i;
|
||||||
|
+ if (showsystray && (i = wintosystrayicon(ev->window))) {
|
||||||
|
+ sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ updatesystray(1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (!XGetWindowAttributes(dpy, ev->window, &wa))
|
||||||
|
return;
|
||||||
|
if (wa.override_redirect)
|
||||||
|
@@ -1223,6 +1348,16 @@ propertynotify(XEvent *e)
|
||||||
|
Window trans;
|
||||||
|
XPropertyEvent *ev = &e->xproperty;
|
||||||
|
|
||||||
|
+ if (showsystray && (c = wintosystrayicon(ev->window))) {
|
||||||
|
+ if (ev->atom == XA_WM_NORMAL_HINTS) {
|
||||||
|
+ updatesizehints(c);
|
||||||
|
+ updatesystrayicongeom(c, c->w, c->h);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ updatesystrayiconstate(c, ev);
|
||||||
|
+ updatesystray(1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||||
|
updatestatus();
|
||||||
|
else if (ev->state == PropertyDelete)
|
||||||
|
@@ -1273,6 +1408,19 @@ recttomon(int x, int y, int w, int h)
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+removesystrayicon(Client *i)
|
||||||
|
+{
|
||||||
|
+ Client **ii;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !i)
|
||||||
|
+ return;
|
||||||
|
+ for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
|
||||||
|
+ if (ii)
|
||||||
|
+ *ii = i->next;
|
||||||
|
+ free(i);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
|
{
|
||||||
|
@@ -1352,6 +1500,18 @@ resizemouse(const Arg *arg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+resizerequest(XEvent *e)
|
||||||
|
+{
|
||||||
|
+ XResizeRequestEvent *ev = &e->xresizerequest;
|
||||||
|
+ Client *i;
|
||||||
|
+
|
||||||
|
+ if ((i = wintosystrayicon(ev->window))) {
|
||||||
|
+ updatesystrayicongeom(i, ev->width, ev->height);
|
||||||
|
+ updatesystray(1);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
restack(Monitor *m)
|
||||||
|
{
|
||||||
|
@@ -1441,26 +1601,35 @@ setclientstate(Client *c, long state)
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
-sendevent(Client *c, Atom proto)
|
||||||
|
+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
|
||||||
|
{
|
||||||
|
int n;
|
||||||
|
- Atom *protocols;
|
||||||
|
+ Atom *protocols, mt;
|
||||||
|
int exists = 0;
|
||||||
|
XEvent ev;
|
||||||
|
|
||||||
|
- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
|
||||||
|
- while (!exists && n--)
|
||||||
|
- exists = protocols[n] == proto;
|
||||||
|
- XFree(protocols);
|
||||||
|
+ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
|
||||||
|
+ mt = wmatom[WMProtocols];
|
||||||
|
+ if (XGetWMProtocols(dpy, w, &protocols, &n)) {
|
||||||
|
+ while (!exists && n--)
|
||||||
|
+ exists = protocols[n] == proto;
|
||||||
|
+ XFree(protocols);
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ exists = True;
|
||||||
|
+ mt = proto;
|
||||||
|
}
|
||||||
|
if (exists) {
|
||||||
|
ev.type = ClientMessage;
|
||||||
|
- ev.xclient.window = c->win;
|
||||||
|
- ev.xclient.message_type = wmatom[WMProtocols];
|
||||||
|
+ ev.xclient.window = w;
|
||||||
|
+ ev.xclient.message_type = mt;
|
||||||
|
ev.xclient.format = 32;
|
||||||
|
- ev.xclient.data.l[0] = proto;
|
||||||
|
- ev.xclient.data.l[1] = CurrentTime;
|
||||||
|
- XSendEvent(dpy, c->win, False, NoEventMask, &ev);
|
||||||
|
+ ev.xclient.data.l[0] = d0;
|
||||||
|
+ ev.xclient.data.l[1] = d1;
|
||||||
|
+ ev.xclient.data.l[2] = d2;
|
||||||
|
+ ev.xclient.data.l[3] = d3;
|
||||||
|
+ ev.xclient.data.l[4] = d4;
|
||||||
|
+ XSendEvent(dpy, w, False, mask, &ev);
|
||||||
|
}
|
||||||
|
return exists;
|
||||||
|
}
|
||||||
|
@@ -1474,7 +1643,7 @@ setfocus(Client *c)
|
||||||
|
XA_WINDOW, 32, PropModeReplace,
|
||||||
|
(unsigned char *) &(c->win), 1);
|
||||||
|
}
|
||||||
|
- sendevent(c, wmatom[WMTakeFocus]);
|
||||||
|
+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1564,13 +1733,22 @@ setup(void)
|
||||||
|
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
|
||||||
|
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
|
||||||
|
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
||||||
|
+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
|
||||||
|
+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
|
||||||
|
+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
||||||
|
+ netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
|
||||||
|
+ netatom[NetSystemTrayVisual] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_VISUAL", False);
|
||||||
|
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
||||||
|
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
||||||
|
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
||||||
|
netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
|
||||||
|
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
||||||
|
+ netatom[NetWMWindowTypeDock] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
|
||||||
|
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||||
|
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
||||||
|
+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
||||||
|
+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
||||||
|
+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
||||||
|
/* init cursors */
|
||||||
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
||||||
|
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
||||||
|
@@ -1579,6 +1757,9 @@ setup(void)
|
||||||
|
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
||||||
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3);
|
||||||
|
+ /* init system tray */
|
||||||
|
+ if (showsystray)
|
||||||
|
+ updatesystray(0);
|
||||||
|
/* init bars */
|
||||||
|
updatebars();
|
||||||
|
updatestatus();
|
||||||
|
@@ -1661,6 +1842,23 @@ spawn(const Arg *arg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+Monitor *
|
||||||
|
+systraytomon(Monitor *m)
|
||||||
|
+{
|
||||||
|
+ Monitor *t;
|
||||||
|
+ int i, n;
|
||||||
|
+ if (!systraypinning) {
|
||||||
|
+ if (!m)
|
||||||
|
+ return selmon;
|
||||||
|
+ return m == selmon ? m : NULL;
|
||||||
|
+ }
|
||||||
|
+ for (n = 1, t = mons; t && t->next; n++, t = t->next);
|
||||||
|
+ for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next);
|
||||||
|
+ if (systraypinningfailfirst && n < systraypinning)
|
||||||
|
+ return mons;
|
||||||
|
+ return t;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
tag(const Arg *arg)
|
||||||
|
{
|
||||||
|
@@ -1711,6 +1909,23 @@ togglebar(const Arg *arg)
|
||||||
|
selmon->showbar = !selmon->showbar;
|
||||||
|
updatebarpos(selmon);
|
||||||
|
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
||||||
|
+ if (showsystray) {
|
||||||
|
+ XWindowChanges wc;
|
||||||
|
+ if (!selmon->showbar)
|
||||||
|
+ wc.y = -bh;
|
||||||
|
+ else if (selmon->showbar) {
|
||||||
|
+ #if BARPADDING_PATCH
|
||||||
|
+ wc.y = vp;
|
||||||
|
+ if (!selmon->topbar)
|
||||||
|
+ wc.y = selmon->mh - bh + vp;
|
||||||
|
+ #else
|
||||||
|
+ wc.y = 0;
|
||||||
|
+ if (!selmon->topbar)
|
||||||
|
+ wc.y = selmon->mh - bh;
|
||||||
|
+ #endif // BARPADDING_PATCH
|
||||||
|
+ }
|
||||||
|
+ XConfigureWindow(dpy, systray->win, CWY, &wc);
|
||||||
|
+ }
|
||||||
|
arrange(selmon);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1804,6 +2019,11 @@ unmapnotify(XEvent *e)
|
||||||
|
setclientstate(c, WithdrawnState);
|
||||||
|
else
|
||||||
|
unmanage(c, 0);
|
||||||
|
+ } else if (showsystray && (c = wintosystrayicon(ev->window))) {
|
||||||
|
+ /* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
||||||
|
+ * _not_ destroy them. We map those windows back */
|
||||||
|
+ XMapRaised(dpy, c->win);
|
||||||
|
+ updatesystray(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1826,6 +2046,8 @@ updatebars(void)
|
||||||
|
InputOutput, visual,
|
||||||
|
CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
|
||||||
|
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ XMapRaised(dpy, systray->win);
|
||||||
|
XMapRaised(dpy, m->barwin);
|
||||||
|
XSetClassHint(dpy, m->barwin, &ch);
|
||||||
|
}
|
||||||
|
@@ -2003,6 +2225,137 @@ updatestatus(void)
|
||||||
|
drawbar(selmon);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+updatesystray(int updatebar)
|
||||||
|
+{
|
||||||
|
+ XSetWindowAttributes wa;
|
||||||
|
+ XWindowChanges wc;
|
||||||
|
+ Client *i;
|
||||||
|
+ Monitor *m = systraytomon(NULL);
|
||||||
|
+ unsigned int x = m->mx + m->mw;
|
||||||
|
+ unsigned int w = 1, xpad = 0, ypad = 0;
|
||||||
|
+ #if BARPADDING_PATCH
|
||||||
|
+ xpad = sp;
|
||||||
|
+ ypad = vp;
|
||||||
|
+ #endif // BARPADDING_PATCH
|
||||||
|
+
|
||||||
|
+ if (!showsystray)
|
||||||
|
+ return;
|
||||||
|
+ if (!systray) {
|
||||||
|
+ /* init systray */
|
||||||
|
+ if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
|
||||||
|
+ die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
|
||||||
|
+
|
||||||
|
+ wa.override_redirect = True;
|
||||||
|
+ wa.event_mask = ButtonPressMask|ExposureMask;
|
||||||
|
+ wa.background_pixel = 0;
|
||||||
|
+ wa.border_pixel = 0;
|
||||||
|
+ wa.colormap = cmap;
|
||||||
|
+ systray->win = XCreateWindow(dpy, root, x - xpad, m->by + ypad, w, bh, 0, depth,
|
||||||
|
+ InputOutput, visual,
|
||||||
|
+ CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
|
||||||
|
+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
|
||||||
|
+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
|
||||||
|
+ PropModeReplace, (unsigned char *)&systrayorientation, 1);
|
||||||
|
+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayVisual], XA_VISUALID, 32,
|
||||||
|
+ PropModeReplace, (unsigned char *)&visual->visualid, 1);
|
||||||
|
+ XChangeProperty(dpy, systray->win, netatom[NetWMWindowType], XA_ATOM, 32,
|
||||||
|
+ PropModeReplace, (unsigned char *)&netatom[NetWMWindowTypeDock], 1);
|
||||||
|
+ XMapRaised(dpy, systray->win);
|
||||||
|
+ XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
|
||||||
|
+ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
|
||||||
|
+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ fprintf(stderr, "dwm: unable to obtain system tray.\n");
|
||||||
|
+ free(systray);
|
||||||
|
+ systray = NULL;
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (w = 0, i = systray->icons; i; i = i->next) {
|
||||||
|
+ wa.background_pixel = 0;
|
||||||
|
+ XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
|
||||||
|
+ XMapRaised(dpy, i->win);
|
||||||
|
+ w += systrayspacing;
|
||||||
|
+ i->x = w;
|
||||||
|
+ XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
|
||||||
|
+ w += i->w;
|
||||||
|
+ if (i->mon != m)
|
||||||
|
+ i->mon = m;
|
||||||
|
+ }
|
||||||
|
+ w = w ? w + systrayspacing : 1;
|
||||||
|
+ x -= w;
|
||||||
|
+ XMoveResizeWindow(dpy, systray->win, x - xpad, m->by + ypad, w, bh);
|
||||||
|
+ wc.x = x - xpad;
|
||||||
|
+ wc.y = m->by + ypad;
|
||||||
|
+ wc.width = w;
|
||||||
|
+ wc.height = bh;
|
||||||
|
+ wc.stack_mode = Above; wc.sibling = m->barwin;
|
||||||
|
+ XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
|
||||||
|
+ XMapWindow(dpy, systray->win);
|
||||||
|
+ XMapSubwindows(dpy, systray->win);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+
|
||||||
|
+ if (updatebar)
|
||||||
|
+ drawbar(m);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystrayicongeom(Client *i, int w, int h)
|
||||||
|
+{
|
||||||
|
+ if (i) {
|
||||||
|
+ i->h = bh;
|
||||||
|
+ if (w == h)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ else if (h == bh)
|
||||||
|
+ i->w = w;
|
||||||
|
+ else
|
||||||
|
+ i->w = (int) ((float)bh * ((float)w / (float)h));
|
||||||
|
+ applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
|
||||||
|
+ /* force icons into the systray dimensions if they don't want to */
|
||||||
|
+ if (i->h > bh) {
|
||||||
|
+ if (i->w == i->h)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ else
|
||||||
|
+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
|
||||||
|
+ i->h = bh;
|
||||||
|
+ }
|
||||||
|
+ if (i->w > 2*bh)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystrayiconstate(Client *i, XPropertyEvent *ev)
|
||||||
|
+{
|
||||||
|
+ long flags;
|
||||||
|
+ int code = 0;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
|
||||||
|
+ !(flags = getatomprop(i, xatom[XembedInfo])))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ if (flags & XEMBED_MAPPED && !i->tags) {
|
||||||
|
+ i->tags = 1;
|
||||||
|
+ code = XEMBED_WINDOW_ACTIVATE;
|
||||||
|
+ XMapRaised(dpy, i->win);
|
||||||
|
+ setclientstate(i, NormalState);
|
||||||
|
+ }
|
||||||
|
+ else if (!(flags & XEMBED_MAPPED) && i->tags) {
|
||||||
|
+ i->tags = 0;
|
||||||
|
+ code = XEMBED_WINDOW_DEACTIVATE;
|
||||||
|
+ XUnmapWindow(dpy, i->win);
|
||||||
|
+ setclientstate(i, WithdrawnState);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return;
|
||||||
|
+ sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
|
||||||
|
+ systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
updatetitle(Client *c)
|
||||||
|
{
|
||||||
|
@@ -2085,6 +2438,16 @@ wintomon(Window w)
|
||||||
|
return selmon;
|
||||||
|
}
|
||||||
|
|
||||||
|
+Client *
|
||||||
|
+wintosystrayicon(Window w) {
|
||||||
|
+ Client *i = NULL;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !w)
|
||||||
|
+ return i;
|
||||||
|
+ for (i = systray->icons; i && i->win != w; i = i->next);
|
||||||
|
+ return i;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* There's no way to check accesses to destroyed windows, thus those cases are
|
||||||
|
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
|
||||||
|
* default error handler, which may call exit. */
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
179
dwm-6.5/patches/dwm-autostart-20210120-cb3f58a.diff
Normal file
179
dwm-6.5/patches/dwm-autostart-20210120-cb3f58a.diff
Normal file
@ -0,0 +1,179 @@
|
|||||||
|
From 37e970479dc5d40e57fc0cbfeaa5e39941483237 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gan Ainm <gan.ainm.riomhphost@gmail.com>
|
||||||
|
Date: Wed, 10 Jun 2020 10:59:02 +0000
|
||||||
|
Subject: [PATCH] dwm-xdgautostart-6.2.diff
|
||||||
|
|
||||||
|
===================================================================
|
||||||
|
---
|
||||||
|
dwm.1 | 23 +++++++++++++++++
|
||||||
|
dwm.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 105 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/dwm.1 b/dwm.1
|
||||||
|
index 13b3729..9533aa6 100644
|
||||||
|
--- a/dwm.1
|
||||||
|
+++ b/dwm.1
|
||||||
|
@@ -30,6 +30,14 @@ top left corner. The tags which are applied to one or more windows are
|
||||||
|
indicated with an empty square in the top left corner.
|
||||||
|
.P
|
||||||
|
dwm draws a small border around windows to indicate the focus state.
|
||||||
|
+.P
|
||||||
|
+On start, dwm can start additional programs that may be specified in two special
|
||||||
|
+shell scripts (see the FILES section below), autostart_blocking.sh and
|
||||||
|
+autostart.sh. The former is executed first and dwm will wait for its
|
||||||
|
+termination before starting. The latter is executed in the background before
|
||||||
|
+dwm enters its handler loop.
|
||||||
|
+.P
|
||||||
|
+Either of these files may be omitted.
|
||||||
|
.SH OPTIONS
|
||||||
|
.TP
|
||||||
|
.B \-v
|
||||||
|
@@ -152,6 +160,21 @@ Toggles focused window between floating and tiled state.
|
||||||
|
.TP
|
||||||
|
.B Mod1\-Button3
|
||||||
|
Resize focused window while dragging. Tiled windows will be toggled to the floating state.
|
||||||
|
+.SH FILES
|
||||||
|
+The files containing programs to be started along with dwm are searched for in
|
||||||
|
+the following directories:
|
||||||
|
+.IP "1. $XDG_DATA_HOME/dwm"
|
||||||
|
+.IP "2. $HOME/.local/share/dwm"
|
||||||
|
+.IP "3. $HOME/.dwm"
|
||||||
|
+.P
|
||||||
|
+The first existing directory is scanned for any of the autostart files below.
|
||||||
|
+.TP 15
|
||||||
|
+autostart.sh
|
||||||
|
+This file is started as a shell background process before dwm enters its handler
|
||||||
|
+loop.
|
||||||
|
+.TP 15
|
||||||
|
+autostart_blocking.sh
|
||||||
|
+This file is started before any autostart.sh; dwm waits for its termination.
|
||||||
|
.SH CUSTOMIZATION
|
||||||
|
dwm is customized by creating a custom config.h and (re)compiling the source
|
||||||
|
code. This keeps it fast, secure and simple.
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 4465af1..2156b49 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -29,6 +29,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
+#include <sys/stat.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <X11/cursorfont.h>
|
||||||
|
#include <X11/keysym.h>
|
||||||
|
@@ -193,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);
|
||||||
|
@@ -235,7 +237,11 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
|
static void zoom(const Arg *arg);
|
||||||
|
|
||||||
|
/* variables */
|
||||||
|
+static const char autostartblocksh[] = "autostart_blocking.sh";
|
||||||
|
+static const char autostartsh[] = "autostart.sh";
|
||||||
|
static const char broken[] = "broken";
|
||||||
|
+static const char dwmdir[] = "dwm";
|
||||||
|
+static const char localshare[] = ".local/share";
|
||||||
|
static char stext[256];
|
||||||
|
static int screen;
|
||||||
|
static int sw, sh; /* X display screen geometry width, height */
|
||||||
|
@@ -1380,6 +1386,83 @@ run(void)
|
||||||
|
handler[ev.type](&ev); /* call handler */
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+runautostart(void)
|
||||||
|
+{
|
||||||
|
+ char *pathpfx;
|
||||||
|
+ char *path;
|
||||||
|
+ char *xdgdatahome;
|
||||||
|
+ char *home;
|
||||||
|
+ struct stat sb;
|
||||||
|
+
|
||||||
|
+ if ((home = getenv("HOME")) == NULL)
|
||||||
|
+ /* this is almost impossible */
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ /* if $XDG_DATA_HOME is set and not empty, use $XDG_DATA_HOME/dwm,
|
||||||
|
+ * otherwise use ~/.local/share/dwm as autostart script directory
|
||||||
|
+ */
|
||||||
|
+ xdgdatahome = getenv("XDG_DATA_HOME");
|
||||||
|
+ if (xdgdatahome != NULL && *xdgdatahome != '\0') {
|
||||||
|
+ /* space for path segments, separators and nul */
|
||||||
|
+ pathpfx = ecalloc(1, strlen(xdgdatahome) + strlen(dwmdir) + 2);
|
||||||
|
+
|
||||||
|
+ if (sprintf(pathpfx, "%s/%s", xdgdatahome, dwmdir) <= 0) {
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ /* space for path segments, separators and nul */
|
||||||
|
+ pathpfx = ecalloc(1, strlen(home) + strlen(localshare)
|
||||||
|
+ + strlen(dwmdir) + 3);
|
||||||
|
+
|
||||||
|
+ if (sprintf(pathpfx, "%s/%s/%s", home, localshare, dwmdir) < 0) {
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* check if the autostart script directory exists */
|
||||||
|
+ if (! (stat(pathpfx, &sb) == 0 && S_ISDIR(sb.st_mode))) {
|
||||||
|
+ /* the XDG conformant path does not exist or is no directory
|
||||||
|
+ * so we try ~/.dwm instead
|
||||||
|
+ */
|
||||||
|
+ char *pathpfx_new = realloc(pathpfx, strlen(home) + strlen(dwmdir) + 3);
|
||||||
|
+ if(pathpfx_new == NULL) {
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ pathpfx = pathpfx_new;
|
||||||
|
+
|
||||||
|
+ if (sprintf(pathpfx, "%s/.%s", home, dwmdir) <= 0) {
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* try the blocking script first */
|
||||||
|
+ path = ecalloc(1, strlen(pathpfx) + strlen(autostartblocksh) + 2);
|
||||||
|
+ if (sprintf(path, "%s/%s", pathpfx, autostartblocksh) <= 0) {
|
||||||
|
+ free(path);
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (access(path, X_OK) == 0)
|
||||||
|
+ system(path);
|
||||||
|
+
|
||||||
|
+ /* now the non-blocking script */
|
||||||
|
+ if (sprintf(path, "%s/%s", pathpfx, autostartsh) <= 0) {
|
||||||
|
+ free(path);
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (access(path, X_OK) == 0)
|
||||||
|
+ system(strcat(path, " &"));
|
||||||
|
+
|
||||||
|
+ free(pathpfx);
|
||||||
|
+ free(path);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
scan(void)
|
||||||
|
{
|
||||||
|
@@ -2142,6 +2223,7 @@ main(int argc, char *argv[])
|
||||||
|
die("pledge");
|
||||||
|
#endif /* __OpenBSD__ */
|
||||||
|
scan();
|
||||||
|
+ runautostart();
|
||||||
|
run();
|
||||||
|
cleanup();
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
118
dwm-6.5/patches/dwm-barpadding-20211020-a786211.diff
Normal file
118
dwm-6.5/patches/dwm-barpadding-20211020-a786211.diff
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
From a3cfb215f7f647d83d67e33df8f33a73e43bd65f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bakkeby <bakkeby@gmail.com>
|
||||||
|
Date: Wed, 20 Oct 2021 09:14:07 +0200
|
||||||
|
Subject: [PATCH] barpadding: adds space between the statusbar and the edge of
|
||||||
|
the screen
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 2 ++
|
||||||
|
dwm.c | 25 +++++++++++++++----------
|
||||||
|
2 files changed, 17 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index a2ac963..f0b739f 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -5,6 +5,8 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
+static const int vertpad = 10; /* vertical padding of bar */
|
||||||
|
+static const int sidepad = 10; /* horizontal padding of bar */
|
||||||
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
|
static const char dmenufont[] = "monospace:size=10";
|
||||||
|
static const char col_gray1[] = "#222222";
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 5e4d494..df6d0d7 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -242,6 +242,8 @@ static int screen;
|
||||||
|
static int sw, sh; /* X display screen geometry width, height */
|
||||||
|
static int bh, blw = 0; /* bar geometry */
|
||||||
|
static int lrpad; /* sum of left and right padding for text */
|
||||||
|
+static int vp; /* vertical padding for bar */
|
||||||
|
+static int sp; /* side padding for bar */
|
||||||
|
static int (*xerrorxlib)(Display *, XErrorEvent *);
|
||||||
|
static unsigned int numlockmask = 0;
|
||||||
|
static void (*handler[LASTEvent]) (XEvent *) = {
|
||||||
|
@@ -568,7 +570,7 @@ configurenotify(XEvent *e)
|
||||||
|
for (c = m->clients; c; c = c->next)
|
||||||
|
if (c->isfullscreen)
|
||||||
|
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||||
|
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
||||||
|
+ XMoveResizeWindow(dpy, m->barwin, m->wx + sp, m->by + vp, m->ww - 2 * sp, bh);
|
||||||
|
}
|
||||||
|
focus(NULL);
|
||||||
|
arrange(NULL);
|
||||||
|
@@ -706,7 +708,7 @@ drawbar(Monitor *m)
|
||||||
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
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);
|
||||||
|
+ drw_text(drw, m->ww - tw - 2 * sp, 0, tw, bh, 0, stext, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (c = m->clients; c; c = c->next) {
|
||||||
|
@@ -732,12 +734,12 @@ drawbar(Monitor *m)
|
||||||
|
if ((w = m->ww - tw - x) > bh) {
|
||||||
|
if (m->sel) {
|
||||||
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||||
|
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
+ drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
if (m->sel->isfloating)
|
||||||
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
||||||
|
} else {
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
- drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
|
+ drw_rect(drw, x, 0, w - 2 * sp, bh, 1, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||||
|
@@ -1547,7 +1549,10 @@ setup(void)
|
||||||
|
die("no fonts could be loaded.");
|
||||||
|
lrpad = drw->fonts->h;
|
||||||
|
bh = drw->fonts->h + 2;
|
||||||
|
+ sp = sidepad;
|
||||||
|
+ vp = (topbar == 1) ? vertpad : - vertpad;
|
||||||
|
updategeom();
|
||||||
|
+
|
||||||
|
/* init atoms */
|
||||||
|
utf8string = XInternAtom(dpy, "UTF8_STRING", False);
|
||||||
|
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
|
||||||
|
@@ -1704,7 +1709,7 @@ togglebar(const Arg *arg)
|
||||||
|
{
|
||||||
|
selmon->showbar = !selmon->showbar;
|
||||||
|
updatebarpos(selmon);
|
||||||
|
- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
||||||
|
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh);
|
||||||
|
arrange(selmon);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1814,7 +1819,7 @@ updatebars(void)
|
||||||
|
for (m = mons; m; m = m->next) {
|
||||||
|
if (m->barwin)
|
||||||
|
continue;
|
||||||
|
- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
|
||||||
|
+ m->barwin = XCreateWindow(dpy, root, m->wx + sp, m->by + vp, m->ww - 2 * sp, bh, 0, DefaultDepth(dpy, screen),
|
||||||
|
CopyFromParent, DefaultVisual(dpy, screen),
|
||||||
|
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
||||||
|
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||||
|
@@ -1829,11 +1834,11 @@ updatebarpos(Monitor *m)
|
||||||
|
m->wy = m->my;
|
||||||
|
m->wh = m->mh;
|
||||||
|
if (m->showbar) {
|
||||||
|
- m->wh -= bh;
|
||||||
|
- m->by = m->topbar ? m->wy : m->wy + m->wh;
|
||||||
|
- m->wy = m->topbar ? m->wy + bh : m->wy;
|
||||||
|
+ m->wh = m->wh - vertpad - bh;
|
||||||
|
+ m->by = m->topbar ? m->wy : m->wy + m->wh + vertpad;
|
||||||
|
+ m->wy = m->topbar ? m->wy + bh + vp : m->wy;
|
||||||
|
} else
|
||||||
|
- m->by = -bh;
|
||||||
|
+ m->by = -bh - vp;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
142
dwm-6.5/patches/dwm-centeredmaster-6.1_gapps_fix.diff
Normal file
142
dwm-6.5/patches/dwm-centeredmaster-6.1_gapps_fix.diff
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 7054c06..527b214 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -39,6 +39,8 @@ static const Layout layouts[] = {
|
||||||
|
{ "[]=", tile }, /* first entry is default */
|
||||||
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
|
{ "[M]", monocle },
|
||||||
|
+ { "|M|", centeredmaster },
|
||||||
|
+ { ">M>", centeredfloatingmaster },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* key definitions */
|
||||||
|
@@ -74,6 +76,8 @@ static Key keys[] = {
|
||||||
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
|
+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
||||||
|
+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
||||||
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 0362114..1e81412 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
|
static void zoom(const Arg *arg);
|
||||||
|
+static void centeredmaster(Monitor *m);
|
||||||
|
+static void centeredfloatingmaster(Monitor *m);
|
||||||
|
|
||||||
|
/* variables */
|
||||||
|
static const char broken[] = "broken";
|
||||||
|
@@ -2139,3 +2141,106 @@ main(int argc, char *argv[])
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+centeredmaster(Monitor *m)
|
||||||
|
+{
|
||||||
|
+ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
|
||||||
|
+ Client *c;
|
||||||
|
+
|
||||||
|
+ /* count number of clients in the selected monitor */
|
||||||
|
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
||||||
|
+ if (n == 0)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ /* initialize areas */
|
||||||
|
+ mw = m->ww - m->gappx;
|
||||||
|
+ mx = 0;
|
||||||
|
+ my = m->gappx;
|
||||||
|
+ tw = mw;
|
||||||
|
+
|
||||||
|
+ if (n > m->nmaster) {
|
||||||
|
+ /* go mfact box in the center if more than nmaster clients */
|
||||||
|
+ mw = m->nmaster ? m->ww * m->mfact : m->gappx;
|
||||||
|
+ tw = m->ww - mw;
|
||||||
|
+
|
||||||
|
+ if (n - m->nmaster > 1) {
|
||||||
|
+ /* only one client */
|
||||||
|
+ mx = (m->ww - mw) / 2;
|
||||||
|
+ tw = (m->ww - mw) / 2;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ oty = m->gappx;
|
||||||
|
+ ety = m->gappx;
|
||||||
|
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
||||||
|
+ if (i < m->nmaster) {
|
||||||
|
+ /* nmaster clients are stacked vertically, in the center
|
||||||
|
+ * of the screen */
|
||||||
|
+ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
|
||||||
|
+ resize(c, m->wx + mx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx,
|
||||||
|
+ h - (2*c->bw), 0);
|
||||||
|
+ my += HEIGHT(c) + m->gappx;
|
||||||
|
+ } else {
|
||||||
|
+ /* stack clients are stacked vertically */
|
||||||
|
+ if ((i - m->nmaster) % 2 ) {
|
||||||
|
+ h = (m->wh - ety) / ( (1 + n - i) / 2) - m->gappx;
|
||||||
|
+ resize(c, m->wx + m->gappx, m->wy + ety, tw - (2*c->bw) - m->gappx,
|
||||||
|
+ h - (2*c->bw), 0);
|
||||||
|
+ ety += HEIGHT(c) + m->gappx;
|
||||||
|
+ } else {
|
||||||
|
+ h = (m->wh - oty) / ((1 + n - i) / 2) - m->gappx;
|
||||||
|
+ resize(c, m->wx + mx + mw + m->gappx, m->wy + oty,
|
||||||
|
+ tw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0);
|
||||||
|
+ oty += HEIGHT(c) + m->gappx;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+centeredfloatingmaster(Monitor *m)
|
||||||
|
+{
|
||||||
|
+ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
|
||||||
|
+ Client *c;
|
||||||
|
+
|
||||||
|
+ /* count number of clients in the selected monitor */
|
||||||
|
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
||||||
|
+ if (n == 0)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ /* initialize nmaster area */
|
||||||
|
+ if (n > m->nmaster) {
|
||||||
|
+ /* go mfact box in the center if more than nmaster clients */
|
||||||
|
+ if (m->ww > m->wh) {
|
||||||
|
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
||||||
|
+ mh = m->nmaster ? m->wh * 0.9 : 0;
|
||||||
|
+ } else {
|
||||||
|
+ mh = m->nmaster ? m->wh * m->mfact : 0;
|
||||||
|
+ mw = m->nmaster ? m->ww * 0.9 : 0;
|
||||||
|
+ }
|
||||||
|
+ mx = mxo = (m->ww - mw) / 2;
|
||||||
|
+ my = myo = (m->wh - mh) / 2;
|
||||||
|
+ } else {
|
||||||
|
+ /* go fullscreen if all clients are in the master area */
|
||||||
|
+ mh = m->wh;
|
||||||
|
+ mw = m->ww;
|
||||||
|
+ mx = mxo = 0;
|
||||||
|
+ my = myo = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
||||||
|
+ if (i < m->nmaster) {
|
||||||
|
+ /* nmaster clients are stacked horizontally, in the center
|
||||||
|
+ * of the screen */
|
||||||
|
+ w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
|
||||||
|
+ resize(c, m->wx + mx, m->wy + my, w - (2*c->bw),
|
||||||
|
+ mh - (2*c->bw), 0);
|
||||||
|
+ mx += WIDTH(c);
|
||||||
|
+ } else {
|
||||||
|
+ /* stack clients are stacked horizontally */
|
||||||
|
+ w = (m->ww - tx) / (n - i);
|
||||||
|
+ resize(c, m->wx + tx, m->wy, w - (2*c->bw),
|
||||||
|
+ m->wh - (2*c->bw), 0);
|
||||||
|
+ tx += WIDTH(c);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
62
dwm-6.5/patches/dwm-statuspadding-6.3.diff
Normal file
62
dwm-6.5/patches/dwm-statuspadding-6.3.diff
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
From d6dd69c26f4272f87672ae54f69dc0d48650d34b Mon Sep 17 00:00:00 2001
|
||||||
|
From: taep96 <64481039+taep96@users.noreply.github.com>
|
||||||
|
Date: Mon, 7 Feb 2022 19:09:45 +0100
|
||||||
|
Subject: [PATCH] Fixed | Replaces magic numbers in statusbar with configurable
|
||||||
|
variables.
|
||||||
|
|
||||||
|
horizpadbar for horizontal statusbar padding
|
||||||
|
vertpadbar for vertical statusbar padding
|
||||||
|
|
||||||
|
StatusText now has both left and right padding,
|
||||||
|
as well as the vertical padding that all of the statusbar shares.
|
||||||
|
|
||||||
|
Other than the addition of left padding to StatusText, appearance
|
||||||
|
of the statusbar is identical to pre-patch when using the defaults
|
||||||
|
in config.def.h
|
||||||
|
---
|
||||||
|
config.def.h | 2 ++
|
||||||
|
dwm.c | 8 ++++----
|
||||||
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index a2ac963..6cb845c 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -5,6 +5,8 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
+static const int horizpadbar = 2; /* horizontal padding for statusbar */
|
||||||
|
+static const int vertpadbar = 0; /* vertical padding for statusbar */
|
||||||
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
|
static const char dmenufont[] = "monospace:size=10";
|
||||||
|
static const char col_gray1[] = "#222222";
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index a96f33c..a1b8c95 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -708,8 +708,8 @@ drawbar(Monitor *m)
|
||||||
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
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);
|
||||||
|
+ tw = TEXTW(stext);
|
||||||
|
+ drw_text(drw, m->ww - tw, 0, tw, bh, lrpad / 2, stext, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (c = m->clients; c; c = c->next) {
|
||||||
|
@@ -1548,8 +1548,8 @@ setup(void)
|
||||||
|
drw = drw_create(dpy, screen, root, sw, sh);
|
||||||
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
||||||
|
die("no fonts could be loaded.");
|
||||||
|
- lrpad = drw->fonts->h;
|
||||||
|
- bh = drw->fonts->h + 2;
|
||||||
|
+ lrpad = drw->fonts->h + horizpadbar;
|
||||||
|
+ bh = drw->fonts->h + vertpadbar;
|
||||||
|
updategeom();
|
||||||
|
/* init atoms */
|
||||||
|
utf8string = XInternAtom(dpy, "UTF8_STRING", False);
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
42
dwm-6.5/transient.c
Normal file
42
dwm-6.5/transient.c
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/* 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
dwm-6.5/util.c
Normal file
36
dwm-6.5/util.c
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/* 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
dwm-6.5/util.h
Normal file
8
dwm-6.5/util.h
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/* 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