From 3bb94dc1a6094f1306cdaf387973b6712244df6a Mon Sep 17 00:00:00 2001
From: Harry Jeffery <harry@exec64.co.uk>
Date: Thu, 23 Nov 2017 22:33:12 +0000
Subject: Require <> around all keys in a bind

This is partly for consistency, party to resolve a bug where binding [
in the config file would trick the ini parser into thinking it was
reading a section header, leading to the bind not being applied.
---
 src/imv.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/imv.c')

diff --git a/src/imv.c b/src/imv.c
index e0fbfa9..2f72a6f 100644
--- a/src/imv.c
+++ b/src/imv.c
@@ -185,35 +185,35 @@ struct imv *imv_create(void)
   imv_command_alias(imv->commands, "n", "select_rel 1");
   imv_command_alias(imv->commands, "p", "select_rel -1");
 
-  add_bind(imv, "Q", "quit");
+  add_bind(imv, "<Q>", "quit");
   add_bind(imv, "<Left>", "select_rel -1");
-  add_bind(imv, "[", "select_rel -1");
+  add_bind(imv, "<[>", "select_rel -1");
   add_bind(imv, "<Right>", "select_rel 1");
-  add_bind(imv, "]", "select_rel 1");
-  add_bind(imv, "GG", "select_abs 0");
+  add_bind(imv, "<]>", "select_rel 1");
+  add_bind(imv, "<G><G>", "select_abs 0");
   add_bind(imv, "<Shift+G>", "select_abs -1");
-  add_bind(imv, "J", "pan 0 -50");
-  add_bind(imv, "K", "pan 0 50");
-  add_bind(imv, "H", "pan 50 0");
-  add_bind(imv, "L", "pan -50 0");
-  add_bind(imv, "X", "remove");
-  add_bind(imv, "F", "fullscreen");
-  add_bind(imv, "D", "overlay");
-  add_bind(imv, "P", "exec echo $imv_path");
+  add_bind(imv, "<J>", "pan 0 -50");
+  add_bind(imv, "<K>", "pan 0 50");
+  add_bind(imv, "<H>", "pan 50 0");
+  add_bind(imv, "<L>", "pan -50 0");
+  add_bind(imv, "<X>", "remove");
+  add_bind(imv, "<F>", "fullscreen");
+  add_bind(imv, "<D>", "overlay");
+  add_bind(imv, "<P>", "exec echo $imv_path");
   add_bind(imv, "<Equals>", "zoom 1");
   add_bind(imv, "<Up>", "zoom 1");
-  add_bind(imv, "+", "zoom 1");
-  add_bind(imv, "I", "zoom 1");
+  add_bind(imv, "<+>", "zoom 1");
+  add_bind(imv, "<I>", "zoom 1");
   add_bind(imv, "<Down>", "zoom -1");
-  add_bind(imv, "-", "zoom -1");
-  add_bind(imv, "O", "zoom -1");
-  add_bind(imv, "C", "center");
-  add_bind(imv, "S", "scaling_mode next");
-  add_bind(imv, "A", "zoom actual");
-  add_bind(imv, "R", "reset");
-  add_bind(imv, ".", "next_frame");
+  add_bind(imv, "<->", "zoom -1");
+  add_bind(imv, "<O>", "zoom -1");
+  add_bind(imv, "<C>", "center");
+  add_bind(imv, "<S>", "scaling_mode next");
+  add_bind(imv, "<A>", "zoom actual");
+  add_bind(imv, "<R>", "reset");
+  add_bind(imv, "<.>", "next_frame");
   add_bind(imv, "<Space>", "toggle_playing");
-  add_bind(imv, "T", "slideshow_duration +1");
+  add_bind(imv, "<T>", "slideshow_duration +1");
   add_bind(imv, "<Shift+T>", "slideshow_duration -1");
 
   return imv;
-- 
cgit v1.2.3