See the COPYING file for a copy of the GNU General Public License.
*/
+#include "event.h"
#include "debug.h"
+#include "window.h"
#include "openbox.h"
#include "dock.h"
#include "client.h"
#include "group.h"
#include "stacking.h"
#include "extensions.h"
-#include "event.h"
#include <X11/Xlib.h>
#include <X11/keysym.h>
static int mask_table_size;
static guint ignore_enter_focus = 0;
-static ObClient *focus_delay_client;
static gboolean menu_can_hide;
event_handle_client(it->data, e);
}
+void event_enter_client(ObClient *client)
+{
+ g_assert(config_focus_follow);
+
+ if (client_normal(client) && client_can_focus(client)) {
+ if (config_focus_delay) {
+ ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
+ ob_main_loop_timeout_add(ob_main_loop,
+ config_focus_delay,
+ focus_delay_func,
+ client, NULL);
+ } else
+ focus_delay_func(client);
+ }
+}
+
static void event_handle_client(ObClient *client, XEvent *e)
{
XEvent ce;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_FRAME:
- /* XXX if doing a 'reconfigure' make sure you kill this timer,
- maybe all timers.. */
- if (config_focus_delay && client == focus_delay_client) {
+ /*
+ if (config_focus_follow && config_focus_delay)
ob_main_loop_timeout_remove_data(ob_main_loop,
focus_delay_func,
- focus_delay_client);
- focus_delay_client = NULL;
- }
+ client);
+ */
+ break;
default:
break;
}
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_FRAME:
- if (!nofocus && client_normal(client) && config_focus_follow) {
- if (e->xcrossing.mode == NotifyGrab ||
- e->xcrossing.detail == NotifyInferior)
- {
+ if (e->xcrossing.mode == NotifyGrab ||
+ e->xcrossing.detail == NotifyInferior ||
+ e->xcrossing.mode == NotifyUngrab)
+ {
#ifdef DEBUG_FOCUS
- ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
- (e->type == EnterNotify ? "Enter" : "Leave"),
- e->xcrossing.mode,
- e->xcrossing.detail, client?client->window:0);
+ ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
+ (e->type == EnterNotify ? "Enter" : "Leave"),
+ e->xcrossing.mode,
+ e->xcrossing.detail, client?client->window:0);
#endif
- } else {
+ } else {
#ifdef DEBUG_FOCUS
- ob_debug("%sNotify mode %d detail %d on %lx, "
- "focusing window\n",
- (e->type == EnterNotify ? "Enter" : "Leave"),
- e->xcrossing.mode,
- e->xcrossing.detail, client?client->window:0);
+ ob_debug("%sNotify mode %d detail %d on %lx, "
+ "focusing window\n",
+ (e->type == EnterNotify ? "Enter" : "Leave"),
+ e->xcrossing.mode,
+ e->xcrossing.detail, client?client->window:0);
#endif
- if (config_focus_delay) {
- ob_main_loop_timeout_add(ob_main_loop,
- config_focus_delay,
- focus_delay_func,
- client, NULL);
- focus_delay_client = client;
- } else
- client_focus(client);
- }
+ if (!nofocus && config_focus_follow)
+ event_enter_client(client);
}
break;
default:
static gboolean focus_delay_func(gpointer data)
{
- client_focus(focus_delay_client);
+ ObClient *c = data;
+
+ client_focus(c);
+ if (config_focus_raise)
+ stacking_raise(CLIENT_AS_WINDOW(c));
return FALSE; /* no repeat */
}
static void focus_delay_client_dest(gpointer data)
{
ObClient *c = data;
- if (c == focus_delay_client) {
- ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func,
- focus_delay_client);
- focus_delay_client = NULL;
- }
+
+ ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, c);
}
-void event_ignore_enter_focus(guint num)
+void event_ignore_queued_enters()
{
- ignore_enter_focus += num;
+ GSList *saved = NULL, *it;
+ XEvent *e;
+
+ XSync(ob_display, FALSE);
+
+ /* count the events */
+ while (TRUE) {
+ e = g_new(XEvent, 1);
+ if (XCheckTypedEvent(ob_display, EnterNotify, e)) {
+ saved = g_slist_append(saved, e);
+ ++ignore_enter_focus;
+ } else {
+ g_free(e);
+ break;
+ }
+ }
+ /* put the events back */
+ for (it = saved; it; it = g_slist_next(it)) {
+ XPutBackEvent(ob_display, it->data);
+ g_free(it->data);
+ }
+ g_slist_free(saved);
}