X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkscreen.h;h=e3a66c654d3eab0c7806e7c780b0fd08e03d4ccd;hb=HEAD;hp=b1f3b8e8a7fb908c53b060333284d149acf1f09c;hpb=791ac426d7cdeaee2f0bd201f1d3bfb2a2c0a71b;p=~andy%2Fgtk

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index b1f3b8e8a..e3a66c654 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -1,7 +1,7 @@
 /*
  * gdkscreen.h
- * 
- * Copyright 2001 Sun Microsystems Inc. 
+ *
+ * Copyright 2001 Sun Microsystems Inc.
  *
  * Erwann Chenede <erwann.chenede@sun.com>
  *
@@ -16,66 +16,33 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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/>.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
 #ifndef __GDK_SCREEN_H__
 #define __GDK_SCREEN_H__
 
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #include <cairo.h>
-#include "gdk/gdktypes.h"
-#include "gdk/gdkdisplay.h"
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdktypes.h>
+#include <gdk/gdkdisplay.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GdkScreenClass GdkScreenClass;
-
 #define GDK_TYPE_SCREEN            (gdk_screen_get_type ())
 #define GDK_SCREEN(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_SCREEN, GdkScreen))
-#define GDK_SCREEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_SCREEN, GdkScreenClass))
 #define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
-#define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
-#define GDK_SCREEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
 
-struct _GdkScreen
-{
-  GObject parent_instance;
-
-  guint closed : 1;
-
-  GdkGC *normal_gcs[32];
-  GdkGC *exposure_gcs[32];
-
-  cairo_font_options_t *font_options;
-  double resolution;		/* pixels/points scale factor for fonts */
-};
-
-struct _GdkScreenClass
-{
-  GObjectClass parent_class;
-
-  void (*size_changed) (GdkScreen *screen);
-  void (*composited_changed) (GdkScreen *screen);
-  void (*monitors_changed) (GdkScreen *screen);
-};
 
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
-GdkColormap *gdk_screen_get_default_colormap  (GdkScreen   *screen);
-void         gdk_screen_set_default_colormap  (GdkScreen   *screen,
-					       GdkColormap *colormap);
-GdkColormap* gdk_screen_get_system_colormap   (GdkScreen   *screen);
-GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgb_colormap      (GdkScreen   *screen);
-GdkVisual *  gdk_screen_get_rgb_visual        (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgba_colormap     (GdkScreen   *screen);
+
+GdkVisual *  gdk_screen_get_system_visual     (GdkScreen   *screen);
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
-gboolean     gdk_screen_is_composited	      (GdkScreen   *screen);
+gboolean     gdk_screen_is_composited         (GdkScreen   *screen);
 
 GdkWindow *  gdk_screen_get_root_window       (GdkScreen   *screen);
 GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
@@ -89,15 +56,21 @@ GList *      gdk_screen_list_visuals          (GdkScreen   *screen);
 GList *      gdk_screen_get_toplevel_windows  (GdkScreen   *screen);
 gchar *      gdk_screen_make_display_name     (GdkScreen   *screen);
 
-gint          gdk_screen_get_n_monitors        (GdkScreen *screen);
-void          gdk_screen_get_monitor_geometry  (GdkScreen *screen,
-						gint       monitor_num,
-						GdkRectangle *dest);
+gint         gdk_screen_get_n_monitors        (GdkScreen    *screen);
+gint         gdk_screen_get_primary_monitor   (GdkScreen    *screen);
+void         gdk_screen_get_monitor_geometry  (GdkScreen    *screen,
+                                               gint          monitor_num,
+                                               GdkRectangle *dest);
+GDK_AVAILABLE_IN_3_4
+void         gdk_screen_get_monitor_workarea  (GdkScreen    *screen,
+                                               gint          monitor_num,
+                                               GdkRectangle *dest);
+
 gint          gdk_screen_get_monitor_at_point  (GdkScreen *screen,
-						gint       x,
-						gint       y);
+                                                gint       x,
+                                                gint       y);
 gint          gdk_screen_get_monitor_at_window (GdkScreen *screen,
-						GdkWindow *window);
+                                                GdkWindow *window);
 gint          gdk_screen_get_monitor_width_mm  (GdkScreen *screen,
                                                 gint       monitor_num);
 gint          gdk_screen_get_monitor_height_mm (GdkScreen *screen,
@@ -105,21 +78,18 @@ gint          gdk_screen_get_monitor_height_mm (GdkScreen *screen,
 gchar *       gdk_screen_get_monitor_plug_name (GdkScreen *screen,
                                                 gint       monitor_num);
 
-void          gdk_screen_broadcast_client_message  (GdkScreen       *screen,
-						    GdkEvent        *event);
-
 GdkScreen *gdk_screen_get_default (void);
 
 gboolean   gdk_screen_get_setting (GdkScreen   *screen,
-				   const gchar *name,
-				   GValue      *value);
+                                   const gchar *name,
+                                   GValue      *value);
 
 void                        gdk_screen_set_font_options (GdkScreen                  *screen,
-							 const cairo_font_options_t *options);
+                                                         const cairo_font_options_t *options);
 const cairo_font_options_t *gdk_screen_get_font_options (GdkScreen                  *screen);
 
 void    gdk_screen_set_resolution (GdkScreen *screen,
-				   gdouble    dpi);
+                                   gdouble    dpi);
 gdouble gdk_screen_get_resolution (GdkScreen *screen);
 
 GdkWindow *gdk_screen_get_active_window (GdkScreen *screen);
@@ -127,4 +97,4 @@ GList     *gdk_screen_get_window_stack  (GdkScreen *screen);
 
 G_END_DECLS
 
-#endif				/* __GDK_SCREEN_H__ */
+#endif  /* __GDK_SCREEN_H__ */