summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-04-17 17:07:37 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-04-17 17:07:37 +0200
commitc41681219388b5535ff64782ef896e401e3255c1 (patch)
tree3b6908691eee8e954145d08c598906a155967deb
parent4f3957af2f800b62d97edce69bc5437a72c1df5d (diff)
downloadberyl-premerge-c41681219388b5535ff64782ef896e401e3255c1.tar.gz
beryl-premerge-c41681219388b5535ff64782ef896e401e3255c1.tar.bz2
group now compiles with new bcop version
-rw-r--r--configure.ac5
-rw-r--r--metadata/Makefile.am6
-rw-r--r--metadata/group.xml475
-rw-r--r--metadata/ring.xml209
-rw-r--r--src/Makefile.am4
-rw-r--r--src/group/Makefile.am4
-rw-r--r--src/group/group.options405
-rw-r--r--src/group/init.c4
-rw-r--r--src/group/paint.c4
9 files changed, 703 insertions, 413 deletions
diff --git a/configure.ac b/configure.ac
index bcf2a8f..0ea5c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,10 @@ AC_SUBST(plugindir)
imagedir=$datadir/compiz
AC_SUBST(imagedir)
+metadatadir=$datadir/compiz
+AC_SUBST(metadatadir)
+
+
dnl ============================================================
dnl Check for the pkg-config path.
if test x"$PKG_CONFIG_PATH" = x; then
@@ -168,6 +172,7 @@ fi
AC_OUTPUT([
Makefile
+metadata/Makefile
src/Makefile
src/group/Makefile
po/Makefile.in
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
new file mode 100644
index 0000000..8e782e1
--- /dev/null
+++ b/metadata/Makefile.am
@@ -0,0 +1,6 @@
+metadir = $(metadatadir)
+meta_DATA = \
+ ring.xml \
+ group.xml
+
+EXTRA_DIST = $(meta_DATA)
diff --git a/metadata/group.xml b/metadata/group.xml
new file mode 100644
index 0000000..c7bc826
--- /dev/null
+++ b/metadata/group.xml
@@ -0,0 +1,475 @@
+<?xml version="1.0"?>
+<compiz>
+ <plugin name="group" useBcop="true">
+ <display>
+ <group>
+ <short>Selection</short>
+ <subgroup>
+ <short>Key bindings</short>
+ <option name="select" type="action">
+ <short>Select</short>
+ <long>The key for starting selecting windows.</long>
+ <allowed/>
+ <default/>
+ </option>
+ <option name="select_single" type="action">
+ <short>Select Single Window</short>
+ <long>The key for selecting the current window.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;s</key>
+ </default>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <short>Grouping</short>
+ <subgroup>
+ <short>Key bindings</short>
+ <option name="group" type="action">
+ <short>Group Windows</short>
+ <long>The key for grouping windows.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;g</key>
+ </default>
+ </option>
+ <option name="ungroup" type="action">
+ <short>Ungroup Windows</short>
+ <long>The key for ungrouping the current group.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;u</key>
+ </default>
+ </option>
+ <option name="remove" type="action">
+ <short>Remove Group Window</short>
+ <long>The key for removing the selected window from its group.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;r</key>
+ </default>
+ </option>
+ <option name="close" type="action">
+ <short>Close Group</short>
+ <long>The key for closing all windows in the group.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;c</key>
+ </default>
+ </option>
+ <option name="ignore" type="action">
+ <short>Ignore Group</short>
+ <long>The key for ignoring the group. If this key is pressed, you can do actions for a single window in the group only.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;x</key>
+ </default>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <short>Tabbing</short>
+ <subgroup>
+ <short>Key bindings</short>
+ <option name="tabmode" type="action">
+ <short>Tab Group</short>
+ <long>The key for toggling the tab mode for the current group.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;t</key>
+ </default>
+ </option>
+ <option name="change_tab_left" type="action">
+ <short>Change Tab Left</short>
+ <long>The key for switching to the tab left of the current one.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;Left</key>
+ </default>
+ </option>
+ <option name="change_tab_right" type="action">
+ <short>Change Tab Right</short>
+ <long>The key for switching to the tab right of the current one.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;Right</key>
+ </default>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <short>Glow</short>
+ <subgroup>
+ <short>Key bindings</short>
+ <option name="change_color" type="action">
+ <short>Glow Color Change</short>
+ <long>If you don't like the current glow color, you can change it with this key.</long>
+ <allowed/>
+ <default/>
+ </option>
+ </subgroup>
+ </group>
+ </display>
+ <screen>
+ <group>
+ <short>General</short>
+ <option name="move_all" type="bool">
+ <short>Move every window in the group</short>
+ <long>If one window in the group is moved, all other group windows are moved as well.</long>
+ <default>true</default>
+ </option>
+ <option name="resize_all" type="bool">
+ <short>Resize every window in the group</short>
+ <long>If one window in the group is resized, all other group windows are resized as well.</long>
+ <default>false</default>
+ </option>
+ <option name="raise_all" type="bool">
+ <short>Raise every window in the group</short>
+ <long>If one window in the group is activated, all other group windows are raised as well.</long>
+ <default>true</default>
+ </option>
+ <option name="maximize_unmaximize_all" type="bool">
+ <short>Maximize/unmaximize with group</short>
+ <long>If one window in the group is (un)maximized, all other group windows are (un)maximized as well.</long>
+ <default>false</default>
+ </option>
+ <option name="minimize_all" type="bool">
+ <short>Minimize with group</short>
+ <long>If one window in the group is (un)minimized, all other group windows are (un)minimized as well.</long>
+ <default>true</default>
+ </option>
+ <option name="shade_all" type="bool">
+ <short>Shade with group</short>
+ <long>If one window in the group is (un)shaded, all other group windows are (un)shaded as well.</long>
+ <default>false</default>
+ </option>
+ <option name="auto_group" type="bool">
+ <short>Group the windows after selection</short>
+ <long>If you have selected some windows, this automatically groups them (Doesn't work with selection mode 'Normal').</long>
+ <default>false</default>
+ </option>
+ <option name="auto_ungroup" type="bool">
+ <short>Ungroup the windows if only one window is left</short>
+ <long>If there is only 1 window left in the group, it will be ungrouped.</long>
+ <default>true</default>
+ </option>
+ <option name="relative_distance" type="bool">
+ <short>Compute distance relative</short>
+ <long>The distance between the windows is computed relative to the window size. This allows you to have windows staying next to each other.</long>
+ <default>false</default>
+ </option>
+ <option name="window_match" type="match">
+ <short>Group Window Match</short>
+ <long>Windows that should be allowed to be grouped</long>
+ <default>Toolbar | Utility | Dialog | Normal | Unknown</default>
+ </option>
+ </group>
+ <group>
+ <short>Selection</short>
+ <subgroup>
+ <short>Options</short>
+ <option name="select_opacity" type="int">
+ <short>Opacity</short>
+ <long>Opacity of selected windows</long>
+ <default>80</default>
+ <min>0</min>
+ <max>100</max>
+ </option>
+ <option name="select_saturation" type="int">
+ <short>Saturation</short>
+ <long>Saturation of selected windows</long>
+ <default>20</default>
+ <min>0</min>
+ <max>100</max>
+ </option>
+ <option name="select_brightness" type="int">
+ <short>Brightness</short>
+ <long>Brightness of selected windows</long>
+ <default>70</default>
+ <min>0</min>
+ <max>100</max>
+ </option>
+ <option name="select_precision" type="int">
+ <short>Precision</short>
+ <long>Precision of the selection (percentage of the visible window area which must be selected for the selection to be recognized).</long>
+ <default>25</default>
+ <min>1</min>
+ <max>100</max>
+ </option>
+ </subgroup>
+ <subgroup>
+ <short>Colors</short>
+ <option name="fill_color" type="color">
+ <short>Selection Color</short>
+ <long>Fill color of the selection rectangle</long>
+ <default>
+ <red>0x0000</red>
+ <green>0x0000</green>
+ <blue>0x0000</blue>
+ <alpha>0x9999</alpha>
+ </default>
+ </option>
+ <option name="line_color" type="color">
+ <short>Line Color</short>
+ <long>Line color of the selection rectangle</long>
+ <default>
+ <red>0x0000</red>
+ <green>0x0000</green>
+ <blue>0x0000</blue>
+ <alpha>0xabab</alpha>
+ </default>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <short>Tabbing</short>
+ <subgroup>
+ <short>Misc. Options</short>
+ <option name="mipmaps" type="bool">
+ <short>Create mipmaps for thumbnails</short>
+ <long>Create mipmaps for thumbnails in the tab bar</long>
+ <default>false</default>
+ </option>
+ <option name="untab_on_close" type="bool">
+ <short>Untab when closing top tab</short>
+ <long>Untab the group when closing the top tab window instead of changing tab</long>
+ <default>false</default>
+ </option>
+ <option name="autotab_create" type="bool">
+ <short>Autotab windows on creation</short>
+ <long>Autotab windows with themselves on window creation</long>
+ <default>false</default>
+ </option>
+ <option name="tabbar_show_delay" type="float">
+ <short>Tab Bar Show Delay</short>
+ <long>Time (in s) before the tab bar is shown after hovering the title bar</long>
+ <default>0.4</default>
+ <min>0.0</min>
+ <max>10.0</max>
+ <precision>0.1</precision>
+ </option>
+ </subgroup>
+ <subgroup>
+ <short>Animation Options</short>
+ <option name="tabbing_speed" type="float">
+ <short>Tabbing Speed</short>
+ <long>Tabbing speed</long>
+ <default>1.2</default>
+ <min>0.1</min>
+ <max>50.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="tabbing_timestep" type="float">
+ <short>Tabbing Timestep</short>
+ <long>Tabbing timestep</long>
+ <default>1.5</default>
+ <min>0.1</min>
+ <max>50.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="fade_time" type="float">
+ <short>Fade time for tab bar animations</short>
+ <long>Duration (in s) of the tab bar fading animation when showing/hiding it</long>
+ <default>0.2</default>
+ <min>0.0</min>
+ <max>5.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="fade_text_time" type="float">
+ <short>Fade time for text animations</short>
+ <long>Duration (in s) of the text fading animation when showing/hiding it</long>
+ <default>0.25</default>
+ <min>0.0</min>
+ <max>5.0</max>
+ <precision>0.05</precision>
+ </option>
+ <option name="visibility_time" type="float">
+ <short>Tab bar visibility time after tab change</short>
+ <long>Time (in s) the tab bar is visibly after a tab change</long>
+ <default>0.5</default>
+ <min>0.0</min>
+ <max>10.0</max>
+ <precision>0.05</precision>
+ </option>
+ <option name="change_animation_time" type="float">
+ <short>Change tab animation duration</short>
+ <long>Duration (in s) of the animation that happens when changing tabs</long>
+ <default>0.5</default>
+ <min>0.0</min>
+ <max>5.0</max>
+ <precision>0.05</precision>
+ </option>
+ </subgroup>
+ <subgroup>
+ <short>Appearance</short>
+ <option name="thumb_size" type="int">
+ <short>Thumb Size</short>
+ <long>The size of the window thumbs in the task bar</long>
+ <default>96</default>
+ <min>16</min>
+ <max>256</max>
+ </option>
+ <option name="thumb_space" type="int">
+ <short>Space</short>
+ <long>The space between the thumbs</long>
+ <default>10</default>
+ <min>1</min>
+ <max>20</max>
+ </option>
+ <option name="border_radius" type="int">
+ <short>Border Radius</short>
+ <long>The radius for the tab bar edges</long>
+ <default>10</default>
+ <min>1</min>
+ <max>20</max>
+ </option>
+ <option name="border_width" type="int">
+ <short>Border Width</short>
+ <long>The width of the tab bar outline</long>
+ <default>1</default>
+ <min>1</min>
+ <max>5</max>
+ </option>
+ <option name="tab_base_color" type="color">
+ <short>Tab Base Color</short>
+ <long>Fill color of the tab bar</long>
+ <default>
+ <red>0x0000</red>
+ <green>0x0000</green>
+ <blue>0x0000</blue>
+ <alpha>0x9999</alpha>
+ </default>
+ </option>
+ <option name="tab_border_color" type="color">
+ <short>Tab Border Color</short>
+ <long>Border color of the tab bar</long>
+ <default>
+ <red>0x0000</red>
+ <green>0x0000</green>
+ <blue>0x0000</blue>
+ <alpha>0xabab</alpha>
+ </default>
+ </option>
+ <option name="tab_highlight_color" type="color">
+ <short>Tab Highlight Color</short>
+ <long>Fill color of the tab bar</long>
+ <default>
+ <red>0xffff</red>
+ <green>0xffff</green>
+ <blue>0xffff</blue>
+ <alpha>0x9999</alpha>
+ </default>
+ </option>
+ <option name="tab_style" type="string">
+ <short>Tab Style</short>
+ <long>The style of the tab bar</long>
+ <default>Simple</default>
+ <allowed>
+ <value>Simple</value>
+ <value>Gradient</value>
+ <value>Glass</value>
+ <value>Metal</value>
+ <value>Murrina</value>
+ </allowed>
+ </option>
+ </subgroup>
+ <subgroup>
+ <short>Window Title Font</short>
+ <option name="tabbar_font_size" type="int">
+ <short>Font Size</short>
+ <long>The size of the window title font in the tab bar</long>
+ <default>12</default>
+ <min>6</min>
+ <max>24</max>
+ </option>
+ <option name="tabbar_font_color" type="color">
+ <short>Font Color</short>
+ <long>The color of the window title in the tab bar</long>
+ <default>
+ <red>0xffff</red>
+ <green>0xffff</green>
+ <blue>0xffff</blue>
+ <alpha>0xffff</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <short>Slot Dragging</short>
+ <option name="spring_model_on_move" type="bool">
+ <short>Spring model on move</short>
+ <long>Use spring model for the tab bar when moving the window</long>
+ <default>false</default>
+ </option>
+ <option name="dnd_ungroup_window" type="bool">
+ <short>Remove window from group after dropping it outside a tab bar</short>
+ <long>Remove window from group after dropping it outside a tab bar</long>
+ <default>true</default>
+ </option>
+ <option name="drag_hover_time" type="float">
+ <short>Hover time for slot dragging</short>
+ <long>Timespan (in s) after which a grouped window is activated if a window of another group is dragged over it</long>
+ <default>0.5</default>
+ <min>0.0</min>
+ <max>5.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="drag_spring_k" type="float">
+ <short>Slot Drag Spring K</short>
+ <long>Spring Konstant used for slot dragging</long>
+ <default>8.0</default>
+ <min>0.1</min>
+ <max>30.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="drag_friction" type="float">
+ <short>Slot drag friction</short>
+ <long>Spring friction for slot dragging</long>
+ <default>35.0</default>
+ <min>0.1</min>
+ <max>30.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="drag_y_distance" type="int">
+ <short>Y distance for spring model</short>
+ <long>Distance (in pixels) between the tab bar and the dragged slot for applying the spring model. If the distance is larger than that value, the model isn't applied.</long>
+ <default>400</default>
+ <min>10</min>
+ <max>2500</max>
+ </option>
+ <option name="drag_speed_limit" type="int">
+ <short>Speed limit for spring model</short>
+ <long>Mouse pointer movement speed limit (in pixels/second) for the spring model</long>
+ <default>800</default>
+ <min>0</min>
+ <max>2000</max>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <short>Glow</short>
+ <option name="glow" type="bool">
+ <short>Enable Glow</short>
+ <long>Enable grouped window glowing</long>
+ <default>true</default>
+ </option>
+ <option name="glow_size" type="int">
+ <short>Glow Size</short>
+ <long>The size of the grouped window glow</long>
+ <default>64</default>
+ <min>1</min>
+ <max>300</max>
+ </option>
+ <option name="glow_type" type="string">
+ <short>Glow Type</short>
+ <long>The type of the glow</long>
+ <default>Rectangular glow</default>
+ <allowed>
+ <value>Rectangular glow</value>
+ <value>Glow ring</value>
+ </allowed>
+ </option>
+ </group>
+ </screen>
+ </plugin>
+</compiz>
diff --git a/metadata/ring.xml b/metadata/ring.xml
new file mode 100644
index 0000000..ecf7388
--- /dev/null
+++ b/metadata/ring.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0"?>
+<compiz>
+ <plugin name="ring" useBcop="true">
+ <display>
+ <group>
+ <short>Key bindings</short>
+ <option name="next" type="action">
+ <short>Next Window</short>
+ <long>Show switcher if not visible and select next window.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;Tab</key>
+ </default>
+ </option>
+ <option name="prev" type="action">
+ <short>Previous Window</short>
+ <long>Show switcher if not visible and select previous window.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;&lt;Shift&gt;Tab</key>
+ </default>
+ </option>
+ <option name="next_all" type="action">
+ <short>Next Window (All Workspaces)</short>
+ <long>Show switcher if not visible and select next window out of all windows.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;&lt;Alt&gt;Tab</key>
+ </default>
+ </option>
+ <option name="prev_all" type="action">
+ <short>Previous Window (All Workspaces)</short>
+ <long>Show switcher if not visible and select previous window out of all windows.</long>
+ <allowed key="true"/>
+ <default>
+ <key>&lt;Super&gt;&lt;Shift&gt;&lt;Alt&gt;Tab</key>
+ </default>
+ </option>
+ <option name="next_group" type="action">
+ <short>Next Window (Group)</short>
+ <long>Show switcher if not visible and select next window of the current application.</long>
+ <allowed/>
+ <default/>
+ </option>
+ <option name="prev_group" type="action">
+ <short>Previous Window (Group)</short>
+ <long>Show switcher if not visible and select previous window of the current application.</long>
+ <allowed/>
+ <default/>
+ </option>
+ </group>
+ </display>
+ <screen>
+ <group>
+ <short>Misc. options</short>
+ <option name="speed" type="float">
+ <short>Speed</short>
+ <long>Ring speed</long>
+ <default>1.5</default>
+ <min>0.1</min>
+ <max>50.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="timestep" type="float">
+ <short>Timestep</short>
+ <long>Ring timestep</long>
+ <default>1.2</default>
+ <min>0.1</min>
+ <max>50.0</max>
+ <precision>0.1</precision>
+ </option>
+ <option name="window_match" type="match">
+ <short>Ring Windows</short>
+ <long>Windows that should be shown in ring</long>
+ <default>Toolbar | Utility | Dialog | Normal | Unknown</default>
+ </option>
+ <option name="darken_back" type="bool">
+ <short>Darken Background</short>
+ <long>Darken background when showing the ring</long>
+ <default>true</default>
+ </option>
+ <option name="inactive_opacity" type="int">
+ <short>Inactive Window Opacity</short>
+ <long>Amount of opacity (in percent) for windows in the ring which are not selected</long>
+ <default>100</default>
+ <min>1</min>
+ <max>100</max>
+ </option>
+ <option name="overlay_icon" type="string">
+ <short>Overlay Icon</short>
+ <long>Overlay an icon on windows in the ring</long>
+ <default>Emblem</default>
+ <allowed>
+ <value>None</value>
+ <value>Emblem</value>
+ <value>Big</value>
+ </allowed>
+ </option>
+ <option name="minimized" type="bool">
+ <short>Show Minimized</short>
+ <long>Show minimized windows</long>
+ <default>true</default>
+ </option>
+ <option name="select_with_mouse" type="bool">
+ <short>Allow Mouse Selection</short>
+ <long>Allow the selection of windows by just clicking on them while the switcher is active.</long>
+ <default>false</default>
+ </option>
+ </group>
+ <group>
+ <short>Ring appearance</short>
+ <option name="ring_width" type="int">
+ <short>Ring Width</short>
+ <long>Ring width (in percent of the screen width)</long>
+ <default>70</default>
+ <min>1</min>
+ <max>100</max>
+ </option>
+ <option name="ring_height" type="int">
+ <short>Ring Height</short>
+ <long>Ring height (in percent of the screen height)</long>
+ <default>60</default>
+ <min>1</min>
+ <max>100</max>
+ </option>
+ <option name="thumb_width" type="int">
+ <short>Thumbnail Width</short>
+ <long>Maximum horizontal size of a thumbnail in the ring</long>
+ <default>350</default>
+ <min>10</min>
+ <max>1024</max>
+ </option>
+ <option name="thumb_height" type="int">
+ <short>Thumbnail Height</short>
+ <long>MaximVertical size of a thumbnail in the ring</long>
+ <default>250</default>
+ <min>10</min>
+ <max>1024</max>
+ </option>
+ <option name="min_brightness" type="float">
+ <short>Minimum Brightness Factor</short>
+ <long>Changes the minimum brightness factor for windows in the ring. The farer away windows are, the less bright are they.</long>
+ <default>0.5</default>
+ <min>0.1</min>
+ <max>1.0</max>
+ <precision>0.01</precision>
+ </option>
+ <option name="min_scale" type="float">
+ <short>Minimum Scale Factor</short>
+ <long>Changes the minimum scale factor for windows in the ring. The farer away windows are, the smaller are they.</long>
+ <default>0.4</default>
+ <min>0.1</min>
+ <max>1.0</max>
+ <precision>0.01</precision>
+ </option>
+ </group>
+ <group>
+ <short>Window title display</short>
+ <option name="window_title" type="bool">
+ <short>Show Window Title</short>
+ <long>Show window title if currently selected window.</long>
+ <default>true</default>
+ </option>
+ <option name="title_font_size" type="int">
+ <short>Font Size</short>
+ <long>Font size for the window title</long>
+ <default>16</default>
+ <min>6</min>
+ <max>96</max>
+ </option>
+ <option name="title_font_bold" type="bool">
+ <short>Bold Font</short>
+ <long>Selects if the window title should be displayed in bold font or not.</long>
+ <default>false</default>
+ </option>
+ <option name="title_back_color" type="color">
+ <short>Background Color</short>
+ <long>Background color for the window title</long>
+ <default>
+ <red>0x0000</red>
+ <green>0x0000</green>
+ <blue>0x0000</blue>
+ <alpha>0x9999</alpha>
+ </default>
+ </option>
+ <option name="title_font_color" type="color">
+ <short>Font Color</short>
+ <long>Font color for the window title</long>
+ <default>
+ <red>0xffff</red>
+ <green>0xffff</green>
+ <blue>0xffff</blue>
+ <alpha>0xffff</alpha>
+ </default>
+ </option>
+ <option name="title_text_placement" type="string">
+ <short>Text Placement</short>
+ <long>Selects where to place the window title.</long>
+ <default>Centered on screen</default>
+ <allowed>
+ <value>Centered on screen</value>
+ <value>Above ring</value>
+ <value>Below ring</value>
+ </allowed>
+ </option>
+ </group>
+ </screen>
+ </plugin>
+</compiz>
diff --git a/src/Makefile.am b/src/Makefile.am
index ff1da78..a2dfc24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,8 +137,8 @@ module_LTLIBRARIES = \
CLEANFILES = *_options.c *_options.h
-%_options.h: %.options
+%_options.h: ../metadata/%.xml
$(BCOP_BIN) --header $@ $<
-%_options.c: %.options %_options.h
+%_options.c: ../metadata/%.xml %_options.h
$(BCOP_BIN) --source $@ $<
diff --git a/src/group/Makefile.am b/src/group/Makefile.am
index d33fa55..4902a7b 100644
--- a/src/group/Makefile.am
+++ b/src/group/Makefile.am
@@ -20,8 +20,8 @@ module_LTLIBRARIES=libgroup.la
CLEANFILES = *_options.c *_options.h
-%_options.h: %.options
+%_options.h: ../../metadata/%.xml
$(BCOP_BIN) --header $@ $<
-%_options.c: %.options %_options.h
+%_options.c: ../../metadata/%.xml %_options.h
$(BCOP_BIN) --source $@ $<
diff --git a/src/group/group.options b/src/group/group.options
deleted file mode 100644
index 3c87954..0000000
--- a/src/group/group.options
+++ /dev/null
@@ -1,405 +0,0 @@
-<plugin name="group">
- <display>
- <group name="Selection">
- <subgroup name="Key bindings">
- <option name="select" type="action">
- <short>Select</short>
- <long>The key for starting selecting windows.</long>
- <button>Super+Button1</button>
- </option>
- <option name="select_single" type="action">
- <short>Select Single Window</short>
- <long>The key for selecting the current window.</long>
- <key>Super+s</key>
- </option>
- </subgroup>
- </group>
- <group name="Grouping">
- <subgroup name="Key bindings">
- <option name="group" type="action">
- <short>Group Windows</short>
- <long>The key for grouping windows.</long>
- <key>Super+g</key>
- </option>
- <option name="ungroup" type="action">
- <short>Ungroup Windows</short>
- <long>The key for ungrouping the current group.</long>
- <key>Super+u</key>
- </option>
- <option name="remove" type="action">
- <short>Remove Group Window</short>
- <long>The key for removing the selected window from its group.</long>
- <key>Super+r</key>
- </option>
- <option name="close" type="action">
- <short>Close Group</short>
- <long>The key for closing all windows in the group.</long>
- <key>Super+c</key>
- </option>
- <option name="ignore" type="action">
- <short>Ignore Group</short>
- <long>The key for ignoring the group. If this key is pressed, you can do actions for a single window in the group only.</long>
- <key>Super+x</key>
- </option>
- </subgroup>
- </group>
- <group name="Tabbing">
- <subgroup name="Key bindings">
- <option name="tabmode" type="action">
- <short>Tab Group</short>
- <long>The key for toggling the tab mode for the current group.</long>
- <key>Super+t</key>
- </option>
- <option name="change_tab_left" type="action">
- <short>Change Tab Left</short>
- <long>The key for switching to the tab left of the current one.</long>
- <key>Super+Left</key>
- </option>
- <option name="change_tab_right" type="action">
- <short>Change Tab Right</short>
- <long>The key for switching to the tab right of the current one.</long>
- <key>Super+Right</key>
- </option>
- </subgroup>
- </group>
- <group name="Glow">
- <subgroup name="Key bindings">
- <option name="change_color" type="action">
- <short>Glow Color Change</short>
- <long>If you don't like the current glow color, you can change it with this key.</long>
- </option>
- </subgroup>
- </group>
- </display>
- <screen>
- <group name="General">
- <option name="move_all" type="bool">
- <short>Move every window in the group</short>
- <long>If one window in the group is moved, all other group windows are moved as well.</long>
- <default>true</default>
- </option>
- <option name="resize_all" type="bool">
- <short>Resize every window in the group</short>
- <long>If one window in the group is resized, all other group windows are resized as well.</long>
- <default>false</default>
- </option>
- <option name="raise_all" type="bool">
- <short>Raise every window in the group</short>
- <long>If one window in the group is activated, all other group windows are raised as well.</long>
- <default>true</default>
- </option>
- <option name="maximize_unmaximize_all" type="bool">
- <short>Maximize/unmaximize with group</short>
- <long>If one window in the group is (un)maximized, all other group windows are (un)maximized as well.</long>
- <default>false</default>
- </option>
- <option name="minimize_all" type="bool">
- <short>Minimize with group</short>
- <long>If one window in the group is (un)minimized, all other group windows are (un)minimized as well.</long>
- <default>true</default>
- </option>
- <option name="shade_all" type="bool">
- <short>Shade with group</short>
- <long>If one window in the group is (un)shaded, all other group windows are (un)shaded as well.</long>
- <default>false</default>
- </option>
- <option name="auto_group" type="bool">
- <short>Group the windows after selection</short>
- <long>If you have selected some windows, this automatically groups them (Doesn't work with selection mode 'Normal').</long>
- <default>false</default>
- </option>
- <option name="auto_ungroup" type="bool">
- <short>Ungroup the windows if only one window is left</short>
- <long>If there is only 1 window left in the group, it will be ungrouped.</long>
- <default>true</default>
- </option>
- <option name="relative_distance" type="bool">
- <short>Compute distance relative</short>
- <long>The distance between the windows is computed relative to the window size. This allows you to have windows staying next to each other.</long>
- <default>false</default>
- </option>
- <option name="window_match" type="match">
- <short>Group Window Match</short>
- <long>Windows that should be allowed to be grouped</long>
- <default>Toolbar | Utility | Dialog | Normal | Unknown</default>
- </option>
- </group>
- <group name="Selection">
- <subgroup name="Options">
- <option name="select_opacity" type="int">
- <short>Opacity</short>
- <long>Opacity of selected windows</long>
- <default>80</default>
- <min>0</min>
- <max>100</max>
- </option>
- <option name="select_saturation" type="int">
- <short>Saturation</short>
- <long>Saturation of selected windows</long>
- <default>20</default>
- <min>0</min>
- <max>100</max>
- </option>
- <option name="select_brightness" type="int">
- <short>Brightness</short>
- <long>Brightness of selected windows</long>
- <default>70</default>
- <min>0</min>
- <max>100</max>
- </option>
- <option name="select_precision" type="int">
- <short>Precision</short>
- <long>Precision of the selection (percentage of the visible window area which must be selected for the selection to be recognized).</long>
- <default>25</default>
- <min>1</min>
- <max>100</max>
- </option>
- </subgroup>
- <subgroup name="Colors">
- <option name="fill_color" type="color">
- <short>Selection Color</short>
- <long>Fill color of the selection rectangle</long>
- <red>0x0000</red>
- <green>0x0000</green>
- <blue>0x0000</blue>
- <alpha>0x9999</alpha>
- </option>
- <option name="line_color" type="color">
- <short>Line Color</short>
- <long>Line color of the selection rectangle</long>
- <red>0x0000</red>
- <green>0x0000</green>
- <blue>0x0000</blue>
- <alpha>0xabab</alpha>
- </option>
- </subgroup>
- </group>
- <group name="Tabbing">
- <subgroup name="Misc. Options">
- <option name="mipmaps" type="bool">
- <short>Create mipmaps for thumbnails</short>
- <long>Create mipmaps for thumbnails in the tab bar</long>
- <default>false</default>
- </option>
- <option name="untab_on_close" type="bool">
- <short>Untab when closing top tab</short>
- <long>Untab the group when closing the top tab window instead of changing tab</long>
- <default>false</default>
- </option>
- <option name="autotab_create" type="bool">
- <short>Autotab windows on creation</short>
- <long>Autotab windows with themselves on window creation</long>
- <default>false</default>
- </option>
- <option name="tabbar_show_delay" type="float">
- <short>Tab Bar Show Delay</short>
- <long>Time (in s) before the tab bar is shown after hovering the title bar</long>
- <default>0.4</default>
- <min>0.0</min>
- <max>10.0</max>
- <precision>0.1</precision>
- </option>
- </subgroup>
- <subgroup name="Animation Options">
- <option name="tabbing_speed" type="float">
- <short>Tabbing Speed</short>
- <long>Tabbing speed</long>
- <default>1.2</default>
- <min>0.1</min>
- <max>50.0</max>
- <precision>0.1</precision>
- </option>
- <option name="tabbing_timestep" type="float">
- <short>Tabbing Timestep</short>
- <long>Tabbing timestep</long>
- <default>1.5</default>
- <min>0.1</min>
- <max>50.0</max>
- <precision>0.1</precision>
- </option>
- <option name="fade_time" type="float">
- <short>Fade time for tab bar animations</short>
- <long>Duration (in s) of the tab bar fading animation when showing/hiding it</long>
- <default>0.2</default>
- <min>0.0</min>
- <max>5.0</max>
- <precision>0.1</precision>
- </option>
- <option name="fade_text_time" type="float">
- <short>Fade time for text animations</short>
- <long>Duration (in s) of the text fading animation when showing/hiding it</long>
- <default>0.25</default>
- <min>0.0</min>
- <max>5.0</max>
- <precision>0.05</precision>
- </option>
- <option name="visibility_time" type="float">
- <short>Tab bar visibility time after tab change</short>
- <long>Time (in s) the tab bar is visibly after a tab change</long>
- <default>0.5</default>
- <min>0.0</min>
- <max>10.0</max>
- <precision>0.05</precision>
- </option>
- <option name="change_animation_time" type="float">
- <short>Change tab animation duration</short>
- <long>Duration (in s) of the animation that happens when changing tabs</long>
- <default>0.5</default>
- <min>0.0</min>
- <max>5.0</max>
- <precision>0.05</precision>
- </option>
- </subgroup>
- <subgroup name="Appearance">
- <option name="thumb_size" type="int">
- <short>Thumb Size</short>
- <long>The size of the window thumbs in the task bar</long>
- <default>96</default>
- <min>16</min>
- <max>256</max>
- </option>
- <option name="thumb_space" type="int">
- <short>Space</short>
- <long>The space between the thumbs</long>
- <default>10</default>
- <min>1</min>
- <max>20</max>
- </option>
- <option name="border_radius" type="int">
- <short>Border Radius</short>
- <long>The radius for the tab bar edges</long>
- <default>10</default>
- <min>1</min>
- <max>20</max>
- </option>
- <option name="border_width" type="int">
- <short>Border Width</short>
- <long>The width of the tab bar outline</long>
- <default>1</default>
- <min>1</min>
- <max>5</max>
- </option>
- <option name="tab_base_color" type="color">
- <short>Tab Base Color</short>
- <long>Fill color of the tab bar</long>
- <red>0x0000</red>
- <green>0x0000</green>
- <blue>0x0000</blue>
- <alpha>0x9999</alpha>
- </option>
- <option name="tab_border_color" type="color">
- <short>Tab Border Color</short>
- <long>Border color of the tab bar</long>
- <red>0x0000</red>
- <green>0x0000</green>
- <blue>0x0000</blue>
- <alpha>0xabab</alpha>
- </option>
- <option name="tab_highlight_color" type="color">
- <short>Tab Highlight Color</short>
- <long>Fill color of the tab bar</long>
- <red>0xffff</red>
- <green>0xffff</green>
- <blue>0xffff</blue>
- <alpha>0x9999</alpha>
- </option>
- <option name="tab_style" type="enum">
- <short>Tab Style</short>
- <long>The style of the tab bar</long>
- <value name="Simple" default="true">Simple</value>
- <value name="Gradient">Gradient</value>
- <value name="Glass">Glass</value>
- <value name="Metal">Metal</value>
- <value name="Murrina">Murrina</value>
- </option>
- </subgroup>
- <subgroup name="Window Title Font">
- <option name="tabbar_font_size" type="int">
- <short>Font Size</short>
- <long>The size of the window title font in the tab bar</long>
- <default>12</default>
- <min>6</min>
- <max>24</max>
- </option>
- <option name="tabbar_font_color" type="color">
- <short>Font Color</short>
- <long>The color of the window title in the tab bar</long>
- <red>0xffff</red>
- <green>0xffff</green>
- <blue>0xffff</blue>
- <alpha>0xffff</alpha>
- </option>
- </subgroup>
- <subgroup name="Slot Dragging">
- <option name="spring_model_on_move" type="bool">
- <short>Spring model on move</short>
- <long>Use spring model for the tab bar when moving the window</long>
- <default>false</default>
- </option>
- <option name="dnd_ungroup_window" type="bool">
- <short>Remove window from group after dropping it outside a tab bar</short>
- <long>Remove window from group after dropping it outside a tab bar</long>
- <default>true</default>
- </option>
- <option name="drag_hover_time" type="float">
- <short>Hover time for slot dragging</short>
- <long>Timespan (in s) after which a grouped window is activated if a window of another group is dragged over it</long>
- <default>0.5</default>
- <min>0.0</min>
- <max>5.0</max>
- <precision>0.1</precision>
- </option>
- <option name="drag_spring_k" type="float">
- <short>Slot Drag Spring K</short>
- <long>Spring Konstant used for slot dragging</long>
- <default>8.0</default>
- <min>0.1</min>
- <max>30.0</max>
- <precision>0.1</precision>
- </option>
- <option name="drag_friction" type="float">
- <short>Slot drag friction</short>
- <long>Spring friction for slot dragging</long>
- <default>35.0</default>
- <min>0.1</min>
- <max>30.0</max>
- <precision>0.1</precision>
- </option>
- <option name="drag_y_distance" type="int">
- <short>Y distance for spring model</short>
- <long>Distance (in pixels) between the tab bar and the dragged slot for applying the spring model. If the distance is larger than that value, the model isn't applied.</long>
- <default>400</default>
- <min>10</min>
- <max>2500</max>
- </option>
- <option name="drag_speed_limit" type="int">
- <short>Speed limit for spring model</short>
- <long>Mouse pointer movement speed limit (in pixels/second) for the spring model</long>
- <default>800</default>
- <min>0</min>
- <max>2000</max>
- </option>
- </subgroup>
- </group>
- <group name="Glow">
- <option name="glow" type="bool">
- <short>Enable Glow</short>
- <long>Enable grouped window glowing</long>
- <default>true</default>
- </option>
- <option name="glow_size" type="int">
- <short>Glow Size</short>
- <long>The size of the grouped window glow</long>
- <default>64</default>
- <min>1</min>
- <max>300</max>
- </option>
- <option name="glow_type" type="enum">
- <short>Glow Type</short>
- <long>The type of the glow</long>
- <value name="Rectangular" default="true">Rectangular glow</value>
- <value name="Ring">Glow ring</value>
- </option>
- </group>
- </screen>
-</plugin>
diff --git a/src/group/init.c b/src/group/init.c
index ce8cbba..3d8a50d 100644
--- a/src/group/init.c
+++ b/src/group/init.c
@@ -87,7 +87,7 @@ static void groupScreenOptionChanged(CompScreen *s, CompOption *opt, GroupScreen
{
GROUP_DISPLAY(s->display);
GroupGlowTypeEnum glowType;
- glowType = groupGetGlowType(s);
+ glowType = groupGetGlowTypeIndex(s);
finiTexture(s, &gs->glowTexture);
initTexture(s, &gs->glowTexture);
@@ -249,7 +249,7 @@ Bool groupInitScreen(CompPlugin * p, CompScreen * s)
initTexture (s, &gs->glowTexture);
- GroupGlowTypeEnum glowType = groupGetGlowType(s);
+ GroupGlowTypeEnum glowType = groupGetGlowTypeIndex(s);
imageDataToTexture (s, &gs->glowTexture,
glowTextureProperties[glowType].textureData,
glowTextureProperties[glowType].textureSize,
diff --git a/src/group/paint.c b/src/group/paint.c
index 05b05b3..1b0dda0 100644
--- a/src/group/paint.c
+++ b/src/group/paint.c
@@ -208,7 +208,7 @@ void groupRenderTabBarBackground(GroupSelection *group)
cairo_close_path (cr);
- switch (groupGetTabStyle(group->screen))
+ switch (groupGetTabStyleIndex(group->screen))
{
case TabStyleSimple:
{
@@ -1021,7 +1021,7 @@ groupComputeGlowQuads (CompWindow *w, CompMatrix *matrix)
GROUP_DISPLAY(w->screen->display);
int glowSize = groupGetGlowSize(w->screen);
- GroupGlowTypeEnum glowType = groupGetGlowType(w->screen);
+ GroupGlowTypeEnum glowType = groupGetGlowTypeIndex(w->screen);
int glowOffset = (glowSize * gd->glowTextureProperties[glowType].glowOffset /
gd->glowTextureProperties[glowType].textureSize) + 1;