Misc: stoppaint_force & Documentation update

- Add stoppaint_force option, controlled via D-Bus, to stop painting
  completely, which may look better than unredirecting the screen,
  sometimes. (#41)

- Add x2, y2 matching targets.

- Update documentation.
This commit is contained in:
Richard Grenville 2013-07-30 22:24:11 +08:00
parent b46deb5162
commit 7417f0deee
7 changed files with 103 additions and 36 deletions

View File

@ -10,9 +10,10 @@ shadow-offset-y = -7;
# shadow-red = 0.0; # shadow-red = 0.0;
# shadow-green = 0.0; # shadow-green = 0.0;
# shadow-blue = 0.0; # shadow-blue = 0.0;
shadow-exclude = [ "name = 'Notification'", "class_g = 'Conky'", "class_g ?= 'Notify-osd'" ]; shadow-exclude = [ "name = 'Notification'", "class_g = 'Conky'", "class_g ?= 'Notify-osd'", "class_g = 'Cairo-clock'" ];
# shadow-exclude = "n:e:Notification"; # shadow-exclude = "n:e:Notification";
shadow-ignore-shaped = false; shadow-ignore-shaped = false;
# shadow-exclude-reg = "x10+0+0"
# Opacity # Opacity
menu-opacity = 0.8; menu-opacity = 0.8;
@ -25,8 +26,11 @@ alpha-step = 0.06;
# inactive-dim-fixed = true; # inactive-dim-fixed = true;
# blur-background = true; # blur-background = true;
# blur-background-frame = true; # blur-background-frame = true;
blur-background-fixed = false; blur-kern = "3x3box"
# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"
# blur-background-fixed = true;
blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ]; blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ];
opacity-rule = [ ]
# Fading # Fading
fading = true; fading = true;
@ -40,19 +44,20 @@ fade-exclude = [ ];
backend = "xrender" backend = "xrender"
mark-wmwin-focused = true; mark-wmwin-focused = true;
mark-ovredir-focused = true; mark-ovredir-focused = true;
use-ewmh-active-win = false; # use-ewmh-active-win = true;
detect-rounded-corners = true; detect-rounded-corners = true;
detect-client-opacity = true; detect-client-opacity = true;
refresh-rate = 0; refresh-rate = 0;
vsync = "none"; vsync = "none";
dbe = false; dbe = false;
paint-on-overlay = false; paint-on-overlay = true;
sw-opti = false; # sw-opti = true;
unredir-if-possible = false; # unredir-if-possible = true;
focus-exclude = [ ]; focus-exclude = [ "class_g = 'Cairo-clock'" ];
detect-transient = true; detect-transient = true;
detect-client-leader = true; detect-client-leader = true;
invert-color-include = [ ]; invert-color-include = [ ];
# resize-damage = 1;
# GLX backend # GLX backend
# glx-no-stencil = true; # glx-no-stencil = true;
@ -60,6 +65,7 @@ glx-copy-from-front = false;
# glx-use-copysubbuffermesa = true; # glx-use-copysubbuffermesa = true;
# glx-no-rebind-pixmap = true; # glx-no-rebind-pixmap = true;
glx-swap-method = "undefined"; glx-swap-method = "undefined";
# glx-use-gpushader4 = true;
# Window type settings # Window type settings
wintypes: wintypes:

View File

@ -98,11 +98,17 @@ OPTIONS
*--inactive-opacity-override*:: *--inactive-opacity-override*::
Let inactive opacity set by *-i* overrides the windows' '_NET_WM_OPACITY' values. Let inactive opacity set by *-i* overrides the windows' '_NET_WM_OPACITY' values.
*--inactive-dim* value:: *--active-opacity* 'OPACITY'::
Default opacity for active windows. (0.0 - 1.0)
*--inactive-dim* 'VALUE'::
Dim inactive windows. (0.0 - 1.0, defaults to 0.0) Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
*--mark-wmwin-focused*:: *--mark-wmwin-focused*::
Try to detect WM windows and mark them as active. Try to detect WM windows (a non-override-redirect window with no child that has `WM_STATE`) and mark them as active.
*--mark-ovredir-focused*::
Mark override-redirect windows that doesn't have a child window with `WM_STATE` focused.
*--no-fading-openclose*:: *--no-fading-openclose*::
Do not fade on window open/close. Do not fade on window open/close.
@ -124,17 +130,20 @@ OPTIONS
+ +
-- --
* 'none': No VSync * 'none': No VSync
* 'drm': VSync with 'DRM_IOCTL_WAIT_VBLANK'. May only work on some drivers. Experimental. * 'drm': VSync with 'DRM_IOCTL_WAIT_VBLANK'. May only work on some drivers.
* 'opengl': Try to VSync with 'SGI_video_sync' OpenGL extension. Only work on some drivers. Experimental. * 'opengl': Try to VSync with 'SGI_video_sync' OpenGL extension. Only work on some drivers.
* 'opengl-oml': Try to VSync with 'OML_sync_control' OpenGL extension. Only work on some drivers. Experimental. * 'opengl-oml': Try to VSync with 'OML_sync_control' OpenGL extension. Only work on some drivers.
* 'opengl-swc': Try to VSync with 'SGI_swap_control' OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn't have the effect of *--sw-opti* unlike other methods. Experimental. * 'opengl-swc': Try to VSync with 'SGI_swap_control' OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn't have the effect of *--sw-opti* unlike other methods. Experimental.
* 'opengl-mswc': Try to VSync with 'MESA_swap_control' OpenGL extension. Basically the same as 'opengl-swc' above, except the extension we use. * 'opengl-mswc': Try to VSync with 'MESA_swap_control' OpenGL extension. Basically the same as 'opengl-swc' above, except the extension we use.
(Note some VSync methods may not be enabled at compile time.) (Note some VSync methods may not be enabled at compile time.)
-- --
*--vsync-aggressive*::
Attempt to send painting request before VBlank and do XFlush() during VBlank. Reported to work pretty terribly. This switch may be lifted out at any moment.
*--alpha-step* 'VALUE':: *--alpha-step* 'VALUE'::
Step for pregenerating alpha pictures. (0.01 - 1.0, defaults to 0.03) X Render backend: Step for pregenerating alpha pictures. (0.01 - 1.0, defaults to 0.03)
*--dbe*:: *--dbe*::
Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing. Reported to have no effect, though. Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing. Reported to have no effect, though.
@ -143,13 +152,16 @@ OPTIONS
Painting on X Composite overlay window instead of on root window. Painting on X Composite overlay window instead of on root window.
*--sw-opti*:: *--sw-opti*::
Limit compton to repaint at most once every 1 / 'refresh_rate' second to boost performance. Experimental. This should not be used with *--vsync* as *--vsync* essentially does *--sw-opti*'s job already, unless you wish to specify a lower refresh rate than the actual value. Limit compton to repaint at most once every 1 / 'refresh_rate' second to boost performance. This should not be used with *--vsync* drm/opengl/opengl-oml as they essentially does *--sw-opti*'s job already, unless you wish to specify a lower refresh rate than the actual value.
*--use-ewmh-active-win*:: *--use-ewmh-active-win*::
Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, provided that the WM supports it. Experimental. Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, provided that the WM supports it.
*--respect-prop-shadow*::
Respect '_COMPTON_SHADOW'. This a prototype-level feature, which you must not rely on.
*--unredir-if-possible*:: *--unredir-if-possible*::
Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows. Known to cause flickering when redirecting/unredirecting windows. *--paint-on-overlay* may make the flickering less obvious. Experimental. Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows. Known to cause flickering when redirecting/unredirecting windows. *--paint-on-overlay* may make the flickering less obvious.
*--shadow-exclude* 'CONDITION':: *--shadow-exclude* 'CONDITION'::
Specify a list of conditions of windows that should have no shadow. Specify a list of conditions of windows that should have no shadow.
@ -178,7 +190,7 @@ OPTIONS
*--blur-background-fixed*:: *--blur-background-fixed*::
Use fixed blur strength rather than adjusting according to window opacity. Use fixed blur strength rather than adjusting according to window opacity.
*--blur-kern* matrix:: *--blur-kern* 'MATRIX'::
Specify the blur convolution kernel, with the following format: Specify the blur convolution kernel, with the following format:
+ +
---- ----
@ -195,33 +207,51 @@ A 7x7 Guassian blur kernel (sigma = 0.84089642) looks like:
+ +
May also be one of the predefined kernels: `3x3box` (default), `5x5box`, `7x7box`, `3x3gaussian`, `5x5gaussian`, `7x7gaussian`, `9x9gaussian`, `11x11gaussian`. All Guassian kernels are generated with sigma = 0.84089642 . You may use the accompanied `compton-convgen.py` to generate blur kernels. May also be one of the predefined kernels: `3x3box` (default), `5x5box`, `7x7box`, `3x3gaussian`, `5x5gaussian`, `7x7gaussian`, `9x9gaussian`, `11x11gaussian`. All Guassian kernels are generated with sigma = 0.84089642 . You may use the accompanied `compton-convgen.py` to generate blur kernels.
*--resize-damage* integer:: *--blur-background-exclude* 'CONDITION'::
Exclude conditions for background blur.
*--resize-damage* 'INTEGER'::
Resize damaged region by a specific number of pixels. A positive value enlarges it while a negative one shrinks it. If the value is positive, those additional pixels will not be actually painted to screen, only used in blur calculation, and such. (Due to technical limitations, with *--dbe* or *--glx-swap-method*, those pixels will still be incorrectly painted to screen.) Primarily used to fix the line corruption issues of blur, in which case you should use the blur radius value here (e.g. with a 3x3 kernel, you should use *--resize-damage* 1, with a 5x5 one you use *--resize-damage* 2, and so on). May or may not work with `--glx-no-stencil`. Shrinking doesn't function correctly. Resize damaged region by a specific number of pixels. A positive value enlarges it while a negative one shrinks it. If the value is positive, those additional pixels will not be actually painted to screen, only used in blur calculation, and such. (Due to technical limitations, with *--dbe* or *--glx-swap-method*, those pixels will still be incorrectly painted to screen.) Primarily used to fix the line corruption issues of blur, in which case you should use the blur radius value here (e.g. with a 3x3 kernel, you should use *--resize-damage* 1, with a 5x5 one you use *--resize-damage* 2, and so on). May or may not work with `--glx-no-stencil`. Shrinking doesn't function correctly.
*--invert-color-include* condition:: *--invert-color-include* 'CONDITION'::
Specify a list of conditions of windows that should be painted with inverted color. Resource-hogging, and is not well tested. Specify a list of conditions of windows that should be painted with inverted color. Resource-hogging, and is not well tested.
*--backend* backend:: *--opacity-rule* 'OPACITY':'CONDITION'::
Specify the backend to use: 'xrender` or 'glx'. GLX (OpenGL) backend generally has much superior performance as far as you have a graphic card/chip and driver. Specify a list of opacity rules, in the format `PERCENT:PATTERN`, like `50:name *= "Firefox"`. compton-trans is recommended over this. Note we do not distinguish 100% and unset, and we don't make any guarantee about possible conflicts with other programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows.
*--shadow-exclude-reg* 'GEOMETRY'::
Specify a X geometry that describes the region in which shadow should not be painted in, such as a dock window region. Use `--shadow-exclude-reg x10+0-0`, for example, if the 10 pixels on the bottom of the screen should not have shadows painted on.
*--backend* 'BACKEND'::
Specify the backend to use: `xrender` or `glx`. GLX (OpenGL) backend generally has much superior performance as far as you have a graphic card/chip and driver.
*--glx-no-stencil*:: *--glx-no-stencil*::
GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. Might cause incorrect opacity when rendering transparent content and cannot work with *--blur-background*. My tests show a 15% performance boost. GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. Might cause incorrect opacity when rendering transparent content (but never practically happened) and may not work with *--blur-background*. My tests show a 15% performance boost. Recommended.
*--glx-copy-from-front*:: *--glx-copy-from-front*::
GLX backend: Copy unmodified regions from front buffer instead of redrawing them all. My tests with nvidia-drivers show a 10% decrease in performance when the whole screen is modified, but a 20% increase when only 1/4 is. My tests on nouveau show terrible slowdown. GLX backend: Copy unmodified regions from front buffer instead of redrawing them all. My tests with nvidia-drivers show a 10% decrease in performance when the whole screen is modified, but a 20% increase when only 1/4 is. My tests on nouveau show terrible slowdown. Useful with `--glx-swap-method`, as well.
*--glx-use-copysubbuffermesa*:: *--glx-use-copysubbuffermesa*::
GLX backend: Use MESA_copy_sub_buffer to do partial screen update. My tests on nouveau shows a 200% performance boost when only 1/4 of the screen is updated. May break VSync and is not available on some drivers. Overrides *--glx-copy-from-front*. GLX backend: Use 'MESA_copy_sub_buffer' to do partial screen update. My tests on nouveau shows a 200% performance boost when only 1/4 of the screen is updated. May break VSync and is not available on some drivers. Overrides *--glx-copy-from-front*.
*--glx-no-rebind-pixmap*:: *--glx-no-rebind-pixmap*::
GLX backend: Avoid rebinding pixmap on window damage. Probably could improve performance on rapid window content changes, but is known to break things on some drivers (LLVMpipe). GLX backend: Avoid rebinding pixmap on window damage. Probably could improve performance on rapid window content changes, but is known to break things on some drivers (LLVMpipe). Recommended if it works.
*--glx-swap-method* undefined/exchange/copy/3/4/5/6:: *--glx-swap-method* undefined/exchange/copy/3/4/5/6/buffer-age::
GLX backend: GLX buffer swap method we assume. Could be `undefined` (0), `copy` (1), `exchange` (2), 3-6, or `buffer-age` (-1). `undefined` is the slowest and the safest, and the default value. `copy` is fastest, but may fail on some drivers, 2-6 are gradually slower but safer (6 is still faster than 0). Usually, double buffer means 2, triple buffer means 3. `buffer-age` means auto-detect using 'GLX_EXT_buffer_age', supported by some drivers. Useless with *--glx-use-copysubbuffermesa*. Partially breaks `--resize-damage`. Defaults to `undefined`. GLX backend: GLX buffer swap method we assume. Could be `undefined` (0), `copy` (1), `exchange` (2), 3-6, or `buffer-age` (-1). `undefined` is the slowest and the safest, and the default value. `copy` is fastest, but may fail on some drivers, 2-6 are gradually slower but safer (6 is still faster than 0). Usually, double buffer means 2, triple buffer means 3. `buffer-age` means auto-detect using 'GLX_EXT_buffer_age', supported by some drivers. Useless with *--glx-use-copysubbuffermesa*. Partially breaks `--resize-damage`. Defaults to `undefined`.
*--glx-use-gpushader4*::
GLX backend: Use 'GL_EXT_gpu_shader4' for some optimization on blur GLSL code. My tests on GTX 670 show no noticeable effect.
*--dbus*:: *--dbus*::
Enable remote control via D-Bus. See the *D-BUS API* section below for more details. Enable remote control via D-Bus. See the *D-BUS API* section below for more details.
*--benchmark* 'CYCLES'::
Benchmark mode. Repeatedly paint until reaching the specified cycles.
*--benchmark-wid* 'WINDOW_ID'::
Specify window ID to repaint in benchmark mode. If omitted or is 0, the whole screen is repainted.
FORMAT OF CONDITIONS FORMAT OF CONDITIONS
-------------------- --------------------
Some options accept a condition string to match certain windows. A condition string is formed by one or more conditions, joined by logical operators. Some options accept a condition string to match certain windows. A condition string is formed by one or more conditions, joined by logical operators.
@ -240,7 +270,7 @@ With greater-than/less-than operators it looks like:
'NEGATION' (optional) is one or more exclamation marks; 'NEGATION' (optional) is one or more exclamation marks;
'TARGET' is either a predefined target name, or the name of a window property to match. Supported predefined targets are `id`, `override_redirect`, `argb` (whether the window has an ARGB visual), `focused`, `wmwin` (whether the window looks like a WM window, i.e. has no child window with `WM_STATE` and is not override-redirected), `client` (ID of client window), `window_type` (window type in string), `leader` (ID of window leader), `name`, `class_g` (= `WM_CLASS[1]`), `class_i` (= `WM_CLASS[0]`), and `role`. 'TARGET' is either a predefined target name, or the name of a window property to match. Supported predefined targets are `id`, `x`, `y`, `x2` (x + widthb), `y2`, `width`, `height`, `widthb` (width + 2 * border), `heightb`, `override_redirect`, `argb` (whether the window has an ARGB visual), `focused`, `wmwin` (whether the window looks like a WM window, i.e. has no child window with `WM_STATE` and is not override-redirected), `client` (ID of client window), `window_type` (window type in string), `leader` (ID of window leader), `name`, `class_g` (= `WM_CLASS[1]`), `class_i` (= `WM_CLASS[0]`), and `role`.
'CLIENT/FRAME' is a single `@` if the window attribute should be be looked up on client window, nothing if on frame window; 'CLIENT/FRAME' is a single `@` if the window attribute should be be looked up on client window, nothing if on frame window;

View File

@ -1045,6 +1045,8 @@ c2_match_once_leaf(session_t *ps, win *w, const c2_l_t *pleaf,
case C2_L_PID: tgt = wid; break; case C2_L_PID: tgt = wid; break;
case C2_L_PX: tgt = w->a.x; break; case C2_L_PX: tgt = w->a.x; break;
case C2_L_PY: tgt = w->a.y; break; case C2_L_PY: tgt = w->a.y; break;
case C2_L_PX2: tgt = w->a.x + w->widthb; break;
case C2_L_PY2: tgt = w->a.y + w->heightb; break;
case C2_L_PWIDTH: tgt = w->a.width; break; case C2_L_PWIDTH: tgt = w->a.width; break;
case C2_L_PHEIGHT: tgt = w->a.height; break; case C2_L_PHEIGHT: tgt = w->a.height; break;
case C2_L_PWIDTHB: tgt = w->widthb; break; case C2_L_PWIDTHB: tgt = w->widthb; break;

View File

@ -101,6 +101,8 @@ struct _c2_l {
C2_L_PID, C2_L_PID,
C2_L_PX, C2_L_PX,
C2_L_PY, C2_L_PY,
C2_L_PX2,
C2_L_PY2,
C2_L_PWIDTH, C2_L_PWIDTH,
C2_L_PHEIGHT, C2_L_PHEIGHT,
C2_L_PWIDTHB, C2_L_PWIDTHB,
@ -187,6 +189,8 @@ const static c2_predef_t C2_PREDEFS[] = {
[C2_L_PID ] = { "id" , C2_L_TCARDINAL , 0 }, [C2_L_PID ] = { "id" , C2_L_TCARDINAL , 0 },
[C2_L_PX ] = { "x" , C2_L_TCARDINAL , 0 }, [C2_L_PX ] = { "x" , C2_L_TCARDINAL , 0 },
[C2_L_PY ] = { "y" , C2_L_TCARDINAL , 0 }, [C2_L_PY ] = { "y" , C2_L_TCARDINAL , 0 },
[C2_L_PX2 ] = { "x2" , C2_L_TCARDINAL , 0 },
[C2_L_PY2 ] = { "y2" , C2_L_TCARDINAL , 0 },
[C2_L_PWIDTH ] = { "width" , C2_L_TCARDINAL , 0 }, [C2_L_PWIDTH ] = { "width" , C2_L_TCARDINAL , 0 },
[C2_L_PHEIGHT ] = { "height" , C2_L_TCARDINAL , 0 }, [C2_L_PHEIGHT ] = { "height" , C2_L_TCARDINAL , 0 },
[C2_L_PWIDTHB ] = { "widthb" , C2_L_TCARDINAL , 0 }, [C2_L_PWIDTHB ] = { "widthb" , C2_L_TCARDINAL , 0 },

View File

@ -462,6 +462,8 @@ typedef struct {
bool unredir_if_possible; bool unredir_if_possible;
/// Forced redirection setting through D-Bus. /// Forced redirection setting through D-Bus.
switch_t redirected_force; switch_t redirected_force;
/// Whether to stop painting. Controlled through D-Bus.
switch_t stoppaint_force;
/// Whether to enable D-Bus support. /// Whether to enable D-Bus support.
bool dbus; bool dbus;
/// Path to log file. /// Path to log file.

View File

@ -4333,13 +4333,16 @@ usage(int ret) {
" Only work on some drivers. Works only with GLX backend.\n" " Only work on some drivers. Works only with GLX backend.\n"
" Does not actually control paint timing, only buffer swap is\n" " Does not actually control paint timing, only buffer swap is\n"
" affected, so it doesn't have the effect of --sw-opti unlike\n" " affected, so it doesn't have the effect of --sw-opti unlike\n"
" other methods. Experimental." WARNING "\n" " other methods." WARNING "\n"
" opengl-mswc = Try to VSync with MESA_swap_control OpenGL\n" " opengl-mswc = Try to VSync with MESA_swap_control OpenGL\n"
" extension. Basically the same as opengl-swc above, except the\n" " extension. Basically the same as opengl-swc above, except the\n"
" extension we use." WARNING "\n" " extension we use." WARNING "\n"
"--vsync-aggressive\n"
" Attempt to send painting request before VBlank and do XFlush()\n"
" during VBlank. This switch may be lifted out at any moment.\n"
"--alpha-step val\n" "--alpha-step val\n"
" Step for pregenerating alpha pictures. 0.01 - 1.0. Defaults to\n" " X Render backend: Step for pregenerating alpha pictures. \n"
" 0.03.\n" " 0.01 - 1.0. Defaults to 0.03.\n"
"--dbe\n" "--dbe\n"
" Enable DBE painting mode, intended to use with VSync to\n" " Enable DBE painting mode, intended to use with VSync to\n"
" (hopefully) eliminate tearing.\n" " (hopefully) eliminate tearing.\n"
@ -4347,10 +4350,7 @@ usage(int ret) {
" Painting on X Composite overlay window.\n" " Painting on X Composite overlay window.\n"
"--sw-opti\n" "--sw-opti\n"
" Limit compton to repaint at most once every 1 / refresh_rate\n" " Limit compton to repaint at most once every 1 / refresh_rate\n"
" second to boost performance. Experimental.\n" " second to boost performance.\n"
"--vsync-aggressive\n"
" Attempt to send painting request before VBlank and do XFlush()\n"
" during VBlank. This switch may be lifted out at any moment.\n"
"--use-ewmh-active-win\n" "--use-ewmh-active-win\n"
" Use _NET_WM_ACTIVE_WINDOW on the root window to determine which\n" " Use _NET_WM_ACTIVE_WINDOW on the root window to determine which\n"
" window is focused instead of using FocusIn/Out events.\n" " window is focused instead of using FocusIn/Out events.\n"
@ -4360,7 +4360,6 @@ usage(int ret) {
"--unredir-if-possible\n" "--unredir-if-possible\n"
" Unredirect all windows if a full-screen opaque window is\n" " Unredirect all windows if a full-screen opaque window is\n"
" detected, to maximize performance for full-screen windows.\n" " detected, to maximize performance for full-screen windows.\n"
" Experimental.\n"
"--focus-exclude condition\n" "--focus-exclude condition\n"
" Specify a list of conditions of windows that should always be\n" " Specify a list of conditions of windows that should always be\n"
" considered focused.\n" " considered focused.\n"
@ -4976,6 +4975,8 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
config_t cfg; config_t cfg;
int ival = 0; int ival = 0;
double dval = 0.0; double dval = 0.0;
// libconfig manages string memory itself, so no need to manually free
// anything
const char *sval = NULL; const char *sval = NULL;
f = open_config_file(ps->o.config_file, &path); f = open_config_file(ps->o.config_file, &path);
@ -5068,6 +5069,10 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
config_lookup_float(&cfg, "shadow-green", &ps->o.shadow_green); config_lookup_float(&cfg, "shadow-green", &ps->o.shadow_green);
// --shadow-blue // --shadow-blue
config_lookup_float(&cfg, "shadow-blue", &ps->o.shadow_blue); config_lookup_float(&cfg, "shadow-blue", &ps->o.shadow_blue);
// --shadow-exclude-reg
if (config_lookup_string(&cfg, "shadow-exclude-reg", &sval)
&& !parse_geometry(ps, sval, &ps->o.shadow_exclude_reg_geom))
exit(1);
// --inactive-opacity-override // --inactive-opacity-override
lcfg_lookup_bool(&cfg, "inactive-opacity-override", lcfg_lookup_bool(&cfg, "inactive-opacity-override",
&ps->o.inactive_opacity_override); &ps->o.inactive_opacity_override);
@ -5126,6 +5131,8 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
parse_cfg_condlst(ps, &cfg, &ps->o.invert_color_list, "invert-color-include"); parse_cfg_condlst(ps, &cfg, &ps->o.invert_color_list, "invert-color-include");
// --blur-background-exclude // --blur-background-exclude
parse_cfg_condlst(ps, &cfg, &ps->o.blur_background_blacklist, "blur-background-exclude"); parse_cfg_condlst(ps, &cfg, &ps->o.blur_background_blacklist, "blur-background-exclude");
// --opacity-rule
parse_cfg_condlst(ps, &cfg, &ps->o.opacity_rules, "opacity-rule");
// --blur-background // --blur-background
lcfg_lookup_bool(&cfg, "blur-background", &ps->o.blur_background); lcfg_lookup_bool(&cfg, "blur-background", &ps->o.blur_background);
// --blur-background-frame // --blur-background-frame
@ -5134,6 +5141,12 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
// --blur-background-fixed // --blur-background-fixed
lcfg_lookup_bool(&cfg, "blur-background-fixed", lcfg_lookup_bool(&cfg, "blur-background-fixed",
&ps->o.blur_background_fixed); &ps->o.blur_background_fixed);
// --blur-kern
if (config_lookup_string(&cfg, "blur-kern", &sval)
&& !parse_conv_kern_lst(ps, sval, ps->o.blur_kerns, MAX_BLUR_PASS))
exit(1);
// --resize-damage
config_lookup_int(&cfg, "resize-damage", &ps->o.resize_damage);
// --glx-no-stencil // --glx-no-stencil
lcfg_lookup_bool(&cfg, "glx-no-stencil", &ps->o.glx_no_stencil); lcfg_lookup_bool(&cfg, "glx-no-stencil", &ps->o.glx_no_stencil);
// --glx-copy-from-front // --glx-copy-from-front
@ -5146,6 +5159,8 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
if (config_lookup_string(&cfg, "glx-swap-method", &sval) if (config_lookup_string(&cfg, "glx-swap-method", &sval)
&& !parse_glx_swap_method(ps, sval)) && !parse_glx_swap_method(ps, sval))
exit(1); exit(1);
// --glx-use-gpushader4
lcfg_lookup_bool(&cfg, "glx-use-gpushader4", &ps->o.glx_use_gpushader4);
// Wintype settings // Wintype settings
{ {
wintype_t i; wintype_t i;
@ -5563,6 +5578,9 @@ get_cfg(session_t *ps, int argc, char *const *argv, bool first_pass) {
} }
rebuild_shadow_exclude_reg(ps); rebuild_shadow_exclude_reg(ps);
if (ps->o.resize_damage < 0)
printf_errf("(): Negative --resize-damage does not work correctly.");
} }
/** /**
@ -6367,6 +6385,7 @@ session_init(session_t *ps_old, int argc, char **argv) {
.resize_damage = 0, .resize_damage = 0,
.unredir_if_possible = false, .unredir_if_possible = false,
.redirected_force = UNSET, .redirected_force = UNSET,
.stoppaint_force = UNSET,
.dbus = false, .dbus = false,
.benchmark = 0, .benchmark = 0,
.benchmark_wid = None, .benchmark_wid = None,
@ -6995,7 +7014,7 @@ session_run(session_t *ps) {
t = paint_preprocess(ps, ps->list); t = paint_preprocess(ps, ps->list);
// If the screen is unredirected, free all_damage to stop painting // If the screen is unredirected, free all_damage to stop painting
if (!ps->redirected) if (!ps->redirected || ON == ps->o.stoppaint_force)
free_region(ps, &ps->all_damage); free_region(ps, &ps->all_damage);
XserverRegion all_damage_orig = None; XserverRegion all_damage_orig = None;

View File

@ -899,6 +899,7 @@ cdbus_process_opts_get(session_t *ps, DBusMessage *msg) {
cdbus_m_opts_get_do(paint_on_overlay, cdbus_reply_bool); cdbus_m_opts_get_do(paint_on_overlay, cdbus_reply_bool);
cdbus_m_opts_get_do(unredir_if_possible, cdbus_reply_bool); cdbus_m_opts_get_do(unredir_if_possible, cdbus_reply_bool);
cdbus_m_opts_get_do(redirected_force, cdbus_reply_enum); cdbus_m_opts_get_do(redirected_force, cdbus_reply_enum);
cdbus_m_opts_get_do(stoppaint_force, cdbus_reply_enum);
cdbus_m_opts_get_do(logpath, cdbus_reply_string); cdbus_m_opts_get_do(logpath, cdbus_reply_string);
cdbus_m_opts_get_do(synchronize, cdbus_reply_bool); cdbus_m_opts_get_do(synchronize, cdbus_reply_bool);
@ -1081,6 +1082,9 @@ cdbus_process_opts_set(session_t *ps, DBusMessage *msg) {
goto cdbus_process_opts_set_success; goto cdbus_process_opts_set_success;
} }
// stoppaint_force
cdbus_m_opts_set_do(stoppaint_force, CDBUS_TYPE_ENUM, cdbus_enum_t);
#undef cdbus_m_opts_set_do #undef cdbus_m_opts_set_do
printf_errf("(): " CDBUS_ERROR_BADTGT_S, target); printf_errf("(): " CDBUS_ERROR_BADTGT_S, target);