diff options
| author | Alexander Larsson <alexl@redhat.com> | 2018-03-20 15:14:10 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2018-03-20 15:14:10 +0100 |
| commit | 3dce0dcca705c4ab6d8c4f5067db93947184b6af (patch) | |
| tree | 8de99e5b35abc5242accafb84d0526b08c66b9e7 /gdk/gdkdisplayprivate.h | |
| parent | 9a7e721181ce714ab248429dc1258984b9e10748 (diff) | |
| download | gtk+-3dce0dcca705c4ab6d8c4f5067db93947184b6af.tar.gz | |
GdkSurface: Rename lots of stuff from window->surface
Mostly these are internal things, but the major public change is
that event.window is now event.surface.
Diffstat (limited to 'gdk/gdkdisplayprivate.h')
| -rw-r--r-- | gdk/gdkdisplayprivate.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index f885f33400..db2ec347d7 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -40,7 +40,7 @@ typedef struct _GdkDisplayClass GdkDisplayClass; /* Tracks information about the device grab on this display */ typedef struct { - GdkSurface *window; + GdkSurface *surface; GdkSurface *native_surface; gulong serial_start; gulong serial_end; /* exclusive, i.e. not active on serial_end */ @@ -54,16 +54,16 @@ typedef struct guint implicit : 1; } GdkDeviceGrabInfo; -/* Tracks information about which window and position the pointer last was in. +/* Tracks information about which surface and position the pointer last was in. * This is useful when we need to synthesize events later. * Note that we track toplevel_under_pointer using enter/leave events, * so in the case of a grab, either with owner_events==FALSE or with the - * pointer in no clients window the x/y coordinates may actually be outside - * the window. + * pointer in no clients surface the x/y coordinates may actually be outside + * the surface. */ typedef struct { - GdkSurface *surface_under_pointer; /* window that last got a normal enter event */ + GdkSurface *surface_under_pointer; /* surface that last got a normal enter event */ gdouble toplevel_x, toplevel_y; guint32 state; guint32 button; @@ -114,7 +114,7 @@ struct _GdkDisplayClass { GObjectClass parent_class; - GType surface_type; /* type for native windows for this display, set in class_init */ + GType surface_type; /* type for native surfaces for this display, set in class_init */ GType vk_context_type; /* type for GdkVulkanContext, must be set if vk_extension_name != NULL */ const char *vk_extension_name; /* Name of required windowing vulkan extension or %NULL (default) if Vulkan isn't supported */ @@ -141,7 +141,7 @@ struct _GdkDisplayClass void (*event_data_free) (GdkDisplay *display, GdkEvent *event); void (*create_surface_impl) (GdkDisplay *display, - GdkSurface *window, + GdkSurface *surface, GdkSurface *real_parent, GdkEventMask event_mask, GdkSurfaceAttr *attributes); @@ -167,7 +167,7 @@ struct _GdkDisplayClass int index); GdkMonitor * (*get_primary_monitor) (GdkDisplay *display); GdkMonitor * (*get_monitor_at_surface) (GdkDisplay *display, - GdkSurface *window); + GdkSurface *surface); gboolean (*get_setting) (GdkDisplay *display, const char *name, GValue *value); @@ -198,7 +198,7 @@ GdkDeviceGrabInfo * _gdk_display_get_last_device_grab (GdkDisplay *display, GdkDevice *device); GdkDeviceGrabInfo * _gdk_display_add_device_grab (GdkDisplay *display, GdkDevice *device, - GdkSurface *window, + GdkSurface *surface, GdkSurface *native_surface, GdkGrabOwnership grab_ownership, gboolean owner_events, @@ -231,11 +231,11 @@ void _gdk_display_event_data_copy (GdkDisplay *display void _gdk_display_event_data_free (GdkDisplay *display, GdkEvent *event); void _gdk_display_create_surface_impl (GdkDisplay *display, - GdkSurface *window, + GdkSurface *surface, GdkSurface *real_parent, GdkEventMask event_mask, GdkSurfaceAttr *attributes); -GdkSurface * _gdk_display_create_window (GdkDisplay *display); +GdkSurface * _gdk_display_create_surface (GdkDisplay *display); gboolean gdk_display_make_gl_context_current (GdkDisplay *display, GdkGLContext *context); |