isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 11:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Move composite version checks here

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-08-13 19:32:39 -04:00
parent 879407c10c
commit e935b52e51
3 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compositor/compositor.c
View File

@ -91,18 +91,6 @@ is_modal (MetaDisplay *display)
return display->grab_op == META_GRAB_OP_COMPOSITOR; return display->grab_op == META_GRAB_OP_COMPOSITOR;
} }
static inline gboolean
composite_at_least_version (MetaDisplay *display, int maj, int min)
{
static int major = -1;
static int minor = -1;
if (major == -1)
meta_display_get_compositor_version (display, &major, &minor);
return (major > maj || (major == maj && minor >= min));
}
static void sync_actor_stacking (MetaCompositor *compositor); static void sync_actor_stacking (MetaCompositor *compositor);
static void static void
@ -1197,11 +1185,7 @@ meta_compositor_new (MetaDisplay *display)
{ {
MetaCompositor *compositor; MetaCompositor *compositor;
if (!composite_at_least_version (display, 0, 3))
return NULL;
compositor = g_new0 (MetaCompositor, 1); compositor = g_new0 (MetaCompositor, 1);
compositor->display = display; compositor->display = display;
if (g_getenv("META_DISABLE_MIPMAPS")) if (g_getenv("META_DISABLE_MIPMAPS"))

19
src/core/display.c
View File

@ -415,11 +415,15 @@ enable_compositor (MetaDisplay *display)
return; return;
} }
if (!display->compositor) int version = (display->composite_major_version * 10) + display->composite_minor_version;
display->compositor = meta_compositor_new (display); if (version < 3)
{
meta_warning ("Your version of COMPOSITE is too old.");
return;
}
if (!display->compositor) if (!display->compositor)
return; display->compositor = meta_compositor_new (display);
meta_compositor_manage (display->compositor); meta_compositor_manage (display->compositor);
} }
@ -3095,15 +3099,6 @@ meta_display_modifiers_accelerator_activate (MetaDisplay *display)
return freeze; return freeze;
} }
void
meta_display_get_compositor_version (MetaDisplay *display,
int *major,
int *minor)
{
*major = display->composite_major_version;
*minor = display->composite_minor_version;
}
/** /**
* meta_display_get_xinput_opcode: (skip) * meta_display_get_xinput_opcode: (skip)
* @display: a #MetaDisplay * @display: a #MetaDisplay

3
src/meta/display.h
View File

@ -66,9 +66,6 @@ GType meta_display_get_type (void) G_GNUC_CONST;
#define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0) #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)
void meta_display_get_compositor_version (MetaDisplay *display,
int *major,
int *minor);
int meta_display_get_xinput_opcode (MetaDisplay *display); int meta_display_get_xinput_opcode (MetaDisplay *display);
gboolean meta_display_supports_extended_barriers (MetaDisplay *display); gboolean meta_display_supports_extended_barriers (MetaDisplay *display);
Display *meta_display_get_xdisplay (MetaDisplay *display); Display *meta_display_get_xdisplay (MetaDisplay *display);