diff options
| author | Alberts Muktupāvels <[email protected]> | 2015-07-21 03:08:45 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-14 18:55:52 +0200 |
| commit | 4f9d40353e3b8c6c99aca3866a3686a8835f6551 (patch) | |
| tree | d4d7d042bc7cfbc3a9a158767afcd7ff6f81d0ae /src/core | |
| parent | 49d830417d9ef75241eb63d6d08a51603cfda18f (diff) | |
| download | marco-4f9d40353e3b8c6c99aca3866a3686a8835f6551.tar.bz2 marco-4f9d40353e3b8c6c99aca3866a3686a8835f6551.tar.xz | |
bump xcomposite required version to 0.3 and simplify code
Version 0.3 is available more then 8 years.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/display-private.h | 2 | ||||
| -rw-r--r-- | src/core/display.c | 28 |
2 files changed, 9 insertions, 21 deletions
diff --git a/src/core/display-private.h b/src/core/display-private.h index f204af0f..069e0ccf 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -276,8 +276,6 @@ struct _MetaDisplay { #ifdef HAVE_COMPOSITE_EXTENSIONS int composite_event_base; int composite_error_base; - int composite_major_version; - int composite_minor_version; int damage_event_base; int damage_error_base; int xfixes_event_base; diff --git a/src/core/display.c b/src/core/display.c index bcb262af..caa76247 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -558,6 +558,9 @@ meta_display_open (void) #ifdef HAVE_COMPOSITE_EXTENSIONS { + int composite_major_version = 0; + int composite_minor_version = 0; + the_display->have_composite = FALSE; the_display->composite_error_base = 0; @@ -572,18 +575,16 @@ meta_display_open (void) } else { - the_display->composite_major_version = 0; - the_display->composite_minor_version = 0; if (XCompositeQueryVersion (the_display->xdisplay, - &the_display->composite_major_version, - &the_display->composite_minor_version)) + &composite_major_version, + &composite_minor_version)) { the_display->have_composite = TRUE; } else { - the_display->composite_major_version = 0; - the_display->composite_minor_version = 0; + composite_major_version = 0; + composite_minor_version = 0; } } @@ -591,8 +592,8 @@ meta_display_open (void) "extn ver %d %d\n", the_display->composite_error_base, the_display->composite_event_base, - the_display->composite_major_version, - the_display->composite_minor_version); + composite_major_version, + composite_minor_version); the_display->have_damage = FALSE; @@ -5389,17 +5390,6 @@ meta_display_remove_autoraise_callback (MetaDisplay *display) } } -#ifdef HAVE_COMPOSITE_EXTENSIONS -void -meta_display_get_compositor_version (MetaDisplay *display, - int *major, - int *minor) -{ - *major = display->composite_major_version; - *minor = display->composite_minor_version; -} -#endif - Display * meta_display_get_xdisplay (MetaDisplay *display) { |