Merge remote-tracking branch 'upstream/next' into next

yshui · Jun 5, 2024 · 400e517 · 400e517
2 parents 3fbe856 + c2cb4df
commit 400e517
Show file tree

Hide file tree

Showing 84 changed files with 855 additions and 737 deletions.
diff --git a/flake.nix b/flake.nix
@@ -59,6 +59,8 @@
           # Workaround a NixOS limitation on sanitizers:
           # See: https://github.com/NixOS/nixpkgs/issues/287763
           export LD_LIBRARY_PATH+=":/run/opengl-driver/lib"
+          export UBSAN_OPTIONS="disable_coredump=0:unmap_shadow_on_exit=1"
+          export ASAN_OPTIONS="disable_coredump=0:unmap_shadow_on_exit=1"
         '';
       });
     in rec {

diff --git a/src/api.c b/src/api.c
@@ -9,9 +9,9 @@
 #include <uthash.h>
 
 #include "compiler.h"
-#include "list.h"
 #include "log.h"
-#include "utils.h"
+#include "utils/list.h"
+#include "utils/misc.h"
 
 struct backend_plugins {
 	UT_hash_handle hh;

diff --git a/src/atom.c b/src/atom.c
@@ -1,13 +1,16 @@
+// SPDX-License-Identifier: MPL-2.0
+// Copyright (c) Yuxuan Shui <yshuiv7@gmail.com>
+
 #include <string.h>
 #include <uthash.h>
 #include <xcb/xcb.h>
 
 #include "atom.h"
-#include "cache.h"
 #include "common.h"
 #include "compiler.h"
 #include "log.h"
-#include "utils.h"
+#include "utils/cache.h"
+#include "utils/misc.h"
 
 struct atom_entry {
 	struct cache_handle entry;
@@ -163,4 +166,4 @@ struct atom *init_mock_atoms(void) {
 	abort();
 }
 
-#endif
+#endif
diff --git a/src/atom.h b/src/atom.h
@@ -1,8 +1,11 @@
+// SPDX-License-Identifier: MPL-2.0
+// Copyright (c) Yuxuan Shui <yshuiv7@gmail.com>
+
 #pragma once
+#include <string.h>
 #include <xcb/xcb.h>
 
-#include "cache.h"
-#include "meta.h"
+#include "utils/meta.h"
 
 // clang-format off
 // Splitted into 2 lists because of the limitation of our macros
@@ -80,4 +83,4 @@ void destroy_atoms(struct atom *a);
 /// secutive integers as atoms, starting from 1. Calling get_atom_name with atoms
 /// previously seen will result in the string that was used to create the atom; if
 /// the atom was never returned by get_atom, it will abort.
-struct atom *init_mock_atoms(void);
+struct atom *init_mock_atoms(void);
diff --git a/src/backend/backend.c b/src/backend/backend.c
@@ -6,15 +6,16 @@
 
 #include <picom/types.h>
 
-#include "backend/backend.h"
 #include "common.h"
 #include "compiler.h"
 #include "config.h"
 #include "log.h"
 #include "region.h"
-#include "win.h"
+#include "wm/win.h"
 #include "x.h"
 
+#include "backend.h"
+
 static struct backend_info {
 	UT_hash_handle hh;
 	const char *name;

diff --git a/src/backend/backend_common.c b/src/backend/backend_common.c
@@ -6,15 +6,16 @@
 #include <xcb/xcb_image.h>
 #include <xcb/xcb_renderutil.h>
 
-#include "backend/backend_common.h"
 #include "common.h"
 #include "config.h"
-#include "kernel.h"
 #include "log.h"
-#include "utils.h"
-#include "win.h"
+#include "utils/kernel.h"
+#include "utils/misc.h"
+#include "wm/win.h"
 #include "x.h"
 
+#include "backend_common.h"
+
 /**
  * Generate a 1x1 <code>Picture</code> of a particular color.
  */

diff --git a/src/backend/driver.c b/src/backend/driver.c
@@ -6,12 +6,12 @@
 #include <xcb/randr.h>
 #include <xcb/xcb.h>
 
-#include "backend/backend.h"
-#include "backend/driver.h"
 #include "common.h"
 #include "compiler.h"
 #include "log.h"
 
+#include "driver.h"
+
 /// Apply driver specified global workarounds. It's safe to call this multiple times.
 void apply_driver_workarounds(struct session *ps, enum driver driver) {
 	if (driver & DRIVER_NVIDIA) {

diff --git a/src/backend/driver.h b/src/backend/driver.h
@@ -8,7 +8,7 @@
 #include <xcb/xcb.h>
 
 #include "config.h"
-#include "utils.h"
+#include "utils/misc.h"
 
 struct session;
 struct backend_base;

diff --git a/src/backend/dummy/dummy.c b/src/backend/dummy/dummy.c
@@ -10,8 +10,8 @@
 #include "config.h"
 #include "log.h"
 #include "region.h"
-#include "uthash_extra.h"
-#include "utils.h"
+#include "utils/misc.h"
+#include "utils/uthash_extra.h"
 #include "x.h"
 
 struct dummy_image {

diff --git a/src/backend/gl/blur.c b/src/backend/gl/blur.c
@@ -1,8 +1,7 @@
 #include <locale.h>
 #include <stdbool.h>
 
-#include <backend/backend.h>
-#include <backend/backend_common.h>
+#include "backend/backend_common.h"
 
 #include "gl_common.h"
 

diff --git a/src/backend/gl/egl.c b/src/backend/gl/egl.c
@@ -11,16 +11,17 @@
 
 #include "backend/backend.h"
 #include "backend/backend_common.h"
-#include "backend/gl/egl.h"
-#include "backend/gl/gl_common.h"
 #include "common.h"
 #include "compiler.h"
 #include "config.h"
 #include "log.h"
 #include "picom.h"
-#include "utils.h"
+#include "utils/misc.h"
 #include "x.h"
 
+#include "egl.h"
+#include "gl_common.h"
+
 struct egl_data {
 	struct gl_data gl;
 	EGLDisplay display;

diff --git a/src/backend/gl/egl.h b/src/backend/gl/egl.h
@@ -7,11 +7,6 @@
 #include <xcb/render.h>
 #include <xcb/xcb.h>
 
-#include "compiler.h"
-#include "log.h"
-#include "utils.h"
-#include "x.h"
-
 struct eglext_info {
 	bool initialized;
 	bool has_EGL_MESA_query_driver;

diff --git a/src/backend/gl/gl_common.c b/src/backend/gl/gl_common.c
@@ -11,15 +11,15 @@
 
 #include <picom/types.h>
 
+#include "backend/backend_common.h"
 #include "common.h"
 #include "compiler.h"
 #include "config.h"
 #include "log.h"
 #include "region.h"
-#include "utils.h"
+#include "utils/misc.h"
 
-#include "backend/backend_common.h"
-#include "backend/gl/gl_common.h"
+#include "gl_common.h"
 
 void gl_prepare(backend_t *base, const region_t *reg attr_unused) {
 	auto gd = (struct gl_data *)base;

diff --git a/src/backend/gl/gl_common.h b/src/backend/gl/gl_common.h
@@ -7,7 +7,7 @@
 #include <xcb/xproto.h>
 
 #include "backend/backend.h"
-#include "backend/backend_common.h"
+
 #include "log.h"
 #include "region.h"
 

diff --git a/src/backend/gl/glx.c b/src/backend/gl/glx.c
@@ -9,31 +9,31 @@
  * See LICENSE-mit for more information.
  *
  */
-
-#include <X11/Xlib-xcb.h>
 #include <limits.h>
-#include <pixman.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <X11/Xlib-xcb.h>
+#include <pixman.h>
 #include <uthash.h>
 #include <xcb/composite.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
 
 #include "backend/backend.h"
 #include "backend/backend_common.h"
-#include "backend/gl/gl_common.h"
-#include "backend/gl/glx.h"
 #include "common.h"
 #include "compiler.h"
 #include "config.h"
 #include "log.h"
 #include "picom.h"
-#include "utils.h"
-#include "win.h"
+#include "utils/misc.h"
 #include "x.h"
 
+#include "gl_common.h"
+#include "glx.h"
+
 struct _glx_data {
 	struct gl_data gl;
 	xcb_window_t target_win;

diff --git a/src/backend/gl/glx.h b/src/backend/gl/glx.h
@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright (c) Yuxuan Shui <yshuiv7@gmail.com>
 #pragma once
+#include <stdbool.h>
+
 #include <X11/Xlib.h>
 #include <epoxy/glx.h>
-#include <stdbool.h>
 #include <xcb/render.h>
 #include <xcb/xcb.h>
 
-#include "compiler.h"
-#include "log.h"
-#include "utils.h"
 #include "x.h"
 
 struct glx_fbconfig_info {

diff --git a/src/backend/gl/meson.build b/src/backend/gl/meson.build
@@ -0,0 +1 @@
+srcs += [ files('blur.c', 'egl.c', 'gl_common.c', 'glx.c', 'shaders.c') ]
diff --git a/src/backend/meson.build b/src/backend/meson.build
@@ -2,16 +2,13 @@
 srcs += [
   files(
     'dummy/dummy.c',
-    'xrender/xrender.c',
     'backend.c',
     'backend_common.c',
     'driver.c',
   ),
 ]
-
+subdir('xrender')
 # enable opengl
 if get_option('opengl')
-  srcs += [
-    files('gl/blur.c', 'gl/egl.c', 'gl/gl_common.c', 'gl/glx.c', 'gl/shaders.c'),
-  ]
+  subdir('gl')
 endif
diff --git a/src/backend/xrender/meson.build b/src/backend/xrender/meson.build
@@ -0,0 +1 @@
+srcs += [ files('xrender.c') ]
diff --git a/src/backend/xrender/xrender.c b/src/backend/xrender/xrender.c
@@ -20,12 +20,11 @@
 #include "common.h"
 #include "compiler.h"
 #include "config.h"
-#include "kernel.h"
 #include "log.h"
 #include "picom.h"
 #include "region.h"
-#include "utils.h"
-#include "win.h"
+#include "utils/kernel.h"
+#include "utils/misc.h"
 #include "x.h"
 
 struct xrender_image_data_inner {

diff --git a/src/c2.c b/src/c2.c
@@ -1,14 +1,6 @@
 // SPDX-License-Identifier: MIT
-
-/*
- * Compton - a compositor for X11
- *
- * Based on `xcompmgr` - Copyright (c) 2003, Keith Packard
- *
- * Copyright (c) 2011-2013, Christopher Jeffrey
- * See LICENSE-mit for more information.
- *
- */
+// Copyright (c) 2011-2013, Christopher Jeffrey
+// Copyright (c) 2018 Yuxuan Shui <yshuiv7@gmail.com>
 
 #include <assert.h>
 #include <ctype.h>
@@ -34,11 +26,10 @@
 #include "compiler.h"
 #include "config.h"
 #include "log.h"
-#include "string_utils.h"
 #include "test.h"
-#include "uthash_extra.h"
-#include "utils.h"
-#include "win.h"
+#include "utils/str.h"
+#include "utils/uthash_extra.h"
+#include "wm/win.h"
 #include "x.h"
 
 #include "c2.h"
@@ -550,6 +541,7 @@ TEST_CASE(c2_parse) {
 
 	cond = c2_parse(NULL, "_NET_WM_STATE = '_NET_WM_STATE_HIDDEN'", NULL);
 	TEST_NOTEQUAL(cond, NULL);
+	c2_list_free(&cond, NULL);
 
 	cond = c2_parse(NULL, "1A:\n1111111111111ar1", NULL);
 	TEST_EQUAL(cond, NULL);

diff --git a/src/c2.h b/src/c2.h
@@ -1,13 +1,6 @@
 // SPDX-License-Identifier: MIT
-/*
- * Compton - a compositor for X11
- *
- * Based on `xcompmgr` - Copyright (c) 2003, Keith Packard
- *
- * Copyright (c) 2011-2013, Christopher Jeffrey
- * See LICENSE-mit for more information.
- *
- */
+// Copyright (c) 2011-2013, Christopher Jeffrey
+// Copyright (c) 2018 Yuxuan Shui <yshuiv7@gmail.com>
 
 #pragma once