summaryrefslogtreecommitdiff
path: root/app/cwm/conf.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2013-02-09 16:47:31 +0100
committerMatthieu Herrb <matthieu.herrb@laas.fr>2013-02-09 16:47:31 +0100
commit367bdc28e2de747c962659517bcc8cbf09a9fd81 (patch)
treeaa2516ad541e8eb43740fd45de6816edc30ed848 /app/cwm/conf.c
parent91bb789ad557ceffb3635adba7a8222a2aab2ec8 (diff)
parent13179665ebbd91ceeeeada784764303924d55696 (diff)
Merge remote-tracking branch 'origin/master' into matthieu/xserver-1.13
Diffstat (limited to 'app/cwm/conf.c')
-rw-r--r--app/cwm/conf.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index 8c45f39c1..24d762339 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: conf.c,v 1.120 2013/01/04 16:27:58 okan Exp $
+ * $OpenBSD: conf.c,v 1.121 2013/01/08 15:16:05 okan Exp $
*/
#include <sys/param.h>
@@ -375,6 +375,10 @@ static struct {
{.i = (CWM_LEFT|CWM_PTRMOVE|CWM_BIGMOVE)} },
{ "bigptrmoveright", kbfunc_moveresize, 0,
{.i = (CWM_RIGHT|CWM_PTRMOVE|CWM_BIGMOVE)} },
+ { "htile", kbfunc_tile, KBFLAG_NEEDCLIENT,
+ {.i = CWM_TILE_HORIZ } },
+ { "vtile", kbfunc_tile, KBFLAG_NEEDCLIENT,
+ {.i = CWM_TILE_VERT } },
};
/*