Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
939 Commits 1 Branch 0 Tags 2 MiB
78938721a4
Commit Graph

939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bert Münnich
df714376c5 Always take {C,CPP,LD}FLAGS from environment 
Our own default values go into accompanying macros prefixed with DEF_.
 2017-10-22 12:26:20 +02:00
Bert Münnich
4d2fc0b889 Back to VPATH for out-of-source builds 
OpenBSD make supports VPATH but not pattern rules. Everything in the new
Makefile should work no matter what make program is used.
 2017-10-19 13:29:25 +02:00
Bert Münnich
d2b3a18d60 Addendum to 1ace4fb0 2017-10-19 13:02:08 +02:00
Bert Münnich
1ace4fb09c No more automatic dependency tracking 
The new Makefile should work with the make programs shipped with FreeBSD,
NetBSD and OpenBSD.
 2017-10-16 21:19:22 +02:00
Bert Münnich
24cf812bb2 No more config.mk 2017-10-16 21:16:05 +02:00
Bert Münnich
2cf9cfc700 Small refinements in Makefile 2017-10-16 21:15:38 +02:00
Bert Münnich
148026007c One header file for type definitions and function declarations 2017-10-16 21:10:35 +02:00
Bert Münnich
4af189e7d9 Fix dep file include in Makefile 2017-10-16 15:07:03 +02:00
Bert Münnich
a5403178e3 Zoom into mouse cursor position 2017-10-16 10:56:53 +02:00
Bert Münnich
5155d52ab1 Much more portable Makefile 
The config.mk file is now optional and only needs to be created if one wants to
persistently overwrite default macro values.

Features used in the Makefile that are not yet in the POSIX standard:

  - Advanced macro assignment operators '+=' and '?=' [1]
  - Special target .PHONY [2]
  - Pattern rules [3]; only needed when $srcdir != '.'. For every pattern rule
    there is an inference rule with the same effect. Hopefully, the inference
    rules get picked up by make programs not supporting pattern rules.
  - Silently including multiple possibly not exisiting files [4] [5]

[1] http://austingroupbugs.net/view.php?id=330
[2] http://austingroupbugs.net/view.php?id=523
[3] http://austingroupbugs.net/view.php?id=513
[4] http://austingroupbugs.net/view.php?id=333
[5] http://austingroupbugs.net/view.php?id=518
 2017-10-12 11:00:24 +02:00
Bert Münnich
6beb8b4d71 Always include non-configurable part of CPPFLAGS 2017-10-08 22:03:05 +02:00
Bert Münnich
e3b68efadd Move DEPFLAGS from Makefile to config.mk 2017-10-08 22:02:29 +02:00
Bert Münnich
33b5dbfa82 Mention GNU make requirement in Makefile 2017-10-08 20:24:15 +02:00
Bert Münnich
171633de32 Get rid of SRCDIR macro, VPATH on make cmd line suffices 2017-10-08 20:23:16 +02:00
Bert Münnich
2bf8f2ac42 Add missing description for Button3 to man page 2017-10-06 10:26:15 +02:00
Bert Münnich
8081cbebf3 Improve mouse support 
None of the mouse mappings uses a keyboard modifier, making it possible to
access the most basic features by only using the mouse.

Next/previous image with left button depending on cursor position, middle
button for dragging, right button for switching to thumnail mode and wheel for
zooming.

Users can keep the old behaviour by simply not adapting the changes to the
buttons array in config.def.h to their config.h file.
 2017-10-06 10:15:43 +02:00
Bert Münnich
ee908ca0a1 Simplify cursor reset in image mode 
No need to give cursor name. reset_cursor() is now the only place to decide
what cursor to fall back to.
 2017-10-05 13:49:11 +02:00
Bert Münnich
d81442f55d Own win method for mouse cursor location 2017-10-05 13:47:02 +02:00
Bert Münnich
b8fd923e74 Simplify cursor handling 2017-10-05 12:30:31 +02:00
Bert Münnich
e310136e02 Mouse drag translates pointer position to image area 
This makes mouse panning more direct and faster.
 2017-10-04 18:22:43 +02:00
Bert Münnich
9b6acc781e Fix linker command line 2017-09-11 17:09:26 +02:00
Bert Münnich
5b5dc74195 Only use targets in build messages 2017-09-11 17:08:38 +02:00
Antti Korpi
ecc363ec10 Add -p flag to disable writing of cache and temporary files 
Closes #285.
 2017-09-08 22:04:44 +02:00
Bert Münnich
20009c240b Move special targets to bottom of Makefile 2017-09-08 21:15:59 +02:00
Bert Münnich
a1b2fd2774 Non-verbose build 
Verbose when build with `V=1'.
 2017-09-08 16:51:47 +02:00
Bert Münnich
a46006f527 Support out-of-source builds 
Fixes issue #167. Long after closing this issue (kind of wontfix) we have switched to
GNU make and can thus use its features like VPATH.
 2017-09-08 16:20:05 +02:00
Bert Münnich
e46b1fa609 Simplify config.mk 2017-09-08 16:03:05 +02:00
Bert Münnich
ad9955a9cf Move configuration parts from Makefile into config.mk 2017-09-06 20:12:09 +02:00
jcalve
ec545a6b6c Make pan fraction configurable 2017-09-06 19:39:22 +02:00
Bert Münnich
30e9ec8970 Add Max Voit to list of contributors 2017-09-06 19:28:50 +02:00
Bert Münnich
c2560f8d0b Add key-handler action to copy image to clipboard 
Thanks ploth for coming up with this:
	https://github.com/muennich/sxiv/issues/247#issuecomment-321316306

Replaces optional dependency on xsel(1) to xclip(1) as it supports this.

Fixes issue #247
 2017-09-02 22:19:00 +02:00
Bert Münnich
52c57f5d61 Adapt inotify_nop to API changes 2017-05-17 20:39:30 +02:00
Bert Münnich
c027122c5f Update copyright notice in autoreload_inotify.c 2017-05-17 20:38:34 +02:00
Bert Münnich
caec32d257 Merge branch 'autoreload' 
Pull request #278.

Fixes issue #29 and issue #199.
 2017-05-17 20:22:23 +02:00
Bert Münnich
a20173a42d Detect all file overwrites in autoreload_inotify 
mv(1) inside the same filesystem was not detected.

Supporting this case made it necessary to always watch the directory. Turns out
the logic and state keeping between arl_setup() and arl_handle() is easier,
when using different watch descriptors for the file and the directory and not
using a oneshot descriptor for the file.

Requiring an absolute canonical path for arl_setup() simplifies dir and base
name splitting. No need for dirname(3) and basename(3) anymore.
 2017-05-17 20:20:39 +02:00
Bert Münnich
de3d7827ce Compiler independent buffer alignment 2017-05-17 20:15:35 +02:00
Bert Münnich
0e1a85d224 Read all available inotify events 
Loop reading from inotify fd in arl_handle(); requires non-blocking inotify fd.
 2017-05-17 20:14:36 +02:00
Bert Münnich
6695cd4c34 Simplify inotify cleanup 2017-05-17 20:14:20 +02:00
Bert Münnich
8bce80fdae Revised error reporting in autoreload_inotify 
No repeated error messages after failed initialization. No error messages on
failed inotify_rm_watch().
 2017-05-17 20:13:32 +02:00
Bert Münnich
9ac8fc62df Fix code-style in autoreload_inotify.c 2017-05-17 20:12:22 +02:00
Bert Münnich
8aaa5c9398 Simplify autoreload backend selection in Makefile 2017-05-17 20:11:44 +02:00
Bert Münnich
3724d3fc17 Revised autoreload interface 
Make the header only contain the public interface and nothing from the
implementation. All functions get a handle to their self object, like the img_
and tns_ and win_ functions. All necessary data (file path) is also passed as
an argument, so that no extern redeclarations are needed.

Make arl_setup_dir() private, it's not called outside the module.

Make arl_handle() return true if the file has changed, so that the reloading of
the file can be done by the caller.
 2017-05-17 20:07:32 +02:00
Max Voit
edb117e3bd Add autoreload support by inotify (and dummy backend nop) 2017-05-17 15:52:40 +02:00
Bert Münnich
1fb3ec576c Properly quit when window gets closed; fixes issue #27 2017-05-17 15:51:47 +02:00
Bert Münnich
e98266b148 State the purpose of CLEANUP macro 2017-05-17 15:51:11 +02:00
Bert Münnich
7e9b4cee92 Merge branch 'diogocp/patch-1' 2017-02-15 20:47:21 +01:00
Jakub Wilk
c313edc0ad Fix typo 2017-02-15 20:20:41 +01:00
Bert Münnich
ba4b84a8b1 Fix missing quote in key-handler from commit 5c607ad 2017-02-13 11:20:58 +01:00
Diogo Pereira
109a38e76c Add Netpbm, TGA and XPM MIME types to sxiv.desktop 
These formats are also supported by imlib2.
 2017-01-27 13:50:29 +00:00
Bert Münnich
5c607ad495 Pass given file names to key-handler instead of real paths 
Misbehaving command lines in the key-handler that rewrite the given files and
thus replace symbolic links instead of their targets shall call realpath(1).

Fixes issue #205 and reverts commit 92e3b578.
 2017-01-07 14:44:33 +01:00