commit 0832dee0473eb5e905049e0bba42164995d9e2e8
parent 51a4c50fb3e023c185031344b682a44a37ea33ed
Author: Ricardo B. Ayres <ricardo.bosqueiro.ayres@gmail.com>
Date: Tue, 10 Aug 2021 20:28:59 -0300
[dwm][patch][tab] Fix rejected chunk in dwm.c
The patch fails to apply because the getatomprop function prototype is
different context from the previous old patch. I just applied the
rejected chunk manually and generated the new diff.
Diffstat:
3 files changed, 500 insertions(+), 502 deletions(-)
diff --git a/dwm.suckless.org/patches/tab/dwm-tab-v2b-20210810-7162335.diff b/dwm.suckless.org/patches/tab/dwm-tab-v2b-20210810-7162335.diff
@@ -0,0 +1,498 @@
+From a10056f3bbda7337b87f1dcd4beaf4f688d5368b Mon Sep 17 00:00:00 2001
+From: "Ricardo B. Ayres" <ricardo.bosqueiro.ayres@gmail.com>
+Date: Tue, 10 Aug 2021 19:52:22 -0300
+Subject: [PATCH] fixing focuswin function prototype not being applied because
+ of new Atom function in context
+
+---
+ config.def.h | 9 +++
+ dwm.1 | 33 +++++---
+ dwm.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ 3 files changed, 232 insertions(+), 19 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index a2ac963..931d7ae 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -5,6 +5,13 @@ 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 */
++/* Display modes of the tab bar: never shown, always shown, shown only in */
++/* monocle mode in the presence of several windows. */
++/* Modes after showtab_nmodes are disabled. */
++enum showtab_modes { showtab_never, showtab_auto, showtab_nmodes, showtab_always};
++static const int showtab = showtab_auto; /* Default tab bar show mode */
++static const int toptab = False; /* False means bottom tab bar */
++
+ static const char *fonts[] = { "monospace:size=10" };
+ static const char dmenufont[] = "monospace:size=10";
+ static const char col_gray1[] = "#222222";
+@@ -65,6 +72,7 @@ static Key keys[] = {
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY, XK_b, togglebar, {0} },
++ { MODKEY, XK_w, tabmode, {-1} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+@@ -112,5 +120,6 @@ static Button buttons[] = {
+ { ClkTagBar, 0, Button3, toggleview, {0} },
+ { ClkTagBar, MODKEY, Button1, tag, {0} },
+ { ClkTagBar, MODKEY, Button3, toggletag, {0} },
++ { ClkTabBar, 0, Button1, focuswin, {0} },
+ };
+
+diff --git a/dwm.1 b/dwm.1
+index ddc8321..7752444 100644
+--- a/dwm.1
++++ b/dwm.1
+@@ -20,14 +20,22 @@ layout applied.
+ 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.
++Each screen contains two small status bars.
++.P
++One bar 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
++Another bar contains a tab for each window of the current view and allows
++navigation between windows, especially in the monocle mode. The different
++display modes of this bar are described under the Mod1\-w Keybord command
++section. When a single tag is selected, this tag is indicated in the left corner
++of the tab bar.
+ .P
+ dwm draws a small border around windows to indicate the focus state.
+ .SH OPTIONS
+@@ -44,7 +52,8 @@ 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.
++label toggles between tiled and floating layout, click on a window name in the
++tab bar brings focus to that window.
+ .TP
+ .B Button3
+ click on a tag label adds/removes all windows with that tag to/from the view.
+@@ -110,6 +119,12 @@ Increase master area size.
+ .B Mod1\-h
+ Decrease master area size.
+ .TP
++.B Mod1\-w
++Cycle over the tab bar display modes: never displayed, always displayed,
++displayed only in monocle mode when the view contains more than one window (auto
++mode). Some display modes can be disabled in the configuration, config.h. In
++the default configuration only "never" and "auto" display modes are enabled.
++.TP
+ .B Mod1\-Return
+ Zooms/cycles focused window to/from master area (tiled layouts only).
+ .TP
+diff --git a/dwm.c b/dwm.c
+index 5e4d494..e3662ca 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -64,7 +64,7 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
+ NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+ NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
+-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
++enum { ClkTagBar, ClkTabBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+
+ typedef union {
+@@ -111,24 +111,32 @@ typedef struct {
+ void (*arrange)(Monitor *);
+ } Layout;
+
++#define MAXTABS 50
++
+ struct Monitor {
+ char ltsymbol[16];
+ float mfact;
+ int nmaster;
+ int num;
+ int by; /* bar geometry */
++ int ty; /* tab bar geometry */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
+ unsigned int seltags;
+ unsigned int sellt;
+ unsigned int tagset[2];
+ int showbar;
++ int showtab;
+ int topbar;
++ int toptab;
+ Client *clients;
+ Client *sel;
+ Client *stack;
+ Monitor *next;
+ Window barwin;
++ Window tabwin;
++ int ntabs;
++ int tab_widths[MAXTABS];
+ const Layout *lt[2];
+ };
+
+@@ -169,6 +177,7 @@ static void focus(Client *c);
+ static void focusin(XEvent *e);
+ static void focusmon(const Arg *arg);
+ static void focusstack(const Arg *arg);
++static void focuswin(const Arg* arg);
+ static Atom getatomprop(Client *c, Atom prop);
+ static int getrootptr(int *x, int *y);
+ static long getstate(Window w);
+@@ -207,6 +216,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 void tabmode(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+ static void tile(Monitor *);
+@@ -241,6 +251,7 @@ static char stext[256];
+ static int screen;
+ static int sw, sh; /* X display screen geometry width, height */
+ static int bh, blw = 0; /* bar geometry */
++static int th = 0; /* tab bar geometry */
+ static int lrpad; /* sum of left and right padding for text */
+ static int (*xerrorxlib)(Display *, XErrorEvent *);
+ static unsigned int numlockmask = 0;
+@@ -393,8 +404,9 @@ arrange(Monitor *m)
+ }
+
+ void
+-arrangemon(Monitor *m)
+-{
++arrangemon(Monitor *m) {
++ updatebarpos(m);
++ XMoveResizeWindow(dpy, m->tabwin, m->wx, m->ty, m->ww, th);
+ strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
+ if (m->lt[m->sellt]->arrange)
+ m->lt[m->sellt]->arrange(m);
+@@ -444,7 +456,24 @@ buttonpress(XEvent *e)
+ click = ClkStatusText;
+ else
+ click = ClkWinTitle;
+- } else if ((c = wintoclient(ev->window))) {
++ }
++ if(ev->window == selmon->tabwin) {
++ i = 0; x = 0;
++ for(c = selmon->clients; c; c = c->next){
++ if(!ISVISIBLE(c)) continue;
++ x += selmon->tab_widths[i];
++ if (ev->x > x)
++ ++i;
++ else
++ break;
++ if(i >= m->ntabs) break;
++ }
++ if(c) {
++ click = ClkTabBar;
++ arg.ui = i;
++ }
++ }
++ else if((c = wintoclient(ev->window))) {
+ focus(c);
+ restack(selmon);
+ XAllowEvents(dpy, ReplayPointer, CurrentTime);
+@@ -452,8 +481,9 @@ buttonpress(XEvent *e)
+ }
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+- && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+- buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
++ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)){
++ buttons[i].func(((click == ClkTagBar || click == ClkTabBar) && buttons[i].arg.i == 0) ? &arg : &buttons[i].arg);
++ }
+ }
+
+ void
+@@ -507,6 +537,8 @@ cleanupmon(Monitor *mon)
+ }
+ XUnmapWindow(dpy, mon->barwin);
+ XDestroyWindow(dpy, mon->barwin);
++ XUnmapWindow(dpy, mon->tabwin);
++ XDestroyWindow(dpy, mon->tabwin);
+ free(mon);
+ }
+
+@@ -638,7 +670,10 @@ createmon(void)
+ m->mfact = mfact;
+ m->nmaster = nmaster;
+ m->showbar = showbar;
++ m->showtab = showtab;
+ m->topbar = topbar;
++ m->toptab = toptab;
++ m->ntabs = 0;
+ m->lt[0] = &layouts[0];
+ m->lt[1] = &layouts[1 % LENGTH(layouts)];
+ strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+@@ -752,6 +787,105 @@ drawbars(void)
+ drawbar(m);
+ }
+
++void
++drawtabs(void) {
++ Monitor *m;
++
++ for(m = mons; m; m = m->next)
++ drawtab(m);
++}
++
++static int
++cmpint(const void *p1, const void *p2) {
++ /* The actual arguments to this function are "pointers to
++ pointers to char", but strcmp(3) arguments are "pointers
++ to char", hence the following cast plus dereference */
++ return *((int*) p1) > * (int*) p2;
++}
++
++
++void
++drawtab(Monitor *m) {
++ Client *c;
++ int i;
++ int itag = -1;
++ char view_info[50];
++ int view_info_w = 0;
++ int sorted_label_widths[MAXTABS];
++ int tot_width;
++ int maxsize = bh;
++ int x = 0;
++ int w = 0;
++
++ //view_info: indicate the tag which is displayed in the view
++ for(i = 0; i < LENGTH(tags); ++i){
++ if((selmon->tagset[selmon->seltags] >> i) & 1) {
++ if(itag >=0){ //more than one tag selected
++ itag = -1;
++ break;
++ }
++ itag = i;
++ }
++ }
++
++ if(0 <= itag && itag < LENGTH(tags)){
++ snprintf(view_info, sizeof view_info, "[%s]", tags[itag]);
++ } else {
++ strncpy(view_info, "[...]", sizeof view_info);
++ }
++ view_info[sizeof(view_info) - 1 ] = 0;
++ view_info_w = TEXTW(view_info);
++ tot_width = view_info_w;
++
++ /* Calculates number of labels and their width */
++ m->ntabs = 0;
++ for(c = m->clients; c; c = c->next){
++ if(!ISVISIBLE(c)) continue;
++ m->tab_widths[m->ntabs] = TEXTW(c->name);
++ tot_width += m->tab_widths[m->ntabs];
++ ++m->ntabs;
++ if(m->ntabs >= MAXTABS) break;
++ }
++
++ if(tot_width > m->ww){ //not enough space to display the labels, they need to be truncated
++ memcpy(sorted_label_widths, m->tab_widths, sizeof(int) * m->ntabs);
++ qsort(sorted_label_widths, m->ntabs, sizeof(int), cmpint);
++ tot_width = view_info_w;
++ for(i = 0; i < m->ntabs; ++i){
++ if(tot_width + (m->ntabs - i) * sorted_label_widths[i] > m->ww)
++ break;
++ tot_width += sorted_label_widths[i];
++ }
++ maxsize = (m->ww - tot_width) / (m->ntabs - i);
++ } else{
++ maxsize = m->ww;
++ }
++ i = 0;
++ for(c = m->clients; c; c = c->next){
++ if(!ISVISIBLE(c)) continue;
++ if(i >= m->ntabs) break;
++ if(m->tab_widths[i] > maxsize) m->tab_widths[i] = maxsize;
++ w = m->tab_widths[i];
++ drw_setscheme(drw, scheme[(c == m->sel) ? SchemeSel : SchemeNorm]);
++ drw_text(drw, x, 0, w, th, 0, c->name, 0);
++ x += w;
++ ++i;
++ }
++
++ drw_setscheme(drw, scheme[SchemeNorm]);
++
++ /* cleans interspace between window names and current viewed tag label */
++ w = m->ww - view_info_w - x;
++ drw_text(drw, x, 0, w, th, 0, "", 0);
++
++ /* view info */
++ x += w;
++ w = view_info_w;
++ drw_text(drw, x, 0, w, th, 0, view_info, 0);
++
++ drw_map(drw, m->tabwin, 0, 0, m->ww, th);
++}
++
+ void
+ enternotify(XEvent *e)
+ {
+@@ -777,8 +911,10 @@ 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);
++ drawtab(m);
++ }
+ }
+
+ void
+@@ -804,6 +940,7 @@ focus(Client *c)
+ }
+ selmon->sel = c;
+ drawbars();
++ drawtabs();
+ }
+
+ /* there are some broken focus acquiring clients needing extra handling */
+@@ -856,6 +993,19 @@ focusstack(const Arg *arg)
+ }
+ }
+
++void
++focuswin(const Arg* arg){
++ int iwin = arg->i;
++ Client* c = NULL;
++ for(c = selmon->clients; c && (iwin || !ISVISIBLE(c)) ; c = c->next){
++ if(ISVISIBLE(c)) --iwin;
++ };
++ if(c) {
++ focus(c);
++ restack(selmon);
++ }
++}
++
+ Atom
+ getatomprop(Client *c, Atom prop)
+ {
+@@ -1234,12 +1384,14 @@ propertynotify(XEvent *e)
+ case XA_WM_HINTS:
+ updatewmhints(c);
+ drawbars();
++ drawtabs();
+ break;
+ }
+ if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+ updatetitle(c);
+ if (c == c->mon->sel)
+ drawbar(c->mon);
++ drawtab(c->mon);
+ }
+ if (ev->atom == netatom[NetWMWindowType])
+ updatewindowtype(c);
+@@ -1353,6 +1505,7 @@ restack(Monitor *m)
+ XWindowChanges wc;
+
+ drawbar(m);
++ drawtab(m);
+ if (!m->sel)
+ return;
+ if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
+@@ -1547,6 +1700,7 @@ setup(void)
+ die("no fonts could be loaded.");
+ lrpad = drw->fonts->h;
+ bh = drw->fonts->h + 2;
++ th = bh;
+ updategeom();
+ /* init atoms */
+ utf8string = XInternAtom(dpy, "UTF8_STRING", False);
+@@ -1708,6 +1862,17 @@ togglebar(const Arg *arg)
+ arrange(selmon);
+ }
+
++void
++tabmode(const Arg *arg)
++{
++ if(arg && arg->i >= 0)
++ selmon->showtab = arg->ui % showtab_nmodes;
++ else
++ selmon->showtab = (selmon->showtab + 1 ) % showtab_nmodes;
++ arrange(selmon);
++}
++
++
+ void
+ togglefloating(const Arg *arg)
+ {
+@@ -1819,6 +1984,11 @@ updatebars(void)
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
+ XMapRaised(dpy, m->barwin);
++ m->tabwin = XCreateWindow(dpy, root, m->wx, m->ty, m->ww, th, 0, DefaultDepth(dpy, screen),
++ CopyFromParent, DefaultVisual(dpy, screen),
++ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
++ XDefineCursor(dpy, m->tabwin, cursor[CurNormal]->cursor);
++ XMapRaised(dpy, m->tabwin);
+ XSetClassHint(dpy, m->barwin, &ch);
+ }
+ }
+@@ -1826,14 +1996,33 @@ updatebars(void)
+ void
+ updatebarpos(Monitor *m)
+ {
++ Client *c;
++ int nvis = 0;
++
+ 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;
+- } else
++ if ( m->topbar )
++ m->wy += bh;
++ } else {
+ m->by = -bh;
++ }
++
++ for(c = m->clients; c; c = c->next) {
++ if(ISVISIBLE(c)) ++nvis;
++ }
++
++ if(m->showtab == showtab_always
++ || ((m->showtab == showtab_auto) && (nvis > 1) && (m->lt[m->sellt]->arrange == monocle))) {
++ m->wh -= th;
++ m->ty = m->toptab ? m->wy : m->wy + m->wh;
++ if ( m->toptab )
++ m->wy += th;
++ } else {
++ m->ty = -th;
++ }
+ }
+
+ void
+@@ -2070,7 +2259,7 @@ wintomon(Window w)
+ if (w == root && getrootptr(&x, &y))
+ return recttomon(x, y, 1, 1);
+ for (m = mons; m; m = m->next)
+- if (w == m->barwin)
++ if (w == m->barwin || w == m->tabwin)
+ return m;
+ if ((c = wintoclient(w)))
+ return c->mon;
+--
+2.32.0
+
diff --git a/dwm.suckless.org/patches/tab/dwm-tab-v2b-56a31dc.diff b/dwm.suckless.org/patches/tab/dwm-tab-v2b-56a31dc.diff
@@ -1,501 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index fd77a07..dd2442b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -5,6 +5,14 @@ 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 */
-+
-+/* Display modes of the tab bar: never shown, always shown, shown only in */
-+/* monocle mode in presence of several windows. */
-+/* Modes after showtab_nmodes are disabled */
-+enum showtab_modes { showtab_never, showtab_auto, showtab_nmodes, showtab_always};
-+static const int showtab = showtab_auto; /* Default tab bar show mode */
-+static const int toptab = False; /* False means bottom tab bar */
-+
- static const char *fonts[] = { "monospace:size=10" };
- static const char dmenufont[] = "monospace:size=10";
- static const char col_gray1[] = "#222222";
-@@ -64,6 +72,7 @@ static Key keys[] = {
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_b, togglebar, {0} },
-+ { MODKEY, XK_w, tabmode, {-1} },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
-@@ -111,5 +120,6 @@ static Button buttons[] = {
- { ClkTagBar, 0, Button3, toggleview, {0} },
- { ClkTagBar, MODKEY, Button1, tag, {0} },
- { ClkTagBar, MODKEY, Button3, toggletag, {0} },
-+ { ClkTabBar, 0, Button1, focuswin, {0} },
- };
-
-diff --git a/dwm.1 b/dwm.1
-index 6687011..9ff827c 100644
---- a/dwm.1
-+++ b/dwm.1
-@@ -19,14 +19,22 @@ layout applied.
- 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.
-+Each screen contains two small status bars.
-+.P
-+One bar 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
-+Another bar contains a tab for each window of the current view and allows
-+navigation between windows, especially in the monocle mode. The different
-+display modes of this bar are described under the Mod1\-w Keybord command
-+section. When a single tag is selected, this tag is indicated in the left corner
-+of the tab bar.
- .P
- dwm draws a small border around windows to indicate the focus state.
- .SH OPTIONS
-@@ -43,7 +51,8 @@ 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.
-+label toggles between tiled and floating layout, click on a window name in the
-+tab bar brings focus to that window.
- .TP
- .B Button3
- click on a tag label adds/removes all windows with that tag to/from the view.
-@@ -104,6 +113,12 @@ Increase master area size.
- .B Mod1\-h
- Decrease master area size.
- .TP
-+.B Mod1\-w
-+Cycle over the tab bar display modes: never displayed, always displayed,
-+displayed only in monocle mode when the view contains more than one window (auto
-+mode). Some display modes can be disabled in the configuration, config.h. In
-+the default configuration only "never" and "auto" display modes are enabled.
-+.TP
- .B Mod1\-Return
- Zooms/cycles focused window to/from master area (tiled layouts only).
- .TP
-diff --git a/dwm.c b/dwm.c
-index b2bc9bd..134a5b0 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -65,7 +65,7 @@ enum { NetSupported, NetWMName, NetWMState,
- NetWMFullscreen, NetActiveWindow, NetWMWindowType,
- NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
- enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
--enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-+enum { ClkTagBar, ClkTabBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-
- typedef union {
-@@ -112,24 +112,32 @@ typedef struct {
- void (*arrange)(Monitor *);
- } Layout;
-
-+#define MAXTABS 50
-+
- struct Monitor {
- char ltsymbol[16];
- float mfact;
- int nmaster;
- int num;
- int by; /* bar geometry */
-+ int ty; /* tab bar geometry */
- int mx, my, mw, mh; /* screen size */
- int wx, wy, ww, wh; /* window area */
- unsigned int seltags;
- unsigned int sellt;
- unsigned int tagset[2];
- int showbar;
-+ int showtab;
- int topbar;
-+ int toptab;
- Client *clients;
- Client *sel;
- Client *stack;
- Monitor *next;
- Window barwin;
-+ Window tabwin;
-+ int ntabs;
-+ int tab_widths[MAXTABS];
- const Layout *lt[2];
- };
-
-@@ -165,12 +173,15 @@ static void detachstack(Client *c);
- static Monitor *dirtomon(int dir);
- static void drawbar(Monitor *m);
- static void drawbars(void);
-+static void drawtab(Monitor *m);
-+static void drawtabs(void);
- static void enternotify(XEvent *e);
- static void expose(XEvent *e);
- static void focus(Client *c);
- static void focusin(XEvent *e);
- static void focusmon(const Arg *arg);
- static void focusstack(const Arg *arg);
-+static void focuswin(const Arg* arg);
- static int getrootptr(int *x, int *y);
- static long getstate(Window w);
- static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-@@ -207,6 +218,7 @@ static void setup(void);
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static void tabmode(const Arg *arg);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *);
-@@ -241,6 +253,7 @@ static char stext[256];
- static int screen;
- static int sw, sh; /* X display screen geometry width, height */
- static int bh, blw = 0; /* bar geometry */
-+static int th = 0; /* tab bar geometry */
- static int lrpad; /* sum of left and right padding for text */
- static int (*xerrorxlib)(Display *, XErrorEvent *);
- static unsigned int numlockmask = 0;
-@@ -393,8 +406,9 @@ arrange(Monitor *m)
- }
-
- void
--arrangemon(Monitor *m)
--{
-+arrangemon(Monitor *m) {
-+ updatebarpos(m);
-+ XMoveResizeWindow(dpy, m->tabwin, m->wx, m->ty, m->ww, th);
- strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
- if (m->lt[m->sellt]->arrange)
- m->lt[m->sellt]->arrange(m);
-@@ -444,14 +458,33 @@ buttonpress(XEvent *e)
- click = ClkStatusText;
- else
- click = ClkWinTitle;
-- } else if ((c = wintoclient(ev->window))) {
-+ }
-+ if(ev->window == selmon->tabwin) {
-+ i = 0; x = 0;
-+ for(c = selmon->clients; c; c = c->next){
-+ if(!ISVISIBLE(c)) continue;
-+ x += selmon->tab_widths[i];
-+ if (ev->x > x)
-+ ++i;
-+ else
-+ break;
-+ if(i >= m->ntabs) break;
-+ }
-+ if(c) {
-+ click = ClkTabBar;
-+ arg.ui = i;
-+ }
-+ }
-+ else if((c = wintoclient(ev->window))) {
- focus(c);
- click = ClkClientWin;
- }
- for (i = 0; i < LENGTH(buttons); i++)
- if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-- && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-- buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)){
-+ buttons[i].func(((click == ClkTagBar || click == ClkTabBar)
-+ && buttons[i].arg.i == 0) ? &arg : &buttons[i].arg);
-+ }
- }
-
- void
-@@ -504,6 +537,8 @@ cleanupmon(Monitor *mon)
- }
- XUnmapWindow(dpy, mon->barwin);
- XDestroyWindow(dpy, mon->barwin);
-+ XUnmapWindow(dpy, mon->tabwin);
-+ XDestroyWindow(dpy, mon->tabwin);
- free(mon);
- }
-
-@@ -576,7 +611,9 @@ configurenotify(XEvent *e)
- if (updategeom() || dirty) {
- drw_resize(drw, sw, bh);
- updatebars();
-- for (m = mons; m; m = m->next) {
-+ //refreshing display of status bar. The tab bar is handled by the arrange()
-+ //method, which is called below
-+ for(m = mons; m; m = m->next){
- for (c = m->clients; c; c = c->next)
- if (c->isfullscreen)
- resizeclient(c, m->mx, m->my, m->mw, m->mh);
-@@ -650,7 +687,10 @@ createmon(void)
- m->mfact = mfact;
- m->nmaster = nmaster;
- m->showbar = showbar;
-+ m->showtab = showtab;
- m->topbar = topbar;
-+ m->toptab = toptab;
-+ m->ntabs = 0;
- m->lt[0] = &layouts[0];
- m->lt[1] = &layouts[1 % LENGTH(layouts)];
- strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-@@ -765,6 +805,105 @@ drawbars(void)
- }
-
- void
-+drawtabs(void) {
-+ Monitor *m;
-+
-+ for(m = mons; m; m = m->next)
-+ drawtab(m);
-+}
-+
-+static int
-+cmpint(const void *p1, const void *p2) {
-+ /* The actual arguments to this function are "pointers to
-+ pointers to char", but strcmp(3) arguments are "pointers
-+ to char", hence the following cast plus dereference */
-+ return *((int*) p1) > * (int*) p2;
-+}
-+
-+
-+void
-+drawtab(Monitor *m) {
-+ Client *c;
-+ int i;
-+ int itag = -1;
-+ char view_info[50];
-+ int view_info_w = 0;
-+ int sorted_label_widths[MAXTABS];
-+ int tot_width;
-+ int maxsize = bh;
-+ int x = 0;
-+ int w = 0;
-+
-+ //view_info: indicate the tag which is displayed in the view
-+ for(i = 0; i < LENGTH(tags); ++i){
-+ if((selmon->tagset[selmon->seltags] >> i) & 1) {
-+ if(itag >=0){ //more than one tag selected
-+ itag = -1;
-+ break;
-+ }
-+ itag = i;
-+ }
-+ }
-+
-+ if(0 <= itag && itag < LENGTH(tags)){
-+ snprintf(view_info, sizeof view_info, "[%s]", tags[itag]);
-+ } else {
-+ strncpy(view_info, "[...]", sizeof view_info);
-+ }
-+ view_info[sizeof(view_info) - 1 ] = 0;
-+ view_info_w = TEXTW(view_info);
-+ tot_width = view_info_w;
-+
-+ /* Calculates number of labels and their width */
-+ m->ntabs = 0;
-+ for(c = m->clients; c; c = c->next){
-+ if(!ISVISIBLE(c)) continue;
-+ m->tab_widths[m->ntabs] = TEXTW(c->name);
-+ tot_width += m->tab_widths[m->ntabs];
-+ ++m->ntabs;
-+ if(m->ntabs >= MAXTABS) break;
-+ }
-+
-+ if(tot_width > m->ww){ //not enough space to display the labels, they need to be truncated
-+ memcpy(sorted_label_widths, m->tab_widths, sizeof(int) * m->ntabs);
-+ qsort(sorted_label_widths, m->ntabs, sizeof(int), cmpint);
-+ tot_width = view_info_w;
-+ for(i = 0; i < m->ntabs; ++i){
-+ if(tot_width + (m->ntabs - i) * sorted_label_widths[i] > m->ww)
-+ break;
-+ tot_width += sorted_label_widths[i];
-+ }
-+ maxsize = (m->ww - tot_width) / (m->ntabs - i);
-+ } else{
-+ maxsize = m->ww;
-+ }
-+ i = 0;
-+ for(c = m->clients; c; c = c->next){
-+ if(!ISVISIBLE(c)) continue;
-+ if(i >= m->ntabs) break;
-+ if(m->tab_widths[i] > maxsize) m->tab_widths[i] = maxsize;
-+ w = m->tab_widths[i];
-+ drw_setscheme(drw, (c == m->sel) ? scheme[SchemeSel] : scheme[SchemeNorm]);
-+ drw_text(drw, x, 0, w, th, lrpad / 2, c->name, 0);
-+ x += w;
-+ ++i;
-+ }
-+
-+ drw_setscheme(drw, scheme[SchemeNorm]);
-+
-+ /* cleans interspace between window names and current viewed tag label */
-+ w = m->ww - view_info_w - x;
-+ drw_text(drw, x, 0, w, th, lrpad / 2, "", 0);
-+
-+ /* view info */
-+ x += w;
-+ w = view_info_w;
-+ drw_text(drw, x, 0, w, th, lrpad / 2, view_info, 0);
-+
-+ drw_map(drw, m->tabwin, 0, 0, m->ww, th);
-+}
-+
-+void
- enternotify(XEvent *e)
- {
- Client *c;
-@@ -789,8 +928,10 @@ 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);
-+ drawtab(m);
-+ }
- }
-
- void
-@@ -817,6 +958,7 @@ focus(Client *c)
- }
- selmon->sel = c;
- drawbars();
-+ drawtabs();
- }
-
- /* there are some broken focus acquiring clients */
-@@ -870,6 +1012,19 @@ focusstack(const Arg *arg)
- }
- }
-
-+void
-+focuswin(const Arg* arg){
-+ int iwin = arg->i;
-+ Client* c = NULL;
-+ for(c = selmon->clients; c && (iwin || !ISVISIBLE(c)) ; c = c->next){
-+ if(ISVISIBLE(c)) --iwin;
-+ };
-+ if(c) {
-+ focus(c);
-+ restack(selmon);
-+ }
-+}
-+
- Atom
- getatomprop(Client *c, Atom prop)
- {
-@@ -1253,12 +1408,14 @@ propertynotify(XEvent *e)
- case XA_WM_HINTS:
- updatewmhints(c);
- drawbars();
-+ drawtabs();
- break;
- }
- if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
- updatetitle(c);
- if (c == c->mon->sel)
- drawbar(c->mon);
-+ drawtab(c->mon);
- }
- if (ev->atom == netatom[NetWMWindowType])
- updatewindowtype(c);
-@@ -1372,6 +1529,7 @@ restack(Monitor *m)
- XWindowChanges wc;
-
- drawbar(m);
-+ drawtab(m);
- if (!m->sel)
- return;
- if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
-@@ -1564,6 +1722,7 @@ setup(void)
- die("no fonts could be loaded.\n");
- lrpad = drw->fonts->h;
- bh = drw->fonts->h + 2;
-+ th = bh;
- updategeom();
- /* init atoms */
- wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-@@ -1698,6 +1857,17 @@ togglebar(const Arg *arg)
- }
-
- void
-+tabmode(const Arg *arg)
-+{
-+ if(arg && arg->i >= 0)
-+ selmon->showtab = arg->ui % showtab_nmodes;
-+ else
-+ selmon->showtab = (selmon->showtab + 1 ) % showtab_nmodes;
-+ arrange(selmon);
-+}
-+
-+
-+void
- togglefloating(const Arg *arg)
- {
- if (!selmon->sel)
-@@ -1808,20 +1978,44 @@ updatebars(void)
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
- XMapRaised(dpy, m->barwin);
-+ m->tabwin = XCreateWindow(dpy, root, m->wx, m->ty, m->ww, th, 0, DefaultDepth(dpy, screen),
-+ CopyFromParent, DefaultVisual(dpy, screen),
-+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-+ XDefineCursor(dpy, m->tabwin, cursor[CurNormal]->cursor);
-+ XMapRaised(dpy, m->tabwin);
- }
- }
-
- void
- updatebarpos(Monitor *m)
- {
-+ Client *c;
-+ int nvis = 0;
-+
- 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;
-- } else
-+ if ( m->topbar )
-+ m->wy += bh;
-+ } else {
- m->by = -bh;
-+ }
-+
-+ for(c = m->clients; c; c = c->next){
-+ if(ISVISIBLE(c)) ++nvis;
-+ }
-+
-+ if(m->showtab == showtab_always
-+ || ((m->showtab == showtab_auto) && (nvis > 1) && (m->lt[m->sellt]->arrange == monocle))){
-+ m->wh -= th;
-+ m->ty = m->toptab ? m->wy : m->wy + m->wh;
-+ if ( m->toptab )
-+ m->wy += th;
-+ } else {
-+ m->ty = -th;
-+ }
- }
-
- void
-@@ -2062,7 +2256,7 @@ wintomon(Window w)
- if (w == root && getrootptr(&x, &y))
- return recttomon(x, y, 1, 1);
- for (m = mons; m; m = m->next)
-- if (w == m->barwin)
-+ if (w == m->barwin || w == m->tabwin)
- return m;
- if ((c = wintoclient(w)))
- return c->mon;
diff --git a/dwm.suckless.org/patches/tab/index.md b/dwm.suckless.org/patches/tab/index.md
@@ -111,7 +111,7 @@ Download
--------
* Tab patch alone
* For dwm 6.1: [dwm-6.1-tab-v2b.diff](dwm-6.1-tab-v2b.diff)
- * For dwm from the git master branch: [dwm-tab-v2b-56a31dc.diff](dwm-tab-v2b-56a31dc.diff)
+ * For dwm from the git master branch: [dwm-tab-v2b-20210810-7162335.diff](dwm-tab-v2b-20210810-7162335.diff)
* For dwm 6.2: [dwm-6.2-tab-v2b.diff](dwm-6.2-tab-v2b.diff)
* Combined patch of tab and the [pertag](../pertag/) patch from Jan Christoph
Ebersbach.
@@ -123,6 +123,7 @@ Download
Change log
----------
+* Fixed the standalone tab patch not applying to the current git master.
* **v2b** Fixed in the pertag-tab patch the support for per-tag default layout
specification. No change in the tab only patch.
* **v2a** Typo corrected in the man page. For the combined pertag-tab patch,
