speedie/speedwm-personal
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

change a few integer names, remove bool we don't need

Browse source
This commit is contained in:
speediegq 2022-10-18 17:42:46 +02:00
parent bc96a99e43
commit 5cb529bdc5
6 changed files with 125 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
docs/example.Xresources
View file

@ -87,21 +87,21 @@
!!
!! -/ Color options \-
!!
!! Color the unselected title (1/0)
!! Color the unselected title (0/1)
!!
- speedwm.colortitle: 1
!!
!! Color the selected title.
!! Note that if you use the powerline then this may look nicer if its disabled. (1/0)
!! Note that if you use the powerline then this may look nicer if its disabled. (0/1)
!!
- speedwm.colorselectedtitle: 1
!!
!! Color the hidden title (1/0)
!! Color the hidden title (0/1)
!!
- speedwm.colorhiddentitle: 1
!!
!! Color the layout indicator.
!! Note that if you use the powerline then this may look nicer disabled. (1/0)
!! Note that if you use the powerline then this may look nicer disabled. (0/1)
!!
- speedwm.colorlayout: 1
!!
@ -133,29 +133,29 @@
!!
!! Border size (in pixels)
!!
- speedwm.borderpx: 1
- speedwm.bordersize: 1
!!
!! Amount of pixels necessary to move the floating window to the nearest edge. (in pixels)
!!
- speedwm.snap: 20
!!
!! Hide the bar or not (1/0)
!! Hide the bar or not (0/1)
!!
- speedwm.hidebar: 0
!!
!! Display bar on the left or right (1/0)
!! Display bar on the left or right (0/1)
!!
- speedwm.barposition: 1
!!
!! Show resize hints or not (1/0)
!! Show resize hints or not (0/1)
!!
- speedwm.resizehints: 0
!!
!! Allow changing mfact using the mouse (1/0)
!! Allow changing mfact using the mouse (0/1)
!!
- speedwm.mousemfact: 1
!!
!! Allow changing cfact using the mouse (1/0)
!! Allow changing cfact using the mouse (0/1)
!!
- speedwm.mousecfact: 1
!!
@ -167,23 +167,23 @@
!!
- speedwm.lowestmfact: 0.05
!!
!! Start on tag. If this is set to 1, speedwm will start on tag 1. If it is set to 0, then speedwm will not start on tag 1. (1/0)
!! Start on tag. If this is set to 1, speedwm will start on tag 1. If it is set to 0, then speedwm will not start on tag 1. (0/1)
!!
- speedwm.startontag: 1
!!
!! Require clicking windows to focus them, or focus when the mouse cursor touches the window border (1/0)
!! Require clicking windows to focus them, or focus when the mouse cursor touches the window border (0/1)
!!
- speedwm.clicktofocus: 0
!!
!! Focus newly spawned windows. If this is set to 0, newly spawned windows will not be automatically focused. (1/0)
!! Focus newly spawned windows. If this is set to 0, newly spawned windows will not be automatically focused. (0/1)
!!
- speedwm.focusspawn: 0
!!
!! Enable gaps around windows. Gaps make it easier to distinguish windows from each other and they look nice, but gives the user less space for windows. (1/0)
!! Enable gaps around windows. Gaps make it easier to distinguish windows from each other and they look nice, but gives the user less space for windows. (0/1)
!!
- speedwm.enablegaps: 1
!!
!! Use different gaps when there is only one window on a tag. (1/0)
!! Use different gaps when there is only one window on a tag. (0/1)
!!
- speedwm.smartgaps: 0
!!
@ -193,18 +193,18 @@
!!
!! Horizontal inner gaps in pixels.
!!
- speedwm.gappih: 10
- speedwm.gapsizeih: 10
!!
!! Vertical inner gaps in pixels.
- speedwm.gappiv: 10
- speedwm.gapsizeiv: 10
!!
!! Horizontal outer gaps in pixels.
!!
- speedwm.gappoh: 10
- speedwm.gapsizeoh: 10
!!
!! Vertical outer gaps in pixels.
!!
- speedwm.gappov: 10
- speedwm.gapsizeov: 10
!!
!! Direction windows are spawned in. (0/1/2/3/4/5)
!!
@ -248,11 +248,11 @@
!!
- speedwm.defaultstatus:
!!
!! Refresh rules when a title or class changes. (1/0)
!! Refresh rules when a title or class changes. (0/1)
!!
- speedwm.refreshrules: 1
!!
!! Respect decoration hints for software that requests it (1/0)
!! Respect decoration hints for software that requests it (0/1)
!!
- speedwm.decorhints: 1
!!
@ -269,7 +269,7 @@
!!
- speedwm.barheight: 8
!!
!! Show systray by default or not (1/0)
!! Show systray by default or not (0/1)
!!
- speedwm.showsystray: 0
!!
@ -285,23 +285,23 @@
!!
- speedwm.systraypinning: 0
!!
!! Center floating windows automatically when spawned. If set to 1, floating windows will be centered when spawned. Otherwise they will be spawned in the top left corner. (1/0)
!! Center floating windows automatically when spawned. If set to 1, floating windows will be centered when spawned. Otherwise they will be spawned in the top left corner. (0/1)
!!
- speedwm.centerfloating: 1
!!
!! Save floating window position. If set to 1, floating windows will be placed back in their position if they are set to floating again. (1/0)
!! Save floating window position. If set to 1, floating windows will be placed back in their position if they are set to floating again. (0/1)
!!
- speedwm.savefloat: 1
!!
!! Warp cursor to the focused window. If set to 1, the mouse cursor will be warped to the newly focused window and/or monitor. (1/0)
!! Warp cursor to the focused window. If set to 1, the mouse cursor will be warped to the newly focused window and/or monitor. (0/1)
!!
- speedwm.warpcursor: 1
!!
!! Different values (such as layouts, mfact, or gaps) for each tag. If set to 1, each tag will be allowed to have a property independently from other tags. Otherwise, all tags will share the same properties. (1/0)
!! Different values (such as layouts, mfact, or gaps) for each tag. If set to 1, each tag will be allowed to have a property independently from other tags. Otherwise, all tags will share the same properties. (0/1)
!!
- speedwm.pertag: 1
!!
!! i3-like number of master behaviour. If set to 1, this will be enabled. (1/0)
!! i3-like number of master behaviour. If set to 1, this will be enabled. (0/1)
!!
- speedwm.i3mastercount: 0
!!
@ -318,11 +318,11 @@
!!
- speedwm.tagpreviewpaddingh: 0
!!
!! Allow previewing tags using the mouse. If a mouse touches a tag, a tag preview will be displayed for that tag. If set to 1, this will be enabled. Otherwise it will be disabled. (1/0)
!! Allow previewing tags using the mouse. If a mouse touches a tag, a tag preview will be displayed for that tag. If set to 1, this will be enabled. Otherwise it will be disabled. (0/1)
!!
- speedwm.mousepreview: 1
!!
!! Display the bar in that preview. If set to 1, the bar will be included in the preview. If set to 0, the bar will not be included. (1/0)
!! Display the bar in that preview. If set to 1, the bar will be included in the preview. If set to 0, the bar will not be included. (0/1)
!!
- speedwm.barpreview: 0
!!
@ -330,11 +330,11 @@
!!
- speedwm.scalepreview: 2
!!
!! Display amount of Monocle clients in the Monocle layout if set to 1, otherwise the layout number (L2) will be printed. (1/0)
!! Display amount of Monocle clients in the Monocle layout if set to 1, otherwise the layout number (L2) will be printed. (0/1)
!!
- speedwm.monocleclientcount: 0
!!
!! Display focused client and number of total clients in the Monocle layout if set to 1, otherwise the layout number (L2) will be printed. (1/0)
!! Display focused client and number of total clients in the Monocle layout if set to 1, otherwise the layout number (L2) will be printed. (0/1)
!!
- speedwm.monoclecount: 0
!!
@ -342,75 +342,81 @@
!!
- speedwm.monocleformat: [%d/%d]
!!
!! Display status on all monitors. If set to 1, the status bar will be displayed on all monitors. Otherwise it will be printed on the focused monitor (1/0)
!! Display status on all monitors. If set to 1, the status bar will be displayed on all monitors. Otherwise it will be printed on the focused monitor (0/1)
!!
- speedwm.statusallmons: 1
!!
!! Hide layout indicator. If set to 0, the layout indicator will be shown. Otherwise it will be disabled! (1/0)
!! Hide layout indicator. If set to 0, the layout indicator will be shown. Otherwise it will be disabled! (0/1)
!!
- speedwm.hidelayout: 0
!!
!! Hide title/taskbar. If set to 0, the tasks will be shown. Otherwise the tasks will not be shown. (1/0)
!! Hide title/taskbar. If set to 0, the tasks will be shown. Otherwise the tasks will not be shown. (0/1)
!!
- speedwm.hidetitle: 0
!!
!! Hide unselected title/taskbar. If set to 0, all tasks will be shown. Otherwise only the selected task will be shown. (1/0)
!! Hide unselected title/taskbar. If set to 0, all tasks will be shown. Otherwise only the selected task will be shown. (0/1)
!!
- speedwm.hideunselectedtitle: 0
!!
!! Hide status bar. If set to 0, the status bar will be shown. Otherwise the status bar will not be shown. (1/0)
!! Hide status bar. If set to 0, the status bar will be shown. Otherwise the status bar will not be shown. (0/1)
!!
- speedwm.hidestatus: 0
!!
!! Hide window icons. If set to 0, the window icons will be used. Otherwise the window icons will not be drawn. (1/0)
!! Hide window icons. If set to 0, the window icons will be used. Otherwise the window icons will not be drawn. (0/1)
!!
- speedwm.hideicon: 0
!!
!! Hide tags. If set to 0, the tags will be drawn. Otherwise the tags will not be drawn. (1/0)
!! Hide tags. If set to 0, the tags will be drawn. Otherwise the tags will not be drawn. (0/1)
!!
- speedwm.hidetags: 0
!!
!! Hide empty tags. If set to 0, the tags that are not used will be printed. Otherwise they will be hidden. (1/0)
!! Hide empty tags. If set to 0, the tags that are not used will be printed. Otherwise they will be hidden. (0/1)
!!
- speedwm.hideemptytags: 1
!!
!! Hide tag powerlines. If set to 0, the powerlines (arrows) will be printed over the tags. Otherwise they will be hidden just like dwm. (1/0)
!! Hide tag powerlines. If set to 0, the powerlines (arrows) will be printed over the tags. Otherwise they will be hidden just like dwm. (0/1)
!!
- speedwm.hidetagpowerline: 1
!!
!! Hide sticky window indicator. If set to 0, the sticky window indicator will be drawn. Otherwise it will be hidden (1/0)
!! Hide sticky window indicator. If set to 0, the sticky window indicator will be drawn. Otherwise it will be hidden (0/1)
!!
- speedwm.hidesticky: 0
!!
!! Hide floating indicator. If set to 0, the floating window indicator will be drawn. Otherwise it will be hidden (1/0)
!! Hide floating indicator. If set to 0, the floating window indicator will be drawn. Otherwise it will be hidden (0/1)
!!
- speedwm.hidefloating: 0
!!
!! Layout indicator position. If set to 1, the layout indicator will be printed before the tags. Otherwise, the layout indicator will be printed after the tags (1/0)
!! Layout indicator position. If set to 1, the layout indicator will be printed before the tags. Otherwise, the layout indicator will be printed after the tags (0/1)
!!
- speedwm.layoutposition: 1
!!
!! Fade inactive windows. If set to 1, inactive windows (the unfocused windows) will fade into the background. This is both an easy way to tell if a window is focused or not and looks good. (1/0)
!! Fade inactive windows. If set to 1, inactive windows (the unfocused windows) will fade into the background.
!! This is both an easy way to tell if a window is focused or not and looks good. (0/1)
!!
- speedwm.fadeinactive: 1
!!
!! Reset layout when there is only one window visible. If set to 1, the layout will be reset to layout 1 if there is only one window on the selected tag. (1/0)
!! Enable window fading by default.
!! If set to 1, fading will be enabled by default, with the default values. Otherwise, the fading will have to be manually toggled by using the keybind/calling the function. (0/1)
!!
- speedwm.fadewindows: 1
!!
!! Reset layout when there is only one window visible. If set to 1, the layout will be reset to layout 1 if there is only one window on the selected tag. (0/1)
!!
- speedwm.resetlayout: 1
!!
!! Reset mfact when there is only one window visible. If set to 1, the mfact will be reset to the default if there is only one window on the selected tag. (1/0)
!! Reset mfact when there is only one window visible. If set to 1, the mfact will be reset to the default if there is only one window on the selected tag. (0/1)
!!
- speedwm.resetmfact: 1
!!
!! Reset gaps when there is only one window visible. If set to 1, the gaps will be reset to the default if there is only one window on the selected tag. (1/0)
!! Reset gaps when there is only one window visible. If set to 1, the gaps will be reset to the default if there is only one window on the selected tag. (0/1)
!!
- speedwm.resetgaps: 1
!!
!! Workaround for when a class cannot be found. If set to 1, a workaround for when a class cannot be found will be enabled. Otherwise it will be disabled. (1/0)
!! Workaround for when a class cannot be found. If set to 1, a workaround for when a class cannot be found will be enabled. Otherwise it will be disabled. (0/1)
!!
- speedwm.wmclass: 1
!!
!! Display the amount of clients in the deck layout count. If set to 1, the client count in the deck layout will be displayed. Otherwise the layout number will be displayed. (1/0)
!! Display the amount of clients in the deck layout count. If set to 1, the client count in the deck layout will be displayed. Otherwise the layout number will be displayed. (0/1)
!!
- speedwm.deckcount: 0
!!
@ -418,7 +424,7 @@
!!
- speedwm.deckformat: [%d]
!!
!! Rounded corners. If set to 1, rounded corners will be drawn. Otherwise sharp corners will be used instead. (1/0)
!! Rounded corners. If set to 1, rounded corners will be drawn. Otherwise sharp corners will be used instead. (0/1)
!!
- speedwm.roundedcorners: 0
!!
@ -426,31 +432,31 @@
!!
- speedwm.cornerradius: 2
!!
!! Window swallowing. If set to 1, your terminal can be hidden, keeping your GUI application in the front. This gives the illusion of, for example watching videos in your terminal. (1/0)
!! Window swallowing. If set to 1, your terminal can be hidden, keeping your GUI application in the front. This gives the illusion of, for example watching videos in your terminal. (0/1)
!!
- speedwm.swallowclients: 1
!!
!! Enable window swallowing for floating clients. If set to 1, floating clients can also be swallowed. Otherwise floating clients will be ignored. (1/0)
!! Enable window swallowing for floating clients. If set to 1, floating clients can also be swallowed. Otherwise floating clients will be ignored. (0/1)
!!
- speedwm.swallowfloating: 1
!!
!! Allow moving fullscreen windows to another monitor. If set to 1, fullscreen windows can be moved to another monitor. Otherwise it will be disabled. (1/0)
!! Allow moving fullscreen windows to another monitor. If set to 1, fullscreen windows can be moved to another monitor. Otherwise it will be disabled. (0/1)
!!
- speedwm.movefullscreenmon: 0
!!
!! Lock focus when in fullscreen. If set to 1, fullscreen windows will always be focused no matter what. Otherwise any window can be focused while in fullscreen. (1/0)
!! Lock focus when in fullscreen. If set to 1, fullscreen windows will always be focused no matter what. Otherwise any window can be focused while in fullscreen. (0/1)
!!
- speedwm.lockfullscreen: 1
!!
!! Hide the bar in fullscreen mode. If set to 1, the bar will be hidden when in fullscreen. Otherwise it will be shown. (1/0)
!! Hide the bar in fullscreen mode. If set to 1, the bar will be hidden when in fullscreen. Otherwise it will be shown. (0/1)
!!
- speedwm.fullscreenhidebar: 1
!!
!! Underline tags. If set to 1, tags in the bar will be underlined which can look nice. Otherwise the underline will not be drawn. (1/0)
!! Underline tags. If set to 1, tags in the bar will be underlined which can look nice. Otherwise the underline will not be drawn. (0/1)
!!
- speedwm.underline: 0
!!
!! Underline all tags. If set to 1, all tags in the bar will be underlined. Otherwise only the selected tag will be underlined. (1/0)
!! Underline all tags. If set to 1, all tags in the bar will be underlined. Otherwise only the selected tag will be underlined. (0/1)
!!
- speedwm.underlineall: 0
!!
@ -466,11 +472,11 @@
!!
- speedwm.underlinevoffset: 0
!!
!! Force two windows to always split vertically in the dynamic grid layout. If set to 1, this will be forced. Otherwise, it will not. (1/0)
!! Force two windows to always split vertically in the dynamic grid layout. If set to 1, this will be forced. Otherwise, it will not. (0/1)
!!
- speedwm.forcevsplit: 1
!!
!! Automatically set scratchpad windows to floating mode. If set to 1, scratchpad windows will automatically be set to floating mode when shown. Otherwise they will stay tiled in the current layout. (1/0)
!! Automatically set scratchpad windows to floating mode. If set to 1, scratchpad windows will automatically be set to floating mode when shown. Otherwise they will stay tiled in the current layout. (0/1)
!!
- speedwm.floatscratchpad: 0
!!

20
options.h
View file

@ -80,10 +80,10 @@
*/
/* Window alignment options */
static int borderpx = 1; /* How big your border is in pixels */
static int bordersize = 1; /* How big your border is in pixels */
static int snap = 20; /* Snap pixel */
static int mastercount = 1; /* Number of masters */
static int resizehints = 0;
static int resizehints = 0; /* Show resize hints */
static int decorhints = 1; /* Respect decoration hints */
static int savefloat = 1; /* Save position of floating windows */
static int refreshrules = 1; /* Refresh rules when a CLASS or TITLE changes */
@ -95,18 +95,18 @@ static float lowestmfact = 0.05; /* Lowest possible mfact v
/* Window gap options */
static int enablegaps = 1; /* Enable gaps */
static unsigned int gappih = 10; /* Horizontal inner gap between windows */
static unsigned int gappiv = 10; /* Vertical inner gap between windows */
static unsigned int gappoh = 10; /* Horizontal outer gap between windows and screen edge */
static unsigned int gappov = 10; /* Vertical outer gap between windows and screen edge */
static unsigned int smartgapsize = 0; /* Gaps for smartgaps. If set to zero, gaps will be disabled. */
static int gapsizeih = 10; /* Horizontal inner gap between windows */
static int gapsizeiv = 10; /* Vertical inner gap between windows */
static int gapsizeoh = 10; /* Horizontal outer gap between windows and screen edge */
static int gapsizeov = 10; /* Vertical outer gap between windows and screen edge */
static int smartgapsize = 0; /* Gaps for smartgaps. If set to zero, gaps will be disabled. */
static int smartgaps = 0; /* 1 means use different gap size when there is only one window */
/* Window aesthetic options */
static int fadewindows = 1; /* Starts with opacity on any focused/unfocused windows */
static int fadeinactive = 1; /* Fade inactive windows */
static double activeopacity = 1.0f; /* Window opacity when it's focused (0 <= opacity <= 1) */
static double inactiveopacity = 0.875f; /* Window opacity when it's inactive (0 <= opacity <= 1) */
static Bool bUseOpacity = True; /* Starts with opacity on any unfocused windows */
/* Rounded corners
*/
@ -155,10 +155,10 @@ static char status[] = "status"; /* Status bar to use,
* If you use Polybar, the default settings here will work, just set altbar to 1 and set altbarcmd to 'polybar &'.
*
*/
static int altbar = 0; /* Use alternative bar */
static int altbar = 0; /* Use alternative bar (0/1) */
static char *altbarcmd = ""; /* Command to run instead of the speedwm bar */
static char *altbarclass = "Polybar"; /* Alternate bar class name */
static char *alttrayname = "tray"; /* Polybar tray instance name */
static char *alttrayname = "tray"; /* Tray instance name */
/* Task switcher options
* NOTE: The modifier and cycle key is a constant and because of this, it cannot be changed in speedwmrc/.Xresources.

76
speedwm.c
View file

@ -233,10 +233,10 @@ struct Monitor {
int bt;
int mx, my, mw, mh; /* screen size */
int wx, wy, ww, wh; /* window area */
int gappih; /* horizontal gap between windows */
int gappiv; /* vertical gap between windows */
int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */
int gapsizeih; /* horizontal gap between windows */
int gapsizeiv; /* vertical gap between windows */
int gapsizeoh; /* horizontal outer gaps */
int gapsizeov; /* vertical outer gaps */
#if USESWITCHER
int switchern; /* move that many clients forward */
int nclients; /* number of active clients in tag */
@ -1500,8 +1500,8 @@ drawroundedcorners(Client *c)
if(!XGetWindowAttributes(dpy, w, &wa))
return;
int width = borderpx * 2 + wa.width;
int height = borderpx * 2 + wa.height;
int width = bordersize * 2 + wa.width;
int height = bordersize * 2 + wa.height;
int rad = cornerradius;
int dia = 2 * rad;
@ -1617,10 +1617,10 @@ createmon(void)
m->showbar = !hidebar;
m->barposition = barposition;
m->bh = bh;
m->gappih = gappih;
m->gappiv = gappiv;
m->gappoh = gappoh;
m->gappov = gappov;
m->gapsizeih = gapsizeih;
m->gapsizeiv = gapsizeiv;
m->gapsizeoh = gapsizeoh;
m->gapsizeov = gapsizeov;
m->lt[0] = &layouts[0];
m->lt[1] = &layouts[1 % LENGTH(layouts)];
#if USESWITCHER
@ -3006,10 +3006,10 @@ setgaps(int oh, int ov, int ih, int iv)
if (ih < 0) ih = 0;
if (iv < 0) iv = 0;
selmon->gappoh = oh;
selmon->gappov = ov;
selmon->gappih = ih;
selmon->gappiv = iv;
selmon->gapsizeoh = oh;
selmon->gapsizeov = ov;
selmon->gapsizeih = ih;
selmon->gapsizeiv = iv;
arrange(selmon);
}
@ -3026,10 +3026,10 @@ getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc)
oe = smartgapsize; // outer gaps disabled when only one client
}
*oh = m->gappoh*oe; // outer horizontal gap
*ov = m->gappov*oe; // outer vertical gap
*ih = m->gappih*ie; // inner horizontal gap
*iv = m->gappiv*ie; // inner vertical gap
*oh = m->gapsizeoh*oe; // outer horizontal gap
*ov = m->gapsizeov*oe; // outer vertical gap
*ih = m->gapsizeih*ie; // inner horizontal gap
*iv = m->gapsizeiv*ie; // inner vertical gap
*nc = n; // number of clients
}
@ -3139,17 +3139,17 @@ togglegaps(const Arg *arg)
void
defaultgaps(const Arg *arg)
{
setgaps(gappoh, gappov, gappih, gappiv);
setgaps(gapsizeoh, gapsizeov, gapsizeih, gapsizeiv);
}
void
incrgaps(const Arg *arg)
{
setgaps(
selmon->gappoh + arg->i,
selmon->gappov + arg->i,
selmon->gappih + arg->i,
selmon->gappiv + arg->i
selmon->gapsizeoh + arg->i,
selmon->gapsizeov + arg->i,
selmon->gapsizeih + arg->i,
selmon->gapsizeiv + arg->i
);
}
@ -3157,10 +3157,10 @@ void
incrigaps(const Arg *arg)
{
setgaps(
selmon->gappoh,
selmon->gappov,
selmon->gappih + arg->i,
selmon->gappiv + arg->i
selmon->gapsizeoh,
selmon->gapsizeov,
selmon->gapsizeih + arg->i,
selmon->gapsizeiv + arg->i
);
}
@ -3168,10 +3168,10 @@ void
incrogaps(const Arg *arg)
{
setgaps(
selmon->gappoh + arg->i,
selmon->gappov + arg->i,
selmon->gappih,
selmon->gappiv
selmon->gapsizeoh + arg->i,
selmon->gapsizeov + arg->i,
selmon->gapsizeih,
selmon->gapsizeiv
);
}
@ -3283,7 +3283,7 @@ manage(Window w, XWindowAttributes *wa)
c->x = MAX(c->x, c->mon->wx);
c->x = MAX(c->x, c->mon->mx);
c->y = MAX(c->y, c->mon->wy);
c->bw = borderpx;
c->bw = bordersize;
wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
@ -4106,7 +4106,7 @@ prevtag_skip_vacant(void)
void
opacity(Client *c, double opacity)
{
if(bUseOpacity && opacity > 0 && opacity < 1 && fadeinactive) {
if(fadewindows && opacity > 0 && opacity < 1 && fadeinactive) {
unsigned long real_opacity[] = { opacity * 0xffffffff };
XChangeProperty(dpy, c->win, netatom[NetWMWindowsOpacity], XA_CARDINAL,
32, PropModeReplace, (unsigned char *)real_opacity,
@ -4982,10 +4982,10 @@ setmfact(const Arg *arg)
#if USEFADE
void
toggleopacity(const Arg *arg) {
bUseOpacity = !bUseOpacity;
fadewindows = !fadewindows;
for (Monitor* m = mons; m; m = m->next)
for (Client* c = m->clients; c; c = c->next)
opacity(c, (bUseOpacity && c != selmon->sel) ? inactiveopacity : activeopacity);
opacity(c, (fadewindows && c != selmon->sel) ? inactiveopacity : activeopacity);
}
#endif
@ -5642,7 +5642,7 @@ updatebars(void)
for (m = mons; m; m = m->next) {
#if USETAGPREVIEW
if (!m->tagwin) {
m->tagwin = XCreateWindow(dpy, root, m->wx + sp, m->by + bh + vp + gappov / 2, m->mw / scalepreview,
m->tagwin = XCreateWindow(dpy, root, m->wx + sp, m->by + bh + vp + gapsizeov / 2, m->mw / scalepreview,
m->mh / scalepreview, 0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, m->tagwin, cursor[CurNormal]->cursor);
@ -5836,7 +5836,7 @@ updatemotifhints(Client *c)
if (motif[MWM_HINTS_DECORATIONS_FIELD] & MWM_DECOR_ALL ||
motif[MWM_HINTS_DECORATIONS_FIELD] & MWM_DECOR_BORDER ||
motif[MWM_HINTS_DECORATIONS_FIELD] & MWM_DECOR_TITLE)
c->bw = c->oldbw = borderpx;
c->bw = c->oldbw = bordersize;
else
c->bw = c->oldbw = 0;
@ -6038,7 +6038,7 @@ updatepreview(void)
};
for (m = mons; m; m = m->next) {
m->tagwin = XCreateWindow(dpy, root, m->wx + sp + tagpreviewpaddingh, m->by + bh + vp + tagpreviewpaddingv + gappov / 2, m->mw / scalepreview, m->mh / scalepreview, 0,
m->tagwin = XCreateWindow(dpy, root, m->wx + sp + tagpreviewpaddingh, m->by + bh + vp + tagpreviewpaddingv + gapsizeov / 2, m->mw / scalepreview, m->mh / scalepreview, 0,
depth, CopyFromParent, visual,
CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
XDefineCursor(dpy, m->tagwin, cursor[CurNormal]->cursor);

2
toggle/ipc-yajl.c
View file

@ -100,7 +100,7 @@ dump_monitor(yajl_gen gen, Monitor *mon, int is_selected)
// clang-format off
YMAP(
YSTR("master_factor"); YDOUBLE(mon->mfact);
YSTR("num_master"); YINT(mon->nmaster);
YSTR("num_master"); YINT(mon->mastercount);
YSTR("num"); YINT(mon->num);
YSTR("is_selected"); YBOOL(is_selected);

11
xresources.h
View file

@ -108,7 +108,7 @@ ResourcePref resources[] = {
{ "movefullscreenmon", INTEGER, &movefullscreenmon },
{ "fullscreenhidebar", INTEGER, &fullscreenhidebar },
{ "refreshrules", INTEGER, &refreshrules },
{ "borderpx", INTEGER, &borderpx },
{ "bordersize", INTEGER, &bordersize },
{ "snap", INTEGER, &snap },
{ "hidebar", INTEGER, &hidebar },
{ "mastercount", INTEGER, &mastercount },
@ -149,10 +149,10 @@ ResourcePref resources[] = {
{ "underlinestroke", INTEGER, &underlinestroke },
{ "underlinevoffset", INTEGER, &underlinevoffset },
{ "enablegaps", INTEGER, &enablegaps },
{ "gappih", INTEGER, &gappih },
{ "gappiv", INTEGER, &gappiv },
{ "gappoh", INTEGER, &gappoh },
{ "gappov", INTEGER, &gappov },
{ "gapsizeih", INTEGER, &gapsizeih },
{ "gapsizeiv", INTEGER, &gapsizeiv },
{ "gapsizeoh", INTEGER, &gapsizeoh },
{ "gapsizeov", INTEGER, &gapsizeov },
{ "smartgaps", INTEGER, &smartgaps },
{ "smartgapsize", INTEGER, &smartgapsize },
{ "mousemfact", INTEGER, &mousemfact },
@ -202,6 +202,7 @@ ResourcePref resources[] = {
#endif
#if USEFADE
{ "fadeinactive", INTEGER, &fadeinactive },
{ "fadewindows", INTEGER, &fadewindows },
#endif
#if USEROUNDCORNERS
{ "roundedcorners", INTEGER, &roundedcorners },