From 4d64e7efedd6f66070d67d6c05d8f4eb09682d03 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Sun, 15 Sep 2019 19:28:01 +0200
Subject: group-desktop: Update to latest sxiv config from upstream

---
 group-desktop/savedconfig/media-gfx/sxiv | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/group-desktop/savedconfig/media-gfx/sxiv b/group-desktop/savedconfig/media-gfx/sxiv
index 978c673..a8d9920 100644
--- a/group-desktop/savedconfig/media-gfx/sxiv
+++ b/group-desktop/savedconfig/media-gfx/sxiv
@@ -7,18 +7,16 @@ enum {
 };
 
 /* bar font:
- * (see X(7) section "FONT NAMES" for valid values)
+ * (see fonts-conf(5) subsection "FONT NAMES" for valid values)
  */
 static const char * const BAR_FONT = "Iosevka Light:size=16";
 
 /* colors:
+ * overwritten by 'background' and 'foreground' X resource properties.
  * (see X(7) section "COLOR NAMES" for valid values)
  */
-static const char * const WIN_BG_COLOR = "#000000";
-static const char * const WIN_FS_COLOR = "#000000";
-static const char * const SEL_COLOR    = "#DDDDDD";
-static const char * const BAR_BG_COLOR = "#222222";
-static const char * const BAR_FG_COLOR = "#EEEEEE";
+static const char * const BG_COLOR = "#ffffea";
+static const char * const FG_COLOR = "#555555";
 
 #endif
 #ifdef _IMAGE_CONFIG
@@ -90,8 +88,9 @@ static const keymap_t keys[] = {
 	{ 0,            XK_minus,         g_zoom,               -1 },
 	{ 0,            XK_KP_Subtract,   g_zoom,               -1 },
 	{ 0,            XK_m,             g_toggle_image_mark,  None },
-	{ 0,            XK_M,             g_reverse_marks,      None },
-	{ ControlMask,  XK_m,             g_unmark_all,         None },
+	{ 0,            XK_M,             g_mark_range,         None },
+	{ ControlMask,  XK_m,             g_reverse_marks,      None },
+	{ ControlMask,  XK_u,             g_unmark_all,         None },
 	{ 0,            XK_N,             g_navigate_marked,    +1 },
 	{ 0,            XK_P,             g_navigate_marked,    -1 },
 	{ 0,            XK_braceleft,     g_change_gamma,       -1 },
@@ -150,17 +149,11 @@ static const keymap_t keys[] = {
 /* mouse button mappings for image mode: */
 static const button_t buttons[] = {
 	/* modifiers    button            function              argument */
-	{ 0,            1,                i_navigate,           +1 },
-	{ 0,            3,                i_navigate,           -1 },
-	{ 0,            2,                i_drag,               None },
-	{ 0,            4,                i_scroll,             DIR_UP },
-	{ 0,            5,                i_scroll,             DIR_DOWN },
-	{ ShiftMask,    4,                i_scroll,             DIR_LEFT },
-	{ ShiftMask,    5,                i_scroll,             DIR_RIGHT },
-	{ 0,            6,                i_scroll,             DIR_LEFT },
-	{ 0,            7,                i_scroll,             DIR_RIGHT },
-	{ ControlMask,  4,                g_zoom,               +1 },
-	{ ControlMask,  5,                g_zoom,               -1 },
+	{ 0,            1,                i_cursor_navigate,    None },
+	{ 0,            2,                i_drag,               DRAG_ABSOLUTE },
+	{ 0,            3,                g_switch_mode,        None },
+	{ 0,            4,                g_zoom,               +1 },
+	{ 0,            5,                g_zoom,               -1 },
 };
 
 #endif
-- 
cgit v1.2.3-2-gb3c3