Merge branch 'yshui:next' into next

Author: pijulius

meson_options.txt

@@ -4,8 +4,6 @@ option('regex', type: 'boolean', value: true, description: 'Enable regex support
 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 support for D-Bus remote control')
 
-option('xrescheck', type: 'boolean', value: false, description: 'Enable X resource leak checker (for debug only)')
-
 option('compton', type: 'boolean', value: true, description: 'Install backwards compat with compton')
 
 option('with_docs', type: 'boolean', value: false, description: 'Build documentation and man pages')

src/backend/gl/glx.c

@@ -179,10 +179,9 @@ static void glx_release_image(backend_t *base, struct gl_texture *tex) {
 void glx_deinit(backend_t *base) {
 	struct _glx_data *gd = (void *)base;
 
-	gl_deinit(&gd->gl);
-
 	// Destroy GLX context
 	if (gd->ctx) {
+		gl_deinit(&gd->gl);
 		glXMakeCurrent(base->c->dpy, None, NULL);
 		glXDestroyContext(base->c->dpy, gd->ctx);
 		gd->ctx = 0;
@@ -297,7 +296,7 @@ static backend_t *glx_init(session_t *ps, xcb_window_t target) {
 		}
 
 		gd->ctx = glXCreateContextAttribsARB(ps->c.dpy, cfg[i], 0, true, attributes);
-		free(cfg);
+		free((void *)cfg);
 
 		if (!gd->ctx) {
 			log_error("Failed to get GLX context.");

src/common.h

@@ -34,11 +34,6 @@
 #include <picom/backend.h>
 #include <picom/types.h>
 
-// X resource checker
-#ifdef DEBUG_XRC
-#include "xrescheck.h"
-#endif
-
 // FIXME This list of includes should get shorter
 #include "backend/driver.h"
 #include "config.h"

src/meson.build

@@ -99,11 +99,6 @@ if get_option('dbus')
 	srcs += ['dbus.c', 'rtkit.c']
 endif
 
-if get_option('xrescheck')
-	cflags += ['-DDEBUG_XRC']
-	srcs += ['xrescheck.c']
-endif
-
 if get_option('unittest')
 	cflags += ['-DUNIT_TEST']
 endif

src/picom.c

@@ -2442,11 +2442,6 @@ static void session_destroy(session_t *ps) {
 	ev_io_stop(ps->loop, &ps->xiow);
 	destroy_atoms(ps->atoms);
 
-#ifdef DEBUG_XRC
-	// Report about resource leakage
-	xrc_report_xid();
-#endif
-
 	// Stop libev event handlers
 	ev_timer_stop(ps->loop, &ps->unredir_timer);
 	ev_timer_stop(ps->loop, &ps->draw_timer);

src/picom.modulemap

@@ -64,9 +64,6 @@ module common {
 module config {
   header "config.h"
 }
-module xrescheck {
-  header "xrescheck.h"
-}
 module cache {
   header "cache.h"
 }