isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic fixes

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-09-27 13:24:52 +01:00
parent 21a24c862e
commit a73f1e6768
1 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clutter/x11/clutter-backend-x11.c
View File

@ -340,11 +340,14 @@ _clutter_backend_x11_post_parse (ClutterBackend *backend,
GError **error) GError **error)
{ {
ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend); ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
ClutterSettings *settings;
Atom atoms[N_ATOM_NAMES];
double dpi;
if (_foreign_dpy) if (_foreign_dpy)
backend_x11->xdpy = _foreign_dpy; backend_x11->xdpy = _foreign_dpy;
/*
* Only open connection if not already set by prior call to /* Only open connection if not already set by prior call to
* clutter_x11_set_display() * clutter_x11_set_display()
*/ */
if (backend_x11->xdpy == NULL) if (backend_x11->xdpy == NULL)
@ -377,11 +380,6 @@ _clutter_backend_x11_post_parse (ClutterBackend *backend,
g_assert (backend_x11->xdpy != NULL); g_assert (backend_x11->xdpy != NULL);
{
ClutterSettings *settings;
Atom atoms[N_ATOM_NAMES];
double dpi;
CLUTTER_NOTE (BACKEND, "Getting the X screen"); CLUTTER_NOTE (BACKEND, "Getting the X screen");
settings = clutter_settings_get_default (); settings = clutter_settings_get_default ();
@ -448,7 +446,6 @@ _clutter_backend_x11_post_parse (ClutterBackend *backend,
backend_x11->atom_XEMBED_INFO = atoms[8]; backend_x11->atom_XEMBED_INFO = atoms[8];
backend_x11->atom_NET_WM_NAME = atoms[9]; backend_x11->atom_NET_WM_NAME = atoms[9];
backend_x11->atom_UTF8_STRING = atoms[10]; backend_x11->atom_UTF8_STRING = atoms[10];
}
g_free (clutter_display_name); g_free (clutter_display_name);
@ -548,7 +545,8 @@ clutter_backend_x11_dispose (GObject *gobject)
static ClutterFeatureFlags static ClutterFeatureFlags
clutter_backend_x11_get_features (ClutterBackend *backend) clutter_backend_x11_get_features (ClutterBackend *backend)
{ {
ClutterFeatureFlags flags = CLUTTER_FEATURE_STAGE_USER_RESIZE | CLUTTER_FEATURE_STAGE_CURSOR; ClutterFeatureFlags flags = CLUTTER_FEATURE_STAGE_USER_RESIZE
| CLUTTER_FEATURE_STAGE_CURSOR;
flags |= CLUTTER_BACKEND_CLASS (clutter_backend_x11_parent_class)->get_features (backend); flags |= CLUTTER_BACKEND_CLASS (clutter_backend_x11_parent_class)->get_features (backend);
@ -758,6 +756,7 @@ error:
if (onscreen_template != NULL) if (onscreen_template != NULL)
cogl_object_unref (onscreen_template); cogl_object_unref (onscreen_template);
if (swap_chain != NULL) if (swap_chain != NULL)
cogl_object_unref (swap_chain); cogl_object_unref (swap_chain);
@ -766,6 +765,7 @@ error:
cogl_object_unref (backend->cogl_renderer); cogl_object_unref (backend->cogl_renderer);
backend->cogl_renderer = NULL; backend->cogl_renderer = NULL;
} }
return FALSE; return FALSE;
} }
@ -783,10 +783,11 @@ clutter_backend_x11_create_stage (ClutterBackend *backend,
"wrapper", wrapper, "wrapper", wrapper,
NULL); NULL);
/* the X11 stage does event translation */
translator = CLUTTER_EVENT_TRANSLATOR (stage); translator = CLUTTER_EVENT_TRANSLATOR (stage);
_clutter_backend_add_event_translator (backend, translator); _clutter_backend_add_event_translator (backend, translator);
CLUTTER_NOTE (MISC, "Cogl stage created (display:%p, screen:%d, root:%u)", CLUTTER_NOTE (MISC, "X11 stage created (display:%p, screen:%d, root:%u)",
backend_x11->xdpy, backend_x11->xdpy,
backend_x11->xscreen_num, backend_x11->xscreen_num,
(unsigned int) backend_x11->xwin_root); (unsigned int) backend_x11->xwin_root);