mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix namespace convention for glib source.

Browse source
This commit is contained in:
Kristian Høgsberg 2008-12-02 18:28:23 -05:00
parent 35052568d0
commit e2ce43a9be
5 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flower.c
View file

@ -155,7 +155,7 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
source = wayland_source_new(display); source = wl_glib_source_new(display);
g_source_attach(source, NULL); g_source_attach(source, NULL);
flower.display = display; flower.display = display;

2
screenshot.c
View file

@ -91,7 +91,7 @@ int main(int argc, char *argv[])
} }
loop = g_main_loop_new(NULL, FALSE); loop = g_main_loop_new(NULL, FALSE);
source = wayland_source_new(display); source = wl_glib_source_new(display);
g_source_attach(source, NULL); g_source_attach(source, NULL);
s = screenshooter_create(display); s = screenshooter_create(display);

38
wayland-glib.c
View file

@ -25,17 +25,17 @@
#include "wayland-client.h" #include "wayland-client.h"
#include "wayland-glib.h" #include "wayland-glib.h"
struct _WaylandSource { typedef struct _WlSource {
GSource source; GSource source;
GPollFD pfd; GPollFD pfd;
uint32_t mask; uint32_t mask;
struct wl_display *display; struct wl_display *display;
}; } WlSource;
static gboolean static gboolean
wayland_source_prepare(GSource *base, gint *timeout) wl_glib_source_prepare(GSource *base, gint *timeout)
{ {
WaylandSource *source = (WaylandSource *) base; WlSource *source = (WlSource *) base;
*timeout = -1; *timeout = -1;
@ -51,19 +51,19 @@ wayland_source_prepare(GSource *base, gint *timeout)
} }
static gboolean static gboolean
wayland_source_check(GSource *base) wl_glib_source_check(GSource *base)
{ {
WaylandSource *source = (WaylandSource *) base; WlSource *source = (WlSource *) base;
return source->pfd.revents; return source->pfd.revents;
} }
static gboolean static gboolean
wayland_source_dispatch(GSource *base, wl_glib_source_dispatch(GSource *base,
GSourceFunc callback, GSourceFunc callback,
gpointer data) gpointer data)
{ {
WaylandSource *source = (WaylandSource *) base; WlSource *source = (WlSource *) base;
wl_display_iterate(source->display, wl_display_iterate(source->display,
WL_DISPLAY_READABLE); WL_DISPLAY_READABLE);
@ -71,17 +71,17 @@ wayland_source_dispatch(GSource *base,
return TRUE; return TRUE;
} }
static GSourceFuncs wayland_source_funcs = { static GSourceFuncs wl_glib_source_funcs = {
wayland_source_prepare, wl_glib_source_prepare,
wayland_source_check, wl_glib_source_check,
wayland_source_dispatch, wl_glib_source_dispatch,
NULL NULL
}; };
static int static int
wayland_source_update(uint32_t mask, void *data) wl_glib_source_update(uint32_t mask, void *data)
{ {
WaylandSource *source = data; WlSource *source = data;
source->mask = mask; source->mask = mask;
@ -89,15 +89,15 @@ wayland_source_update(uint32_t mask, void *data)
} }
GSource * GSource *
wayland_source_new(struct wl_display *display) wl_glib_source_new(struct wl_display *display)
{ {
WaylandSource *source; WlSource *source;
source = (WaylandSource *) g_source_new(&wayland_source_funcs, source = (WlSource *) g_source_new(&wl_glib_source_funcs,
sizeof (WaylandSource)); sizeof (WlSource));
source->display = display; source->display = display;
source->pfd.fd = wl_display_get_fd(display, source->pfd.fd = wl_display_get_fd(display,
wayland_source_update, source); wl_glib_source_update, source);
source->pfd.events = G_IO_IN | G_IO_ERR; source->pfd.events = G_IO_IN | G_IO_ERR;
g_source_add_poll(&source->source, &source->pfd); g_source_add_poll(&source->source, &source->pfd);

3
wayland-glib.h
View file

@ -25,8 +25,7 @@
#include <glib/gmain.h> #include <glib/gmain.h>
typedef struct _WaylandSource WaylandSource; GSource *wl_glib_source_new(struct wl_display *display);
GSource *wayland_source_new(struct wl_display *display);
#endif #endif

2
window.c
View file

@ -425,7 +425,7 @@ int main(int argc, char *argv[])
} }
loop = g_main_loop_new(NULL, FALSE); loop = g_main_loop_new(NULL, FALSE);
source = wayland_source_new(display); source = wl_glib_source_new(display);
g_source_attach(source, NULL); g_source_attach(source, NULL);
window = window_create(display, fd); window = window_create(display, fd);