Added files
This commit is contained in:
Marcin Wozniak
parent
9d2fd88807
commit
52a39819a5
5
.gitignore
vendored
Normal file
5
.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
*.diff
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
*.o
|
||||||
|
dwm
|
||||||
@ -1,132 +0,0 @@
|
|||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/* 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 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[] = "#222222";
|
|
||||||
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 char *colors[][3] = {
|
|
||||||
/* fg bg border */
|
|
||||||
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
|
||||||
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 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 */
|
|
||||||
{ "Chromium", NULL, NULL, 1 << 1, False, -1 },
|
|
||||||
{ "Opera", NULL, NULL, 1 << 1, False, -1 },
|
|
||||||
{ NULL, NULL, "Audacious", 1 << 4, False, -1 },
|
|
||||||
{ "Thunar", NULL, NULL, 1 << 5, False, -1 },
|
|
||||||
{ "Thunderbird", NULL, NULL, 1 << 3, False, -1 },
|
|
||||||
{ "Pidgin", NULL, NULL, 1 << 2, False, -1 },
|
|
||||||
{ "qbittorent", NULL, NULL, 1 << 5, False, -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 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[] = { "xterm", NULL };
|
|
||||||
static const char *print_screen_cmd[] = { "scrot", "%Y-%m-%d-%H%M%S.png", "-e", "mv $f ~/images/screenshots", NULL };
|
|
||||||
static const char *cmdlock[] = { "slock", NULL };
|
|
||||||
|
|
||||||
static Key keys[] = {
|
|
||||||
/* modifier key function argument */
|
|
||||||
{0 , 0x1008ff02 , spawn, SHCMD ("xbacklight -inc 10")},
|
|
||||||
{0 , 0x1008ff03 , spawn, SHCMD ("xbacklight -dec 10")},
|
|
||||||
{0 , 0x1008ff11 , spawn, SHCMD ("pactl set-sink-volume 0 -5%")},
|
|
||||||
{0 , 0x1008ff12 , spawn, SHCMD ("pactl set-sink-mute 0 toggle")},
|
|
||||||
{0 , 0x1008ff13 , spawn, SHCMD ("pactl set-sink-volume 0 +5%")},
|
|
||||||
{ MODKEY|ShiftMask, XK_l, spawn, {.v = cmdlock } },
|
|
||||||
{ 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 } },
|
|
||||||
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 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} },
|
|
||||||
};
|
|
||||||
|
|
||||||
2
config.h
2
config.h
@ -88,7 +88,7 @@ static Key keys[] = {
|
|||||||
{0, 0x1008ff13, spawn, SHCMD ("ponymix increase 5")},
|
{0, 0x1008ff13, spawn, SHCMD ("ponymix increase 5")},
|
||||||
{ MODKEY, XK_F2, spawn, SHCMD ("ponymix decrease 5")},
|
{ MODKEY, XK_F2, spawn, SHCMD ("ponymix decrease 5")},
|
||||||
{ MODKEY, XK_F1, spawn, SHCMD ("ponymix toggle")},
|
{ MODKEY, XK_F1, spawn, SHCMD ("ponymix toggle")},
|
||||||
{ MODKEY, XK_F1, spawn, SHCMD ("ponymix increase 5")},
|
{ MODKEY, XK_F3, spawn, SHCMD ("ponymix increase 5")},
|
||||||
{ MODKEY, XK_F10, spawn, {.v = screenswitcher} },
|
{ MODKEY, XK_F10, spawn, {.v = screenswitcher} },
|
||||||
{0, XK_Print, spawn, {.v = print_screen_cmd } },
|
{0, XK_Print, spawn, {.v = print_screen_cmd } },
|
||||||
{ MODKEY, XK_l, spawn, {.v = cmdlock } },
|
{ MODKEY, XK_l, spawn, {.v = cmdlock } },
|
||||||
|
|||||||
@ -1,38 +0,0 @@
|
|||||||
# dwm version
|
|
||||||
VERSION = 6.1
|
|
||||||
|
|
||||||
# Customize below to fit your system
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
MANPREFIX = ${PREFIX}/share/man
|
|
||||||
|
|
||||||
X11INC = /usr/include/X11
|
|
||||||
X11LIB = /usr/lib/X11
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I${X11INC} -I${FREETYPEINC}
|
|
||||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
|
||||||
|
|
||||||
# flags
|
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
|
||||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
|
||||||
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
|
|
||||||
LDFLAGS = -s ${LIBS}
|
|
||||||
|
|
||||||
# Solaris
|
|
||||||
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
|
||||||
#LDFLAGS = ${LIBS}
|
|
||||||
|
|
||||||
# compiler and linker
|
|
||||||
CC = cc
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
commit 5918623c5bd7fda155bf9dc3d33890c4ae1722d0
|
|
||||||
Author: Simon Bremer <simon.bremer@tum.de>
|
|
||||||
Date: Thu Dec 22 17:31:07 2016 +0100
|
|
||||||
|
|
||||||
Applied and fixed autostart patch for previous version;
|
|
||||||
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index d27cb67..066ed71 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -194,6 +194,7 @@ static void resizeclient(Client *c, int x, int y, int w, int h);
|
|
||||||
static void resizemouse(const Arg *arg);
|
|
||||||
static void restack(Monitor *m);
|
|
||||||
static void run(void);
|
|
||||||
+static void runAutostart(void);
|
|
||||||
static void scan(void);
|
|
||||||
static int sendevent(Client *c, Atom proto);
|
|
||||||
static void sendmon(Client *c, Monitor *m);
|
|
||||||
@@ -1386,6 +1387,12 @@ run(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
+runAutostart(void) {
|
|
||||||
+ system("cd ~/.dwm; ./autostart_blocking.sh");
|
|
||||||
+ system("cd ~/.dwm; ./autostart.sh &");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
scan(void)
|
|
||||||
{
|
|
||||||
unsigned int i, num;
|
|
||||||
@@ -2145,6 +2152,7 @@ main(int argc, char *argv[])
|
|
||||||
checkotherwm();
|
|
||||||
setup();
|
|
||||||
scan();
|
|
||||||
+ runAutostart();
|
|
||||||
run();
|
|
||||||
cleanup();
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
@ -1,95 +0,0 @@
|
|||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1c0b587..38d2f6c 100644
|
|
||||||
--- 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 */
|
|
||||||
@@ -84,6 +85,9 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
|
||||||
+ { MODKEY, XK_minus, setgaps, {.i = -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 --git a/dwm.c b/dwm.c
|
|
||||||
index 4465af1..4363627 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -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];
|
|
||||||
@@ -199,6 +200,7 @@ static void sendmon(Client *c, Monitor *m);
|
|
||||||
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);
|
|
||||||
@@ -638,6 +640,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);
|
|
||||||
@@ -1497,6 +1500,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)
|
|
||||||
{
|
|
||||||
@@ -1683,16 +1696,16 @@ 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++)
|
|
||||||
+ 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);
|
|
||||||
- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- my += HEIGHT(c);
|
|
||||||
+ 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);
|
|
||||||
+ 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);
|
|
||||||
- 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);
|
|
||||||
+ ty += HEIGHT(c) + m->gappx;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
@ -1,294 +0,0 @@
|
|||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 77ff358..3bee2e7 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
-static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
|
|
||||||
+static const char font[] = "Sans 8";
|
|
||||||
static const char normbordercolor[] = "#444444";
|
|
||||||
static const char normbgcolor[] = "#222222";
|
|
||||||
static const char normfgcolor[] = "#bbbbbb";
|
|
||||||
@@ -12,6 +12,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
static const Bool showbar = True; /* False means no bar */
|
|
||||||
static const Bool topbar = True; /* False means bottom bar */
|
|
||||||
+static const Bool statusmarkup = True; /* True means use pango markup in status message */
|
|
||||||
|
|
||||||
/* tagging */
|
|
||||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
|
||||||
diff --git a/config.mk b/config.mk
|
|
||||||
index 484554a..cdfb642 100644
|
|
||||||
--- a/config.mk
|
|
||||||
+++ b/config.mk
|
|
||||||
@@ -15,8 +15,8 @@ XINERAMALIBS = -L${X11LIB} -lXinerama
|
|
||||||
XINERAMAFLAGS = -DXINERAMA
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
-INCS = -I. -I/usr/include -I${X11INC}
|
|
||||||
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
|
|
||||||
+INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags xft pango pangoxft`
|
|
||||||
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} `pkg-config --libs xft pango pangoxft`
|
|
||||||
|
|
||||||
# flags
|
|
||||||
CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 1d78655..8fae3ba 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -36,6 +36,9 @@
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#include <X11/Xproto.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
+#include <X11/Xft/Xft.h>
|
|
||||||
+#include <pango/pango.h>
|
|
||||||
+#include <pango/pangoxft.h>
|
|
||||||
#ifdef XINERAMA
|
|
||||||
#include <X11/extensions/Xinerama.h>
|
|
||||||
#endif /* XINERAMA */
|
|
||||||
@@ -47,8 +50,12 @@
|
|
||||||
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
|
|
||||||
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
|
|
||||||
#define LENGTH(X) (sizeof X / sizeof X[0])
|
|
||||||
+#ifndef MAX
|
|
||||||
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
|
||||||
+#endif
|
|
||||||
+#ifndef MIN
|
|
||||||
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
|
||||||
+#endif
|
|
||||||
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
|
|
||||||
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
|
||||||
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
|
||||||
@@ -104,11 +111,15 @@ typedef struct {
|
|
||||||
Drawable drawable;
|
|
||||||
GC gc;
|
|
||||||
struct {
|
|
||||||
+ XftColor norm[ColLast];
|
|
||||||
+ XftColor sel[ColLast];
|
|
||||||
+ XftDraw *drawable;
|
|
||||||
+ } xft;
|
|
||||||
+ struct {
|
|
||||||
int ascent;
|
|
||||||
int descent;
|
|
||||||
int height;
|
|
||||||
- XFontSet set;
|
|
||||||
- XFontStruct *xfont;
|
|
||||||
+ PangoLayout *layout;
|
|
||||||
} font;
|
|
||||||
} DC; /* draw context */
|
|
||||||
|
|
||||||
@@ -186,7 +197,7 @@ static void focus(Client *c);
|
|
||||||
static void focusin(XEvent *e);
|
|
||||||
static void focusmon(const Arg *arg);
|
|
||||||
static void focusstack(const Arg *arg);
|
|
||||||
-static unsigned long getcolor(const char *colstr);
|
|
||||||
+static unsigned long getcolor(const char *colstr, XftColor *color);
|
|
||||||
static Bool getrootptr(int *x, int *y);
|
|
||||||
static long getstate(Window w);
|
|
||||||
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|
||||||
@@ -254,7 +265,7 @@ static void zoom(const Arg *arg);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
-static char stext[256];
|
|
||||||
+static char stext[512];
|
|
||||||
static int screen;
|
|
||||||
static int sw, sh; /* X display screen geometry width, height */
|
|
||||||
static int bh, blw = 0; /* bar geometry */
|
|
||||||
@@ -479,18 +490,21 @@ cleanup(void) {
|
|
||||||
Arg a = {.ui = ~0};
|
|
||||||
Layout foo = { "", NULL };
|
|
||||||
Monitor *m;
|
|
||||||
+ int i;
|
|
||||||
|
|
||||||
view(&a);
|
|
||||||
selmon->lt[selmon->sellt] = &foo;
|
|
||||||
for(m = mons; m; m = m->next)
|
|
||||||
while(m->stack)
|
|
||||||
unmanage(m->stack, False);
|
|
||||||
- if(dc.font.set)
|
|
||||||
- XFreeFontSet(dpy, dc.font.set);
|
|
||||||
- else
|
|
||||||
- XFreeFont(dpy, dc.font.xfont);
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
|
||||||
XFreePixmap(dpy, dc.drawable);
|
|
||||||
+ for(i = ColBorder; i < ColLast; i++) {
|
|
||||||
+ XftColorFree(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), dc.xft.norm + i);
|
|
||||||
+ XftColorFree(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), dc.xft.sel + i);
|
|
||||||
+ }
|
|
||||||
+ XftDrawDestroy(dc.xft.drawable);
|
|
||||||
+ g_object_unref(dc.font.layout);
|
|
||||||
XFreeGC(dpy, dc.gc);
|
|
||||||
XFreeCursor(dpy, cursor[CurNormal]);
|
|
||||||
XFreeCursor(dpy, cursor[CurResize]);
|
|
||||||
@@ -581,6 +595,7 @@ configurenotify(XEvent *e) {
|
|
||||||
if(dc.drawable != 0)
|
|
||||||
XFreePixmap(dpy, dc.drawable);
|
|
||||||
dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
|
|
||||||
+ XftDrawChange(dc.xft.drawable, dc.drawable);
|
|
||||||
updatebars();
|
|
||||||
for(m = mons; m; m = m->next)
|
|
||||||
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
|
||||||
@@ -787,7 +802,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
|
|
||||||
|
|
||||||
void
|
|
||||||
drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
|
|
||||||
- char buf[256];
|
|
||||||
+ char buf[512];
|
|
||||||
int i, x, y, h, len, olen;
|
|
||||||
|
|
||||||
XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
|
|
||||||
@@ -796,20 +811,25 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
|
|
||||||
return;
|
|
||||||
olen = strlen(text);
|
|
||||||
h = dc.font.ascent + dc.font.descent;
|
|
||||||
- y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
|
|
||||||
+ y = dc.y + (dc.h / 2) - (h / 2);
|
|
||||||
x = dc.x + (h / 2);
|
|
||||||
- /* shorten text if necessary */
|
|
||||||
+ /* shorten text if necessary (this could wreak havoc with pango markup but fortunately
|
|
||||||
+ dc.w is adjusted to the width of the status text and not the other way around) */
|
|
||||||
for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
|
|
||||||
if(!len)
|
|
||||||
return;
|
|
||||||
memcpy(buf, text, len);
|
|
||||||
if(len < olen)
|
|
||||||
for(i = len; i && i > len - 3; buf[--i] = '.');
|
|
||||||
- XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
|
|
||||||
- if(dc.font.set)
|
|
||||||
- XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
|
|
||||||
+ if(text == stext && statusmarkup)
|
|
||||||
+ pango_layout_set_markup(dc.font.layout, buf, len);
|
|
||||||
else
|
|
||||||
- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
|
|
||||||
+ pango_layout_set_text(dc.font.layout, buf, len);
|
|
||||||
+ pango_xft_render_layout(dc.xft.drawable,
|
|
||||||
+ (col == dc.norm ? dc.xft.norm : dc.xft.sel) + (invert ? ColBG : ColFG),
|
|
||||||
+ dc.font.layout, x * PANGO_SCALE, y * PANGO_SCALE);
|
|
||||||
+ if(text == stext && statusmarkup) /* clear markup attributes */
|
|
||||||
+ pango_layout_set_attributes(dc.font.layout, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -927,13 +947,13 @@ getatomprop(Client *c, Atom prop) {
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long
|
|
||||||
-getcolor(const char *colstr) {
|
|
||||||
+getcolor(const char *colstr, XftColor *color) {
|
|
||||||
Colormap cmap = DefaultColormap(dpy, screen);
|
|
||||||
- XColor color;
|
|
||||||
+ Visual *vis = DefaultVisual(dpy, screen);
|
|
||||||
|
|
||||||
- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
|
|
||||||
+ if(!XftColorAllocName(dpy, vis, cmap, colstr, color))
|
|
||||||
die("error, cannot allocate color '%s'\n", colstr);
|
|
||||||
- return color.pixel;
|
|
||||||
+ return color->pixel;
|
|
||||||
}
|
|
||||||
|
|
||||||
Bool
|
|
||||||
@@ -1034,36 +1054,24 @@ incnmaster(const Arg *arg) {
|
|
||||||
|
|
||||||
void
|
|
||||||
initfont(const char *fontstr) {
|
|
||||||
- char *def, **missing;
|
|
||||||
- int n;
|
|
||||||
-
|
|
||||||
- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
|
|
||||||
- if(missing) {
|
|
||||||
- while(n--)
|
|
||||||
- fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
|
|
||||||
- XFreeStringList(missing);
|
|
||||||
- }
|
|
||||||
- if(dc.font.set) {
|
|
||||||
- XFontStruct **xfonts;
|
|
||||||
- char **font_names;
|
|
||||||
-
|
|
||||||
- dc.font.ascent = dc.font.descent = 0;
|
|
||||||
- XExtentsOfFontSet(dc.font.set);
|
|
||||||
- n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
|
|
||||||
- while(n--) {
|
|
||||||
- dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
|
|
||||||
- dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
|
|
||||||
- xfonts++;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- else {
|
|
||||||
- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
|
|
||||||
- && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
|
|
||||||
- die("error, cannot load font: '%s'\n", fontstr);
|
|
||||||
- dc.font.ascent = dc.font.xfont->ascent;
|
|
||||||
- dc.font.descent = dc.font.xfont->descent;
|
|
||||||
- }
|
|
||||||
+ PangoFontMap *fontmap;
|
|
||||||
+ PangoContext *context;
|
|
||||||
+ PangoFontDescription *desc;
|
|
||||||
+ PangoFontMetrics *metrics;
|
|
||||||
+
|
|
||||||
+ fontmap = pango_xft_get_font_map(dpy, screen);
|
|
||||||
+ context = pango_font_map_create_context(fontmap);
|
|
||||||
+ desc = pango_font_description_from_string(fontstr);
|
|
||||||
+ dc.font.layout = pango_layout_new(context);
|
|
||||||
+ pango_layout_set_font_description(dc.font.layout, desc);
|
|
||||||
+
|
|
||||||
+ metrics = pango_context_get_metrics(context, desc, NULL);
|
|
||||||
+ dc.font.ascent = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE;
|
|
||||||
+ dc.font.descent = pango_font_metrics_get_descent(metrics) / PANGO_SCALE;
|
|
||||||
dc.font.height = dc.font.ascent + dc.font.descent;
|
|
||||||
+
|
|
||||||
+ pango_font_metrics_unref(metrics);
|
|
||||||
+ g_object_unref(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef XINERAMA
|
|
||||||
@@ -1612,17 +1620,16 @@ setup(void) {
|
|
||||||
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
|
|
||||||
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
|
|
||||||
/* init appearance */
|
|
||||||
- dc.norm[ColBorder] = getcolor(normbordercolor);
|
|
||||||
- dc.norm[ColBG] = getcolor(normbgcolor);
|
|
||||||
- dc.norm[ColFG] = getcolor(normfgcolor);
|
|
||||||
- dc.sel[ColBorder] = getcolor(selbordercolor);
|
|
||||||
- dc.sel[ColBG] = getcolor(selbgcolor);
|
|
||||||
- dc.sel[ColFG] = getcolor(selfgcolor);
|
|
||||||
+ dc.norm[ColBorder] = getcolor(normbordercolor, dc.xft.norm + ColBorder);
|
|
||||||
+ dc.norm[ColBG] = getcolor(normbgcolor, dc.xft.norm + ColBG);
|
|
||||||
+ dc.norm[ColFG] = getcolor(normfgcolor, dc.xft.norm + ColFG);
|
|
||||||
+ dc.sel[ColBorder] = getcolor(selbordercolor, dc.xft.sel + ColBorder);
|
|
||||||
+ dc.sel[ColBG] = getcolor(selbgcolor, dc.xft.sel + ColBG);
|
|
||||||
+ dc.sel[ColFG] = getcolor(selfgcolor, dc.xft.sel + ColFG);
|
|
||||||
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
|
|
||||||
+ dc.xft.drawable = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen));
|
|
||||||
dc.gc = XCreateGC(dpy, root, 0, NULL);
|
|
||||||
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
|
|
||||||
- if(!dc.font.set)
|
|
||||||
- XSetFont(dpy, dc.gc, dc.font.xfont->fid);
|
|
||||||
/* init bars */
|
|
||||||
updatebars();
|
|
||||||
updatestatus();
|
|
||||||
@@ -1692,13 +1699,15 @@ tagmon(const Arg *arg) {
|
|
||||||
|
|
||||||
int
|
|
||||||
textnw(const char *text, unsigned int len) {
|
|
||||||
- XRectangle r;
|
|
||||||
-
|
|
||||||
- if(dc.font.set) {
|
|
||||||
- XmbTextExtents(dc.font.set, text, len, NULL, &r);
|
|
||||||
- return r.width;
|
|
||||||
- }
|
|
||||||
- return XTextWidth(dc.font.xfont, text, len);
|
|
||||||
+ PangoRectangle r;
|
|
||||||
+ if(text == stext && statusmarkup)
|
|
||||||
+ pango_layout_set_markup(dc.font.layout, text, len);
|
|
||||||
+ else
|
|
||||||
+ pango_layout_set_text(dc.font.layout, text, len);
|
|
||||||
+ pango_layout_get_extents(dc.font.layout, 0, &r);
|
|
||||||
+ if(text == stext && statusmarkup) /* clear markup attributes */
|
|
||||||
+ pango_layout_set_attributes(dc.font.layout, NULL);
|
|
||||||
+ return r.width / PANGO_SCALE;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@ -1,716 +0,0 @@
|
|||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index a9ac303..bb623f0 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -3,6 +3,10 @@
|
|
||||||
/* 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 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" };
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index c98678d..5f74da0 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -57,12 +57,30 @@
|
|
||||||
#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 +159,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);
|
|
||||||
@@ -169,8 +193,10 @@ 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 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);
|
|
||||||
@@ -188,13 +214,16 @@ static void pop(Client *);
|
|
||||||
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);
|
|
||||||
@@ -206,6 +235,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 *);
|
|
||||||
@@ -223,18 +253,23 @@ static void updateclientlist(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 int screen;
|
|
||||||
@@ -257,9 +292,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;
|
|
||||||
@@ -482,6 +518,11 @@ cleanup(void)
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
|
||||||
while (mons)
|
|
||||||
cleanupmon(mons);
|
|
||||||
+ 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++)
|
|
||||||
@@ -512,9 +553,52 @@ 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);
|
|
||||||
+ /* 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]) {
|
|
||||||
@@ -567,7 +651,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);
|
|
||||||
@@ -652,6 +736,11 @@ destroynotify(XEvent *e)
|
|
||||||
|
|
||||||
if ((c = wintoclient(ev->window)))
|
|
||||||
unmanage(c, 1);
|
|
||||||
+ else if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
+ removesystrayicon(c);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -695,19 +784,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();
|
|
||||||
+
|
|
||||||
/* 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);
|
|
||||||
+ sw = TEXTW(stext) - lrpad / 2 + 2; /* 2px right padding */
|
|
||||||
+ drw_text(drw, m->ww - sw - stw, 0, sw, bh, lrpad / 2 - 2, stext, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ resizebarwin(m);
|
|
||||||
for (c = m->clients; c; c = c->next) {
|
|
||||||
occ |= c->tags;
|
|
||||||
if (c->isurgent)
|
|
||||||
@@ -728,7 +821,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);
|
|
||||||
@@ -739,7 +832,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
|
|
||||||
@@ -776,8 +869,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
|
|
||||||
@@ -862,10 +958,17 @@ getatomprop(Client *c, Atom prop)
|
|
||||||
unsigned long dl;
|
|
||||||
unsigned char *p = NULL;
|
|
||||||
Atom da, atom = None;
|
|
||||||
+ /* 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, XA_ATOM,
|
|
||||||
+ 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;
|
|
||||||
@@ -899,6 +1002,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)
|
|
||||||
{
|
|
||||||
@@ -1003,7 +1116,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);
|
|
||||||
@@ -1091,6 +1204,12 @@ 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))
|
|
||||||
return;
|
|
||||||
@@ -1215,6 +1334,16 @@ propertynotify(XEvent *e)
|
|
||||||
Window trans;
|
|
||||||
XPropertyEvent *ev = &e->xproperty;
|
|
||||||
|
|
||||||
+ 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)
|
|
||||||
@@ -1265,6 +1394,20 @@ 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)
|
|
||||||
{
|
|
||||||
@@ -1272,6 +1415,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))
|
|
||||||
+ w -= getsystraywidth();
|
|
||||||
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
resizeclient(Client *c, int x, int y, int w, int h)
|
|
||||||
{
|
|
||||||
@@ -1344,6 +1495,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)
|
|
||||||
{
|
|
||||||
@@ -1433,26 +1597,36 @@ 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;
|
|
||||||
}
|
|
||||||
@@ -1466,7 +1640,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,6 +1729,10 @@ 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[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
|
||||||
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
|
||||||
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
|
||||||
@@ -1562,6 +1740,9 @@ setup(void)
|
|
||||||
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);
|
|
||||||
+ 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);
|
|
||||||
@@ -1570,6 +1751,8 @@ setup(void)
|
|
||||||
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
|
||||||
for (i = 0; i < LENGTH(colors); i++)
|
|
||||||
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
|
||||||
+ /* init system tray */
|
|
||||||
+ updatesystray();
|
|
||||||
/* init bars */
|
|
||||||
updatebars();
|
|
||||||
updatestatus();
|
|
||||||
@@ -1701,7 +1884,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);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1796,11 +1990,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,
|
|
||||||
@@ -1811,10 +2012,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 +2196,121 @@ 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 dimenons 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 w = 1;
|
|
||||||
+
|
|
||||||
+ if (!showsystray)
|
|
||||||
+ return;
|
|
||||||
+ 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 +2378,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 +2441,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)
|
|
||||||
{
|
|
||||||
2505
dwm.c.orig
2505
dwm.c.orig
File diff suppressed because it is too large
Load Diff
747
dwmgit.diff
747
dwmgit.diff
@ -1,747 +0,0 @@
|
|||||||
Authors:
|
|
||||||
Jan Christoph Ebersbach <jceb@e-jc.de>, inspired by http://code.google.com/p/dwm-plus
|
|
||||||
Eric Pruitt <eric.pruitt@gmail.com>
|
|
||||||
Yury Shvedov <shved@lvk.cs.msu.su>
|
|
||||||
URL: http://dwm.suckless.org/patches/systray
|
|
||||||
Implements a system tray for dwm.
|
|
||||||
|
|
||||||
Contributors:
|
|
||||||
- Carlos Pita, thanks for investigating multi monitor issues and sending in a
|
|
||||||
patch
|
|
||||||
|
|
||||||
Index: dwm/config.def.h
|
|
||||||
===================================================================
|
|
||||||
--- dwm/config.def.h.orig
|
|
||||||
+++ dwm/config.def.h
|
|
||||||
@@ -3,6 +3,10 @@
|
|
||||||
/* 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 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[] = { "Hack:size=8.5:antialias=true:autohint=false" };
|
|
||||||
Index: dwm/dwm.c
|
|
||||||
===================================================================
|
|
||||||
--- dwm/dwm.c.orig
|
|
||||||
+++ dwm/dwm.c
|
|
||||||
@@ -59,12 +59,30 @@
|
|
||||||
#define ColBorder 2
|
|
||||||
#define ColFloat 3
|
|
||||||
|
|
||||||
+#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, NetWMWindowTypeDock,
|
|
||||||
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 */
|
|
||||||
@@ -146,6 +164,12 @@ typedef struct {
|
|
||||||
int monitor;
|
|
||||||
} Rule;
|
|
||||||
|
|
||||||
+typedef struct Systray Systray;
|
|
||||||
+struct Systray {
|
|
||||||
+ Window win;
|
|
||||||
+ Client *icons;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
struct Clientlist {
|
|
||||||
Client *clients;
|
|
||||||
Client *stack;
|
|
||||||
@@ -184,8 +208,10 @@ 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 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);
|
|
||||||
@@ -203,13 +229,16 @@ static void pop(Client *);
|
|
||||||
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);
|
|
||||||
@@ -222,6 +251,7 @@ static void showhide(Client *c);
|
|
||||||
static void sigchld(int unused);
|
|
||||||
static void spawn(const Arg *arg);
|
|
||||||
static void swapfocus();
|
|
||||||
+static Monitor *systraytomon(Monitor *m);
|
|
||||||
static void tag(const Arg *arg);
|
|
||||||
static void tagmon(const Arg *arg);
|
|
||||||
static void tile(Monitor *);
|
|
||||||
@@ -239,18 +269,23 @@ static void updateclientlist(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 updatewindowtype(Client *c);
|
|
||||||
static void updatetitle(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 Client *prevclient = NULL;
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
static char stext[256];
|
|
||||||
@@ -274,9 +309,10 @@ static void (*handler[LASTEvent]) (XEven
|
|
||||||
[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 int restart = 0;
|
|
||||||
static Cur *cursor[CurLast];
|
|
||||||
@@ -558,6 +594,11 @@ cleanup(void)
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
|
||||||
while (mons)
|
|
||||||
cleanupmon(mons);
|
|
||||||
+ 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++)
|
|
||||||
@@ -588,9 +629,54 @@ 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);
|
|
||||||
+ XChangeProperty(dpy, c->win, netatom[NetWMWindowType], XA_ATOM, 32,
|
|
||||||
+ PropModeReplace, (unsigned char *)&netatom[NetWMWindowTypeDock], 1);
|
|
||||||
+ 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]) {
|
|
||||||
@@ -643,7 +729,7 @@ configurenotify(XEvent *e)
|
|
||||||
for (c = m->cl->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);
|
|
||||||
@@ -770,6 +856,11 @@ destroynotify(XEvent *e)
|
|
||||||
|
|
||||||
if ((c = wintoclient(ev->window)))
|
|
||||||
unmanage(c, 1);
|
|
||||||
+ else if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
+ removesystrayicon(c);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -813,19 +904,24 @@ dirtomon(int dir)
|
|
||||||
void
|
|
||||||
drawbar(Monitor *m)
|
|
||||||
{
|
|
||||||
- int x, w, sw = 0;
|
|
||||||
+ int x, w, sw, 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();
|
|
||||||
+
|
|
||||||
/* draw status first so it can be overdrawn by tags later */
|
|
||||||
if (m == selmon || 1) { /* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ resizebarwin(m);
|
|
||||||
for(c = m->cl->clients; c; c = c->next) {
|
|
||||||
occ |= c->tags;
|
|
||||||
if (c->isurgent)
|
|
||||||
@@ -846,7 +942,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);
|
|
||||||
@@ -857,7 +953,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
|
|
||||||
@@ -894,8 +990,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
|
|
||||||
@@ -983,10 +1082,17 @@ getatomprop(Client *c, Atom prop)
|
|
||||||
unsigned long dl;
|
|
||||||
unsigned char *p = NULL;
|
|
||||||
Atom da, atom = None;
|
|
||||||
+ /* 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, XA_ATOM,
|
|
||||||
+ 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;
|
|
||||||
@@ -1020,6 +1126,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)
|
|
||||||
{
|
|
||||||
@@ -1124,7 +1240,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);
|
|
||||||
@@ -1223,6 +1339,12 @@ 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))
|
|
||||||
return;
|
|
||||||
@@ -1356,6 +1478,16 @@ propertynotify(XEvent *e)
|
|
||||||
Window trans;
|
|
||||||
XPropertyEvent *ev = &e->xproperty;
|
|
||||||
|
|
||||||
+ 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)
|
|
||||||
@@ -1409,6 +1541,20 @@ recttomon(int x, int y, int w, int h)
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
if (applysizehints(c, &x, &y, &w, &h, interact))
|
|
||||||
@@ -1416,6 +1562,14 @@ resize(Client *c, int x, int y, int w, i
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
+resizebarwin(Monitor *m) {
|
|
||||||
+ unsigned int w = m->ww;
|
|
||||||
+ if (showsystray && m == systraytomon(m))
|
|
||||||
+ w -= getsystraywidth();
|
|
||||||
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
resizeclient(Client *c, int x, int y, int w, int h)
|
|
||||||
{
|
|
||||||
XWindowChanges wc;
|
|
||||||
@@ -1488,6 +1642,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)
|
|
||||||
{
|
|
||||||
Client *c;
|
|
||||||
@@ -1574,26 +1741,36 @@ 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;
|
|
||||||
}
|
|
||||||
@@ -1607,7 +1784,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
|
|
||||||
@@ -1701,6 +1878,10 @@ 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[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
|
||||||
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
|
||||||
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
|
||||||
@@ -1709,6 +1890,9 @@ setup(void)
|
|
||||||
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);
|
|
||||||
@@ -1717,6 +1901,8 @@ setup(void)
|
|
||||||
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
|
||||||
for (i = 0; i < LENGTH(colors); i++)
|
|
||||||
scheme[i] = drw_scm_create(drw, colors[i], 4);
|
|
||||||
+ /* init system tray */
|
|
||||||
+ updatesystray();
|
|
||||||
/* init bars */
|
|
||||||
updatebars();
|
|
||||||
updatestatus();
|
|
||||||
@@ -1765,10 +1951,12 @@ showhide(Client *c)
|
|
||||||
if (ISVISIBLE(c, c->mon)) {
|
|
||||||
/* show clients top down */
|
|
||||||
XMoveWindow(dpy, c->win, c->x, c->y);
|
|
||||||
- if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
|
|
||||||
- if (c->isfloating)
|
|
||||||
+ if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen) {
|
|
||||||
+ if (c->isfloating) {
|
|
||||||
keepfloatingposition(c);
|
|
||||||
+ }
|
|
||||||
resize(c, c->x, c->y, c->w, c->h, 0);
|
|
||||||
+ }
|
|
||||||
showhide(c->snext);
|
|
||||||
} else {
|
|
||||||
/* hide clients bottom up */
|
|
||||||
@@ -1895,7 +2083,18 @@ togglebar(const Arg *arg)
|
|
||||||
{
|
|
||||||
selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !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);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2040,11 +2239,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,
|
|
||||||
@@ -2055,12 +2261,17 @@ 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);
|
|
||||||
XChangeProperty(dpy, m->barwin, netatom[NetWMWindowType], XA_ATOM, 32,
|
|
||||||
PropModeReplace, (unsigned char *) & netatom[NetWMWindowTypeDock], 1);
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
@@ -2246,6 +2457,123 @@ updatestatus(void)
|
|
||||||
strcpy(stext, "dwm-"VERSION);
|
|
||||||
for(m = mons; m; m = m->next)
|
|
||||||
drawbar(m);
|
|
||||||
+ 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 dimenons 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 w = 1;
|
|
||||||
+
|
|
||||||
+ if (!showsystray)
|
|
||||||
+ return;
|
|
||||||
+ 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);
|
|
||||||
+ XChangeProperty(dpy, systray->win, netatom[NetWMWindowType], XA_ATOM, 32,
|
|
||||||
+ PropModeReplace, (unsigned char *)&netatom[NetWMWindowTypeDock], 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
|
|
||||||
@@ -2344,6 +2672,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)
|
|
||||||
{
|
|
||||||
@@ -2397,6 +2735,22 @@ xerrorstart(Display *dpy, XErrorEvent *e
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
Loading…
Reference in New Issue
Block a user