AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk: Drop GdkWindowAttr

Browse Source 
All the information in it is already contained
in the surface object we pass along, and none
of the backend implementations were using the
attributes at all.
This commit is contained in:
Matthias Clasen 2019-04-21 12:24:07 -04:00
parent 2855729cb4
commit 47fb092393
12 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/broadway/gdkprivate-broadway.h
View File

@ -103,8 +103,7 @@ void _gdk_broadway_display_get_maximal_cursor_size (GdkDisplay *display,
guint *height);
void _gdk_broadway_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes);
GdkSurface *real_parent);
gint _gdk_broadway_display_text_property_to_utf8_list (GdkDisplay *display,
GdkAtom encoding,
gint format,

3
gdk/broadway/gdksurface-broadway.c
View File

@ -217,8 +217,7 @@ connect_frame_clock (GdkSurface *surface)
void
_gdk_broadway_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes)
GdkSurface *real_parent)
{
GdkSurfaceImplBroadway *impl;
GdkBroadwayDisplay *broadway_display;

6
gdk/gdkdisplay.c
View File

@ -1327,13 +1327,11 @@ _gdk_display_event_data_free (GdkDisplay *display,
void
gdk_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes)
GdkSurface *real_parent)
{
GDK_DISPLAY_GET_CLASS (display)->create_surface_impl (display,
surface,
real_parent,
attributes);
real_parent);
}
GdkSurface *

6
gdk/gdkdisplayprivate.h
View File

@ -143,8 +143,7 @@ struct _GdkDisplayClass
GdkEvent *event);
void (*create_surface_impl) (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes);
GdkSurface *real_parent);
GdkKeymap * (*get_keymap) (GdkDisplay *display);
@ -231,8 +230,7 @@ void _gdk_display_event_data_free (GdkDisplay *display
GdkEvent *event);
void gdk_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes);
GdkSurface *real_parent);
GdkSurface * _gdk_display_create_surface (GdkDisplay *display);
gboolean gdk_display_make_gl_context_current (GdkDisplay *display,

10
gdk/gdkinternals.h
View File

@ -42,8 +42,6 @@ G_BEGIN_DECLS
/* Debugging support */
typedef struct _GdkSurfaceAttr GdkSurfaceAttr;
typedef enum {
GDK_DEBUG_MISC = 1 << 0,
GDK_DEBUG_EVENTS = 1 << 1,
@ -118,14 +116,6 @@ typedef enum
typedef struct _GdkSurfacePaint GdkSurfacePaint;
struct _GdkSurfaceAttr
{
gint x, y;
gint width;
gint height;
GdkSurfaceType surface_type;
};
struct _GdkSurface
{
GObject parent_instance;

10
gdk/gdksurface.c
View File

@ -483,7 +483,6 @@ gdk_surface_new (GdkDisplay *display,
{
GdkSurface *surface;
GdkFrameClock *frame_clock;
GdkSurfaceAttr attributes;
surface = _gdk_display_create_surface (display);
@ -491,22 +490,17 @@ gdk_surface_new (GdkDisplay *display,
surface->focus_on_map = TRUE;
surface->alpha = 255;
surface->surface_type = surface_type;
surface->x = x;
surface->y = y;
surface->width = width;
surface->height = height;
surface->surface_type = surface_type;
frame_clock = g_object_new (GDK_TYPE_FRAME_CLOCK_IDLE, NULL);
gdk_surface_set_frame_clock (surface, frame_clock);
g_object_unref (frame_clock);
attributes.surface_type = surface_type;
attributes.x = x;
attributes.y = y;
attributes.width = width;
attributes.height = height;
gdk_display_create_surface_impl (display, surface, NULL, &attributes);
gdk_display_create_surface_impl (display, surface, NULL);
surface->impl_surface = surface;
g_signal_connect (display, "seat-removed", G_CALLBACK (seat_removed_cb), surface);

3
gdk/quartz/gdksurface-quartz.c
View File

@ -734,8 +734,7 @@ get_nsscreen_for_point (gint x, gint y)
void
_gdk_quartz_display_create_surface_impl (GdkDisplay *display,
GdkSurface *window,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes)
GdkSurface *real_parent)
{
GdkSurfaceImplQuartz *impl;
GdkSurfaceImplQuartz *parent_impl;

3
gdk/wayland/gdkprivate-wayland.h
View File

@ -118,8 +118,7 @@ void gdk_wayland_drop_set_action (GdkDrop
void _gdk_wayland_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes);
GdkSurface *real_parent);
gint _gdk_wayland_display_text_property_to_utf8_list (GdkDisplay *display,
GdkAtom encoding,

3
gdk/wayland/gdksurface-wayland.c
View File

@ -545,8 +545,7 @@ static void gdk_wayland_surface_create_surface (GdkSurface *surface);
void
_gdk_wayland_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes)
GdkSurface *real_parent)
{
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
GdkSurfaceImplWayland *impl;

13
gdk/win32/gdksurface-win32.c
View File

@ -520,18 +520,12 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint)
* except for toplevel window where OS/Window Manager placement
* is used.
*
* From attributes the only things used is: colormap, title,
* wmclass and type_hint. [1]. We are checking redundant information
* and complain if that changes, which would break this implementation
* again.
*
* [1] http://mail.gnome.org/archives/gtk-devel-list/2010-August/msg00214.html
*/
void
_gdk_win32_display_create_surface_impl (GdkDisplay *display,
GdkSurface *window,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes)
GdkSurface *real_parent)
{
HWND hwndNew;
HANDLE hparent;
@ -550,9 +544,8 @@ _gdk_win32_display_create_surface_impl (GdkDisplay *display,
g_return_if_fail (display == _gdk_display);
GDK_NOTE (MISC,
g_print ("_gdk_surface_impl_new: %s %s\n", (window->surface_type == GDK_SURFACE_TOPLEVEL ? "TOPLEVEL" :
(window->surface_type == GDK_SURFACE_TEMP ? "TEMP" : "???")),
(attributes->wclass == GDK_INPUT_OUTPUT ? "" : "input-only")));
g_print ("_gdk_surface_impl_new: %s\n", (window->surface_type == GDK_SURFACE_TOPLEVEL ? "TOPLEVEL" :
(window->surface_type == GDK_SURFACE_TEMP ? "TEMP" : "???")));
hparent = (real_parent != NULL) ? GDK_SURFACE_HWND (real_parent) : NULL;

3
gdk/x11/gdkprivate-x11.h
View File

@ -178,8 +178,7 @@ void _gdk_x11_display_get_maximal_cursor_size (GdkDisplay *display,
guint *height);
void _gdk_x11_display_create_surface_impl (GdkDisplay *display,
GdkSurface *window,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes);
GdkSurface *real_parent);
GList * gdk_x11_display_get_toplevel_windows (GdkDisplay *display);
void _gdk_x11_precache_atoms (GdkDisplay *display,

3
gdk/x11/gdksurface-x11.c
View File

@ -814,8 +814,7 @@ connect_frame_clock (GdkSurface *surface)
void
_gdk_x11_display_create_surface_impl (GdkDisplay *display,
GdkSurface *surface,
GdkSurface *real_parent,
GdkSurfaceAttr *attributes)
GdkSurface *real_parent)
{
GdkSurfaceImplX11 *impl;
GdkX11Screen *x11_screen;