From: Dana Jansens <danakj@orodu.net>
Date: Thu, 14 Feb 2008 20:16:10 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre1~16
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=591b261df14cf987dddf17137a87cd15c9d25fa7;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/focus.c
---

591b261df14cf987dddf17137a87cd15c9d25fa7
diff --cc data/rc.xsd
index 31df2f7f,de227ea1..c51135b4
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@@ -283,15 -247,24 +284,27 @@@
              <xsd:enumeration value="ToggleOmnipresent"/>
              <xsd:enumeration value="ToggleShade"/>
              <xsd:enumeration value="ToggleShowDesktop"/>
 -            <xsd:enumeration value="Undecorate"/>
              <xsd:enumeration value="Unfocus"/>
 -            <xsd:enumeration value="Unmaximize"/>
 +            <xsd:enumeration value="UnmaximizeFull"/>
 +            <xsd:enumeration value="UnmaximizeHorz"/>
 +            <xsd:enumeration value="UnmaximizeVert"/>
              <xsd:enumeration value="Unshade"/>
 +            <xsd:enumeration value="UnshadeRaise"/>
 +            <xsd:enumeration value="UnShowDesktop"/>
          </xsd:restriction>
      </xsd:simpleType>
+     <xsd:simpleType name="clienttype">
+         <xsd:restriction base="xsd:string">
+             <xsd:enumeration value="desktop"/>
+             <xsd:enumeration value="dock"/>
+             <xsd:enumeration value="toolbar"/>
+             <xsd:enumeration value="menu"/>
+             <xsd:enumeration value="splash"/>
+             <xsd:enumeration value="utility"/>
+             <xsd:enumeration value="dialog"/>
+             <xsd:enumeration value="normal"/>
+         </xsd:restriction>
+     </xsd:simpleType>
      <xsd:simpleType name="bool">
          <!-- this is copied to maximization.  Keep that in sync. -->
          <xsd:restriction base="xsd:string">
diff --cc openbox/actions/focus.c
index 1dceb86d,0ef9d268..a157b4ad
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@@ -71,8 -55,9 +71,10 @@@ static gboolean run_func(ObActionsData 
              (data->context != OB_FRAME_CONTEXT_CLIENT &&
               data->context != OB_FRAME_CONTEXT_FRAME))
          {
+             actions_client_move(data, TRUE);
 -            client_activate(data->client, o->here, FALSE, FALSE, TRUE);
 +            client_activate(data->client, o->here,
 +                            o->activate, o->activate, TRUE);
+             actions_client_move(data, FALSE);
          }
      } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
          /* focus action on the root window. make keybindings work for this