* 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 <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkcursor.h"
-
+#include "gdkcursorprivate.h"
#include "gdkprivate-x11.h"
#include "gdkdisplay-x11.h"
-#include "gdkx.h"
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
#include <string.h>
#include <errno.h>
+struct _GdkX11Cursor
+{
+ GdkCursor cursor;
+
+ Cursor xcursor;
+ gchar *name;
+ guint serial;
+};
+
+struct _GdkX11CursorClass
+{
+ GdkCursorClass cursor_class;
+};
static guint theme_serial = 0;
* a non-NULL name.
*/
static void
-add_to_cache (GdkCursorPrivate* cursor)
+add_to_cache (GdkX11Cursor* cursor)
{
cursor_cache = g_slist_prepend (cursor_cache, cursor);
/* Take a ref so that if the caller frees it we still have it */
- gdk_cursor_ref ((GdkCursor*) cursor);
+ g_object_ref (cursor);
}
/* Returns 0 on a match
cache_compare_func (gconstpointer listelem,
gconstpointer target)
{
- GdkCursorPrivate* cursor = (GdkCursorPrivate*)listelem;
+ GdkX11Cursor* cursor = (GdkX11Cursor*)listelem;
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
* For named cursors type shall be GDK_CURSOR_IS_PIXMAP
* For unnamed, typed cursors, name shall be NULL
*/
-static GdkCursorPrivate*
+static GdkX11Cursor*
find_in_cache (GdkDisplay *display,
GdkCursorType type,
const char *name)
res = g_slist_find_custom (cursor_cache, &key, cache_compare_func);
if (res)
- return (GdkCursorPrivate *) res->data;
+ return (GdkX11Cursor *) res->data;
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;
itemp = &cursor_cache;
while (item)
{
- GdkCursorPrivate* cursor = (GdkCursorPrivate*)(item->data);
- if (cursor->display == display)
+ GdkX11Cursor* cursor = (GdkX11Cursor*)(item->data);
+ if (gdk_cursor_get_display (GDK_CURSOR (cursor)) == display)
{
- GSList* olditem;
- gdk_cursor_unref ((GdkCursor*) cursor);
- /* Remove this item from the list */
- *(itemp) = item->next;
- olditem = item;
- item = g_slist_next (item);
- g_slist_free_1 (olditem);
+ GSList* olditem;
+ g_object_unref ((GdkCursor*) cursor);
+ /* Remove this item from the list */
+ *(itemp) = item->next;
+ olditem = item;
+ item = g_slist_next (item);
+ g_slist_free_1 (olditem);
}
else
{
- itemp = &(item->next);
- item = g_slist_next (item);
- }
+ itemp = &(item->next);
+ item = g_slist_next (item);
+ }
}
}
+/*** GdkX11Cursor ***/
+
+G_DEFINE_TYPE (GdkX11Cursor, gdk_x11_cursor, GDK_TYPE_CURSOR)
+
+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;
+
+ 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);
+
+ G_OBJECT_CLASS (gdk_x11_cursor_parent_class)->finalize (object);
+}
+
+static void
+gdk_x11_cursor_class_init (GdkX11CursorClass *xcursor_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
+gdk_x11_cursor_init (GdkX11Cursor *cursor)
+{
+}
+
static Cursor
get_blank_cursor (GdkDisplay *display)
{
color.pixel = 0;
color.red = color.blue = color.green = 0;
-
- if (display->closed)
+
+ if (gdk_display_is_closed (display))
cursor = None;
else
cursor = XCreatePixmapCursor (GDK_DISPLAY_XDISPLAY (display),
return cursor;
}
-/**
- * gdk_cursor_new_for_display:
- * @display: the #GdkDisplay for which the cursor will be created
- * @cursor_type: cursor to create
- *
- * Creates a new cursor from the set of builtin cursors.
- * Some useful ones are:
- * <itemizedlist>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="right_ptr.png"></inlinegraphic> #GDK_RIGHT_PTR (right-facing arrow)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="crosshair.png"></inlinegraphic> #GDK_CROSSHAIR (crosshair)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic> #GDK_XTERM (I-beam)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic> #GDK_WATCH (busy)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="fleur.png"></inlinegraphic> #GDK_FLEUR (for moving objects)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="hand1.png"></inlinegraphic> #GDK_HAND1 (a right-pointing hand)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="hand2.png"></inlinegraphic> #GDK_HAND2 (a left-pointing hand)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="left_side.png"></inlinegraphic> #GDK_LEFT_SIDE (resize left side)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="right_side.png"></inlinegraphic> #GDK_RIGHT_SIDE (resize right side)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="top_left_corner.png"></inlinegraphic> #GDK_TOP_LEFT_CORNER (resize northwest corner)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="top_right_corner.png"></inlinegraphic> #GDK_TOP_RIGHT_CORNER (resize northeast corner)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="bottom_left_corner.png"></inlinegraphic> #GDK_BOTTOM_LEFT_CORNER (resize southwest corner)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="bottom_right_corner.png"></inlinegraphic> #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="top_side.png"></inlinegraphic> #GDK_TOP_SIDE (resize top side)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="bottom_side.png"></inlinegraphic> #GDK_BOTTOM_SIDE (resize bottom side)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"></inlinegraphic> #GDK_SB_H_DOUBLE_ARROW (move vertical splitter)
- * </para></listitem>
- * <listitem><para>
- * <inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"></inlinegraphic> #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter)
- * </para></listitem>
- * <listitem><para>
- * #GDK_BLANK_CURSOR (Blank cursor). Since 2.16
- * </para></listitem>
- * </itemizedlist>
- *
- * Return value: a new #GdkCursor
- *
- * Since: 2.2
- **/
GdkCursor*
-gdk_cursor_new_for_display (GdkDisplay *display,
- GdkCursorType cursor_type)
+_gdk_x11_display_get_cursor_for_type (GdkDisplay *display,
+ GdkCursorType cursor_type)
{
- GdkCursorPrivate *private;
- GdkCursor *cursor;
+ GdkX11Cursor *private;
Cursor xcursor;
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
- if (display->closed)
+ if (gdk_display_is_closed (display))
{
xcursor = None;
- }
- else
+ }
+ else
{
private = find_in_cache (display, cursor_type, NULL);
if (private)
{
/* Cache had it, add a ref for this user */
- gdk_cursor_ref ((GdkCursor*) private);
-
+ g_object_ref (private);
+
return (GdkCursor*) private;
- }
- else
+ }
+ else
{
- if (cursor_type != GDK_BLANK_CURSOR)
+ if (cursor_type != GDK_BLANK_CURSOR)
xcursor = XCreateFontCursor (GDK_DISPLAY_XDISPLAY (display),
cursor_type);
- else
- xcursor = get_blank_cursor (display);
+ else
+ xcursor = get_blank_cursor (display);
}
}
-
- private = g_new (GdkCursorPrivate, 1);
- private->display = display;
+
+ private = g_object_new (GDK_TYPE_X11_CURSOR,
+ "cursor-type", cursor_type,
+ "display", display,
+ NULL);
private->xcursor = xcursor;
private->name = NULL;
private->serial = theme_serial;
- cursor = (GdkCursor *) private;
- cursor->type = cursor_type;
- cursor->ref_count = 1;
-
if (xcursor != None)
add_to_cache (private);
- return cursor;
-}
-
-void
-_gdk_cursor_destroy (GdkCursor *cursor)
-{
- GdkCursorPrivate *private;
-
- g_return_if_fail (cursor != NULL);
- g_return_if_fail (cursor->ref_count == 0);
-
- private = (GdkCursorPrivate *) cursor;
- if (!private->display->closed && private->xcursor)
- XFreeCursor (GDK_DISPLAY_XDISPLAY (private->display), private->xcursor);
-
- g_free (private->name);
- g_free (private);
+ return GDK_CURSOR (private);
}
/**
* 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(((GdkCursorPrivate *)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.
*
{
g_return_val_if_fail (cursor != NULL, None);
- return ((GdkCursorPrivate *)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 ((GdkCursorPrivate *)cursor)->display;
+ return ((GdkX11Cursor *)cursor)->xcursor;
}
#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;
- GdkCursorPrivate *private;
+ GdkX11Cursor *private;
XcursorImages *images = NULL;
XcursorImage *image;
gint size;
GdkPixbuf *pixbuf;
gchar *theme;
- g_return_val_if_fail (cursor != NULL, NULL);
-
- private = (GdkCursorPrivate *) 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);
if (cursor->type == GDK_CURSOR_IS_PIXMAP)
{
if (private->name)
- images = XcursorLibraryLoadImages (private->name, theme, size);
+ images = XcursorLibraryLoadImages (private->name, theme, size);
}
- else
+ else
images = XcursorShapeLoadImages (cursor->type, theme, size);
if (!images)
return NULL;
-
+
image = images->images[0];
data = g_malloc (4 * image->width * image->height);
}
pixbuf = gdk_pixbuf_new_from_data (data, GDK_COLORSPACE_RGB, TRUE,
- 8, image->width, image->height,
- 4 * image->width,
- (GdkPixbufDestroyNotify)g_free, NULL);
+ 8, image->width, image->height,
+ 4 * image->width,
+ (GdkPixbufDestroyNotify)g_free, NULL);
if (private->name)
gdk_pixbuf_set_option (pixbuf, "name", private->name);
_gdk_x11_cursor_update_theme (GdkCursor *cursor)
{
Display *xdisplay;
- GdkCursorPrivate *private;
+ GdkX11Cursor *private;
Cursor new_cursor = None;
- GdkDisplayX11 *display_x11;
+ GdkX11Display *display_x11;
- private = (GdkCursorPrivate *) cursor;
- xdisplay = GDK_DISPLAY_XDISPLAY (private->display);
- display_x11 = GDK_DISPLAY_X11 (private->display);
+ private = (GdkX11Cursor *) cursor;
+ display_x11 = GDK_X11_DISPLAY (gdk_cursor_get_display (cursor));
+ xdisplay = GDK_DISPLAY_XDISPLAY (display_x11);
if (!display_x11->have_xfixes)
return;
return;
if (cursor->type == GDK_CURSOR_IS_PIXMAP)
- {
- if (private->name)
- new_cursor = XcursorLibraryLoadCursor (xdisplay, private->name);
- }
+ {
+ if (private->name)
+ new_cursor = XcursorLibraryLoadCursor (xdisplay, private->name);
+ }
else
- new_cursor = XcursorShapeLoadCursor (xdisplay, cursor->type);
+ new_cursor = XcursorShapeLoadCursor (xdisplay, cursor->type);
if (new_cursor != None)
- {
- XFixesChangeCursor (xdisplay, new_cursor, private->xcursor);
- private->xcursor = new_cursor;
- }
+ {
+ XFixesChangeCursor (xdisplay, new_cursor, private->xcursor);
+ private->xcursor = new_cursor;
+ }
}
}
static void
update_cursor (gpointer data,
- gpointer user_data)
+ gpointer user_data)
{
GdkCursor *cursor;
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).
*
*/
void
gdk_x11_display_set_cursor_theme (GdkDisplay *display,
- const gchar *theme,
- const gint size)
+ 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;
}
void
gdk_x11_display_set_cursor_theme (GdkDisplay *display,
- const gchar *theme,
- const gint size)
+ const gchar *theme,
+ const gint size)
{
g_return_if_fail (GDK_IS_DISPLAY (display));
}
static XcursorImage*
create_cursor_image (GdkPixbuf *pixbuf,
- gint x,
- gint y)
+ gint x,
+ gint y)
{
guint width, height;
XcursorImage *xcimage;
return xcimage;
}
-
-/**
- * gdk_cursor_new_from_pixbuf:
- * @display: the #GdkDisplay for which the cursor will be created
- * @pixbuf: the #GdkPixbuf containing the cursor image
- * @x: the horizontal offset of the 'hotspot' of the cursor.
- * @y: the vertical offset of the 'hotspot' of the cursor.
- *
- * Creates a new cursor from a pixbuf.
- *
- * Not all GDK backends support RGBA cursors. If they are not
- * supported, a monochrome approximation will be displayed.
- * The functions gdk_display_supports_cursor_alpha() and
- * gdk_display_supports_cursor_color() can be used to determine
- * whether RGBA cursors are supported;
- * gdk_display_get_default_cursor_size() and
- * gdk_display_get_maximal_cursor_size() give information about
- * cursor sizes.
- *
- * If @x or @y are <literal>-1</literal>, the pixbuf must have
- * options named "x_hot" and "y_hot", resp., containing
- * integer values between %0 and the width resp. height of
- * the pixbuf. (Since: 3.0)
- *
- * On the X backend, support for RGBA cursors requires a
- * sufficently new version of the X Render extension.
- *
- * Returns: a new #GdkCursor.
- *
- * Since: 2.4
- */
GdkCursor *
-gdk_cursor_new_from_pixbuf (GdkDisplay *display,
- GdkPixbuf *pixbuf,
- gint x,
- gint y)
+_gdk_x11_display_get_cursor_for_pixbuf (GdkDisplay *display,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y)
{
XcursorImage *xcimage;
Cursor xcursor;
- GdkCursorPrivate *private;
- GdkCursor *cursor;
+ GdkX11Cursor *private;
const char *option;
char *end;
gint64 value;
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-
if (x == -1 && (option = gdk_pixbuf_get_option (pixbuf, "x_hot")))
{
errno = 0;
g_return_val_if_fail (0 <= x && x < gdk_pixbuf_get_width (pixbuf), NULL);
g_return_val_if_fail (0 <= y && y < gdk_pixbuf_get_height (pixbuf), NULL);
- if (display->closed)
- xcursor = None;
- else
+ if (gdk_display_is_closed (display))
+ {
+ xcursor = None;
+ }
+ else
{
xcimage = create_cursor_image (pixbuf, x, y);
xcursor = XcursorImageLoadCursor (GDK_DISPLAY_XDISPLAY (display), xcimage);
XcursorImageDestroy (xcimage);
}
- private = g_new (GdkCursorPrivate, 1);
- private->display = display;
+ private = g_object_new (GDK_TYPE_X11_CURSOR,
+ "cursor-type", GDK_CURSOR_IS_PIXMAP,
+ "display", display,
+ NULL);
private->xcursor = xcursor;
private->name = NULL;
private->serial = theme_serial;
- cursor = (GdkCursor *) private;
- cursor->type = GDK_CURSOR_IS_PIXMAP;
- cursor->ref_count = 1;
-
- return cursor;
+ return GDK_CURSOR (private);
}
-/**
- * gdk_cursor_new_from_name:
- * @display: the #GdkDisplay for which the cursor will be created
- * @name: the name of the cursor
- *
- * Creates a new cursor by looking up @name in the current cursor
- * theme.
- *
- * Returns: a new #GdkCursor, or %NULL if there is no cursor with
- * the given name
- *
- * Since: 2.8
- */
-GdkCursor*
-gdk_cursor_new_from_name (GdkDisplay *display,
- const gchar *name)
+GdkCursor*
+_gdk_x11_display_get_cursor_for_name (GdkDisplay *display,
+ const gchar *name)
{
Cursor xcursor;
Display *xdisplay;
- GdkCursorPrivate *private;
- GdkCursor *cursor;
-
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ GdkX11Cursor *private;
- if (display->closed)
- xcursor = None;
- else
+ if (gdk_display_is_closed (display))
+ {
+ xcursor = None;
+ }
+ else
{
private = find_in_cache (display, GDK_CURSOR_IS_PIXMAP, name);
if (private)
{
/* Cache had it, add a ref for this user */
- gdk_cursor_ref ((GdkCursor*) private);
+ g_object_ref (private);
return (GdkCursor*) private;
}
xdisplay = GDK_DISPLAY_XDISPLAY (display);
xcursor = XcursorLibraryLoadCursor (xdisplay, name);
if (xcursor == None)
- return NULL;
+ return NULL;
}
- private = g_new (GdkCursorPrivate, 1);
- private->display = display;
+ private = g_object_new (GDK_TYPE_X11_CURSOR,
+ "cursor-type", GDK_CURSOR_IS_PIXMAP,
+ "display", display,
+ NULL);
private->xcursor = xcursor;
private->name = g_strdup (name);
private->serial = theme_serial;
- cursor = (GdkCursor *) private;
- cursor->type = GDK_CURSOR_IS_PIXMAP;
- cursor->ref_count = 1;
add_to_cache (private);
- return cursor;
+ return GDK_CURSOR (private);
}
-/**
- * gdk_display_supports_cursor_alpha:
- * @display: a #GdkDisplay
- *
- * Returns %TRUE if cursors can use an 8bit alpha channel
- * on @display. Otherwise, cursors are restricted to bilevel
- * alpha (i.e. a mask).
- *
- * Returns: whether cursors can have alpha channels.
- *
- * Since: 2.4
- */
-gboolean
-gdk_display_supports_cursor_alpha (GdkDisplay *display)
+gboolean
+_gdk_x11_display_supports_cursor_alpha (GdkDisplay *display)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
return XcursorSupportsARGB (GDK_DISPLAY_XDISPLAY (display));
}
-/**
- * gdk_display_supports_cursor_color:
- * @display: a #GdkDisplay
- *
- * Returns %TRUE if multicolored cursors are supported
- * on @display. Otherwise, cursors have only a forground
- * and a background color.
- *
- * Returns: whether cursors can have multiple colors.
- *
- * Since: 2.4
- */
-gboolean
-gdk_display_supports_cursor_color (GdkDisplay *display)
+gboolean
+_gdk_x11_display_supports_cursor_color (GdkDisplay *display)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
return XcursorSupportsARGB (GDK_DISPLAY_XDISPLAY (display));
}
-/**
- * gdk_display_get_default_cursor_size:
- * @display: a #GdkDisplay
- *
- * Returns the default size to use for cursors on @display.
- *
- * Returns: the default cursor size.
- *
- * Since: 2.4
- */
-guint
-gdk_display_get_default_cursor_size (GdkDisplay *display)
+void
+_gdk_x11_display_get_default_cursor_size (GdkDisplay *display,
+ guint *width,
+ guint *height)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
- return XcursorGetDefaultSize (GDK_DISPLAY_XDISPLAY (display));
+ *width = *height = XcursorGetDefaultSize (GDK_DISPLAY_XDISPLAY (display));
}
#else
static GdkCursor*
gdk_cursor_new_from_pixmap (GdkDisplay *display,
Pixmap source_pixmap,
- Pixmap mask_pixmap,
- const GdkColor *fg,
- const GdkColor *bg,
- gint x,
- gint y)
+ Pixmap mask_pixmap,
+ const GdkRGBA *fg,
+ const GdkRGBA *bg,
+ gint x,
+ gint y)
{
- GdkCursorPrivate *private;
- GdkCursor *cursor;
+ GdkX11Cursor *private;
Cursor xcursor;
XColor xfg, xbg;
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 (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_new (GdkCursorPrivate, 1);
- private->display = 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;
private->name = NULL;
private->serial = theme_serial;
- cursor = (GdkCursor *) private;
- cursor->type = GDK_CURSOR_IS_PIXMAP;
- cursor->ref_count = 1;
-
- return cursor;
+ return GDK_CURSOR (private);
}
GdkCursor *
-gdk_cursor_new_from_pixbuf (GdkDisplay *display,
- GdkPixbuf *pixbuf,
- gint x,
- gint y)
+_gdk_x11_display_get_cursor_for_pixbuf (GdkDisplay *display,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y)
{
GdkCursor *cursor;
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;
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
guint8 *src = pixels + j * rowstride;
guint8 *d = data + data_stride * j;
guint8 *md = mask_data + data_stride * j;
-
+
for (i = 0; i < width; i++)
- {
- if (src[1] < 0x80)
- *d |= 1 << (i % 8);
-
- if (n_channels == 3 || src[3] >= 0x80)
- *md |= 1 << (i % 8);
-
- src += n_channels;
- if (i % 8 == 7)
- {
- d++;
- md++;
- }
- }
+ {
+ if (src[1] < 0x80)
+ *d |= 1 << (i % 8);
+
+ if (n_channels == 3 || src[3] >= 0x80)
+ *md |= 1 << (i % 8);
+
+ src += n_channels;
+ if (i % 8 == 7)
+ {
+ d++;
+ md++;
+ }
+ }
}
-
+
screen = gdk_display_get_default_screen (display);
- pixmap = _gdk_x11_window_create_bitmap_surface (gdk_screen_get_root_window (screen),
- width, height);
+ pixmap = _gdk_x11_window_create_bitmap_surface (gdk_screen_get_root_window (screen),
+ width, height);
cr = cairo_create (pixmap);
image = cairo_image_surface_create_for_data (data, CAIRO_FORMAT_A1,
width, height, data_stride);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_destroy (cr);
-
- mask = _gdk_x11_window_create_bitmap_surface (gdk_screen_get_root_window (screen),
- width, height);
+
+ mask = _gdk_x11_window_create_bitmap_surface (gdk_screen_get_root_window (screen),
+ width, height);
cr = cairo_create (mask);
image = cairo_image_surface_create_for_data (mask_data, CAIRO_FORMAT_A1,
width, height, data_stride);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_destroy (cr);
-
+
cursor = gdk_cursor_new_from_pixmap (display,
cairo_xlib_surface_get_drawable (pixmap),
cairo_xlib_surface_get_drawable (mask),
&fg, &bg,
x, y);
-
+
cairo_surface_destroy (pixmap);
cairo_surface_destroy (mask);
g_free (data);
g_free (mask_data);
-
+
return cursor;
}
-GdkCursor*
-gdk_cursor_new_from_name (GdkDisplay *display,
- const gchar *name)
+GdkCursor*
+_gdk_x11_display_get_cursor_for_name (GdkDisplay *display,
+ const gchar *name)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
return NULL;
}
-gboolean
-gdk_display_supports_cursor_alpha (GdkDisplay *display)
+gboolean
+_gdk_x11_display_supports_cursor_alpha (GdkDisplay *display)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
return FALSE;
}
-gboolean
-gdk_display_supports_cursor_color (GdkDisplay *display)
+gboolean
+_gdk_x11_display_supports_cursor_color (GdkDisplay *display)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
return FALSE;
}
-guint
-gdk_display_get_default_cursor_size (GdkDisplay *display)
+void
+_gdk_x11_display_get_default_cursor_size (GdkDisplay *display,
+ guint *width,
+ guint *height)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
-
/* 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_display_get_maximal_cursor_size (GdkDisplay *display,
- guint *width,
- guint *height)
+void
+_gdk_x11_display_get_maximal_cursor_size (GdkDisplay *display,
+ guint *width,
+ guint *height)
{
GdkScreen *screen;
GdkWindow *window;
g_return_if_fail (GDK_IS_DISPLAY (display));
-
+
screen = gdk_display_get_default_screen (display);
window = gdk_screen_get_root_window (screen);
- XQueryBestCursor (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XID (window),
- 128, 128, width, height);
+ XQueryBestCursor (GDK_DISPLAY_XDISPLAY (display),
+ GDK_WINDOW_XID (window),
+ 128, 128, width, height);
}
projects / ~andy / gtk / blobdiff