
Wed Jun 5 18:34:47 2002 Owen Taylor <otaylor@redhat.com> Changes multihead reorganizing code for win32 support, mostly from a patch by Hans Breuer. * gdk/gdkcolor.c gdk/x11/gdkcolor-x11.c gdk/gdkcursor.c gdk/x11/gdkcursor-x11.c gdk/gdkevents.c gdk/x11/gdkevents-x11.c gdk/gdkfont.c gdk/x11/gdkfont-x11.c gdk/gdkkeys.c gdk/x11/gdkkeys-x11.c gdk/gdkimage.c gdk/x11/gdkimage-x11.c gdk/gdkscreen.c gdk/x11/gdkmain-x11.c gdk/gdkdisplay.c gdk/gdkevents-x11.c gdk/gdkpango.c gdk/x11/gdkpango-x11.c gdk/gdkselection.c gdk/x11/gdkselection-x11.c gdk/gdkwindow.c gdk/x11/gdkwindow-x11.c gdk/gdkvisual.c gdk/x11/gdkvisual-x11.c: Move port-independent singlehead wrapper functions into port-independent part of GDK. (#80009) * gdk/win32/gdkcolor-win32.c gdk/win32/gdkcursor-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkfont-win32.c gdk/win32/gdkimage-win32.c gdk/win32/gdkkeys-win32.c gdk/win32/gdkmain-win32.c gdk/win32/gdkproperty-win32.c gdk/win32/gdkselection-win32.c gdk/win32/gkwindow-win32.c: Turn singlehead functions into "multihead" functions that ignore their GdkDisplay or GdkScreen arguments. * gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c gdk/win32/gdkinput-win32.c gdk/win32/gdkprivate-win32.h: Misc multihead-compatibility changes. * gtk/gtk.def gdk/gdk.def: Update for multihead functions. * gdk/gdkcolormap.h gdk/gdkvisual.h gdk/x11/gdkcolormap-x11.c gdk/x11/gdkvisual-x11.c: Remove the screen fields from the public parts of the colormap/visual structures, add accessors instead. * gdk/gdkpixbuf-render.c gdk/gdkpixmap.c gdk/gdkrgb.c gdk/x11/gdkcolormap-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkimage-x11.c gdk/x11/gdkprivate-x11.h gtk/gtkgc.c gtk/gtkstyle.c gtk/gtkwidget.c: Use accessors to get the screen for colormaps, visuals; move the fields into the private structures for the x11 backend. * gdk/gdkdisplay.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/gdkscreen.[ch] gdk/x11/gdkscreen-x11.c: Remove virtualization of screen and display functions. (#79990, patch from Erwann Chenede) * gdk/win32/gdkdisplay-x11.c gdk/win32/gdkscreen-win32.c gdk/win32/{Makefile.am, makefile.msc, makefile.mingw}: New files containing stub implementations of Display, Screen functions. * gdk/x11/gdkscreen-x11.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkx.h: Clean up function exports and what headers they are in. (#79954) * gdk/x11/gdkx.h: Fix macro that was referring to a non-existant screen->screen_num. (In the patch for #79972, Erwann Chenede) * gdk/gdkscreen.c gdk/gdkwindow.c gdk/x11/gdkinternals.h gdk/x11/gdkscreen-x11.c: Fix gdk_screen_get_window_at_pointer() to use window hooks. (#79972, patch partly from Erwann Chenede) * gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c: Fix some warnings.
215 lines
6.8 KiB
C
215 lines
6.8 KiB
C
/* GDK - The GIMP Drawing Kit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* 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.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/cursorfont.h>
|
|
|
|
#include "gdkprivate-x11.h"
|
|
#include "gdkcursor.h"
|
|
#include "gdkpixmap-x11.h"
|
|
#include "gdkx.h"
|
|
#include <gdk/gdkpixmap.h>
|
|
#include "gdkscreen-x11.h"
|
|
|
|
/**
|
|
* gdk_cursor_new_for_screen:
|
|
* @screen: the #GdkScreen where the cursor will be defined
|
|
* @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>
|
|
* </itemizedlist>
|
|
*
|
|
* To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
|
|
* a cursor with no pixels in it.
|
|
*
|
|
* Return value: a new #GdkCursor
|
|
**/
|
|
GdkCursor*
|
|
gdk_cursor_new_for_screen (GdkScreen *screen,
|
|
GdkCursorType cursor_type)
|
|
{
|
|
GdkCursorPrivate *private;
|
|
GdkCursor *cursor;
|
|
Cursor xcursor;
|
|
|
|
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
|
|
|
|
xcursor = XCreateFontCursor (GDK_SCREEN_XDISPLAY (screen), cursor_type);
|
|
private = g_new (GdkCursorPrivate, 1);
|
|
private->screen = screen;
|
|
private->xcursor = xcursor;
|
|
cursor = (GdkCursor *) private;
|
|
cursor->type = cursor_type;
|
|
cursor->ref_count = 1;
|
|
|
|
return cursor;
|
|
}
|
|
|
|
GdkCursor*
|
|
gdk_cursor_new_from_pixmap (GdkPixmap *source,
|
|
GdkPixmap *mask,
|
|
GdkColor *fg,
|
|
GdkColor *bg,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
GdkCursorPrivate *private;
|
|
GdkCursor *cursor;
|
|
Pixmap source_pixmap, mask_pixmap;
|
|
Cursor xcursor;
|
|
XColor xfg, xbg;
|
|
GdkScreen *screen;
|
|
|
|
g_return_val_if_fail (GDK_IS_PIXMAP (source), NULL);
|
|
g_return_val_if_fail (GDK_IS_PIXMAP (mask), NULL);
|
|
g_return_val_if_fail (fg != NULL, NULL);
|
|
g_return_val_if_fail (bg != NULL, NULL);
|
|
|
|
source_pixmap = GDK_PIXMAP_XID (source);
|
|
mask_pixmap = GDK_PIXMAP_XID (mask);
|
|
screen = GDK_PIXMAP_SCREEN (source);
|
|
|
|
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;
|
|
|
|
xcursor = XCreatePixmapCursor (GDK_SCREEN_XDISPLAY (screen),
|
|
source_pixmap, mask_pixmap, &xfg, &xbg, x, y);
|
|
private = g_new (GdkCursorPrivate, 1);
|
|
private->screen = screen;
|
|
private->xcursor = xcursor;
|
|
cursor = (GdkCursor *) private;
|
|
cursor->type = GDK_CURSOR_IS_PIXMAP;
|
|
cursor->ref_count = 1;
|
|
|
|
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;
|
|
XFreeCursor (GDK_SCREEN_XDISPLAY (private->screen), private->xcursor);
|
|
|
|
g_free (private);
|
|
}
|
|
|
|
Display *
|
|
gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
|
|
{
|
|
g_return_val_if_fail (cursor != NULL, NULL);
|
|
|
|
return GDK_SCREEN_XDISPLAY(((GdkCursorPrivate *)cursor)->screen);
|
|
}
|
|
|
|
Cursor
|
|
gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
|
|
{
|
|
g_return_val_if_fail (cursor != NULL, None);
|
|
|
|
return ((GdkCursorPrivate *)cursor)->xcursor;
|
|
}
|
|
|
|
/**
|
|
* gdk_cursor_get_screen:
|
|
* @cursor : a #GdkCursor.
|
|
*
|
|
* Returns the screen on which the GdkCursor is defined
|
|
*
|
|
* Returns : the #GdkScreen associated to @cursor
|
|
*/
|
|
|
|
GdkScreen *
|
|
gdk_cursor_get_screen (GdkCursor *cursor)
|
|
{
|
|
g_return_val_if_fail (cursor != NULL, NULL);
|
|
|
|
return ((GdkCursorPrivate *)cursor)->screen;
|
|
}
|