Branch: r14.0.x

678558b1 2015-01-24 09:03:36 Richard Grenville
Misc #215: Reformat usage text & update docs

 - Reformat usage text by adding a blank line between descriptions of
   two switches. (#215)

 - Update documentation for a bit. Correct some wrong statements and
   clarify some others.
(cherry picked from commit 07b75620487436a0e693d3a13354dba346a463f2)
M twin/compton-tde/compton.c
diff --git a/twin/compton-tde/compton.c b/twin/compton-tde/compton.c
index d8f6223..7b195f5 100644
--- a/twin/compton-tde/compton.c
+++ b/twin/compton-tde/compton.c
@@ -5153,88 +5153,126 @@
     "\n"
     "-d display\n"
     "  Which display should be managed.\n"
+    "\n"
     "-r radius\n"
     "  The blur radius for shadows. (default 12)\n"
+    "\n"
     "-o opacity\n"
     "  The translucency for shadows. (default .75)\n"
+    "\n"
     "-l left-offset\n"
     "  The left offset for shadows. (default -15)\n"
+    "\n"
     "-t top-offset\n"
     "  The top offset for shadows. (default -15)\n"
+    "\n"
     "-I fade-in-step\n"
     "  Opacity change between steps while fading in. (default 0.028)\n"
+    "\n"
     "-O fade-out-step\n"
     "  Opacity change between steps while fading out. (default 0.03)\n"
+    "\n"
     "-D fade-delta-time\n"
     "  The time between steps in a fade in milliseconds. (default 10)\n"
+    "\n"
     "-m opacity\n"
     "  The opacity for menus. (default 1.0)\n"
+    "\n"
     "-c\n"
     "  Enabled client-side shadows on windows.\n"
+    "\n"
     "-C\n"
     "  Avoid drawing shadows on dock/panel windows.\n"
+    "\n"
     "-z\n"
-    "  Zero the part of the shadow's mask behind the window (experimental).\n"
+    "  Zero the part of the shadow's mask behind the window.\n"
+    "\n"
     "-f\n"
     "  Fade windows in/out when opening/closing and when opacity\n"
     "  changes, unless --no-fading-openclose is used.\n"
+    "\n"
     "-F\n"
-    "  Equals -f. Deprecated.\n"
+    "  Equals to -f. Deprecated.\n"
+    "\n"
     "-i opacity\n"
     "  Opacity of inactive windows. (0.1 - 1.0)\n"
+    "\n"
     "-e opacity\n"
     "  Opacity of window titlebars and borders. (0.1 - 1.0)\n"
+    "\n"
     "-G\n"
     "  Don't draw shadows on DND windows\n"
+    "\n"
     "-b\n"
     "  Daemonize process.\n"
+    "\n"
     "-S\n"
     "  Enable synchronous operation (for debugging).\n"
+    "\n"
     "--show-all-xerrors\n"
     "  Show all X errors (for debugging).\n"
+    "\n"
     "-v\n"
-    "  Print version Number and exit\\n"
+    "  Print version Number and exit\n"
     "--config path\n"
-    "  Look for configuration file at the path.\n"
+    "  Look for configuration file at the path. Use /dev/null to avoid\n"
+    "  loading configuration file.\n"
+    "\n"
     "--write-pid-path path\n"
     "  Write process ID to a file.\n"
+    "\n"
     "--shadow-red value\n"
     "  Red color value of shadow (0.0 - 1.0, defaults to 0).\n"
+    "\n"
     "--shadow-green value\n"
     "  Green color value of shadow (0.0 - 1.0, defaults to 0).\n"
+    "\n"
     "--shadow-blue value\n"
     "  Blue color value of shadow (0.0 - 1.0, defaults to 0).\n"
+    "\n"
     "--inactive-opacity-override\n"
     "  Inactive opacity set by -i overrides value of _NET_WM_OPACITY.\n"
+    "\n"
     "--inactive-dim value\n"
     "  Dim inactive windows. (0.0 - 1.0, defaults to 0)\n"
+    "\n"
     "--active-opacity opacity\n"
     "  Default opacity for active windows. (0.0 - 1.0)\n"
+    "\n"
     "--mark-wmwin-focused\n"
     "  Try to detect WM windows and mark them as active.\n"
+    "\n"
     "--shadow-exclude condition\n"
     "  Exclude conditions for shadows.\n"
+    "\n"
     "--fade-exclude condition\n"
     "  Exclude conditions for fading.\n"
+    "\n"
     "--mark-ovredir-focused\n"
     "  Mark windows that have no WM frame as active.\n"
+    "\n"
     "--no-fading-openclose\n"
     "  Do not fade on window open/close.\n"
+    "\n"
     "--no-fading-destroyed-argb\n"
     "  Do not fade destroyed ARGB windows with WM frame. Workaround of bugs\n"
     "  in Openbox, Fluxbox, etc.\n"
+    "\n"
     "--no-fading-opacitychange\n"
     "  Do not fade on window opacity change.\n"
+    "\n"
     "--shadow-ignore-shaped\n"
     "  Do not paint shadows on shaped windows. (Deprecated, use\n"
     "  --shadow-exclude \'bounding_shaped\' or\n"
     "  --shadow-exclude \'bounding_shaped && !rounded_corners\' instead.)\n"
+    "\n"
     "--detect-rounded-corners\n"
     "  Try to detect windows with rounded corners and don't consider\n"
     "  them shaped windows. Affects --shadow-ignore-shaped,\n"
     "  --unredir-if-possible, and possibly others. You need to turn this\n"
     "  on manually if you want to match against rounded_corners in\n"
     "  conditions.\n"
+    "\n"
     "--detect-client-opacity\n"
     "  Detect _NET_WM_OPACITY on client windows, useful for window\n"
     "  managers not passing _NET_WM_OPACITY of client windows to frame\n"
@@ -5244,11 +5282,14 @@
 #else
 #define WARNING
 #endif
+    "\n"
     "--refresh-rate val\n"
     "  Specify refresh rate of the screen. If not specified or 0, compton\n"
     "  will try detecting this with X RandR extension."WARNING"\n"
+    "\n"
     "--vsync vsync-method\n"
-    "  Set VSync method. There are up to 4 VSync methods currently available.\n"
+    "  Set VSync method. There are (up to) 5 VSync methods currently\n"
+    "  available:\n"
     "    none = No VSync\n"
 #undef WARNING
 #ifndef CONFIG_VSYNC_DRM
@@ -5257,7 +5298,7 @@
 #define WARNING
 #endif
     "    drm = VSync with DRM_IOCTL_WAIT_VBLANK. May only work on some\n"
-    "      drivers." WARNING "\n"
+    "      (DRI-based) drivers." WARNING "\n"
 #undef WARNING
 #ifndef CONFIG_VSYNC_OPENGL
 #define WARNING WARNING_DISABLED
@@ -5267,67 +5308,82 @@
     "    opengl = Try to VSync with SGI_video_sync OpenGL extension. Only\n"
     "      work on some drivers." WARNING"\n"
     "    opengl-oml = Try to VSync with OML_sync_control OpenGL extension.\n"
-    "      Only work on some drivers. Experimental." WARNING"\n"
+    "      Only work on some drivers." WARNING"\n"
     "    opengl-swc = Try to VSync with SGI_swap_control OpenGL extension.\n"
-    "      Only work on some drivers. Works only with GLX backend.\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"
-    "      other methods." WARNING "\n"
+    "      Only work on some drivers. Works only with GLX backend." WARNING "\n"
     "    opengl-mswc = Try to VSync with MESA_swap_control OpenGL\n"
     "      extension. Basically the same as opengl-swc above, except the\n"
     "      extension we use." WARNING "\n"
+    "\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"
+    "\n"
     "--alpha-step val\n"
     "  X Render backend: Step for pregenerating alpha pictures. \n"
     "  0.01 - 1.0. Defaults to 0.03.\n"
+    "\n"
     "--dbe\n"
     "  Enable DBE painting mode, intended to use with VSync to\n"
     "  (hopefully) eliminate tearing.\n"
+    "\n"
     "--paint-on-overlay\n"
     "  Painting on X Composite overlay window.\n"
+    "\n"
     "--sw-opti\n"
     "  Limit compton to repaint at most once every 1 / refresh_rate\n"
     "  second to boost performance.\n"
+    "\n"
     "--use-ewmh-active-win\n"
     "  Use _NET_WM_ACTIVE_WINDOW on the root window to determine which\n"
     "  window is focused instead of using FocusIn/Out events.\n"
+    "\n"
     "--respect-prop-shadow\n"
     "  Respect _TDE_WM_WINDOW_SHADOW. This a prototype-level feature, which\n"
     "  you must not rely on.\n"
+    "\n"
     "--unredir-if-possible\n"
     "  Unredirect all windows if a full-screen opaque window is\n"
     "  detected, to maximize performance for full-screen windows.\n"
+    "\n"
     "--unredir-if-possible-delay ms\n"
     "  Delay before unredirecting the window, in milliseconds.\n"
     "  Defaults to 0.\n"
+    "\n"
     "--unredir-if-possible-exclude condition\n"
     "  Conditions of windows that shouldn't be considered full-screen\n"
     "  for unredirecting screen.\n"
+    "\n"
     "--focus-exclude condition\n"
     "  Specify a list of conditions of windows that should always be\n"
     "  considered focused.\n"
+    "\n"
     "--inactive-dim-fixed\n"
     "  Use fixed inactive dim value.\n"
+    "\n"
     "--detect-transient\n"
     "  Use WM_TRANSIENT_FOR to group windows, and consider windows in\n"
     "  the same group focused at the same time.\n"
+    "\n"
     "--detect-client-leader\n"
     "  Use WM_CLIENT_LEADER to group windows, and consider windows in\n"
     "  the same group focused at the same time. WM_TRANSIENT_FOR has\n"
     "  higher priority if --detect-transient is enabled, too.\n"
+    "\n"
     "--blur-background\n"
     "  Blur background of semi-transparent / ARGB windows. Bad in\n"
     "  performance. The switch name may change without prior\n"
     "  notifications.\n"
+    "\n"
     "--blur-background-frame\n"
     "  Blur background of windows when the window frame is not opaque.\n"
     "  Implies --blur-background. Bad in performance. The switch name\n"
     "  may change.\n"
+    "\n"
     "--blur-background-fixed\n"
     "  Use fixed blur strength instead of adjusting according to window\n"
     "  opacity.\n"
+    "\n"
     "--blur-kern matrix\n"
     "  Specify the blur convolution kernel, with the following format:\n"
     "    WIDTH,HEIGHT,ELE1,ELE2,ELE3,ELE4,ELE5...\n"
@@ -5341,6 +5397,7 @@
     "  May also be one the predefined kernels: 3x3box (default), 5x5box,\n"
 ** Diff limit reached (max: 250 lines) **
a5535fa1 2015-01-24 09:05:09 Richard Grenville
Bug fix #244: Build failure with -DDEBUG_EVENTS

Fix build failure with -DDEBUG_EVENTS, caused by incorrect references to
X Sync macros. Thanks to blueyed for reporting. (#244)
(cherry picked from commit 6219569d6cb45be6f2104460e02672dd508e344a)
M twin/compton-tde/compton.c
 ** Diff limit reached (max: 250 lines) **
7034296d 2015-01-24 09:19:43 Richard Grenville
Bug fix: --no-fading-openclose doesn't work when fading out

 - Fix the bug that --no-fading-openclose doesn not work when fading out
   by writing w->fade_last as well in win_determine_fade().

 - Write w->fade_last for applying w->fade_force, as well.
(cherry picked from commit 2dff937b31aa3753dca28fdda741be5d1da25088)
M twin/compton-tde/compton.c
 ** Diff limit reached (max: 250 lines) **
ebac4aa5 2015-01-24 09:20:22 Richard Grenville
Bug fix: Compilation failure with NO_VSYNC_OPENGL=1

Fix compilation failure with NO_VSYNC_OPENGL=1, caused by one
incorrectly placed "#endif" in "src/common.h".
(cherry picked from commit 65bc49312cf8e75bf5ae3290eef40a2ebe712e9c)
M twin/compton-tde/common.h
 ** Diff limit reached (max: 250 lines) **
b6db0268 2015-01-24 09:28:27 Timothy Pearson
Fix update_compton_tde script
(cherry picked from commit 614d4d45f31fd1d20e89a26448759ab609b9dd5f)
M twin/update_compton_tde
 ** Diff limit reached (max: 250 lines) **