Merge branch 'yshui:next' into next

Author: pijulius

CONTRIBUTORS

@@ -93,6 +93,7 @@ Toni Jarjour
 triallax <triallax at tutanota.com>
 Tuomas Kinnunen <tuomas.kinnunen at aalto.fi>
 Uli Schlachter <psychon at znc.in>
+Vasiliy Stelmachenok <ventureo at cachyos.org>
 Walter Lapchynski <wxl at ubuntu.com>
 Will Dietz <w at wdtz.org>
 Wim Koomen <autosuggestion at gmail.com>

src/backend/gl/egl.c

@@ -96,10 +96,6 @@ void egl_deinit(backend_t *base) {
 	free(gd);
 }
 
-static void *egl_decouple_user_data(backend_t *base attr_unused, void *ud attr_unused) {
-	return NULL;
-}
-
 static bool egl_set_swap_interval(int interval, EGLDisplay dpy) {
 	return eglSwapInterval(dpy, interval);
 }
@@ -215,7 +211,6 @@ static backend_t *egl_init(session_t *ps, xcb_window_t target) {
 		goto end;
 	}
 
-	gd->gl.decouple_texture_user_data = egl_decouple_user_data;
 	gd->gl.release_user_data = egl_release_image;
 
 	if (ps->o.vsync) {

src/backend/gl/gl_common.h

@@ -117,10 +117,6 @@ struct gl_data {
 
 	GLuint default_mask_texture;
 
-	/// Called when an gl_texture is decoupled from the texture it refers. Returns
-	/// the decoupled user_data
-	void *(*decouple_texture_user_data)(backend_t *base, void *user_data);
-
 	/// Release the user data attached to a gl_texture
 	void (*release_user_data)(backend_t *base, struct gl_texture *);
 
@@ -129,14 +125,6 @@ struct gl_data {
 
 typedef struct session session_t;
 
-#define GL_PROG_MAIN_INIT                                                                \
-	{                                                                                \
-	    .prog = 0,                                                                   \
-	    .unifm_opacity = -1,                                                         \
-	    .unifm_invert_color = -1,                                                    \
-	    .unifm_tex = -1,                                                             \
-	}
-
 void gl_prepare(backend_t *base, const region_t *reg);
 /// Convert a mask formed by a collection of rectangles to OpenGL vertex and texture
 /// coordinates.
@@ -182,8 +170,6 @@ GLuint gl_new_texture(void);
 
 xcb_pixmap_t gl_release_image(backend_t *base, image_handle image);
 
-image_handle gl_clone(backend_t *base, image_handle image, const region_t *reg_visible);
-
 bool gl_blur(struct backend_base *gd, ivec2 origin, image_handle target,
              const struct backend_blur_args *args);
 bool gl_copy_area(backend_t *backend_data, ivec2 origin, image_handle target,

src/backend/gl/glx.c

@@ -197,10 +197,6 @@ void glx_deinit(backend_t *base) {
 	free(gd);
 }
 
-static void *glx_decouple_user_data(backend_t *base attr_unused, void *ud attr_unused) {
-	return NULL;
-}
-
 static bool glx_set_swap_interval(int interval, Display *dpy, GLXDrawable drawable) {
 	bool vsync_enabled = false;
 	if (glxext.has_MESA_swap_control) {
@@ -328,7 +324,6 @@ static backend_t *glx_init(session_t *ps, xcb_window_t target) {
 		goto end;
 	}
 
-	gd->gl.decouple_texture_user_data = glx_decouple_user_data;
 	gd->gl.release_user_data = glx_release_image;
 
 	if (ps->o.vsync) {

src/common.h

@@ -151,8 +151,6 @@ typedef struct session {
 	// === Operation related ===
 	/// Whether there is a pending quest to get the focused window
 	bool pending_focus_check;
-	/// Flags related to the root window
-	uint64_t root_flags;
 	/// Program options.
 	options_t o;
 	/// State object for c2.
@@ -181,8 +179,6 @@ typedef struct session {
 	struct renderer *renderer;
 	/// Whether all windows are currently redirected.
 	bool redirected;
-	/// Pre-generated alpha pictures.
-	xcb_render_picture_t *alpha_picts;
 	/// Time of last fading. In milliseconds.
 	long long fade_time;
 	/// If we should quit
@@ -196,21 +192,6 @@ typedef struct session {
 
 	struct window_options window_options_default;
 
-	// === Shadow/dimming related ===
-	/// 1x1 black Picture.
-	xcb_render_picture_t black_picture;
-	/// 1x1 Picture of the shadow color.
-	xcb_render_picture_t cshadow_picture;
-	/// 1x1 white Picture.
-	xcb_render_picture_t white_picture;
-	/// Backend shadow context.
-	struct backend_shadow_context *shadow_context;
-	// for shadow precomputation
-
-	// === Software-optimization-related ===
-	/// Nanosecond offset of the first painting.
-	long paint_tm_offset;
-
 	// === X extension related ===
 	/// Information about monitors.
 	struct x_monitors monitors;
@@ -224,31 +205,15 @@ typedef struct session {
 #endif
 } session_t;
 
-/// Enumeration for window event hints.
-typedef enum { WIN_EVMODE_UNKNOWN, WIN_EVMODE_FRAME, WIN_EVMODE_CLIENT } win_evmode_t;
 struct wintype_info {
 	const char *name;
 	const char *atom;
 };
 extern const struct wintype_info WINTYPES[NUM_WINTYPES];
 extern session_t *ps_g;
 
-void ev_xcb_error(session_t *ps, xcb_generic_error_t *err);
-
 // === Functions ===
 
-/**
- * Get current time in struct timeval.
- */
-static inline struct timeval get_time_timeval(void) {
-	struct timeval tv = {0, 0};
-
-	gettimeofday(&tv, NULL);
-
-	// Return a time of all 0 if the call fails
-	return tv;
-}
-
 /**
  * Get current time in struct timespec.
  *
@@ -263,13 +228,6 @@ static inline struct timespec get_time_timespec(void) {
 	return tm;
 }
 
-/**
- * Return the painting target window.
- */
-static inline xcb_window_t get_tgt_window(session_t *ps) {
-	return ps->overlay != XCB_NONE ? ps->overlay : ps->c.screen_info->root;
-}
-
 /**
  * Determine if a window has a specific property.
  *
@@ -295,14 +253,3 @@ static inline bool wid_has_prop(xcb_connection_t *c, xcb_window_t w, xcb_atom_t
 }
 
 void force_repaint(session_t *ps);
-
-/**
- * Set a <code>bool</code> array of all wintypes to true.
- */
-static inline void wintype_arr_enable(bool arr[]) {
-	wintype_t i;
-
-	for (i = 0; i < NUM_WINTYPES; ++i) {
-		arr[i] = true;
-	}
-}

src/picom.c

@@ -1981,15 +1981,9 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
 	    .overlay = XCB_NONE,
 	    .reg_win = XCB_NONE,
 	    .redirected = false,
-	    .alpha_picts = NULL,
 	    .fade_time = 0L,
 	    .quit = false,
 
-	    .black_picture = XCB_NONE,
-	    .cshadow_picture = XCB_NONE,
-	    .white_picture = XCB_NONE,
-	    .shadow_context = NULL,
-
 	    .last_msc = 0,
 
 #ifdef CONFIG_DBUS

src/picom.h

@@ -25,14 +25,10 @@
 // == Functions ==
 // TODO(yshui) move static inline functions that are only used in picom.c, into picom.c
 
-void circulate_win(session_t *ps, xcb_circulate_notify_event_t *ce);
-
 void root_damaged(session_t *ps);
 
 void queue_redraw(session_t *ps);
 
-void discard_pending(session_t *ps, uint32_t sequence);
-
 void configure_root(session_t *ps);
 
 void quit(session_t *ps);
@@ -48,47 +44,3 @@ static inline struct cdbus_data *session_get_cdbus(session_t *ps attr_unused) {
 	return NULL;
 }
 #endif
-
-/**
- * Set a <code>switch_t</code> array of all unset wintypes to true.
- */
-static inline void wintype_arr_enable_unset(switch_t arr[]) {
-	wintype_t i;
-
-	for (i = 0; i < NUM_WINTYPES; ++i) {
-		if (UNSET == arr[i]) {
-			arr[i] = ON;
-		}
-	}
-}
-
-/**
- * Check if a window ID exists in an array of window IDs.
- *
- * @param arr the array of window IDs
- * @param count amount of elements in the array
- * @param wid window ID to search for
- */
-static inline bool array_wid_exists(const xcb_window_t *arr, int count, xcb_window_t wid) {
-	while (count--) {
-		if (arr[count] == wid) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-/**
- * Dump an drawable's info.
- */
-static inline void dump_drawable(session_t *ps, xcb_drawable_t drawable) {
-	auto r = xcb_get_geometry_reply(ps->c.c, xcb_get_geometry(ps->c.c, drawable), NULL);
-	if (!r) {
-		log_trace("Drawable %#010x: Failed", drawable);
-		return;
-	}
-	log_trace("Drawable %#010x: x = %u, y = %u, wid = %u, hei = %d, b = %u, d = %u",
-	          drawable, r->x, r->y, r->width, r->height, r->border_width, r->depth);
-	free(r);
-}

src/x.c

@@ -964,39 +964,6 @@ bool x_is_root_back_pixmap_atom(struct atom *atoms, xcb_atom_t atom) {
 	       atom == atoms->a_XSETROOT_ID;
 }
 
-/**
- * Synchronizes a X Render drawable to ensure all pending painting requests
- * are completed.
- */
-bool x_fence_sync(struct x_connection *c, xcb_sync_fence_t f) {
-	// TODO(richardgv): If everybody just follows the rules stated in X Sync
-	// prototype, we need only one fence per screen, but let's stay a bit
-	// cautious right now
-
-	auto e = xcb_request_check(c->c, xcb_sync_trigger_fence_checked(c->c, f));
-	if (e) {
-		log_error_x_error(c, e, "Failed to trigger the fence");
-		goto err;
-	}
-
-	e = xcb_request_check(c->c, xcb_sync_await_fence_checked(c->c, 1, &f));
-	if (e) {
-		log_error_x_error(c, e, "Failed to await on a fence");
-		goto err;
-	}
-
-	e = xcb_request_check(c->c, xcb_sync_reset_fence_checked(c->c, f));
-	if (e) {
-		log_error_x_error(c, e, "Failed to reset the fence");
-		goto err;
-	}
-	return true;
-
-err:
-	free(e);
-	return false;
-}
-
 void x_request_vblank_event(struct x_connection *c, xcb_window_t window, uint64_t msc) {
 	auto cookie = xcb_present_notify_msc(c->c, window, 0, msc, 1, 0);
 	x_set_error_action_abort(c, cookie);

src/x.h

@@ -420,8 +420,6 @@ xcb_pixmap_t x_get_root_back_pixmap(struct x_connection *c, struct atom *atoms);
 /// root window background pixmap
 bool x_is_root_back_pixmap_atom(struct atom *atoms, xcb_atom_t atom);
 
-bool x_fence_sync(struct x_connection *, xcb_sync_fence_t);
-
 struct x_convolution_kernel {
 	int size;
 	int capacity;