callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt quartz visual code to new ways

Browse Source 
We may still need a subclass here later, not sure
This commit is contained in:
Matthias Clasen 2010-12-17 11:05:53 -05:00 committed by Kristian Rietveld
parent 46e8aadaf8
commit e2fea748d6
3 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/quartz/gdkdisplay-quartz.c
View File

@ -63,10 +63,10 @@ gdk_display_open (const gchar *display_name)
_gdk_display = g_object_new (GDK_TYPE_DISPLAY, NULL);
_gdk_display->device_manager = _gdk_device_manager_new (_gdk_display);
_gdk_visual_init ();
_gdk_screen = _gdk_screen_quartz_new ();
_gdk_quartz_visual_init (_gdk_screen);
_gdk_windowing_window_init ();
_gdk_events_init ();

2
gdk/quartz/gdkprivate-quartz.h
View File

@ -68,7 +68,7 @@ extern GdkDragContext *_gdk_quartz_drag_source_context;
void _gdk_windowing_update_window_sizes (GdkScreen *screen);
void _gdk_windowing_window_init (void);
void _gdk_events_init (void);
void _gdk_visual_init (void);
void _gdk_quartz_visual_init (GdkScreen *screen);
void _gdk_input_init (void);
void _gdk_quartz_event_loop_init (void);

70
gdk/quartz/gdkvisual-quartz.c
View File

@ -20,53 +20,13 @@
#include "config.h"
#include "gdkvisual.h"
#include "gdkvisualprivate.h"
#include "gdkprivate-quartz.h"
static GdkVisual *system_visual;
static GdkVisual *rgba_visual;
static GdkVisual *gray_visual;
static void
gdk_visual_finalize (GObject *object)
{
g_error ("A GdkVisual object was finalized. This should not happen");
}
static void
gdk_visual_class_init (GObjectClass *class)
{
class->finalize = gdk_visual_finalize;
}
GType
gdk_visual_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
const GTypeInfo object_info =
{
sizeof (GdkVisualClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gdk_visual_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GdkVisual),
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkVisual",
&object_info, 0);
}
return object_type;
}
static void
gdk_visual_decompose_mask (gulong mask,
gint *shift,
@ -89,14 +49,17 @@ gdk_visual_decompose_mask (gulong mask,
}
static GdkVisual *
create_standard_visual (gint depth)
create_standard_visual (GdkScreen *screen,
gint depth)
{
GdkVisual *visual = g_object_new (GDK_TYPE_VISUAL, NULL);
visual->screen = screen;
visual->depth = depth;
visual->byte_order = GDK_MSB_FIRST; /* FIXME: Should this be different on intel macs? */
visual->colormap_size = 0;
visual->type = GDK_VISUAL_TRUE_COLOR;
visual->red_mask = 0xff0000;
@ -117,10 +80,12 @@ create_standard_visual (gint depth)
}
static GdkVisual *
create_gray_visual (void)
create_gray_visual (GdkScreen *screen)
{
GdkVisual *visual = g_object_new (GDK_TYPE_VISUAL, NULL);
visual->screen = screen;
visual->depth = 1;
visual->byte_order = GDK_MSB_FIRST;
visual->colormap_size = 0;
@ -131,11 +96,11 @@ create_gray_visual (void)
}
void
_gdk_visual_init (void)
_gdk_quartz_visual_init (GdkScreen *screen)
{
system_visual = create_standard_visual (24);
rgba_visual = create_standard_visual (32);
gray_visual = create_gray_visual ();
system_visual = create_standard_visual (screen, 24);
rgba_visual = create_standard_visual (screen, 32);
gray_visual = create_gray_visual (screen);
}
/* We prefer the system visual for now ... */
@ -256,12 +221,3 @@ _gdk_quartz_screen_list_visuals (GdkScreen *screen)
return visuals;
}
GdkScreen *
gdk_visual_get_screen (GdkVisual *visual)
{
g_return_val_if_fail (GDK_IS_VISUAL (visual), NULL);
return gdk_screen_get_default ();
}