commit 480fb2e1bd773ce49f80f53d455f378dc4eace57
parent a053d8da55ae32ba5c27d9d07746c42449d8b15d
Author: Jacob R. Edwards <n/a>
Date: Wed, 30 Nov 2022 22:40:15 -0600
Add sxiv fork
Unfortunately, OpenBSD no longer packages sxiv (only it's "successor"
nsxiv). Therefor this fork is needed, plus, I do like to have a few
different key bindings and such.
Diffstat:
5 files changed, 235 insertions(+), 0 deletions(-)
diff --git a/local/src/src/fork/sxiv/Makefile b/local/src/src/fork/sxiv/Makefile
@@ -0,0 +1,9 @@
+name = sxiv
+rev = v26
+dir = sxiv
+arc = sxiv.tar.gz
+url = https://github.com/muennich/sxiv/archive/${rev}.tar.gz
+
+.include "../common.mk"
+.include "../http.mk"
+.include "../suckless.mk"
diff --git a/local/src/src/fork/sxiv/checksum b/local/src/src/fork/sxiv/checksum
@@ -0,0 +1 @@
+a382ad57734243818e828ba161fc0357b48d8f3a7f8c29cac183492b46b58949
diff --git a/local/src/src/fork/sxiv/patches/config.diff b/local/src/src/fork/sxiv/patches/config.diff
@@ -0,0 +1,166 @@
+Author: Jacob R. Edwards
+Date: 2022-11-30
+
+Costom sxiv configuration.
+
+--- /dev/null Wed Nov 30 12:52:46 2022
++++ config.h Wed Nov 30 12:52:24 2022
+@@ -0,0 +1,158 @@
++#ifdef _WINDOW_CONFIG
++
++/* default window dimensions (overwritten via -g option): */
++enum {
++ WIN_WIDTH = 800,
++ WIN_HEIGHT = 600
++};
++
++/* colors and font are configured with 'background', 'foreground' and
++ * 'font' X resource properties.
++ * See X(7) section Resources and xrdb(1) for more information.
++ */
++
++#endif
++#ifdef _IMAGE_CONFIG
++
++/* levels (in percent) to use when zooming via '-' and '+':
++ * (first/last value is used as min/max zoom level)
++ */
++static const float zoom_levels[] = {
++ 4, 8, 32, 48, 72, 100, 128, 150, 200, 350, 500, 700, 800,
++ 950, 1150, 1200
++};
++
++/* default slideshow delay (in sec, overwritten via -S option): */
++enum { SLIDESHOW_DELAY = 5 };
++
++/* gamma correction: the user-visible ranges [-GAMMA_RANGE, 0] and
++ * (0, GAMMA_RANGE] are mapped to the ranges [0, 1], and (1, GAMMA_MAX].
++ * */
++static const double GAMMA_MAX = 10.0;
++static const int GAMMA_RANGE = 32;
++
++/* command i_scroll pans image 1/PAN_FRACTION of screen width/height */
++static const int PAN_FRACTION = 2; /* 25% of screen */
++
++/* if false, pixelate images at zoom level != 100%,
++ * toggled with 'a' key binding
++ */
++static const bool ANTI_ALIAS = true;
++
++/* if true, use a checkerboard background for alpha layer,
++ * toggled with 'A' key binding
++ */
++static const bool ALPHA_LAYER = false;
++
++#endif
++#ifdef _THUMBS_CONFIG
++
++/* thumbnail sizes in pixels (width == height): */
++static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
++
++/* thumbnail size at startup, index into thumb_sizes[]: */
++static const int THUMB_SIZE = 3;
++
++#endif
++#ifdef _MAPPINGS_CONFIG
++
++/* keyboard mappings for image and thumbnail mode: */
++static const keymap_t keys[] = {
++ /* modifiers key function argument */
++ { 0, XK_q, g_quit, None },
++ { 0, XK_Return, g_switch_mode, None },
++ { 0, XK_v, g_switch_mode, None },
++ { 0, XK_f, g_toggle_fullscreen, None },
++ { 0, XK_b, g_toggle_bar, None },
++ { ControlMask, XK_x, g_prefix_external, None },
++ { 0, XK_g, g_first, None },
++ { 0, XK_G, g_n_or_last, None },
++ { 0, XK_r, g_reload_image, None },
++ { 0, XK_D, g_remove_image, None },
++ { ControlMask, XK_h, g_scroll_screen, DIR_LEFT },
++ { ControlMask, XK_Left, g_scroll_screen, DIR_LEFT },
++ { ControlMask, XK_j, g_scroll_screen, DIR_DOWN },
++ { ControlMask, XK_Down, g_scroll_screen, DIR_DOWN },
++ { ControlMask, XK_k, g_scroll_screen, DIR_UP },
++ { ControlMask, XK_Up, g_scroll_screen, DIR_UP },
++ { ControlMask, XK_l, g_scroll_screen, DIR_RIGHT },
++ { ControlMask, XK_Right, g_scroll_screen, DIR_RIGHT },
++ { 0, XK_plus, g_zoom, +1 },
++ { 0, XK_KP_Add, g_zoom, +1 },
++ { ControlMask, XK_o, g_zoom, +1 },
++ { 0, XK_minus, g_zoom, -1 },
++ { 0, XK_KP_Subtract, g_zoom, -1 },
++ { ControlMask, XK_n, g_zoom, -1 },
++ { 0, XK_m, g_toggle_image_mark, 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 },
++ { 0, XK_braceright, g_change_gamma, +1 },
++ { ControlMask, XK_g, g_change_gamma, 0 },
++
++ { 0, XK_h, t_move_sel, DIR_LEFT },
++ { 0, XK_Left, t_move_sel, DIR_LEFT },
++ { 0, XK_j, t_move_sel, DIR_DOWN },
++ { 0, XK_Down, t_move_sel, DIR_DOWN },
++ { 0, XK_k, t_move_sel, DIR_UP },
++ { 0, XK_Up, t_move_sel, DIR_UP },
++ { 0, XK_l, t_move_sel, DIR_RIGHT },
++ { 0, XK_Right, t_move_sel, DIR_RIGHT },
++ { 0, XK_R, t_reload_all, None },
++
++ { 0, XK_n, i_navigate, +1 },
++ { 0, XK_n, i_scroll_to_edge, DIR_LEFT | DIR_UP },
++ { 0, XK_space, i_navigate, +1 },
++ { 0, XK_p, i_navigate, -1 },
++ { 0, XK_p, i_scroll_to_edge, DIR_LEFT | DIR_UP },
++ { 0, XK_BackSpace, i_navigate, -1 },
++ { 0, XK_bracketright, i_navigate, +10 },
++ { 0, XK_bracketleft, i_navigate, -10 },
++ { ControlMask, XK_6, i_alternate, None },
++ { ControlMask, XK_n, i_navigate_frame, +1 },
++ { ControlMask, XK_p, i_navigate_frame, -1 },
++ { ControlMask, XK_space, i_toggle_animation, None },
++ { 0, XK_h, i_scroll, DIR_LEFT },
++ { 0, XK_Left, i_scroll, DIR_LEFT },
++ { 0, XK_j, i_scroll, DIR_DOWN },
++ { 0, XK_Down, i_scroll, DIR_DOWN },
++ { 0, XK_k, i_scroll, DIR_UP },
++ { 0, XK_Up, i_scroll, DIR_UP },
++ { 0, XK_l, i_scroll, DIR_RIGHT },
++ { 0, XK_Right, i_scroll, DIR_RIGHT },
++ { 0, XK_H, i_scroll_to_edge, DIR_LEFT },
++ { 0, XK_J, i_scroll_to_edge, DIR_DOWN },
++ { 0, XK_K, i_scroll_to_edge, DIR_UP },
++ { 0, XK_L, i_scroll_to_edge, DIR_RIGHT },
++ { 0, XK_equal, i_set_zoom, 100 },
++ { 0, XK_w, i_fit_to_win, SCALE_DOWN },
++ { 0, XK_W, i_fit_to_win, SCALE_FIT },
++ { 0, XK_e, i_fit_to_win, SCALE_WIDTH },
++ { 0, XK_E, i_fit_to_win, SCALE_HEIGHT },
++ { 0, XK_less, i_rotate, DEGREE_270 },
++ { 0, XK_greater, i_rotate, DEGREE_90 },
++ { 0, XK_question, i_rotate, DEGREE_180 },
++ { 0, XK_bar, i_flip, FLIP_HORIZONTAL },
++ { 0, XK_underscore, i_flip, FLIP_VERTICAL },
++ { 0, XK_a, i_toggle_antialias, None },
++ { 0, XK_A, i_toggle_alpha, None },
++ { 0, XK_s, i_slideshow, None },
++};
++
++/* mouse button mappings for image mode: */
++static const button_t buttons[] = {
++ /* modifiers button function argument */
++ { 0, 1, i_drag, DRAG_ABSOLUTE },
++ { ShiftMask, 1, i_drag, DRAG_RELATIVE },
++ { ControlMask, 1, g_zoom, +1 },
++ { 0, 2, g_switch_mode, None },
++ { ControlMask, 2, i_fit_to_win, SCALE_FIT },
++ { ControlMask, 3, g_zoom, -1 },
++ { 0, 4, g_zoom, +1 },
++ { 0, 5, g_zoom, -1 },
++};
++
++#endif
diff --git a/local/src/src/fork/sxiv/patches/nogit.diff b/local/src/src/fork/sxiv/patches/nogit.diff
@@ -0,0 +1,17 @@
+Author: Jacob R. Edwards
+Date: 2022-11-30
+
+Fix version.h target when it's not in a git repository.
+
+--- Makefile.orig Wed Nov 30 12:42:53 2022
++++ Makefile Wed Nov 30 12:42:57 2022
+@@ -57,8 +57,7 @@ config.h:
+
+ version.h: Makefile .git/index
+ @echo "GEN $@"
+- v="$$(cd $(srcdir); git describe 2>/dev/null)"; \
+- echo "#define VERSION \"$${v:-$(version)}\"" >$@
++ echo "#define VERSION \"$(version)\"" >$@
+
+ .git/index:
+
diff --git a/local/src/src/fork/sxiv/patches/openbsd.diff b/local/src/src/fork/sxiv/patches/openbsd.diff
@@ -0,0 +1,42 @@
+Author: Jacob R. Edwards
+Date: 2022-11-30
+
+Compile sxiv on OpenBSD without inotify support (I was having trouble
+with it).
+
+--- Makefile.orig Wed Nov 30 12:24:54 2022
++++ Makefile Wed Nov 30 12:42:18 2022
+@@ -4,10 +4,10 @@ srcdir = .
+ VPATH = $(srcdir)
+
+ PREFIX = /usr/local
+-MANPREFIX = $(PREFIX)/share/man
++MANPREFIX = $(PREFIX)/man
+
+ # autoreload backend: inotify/nop
+-AUTORELOAD = inotify
++AUTORELOAD = nop
+
+ # enable features requiring giflib (-lgif)
+ HAVE_GIFLIB = 1
+@@ -15,16 +15,18 @@ HAVE_GIFLIB = 1
+ # enable features requiring libexif (-lexif)
+ HAVE_LIBEXIF = 1
+
++X11 = /usr/X11R6
++
+ cflags = -std=c99 -Wall -pedantic $(CFLAGS)
+ cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=700 \
+ -DHAVE_GIFLIB=$(HAVE_GIFLIB) -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) \
+- -I/usr/include/freetype2 -I$(PREFIX)/include/freetype2
++ -I$(X11)/include/freetype2 -I$(X11)/include
+
+ lib_exif_0 =
+ lib_exif_1 = -lexif
+ lib_gif_0 =
+ lib_gif_1 = -lgif
+-ldlibs = $(LDLIBS) -lImlib2 -lX11 -lXft -lfontconfig \
++ldlibs = $(LDLIBS) -L$(X11)/lib -lImlib2 -lX11 -lXft -lfontconfig \
+ $(lib_exif_$(HAVE_LIBEXIF)) $(lib_gif_$(HAVE_GIFLIB))
+
+ objs = autoreload_$(AUTORELOAD).o commands.o image.o main.o options.o \
