mirror of
https://github.com/eRgo35/dots.git
synced 2025-12-18 16:36:10 +01:00
dwm patches
This commit is contained in:
488
dwm/.dwm/patches/dwm-6.2-tab-v2b.diff
Normal file
488
dwm/.dwm/patches/dwm-6.2-tab-v2b.diff
Normal file
@@ -0,0 +1,488 @@
|
||||
diff -up dwm-6.2.1/config.def.h dwm-6.2/config.def.h
|
||||
--- dwm-6.2.1/config.def.h 2019-02-02 04:55:28.000000000 -0800
|
||||
+++ dwm-6.2/config.def.h 2019-07-12 11:40:50.530164308 -0700
|
||||
@@ -5,6 +5,13 @@ static const unsigned int borderpx = 1;
|
||||
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";
|
||||
@@ -64,6 +71,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 +119,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 -up dwm-6.2.1/dwm.1 dwm-6.2/dwm.1
|
||||
--- dwm-6.2.1/dwm.1 2019-02-02 04:55:28.000000000 -0800
|
||||
+++ dwm-6.2/dwm.1 2019-07-12 11:36:25.453487700 -0700
|
||||
@@ -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 -up dwm-6.2.1/dwm.c dwm-6.2/dwm.c
|
||||
--- dwm-6.2.1/dwm.c 2019-02-02 04:55:28.000000000 -0800
|
||||
+++ dwm-6.2/dwm.c 2019-07-12 11:47:37.726846244 -0700
|
||||
@@ -64,7 +64,7 @@ enum { NetSupported, NetWMName, NetWMSta
|
||||
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];
|
||||
};
|
||||
|
||||
@@ -163,12 +171,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);
|
||||
@@ -206,6 +217,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 *);
|
||||
@@ -240,6 +252,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;
|
||||
@@ -392,8 +405,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);
|
||||
@@ -443,7 +457,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);
|
||||
@@ -451,8 +482,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
|
||||
@@ -506,6 +538,8 @@ cleanupmon(Monitor *mon)
|
||||
}
|
||||
XUnmapWindow(dpy, mon->barwin);
|
||||
XDestroyWindow(dpy, mon->barwin);
|
||||
+ XUnmapWindow(dpy, mon->tabwin);
|
||||
+ XDestroyWindow(dpy, mon->tabwin);
|
||||
free(mon);
|
||||
}
|
||||
|
||||
@@ -637,7 +671,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 +789,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, 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)
|
||||
{
|
||||
Client *c;
|
||||
@@ -776,8 +912,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
|
||||
@@ -803,6 +941,7 @@ focus(Client *c)
|
||||
}
|
||||
selmon->sel = c;
|
||||
drawbars();
|
||||
+ drawtabs();
|
||||
}
|
||||
|
||||
/* there are some broken focus acquiring clients needing extra handling */
|
||||
@@ -855,6 +994,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)
|
||||
{
|
||||
@@ -1233,12 +1385,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);
|
||||
@@ -1352,6 +1506,7 @@ restack(Monitor *m)
|
||||
XWindowChanges wc;
|
||||
|
||||
drawbar(m);
|
||||
+ drawtab(m);
|
||||
if (!m->sel)
|
||||
return;
|
||||
if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
|
||||
@@ -1546,6 +1701,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);
|
||||
@@ -1706,6 +1862,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)
|
||||
@@ -1816,6 +1983,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);
|
||||
}
|
||||
}
|
||||
@@ -1823,14 +1995,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
|
||||
@@ -2067,7 +2258,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;
|
||||
Reference in New Issue
Block a user