[gtk+] gdk: Get rid of GdkCursorType
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Get rid of GdkCursorType
- Date: Fri, 3 Nov 2017 23:25:40 +0000 (UTC)
commit a1759a0a52d4b6b988fcafbf30f9fd0b61c06030
Author: Benjamin Otte <otte redhat com>
Date: Thu Nov 2 18:52:35 2017 +0100
gdk: Get rid of GdkCursorType
Now that we no longer have API that uses cursor types, don't keep them
around.
docs/reference/gdk/gdk4-sections.txt | 1 -
gdk/broadway/gdkcursor-broadway.c | 2 -
gdk/gdkcursor.c | 15 ---
gdk/gdkcursor.h | 176 ----------------------------------
gdk/gdkcursorprivate.h | 1 -
gdk/wayland/gdkcursor-wayland.c | 2 -
gdk/win32/gdkcursor-win32.c | 1 -
gdk/x11/gdkcursor-x11.c | 41 ++------
8 files changed, 9 insertions(+), 230 deletions(-)
---
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 3b0cc41..99e8149 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -809,7 +809,6 @@ gdk_owner_change_get_type
<TITLE>Cursors</TITLE>
<FILE>cursors</FILE>
GdkCursor
-GdkCursorType
gdk_cursor_new_from_pixbuf
gdk_cursor_new_from_surface
gdk_cursor_new_from_name
diff --git a/gdk/broadway/gdkcursor-broadway.c b/gdk/broadway/gdkcursor-broadway.c
index e870a24..02e8782 100644
--- a/gdk/broadway/gdkcursor-broadway.c
+++ b/gdk/broadway/gdkcursor-broadway.c
@@ -111,7 +111,6 @@ _gdk_broadway_display_get_cursor_for_surface (GdkDisplay *display,
GdkCursor *cursor;
private = g_object_new (GDK_TYPE_BROADWAY_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
cursor = (GdkCursor *) private;
@@ -126,7 +125,6 @@ _gdk_broadway_display_get_cursor_for_name (GdkDisplay *display,
GdkBroadwayCursor *private;
private = g_object_new (GDK_TYPE_BROADWAY_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 1110efd..4c85588 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -65,7 +65,6 @@
enum {
PROP_0,
- PROP_CURSOR_TYPE,
PROP_DISPLAY
};
@@ -81,9 +80,6 @@ gdk_cursor_get_property (GObject *object,
switch (prop_id)
{
- case PROP_CURSOR_TYPE:
- g_value_set_enum (value, cursor->type);
- break;
case PROP_DISPLAY:
g_value_set_object (value, cursor->display);
break;
@@ -103,9 +99,6 @@ gdk_cursor_set_property (GObject *object,
switch (prop_id)
{
- case PROP_CURSOR_TYPE:
- cursor->type = g_value_get_enum (value);
- break;
case PROP_DISPLAY:
cursor->display = g_value_get_object (value);
/* check that implementations actually provide the display when constructing */
@@ -126,14 +119,6 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
object_class->set_property = gdk_cursor_set_property;
g_object_class_install_property (object_class,
- PROP_CURSOR_TYPE,
- g_param_spec_enum ("cursor-type",
- P_("Cursor type"),
- P_("Standard cursor type"),
- GDK_TYPE_CURSOR_TYPE, GDK_X_CURSOR,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
PROP_DISPLAY,
g_param_spec_object ("display",
P_("Display"),
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 74abbe9..94c09bf 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -39,182 +39,6 @@ G_BEGIN_DECLS
#define GDK_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_CURSOR, GdkCursor))
#define GDK_IS_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR))
-
-/**
- * GdkCursorType:
- * @GDK_X_CURSOR: 
- * @GDK_ARROW: 
- * @GDK_BASED_ARROW_DOWN: 
- * @GDK_BASED_ARROW_UP: 
- * @GDK_BOAT: 
- * @GDK_BOGOSITY: 
- * @GDK_BOTTOM_LEFT_CORNER: 
- * @GDK_BOTTOM_RIGHT_CORNER: 
- * @GDK_BOTTOM_SIDE: 
- * @GDK_BOTTOM_TEE: 
- * @GDK_BOX_SPIRAL: 
- * @GDK_CENTER_PTR: 
- * @GDK_CIRCLE: 
- * @GDK_CLOCK: 
- * @GDK_COFFEE_MUG: 
- * @GDK_CROSS: 
- * @GDK_CROSS_REVERSE: 
- * @GDK_CROSSHAIR: 
- * @GDK_DIAMOND_CROSS: 
- * @GDK_DOT: 
- * @GDK_DOTBOX: 
- * @GDK_DOUBLE_ARROW: 
- * @GDK_DRAFT_LARGE: 
- * @GDK_DRAFT_SMALL: 
- * @GDK_DRAPED_BOX: 
- * @GDK_EXCHANGE: 
- * @GDK_FLEUR: 
- * @GDK_GOBBLER: 
- * @GDK_GUMBY: 
- * @GDK_HAND1: 
- * @GDK_HAND2: 
- * @GDK_HEART: 
- * @GDK_ICON: 
- * @GDK_IRON_CROSS: 
- * @GDK_LEFT_PTR: 
- * @GDK_LEFT_SIDE: 
- * @GDK_LEFT_TEE: 
- * @GDK_LEFTBUTTON: 
- * @GDK_LL_ANGLE: 
- * @GDK_LR_ANGLE: 
- * @GDK_MAN: 
- * @GDK_MIDDLEBUTTON: 
- * @GDK_MOUSE: 
- * @GDK_PENCIL: 
- * @GDK_PIRATE: 
- * @GDK_PLUS: 
- * @GDK_QUESTION_ARROW: 
- * @GDK_RIGHT_PTR: 
- * @GDK_RIGHT_SIDE: 
- * @GDK_RIGHT_TEE: 
- * @GDK_RIGHTBUTTON: 
- * @GDK_RTL_LOGO: 
- * @GDK_SAILBOAT: 
- * @GDK_SB_DOWN_ARROW: 
- * @GDK_SB_H_DOUBLE_ARROW: 
- * @GDK_SB_LEFT_ARROW: 
- * @GDK_SB_RIGHT_ARROW: 
- * @GDK_SB_UP_ARROW: 
- * @GDK_SB_V_DOUBLE_ARROW: 
- * @GDK_SHUTTLE: 
- * @GDK_SIZING: 
- * @GDK_SPIDER: 
- * @GDK_SPRAYCAN: 
- * @GDK_STAR: 
- * @GDK_TARGET: 
- * @GDK_TCROSS: 
- * @GDK_TOP_LEFT_ARROW: 
- * @GDK_TOP_LEFT_CORNER: 
- * @GDK_TOP_RIGHT_CORNER: 
- * @GDK_TOP_SIDE: 
- * @GDK_TOP_TEE: 
- * @GDK_TREK: 
- * @GDK_UL_ANGLE: 
- * @GDK_UMBRELLA: 
- * @GDK_UR_ANGLE: 
- * @GDK_WATCH: 
- * @GDK_XTERM: 
- * @GDK_LAST_CURSOR: last cursor type
- * @GDK_BLANK_CURSOR: Blank cursor. Since 2.16
- * @GDK_CURSOR_IS_PIXMAP: type of cursors constructed with
- * gdk_cursor_new_from_pixbuf()
- *
- * Predefined cursors.
- *
- * Note that these IDs are directly taken from the X cursor font, and many
- * of these cursors are either not useful, or are not available on other platforms.
- *
- * The recommended way to create cursors is to use gdk_cursor_new_from_name().
- */
-typedef enum
-{
- GDK_X_CURSOR = 0,
- GDK_ARROW = 2,
- GDK_BASED_ARROW_DOWN = 4,
- GDK_BASED_ARROW_UP = 6,
- GDK_BOAT = 8,
- GDK_BOGOSITY = 10,
- GDK_BOTTOM_LEFT_CORNER = 12,
- GDK_BOTTOM_RIGHT_CORNER = 14,
- GDK_BOTTOM_SIDE = 16,
- GDK_BOTTOM_TEE = 18,
- GDK_BOX_SPIRAL = 20,
- GDK_CENTER_PTR = 22,
- GDK_CIRCLE = 24,
- GDK_CLOCK = 26,
- GDK_COFFEE_MUG = 28,
- GDK_CROSS = 30,
- GDK_CROSS_REVERSE = 32,
- GDK_CROSSHAIR = 34,
- GDK_DIAMOND_CROSS = 36,
- GDK_DOT = 38,
- GDK_DOTBOX = 40,
- GDK_DOUBLE_ARROW = 42,
- GDK_DRAFT_LARGE = 44,
- GDK_DRAFT_SMALL = 46,
- GDK_DRAPED_BOX = 48,
- GDK_EXCHANGE = 50,
- GDK_FLEUR = 52,
- GDK_GOBBLER = 54,
- GDK_GUMBY = 56,
- GDK_HAND1 = 58,
- GDK_HAND2 = 60,
- GDK_HEART = 62,
- GDK_ICON = 64,
- GDK_IRON_CROSS = 66,
- GDK_LEFT_PTR = 68,
- GDK_LEFT_SIDE = 70,
- GDK_LEFT_TEE = 72,
- GDK_LEFTBUTTON = 74,
- GDK_LL_ANGLE = 76,
- GDK_LR_ANGLE = 78,
- GDK_MAN = 80,
- GDK_MIDDLEBUTTON = 82,
- GDK_MOUSE = 84,
- GDK_PENCIL = 86,
- GDK_PIRATE = 88,
- GDK_PLUS = 90,
- GDK_QUESTION_ARROW = 92,
- GDK_RIGHT_PTR = 94,
- GDK_RIGHT_SIDE = 96,
- GDK_RIGHT_TEE = 98,
- GDK_RIGHTBUTTON = 100,
- GDK_RTL_LOGO = 102,
- GDK_SAILBOAT = 104,
- GDK_SB_DOWN_ARROW = 106,
- GDK_SB_H_DOUBLE_ARROW = 108,
- GDK_SB_LEFT_ARROW = 110,
- GDK_SB_RIGHT_ARROW = 112,
- GDK_SB_UP_ARROW = 114,
- GDK_SB_V_DOUBLE_ARROW = 116,
- GDK_SHUTTLE = 118,
- GDK_SIZING = 120,
- GDK_SPIDER = 122,
- GDK_SPRAYCAN = 124,
- GDK_STAR = 126,
- GDK_TARGET = 128,
- GDK_TCROSS = 130,
- GDK_TOP_LEFT_ARROW = 132,
- GDK_TOP_LEFT_CORNER = 134,
- GDK_TOP_RIGHT_CORNER = 136,
- GDK_TOP_SIDE = 138,
- GDK_TOP_TEE = 140,
- GDK_TREK = 142,
- GDK_UL_ANGLE = 144,
- GDK_UMBRELLA = 146,
- GDK_UR_ANGLE = 148,
- GDK_WATCH = 150,
- GDK_XTERM = 152,
- GDK_LAST_CURSOR,
- GDK_BLANK_CURSOR = -2,
- GDK_CURSOR_IS_PIXMAP = -1
-} GdkCursorType;
-
/* Cursors
*/
diff --git a/gdk/gdkcursorprivate.h b/gdk/gdkcursorprivate.h
index 15dbe03..85498a6 100644
--- a/gdk/gdkcursorprivate.h
+++ b/gdk/gdkcursorprivate.h
@@ -40,7 +40,6 @@ struct _GdkCursor
GObject parent_instance;
GdkDisplay *display;
- GdkCursorType type;
};
struct _GdkCursorClass
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index 33aa8ef..060b54a 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -346,7 +346,6 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display,
return GDK_CURSOR (g_object_ref (private));
private = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
@@ -407,7 +406,6 @@ _gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display,
cairo_t *cr;
cursor = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display_wayland,
NULL);
cursor->name = NULL;
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index 4b6dfcb..99a3e6d 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -539,7 +539,6 @@ cursor_new_from_hcursor (GdkDisplay *display,
GdkCursor *cursor;
private = g_object_new (GDK_TYPE_WIN32_CURSOR,
- "cursor-type", cursor_type,
"display", display,
NULL);
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 488854c..7fc1c5d 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -72,7 +72,6 @@ static GSList* cursor_cache = NULL;
struct cursor_cache_key
{
GdkDisplay* display;
- GdkCursorType type;
const char* name;
};
@@ -98,33 +97,25 @@ cache_compare_func (gconstpointer listelem,
GdkX11Cursor* cursor = (GdkX11Cursor*)listelem;
struct cursor_cache_key* key = (struct cursor_cache_key*)target;
- if ((cursor->cursor.type != key->type) ||
- (gdk_cursor_get_display (GDK_CURSOR (cursor)) != key->display))
+ if (gdk_cursor_get_display (GDK_CURSOR (cursor)) != key->display)
return 1; /* No match */
/* Elements marked as pixmap must be named cursors
* (since we don't store normal pixmap cursors
*/
- if (key->type == GDK_CURSOR_IS_PIXMAP)
- return strcmp (key->name, cursor->name);
-
- return 0; /* Match */
+ return strcmp (key->name, cursor->name);
}
/* Returns the cursor if there is a match, NULL if not
- * For named cursors type shall be GDK_CURSOR_IS_PIXMAP
- * For unnamed, typed cursors, name shall be NULL
*/
static GdkX11Cursor*
find_in_cache (GdkDisplay *display,
- GdkCursorType type,
const char *name)
{
GSList* res;
struct cursor_cache_key key;
key.display = display;
- key.type = type;
key.name = name;
res = g_slist_find_custom (cursor_cache, &key, cache_compare_func);
@@ -279,7 +270,7 @@ gdk_x11_cursor_get_surface (GdkCursor *cursor,
GdkDisplay *display;
Display *xdisplay;
GdkX11Cursor *private;
- XcursorImages *images = NULL;
+ XcursorImages *images;
XcursorImage *image;
gint size;
cairo_surface_t *surface;
@@ -294,13 +285,10 @@ gdk_x11_cursor_get_surface (GdkCursor *cursor,
size = XcursorGetDefaultSize (xdisplay);
theme = XcursorGetTheme (xdisplay);
- if (cursor->type == GDK_CURSOR_IS_PIXMAP)
- {
- if (private->name)
- images = XcursorLibraryLoadImages (private->name, theme, size);
- }
+ if (private->name)
+ images = XcursorLibraryLoadImages (private->name, theme, size);
else
- images = XcursorShapeLoadImages (cursor->type, theme, size);
+ images = NULL;
if (!images)
return NULL;
@@ -355,16 +343,8 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor)
if (private->xcursor != None)
{
- if (cursor->type == GDK_BLANK_CURSOR)
- return;
-
- if (cursor->type == GDK_CURSOR_IS_PIXMAP)
- {
- if (private->name)
- new_cursor = XcursorLibraryLoadCursor (xdisplay, private->name);
- }
- else
- new_cursor = XcursorShapeLoadCursor (xdisplay, cursor->type);
+ if (private->name)
+ new_cursor = XcursorLibraryLoadCursor (xdisplay, private->name);
if (new_cursor != None)
{
@@ -549,7 +529,6 @@ _gdk_x11_display_get_cursor_for_surface (GdkDisplay *display,
}
private = g_object_new (GDK_TYPE_X11_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
private->xcursor = xcursor;
@@ -632,7 +611,7 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay *display,
}
else
{
- private = find_in_cache (display, GDK_CURSOR_IS_PIXMAP, name);
+ private = find_in_cache (display, name);
if (private)
{
@@ -664,7 +643,6 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay *display,
}
private = g_object_new (GDK_TYPE_X11_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
private->xcursor = xcursor;
@@ -728,7 +706,6 @@ gdk_cursor_new_from_pixmap (GdkDisplay *display,
xcursor = XCreatePixmapCursor (GDK_DISPLAY_XDISPLAY (display),
source_pixmap, mask_pixmap, &xfg, &xbg, x, y);
private = g_object_new (GDK_TYPE_X11_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
"display", display,
NULL);
private->xcursor = xcursor;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
