X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkscreen.c;h=c403a41dc2eb1db3b8e58b03e9a5cec54116971a;hb=46206f8bb824d82d89b528bc9bd557b3bd30d5d2;hp=329eab9540e87570d5657f6b0a9a501de60d20c2;hpb=1c51c48606930b3a784c0bbc99a5a8eb2188ca5f;p=~andy%2Fgtk diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index 329eab954..c403a41dc 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -21,71 +21,84 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gdk.h" /* For gdk_rectangle_intersect() */ #include "gdkcolor.h" #include "gdkwindow.h" #include "gdkscreen.h" +#include "gdkintl.h" -static void gdk_screen_class_init (GdkScreenClass *klass); -static void gdk_screen_dispose (GObject *object); + +static void gdk_screen_dispose (GObject *object); +static void gdk_screen_finalize (GObject *object); +static void gdk_screen_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gdk_screen_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); + +enum +{ + PROP_0, + PROP_FONT_OPTIONS, + PROP_RESOLUTION +}; enum { SIZE_CHANGED, + COMPOSITED_CHANGED, + MONITORS_CHANGED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; -static gpointer parent_class = NULL; - -GType -gdk_screen_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - static const GTypeInfo object_info = - { - sizeof (GdkScreenClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gdk_screen_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GdkScreen), - 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, - }; - - object_type = g_type_register_static (G_TYPE_OBJECT, - "GdkScreen", &object_info, 0); - } - - return object_type; -} +G_DEFINE_TYPE (GdkScreen, gdk_screen, G_TYPE_OBJECT) static void gdk_screen_class_init (GdkScreenClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->dispose = gdk_screen_dispose; + object_class->finalize = gdk_screen_finalize; + object_class->set_property = gdk_screen_set_property; + object_class->get_property = gdk_screen_get_property; + g_object_class_install_property (object_class, + PROP_FONT_OPTIONS, + g_param_spec_pointer ("font-options", + P_("Font options"), + P_("The default font options for the screen"), + G_PARAM_READWRITE|G_PARAM_STATIC_NAME| + G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_RESOLUTION, + g_param_spec_double ("resolution", + P_("Font resolution"), + P_("The resolution for fonts on the screen"), + -G_MAXDOUBLE, + G_MAXDOUBLE, + -1.0, + G_PARAM_READWRITE|G_PARAM_STATIC_NAME| + G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); + /** * GdkScreen::size-changed: * @screen: the object on which the signal is emitted * - * The ::size_changed signal is emitted when the pixel width or + * The ::size-changed signal is emitted when the pixel width or * height of a screen changes. * * Since: 2.2 */ signals[SIZE_CHANGED] = - g_signal_new ("size_changed", + g_signal_new (g_intern_static_string ("size-changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkScreenClass, size_changed), @@ -93,6 +106,53 @@ gdk_screen_class_init (GdkScreenClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + + /** + * GdkScreen::composited-changed: + * @screen: the object on which the signal is emitted + * + * The ::composited-changed signal is emitted when the composited + * status of the screen changes + * + * Since: 2.10 + */ + signals[COMPOSITED_CHANGED] = + g_signal_new (g_intern_static_string ("composited-changed"), + G_OBJECT_CLASS_TYPE (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GdkScreenClass, composited_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + /** + * GdkScreen::monitors-changed: + * @screen: the object on which the signal is emitted + * + * The ::monitors-changed signal is emitted when the number, size + * or position of the monitors attached to the screen change. + * + * Only for X11 and OS X for now. A future implementation for Win32 + * may be a possibility. + * + * Since: 2.14 + */ + signals[MONITORS_CHANGED] = + g_signal_new (g_intern_static_string ("monitors-changed"), + G_OBJECT_CLASS_TYPE (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GdkScreenClass, monitors_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + +static void +gdk_screen_init (GdkScreen *screen) +{ + screen->resolution = -1.; } static void @@ -104,13 +164,30 @@ gdk_screen_dispose (GObject *object) for (i = 0; i < 32; ++i) { if (screen->exposure_gcs[i]) - g_object_unref (screen->exposure_gcs[i]); + { + g_object_unref (screen->exposure_gcs[i]); + screen->exposure_gcs[i] = NULL; + } if (screen->normal_gcs[i]) - g_object_unref (screen->normal_gcs[i]); + { + g_object_unref (screen->normal_gcs[i]); + screen->normal_gcs[i] = NULL; + } } - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (gdk_screen_parent_class)->dispose (object); +} + +static void +gdk_screen_finalize (GObject *object) +{ + GdkScreen *screen = GDK_SCREEN (object); + + if (screen->font_options) + cairo_font_options_destroy (screen->font_options); + + G_OBJECT_CLASS (gdk_screen_parent_class)->finalize (object); } void @@ -136,7 +213,7 @@ get_nearest_monitor (GdkScreen *screen, gint num_monitors, i; gint nearest_dist = G_MAXINT; gint nearest_monitor = 0; - + g_return_val_if_fail (GDK_IS_SCREEN (screen), -1); num_monitors = gdk_screen_get_n_monitors (screen); @@ -144,7 +221,7 @@ get_nearest_monitor (GdkScreen *screen, for (i = 0; i < num_monitors; i++) { GdkRectangle monitor; - gint dist_x, dist_y; + gint dist_x, dist_y, dist; gdk_screen_get_monitor_geometry (screen, i, &monitor); @@ -162,9 +239,10 @@ get_nearest_monitor (GdkScreen *screen, else dist_y = 0; - if (MIN (dist_x, dist_y) < nearest_dist) + dist = dist_x + dist_y; + if (dist < nearest_dist) { - nearest_dist = MIN (dist_x, dist_y); + nearest_dist = dist; nearest_monitor = i; } } @@ -231,8 +309,9 @@ gdk_screen_get_monitor_at_window (GdkScreen *screen, { gint num_monitors, i, area = 0, screen_num = -1; GdkRectangle win_rect; + g_return_val_if_fail (GDK_IS_SCREEN (screen), -1); - + gdk_window_get_geometry (window, &win_rect.x, &win_rect.y, &win_rect.width, &win_rect.height, NULL); gdk_window_get_origin (window, &win_rect.x, &win_rect.y); @@ -269,7 +348,7 @@ gdk_screen_get_monitor_at_window (GdkScreen *screen, gint gdk_screen_width (void) { - return gdk_screen_get_width (gdk_screen_get_default()); + return gdk_screen_get_width (gdk_screen_get_default ()); } /** @@ -282,7 +361,7 @@ gdk_screen_width (void) gint gdk_screen_height (void) { - return gdk_screen_get_height (gdk_screen_get_default()); + return gdk_screen_get_height (gdk_screen_get_default ()); } /** @@ -297,7 +376,7 @@ gdk_screen_height (void) gint gdk_screen_width_mm (void) { - return gdk_screen_get_width_mm (gdk_screen_get_default()); + return gdk_screen_get_width_mm (gdk_screen_get_default ()); } /** @@ -314,3 +393,150 @@ gdk_screen_height_mm (void) { return gdk_screen_get_height_mm (gdk_screen_get_default ()); } + +/** + * gdk_screen_set_font_options: + * @screen: a #GdkScreen + * @options: (allow-none): a #cairo_font_options_t, or %NULL to unset any + * previously set default font options. + * + * Sets the default font options for the screen. These + * options will be set on any #PangoContext's newly created + * with gdk_pango_context_get_for_screen(). Changing the + * default set of font options does not affect contexts that + * have already been created. + * + * Since: 2.10 + **/ +void +gdk_screen_set_font_options (GdkScreen *screen, + const cairo_font_options_t *options) +{ + g_return_if_fail (GDK_IS_SCREEN (screen)); + + if (screen->font_options != options) + { + if (screen->font_options) + cairo_font_options_destroy (screen->font_options); + + if (options) + screen->font_options = cairo_font_options_copy (options); + else + screen->font_options = NULL; + + g_object_notify (G_OBJECT (screen), "font-options"); + } +} + +/** + * gdk_screen_get_font_options: + * @screen: a #GdkScreen + * + * Gets any options previously set with gdk_screen_set_font_options(). + * + * Return value: the current font options, or %NULL if no default + * font options have been set. + * + * Since: 2.10 + **/ +const cairo_font_options_t * +gdk_screen_get_font_options (GdkScreen *screen) +{ + g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); + + return screen->font_options; +} + +/** + * gdk_screen_set_resolution: + * @screen: a #GdkScreen + * @dpi: the resolution in "dots per inch". (Physical inches aren't actually + * involved; the terminology is conventional.) + + * Sets the resolution for font handling on the screen. This is a + * scale factor between points specified in a #PangoFontDescription + * and cairo units. The default value is 96, meaning that a 10 point + * font will be 13 units high. (10 * 96. / 72. = 13.3). + * + * Since: 2.10 + **/ +void +gdk_screen_set_resolution (GdkScreen *screen, + gdouble dpi) +{ + g_return_if_fail (GDK_IS_SCREEN (screen)); + + if (dpi < 0) + dpi = -1.0; + + if (screen->resolution != dpi) + { + screen->resolution = dpi; + + g_object_notify (G_OBJECT (screen), "resolution"); + } +} + +/** + * gdk_screen_get_resolution: + * @screen: a #GdkScreen + * + * Gets the resolution for font handling on the screen; see + * gdk_screen_set_resolution() for full details. + * + * Return value: the current resolution, or -1 if no resolution + * has been set. + * + * Since: 2.10 + **/ +gdouble +gdk_screen_get_resolution (GdkScreen *screen) +{ + g_return_val_if_fail (GDK_IS_SCREEN (screen), -1.0); + + return screen->resolution; +} + +static void +gdk_screen_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GdkScreen *screen = GDK_SCREEN (object); + + switch (prop_id) + { + case PROP_FONT_OPTIONS: + g_value_set_pointer (value, (gpointer) gdk_screen_get_font_options (screen)); + break; + case PROP_RESOLUTION: + g_value_set_double (value, gdk_screen_get_resolution (screen)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gdk_screen_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GdkScreen *screen = GDK_SCREEN (object); + + switch (prop_id) + { + case PROP_FONT_OPTIONS: + gdk_screen_set_font_options (screen, g_value_get_pointer (value)); + break; + case PROP_RESOLUTION: + gdk_screen_set_resolution (screen, g_value_get_double (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +}