diff options
Diffstat (limited to 'src/backends/x11/cm')
| -rw-r--r-- | src/backends/x11/cm/meta-backend-x11-cm.c | 41 | ||||
| -rw-r--r-- | src/backends/x11/cm/meta-cursor-sprite-xfixes.c | 22 |
2 files changed, 36 insertions, 27 deletions
diff --git a/src/backends/x11/cm/meta-backend-x11-cm.c b/src/backends/x11/cm/meta-backend-x11-cm.c index 1e377220b..374608cf9 100644 --- a/src/backends/x11/cm/meta-backend-x11-cm.c +++ b/src/backends/x11/cm/meta-backend-x11-cm.c @@ -53,7 +53,10 @@ take_touch_grab (MetaBackend *backend) MetaBackendX11 *x11 = META_BACKEND_X11 (backend); Display *xdisplay = meta_backend_x11_get_xdisplay (x11); unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 }; - XIEventMask mask = { META_VIRTUAL_CORE_POINTER_ID, sizeof (mask_bits), mask_bits }; + XIEventMask mask = + { + META_VIRTUAL_CORE_POINTER_ID, sizeof (mask_bits), mask_bits + }; XIGrabModifiers mods = { XIAnyModifier, 0 }; XISetMask (mask.mask, XI_TouchBegin); @@ -154,12 +157,12 @@ meta_backend_x11_cm_select_stage_events (MetaBackend *backend) } static void -get_xkbrf_var_defs (Display *xdisplay, - const char *layouts, - const char *variants, - const char *options, - char **rules_p, - XkbRF_VarDefsRec *var_defs) +get_xkbrf_var_defs (Display *xdisplay, + const char *layouts, + const char *variants, + const char *options, + char **rules_p, + XkbRF_VarDefsRec *var_defs) { char *rules = NULL; @@ -182,7 +185,7 @@ get_xkbrf_var_defs (Display *xdisplay, var_defs->options = strdup (options); /* Sometimes, the property is a file path, and sometimes it's - not. Normalize it so it's always a file path. */ + * not. Normalize it so it's always a file path. */ if (rules[0] == '/') *rules_p = g_strdup (rules); else @@ -270,7 +273,8 @@ apply_keymap (MetaBackendX11 *x11) XkbComponentNamesRec xkb_comp_names = { 0 }; XkbRF_GetComponents (xkb_rules, &xkb_var_defs, &xkb_comp_names); - upload_xkb_description (xdisplay, rules_file_path, &xkb_var_defs, &xkb_comp_names); + upload_xkb_description (xdisplay, rules_file_path, &xkb_var_defs, + &xkb_comp_names); free_xkb_component_names (&xkb_comp_names); XkbRF_Free (xkb_rules, True); @@ -399,16 +403,21 @@ meta_backend_x11_cm_class_init (MetaBackendX11CmClass *klass) backend_class->post_init = meta_backend_x11_cm_post_init; backend_class->create_renderer = meta_backend_x11_cm_create_renderer; - backend_class->create_monitor_manager = meta_backend_x11_cm_create_monitor_manager; - backend_class->create_cursor_renderer = meta_backend_x11_cm_create_cursor_renderer; - backend_class->create_input_settings = meta_backend_x11_cm_create_input_settings; + backend_class->create_monitor_manager = + meta_backend_x11_cm_create_monitor_manager; + backend_class->create_cursor_renderer = + meta_backend_x11_cm_create_cursor_renderer; + backend_class->create_input_settings = + meta_backend_x11_cm_create_input_settings; backend_class->update_screen_size = meta_backend_x11_cm_update_screen_size; backend_class->select_stage_events = meta_backend_x11_cm_select_stage_events; backend_class->lock_layout_group = meta_backend_x11_cm_lock_layout_group; backend_class->set_keymap = meta_backend_x11_cm_set_keymap; - backend_x11_class->handle_host_xevent = meta_backend_x11_cm_handle_host_xevent; - backend_x11_class->translate_device_event = meta_backend_x11_cm_translate_device_event; - backend_x11_class->translate_crossing_event = meta_backend_x11_cm_translate_crossing_event; + backend_x11_class->handle_host_xevent = + meta_backend_x11_cm_handle_host_xevent; + backend_x11_class->translate_device_event = + meta_backend_x11_cm_translate_device_event; + backend_x11_class->translate_crossing_event = + meta_backend_x11_cm_translate_crossing_event; } - diff --git a/src/backends/x11/cm/meta-cursor-sprite-xfixes.c b/src/backends/x11/cm/meta-cursor-sprite-xfixes.c index 0c524668e..be98c5b6e 100644 --- a/src/backends/x11/cm/meta-cursor-sprite-xfixes.c +++ b/src/backends/x11/cm/meta-cursor-sprite-xfixes.c @@ -102,8 +102,8 @@ meta_cursor_sprite_xfixes_set_property (GObject *object, } MetaCursorSpriteXfixes * -meta_cursor_sprite_xfixes_new (MetaDisplay *display, - GError **error) +meta_cursor_sprite_xfixes_new (MetaDisplay *display, + GError **error) { return g_initable_new (META_TYPE_CURSOR_SPRITE_XFIXES, NULL, error, @@ -112,9 +112,9 @@ meta_cursor_sprite_xfixes_new (MetaDisplay *display, } static gboolean -meta_cursor_sprite_xfixes_initable_init (GInitable *initable, - GCancellable *cancellable, - GError **error) +meta_cursor_sprite_xfixes_initable_init (GInitable *initable, + GCancellable *cancellable, + GError **error) { MetaCursorSpriteXfixes *sprite_xfixes = META_CURSOR_SPRITE_XFIXES (initable); @@ -172,12 +172,12 @@ meta_cursor_sprite_xfixes_initable_init (GInitable *initable, clutter_backend = clutter_get_default_backend (); cogl_context = clutter_backend_get_cogl_context (clutter_backend); texture = cogl_texture_2d_new_from_data (cogl_context, - cursor_image->width, - cursor_image->height, - CLUTTER_CAIRO_FORMAT_ARGB32, - cursor_image->width * 4, /* stride */ - cursor_data, - error); + cursor_image->width, + cursor_image->height, + CLUTTER_CAIRO_FORMAT_ARGB32, + cursor_image->width * 4, /* stride */ + cursor_data, + error); if (free_cursor_data) g_free (cursor_data); |