Changes multihead reorganizing code for win32 support, mostly from a patch
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.
This commit is contained in:
Owen Taylor
293
gdk/gdkscreen.c
293
gdk/gdkscreen.c
@ -21,8 +21,11 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "gdkscreen.h"
|
||||
#include "gdk.h" /* For gdk_rectangle_intersect() */
|
||||
#include "gdkcolor.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkwindow.h"
|
||||
#include "gdkscreen.h"
|
||||
|
||||
GType
|
||||
gdk_screen_get_type (void)
|
||||
@ -51,176 +54,6 @@ gdk_screen_get_type (void)
|
||||
return object_type;
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_default_colormap:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the default colormap for @screen.
|
||||
*
|
||||
* Returns: the default #GdkColormap.
|
||||
**/
|
||||
GdkColormap *
|
||||
gdk_screen_get_default_colormap (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_default_colormap (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_set_default_colormap:
|
||||
* @screen: a #GdkScreen
|
||||
* @colormap: a #GdkColormap
|
||||
*
|
||||
* Sets the default @colormap for @screen.
|
||||
**/
|
||||
void
|
||||
gdk_screen_set_default_colormap (GdkScreen *screen,
|
||||
GdkColormap *colormap)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_SCREEN (screen));
|
||||
g_return_if_fail (GDK_IS_COLORMAP (colormap));
|
||||
|
||||
GDK_SCREEN_GET_CLASS (screen)->set_default_colormap (screen, colormap);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_root_window:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the root window of @screen.
|
||||
*
|
||||
* Returns: the root window
|
||||
**/
|
||||
GdkWindow *
|
||||
gdk_screen_get_root_window (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_root_window (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_display:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the display to which the @screen belongs.
|
||||
*
|
||||
* Returns: the display to which @screen belongs
|
||||
**/
|
||||
GdkDisplay *
|
||||
gdk_screen_get_display (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_display (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_number:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the index of @screen among the screens in the display
|
||||
* to which it belongs. (See gdk_screen_get_display())
|
||||
*
|
||||
* Returns: the index
|
||||
**/
|
||||
gint
|
||||
gdk_screen_get_number (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_screen_num (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_window_at_pointer:
|
||||
* @screen: a #GdkScreen
|
||||
* @win_x: return location for origin of the window under the pointer
|
||||
* @win_y: return location for origin of the window under the pointer
|
||||
*
|
||||
* Obtains the window underneath the mouse pointer, returning the location
|
||||
* of that window in @win_x, @win_y for @screen. Returns %NULL if the window
|
||||
* under the mouse pointer is not known to GDK (for example, belongs to
|
||||
* another application).
|
||||
*
|
||||
* Returns: the window under the mouse pointer, or %NULL
|
||||
**/
|
||||
GdkWindow *
|
||||
gdk_screen_get_window_at_pointer (GdkScreen *screen,
|
||||
gint *win_x,
|
||||
gint *win_y)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_window_at_pointer (screen, win_x, win_y);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_width:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the width of @screen in pixels
|
||||
*
|
||||
* Returns: the width of @screen in pixels.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_get_width (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_width (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_height:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the height of @screen in pixels
|
||||
*
|
||||
* Returns: the height of @screen in pixels.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_get_height (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_height (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_width_mm:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Gets the width of @screen in millimeters.
|
||||
* Note that on some X servers this value will not be correct.
|
||||
*
|
||||
* Returns: the width of @screen in pixels.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_get_width_mm (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_width_mm (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_height_mm:
|
||||
* @screen: a #GdkScreen
|
||||
*
|
||||
* Returns the height of @screen in millimeters.
|
||||
* Note that on some X servers this value will not be correct.
|
||||
*
|
||||
* Returns: the heigth of @screen in pixels.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_get_height_mm (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_height_mm (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_close:
|
||||
@ -237,47 +70,6 @@ gdk_screen_close (GdkScreen *screen)
|
||||
g_object_run_dispose (G_OBJECT (screen));
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_n_monitors:
|
||||
* @screen : a #GdkScreen.
|
||||
*
|
||||
* Returns the number of monitors being part of the virtual screen
|
||||
*
|
||||
* Returns: number of monitors part of the virtual screen or
|
||||
* 0 if @screen is not in virtual screen mode.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_get_n_monitors (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
|
||||
|
||||
return GDK_SCREEN_GET_CLASS (screen)->get_n_monitors (screen);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_monitor_geometry:
|
||||
* @screen : a #GdkScreen.
|
||||
* @monitor_num: the monitor number.
|
||||
* @dest : a #GdkRectangle to be filled with the monitor geometry
|
||||
*
|
||||
* Retrieves the #GdkRectangle representing the size and start
|
||||
* coordinates of the individual monitor within the the entire virtual
|
||||
* screen.
|
||||
*
|
||||
* Note that the virtual screen coordinates can be retrieved via
|
||||
* gdk_screen_get_width() and gdk_screen_get_height().
|
||||
*
|
||||
**/
|
||||
void
|
||||
gdk_screen_get_monitor_geometry (GdkScreen *screen,
|
||||
gint monitor_num,
|
||||
GdkRectangle *dest)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_SCREEN (screen));
|
||||
|
||||
GDK_SCREEN_GET_CLASS (screen)->get_monitor_geometry (screen, monitor_num, dest);
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_monitor_at_point:
|
||||
* @screen : a #GdkScreen.
|
||||
@ -353,3 +145,80 @@ gdk_screen_get_monitor_at_window (GdkScreen *screen,
|
||||
}
|
||||
return screen_num;
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_width:
|
||||
*
|
||||
* Returns the width of the default screen in pixels.
|
||||
*
|
||||
* Return value: the width of the default screen in pixels.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_width (void)
|
||||
{
|
||||
return gdk_screen_get_width (gdk_get_default_screen());
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_height:
|
||||
*
|
||||
* Returns the height of the default screen in pixels.
|
||||
*
|
||||
* Return value: the height of the default screen in pixels.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_height (void)
|
||||
{
|
||||
return gdk_screen_get_height (gdk_get_default_screen());
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_width_mm:
|
||||
*
|
||||
* Returns the width of the default screen in millimeters.
|
||||
* Note that on many X servers this value will not be correct.
|
||||
*
|
||||
* Return value: the width of the default screen in millimeters,
|
||||
* though it is not always correct.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_width_mm (void)
|
||||
{
|
||||
return gdk_screen_get_width_mm (gdk_get_default_screen());
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_height_mm:
|
||||
*
|
||||
* Returns the height of the default screen in millimeters.
|
||||
* Note that on many X servers this value will not be correct.
|
||||
*
|
||||
* Return value: the height of the default screen in millimeters,
|
||||
* though it is not always correct.
|
||||
**/
|
||||
gint
|
||||
gdk_screen_height_mm (void)
|
||||
{
|
||||
return gdk_screen_get_height_mm (gdk_get_default_screen ());
|
||||
}
|
||||
|
||||
/**
|
||||
* gdk_screen_get_window_at_pointer:
|
||||
* @screen: a #GdkScreen
|
||||
* @win_x: return location for origin of the window under the pointer
|
||||
* @win_y: return location for origin of the window under the pointer
|
||||
*
|
||||
* Obtains the window underneath the mouse pointer, returning the location
|
||||
* of that window in @win_x, @win_y for @screen. Returns %NULL if the window
|
||||
* under the mouse pointer is not known to GDK (for example, belongs to
|
||||
* another application).
|
||||
*
|
||||
* Returns: the window under the mouse pointer, or %NULL
|
||||
**/
|
||||
GdkWindow *
|
||||
gdk_screen_get_window_at_pointer (GdkScreen *screen,
|
||||
gint *win_x,
|
||||
gint *win_y)
|
||||
{
|
||||
return _gdk_current_pointer_hooks->window_at_pointer (screen, win_x, win_y);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user