summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md18
-rw-r--r--dwm.c5
-rw-r--r--patches.def.h2
3 files changed, 17 insertions, 8 deletions
diff --git a/README.md b/README.md
index 477baed..6e65437 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-This dwm 6.2 (aaad5f, 2020-07-08) side project has a different take on dwm patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more.
+This dwm 6.2 (aaad5f, 2020-07-08) side project has a different take on dwm patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. Due to the complexity of some of the patches dwm-flexipatch has diverged from mainstream dwm by making some core patches non-optional for maintenance reasons. For the classic dwm-flexipatch build refer to branch [dwm-flexipatch-1.0](https://github.com/bakkeby/dwm-flexipatch/tree/dwm-flexipatch-1.0).
For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/dwm-flexipatch/blob/master/patches.def.h):
```c
@@ -15,6 +15,10 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
### Changelog:
+2020-07-19 - Added bar_modules patch - making extrabar, leftlayout, staticstatus and statusallmons patches redundant
+
+2020-07-18 - **Note**: Up until now building dwm-flexipath without any patches selected would have given you something more or less identical with mainstream dwm. In order to reduce complexity when it comes to maintainance future versions of dwm-flexipatch may diverge from this by making some patches non-optional. For the classic dwm-flexipatch and its many patch integration hints refer to branch [dwm-flexipatch-1.0](https://github.com/bakkeby/dwm-flexipatch/tree/dwm-flexipatch-1.0) which will be subject to bug fixes and mainstream dwm updates as far as feasible.
+
2020-07-05 - Extrabar compatibility improvements (staticstatus, status2d, dwmblocks) and fix for systray randomly causing dwm to crash when first systray application starts
2020-06-24 - Added resizepoint, statusbutton and sendmon_keepfocus patches
@@ -171,6 +175,9 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
- [bar_height](https://dwm.suckless.org/patches/bar_height/)
- allows the bar height to be explicitly set rather than being derived from font
+ - bar_modules
+ - splits the dwm bar into modules allowing for re-arrangement of the bar and easier integration for new features
+
- [barpadding](https://dwm.suckless.org/patches/barpadding/)
- adds vertical and horizontal space between the statusbar and the edge of the screen
@@ -222,9 +229,12 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
- this patch allows the user to change size and placement of floating windows using only the keyboard
- it also allows for temporary vertical and horizontal extension of windows similar to other WMs fill command
- - [extrabar](https://dwm.suckless.org/patches/extrabar/)
- - enables an extra status bar in dwm in a similar manner to the dualstatus patch
- - if the primary status is at the top via topbar then the extra status bar will be placed at the bottom and vice versa
+ - [-extrabar-](https://dwm.suckless.org/patches/extrabar/)
+ - -enables an extra status bar in dwm in a similar manner to the dualstatus patch-
+ - -if the primary status is at the top via topbar then the extra status bar will be placed at the bottom and vice versa-
+
+ - extrastatus
+ - formerly extrabar - now only splits the status into to statuses by using a status separator
- [fakefullscreen](https://dwm.suckless.org/patches/fakefullscreen/)
- only allow clients to "fullscreen" into the space currently given to them
diff --git a/dwm.c b/dwm.c
index 9de4559..82fd7e9 100644
--- a/dwm.c
+++ b/dwm.c
@@ -563,7 +563,7 @@ static const char broken[] = "broken";
static char stext[1024];
#else
static char stext[512];
-#endif // BAR_STATUS2D_PATCH
+#endif // BAR_PANGO_PATCH | BAR_STATUS2D_PATCH
#if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH
#if BAR_STATUS2D_PATCH
static char rawstext[1024];
@@ -1234,14 +1234,13 @@ configurerequest(XEvent *e)
Monitor *
createmon(void)
{
- Monitor *m;
+ Monitor *m, *mon;
int i, n, mi, max_bars = 2, istopbar = topbar;
const BarRule *br;
Bar *bar;
#if MONITOR_RULES_PATCH
int j;
- Monitor *mon;
const MonitorRule *mr;
#endif // MONITOR_RULES_PATCH
diff --git a/patches.def.h b/patches.def.h
index e758aad..01e8c54 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -925,4 +925,4 @@
/* Monocle layout (default).
* This can be optionally disabled in favour of other layouts.
*/
-#define MONOCLE_LAYOUT 1 \ No newline at end of file
+#define MONOCLE_LAYOUT 1