Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/actions/all.c
	openbox/actions/all.h

diff --cc Makefile.am
index 828008e3ba29321a1d853644c1ab4dec8caf3332,0c1b9b095f68960d7aae531509dfab4dd09be1dc..71a447952556b517aa6c7f5b17a24c1f05a020ef
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -209,11 -201,10 +209,12 @@@ openbox_openbox_SOURCES = 
        openbox/actions/resize.c \
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
 +      openbox/actions/sendkeyevent.c \
        openbox/actions/shade.c \
+       openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
 +      openbox/actions/stop.c \
        openbox/actions/unfocus.c \
        openbox/actions.c \
        openbox/actions.h \

diff --cc openbox/actions/all.c
index 8ee85d9a5fecec989642c1a2ba2feb055011fa25,952d756dfce343a658c6b39fad2a663cb0a0488a..99b0de8b8be00d130584b3262d9c7c3282d83bc7
--- 1/openbox/actions/all.c
--- 2/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@@ -41,8 -39,6 +41,10 @@@ void action_all_startup(void
      action_growtoedge_startup();
      action_if_startup();
      action_focustobottom_startup();
 +    action_sendkeyevent_startup();
 +    action_lock_startup();
 +    action_allclients_startup();
 +    action_stop_startup();
+     /* 3.4-compatibility */
+     action_shadelowerraise_startup();
  }

diff --cc openbox/actions/all.h
index 24db440b1d85f7670ef275867e50edf9fbc2e2f6,1f520b93f1a2d4abc130f86329274844737f1304..b62e3160e617259d592a91713c75b123b9fc0a70
--- 1/openbox/actions/all.h
--- 2/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@@ -42,9 -40,7 +42,11 @@@ void action_movetoedge_startup(void)
  void action_growtoedge_startup(void);
  void action_if_startup(void);
  void action_focustobottom_startup(void);
 +void action_sendkeyevent_startup(void);
 +void action_lock_startup(void);
 +void action_zenbu_startup(void);
 +void action_stop_startup(void);
+ /* 3.4-compatibility */
+ void action_shadelowerraise_startup(void);
  
  #endif

diff --cc openbox/actions/desktop.c
Simple merge

diff --cc openbox/actions/directionalwindows.c
Simple merge

diff --cc openbox/actions/growtoedge.c
Simple merge

diff --cc openbox/actions/maximize.c
Simple merge

diff --cc openbox/actions/moveresizeto.c
Simple merge

diff --cc openbox/actions/movetoedge.c
Simple merge

diff --cc openbox/client.c
index a0d7f9cf1fcc3739c0e5f46d1814deb571345ae3,a62aa5b6c9f2e94a7c96553824e43c19aaae79b0..6f13d9fe480713e4c37c13e1bf7ce74972cd03b9
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -442,11 -439,20 +441,11 @@@ void client_manage(Window window, ObPro
                        "Current focus_client: %s",
                        (focus_client ? focus_client->title : "(none)"));
          ob_debug_type(OB_DEBUG_FOCUS,
-                       "parent focuesed: %d  relative focused: %d",
+                       "parent focused: %d  relative focused: %d",
                        parent_focused, relative_focused);
  
 -        if (menu_frame_visible || moveresize_in_progress) {
 -            activate = FALSE;
 -            raise = TRUE;
 -            ob_debug_type(OB_DEBUG_FOCUS,
 -                          "Not focusing the window because the user is inside "
 -                          "an Openbox menu or is move/resizing a window and "
 -                          "we don't want to interrupt them");
 -        }
 -
          /* if it's on another desktop */
 -        else if (!(self->desktop == screen_desktop ||
 +        if (!(self->desktop == screen_desktop ||
                     self->desktop == DESKTOP_ALL) &&
                   /* the timestamp is from before you changed desktops */
                   launch_time && screen_desktop_user_time &&

diff --cc openbox/client.h
Simple merge

diff --cc openbox/event.c
Simple merge

diff --cc render/color.c
Simple merge