From 31a0933fe9d91c2f35cde29e55e456db92694a83 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 4 Nov 2016 00:10:43 +0100 Subject: [PATCH] quartz: Remove all mentions of visuals --- gdk/quartz/Makefile.am | 2 - gdk/quartz/gdkdisplay-quartz.c | 1 - gdk/quartz/gdkglcontext-quartz.h | 1 - gdk/quartz/gdkprivate-quartz.h | 3 - gdk/quartz/gdkquartz.h | 1 - gdk/quartz/gdkquartzvisual.h | 51 ----------------- gdk/quartz/gdkvisual-quartz.c | 98 -------------------------------- gdk/quartz/gdkwindow-quartz.c | 1 - 8 files changed, 158 deletions(-) delete mode 100644 gdk/quartz/gdkquartzvisual.h delete mode 100644 gdk/quartz/gdkvisual-quartz.c diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am index 9bd34ef441..eda5263f72 100644 --- a/gdk/quartz/Makefile.am +++ b/gdk/quartz/Makefile.am @@ -46,7 +46,6 @@ libgdk_quartz_la_SOURCES = \ gdkselection-quartz.c \ gdktestutils-quartz.c \ gdkutils-quartz.c \ - gdkvisual-quartz.c \ gdkwindow-quartz.c \ gdkwindow-quartz.h \ xcursors.h @@ -64,7 +63,6 @@ libgdkquartzinclude_HEADERS = \ gdkquartzkeys.h \ gdkquartzscreen.h \ gdkquartzutils.h \ - gdkquartzvisual.h \ gdkquartzwindow.h diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c index 63fa0f8d60..b24fdffa1c 100644 --- a/gdk/quartz/gdkdisplay-quartz.c +++ b/gdk/quartz/gdkdisplay-quartz.c @@ -69,7 +69,6 @@ _gdk_quartz_display_open (const gchar *display_name) _gdk_display->device_manager = _gdk_device_manager_new (_gdk_display); _gdk_screen = g_object_new (gdk_quartz_screen_get_type (), NULL); - _gdk_quartz_screen_init_visuals (_gdk_screen); _gdk_quartz_window_init_windowing (_gdk_display, _gdk_screen); diff --git a/gdk/quartz/gdkglcontext-quartz.h b/gdk/quartz/gdkglcontext-quartz.h index bc55a57032..269f8fa18e 100644 --- a/gdk/quartz/gdkglcontext-quartz.h +++ b/gdk/quartz/gdkglcontext-quartz.h @@ -24,7 +24,6 @@ #define __GDK_QUARTZ_GL_CONTEXT__ #include "gdkglcontextprivate.h" -#include "gdkvisual.h" #include "gdkwindow.h" #include "gdkinternals.h" #include "gdkmain.h" diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h index 66cc8fc49e..05eace5553 100644 --- a/gdk/quartz/gdkprivate-quartz.h +++ b/gdk/quartz/gdkprivate-quartz.h @@ -161,9 +161,6 @@ gchar * _gdk_quartz_display_utf8_to_string_target (GdkDisplay *disp GdkScreen *_gdk_quartz_screen_new (void); void _gdk_quartz_screen_update_window_sizes (GdkScreen *screen); -/* Screen methods - visual */ -void _gdk_quartz_screen_init_visuals (GdkScreen *screen); - /* Screen methods - events */ gboolean _gdk_quartz_screen_get_setting (GdkScreen *screen, const gchar *name, diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h index e933708c99..6b7b434495 100644 --- a/gdk/quartz/gdkquartz.h +++ b/gdk/quartz/gdkquartz.h @@ -73,7 +73,6 @@ G_END_DECLS #include #include #include -#include #include #undef __GDKQUARTZ_H_INSIDE__ diff --git a/gdk/quartz/gdkquartzvisual.h b/gdk/quartz/gdkquartzvisual.h deleted file mode 100644 index 3ca46ecf4b..0000000000 --- a/gdk/quartz/gdkquartzvisual.h +++ /dev/null @@ -1,51 +0,0 @@ -/* gdkquartzvisual.h - * - * Copyright (C) 2005 Imendio AB - * Copyright (C) 2010 Kristian Rietveld - * - * 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, see . - */ - -#ifndef __GDK_QUARTZ_VISUAL_H__ -#define __GDK_QUARTZ_VISUAL_H__ - -#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GDK_TYPE_QUARTZ_VISUAL (gdk_quartz_visual_get_type ()) -#define GDK_QUARTZ_VISUAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_QUARTZ_VISUAL, GdkQuartzVisual)) -#define GDK_QUARTZ_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_QUARTZ_VISUAL, GdkQuartzVisualClass)) -#define GDK_IS_QUARTZ_VISUAL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_QUARTZ_VISUAL)) -#define GDK_IS_QUARTZ_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_VISUAL)) -#define GDK_QUARTZ_VISUAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_VISUAL, GdkQuartzVisualClass)) - -#ifdef GDK_COMPILATION -typedef struct _GdkQuartzVisual GdkQuartzVisual; -#else -typedef GdkVisual GdkQuartzVisual; -#endif -typedef struct _GdkQuartzVisualClass GdkQuartzVisualClass; - - -GDK_AVAILABLE_IN_ALL -GType gdk_quartz_visual_get_type (void); - -G_END_DECLS - -#endif /* __GDK_QUARTZ_VISUAL_H__ */ diff --git a/gdk/quartz/gdkvisual-quartz.c b/gdk/quartz/gdkvisual-quartz.c deleted file mode 100644 index b15ea4c9b8..0000000000 --- a/gdk/quartz/gdkvisual-quartz.c +++ /dev/null @@ -1,98 +0,0 @@ -/* gdkvisual-quartz.c - * - * Copyright (C) 2005 Imendio AB - * - * 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, see . - */ - -#include "config.h" - -#include "gdkvisualprivate.h" -#include "gdkquartzvisual.h" -#include "gdkprivate-quartz.h" - - -struct _GdkQuartzVisual -{ - GdkVisual visual; -}; - -struct _GdkQuartzVisualClass -{ - GdkVisualClass visual_class; -}; - - -static GdkVisual *system_visual; -static GdkVisual *rgba_visual; -static GdkVisual *gray_visual; - -static GdkVisual * -create_standard_visual (GdkScreen *screen, - gint depth) -{ - GdkVisual *visual = g_object_new (GDK_TYPE_QUARTZ_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; - visual->green_mask = 0xff00; - visual->blue_mask = 0xff; - - return visual; -} - -static GdkVisual * -create_gray_visual (GdkScreen *screen) -{ - GdkVisual *visual = g_object_new (GDK_TYPE_QUARTZ_VISUAL, NULL); - - visual->screen = screen; - - visual->depth = 1; - visual->byte_order = GDK_MSB_FIRST; - visual->colormap_size = 0; - - visual->type = GDK_VISUAL_STATIC_GRAY; - - return visual; -} - - -G_DEFINE_TYPE (GdkQuartzVisual, gdk_quartz_visual, GDK_TYPE_VISUAL) - -static void -gdk_quartz_visual_init (GdkQuartzVisual *quartz_visual) -{ -} - -static void -gdk_quartz_visual_class_init (GdkQuartzVisualClass *class) -{ -} - -void -_gdk_quartz_screen_init_visuals (GdkScreen *screen) -{ - system_visual = create_standard_visual (screen, 24); - rgba_visual = create_standard_visual (screen, 32); - gray_visual = create_gray_visual (screen); -} - diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 7cd39f2cfc..6bdc1fa25d 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -940,7 +940,6 @@ _gdk_quartz_window_init_windowing (GdkDisplay *display, _gdk_root->impl = g_object_new (_gdk_root_window_impl_quartz_get_type (), NULL); _gdk_root->impl_window = _gdk_root; - _gdk_root->visual = gdk_screen_get_system_visual (screen); impl = GDK_WINDOW_IMPL_QUARTZ (_gdk_root->impl);