Merge branch 'backport' into work

Conflicts:

	openbox/screen.c

diff --cc openbox/event.c
Simple merge

diff --cc openbox/focus_cycle.c
Simple merge

diff --cc openbox/focus_cycle_popup.c
Simple merge

diff --cc openbox/focus_cycle_popup.h
index c289be36b35d683acb018b4eb0c847eaa01387e6,19279a62d43f2232661cd4a7ab896139648ecb5b..ad76491d52d68e99ce12e43d178cbd26d9ffee60
--- 1/openbox/focus_cycle_popup.h
--- 2/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@@ -44,6 -37,9 +44,9 @@@ void focus_cycle_popup_single_show(stru
                                     gboolean all_desktops,
                                     gboolean dock_windows,
                                     gboolean desktop_windows);
 -void focus_cycle_popup_single_hide();
 +void focus_cycle_popup_single_hide(void);
  
+ /*! Returns TRUE if the popup is showing the client, otherwise FALSE. */
+ gboolean focus_cycle_popup_is_showing(struct _ObClient *client);
+ 
  #endif

diff --cc openbox/screen.c
index aabed2149368fe0aee55b66b5ce124633077e14c,d88be432f1a26965b6103324db9d327ae79df0a1..bb98e084cadd9017c55205fe81fa6792d0a19671
--- 1/openbox/screen.c
--- 2/openbox/screen.c
+++ b/openbox/screen.c
@@@ -30,12 -33,11 +30,13 @@@
  #include "frame.h"
  #include "event.h"
  #include "focus.h"
+ #include "focus_cycle.h"
  #include "popup.h"
 -#include "extensions.h"
  #include "render/render.h"
  #include "gettext.h"
 +#include "obt/display.h"
 +#include "obt/prop.h"
 +#include "obt/mainloop.h"
  
  #include <X11/Xlib.h>
  #ifdef HAVE_UNISTD_H