summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/rc.xsd9
-rw-r--r--openbox/focus_cycle.c3
2 files changed, 10 insertions, 2 deletions
diff --git a/data/rc.xsd b/data/rc.xsd
index 03a38e5b..ad96994a 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -171,7 +171,7 @@
<xsd:element minOccurs="0" name="edge" type="xsd:string"/>
<xsd:element minOccurs="0" name="wrap" type="ob:bool"/>
<xsd:element minOccurs="0" name="follow" type="ob:bool"/>
- <xsd:element minOccurs="0" name="dialog" type="ob:bool"/>
+ <xsd:element minOccurs="0" name="dialog" type="ob:dialogtype"/>
<xsd:element minOccurs="0" name="panels" type="ob:bool"/>
<xsd:element minOccurs="0" name="here" type="ob:bool"/>
<xsd:element minOccurs="0" name="linear" type="ob:bool"/>
@@ -541,4 +541,11 @@
<xsd:enumeration value="Nonpixel"/>
</xsd:restriction>
</xsd:simpleType>
+ <xsd:simpleType name="dialogtype">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="None"/>
+ <xsd:enumeration value="Icons"/>
+ <xsd:enumeration value="List"/>
+ </xsd:restriction>
+ </xsd:simpleType>
</xsd:schema>
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 39d704cc..6d4cc2a5 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -93,7 +93,8 @@ void focus_cycle_reorder()
focus_cycle_update_indicator(focus_cycle_target);
if (!focus_cycle_target)
focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,
- TRUE, TRUE, TRUE, TRUE, TRUE);
+ TRUE, TRUE, OB_FOCUS_CYCLE_POPUP_MODE_NONE,
+ TRUE, TRUE);
}
}