isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-29 14:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

backends/cursor: Rename X11 cursor creation function

Browse Source 
It was prefixed with meta_cursor_, but it took a X11 Display, so update
the naming. Eventually it should be duplicated depending if it's a
frontend X11 connection call or a backend X11 connection call and moved
to the corresponding layers, but let's just do this minor cleanup for
now.

https://gitlab.gnome.org/GNOME/mutter/issues/77
This commit is contained in:
Jonas Ådahl 2018-04-27 15:39:29 +02:00
parent 10dfc67dad
commit 2fc978ca9d
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/meta-cursor.c
View File

@ -111,8 +111,8 @@ translate_meta_cursor (MetaCursor cursor)
} }
Cursor Cursor
meta_cursor_create_x_cursor (Display *xdisplay, meta_create_x_cursor (Display *xdisplay,
MetaCursor cursor) MetaCursor cursor)
{ {
return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor)); return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
} }

4
src/backends/meta-cursor.h
View File

@ -46,8 +46,8 @@ void meta_cursor_sprite_set_theme_scale (MetaCursorSprite *sprite,
MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *sprite); MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *sprite);
Cursor meta_cursor_create_x_cursor (Display *xdisplay, Cursor meta_create_x_cursor (Display *xdisplay,
MetaCursor cursor); MetaCursor cursor);
void meta_cursor_sprite_prepare_at (MetaCursorSprite *sprite, void meta_cursor_sprite_prepare_at (MetaCursorSprite *sprite,
int x, int x,

4
src/backends/x11/meta-cursor-renderer-x11.c
View File

@ -65,7 +65,9 @@ meta_cursor_renderer_x11_update_cursor (MetaCursorRenderer *renderer,
if (cursor != META_CURSOR_NONE) if (cursor != META_CURSOR_NONE)
{ {
Cursor xcursor = meta_cursor_create_x_cursor (xdisplay, cursor); Cursor xcursor;
xcursor = meta_create_x_cursor (xdisplay, cursor);
XDefineCursor (xdisplay, xwindow, xcursor); XDefineCursor (xdisplay, xwindow, xcursor);
XFlush (xdisplay); XFlush (xdisplay);
XFreeCursor (xdisplay, xcursor); XFreeCursor (xdisplay, xcursor);

2
src/core/display.c
View File

@ -3018,7 +3018,7 @@ Cursor
meta_display_create_x_cursor (MetaDisplay *display, meta_display_create_x_cursor (MetaDisplay *display,
MetaCursor cursor) MetaCursor cursor)
{ {
return meta_cursor_create_x_cursor (display->xdisplay, cursor); return meta_create_x_cursor (display->xdisplay, cursor);
} }
MetaGestureTracker * MetaGestureTracker *