Merge pull request #100 from yshui/v5.1-pre

Fixes for v5.1

Doxyfile

@@ -1674,7 +1674,7 @@ UML_LOOK               = NO
 # the class node. If there are many fields or methods and many nodes the
 # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
 # threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
+# manageable. Set this to 0 for no limit. Note that the threshold may be
 # exceeded by 50% before the limit is enforced.
 
 UML_LIMIT_NUM_FIELDS   = 10

bin/compton-trans

@@ -50,7 +50,7 @@ for v in "$@"; do
 done
 
 # This takes into account the fact that getopts stops on
-# any argument it doesn't recongize or errors on. This
+# any argument it doesn't recognize or errors on. This
 # allows for things like `compton-trans -5` as well
 # as `compton-trans -c +5 -s` (contrived example).
 while test $# -gt 0; do

man/compton.1.asciidoc

@@ -144,9 +144,6 @@ OPTIONS
 *--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.
 
-*--dbe*::
-	Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing. Reported to have no effect, though.
-
 *--paint-on-overlay*::
 	Painting on X Composite overlay window instead of on root window.
 
@@ -216,7 +213,7 @@ May also be one of the predefined kernels: `3x3box` (default), `5x5box`, `7x7box
 	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 *--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'::
 	Specify a list of conditions of windows that should be painted with inverted color. Resource-hogging, and is not well tested.
@@ -357,7 +354,9 @@ CONFIGURATION FILES
 -------------------
 compton could read from a configuration file if libconfig support is compiled in. If *--config* is not used, compton will seek for a configuration file in `$XDG_CONFIG_HOME/compton.conf` (`~/.config/compton.conf`, usually), then `~/.compton.conf`, then `compton.conf` under `$XDG_CONFIG_DIRS` (often `/etc/xdg/compton.conf`).
 
-compton uses general libconfig configuration file format. A sample configuration file is available as `compton.sample.conf` in the source tree. Most commandline switches each could be replaced with an option in configuration file, thus documented above. Window-type-specific settings are exposed only in configuration file and has the following format:
+compton uses general libconfig configuration file format. A sample configuration file is available as `compton.sample.conf` in the source tree. Most of commandline switches can be used as options in configuration file as well. For example, *--vsync* option documented above can be set in the configuration file using `vsync = `. Command line options will always overwrite the settings in the configuration file.
+
+Window-type-specific settings are exposed only in configuration file and has the following format:
 
 ------------
 wintypes:

meson_options.txt

@@ -6,7 +6,7 @@ option('regex', type: 'boolean', value: true, description: 'Enable regex support
 option('vsync_drm', type: 'boolean', value: false, description: 'Enable support for using drm for vsync')
 
 option('opengl', type: 'boolean', value: true, description: 'Enable features that require opengl (opengl backend, and opengl vsync methods)')
-option('dbus', type: 'boolean', value: true, description: 'Enable suport for D-Bus remote control')
+option('dbus', type: 'boolean', value: true, description: 'Enable support for D-Bus remote control')
 
 option('xrescheck', type: 'boolean', value: false, description: 'Enable X resource leak checker (for debug only)')
 

src/backend/gl/gl_common.c

@@ -306,8 +306,6 @@ bool gl_dim_reg(session_t *ps, int dx, int dy, int width, int height, float z,
 		P_PAINTREG_END();
 	}
 
-	glEnd();
-
 	glColor4f(0.0f, 0.0f, 0.0f, 0.0f);
 	glDisable(GL_BLEND);
 

src/backend/gl/gl_common.h

@@ -118,7 +118,7 @@ static inline void gl_check_err_(const char *func, int line) {
 /**
  * Check if a GLX extension exists.
  */
-static inline bool gl_has_extension(session_t *ps, const char *ext) {
+static inline bool gl_has_extension(const char *ext) {
 	GLint nexts = 0;
 	glGetIntegerv(GL_NUM_EXTENSIONS, &nexts);
 	if (!nexts) {

src/backend/gl/glx.c

@@ -432,8 +432,8 @@ static void *glx_init(session_t *ps) {
 
 	// Check GL_ARB_texture_non_power_of_two, requires a GLX context and
 	// must precede FBConfig fetching
-	gd->cap.non_power_of_two_texture = gl_has_extension(ps, "GL_ARB_texture_non_"
-	                                                        "power_of_two");
+	gd->cap.non_power_of_two_texture = gl_has_extension("GL_ARB_texture_non_"
+							    "power_of_two");
 
 	gd->glXBindTexImage = (void *)glXGetProcAddress((const GLubyte *)"glXBindTexImage"
 	                                                                 "EXT");

src/c2.c

@@ -19,7 +19,7 @@
 #ifdef CONFIG_REGEX_PCRE
 #include <pcre.h>
 
-// For compatiblity with <libpcre-8.20
+// For compatibility with <libpcre-8.20
 #ifndef PCRE_STUDY_JIT_COMPILE
 #define PCRE_STUDY_JIT_COMPILE    0
 #define LPCRE_FREE_STUDY(extra)   pcre_free(extra)

src/compton.c

@@ -2482,12 +2482,16 @@ static void
 delayed_draw_callback(EV_P_ ev_idle *w, int revents) {
   // This function is only used if we are using --swopti
   session_t *ps = session_ptr(w, draw_idle);
-  if (ev_is_active(&ps->delayed_draw_timer))
-    return;
+  assert(ps->redraw_needed);
+  assert(!ev_is_active(&ps->delayed_draw_timer));
 
   double delay = swopti_handle_timeout(ps);
-  if (delay < 1e-6)
+  if (delay < 1e-6) {
+    if (!ps->o.benchmark) {
+      ev_idle_stop(ps->loop, &ps->draw_idle);
+    }
     return _draw_callback(EV_A_ ps, revents);
+  }
 
   // This is a little bit hacky. When we get to this point in code, we need
   // to update the screen , but we will only be updating after a delay, So

src/config_libconfig.c

@@ -37,6 +37,28 @@ lcfg_lookup_bool(const config_t *config, const char *path, bool *value) {
   return ret;
 }
 
+/// Search for config file under a base directory
+FILE *
+open_config_file_at(const char *base, char **out_path) {
+  static const char *config_paths[] = {
+    "/compton.conf",
+    "/compton/compton.conf"
+  };
+  for (size_t i = 0; i < ARR_SIZE(config_paths); i++) {
+    char *path = mstrjoin(base, config_paths[i]);
+    FILE *ret = fopen(path, "r");
+    if (ret && out_path) {
+      *out_path = path;
+    } else {
+      free(path);
+    }
+    if (ret) {
+      return ret;
+    }
+  }
+  return NULL;
+}
+
 /**
  * Get a file stream of the configuration file to read.
  *
@@ -44,10 +66,6 @@ lcfg_lookup_bool(const config_t *config, const char *path, bool *value) {
  */
 FILE *
 open_config_file(const char *cpath, char **ppath) {
-  static const char *config_paths[] = {
-    "/compton.conf",
-    "/compton/compton.conf"
-  };
   static const char config_filename_legacy[] = "/.compton.conf";
 
   if (cpath) {
@@ -57,31 +75,40 @@ open_config_file(const char *cpath, char **ppath) {
     return ret;
   }
 
-  for (size_t i = 0; i < ARR_SIZE(config_paths); i++) {
-    char *path = xdgConfigFind(config_paths[i], NULL);
-    FILE *ret = fopen(path, "r");
+  // First search for config file in user config directory
+  auto config_home = xdgConfigHome(NULL);
+  auto ret = open_config_file_at(config_home, ppath);
+  free((void *)config_home);
+  if (ret) {
+    return ret;
+  }
+
+  // Fall back to legacy config file in user home directory
+  const char *home = getenv("HOME");
+  if (home && strlen(home)) {
+    auto path = mstrjoin(home, config_filename_legacy);
+    ret = fopen(path, "r");
     if (ret && ppath) {
-        *ppath = strdup(path);
+      *ppath = path;
+    } else {
+      free(path);
     }
-    free(path);
     if (ret) {
       return ret;
     }
   }
 
-  // Fall back to legacy config file names
-  const char *home = getenv("HOME");
-  if (home && strlen(home)) {
-    auto path = ccalloc(strlen(home)+strlen(config_filename_legacy)+1, char);
-    strcpy(path, home);
-    strcpy(path+strlen(home), config_filename_legacy);
-    FILE *ret = fopen(path, "r");
-    if (ret && ppath)
-      *ppath = path;
-    else
-      free(path);
-    return ret;
+  // Fall back to config file in system config directory
+  auto config_dirs = xdgConfigDirectories(NULL);
+  for (int i = 0; config_dirs[i]; i++) {
+    ret = open_config_file_at(config_dirs[i], ppath);
+    if (ret) {
+      free((void *)config_dirs);
+      return ret;
+    }
   }
+  free((void *)config_dirs);
+
   return NULL;
 }
 

src/log.c

@@ -344,7 +344,7 @@ struct log_target *glx_string_marker_logger_new(void) {
 
 #else
 struct log_target *glx_string_marker_logger_new(void) {
-	return null_logger_new();
+	return NULL;
 }
 #endif
 

src/opengl.c

@@ -561,7 +561,7 @@ glx_init_blur(session_t *ps) {
     const char *texture_func = (use_texture_rect ?
         "texture2DRect": "texture2D");
     const char *shader_add = FRAG_SHADER_BLUR_ADD;
-    char *extension = strdup("");
+    char *extension = NULL;
     if (use_texture_rect)
       mstrextend(&extension, "#extension GL_ARB_texture_rectangle : require\n");
     if (ps->o.glx_use_gpushader4) {
@@ -1102,11 +1102,10 @@ glx_blur_dst(session_t *ps, int dx, int dy, int width, int height, float z,
     glBindTexture(tex_tgt, tex_scr);
 
     if (!last_pass) {
-      static const GLenum DRAWBUFS[2] = { GL_COLOR_ATTACHMENT0 };
       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
       glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
           GL_TEXTURE_2D, tex_scr2, 0);
-      glDrawBuffers(1, DRAWBUFS);
+      glDrawBuffer(GL_COLOR_ATTACHMENT0);
       if (glCheckFramebufferStatus(GL_FRAMEBUFFER)
           != GL_FRAMEBUFFER_COMPLETE) {
         log_error("Framebuffer attachment failed.");
@@ -1114,9 +1113,8 @@ glx_blur_dst(session_t *ps, int dx, int dy, int width, int height, float z,
       }
     }
     else {
-      static const GLenum DRAWBUFS[2] = { GL_BACK };
       glBindFramebuffer(GL_FRAMEBUFFER, 0);
-      glDrawBuffers(1, DRAWBUFS);
+      glDrawBuffer(GL_BACK);
       if (have_scissors)
         glEnable(GL_SCISSOR_TEST);
       if (have_stencil)
@@ -1224,8 +1222,6 @@ glx_dim_dst(session_t *ps, int dx, int dy, int width, int height, float z,
     P_PAINTREG_END();
   }
 
-  glEnd();
-
   glColor4f(0.0f, 0.0f, 0.0f, 0.0f);
   glDisable(GL_BLEND);
 

src/options.c

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <xcb/render.h> // for xcb_render_fixed_t, XXX
+#include <xcb/render.h>        // for xcb_render_fixed_t, XXX
 
 #include "common.h"
 #include "config.h"
@@ -20,7 +20,7 @@
 #pragma GCC diagnostic error "-Wunused-parameter"
 
 /**
- * Print usage text and exit.
+ * Print usage text.
  */
 static void usage(int ret) {
 #define WARNING_DISABLED " (DISABLED AT COMPILE TIME)"
@@ -479,9 +479,13 @@ bool get_early_config(int argc, char *const *argv, char **config_file, bool *all
 	// arguments
 	optind = 1;
 	*config_file = NULL;
+	*exit_code = 0;
 	while (-1 != (o = getopt_long(argc, argv, shortopts, longopts, &longopt_idx))) {
 		if (o == 256) {
 			*config_file = strdup(optarg);
+		} else if (o == 'h') {
+			usage(0);
+			return true;
 		} else if (o == 'd') {
 			log_warn("-d will be ignored, please use the DISPLAY "
 			         "environment variable");
@@ -489,7 +493,6 @@ bool get_early_config(int argc, char *const *argv, char **config_file, bool *all
 			*all_xerrors = true;
 		} else if (o == 318) {
 			printf("%s\n", COMPTON_VERSION);
-			*exit_code = 0;
 			return true;
 		} else if (o == 'S') {
 			log_warn("-S will be ignored");
@@ -497,7 +500,6 @@ bool get_early_config(int argc, char *const *argv, char **config_file, bool *all
 			log_warn("--no-name-pixmap will be ignored");
 		} else if (o == '?' || o == ':') {
 			usage(1);
-			*exit_code = 1;
 			return true;
 		}
 	}

src/string_utils.c

@@ -11,33 +11,32 @@
  * Allocate the space and join two strings.
  */
 char *mstrjoin(const char *src1, const char *src2) {
-  auto str = ccalloc(strlen(src1)+strlen(src2)+1, char);
+	auto len1 = strlen(src1);
+	auto len2 = strlen(src2);
+	auto len = len1 + len2 + 1;
+	auto str = ccalloc(len, char);
 
-  strcpy(str, src1);
-  strcat(str, src2);
+	strncpy(str, src1, len1);
+	strncpy(str + len1, src2, len2);
+	str[len - 1] = '\0';
 
-  return str;
-}
-
-/**
- * Allocate the space and join two strings;
- */
-char *
-mstrjoin3(const char *src1, const char *src2, const char *src3) {
-  auto str = ccalloc(strlen(src1)+strlen(src2)+strlen(src3)+1, char);
-
-  strcpy(str, src1);
-  strcat(str, src2);
-  strcat(str, src3);
-
-  return str;
+	return str;
 }
 
 /**
  * Concatenate a string on heap with another string.
  */
 void mstrextend(char **psrc1, const char *src2) {
-  *psrc1 = crealloc(*psrc1, (*psrc1 ? strlen(*psrc1) : 0)+strlen(src2)+1);
+	if (!*psrc1) {
+		*psrc1 = strdup(src2);
+		return;
+	}
 
-  strcat(*psrc1, src2);
+	auto len1 = strlen(*psrc1);
+	auto len2 = strlen(src2);
+	auto len = len1 + len2 + 1;
+	*psrc1 = crealloc(*psrc1, len);
+
+	strncpy(*psrc1 + len1, src2, len2);
+	(*psrc1)[len - 1] = '\0';
 }