From 61e1b178e5e4a41a92f1f86349bebdc5ab23b0f7 Mon Sep 17 00:00:00 2001 From: Maxim Solovyov Date: Fri, 18 Oct 2024 20:30:18 +0300 Subject: [PATCH] common: remove unused information about the x extensions --- src/common.h | 16 ---------------- src/picom.c | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/src/common.h b/src/common.h index aaa3bf7a..11193d42 100644 --- a/src/common.h +++ b/src/common.h @@ -207,42 +207,26 @@ typedef struct session { long paint_tm_offset; // === X extension related === - /// Event base number for X Fixes extension. - int xfixes_event; /// Error base number for X Fixes extension. int xfixes_error; /// Event base number for X Damage extension. int damage_event; /// Error base number for X Damage extension. int damage_error; - /// Event base number for X Render extension. - int render_event; /// Error base number for X Render extension. int render_error; - /// Event base number for X Composite extension. - int composite_event; - /// Error base number for X Composite extension. - int composite_error; - /// Major opcode for X Composite extension. - int composite_opcode; /// Whether X Shape extension exists. bool shape_exists; /// Event base number for X Shape extension. int shape_event; - /// Error base number for X Shape extension. - int shape_error; /// Whether X RandR extension exists. bool randr_exists; /// Event base number for X RandR extension. int randr_event; - /// Error base number for X RandR extension. - int randr_error; /// Whether X Present extension exists. bool present_exists; /// Whether X GLX extension exists. bool glx_exists; - /// Event base number for X GLX extension. - int glx_event; /// Error base number for X GLX extension. int glx_error; /// Information about monitors. diff --git a/src/picom.c b/src/picom.c index b1bcb709..50b079d6 100644 --- a/src/picom.c +++ b/src/picom.c @@ -1979,23 +1979,15 @@ static session_t *session_init(int argc, char **argv, Display *dpy, .last_msc = 0, - .xfixes_event = 0, .xfixes_error = 0, .damage_event = 0, .damage_error = 0, - .render_event = 0, .render_error = 0, - .composite_event = 0, - .composite_error = 0, - .composite_opcode = 0, .shape_exists = false, .shape_event = 0, - .shape_error = 0, .randr_exists = 0, .randr_event = 0, - .randr_error = 0, .glx_exists = false, - .glx_event = 0, .glx_error = 0, #ifdef CONFIG_DBUS @@ -2042,7 +2034,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy, log_fatal("No render extension"); exit(1); } - ps->render_event = ext_info->first_event; ps->render_error = ext_info->first_error; ext_info = xcb_get_extension_data(ps->c.c, &xcb_composite_id); @@ -2050,9 +2041,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy, log_fatal("No composite extension"); exit(1); } - ps->composite_opcode = ext_info->major_opcode; - ps->composite_event = ext_info->first_event; - ps->composite_error = ext_info->first_error; { xcb_composite_query_version_reply_t *reply = xcb_composite_query_version_reply( @@ -2085,7 +2073,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy, log_fatal("No XFixes extension"); exit(1); } - ps->xfixes_event = ext_info->first_event; ps->xfixes_error = ext_info->first_error; xcb_discard_reply(ps->c.c, xcb_xfixes_query_version(ps->c.c, XCB_XFIXES_MAJOR_VERSION, XCB_XFIXES_MINOR_VERSION) @@ -2101,7 +2088,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy, if (ext_info && ext_info->present) { ps->glx_exists = true; ps->glx_error = ext_info->first_error; - ps->glx_event = ext_info->first_event; } // Parse configuration file @@ -2194,7 +2180,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy, ext_info = xcb_get_extension_data(ps->c.c, &xcb_shape_id); if (ext_info && ext_info->present) { ps->shape_event = ext_info->first_event; - ps->shape_error = ext_info->first_error; ps->shape_exists = true; } @@ -2202,7 +2187,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy, if (ext_info && ext_info->present) { ps->randr_exists = true; ps->randr_event = ext_info->first_event; - ps->randr_error = ext_info->first_error; } ext_info = xcb_get_extension_data(ps->c.c, &xcb_present_id);