[gtk/wip/otte/gleanup: 23/59] x11: Remove GdkVisual
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/gleanup: 23/59] x11: Remove GdkVisual
- Date: Tue, 20 Jul 2021 03:21:17 +0000 (UTC)
commit fb956dfdcc29d2007e153ddb12cb013f2f33ff57
Author: Benjamin Otte <otte redhat com>
Date: Sun Jun 13 17:43:15 2021 +0200
x11: Remove GdkVisual
It's not used anymore.
gdk/x11/gdkglcontext-egl.c | 1 -
gdk/x11/gdkglcontext-glx.c | 1 -
gdk/x11/gdkglcontext-x11.c | 1 -
gdk/x11/gdkglcontext-x11.h | 1 -
gdk/x11/gdkscreen-x11.c | 11 --
gdk/x11/gdkscreen-x11.h | 12 ---
gdk/x11/gdksurface-x11.c | 1 -
gdk/x11/gdkvisual-x11.c | 247 ---------------------------------------------
gdk/x11/gdkvisual-x11.h | 83 ---------------
gdk/x11/meson.build | 1 -
10 files changed, 359 deletions(-)
---
diff --git a/gdk/x11/gdkglcontext-egl.c b/gdk/x11/gdkglcontext-egl.c
index cad79305bb..4bb1f89d06 100644
--- a/gdk/x11/gdkglcontext-egl.c
+++ b/gdk/x11/gdkglcontext-egl.c
@@ -19,7 +19,6 @@
#include "gdkx11glcontext.h"
#include "gdkx11screen.h"
#include "gdkx11surface.h"
-#include "gdkvisual-x11.h"
#include "gdkx11property.h"
#include <X11/Xatom.h>
diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c
index 04af52483f..0df7c40ba8 100644
--- a/gdk/x11/gdkglcontext-glx.c
+++ b/gdk/x11/gdkglcontext-glx.c
@@ -19,7 +19,6 @@
#include "gdkx11glcontext.h"
#include "gdkx11screen.h"
#include "gdkx11surface.h"
-#include "gdkvisual-x11.h"
#include "gdkx11property.h"
#include <X11/Xatom.h>
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index b493c34e29..7d618c5b7c 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -29,7 +29,6 @@
#include "gdkx11glcontext.h"
#include "gdkx11screen.h"
#include "gdkx11surface.h"
-#include "gdkvisual-x11.h"
#include "gdkx11property.h"
#include <X11/Xatom.h>
diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h
index e9a349613c..7dbd4d9ba5 100644
--- a/gdk/x11/gdkglcontext-x11.h
+++ b/gdk/x11/gdkglcontext-x11.h
@@ -35,7 +35,6 @@
#include "gdkglcontextprivate.h"
#include "gdkdisplay-x11.h"
-#include "gdkvisual-x11.h"
#include "gdksurface.h"
#include "gdkinternals.h"
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index d06ecfb05c..e84645bf17 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -91,9 +91,6 @@ gdk_x11_screen_dispose (GObject *object)
_gdk_x11_xsettings_finish (x11_screen);
- for (i = 0; i < x11_screen->nvisuals; i++)
- g_object_run_dispose (G_OBJECT (x11_screen->visuals[i]));
-
G_OBJECT_CLASS (gdk_x11_screen_parent_class)->dispose (object);
x11_screen->xdisplay = NULL;
@@ -106,12 +103,6 @@ static void
gdk_x11_screen_finalize (GObject *object)
{
GdkX11Screen *x11_screen = GDK_X11_SCREEN (object);
- int i;
-
- /* Visual Part */
- for (i = 0; i < x11_screen->nvisuals; i++)
- g_object_unref (x11_screen->visuals[i]);
- g_free (x11_screen->visuals);
g_free (x11_screen->window_manager_name);
@@ -897,8 +888,6 @@ _gdk_x11_screen_new (GdkDisplay *display,
init_randr_support (x11_screen);
init_multihead (x11_screen);
- _gdk_x11_screen_init_visuals (x11_screen);
-
return x11_screen;
}
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 03cbee6678..2d9c8ae677 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -23,7 +23,6 @@
#define __GDK_X11_SCREEN__
#include "gdkx11screen.h"
-#include "gdkvisual-x11.h"
#include <X11/X.h>
#include <X11/Xlib.h>
@@ -71,15 +70,6 @@ struct _GdkX11Screen
guint xft_antialias : 1;
guint xft_hinting : 1;
- /* Visual Part */
- int nvisuals;
- GdkX11Visual **visuals;
- int available_depths[7];
- GdkVisualType available_types[6];
- gint16 navailable_depths;
- gint16 navailable_types;
- GdkX11Visual *rgba_visual;
-
/* cache for window->translate vfunc */
GC subwindow_gcs[32];
};
@@ -118,8 +108,6 @@ _gdk_x11_screen_get_xft_setting (GdkX11Screen *screen,
const char *name,
GValue *value);
-void _gdk_x11_screen_init_visuals (GdkX11Screen *screen);
-
G_END_DECLS
#endif /* __GDK_X11_SCREEN__ */
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 6edf839cf8..e532645f80 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -31,7 +31,6 @@
#include "gdkpopupprivate.h"
#include "gdktoplevelprivate.h"
#include "gdkdragsurfaceprivate.h"
-#include "gdkvisual-x11.h"
#include "gdkinternals.h"
#include "gdkdeviceprivate.h"
#include "gdkdevice-xi2-private.h"
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 082fc9803a..1e09434afd 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -16,7 +16,6 @@ gdk_x11_public_sources = files([
'gdkproperty-x11.c',
'gdkscreen-x11.c',
'gdkselection-x11.c',
- 'gdkvisual-x11.c',
'gdksurface-x11.c',
'gdkxid.c',
'xsettings-client.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]