Adjust for sxiv-25. - pkgsrc-localpatches - leot's pkgsrc LOCALPATCHES
(HTM) hg clone https://bitbucket.org/iamleot/pkgsrc-localpatches
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) changeset 81058a856ec431ff0a782d5282f29332da00742a
(DIR) parent 03634f980098b6cf6a09d3938ec9f596275ed960
(HTM) Author: Leonardo Taccari <iamleot@gmail.com>
Date: Sat, 26 Jan 2019 20:53:28
Adjust for sxiv-25.
(patch-main.c was removed, probably should be completely rewritten.)
Diffstat:
graphics/sxiv/patch-config.h | 21 ++++++++++-----------
graphics/sxiv/patch-main.c | 18 ------------------
2 files changed, 10 insertions(+), 29 deletions(-)
---
diff -r 03634f980098 -r 81058a856ec4 graphics/sxiv/patch-config.h
--- a/graphics/sxiv/patch-config.h Sat Jan 26 01:10:46 2019 +0100
+++ b/graphics/sxiv/patch-config.h Sat Jan 26 20:53:28 2019 +0100
@@ -1,6 +1,6 @@
---- /dev/null 2017-10-28 17:06:36.969087391 +0200
-+++ config.h 2017-10-28 17:04:52.844052093 +0200
-@@ -0,0 +1,160 @@
+--- /dev/null 2019-01-26 20:49:30.367348847 +0100
++++ config.h 2019-01-26 20:49:14.478195877 +0100
+@@ -0,0 +1,159 @@
+#ifdef _WINDOW_CONFIG
+
+/* default window dimensions (overwritten via -g option): */
@@ -15,13 +15,11 @@
+static const char * const BAR_FONT = "monospace:size=8";
+
+/* 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 = "#FFFFFF";
-+static const char * const BAR_BG_COLOR = "#000000";
-+static const char * const BAR_FG_COLOR = "#FFFFFF";
++static const char * const BG_COLOR = "#000000";
++static const char * const FG_COLOR = "#ffffff";
+
+#endif
+#ifdef _IMAGE_CONFIG
@@ -93,8 +91,9 @@
+ { 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 },
@@ -154,7 +153,7 @@
+static const button_t buttons[] = {
+ /* modifiers button function argument */
+ { 0, 1, i_cursor_navigate, None },
-+ { 0, 2, i_drag, None },
++ { 0, 2, i_drag, DRAG_ABSOLUTE },
+ { 0, 3, g_switch_mode, None },
+ { 0, 4, g_zoom, +1 },
+ { 0, 5, g_zoom, -1 },
diff -r 03634f980098 -r 81058a856ec4 graphics/sxiv/patch-main.c
--- a/graphics/sxiv/patch-main.c Sat Jan 26 01:10:46 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Put more information in the window title, similar to the ones in the bar.
-
---- main.c.orig 2017-10-27 15:25:56.000000000 +0000
-+++ main.c
-@@ -347,7 +347,10 @@ void update_info(void)
- if (mode == MODE_THUMB) {
- win_set_title(&win, "sxiv");
- } else {
-- snprintf(title, sizeof(title), "sxiv - %s", files[fileidx].name);
-+ snprintf(title, sizeof(title), "%s - %d/%d (%d%%) %s",
-+ files[fileidx].name, fileidx + 1, filecnt,
-+ (int) (img.zoom * 100.0),
-+ files[fileidx].flags & FF_MARK ? "*" : "");
- win_set_title(&win, title);
- }
-