* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include <string.h>
#include <errno.h>
-#define GDK_TYPE_X11_CURSOR (gdk_x11_cursor_get_type ())
-#define GDK_X11_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_CURSOR, GdkX11Cursor))
-#define GDK_X11_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_CURSOR, GdkX11CursorClass))
-#define GDK_IS_X11_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_CURSOR))
-#define GDK_IS_X11_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_CURSOR))
-#define GDK_X11_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_CURSOR, GdkX11CursorClass))
-
-typedef struct _GdkX11Cursor GdkX11Cursor;
-typedef struct _GdkX11CursorClass GdkX11CursorClass;
-
struct _GdkX11Cursor
{
GdkCursor cursor;
Cursor xcursor;
- GdkDisplay *display;
gchar *name;
guint serial;
};
struct cursor_cache_key* key = (struct cursor_cache_key*)target;
if ((cursor->cursor.type != key->type) ||
- (cursor->display != key->display))
+ (gdk_cursor_get_display (GDK_CURSOR (cursor)) != key->display))
return 1; /* No match */
/* Elements marked as pixmap must be named cursors
return NULL;
}
-/* Called by gdk_display_x11_finalize to flush any cached cursors
+/* Called by gdk_x11_display_finalize to flush any cached cursors
* for a dead display.
*/
-void
+void
_gdk_x11_cursor_display_finalize (GdkDisplay *display)
{
GSList* item;
while (item)
{
GdkX11Cursor* cursor = (GdkX11Cursor*)(item->data);
- if (cursor->display == display)
+ if (gdk_cursor_get_display (GDK_CURSOR (cursor)) == display)
{
GSList* olditem;
- gdk_cursor_unref ((GdkCursor*) cursor);
+ g_object_unref ((GdkCursor*) cursor);
/* Remove this item from the list */
*(itemp) = item->next;
olditem = item;
G_DEFINE_TYPE (GdkX11Cursor, gdk_x11_cursor, GDK_TYPE_CURSOR)
-void
+static GdkPixbuf* gdk_x11_cursor_get_image (GdkCursor *cursor);
+
+static void
gdk_x11_cursor_finalize (GObject *object)
{
GdkX11Cursor *private = GDK_X11_CURSOR (object);
+ GdkDisplay *display;
- if (private->xcursor && !gdk_display_is_closed (private->display))
- XFreeCursor (GDK_DISPLAY_XDISPLAY (private->display), private->xcursor);
+ display = gdk_cursor_get_display (GDK_CURSOR (object));
+ if (private->xcursor && !gdk_display_is_closed (display))
+ XFreeCursor (GDK_DISPLAY_XDISPLAY (display), private->xcursor);
g_free (private->name);
}
static void
-gdk_x11_cursor_class_init (GdkX11CursorClass *cursor_class)
+gdk_x11_cursor_class_init (GdkX11CursorClass *xcursor_class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (cursor_class);
+ GdkCursorClass *cursor_class = GDK_CURSOR_CLASS (xcursor_class);
+ GObjectClass *object_class = G_OBJECT_CLASS (xcursor_class);
object_class->finalize = gdk_x11_cursor_finalize;
+
+ cursor_class->get_image = gdk_x11_cursor_get_image;
}
static void
}
private = g_object_new (GDK_TYPE_X11_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
+ "cursor-type", cursor_type,
+ "display", display,
NULL);
- private->display = display;
private->xcursor = xcursor;
private->name = NULL;
private->serial = theme_serial;
/**
* gdk_x11_cursor_get_xdisplay:
- * @cursor: a #GdkCursor.
+ * @cursor: (type GdkX11Cursor): a #GdkCursor.
*
* Returns the display of a #GdkCursor.
*
- * Return value: an Xlib <type>Display*</type>.
+ * Return value: (transfer none): an Xlib <type>Display*</type>.
**/
Display *
gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
{
g_return_val_if_fail (cursor != NULL, NULL);
- return GDK_DISPLAY_XDISPLAY(((GdkX11Cursor *)cursor)->display);
+ return GDK_DISPLAY_XDISPLAY (gdk_cursor_get_display (cursor));
}
/**
* gdk_x11_cursor_get_xcursor:
- * @cursor: a #GdkCursor.
+ * @cursor: (type GdkX11Cursor): a #GdkCursor.
*
* Returns the X cursor belonging to a #GdkCursor.
*
return ((GdkX11Cursor *)cursor)->xcursor;
}
-/**
- * gdk_cursor_get_display:
- * @cursor: a #GdkCursor.
- *
- * Returns the display on which the #GdkCursor is defined.
- *
- * Returns: (transfer none): the #GdkDisplay associated to @cursor
- *
- * Since: 2.2
- */
-
-GdkDisplay *
-gdk_cursor_get_display (GdkCursor *cursor)
-{
- g_return_val_if_fail (cursor != NULL, NULL);
-
- return ((GdkX11Cursor *)cursor)->display;
-}
-
#if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
-/**
- * gdk_cursor_get_image:
- * @cursor: a #GdkCursor
- *
- * Returns a #GdkPixbuf with the image used to display the cursor.
- *
- * Note that depending on the capabilities of the windowing system and
- * on the cursor, GDK may not be able to obtain the image data. In this
- * case, %NULL is returned.
- *
- * Returns: (transfer full): a #GdkPixbuf representing @cursor, or %NULL
- *
- * Since: 2.8
- */
-GdkPixbuf*
-gdk_cursor_get_image (GdkCursor *cursor)
+static GdkPixbuf*
+gdk_x11_cursor_get_image (GdkCursor *cursor)
{
Display *xdisplay;
GdkX11Cursor *private;
GdkPixbuf *pixbuf;
gchar *theme;
- g_return_val_if_fail (cursor != NULL, NULL);
-
- private = (GdkX11Cursor *) cursor;
+ private = GDK_X11_CURSOR (cursor);
- xdisplay = GDK_DISPLAY_XDISPLAY (private->display);
+ xdisplay = GDK_DISPLAY_XDISPLAY (gdk_cursor_get_display (cursor));
size = XcursorGetDefaultSize (xdisplay);
theme = XcursorGetTheme (xdisplay);
Display *xdisplay;
GdkX11Cursor *private;
Cursor new_cursor = None;
- GdkDisplayX11 *display_x11;
+ GdkX11Display *display_x11;
private = (GdkX11Cursor *) cursor;
- xdisplay = GDK_DISPLAY_XDISPLAY (private->display);
- display_x11 = GDK_DISPLAY_X11 (private->display);
+ display_x11 = GDK_X11_DISPLAY (gdk_cursor_get_display (cursor));
+ xdisplay = GDK_DISPLAY_XDISPLAY (display_x11);
if (!display_x11->have_xfixes)
return;
if (!cursor)
return;
-
+
_gdk_x11_cursor_update_theme (cursor);
}
/**
* gdk_x11_display_set_cursor_theme:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
* @theme: the name of the cursor theme to use, or %NULL to unset
- * a previously set value
+ * a previously set value
* @size: the cursor size to use, or 0 to keep the previous size
*
* Sets the cursor theme from which the images for cursor
- * should be taken.
- *
- * If the windowing system supports it, existing cursors created
- * with gdk_cursor_new(), gdk_cursor_new_for_display() and
- * gdk_cursor_new_for_name() are updated to reflect the theme
+ * should be taken.
+ *
+ * If the windowing system supports it, existing cursors created
+ * with gdk_cursor_new(), gdk_cursor_new_for_display() and
+ * gdk_cursor_new_for_name() are updated to reflect the theme
* change. Custom cursors constructed with
* gdk_cursor_new_from_pixbuf() will have to be handled
- * by the application (GTK+ applications can learn about
+ * by the application (GTK+ applications can learn about
* cursor theme changes by listening for change notification
* for the corresponding #GtkSetting).
*
const gchar *theme,
const gint size)
{
- GdkDisplayX11 *display_x11;
Display *xdisplay;
gchar *old_theme;
gint old_size;
g_return_if_fail (GDK_IS_DISPLAY (display));
- display_x11 = GDK_DISPLAY_X11 (display);
xdisplay = GDK_DISPLAY_XDISPLAY (display);
old_theme = XcursorGetTheme (xdisplay);
XcursorSetTheme (xdisplay, theme);
if (size > 0)
XcursorSetDefaultSize (xdisplay, size);
-
+
g_slist_foreach (cursor_cache, update_cursor, NULL);
}
#else
-GdkPixbuf*
-gdk_cursor_get_image (GdkCursor *cursor)
+static GdkPixbuf*
+gdk_x11_cursor_get_image (GdkCursor *cursor)
{
- g_return_val_if_fail (cursor != NULL, NULL);
-
return NULL;
}
private = g_object_new (GDK_TYPE_X11_CURSOR,
"cursor-type", GDK_CURSOR_IS_PIXMAP,
+ "display", display,
NULL);
- private->display = display;
private->xcursor = xcursor;
private->name = NULL;
private->serial = theme_serial;
private = g_object_new (GDK_TYPE_X11_CURSOR,
"cursor-type", GDK_CURSOR_IS_PIXMAP,
+ "display", display,
NULL);
- private->display = display;
private->xcursor = xcursor;
private->name = g_strdup (name);
private->serial = theme_serial;
gdk_cursor_new_from_pixmap (GdkDisplay *display,
Pixmap source_pixmap,
Pixmap mask_pixmap,
- const GdkColor *fg,
- const GdkColor *bg,
+ const GdkRGBA *fg,
+ const GdkRGBA *bg,
gint x,
gint y)
{
g_return_val_if_fail (fg != NULL, NULL);
g_return_val_if_fail (bg != NULL, NULL);
- xfg.pixel = fg->pixel;
- xfg.red = fg->red;
- xfg.blue = fg->blue;
- xfg.green = fg->green;
- xbg.pixel = bg->pixel;
- xbg.red = bg->red;
- xbg.blue = bg->blue;
- xbg.green = bg->green;
-
- if (gdk_display_is_closed (display->closed))
+ xfg.red = fg->red * 65535;
+ xfg.blue = fg->blue * 65535;
+ xfg.green = fg->green * 65535;
+
+ xbg.red = bg->red * 65535;
+ xbg.blue = bg->blue * 65535;
+ xbg.green = bg->green * 65535;
+
+ if (gdk_display_is_closed (display))
xcursor = None;
else
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->display = display;
private->xcursor = xcursor;
private->name = NULL;
private->serial = theme_serial;
cairo_surface_t *pixmap, *mask;
guint width, height, n_channels, rowstride, data_stride, i, j;
guint8 *data, *mask_data, *pixels;
- GdkColor fg = { 0, 0, 0, 0 };
- GdkColor bg = { 0, 0xffff, 0xffff, 0xffff };
+ GdkRGBA fg = { 0, 0, 0, 1 };
+ GdkRGBA bg = { 1, 1, 1, 1 };
GdkScreen *screen;
cairo_surface_t *image;
cairo_t *cr;
}
void
-_gdk_x11_display_get_default_cursor_size (GdkDisplay *display)
+_gdk_x11_display_get_default_cursor_size (GdkDisplay *display,
+ guint *width,
+ guint *height)
{
/* no idea, really */
- return 20;
+ *width = *height = 20;
+ return;
}
#endif
-
-/**
- * gdk_display_get_maximal_cursor_size:
- * @display: a #GdkDisplay
- * @width: (out): the return location for the maximal cursor width
- * @height: (out): the return location for the maximal cursor height
- *
- * Gets the maximal size to use for cursors on @display.
- *
- * Since: 2.4
- */
void
_gdk_x11_display_get_maximal_cursor_size (GdkDisplay *display,
guint *width,
projects / ~andy / gtk / blobdiff