export if the keyboard and pointer are currently grabbed or not

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index a50a48fb97cf755913831078c3fbf4cfdc196270..b8b7e698001d4982a3889275c57147e8519d9113 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -1,5 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   mainloop.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "mainloop.h"
-#include "focus.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -100,7 +117,6 @@ struct _ObMainLoopXHandlerType
     ObMainLoop *loop;
     gpointer data;
     ObMainLoopXHandler func;
-    ObMainLoopXDoneHandler done_func;
     GDestroyNotify destroy;
 };
 
@@ -265,12 +281,6 @@ void ob_main_loop_run(ObMainLoop *loop)
                     h->func(&e, h->data);
                 }
             } while (XPending(loop->display));
-
-            for (it = loop->x_handlers; it; it = g_slist_next(it)) {
-                ObMainLoopXHandlerType *h = it->data;
-                if (h->done_func)
-                    h->done_func(h->data);
-            }
         } else {
             /* this only runs if there were no x events received */
 
@@ -305,7 +315,6 @@ void ob_main_loop_exit(ObMainLoop *loop)
 
 void ob_main_loop_x_add(ObMainLoop *loop,
                         ObMainLoopXHandler handler,
-                        ObMainLoopXDoneHandler done_handler,
                         gpointer data,
                         GDestroyNotify notify)
 {
@@ -314,7 +323,6 @@ void ob_main_loop_x_add(ObMainLoop *loop,
     h = g_new(ObMainLoopXHandlerType, 1);
     h->loop = loop;
     h->func = handler;
-    h->done_func = done_handler;
     h->data = data;
     h->destroy = notify;
     loop->x_handlers = g_slist_prepend(loop->x_handlers, h);