sravan/dwl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix space / tab inconsistency

Browse Source
This commit is contained in:
Sravan Balaji
2024-09-27 19:46:18 -04:00
parent 089bb41dab
commit d89e40ddaa
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
dwl.c
View File

@@ -902,7 +902,7 @@ cleanupmon(struct wl_listener *listener, void *data)
wlr_scene_output_destroy(m->scene_output); wlr_scene_output_destroy(m->scene_output);
#if PERTAG_PATCH #if PERTAG_PATCH
free(m->pertag); free(m->pertag);
#endif // PERTAG_PATCH #endif // PERTAG_PATCH
closemon(m); closemon(m);
wlr_scene_node_destroy(&m->fullscreen_bg->node); wlr_scene_node_destroy(&m->fullscreen_bg->node);
@@ -2052,9 +2052,9 @@ handlesig(int signo)
*/ */
while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid
&& (!xwayland || in.si_pid != xwayland->server->pid)) && (!xwayland || in.si_pid != xwayland->server->pid))
waitpid(in.si_pid, NULL, 0); waitpid(in.si_pid, NULL, 0);
#else // XWAYLAND #else // XWAYLAND
while (waitpid(-1, NULL, WNOHANG) > 0); while (waitpid(-1, NULL, WNOHANG) > 0);
#endif // XWAYLAND #endif // XWAYLAND
#endif // AUTOSTART_PATCH #endif // AUTOSTART_PATCH
} else if (signo == SIGINT || signo == SIGTERM) { } else if (signo == SIGINT || signo == SIGTERM) {
@@ -2373,7 +2373,7 @@ mapnotify(struct wl_listener *listener, void *data)
else else
wl_list_insert(&clients, &c->link); wl_list_insert(&clients, &c->link);
#else // ATTACHTOP_PATCH #else // ATTACHTOP_PATCH
wl_list_insert(&clients, &c->link); wl_list_insert(&clients, &c->link);
#endif // ATTACHTOP_PATCH #endif // ATTACHTOP_PATCH
wl_list_insert(&fstack, &c->flink); wl_list_insert(&fstack, &c->flink);
@@ -2438,8 +2438,8 @@ monocle(Monitor *m)
resize(c, (struct wlr_box){.x = m->w.x + gappoh, .y = m->w.y + gappov, resize(c, (struct wlr_box){.x = m->w.x + gappoh, .y = m->w.y + gappov,
.width = m->w.width - 2 * gappoh, .height = m->w.height - 2 * gappov}, 0); .width = m->w.width - 2 * gappoh, .height = m->w.height - 2 * gappov}, 0);
#else // VANITYGAPS_PATCH #else // VANITYGAPS_PATCH
resize(c, m->w, 0); resize(c, m->w, 0);
n++; n++;
#endif // VANITYGAPS_PATCH #endif // VANITYGAPS_PATCH
} }
if (n) if (n)
@@ -3100,15 +3100,15 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
if (c->foreign_toplevel) if (c->foreign_toplevel)
wlr_foreign_toplevel_handle_v1_output_leave(c->foreign_toplevel, oldmon->wlr_output); wlr_foreign_toplevel_handle_v1_output_leave(c->foreign_toplevel, oldmon->wlr_output);
arrange(oldmon); arrange(oldmon);
} }
#endif // FOREIGN_TOPLEVEL_MANAGEMENT_PATCH #endif // FOREIGN_TOPLEVEL_MANAGEMENT_PATCH
if (m) { if (m) {
/* Make sure window actually overlaps with the monitor */ /* Make sure window actually overlaps with the monitor */
resize(c, c->geom, 0); resize(c, c->geom, 0);
c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */ c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
#if FOREIGN_TOPLEVEL_MANAGEMENT_PATCH #if FOREIGN_TOPLEVEL_MANAGEMENT_PATCH
if (c->foreign_toplevel) if (c->foreign_toplevel)
wlr_foreign_toplevel_handle_v1_output_enter(c->foreign_toplevel, m->wlr_output); wlr_foreign_toplevel_handle_v1_output_enter(c->foreign_toplevel, m->wlr_output);
#endif // FOREIGN_TOPLEVEL_MANAGEMENT_PATCH #endif // FOREIGN_TOPLEVEL_MANAGEMENT_PATCH
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */ setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
setfloating(c, c->isfloating); setfloating(c, c->isfloating);
@@ -3415,8 +3415,8 @@ tagmon(const Arg *arg)
die("oom"); die("oom");
} }
#else // RESTORE_MONITOR_PATCH #else // RESTORE_MONITOR_PATCH
if (sel) if (sel)
setmon(sel, dirtomon(arg->i), 0); setmon(sel, dirtomon(arg->i), 0);
#endif // RESTORE_MONITOR_PATCH #endif // RESTORE_MONITOR_PATCH
} }
@@ -3455,8 +3455,8 @@ tile(Monitor *m)
i = 0; i = 0;
my = ty = m->gappoh*oe; my = ty = m->gappoh*oe;
#else // VANITYGAPS_PATCH #else // VANITYGAPS_PATCH
mw = m->w.width; mw = m->w.width;
i = my = ty = 0; i = my = ty = 0;
#endif // VANITYGAPS_PATCH #endif // VANITYGAPS_PATCH
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
@@ -3469,9 +3469,9 @@ tile(Monitor *m)
.width = mw - m->gappiv*ie, .height = h}, 0); .width = mw - m->gappiv*ie, .height = h}, 0);
my += c->geom.height + m->gappih*ie; my += c->geom.height + m->gappih*ie;
#else // VANITYGAPS_PATCH #else // VANITYGAPS_PATCH
resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw, resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0); .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
my += c->geom.height; my += c->geom.height;
#endif // VANITYGAPS_PATCH #endif // VANITYGAPS_PATCH
} else { } else {
#if VANITYGAPS_PATCH #if VANITYGAPS_PATCH
@@ -3481,9 +3481,9 @@ tile(Monitor *m)
.width = m->w.width - mw - 2*m->gappov*oe, .height = h}, 0); .width = m->w.width - mw - 2*m->gappov*oe, .height = h}, 0);
ty += c->geom.height + m->gappih*ie; ty += c->geom.height + m->gappih*ie;
#else // VANITYGAPS_PATCH #else // VANITYGAPS_PATCH
resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty, resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
.width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0); .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
ty += c->geom.height; ty += c->geom.height;
#endif // VANITYGAPS_PATCH #endif // VANITYGAPS_PATCH
} }
i++; i++;
@@ -3776,7 +3776,6 @@ view(const Arg *arg)
#if PERTAG_PATCH #if PERTAG_PATCH
size_t i, tmptag; size_t i, tmptag;
#endif // PERTAG_PATCH #endif // PERTAG_PATCH
//
if (!selmon || (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) if (!selmon || (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
return; return;
selmon->seltags ^= 1; /* toggle sel tagset */ selmon->seltags ^= 1; /* toggle sel tagset */