47 lines
1.9 KiB
Plaintext
47 lines
1.9 KiB
Plaintext
--- dwm.c
|
|
+++ dwm.c
|
|
@@ -59,7 +58,7 @@
|
|
/* enums */
|
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
|
-enum { NetSupported, NetWMName, NetWMIcon, NetWMState, NetWMCheck,
|
|
+enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
|
@@ -92,8 +91,6 @@ struct Client {
|
|
int bw, oldbw;
|
|
unsigned int tags;
|
|
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
|
|
- unsigned int icw, ich;
|
|
- Picture icon;
|
|
Client *next;
|
|
Client *snext;
|
|
Monitor *mon;
|
|
@@ -170,11 +166,9 @@ static void focus(Client *c);
|
|
static void focusin(XEvent *e);
|
|
static void focusmon(const Arg *arg);
|
|
static void focusstack(const Arg *arg);
|
|
-static void freeicon(Client *c);
|
|
static Atom getatomprop(Client *c, Atom prop);
|
|
static int getrootptr(int *x, int *y);
|
|
static long getstate(Window w);
|
|
-static Picture geticonprop(Display *dpy, Window w, int iconsize, unsigned int *icw, unsigned int *ich);
|
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|
static void grabbuttons(Client *c, int focused);
|
|
static void grabkeys(void);
|
|
@@ -740,12 +681,7 @@ drawbar(Monitor *m)
|
|
if ((w = m->ww - tw - x) > bh) {
|
|
if (m->sel) {
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
- if (m->sel->icon) {
|
|
- drw_text(drw, x, 0, w, bh, lrpad / 2 + m->sel->icw + iconspacing, m->sel->name, 0);
|
|
- drw_pic(drw, x + lrpad / 2, (bh - m->sel->ich) / 2, m->sel->icw, m->sel->ich, m->sel->icon);
|
|
- } else {
|
|
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
- }
|
|
+ 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 {
|