Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:16:10 +0000 (15:16 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:16:10 +0000 (15:16 -0500)
Conflicts:

openbox/actions/focus.c

1  2 
Makefile.am
data/rc.xml
data/rc.xsd
openbox/actions/focus.c
openbox/config.c

diff --cc Makefile.am
Simple merge
diff --cc data/rc.xml
Simple merge
diff --cc data/rc.xsd
              <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">
@@@ -71,8 -55,9 +71,10 @@@ static gboolean run_func(ObActionsData 
              (data->context != OB_FRAME_CONTEXT_CLIENT &&
               data->context != OB_FRAME_CONTEXT_FRAME))
          {
 -            client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+             actions_client_move(data, 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
Simple merge