From: Matthias Clasen Date: Thu, 10 Nov 2022 14:36:00 +0000 (+0100) Subject: gdk: Rename GDK_SURFACE_TEMP X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~93^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2bab8cca5fa1800f6463708583df5d8e7b717a7d;p=gtk4.git gdk: Rename GDK_SURFACE_TEMP We use this value only for drag surfaces, so call it that. --- diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c index ac1da88ff9..a29b5f2601 100644 --- a/gdk/broadway/gdksurface-broadway.c +++ b/gdk/broadway/gdksurface-broadway.c @@ -239,7 +239,7 @@ _gdk_broadway_display_create_surface (GdkDisplay *display, case GDK_SURFACE_POPUP: type = GDK_TYPE_BROADWAY_POPUP; break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: type = GDK_TYPE_BROADWAY_DRAG_SURFACE; break; default: @@ -1115,7 +1115,7 @@ create_moveresize_surface (MoveResizeData *mv_resize, mv_resize->moveresize_emulation_surface = _gdk_broadway_display_create_surface (mv_resize->display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, -100, -100, 1, 1); diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h index c53368574d..a4e0e751ab 100644 --- a/gdk/gdksurfaceprivate.h +++ b/gdk/gdksurfaceprivate.h @@ -30,8 +30,8 @@ G_BEGIN_DECLS typedef enum { GDK_SURFACE_TOPLEVEL, - GDK_SURFACE_TEMP, - GDK_SURFACE_POPUP + GDK_SURFACE_POPUP, + GDK_SURFACE_DRAG } GdkSurfaceType; struct _GdkSurface diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index b847ea0ff4..00a33975d4 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -436,7 +436,7 @@ gdk_macos_surface_drag_begin (GdkSurface *surface, gdk_macos_device_query_state (device, surface, NULL, &px, &py, NULL); _gdk_macos_surface_get_root_coords (GDK_MACOS_SURFACE (surface), &sx, &sy); drag_surface = _gdk_macos_surface_new (GDK_MACOS_DISPLAY (surface->display), - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, surface, sx, sy, 1, 1); drag = g_object_new (GDK_TYPE_MACOS_DRAG, @@ -646,7 +646,7 @@ _gdk_macos_surface_new (GdkMacosDisplay *display, ret = _gdk_macos_popup_surface_new (display, parent, frame_clock, x, y, width, height); break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: ret = _gdk_macos_drag_surface_new (display, frame_clock, x, y, width, height); break; diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index a6ea68f8cc..fb2842b447 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -852,7 +852,7 @@ _gdk_wayland_display_create_surface (GdkDisplay *display, "frame-clock", frame_clock, NULL); break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: surface = g_object_new (GDK_TYPE_WAYLAND_DRAG_SURFACE, "display", display, "frame-clock", frame_clock, @@ -4811,7 +4811,7 @@ create_dnd_surface (GdkDisplay *display) GdkSurface *surface; surface = _gdk_wayland_display_create_surface (display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, 0, 0, 100, 100); diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index e5becd265f..c7302745fd 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -429,7 +429,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager) /* Create a dummy window to receive wintab events */ wintab_window = _gdk_win32_display_create_surface (display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, -100, -100, 2, 2); diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index d3fd992b13..679d80db6f 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -1652,7 +1652,7 @@ create_drag_surface (GdkDisplay *display) GdkSurface *surface; surface = _gdk_win32_display_create_surface (display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, 0, 0, 100, 100); diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 3aae19186c..5a32e78f30 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -421,7 +421,7 @@ RegisterGdkClass (GdkSurfaceType wtype) klass = klassTOPLEVEL; break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: if (klassTEMP == 0) { wcl.lpszClassName = L"gdkSurfaceTemp"; @@ -486,8 +486,8 @@ _gdk_win32_display_create_surface (GdkDisplay *display, GDK_NOTE (MISC, g_print ("_gdk_surface_new: %s\n", (surface_type == GDK_SURFACE_TOPLEVEL ? "TOPLEVEL" : - (surface_type == GDK_SURFACE_TEMP ? "TEMP" : - (surface_type == GDK_SURFACE_TEMP ? "POPUP" : "???"))))); + (surface_type == GDK_SURFACE_DRAG? "TEMP" : + (surface_type == GDK_SURFACE_DRAG ? "POPUP" : "???"))))); display_win32 = GDK_WIN32_DISPLAY (display); @@ -511,7 +511,7 @@ _gdk_win32_display_create_surface (GdkDisplay *display, "frame-clock", frame_clock, NULL); break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: impl = g_object_new (GDK_TYPE_WIN32_DRAG_SURFACE, "display", display, "frame-clock", frame_clock, @@ -542,7 +542,7 @@ _gdk_win32_display_create_surface (GdkDisplay *display, dwStyle |= WS_OVERLAPPEDWINDOW; break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: dwExStyle |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST; /* fall through */ case GDK_SURFACE_POPUP: @@ -646,7 +646,7 @@ _gdk_win32_display_create_surface (GdkDisplay *display, gdk_surface_set_egl_native_window (surface, (void *) impl->handle); - if (surface_type != GDK_SURFACE_TEMP) + if (surface_type != GDK_SURFACE_DRAG) { if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER) gdk_winpointer_initialize_surface (surface); diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 18b808e544..e9e1b766d6 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1393,7 +1393,7 @@ gdk_x11_display_init_leader_surface (GdkX11Display *self) self->leader_gdk_surface = _gdk_x11_display_create_surface (display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, -100, -100, 1, 1); diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index 9ed967e886..7a58f690ae 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -1261,7 +1261,7 @@ create_drag_surface (GdkDisplay *display) GdkSurface *surface; surface = _gdk_x11_display_create_surface (display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, 0, 0, 100, 100); @@ -2027,7 +2027,7 @@ _gdk_x11_surface_drag_begin (GdkSurface *surface, display = gdk_surface_get_display (surface); ipc_surface = _gdk_x11_display_create_surface (display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, -99, -99, 1, 1); diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 3bf6936e9a..b77cd2e3ad 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -1194,7 +1194,7 @@ _gdk_x11_display_create_surface (GdkDisplay *display, "frame-clock", frame_clock, NULL); break; - case GDK_SURFACE_TEMP: + case GDK_SURFACE_DRAG: surface = g_object_new (GDK_TYPE_X11_DRAG_SURFACE, "display", display, "frame-clock", frame_clock, @@ -1233,7 +1233,7 @@ _gdk_x11_display_create_surface (GdkDisplay *display, xattributes.colormap = gdk_x11_display_get_window_colormap (display_x11); xattributes_mask |= CWColormap; - if (surface_type == GDK_SURFACE_TEMP || + if (surface_type == GDK_SURFACE_DRAG || surface_type == GDK_SURFACE_POPUP) { xattributes.save_under = True; @@ -4371,7 +4371,7 @@ create_moveresize_surface (MoveResizeData *mv_resize, mv_resize->moveresize_emulation_surface = _gdk_x11_display_create_surface (mv_resize->display, - GDK_SURFACE_TEMP, + GDK_SURFACE_DRAG, NULL, -100, -100, 1, 1);