From: Mikael Magnusson <mikachu@comhem.se>
Date: Thu, 28 Feb 2008 00:31:32 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.7-pre1~5
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ad0c5b92577571ef7ecec5e89ee2611928cf2238;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4

Conflicts:

	openbox/event.h
---

ad0c5b92577571ef7ecec5e89ee2611928cf2238
diff --cc openbox/event.h
index 6ff5a7f4,93af6b4c..1dec416c
--- a/openbox/event.h
+++ b/openbox/event.h
@@@ -46,21 -46,27 +46,27 @@@ void event_shutdown(gboolean reconfig)
  void event_enter_client(struct _ObClient *client);
  
  /*! Make mouse focus not move at all from the stuff that happens between these
-  two function calls. */
+     two function calls. */
 -gulong event_start_ignore_all_enters();
 +gulong event_start_ignore_all_enters(void);
  void event_end_ignore_all_enters(gulong start);
  
- /*! End *all* active and passive grabs on the keyboard */
+ /*! End *all* active and passive grabs on the keyboard
+     This is called in situations where if there is a grab going on, then
+     we need to cancel it. If we move focus during the grab, applications
+     will get NotifyWhileGrabbed events and ignore them!
+ 
+     Actions should not rely on being able to move focus during an
+     interactive grab. */
 -void event_cancel_all_key_grabs();
 +void event_cancel_all_key_grabs(void);
  
  /* Halts any focus delay in progress, use this when the user is selecting a
     window for focus */
 -void event_halt_focus_delay();
 +void event_halt_focus_delay(void);
  
  /*! Compare t1 and t2, taking into account wraparound. True if t1
-   comes at the same time or later than t2. */
+     comes at the same time or later than t2. */
  gboolean event_time_after(Time t1, Time t2);
  
 -Time event_get_server_time();
 +Time event_get_server_time(void);
  
  #endif