summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiguel A. Colón Vélez <[email protected]>2015-01-01 19:16:35 -0500
committerMiguel A. Colón Vélez <[email protected]>2015-01-01 19:16:35 -0500
commit0103f18326f7be7075933235f8c04264d2892528 (patch)
tree47ffc736ebf4d77445356f51b87263793addb6b4 /src
parent094bf425195d75b2c4c530fd81a7bdd9b62045ab (diff)
downloadmarco-0103f18326f7be7075933235f8c04264d2892528.tar.bz2
marco-0103f18326f7be7075933235f8c04264d2892528.tar.xz
Add the tile-to-side options to the appropiate files.
This is just a copy/paste from move-to-side-{e,w} with: s/move/tile/g s/Move/Tile/g . It uses the existing handle_toggle_tiled as the backend.
Diffstat (limited to 'src')
-rw-r--r--src/50-marco-window-key.xml.in8
-rw-r--r--src/include/all-keybindings.h5
-rw-r--r--src/marco.convert2
-rw-r--r--src/org.mate.marco.gschema.xml10
4 files changed, 25 insertions, 0 deletions
diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in
index 2dcfabc3..0b3ecef4 100644
--- a/src/50-marco-window-key.xml.in
+++ b/src/50-marco-window-key.xml.in
@@ -70,6 +70,14 @@
_description="Maximize window horizontally" />
<KeyListEntry
+ name="tile-to-side-e"
+ _description="Tile window to east (right) side of screen" />
+
+ <KeyListEntry
+ name="tile-to-side-w"
+ _description="Tile window to west (left) side of screen" />
+
+ <KeyListEntry
name="move-to-corner-nw"
_description="Move window to north-west (top left) corner" />
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index 5b030280..a14777e9 100644
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -252,6 +252,11 @@ keybind (maximize-vertically, handle_maximize_vertically, 0,
keybind (maximize-horizontally, handle_maximize_horizontally, 0,
BINDING_PER_WINDOW)
+keybind (tile-to-side-e, handle_toggle_tiled, META_TILE_RIGHT,
+ BINDING_PER_WINDOW)
+keybind (tile-to-side-w, handle_toggle_tiled, META_TILE_LEFT,
+ BINDING_PER_WINDOW)
+
keybind (move-to-corner-nw, handle_move_to_corner_nw, 0,
BINDING_PER_WINDOW)
keybind (move-to-corner-ne, handle_move_to_corner_ne, 0,
diff --git a/src/marco.convert b/src/marco.convert
index eb1f623b..21c8799f 100644
--- a/src/marco.convert
+++ b/src/marco.convert
@@ -142,6 +142,8 @@ raise = /apps/marco/window_keybindings/raise
lower = /apps/marco/window_keybindings/lower
maximize-vertically = /apps/marco/window_keybindings/maximize_vertically
maximize-horizontally = /apps/marco/window_keybindings/maximize_horizontally
+tile-to-side-e = /apps/marco/window_keybindings/tile_to_side_e
+tile-to-side-w = /apps/marco/window_keybindings/tile_to_side_w
move-to-corner-nw = /apps/marco/window_keybindings/move_to_corner_nw
move-to-corner-ne = /apps/marco/window_keybindings/move_to_corner_ne
move-to-corner-sw = /apps/marco/window_keybindings/move_to_corner_sw
diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
index a0725382..4108355c 100644
--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
@@ -838,6 +838,16 @@
<summary>Maximize window horizontally</summary>
<description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
</key>
+ <key name="tile-to-side-e" type="s">
+ <default>'disabled'</default>
+ <summary>Tile window to east (right) side of screen</summary>
+ <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
+ </key>
+ <key name="tile-to-side-w" type="s">
+ <default>'disabled'</default>
+ <summary>Tile window to west (left) side of screen</summary>
+ <description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
+ </key>
<key name="move-to-corner-nw" type="s">
<default>'disabled'</default>
<summary>Move window to north-west (top left) corner</summary>