BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove leftover CONFIG_XINERAMAs 

Fixes #118

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-02-19 20:48:31 +00:00
parent bb8fd08b5b
commit 02ddf96fd5
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compton.c
View File

@ -71,10 +71,8 @@ cxinerama_upd_scrs(session_t *ps);
static void static void
session_destroy(session_t *ps); session_destroy(session_t *ps);
#ifdef CONFIG_XINERAMA
static void static void
cxinerama_upd_scrs(session_t *ps); cxinerama_upd_scrs(session_t *ps);
#endif
static void static void
redir_start(session_t *ps); redir_start(session_t *ps);
@ -148,7 +146,6 @@ session_t *ps_g = NULL;
*/ */
static inline void static inline void
free_xinerama_info(session_t *ps) { free_xinerama_info(session_t *ps) {
#ifdef CONFIG_XINERAMA
if (ps->xinerama_scr_regs) { if (ps->xinerama_scr_regs) {
for (int i = 0; i < ps->xinerama_nscrs; ++i) for (int i = 0; i < ps->xinerama_nscrs; ++i)
pixman_region32_fini(&ps->xinerama_scr_regs[i]); pixman_region32_fini(&ps->xinerama_scr_regs[i]);
@ -157,7 +154,6 @@ free_xinerama_info(session_t *ps) {
cxfree(ps->xinerama_scrs); cxfree(ps->xinerama_scrs);
ps->xinerama_scrs = NULL; ps->xinerama_scrs = NULL;
ps->xinerama_nscrs = 0; ps->xinerama_nscrs = 0;
#endif
} }
/** /**
@ -175,7 +171,6 @@ get_time_ms(void) {
// XXX Move to x.c // XXX Move to x.c
static void static void
cxinerama_upd_scrs(session_t *ps) { cxinerama_upd_scrs(session_t *ps) {
#ifdef CONFIG_XINERAMA
// XXX Consider deprecating Xinerama, switch to RandR when necessary // XXX Consider deprecating Xinerama, switch to RandR when necessary
free_xinerama_info(ps); free_xinerama_info(ps);
@ -203,7 +198,6 @@ cxinerama_upd_scrs(session_t *ps) {
const xcb_xinerama_screen_info_t * const s = &scrs[i]; const xcb_xinerama_screen_info_t * const s = &scrs[i];
pixman_region32_init_rect(&ps->xinerama_scr_regs[i], s->x_org, s->y_org, s->width, s->height); pixman_region32_init_rect(&ps->xinerama_scr_regs[i], s->x_org, s->y_org, s->width, s->height);
} }
#endif
} }
/** /**
@ -2590,13 +2584,8 @@ session_init(int argc, char **argv, Display *dpy, const char *config_file,
// Query X Xinerama extension // Query X Xinerama extension
if (ps->o.xinerama_shadow_crop) { if (ps->o.xinerama_shadow_crop) {
#ifdef CONFIG_XINERAMA
ext_info = xcb_get_extension_data(ps->c, &xcb_xinerama_id); ext_info = xcb_get_extension_data(ps->c, &xcb_xinerama_id);
ps->xinerama_exists = ext_info && ext_info->present; ps->xinerama_exists = ext_info && ext_info->present;
#else
log_fatal("Xinerama support not compiled in. xinerama-shadow-crop cannot be enabled");
exit(1);
#endif
} }
rebuild_screen_reg(ps); rebuild_screen_reg(ps);

1
src/compton.modulemap
View File

@ -1,5 +1,4 @@
// modulemap // modulemap
// Generated by: modularize -module-map-path=modulemap list -I. -I/usr/include/pixman-1 -x c -I/usr/include/dbus-1.0 -DCONFIG_XINERAMA -DCONFIG_LIBCONFIG -DCONFIG_REGEX_PCRE -DCONFIG_REGEX_PCRE_JIT -DCONFIG_OPENGL -DCONFIG_DBUS -DGL_GLEXT_PROTOTYPES -I/usr/lib/dbus-1.0/include
module compiler { module compiler {
header "compiler.h" header "compiler.h"