}
static GdkCursor *
-create_cursor(GdkDisplayWayland *display, GdkPixbuf *pixbuf, int x, int y)
+create_cursor(GdkWaylandDisplay *display, GdkPixbuf *pixbuf, int x, int y)
{
GdkWaylandCursor *cursor;
int stride, fd;
_gdk_wayland_display_get_cursor_for_type (GdkDisplay *display,
GdkCursorType cursor_type)
{
- GdkDisplayWayland *wayland_display;
+ GdkWaylandDisplay *wayland_display;
GdkPixbuf *pixbuf = NULL;
GError *error = NULL;
int i;
i = 0;
}
- wayland_display = GDK_DISPLAY_WAYLAND (display);
+ wayland_display = GDK_WAYLAND_DISPLAY (display);
if (!wayland_display->cursors)
wayland_display->cursors =
g_new0 (GdkCursor *, G_N_ELEMENTS(cursor_definitions));
int32_t x, int32_t y, int32_t sx, int32_t sy)
{
GdkWaylandDevice *device = data;
- GdkDisplayWayland *display = GDK_DISPLAY_WAYLAND (device->display);
+ GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (device->display);
GdkEvent *event;
event = gdk_event_new (GDK_NOTHING);
uint32_t time, uint32_t button, uint32_t state)
{
GdkWaylandDevice *device = data;
- GdkDisplayWayland *display = GDK_DISPLAY_WAYLAND (device->display);
+ GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (device->display);
GdkEvent *event;
uint32_t modifier;
int gdk_button;
struct wl_input_device *wl_device)
{
GdkDisplay *display;
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
GdkDeviceManagerCore *device_manager_core =
GDK_DEVICE_MANAGER_CORE(device_manager);
GdkWaylandDevice *device;
device = g_new0 (GdkWaylandDevice, 1);
display = gdk_device_manager_get_display (device_manager);
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
device->display = display;
device->pointer = g_object_new (GDK_TYPE_DEVICE_CORE,
gpointer userdata)
{
GdkDisplay *display;
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
GdkWaylandSelectionOffer *offer;
GdkWaylandDevice *device;
gint i;
device = GDK_DEVICE_CORE (gdk_device)->device;
display = device->display;
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
offer = g_new0 (GdkWaylandSelectionOffer, 1);
offer->cb = cb;
#include "gdkkeysprivate.h"
#include "gdkprivate-wayland.h"
-G_DEFINE_TYPE (GdkDisplayWayland, _gdk_display_wayland, GDK_TYPE_DISPLAY)
+G_DEFINE_TYPE (GdkWaylandDisplay, _gdk_wayland_display, GDK_TYPE_DISPLAY)
static void
gdk_input_init (GdkDisplay *display)
{
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
GdkDeviceManager *device_manager;
GdkDevice *device;
GList *list, *l;
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
device_manager = gdk_display_get_device_manager (display);
/* For backwards compatibility, just add
gdk_display_handle_global(struct wl_display *display, uint32_t id,
const char *interface, uint32_t version, void *data)
{
- GdkDisplayWayland *display_wayland = data;
+ GdkWaylandDisplay *display_wayland = data;
GdkDisplay *gdk_display = GDK_DISPLAY_OBJECT (data);
struct wl_input_device *input;
static gboolean
gdk_display_init_egl(GdkDisplay *display)
{
- GdkDisplayWayland *display_wayland = GDK_DISPLAY_WAYLAND (display);
+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
EGLint major, minor, i;
void *p;
static const struct { const char *f; unsigned int offset; }
extension_functions[] = {
- { "glEGLImageTargetTexture2DOES", offsetof(GdkDisplayWayland, image_target_texture_2d) },
- { "eglCreateImageKHR", offsetof(GdkDisplayWayland, create_image) },
- { "eglDestroyImageKHR", offsetof(GdkDisplayWayland, destroy_image) }
+ { "glEGLImageTargetTexture2DOES", offsetof(GdkWaylandDisplay, image_target_texture_2d) },
+ { "eglCreateImageKHR", offsetof(GdkWaylandDisplay, create_image) },
+ { "eglDestroyImageKHR", offsetof(GdkWaylandDisplay, destroy_image) }
};
display_wayland->egl_display =
{
struct wl_display *wl_display;
GdkDisplay *display;
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
wl_display = wl_display_connect(display_name);
if (!wl_display)
return NULL;
- display = g_object_new (GDK_TYPE_DISPLAY_WAYLAND, NULL);
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display = g_object_new (GDK_TYPE_WAYLAND_DISPLAY, NULL);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
display_wayland->wl_display = wl_display;
static void
gdk_wayland_display_dispose (GObject *object)
{
- GdkDisplayWayland *display_wayland = GDK_DISPLAY_WAYLAND (object);
+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (object);
_gdk_wayland_display_manager_remove_display (gdk_display_manager_get (),
GDK_DISPLAY (display_wayland));
eglTerminate(display_wayland->egl_display);
#endif
- G_OBJECT_CLASS (_gdk_display_wayland_parent_class)->dispose (object);
+ G_OBJECT_CLASS (_gdk_wayland_display_parent_class)->dispose (object);
}
static void
gdk_wayland_display_finalize (GObject *object)
{
- GdkDisplayWayland *display_wayland = GDK_DISPLAY_WAYLAND (object);
+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (object);
/* Keymap */
if (display_wayland->keymap)
g_free (display_wayland->startup_notification_id);
- G_OBJECT_CLASS (_gdk_display_wayland_parent_class)->finalize (object);
+ G_OBJECT_CLASS (_gdk_wayland_display_parent_class)->finalize (object);
}
static const gchar *
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
g_return_val_if_fail (screen_num == 0, NULL);
- return GDK_DISPLAY_WAYLAND (display)->screen;
+ return GDK_WAYLAND_DISPLAY (display)->screen;
}
static GdkScreen *
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- return GDK_DISPLAY_WAYLAND (display)->screen;
+ return GDK_WAYLAND_DISPLAY (display)->screen;
}
static void
static void
gdk_wayland_display_sync (GdkDisplay *display)
{
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
g_return_if_fail (GDK_IS_DISPLAY (display));
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
wl_display_roundtrip(display_wayland->wl_display);
}
if (!display->closed)
_gdk_wayland_display_flush (display,
- GDK_DISPLAY_WAYLAND (display)->event_source);
+ GDK_WAYLAND_DISPLAY (display)->event_source);
}
static gboolean
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- return GDK_DISPLAY_WAYLAND (display)->input_devices;
+ return GDK_WAYLAND_DISPLAY (display)->input_devices;
}
static void
static GdkKeymap *
gdk_wayland_display_get_keymap (GdkDisplay *display)
{
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
if (!display_wayland->keymap)
display_wayland->keymap = _gdk_wayland_keymap_new (display);
}
static void
-_gdk_display_wayland_class_init (GdkDisplayWaylandClass * class)
+_gdk_wayland_display_class_init (GdkWaylandDisplayClass * class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GdkDisplayClass *display_class = GDK_DISPLAY_CLASS (class);
}
static void
-_gdk_display_wayland_init (GdkDisplayWayland *display)
+_gdk_wayland_display_init (GdkWaylandDisplay *display)
{
_gdk_wayland_display_manager_add_display (gdk_display_manager_get (),
GDK_DISPLAY (display));
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GDK_DISPLAY_WAYLAND__
-#define __GDK_DISPLAY_WAYLAND__
+#ifndef __GDK_WAYLAND_DISPLAY__
+#define __GDK_WAYLAND_DISPLAY__
#include <config.h>
#include <stdint.h>
G_BEGIN_DECLS
-typedef struct _GdkDisplayWayland GdkDisplayWayland;
-typedef struct _GdkDisplayWaylandClass GdkDisplayWaylandClass;
+typedef struct _GdkWaylandDisplay GdkWaylandDisplay;
+typedef struct _GdkWaylandDisplayClass GdkWaylandDisplayClass;
-#define GDK_TYPE_DISPLAY_WAYLAND (_gdk_display_wayland_get_type())
-#define GDK_DISPLAY_WAYLAND(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_WAYLAND, GdkDisplayWayland))
-#define GDK_DISPLAY_WAYLAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_WAYLAND, GdkDisplayWaylandClass))
-#define GDK_IS_DISPLAY_WAYLAND(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_WAYLAND))
-#define GDK_IS_DISPLAY_WAYLAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_WAYLAND))
-#define GDK_DISPLAY_WAYLAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_WAYLAND, GdkDisplayWaylandClass))
+#define GDK_TYPE_WAYLAND_DISPLAY (_gdk_wayland_display_get_type())
+#define GDK_WAYLAND_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY, GdkWaylandDisplay))
+#define GDK_WAYLAND_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY, GdkWaylandDisplayClass))
+#define GDK_IS_WAYLAND_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY))
+#define GDK_IS_WAYLAND_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY))
+#define GDK_WAYLAND_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY, GdkWaylandDisplayClass))
-struct _GdkDisplayWayland
+struct _GdkWaylandDisplay
{
GdkDisplay parent_instance;
GdkScreen *screen;
#endif
};
-struct _GdkDisplayWaylandClass
+struct _GdkWaylandDisplayClass
{
GdkDisplayClass parent_class;
};
-GType _gdk_display_wayland_get_type (void);
+GType _gdk_wayland_display_get_type (void);
G_END_DECLS
-#endif /* __GDK_DISPLAY_WAYLAND__ */
+#endif /* __GDK_WAYLAND_DISPLAY__ */
gdk_event_source_prepare(GSource *base, gint *timeout)
{
GdkWaylandEventSource *source = (GdkWaylandEventSource *) base;
- GdkDisplayWayland *display = (GdkDisplayWayland *) source->display;
+ GdkWaylandDisplay *display = (GdkWaylandDisplay *) source->display;
*timeout = -1;
{
GSource *source;
GdkWaylandEventSource *wl_source;
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
char *name;
source = g_source_new (&wl_glib_source_funcs,
g_free (name);
wl_source = (GdkWaylandEventSource *) source;
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
wl_source->display = display;
wl_source->pfd.fd = wl_display_get_fd(display_wayland->wl_display,
gdk_event_source_update, source);
GdkWaylandEventSource *wayland_source = (GdkWaylandEventSource *) source;
while (wayland_source->mask & WL_DISPLAY_WRITABLE)
- wl_display_iterate(GDK_DISPLAY_WAYLAND (display)->wl_display,
+ wl_display_iterate(GDK_WAYLAND_DISPLAY (display)->wl_display,
WL_DISPLAY_WRITABLE);
}
void
_gdk_wayland_display_queue_events (GdkDisplay *display)
{
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
GdkWaylandEventSource *source;
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
source = (GdkWaylandEventSource *) display_wayland->event_source;
if (source->pfd.revents)
size_t buf_length;
#endif
struct wl_buffer *buffer;
- GdkDisplayWayland *display;
+ GdkWaylandDisplay *display;
int32_t width, height;
} GdkWaylandCairoSurfaceData;
}
static cairo_surface_t *
-gdk_wayland_create_cairo_surface (GdkDisplayWayland *display,
+gdk_wayland_create_cairo_surface (GdkWaylandDisplay *display,
int width, int height)
{
GdkWaylandCairoSurfaceData *data;
}
static cairo_surface_t *
-gdk_wayland_create_cairo_surface (GdkDisplayWayland *display,
+gdk_wayland_create_cairo_surface (GdkWaylandDisplay *display,
int width, int height)
{
GdkWaylandCairoSurfaceData *data;
gdk_wayland_window_ref_cairo_surface (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
- GdkDisplayWayland *display_wayland =
- GDK_DISPLAY_WAYLAND (gdk_window_get_display (impl->wrapper));
+ GdkWaylandDisplay *display_wayland =
+ GDK_WAYLAND_DISPLAY (gdk_window_get_display (impl->wrapper));
if (GDK_WINDOW_DESTROYED (impl->wrapper))
return NULL;
gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped)
{
GdkDisplay *display;
- GdkDisplayWayland *display_wayland;
+ GdkWaylandDisplay *display_wayland;
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkEvent *event;
display = gdk_window_get_display (window);
- display_wayland = GDK_DISPLAY_WAYLAND (display);
+ display_wayland = GDK_WAYLAND_DISPLAY (display);
if (impl->user_time != 0 &&
display_wayland->user_time != 0 &&