From b37de0b2e0f4bda8edb9fd2df79ce8422464eff6 Mon Sep 17 00:00:00 2001 From: speedie Date: Fri, 9 Jun 2023 13:55:55 +0200 Subject: [PATCH] Fix keybind conflict causing image to be flipped if columns are changed --- docs/docs.md | 4 ++-- docs/spmenu.conf | 4 ++-- libs/keybinds.h | 4 ++-- spmenu.1 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/docs.md b/docs/docs.md index 2a43416..79cc1ca 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -720,8 +720,8 @@ These are the default keybinds. You can generate these yourself from a | 0 | 0 | t | toggleimg | 0 | | 0 | 0 | f | togglefullimg | 0 | | 0 | 0 | p | paste | 2 | -| 0 | 0 | h | flipimg | 1 | -| 0 | 0 | v | flipimg | 0 | +| 0 | Shift | h | flipimg | 1 | +| 0 | Shift | v | flipimg | 0 | | 0 | 0 | k | moveup | 0 | | 0 | 0 | j | movedown | 0 | | 0 | 0 | h | moveleft | 0 | diff --git a/docs/spmenu.conf b/docs/spmenu.conf index ac8bd27..1cbdc78 100644 --- a/docs/spmenu.conf +++ b/docs/spmenu.conf @@ -294,8 +294,8 @@ spmenu = { { mode = 0; modifier = "Shift"; key = "@"; function = "setimggaps"; argument = "+100"; }, // Shift+2: Increase image gaps by 100 { mode = 0; modifier = "None"; key = "t"; function = "toggleimg"; argument = "0"; }, // t: Toggle image { mode = 0; modifier = "None"; key = "f"; function = "togglefullimg"; argument = "0"; }, // f: Toggle image full screen mode - { mode = 0; modifier = "None"; key = "h"; function = "flipimg"; argument = "1"; }, // h: Flip image horizontally - { mode = 0; modifier = "None"; key = "v"; function = "flipimg"; argument = "0"; }, // v: Flip image vertically + { mode = 0; modifier = "Shift"; key = "h"; function = "flipimg"; argument = "1"; }, // Shift+h: Flip image horizontally + { mode = 0; modifier = "Shift"; key = "v"; function = "flipimg"; argument = "0"; }, // Shift+v: Flip image vertically { mode = 0; modifier = "None"; key = "k"; function = "moveup"; argument = "0"; }, // k: Move up 1 item { mode = 0; modifier = "None"; key = "j"; function = "movedown"; argument = "0"; }, // j: Move down 1 item { mode = 0; modifier = "None"; key = "h"; function = "moveleft"; argument = "0"; }, // h: Move left 1 item diff --git a/libs/keybinds.h b/libs/keybinds.h index 8b7fde1..b197e6c 100644 --- a/libs/keybinds.h +++ b/libs/keybinds.h @@ -46,8 +46,8 @@ static Key keys[] = { { 0, 0, XK_t, toggleimg, {0} }, { 0, 0, XK_f, togglefullimg, {0} }, { 0, 0, XK_p, paste, {.i = 2 } }, - { 0, 0, XK_h, flipimg, {.i = 1 } }, - { 0, 0, XK_v, flipimg, {.i = 0 } }, + { 0, Shift, XK_h, flipimg, {.i = 1 } }, + { 0, Shift, XK_v, flipimg, {.i = 0 } }, { 0, 0, XK_k, moveup, {0} }, { 0, 0, XK_j, movedown, {0} }, { 0, 0, XK_h, moveleft, {0} }, diff --git a/spmenu.1 b/spmenu.1 index c49b926..af15018 100644 --- a/spmenu.1 +++ b/spmenu.1 @@ -1105,7 +1105,7 @@ T} T{ 0 T}@T{ -0 +Shift T}@T{ h T}@T{ @@ -1116,7 +1116,7 @@ T} T{ 0 T}@T{ -0 +Shift T}@T{ v T}@T{