nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a gsource instead of gio channels for watching x events

Browse source 
Fixes not getting some focusin events sometimes.
This commit is contained in:
Mikael Magnusson 2010-06-25 13:04:39 +02:00
parent de7c3f466f
commit a1bb01c92e
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
obt/xqueue.c
View file

@ -327,7 +327,7 @@ typedef struct _ObtXQueueCB {
static ObtXQueueCB *callbacks = NULL; static ObtXQueueCB *callbacks = NULL;
static guint n_callbacks = 0; static guint n_callbacks = 0;
static gboolean event_read(GIOChannel *s, GIOCondition cond, gpointer data) static gboolean event_read(GSource *source, GSourceFunc callback, gpointer data)
{ {
XEvent ev; XEvent ev;
@ -340,15 +340,39 @@ static gboolean event_read(GIOChannel *s, GIOCondition cond, gpointer data)
return TRUE; /* repeat */ return TRUE; /* repeat */
} }
static gboolean x_source_prepare(GSource *source, gint *timeout)
{
*timeout = -1;
return XPending(obt_display);
}
static gboolean x_source_check(GSource *source)
{
return XPending(obt_display);
}
struct x_source {
GSource source;
GPollFD pfd;
};
static GSourceFuncs x_source_funcs = {
x_source_prepare,
x_source_check,
event_read,
NULL
};
void xqueue_listen(void) void xqueue_listen(void)
{ {
GIOChannel *ch; GSource *source = g_source_new(&x_source_funcs, sizeof(struct x_source));
struct x_source *x_source = (struct x_source *)source;
GPollFD *pfd = &x_source->pfd;
g_assert(obt_display != NULL); *pfd = (GPollFD){ ConnectionNumber(obt_display), G_IO_IN, G_IO_IN };
g_source_add_poll(source, pfd);
ch = g_io_channel_unix_new(ConnectionNumber(obt_display)); g_source_attach(source, NULL);
g_io_add_watch(ch, G_IO_IN, event_read, NULL);
g_io_channel_unref(ch);
} }
void xqueue_add_callback(ObtXQueueFunc f, gpointer data) void xqueue_add_callback(ObtXQueueFunc f, gpointer data)