By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] 0005-twin-compton-tde-make-XRandR-support-optional-in-com.patch

0005-twin-compton-tde-make-XRandR-support-optional-in-com.patch (text/plain), 8.65 KB, created by Alexander Golubev (Fat-Zer) on 2014-04-10 12:50:58 CDT

(hide)

Description: 0005-twin-compton-tde-make-XRandR-support-optional-in-com.patch

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2014-04-10 12:50:58 CDT

Size: 8.65 KB

patch

obsolete

>From f1793b04aa55307e28e6e12ee7ec18c079a5dca0 Mon Sep 17 00:00:00 2001 >From: Alexander Golubev <fatzer2@gmail.com> >Date: Mon, 7 Apr 2014 02:00:35 +0400 >Subject: [PATCH 5/5] twin/compton-tde: make XRandR support optional in > compot-tde > >--- > twin/compton-tde/CMakeLists.txt | 15 ++++++---- > twin/compton-tde/common.h | 7 ++++- > twin/compton-tde/compton.c | 51 ++++++++++++++++++++++++++------- > twin/compton-tde/compton_config.h.cmake | 2 ++ > 4 files changed, 57 insertions(+), 18 deletions(-) > >diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt >index e7a5e8a..4c7fc53 100644 >--- a/twin/compton-tde/CMakeLists.txt >+++ b/twin/compton-tde/CMakeLists.txt >@@ -12,8 +12,6 @@ > > if( NOT WITH_XRENDER ) > tde_message_fatal( "xrender support is needed to build compton-tde.\n Pass -DWITH_XRENDER=ON to cmake arguments." ) >-elseif( NOT WITH_XRANDR ) >- tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." ) > elseif( NOT WITH_XFIXES ) > tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." ) > endif( ) >@@ -28,7 +26,8 @@ include_directories( > ##### compton-tde (executable) ################### > > # TDE to compton config option map >-# WITH_XINNERAMA -> CONFIG_XINERAMA >+# WITH_XINNERAMA -> CONFIG_XINERAMA >+# WITH_XRANDR -> CONFIG_XANDR > # WITH_OPENGL -> CONFIG_VSYNC_OPENGL > # WITH_OPENGL -> CONFIG_VSYNC_OPENGL_GLSL > # WITH_OPENGL -> CONFIG_VSYNC_OPENGL_FBO >@@ -68,6 +67,11 @@ if( WITH_XINERAMA ) > list( APPEND compton_LIBRARIES ${XINERAMA_LIBRARIES} ) > endif( ) > >+if( WITH_XRANDR ) >+ set( CONFIG_XRANDR ${WITH_XRANDR} ) >+ list( APPEND compton_LIBRARIES ${XRANDR_LIBRARIES} ) >+endif( ) >+ > if( WITH_PCRE ) > set( CONFIG_REGEX_PCRE ${WITH_PCRE} ) > set( CONFIG_REGEX_PCRE_JIT ${WITH_PCRE} ) >@@ -82,8 +86,7 @@ list( APPEND compton_LIBRARIES ${DBUS_LIBRARIES} ) > > tde_add_executable( compton-tde > SOURCES ${compton_SRCS} >- LINK m ${compton_LIBRARIES} ${XRENDER_LIBRARIES} >- ${XRANDR_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} >- ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES} >+ LINK m ${compton_LIBRARIES} ${XRENDER_LIBRARIES} ${XFIXES_LIBRARIES} >+ ${XDAMAGE_LIBRARIES} ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES} > DESTINATION ${BIN_INSTALL_DIR} > ) >diff --git a/twin/compton-tde/common.h b/twin/compton-tde/common.h >index 44be226..6f61e78 100644 >--- a/twin/compton-tde/common.h >+++ b/twin/compton-tde/common.h >@@ -106,12 +106,15 @@ > #include <X11/extensions/Xdamage.h> > #include <X11/extensions/Xrender.h> > #include <X11/extensions/shape.h> >-#include <X11/extensions/Xrandr.h> > #include <X11/extensions/Xdbe.h> > #ifdef CONFIG_XSYNC > #include <X11/extensions/sync.h> > #endif > >+#ifdef CONFIG_XRANDR >+#include <X11/extensions/Xrandr.h> >+#endif >+ > #ifdef CONFIG_XINERAMA > #include <X11/extensions/Xinerama.h> > #endif >@@ -921,12 +924,14 @@ typedef struct _session_t { > int shape_event; > /// Error base number for X Shape extension. > int shape_error; >+#ifdef CONFIG_XRANDR > /// 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; >+#endif // CONFIG_XRANDR > #ifdef CONFIG_VSYNC_OPENGL > /// Whether X GLX extension exists. > bool glx_exists; >diff --git a/twin/compton-tde/compton.c b/twin/compton-tde/compton.c >index 123703a..50b2005 100644 >--- a/twin/compton-tde/compton.c >+++ b/twin/compton-tde/compton.c >@@ -4543,6 +4543,7 @@ ev_shape_notify(session_t *ps, XShapeEvent *ev) { > update_reg_ignore_expire(ps, w); > } > >+#ifdef CONFIG_XRANDR > /** > * Handle ScreenChangeNotify events from X RandR extension. > */ >@@ -4561,6 +4562,7 @@ ev_screen_change_notify(session_t *ps, > } > } > } >+#endif // CONFIG_XRANDR > > #if defined(DEBUG_EVENTS) || defined(DEBUG_RESTACK) > /** >@@ -4659,10 +4661,12 @@ ev_handle(session_t *ps, XEvent *ev) { > ev_shape_notify(ps, (XShapeEvent *) ev); > break; > } >+#ifdef CONFIG_XRANDR > if (ps->randr_exists && ev->type == (ps->randr_event + RRScreenChangeNotify)) { > ev_screen_change_notify(ps, (XRRScreenChangeNotifyEvent *) ev); > break; > } >+#endif // CONFIG_XRANDR > if (isdamagenotify(ps, ev)) { > ev_damage_notify(ps, (XDamageNotifyEvent *) ev); > break; >@@ -4762,9 +4766,14 @@ usage(int ret) { > " Detect _NET_WM_OPACITY on client windows, useful for window\n" > " managers not passing _NET_WM_OPACITY of client windows to frame\n" > " windows.\n" >+#ifndef CONFIG_XRANDR >+#define WARNING " (AUTODETECTION DISABLED AT COMPILE TIME)" >+#else >+#define WARNING >+#endif > "--refresh-rate val\n" > " Specify refresh rate of the screen. If not specified or 0, compton\n" >- " will try detecting this with X RandR extension.\n" >+ " will try detecting this with X RandR extension."WARNING"\n" > "--vsync vsync-method\n" > " Set VSync method. There are up to 4 VSync methods currently available.\n" > " none = No VSync\n" >@@ -6259,24 +6268,26 @@ init_atoms(session_t *ps) { > ps->atom_win_type_tde_transparent_to_desktop = get_atom(ps, "_TDE_TRANSPARENT_TO_DESKTOP"); > } > >+#ifdef CONFIG_XRANDR > /** > * Update refresh rate info with X Randr extension. > */ > static void > update_refresh_rate(session_t *ps) { > XRRScreenConfiguration* randr_info; >- >+ > if (!(randr_info = XRRGetScreenInfo(ps->dpy, ps->root))) > return; > ps->refresh_rate = XRRConfigCurrentRate(randr_info); >- >+ > XRRFreeScreenConfigInfo(randr_info); >- >+ > if (ps->refresh_rate) > ps->refresh_intv = US_PER_SEC / ps->refresh_rate; > else > ps->refresh_intv = 0; > } >+#endif // CONFIG_XRANDR > > /** > * Initialize refresh-rated based software optimization. >@@ -6291,10 +6302,12 @@ swopti_init(session_t *ps) { > if (ps->refresh_rate) > ps->refresh_intv = US_PER_SEC / ps->refresh_rate; > >+#ifdef CONFIG_XRANDR > // Auto-detect refresh rate otherwise > if (!ps->refresh_rate && ps->randr_exists) { > update_refresh_rate(ps); > } >+#endif // CONFIG_XRANDR > > // Turn off vsync_sw if we can't get the refresh rate > if (!ps->refresh_rate) >@@ -7196,9 +7209,11 @@ session_init(session_t *ps_old, int argc, char **argv) { > .shape_exists = false, > .shape_event = 0, > .shape_error = 0, >+#ifdef CONFIG_XRANDR > .randr_exists = 0, > .randr_event = 0, > .randr_error = 0, >+#endif // CONFIG_XRANDR > #ifdef CONFIG_VSYNC_OPENGL > .glx_exists = false, > .glx_event = 0, >@@ -7371,11 +7386,15 @@ session_init(session_t *ps_old, int argc, char **argv) { > > // Query X RandR > if ((ps->o.sw_opti && !ps->o.refresh_rate) || ps->o.xinerama_shadow_crop) { >- if (XRRQueryExtension(ps->dpy, &ps->randr_event, &ps->randr_error)) >- ps->randr_exists = true; >- else >- printf_errf("(): No XRandR extension, automatic screen change " >- "detection impossible."); >+#ifdef CONFIG_XRANDR >+ if (XRRQueryExtension(ps->dpy, &ps->randr_event, &ps->randr_error)) >+ ps->randr_exists = true; >+ else >+ printf_errf("(): No XRandR extension, automatic screen change " >+ "detection impossible."); >+#else // CONFIG_XRANDR >+ printf_errf("(): Xrandr support not compiled in."); >+#endif // CONFIG_XRANDR > } > > // Query X DBE extension >@@ -7435,11 +7454,21 @@ session_init(session_t *ps_old, int argc, char **argv) { > if (ps->o.sw_opti) > ps->o.sw_opti = swopti_init(ps); > >+#ifdef CONFIG_XRANDR > // Monitor screen changes if vsync_sw is enabled and we are using > // an auto-detected refresh rate, or when Xinerama features are enabled > if (ps->randr_exists && ((ps->o.sw_opti && !ps->o.refresh_rate) >- || ps->o.xinerama_shadow_crop)) >- XRRSelectInput(ps->dpy, ps->root, RRScreenChangeNotifyMask); >+ || ps->o.xinerama_shadow_crop)) >+ XRRSelectInput(ps->dpy, ps->root, RRScreenChangeNotifyMask); >+#else >+ if( (ps->o.sw_opti && !ps->o.refresh_rate) ) { >+ printf_errf("(): Xrandr support not compiled in. Plese specify --refrash-rate manually"); >+ } >+ if (ps->o.xinerama_shadow_crop) { >+ printf_errf("(): due to Xrandr support not compiled in." >+ " Xinerama features may malfunction on changing screen size."); >+ } >+#endif // CONFIG_XRANDR > > // Initialize VSync > if (!vsync_init(ps)) >diff --git a/twin/compton-tde/compton_config.h.cmake b/twin/compton-tde/compton_config.h.cmake >index 06db4ca..a77d93b 100644 >--- a/twin/compton-tde/compton_config.h.cmake >+++ b/twin/compton-tde/compton_config.h.cmake >@@ -32,5 +32,7 @@ > // Whether to enable GLX Sync support. > #cmakedefine CONFIG_GLX_XSYNC 1 > >+// Whether to enable Xranr support >+#cmakedefine CONFIG_XRANDR 1 > // Whether to enable Xinerama support > #cmakedefine CONFIG_XINERAMA 1 >-- >1.8.3.2 > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]