Merge pull request #40 from FreeBirdLjj/issue#16

Add sublime Text 3 project settings.
Replace ((void*)0) with NULL.
Add inline_display().
Update for inline markdown support of unordered list.
Support for inline markdown in unordered list.
Use for loop to iterate.
Remove unused block.

diff --git a/Makefile b/Makefile
index 7f17a1b..1231bde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,25 +18,33 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-CURSES   = ncursesw
-ifeq (Windows_NT, $(OS))
-OSTYPE  := $(shell uname -o)
-ifneq (Cygwin, $(OSTYPE))
-CURSES  := pdcurses
-endif
+UNAME_S := $(shell uname -s 2>/dev/null || echo not)
+
+SOURCES = $(wildcard src/*.c)
+OBJECTS = $(SOURCES:.c=.o)
+TARGET  = mdp
+DESTDIR = /usr/bin
+
+CURSES  = ncursesw
+LDFLAGS = -s
+
+ifeq (Windows_NT,$(OS))
+       ifeq (,$(findstring CYGWIN,$(UNAME_S)))
+               CURSES := pdcurses
+       endif
 endif
 
-LDFLAGS  = -s
-LDLIBS   = -l$(CURSES)
-SOURCES  = $(wildcard src/*.c)
-OBJECTS  = $(SOURCES:.c=.o)
-TARGET   = mdp
-DESTDIR  = /usr/bin
+ifeq ($(UNAME_S),Darwin)
+       CURSES := ncurses
+       LDFLAGS :=
+endif
 
 ifeq ($(DEBUG),1)
-LDFLAGS :=
+       LDFLAGS :=
 endif
 
+LDLIBS   = -l$(CURSES)
+
 all: $(TARGET)
 
 $(TARGET): src

diff --git a/include/viewer.h b/include/viewer.h
index e498dfb..07475fd 100644 (file)
--- a/include/viewer.h
+++ b/include/viewer.h
@@ -32,10 +32,10 @@
  *
  */
 
-#if WIN32 == 1
-# include <curses.h>
+#if defined( WIN32 )
+#include <curses.h>
 #else
-# include <ncurses.h>
+#include <ncurses.h>
 #endif
 
 #include "parser.h"

diff --git a/mdp.sublime-project b/mdp.sublime-project
index 17711a0..e20eca6 100644 (file)
--- a/mdp.sublime-project
+++ b/mdp.sublime-project
@@ -1,15 +1,16 @@
 {
-       "settings":
-       {
-               "tab_size": 4,
-               "translate_tabs_to_spaces": true,
-               "use_tab_stops": false,
-       }
-       ,"folders":
-       [
-       {
-               "follow_symlinks": true,
-               "path": "."
-       }
-       ]
-}
+    "settings":
+    {
+        "tab_size": 4,
+        "translate_tabs_to_spaces": true,
+        "use_tab_stops": false
+    }
+    ,"folders":
+    [
+    {
+        "follow_symlinks": true,
+        "path": ".",
+        "file_exclude_patterns": [".*", "mdp", "mdp.sublime-project"]
+    }
+    ]
+}
\ No newline at end of file

diff --git a/src/Makefile b/src/Makefile
index 42d5563..f41e99a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,19 +18,20 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
+UNAME_S := $(shell uname -s 2>/dev/null || echo not)
+
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:.c=.o)
+CFLAGS  = -O3 -Wall -I../include
 
-CFLAGS   = -O3 -Wall -I../include
 ifeq ($(DEBUG),1)
-CFLAGS  := -O0 -Wall -g -I../include
+       CFLAGS := -O0 -Wall -g -I../include
 endif
 
-ifeq (Windows_NT, $(OS))
-OSTYPE  := $(shell uname -o)
-ifneq (Cygwin, $(OSTYPE))
-CFLAGS  += -DWIN32=1
-endif
+ifeq ($(OS),Windows_NT)
+       ifeq (,$(findstring CYGWIN,$(UNAME_S)))
+               CFLAGS += -DWIN32
+       endif
 endif
 
 all: $(OBJECTS)

diff --git a/src/viewer.c b/src/viewer.c
index 81614e1..747329c 100644 (file)
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -297,6 +297,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             // show previous slide
             case KEY_UP:
             case KEY_LEFT:
+            case KEY_PPAGE:
             case 8:   // BACKSPACE (ascii)
             case 127: // BACKSPACE (xterm)
             case 263: // BACKSPACE (getty)
@@ -313,6 +314,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             // show next slide
             case KEY_DOWN:
             case KEY_RIGHT:
+            case KEY_NPAGE:
             case '\n': // ENTER
             case ' ':  // SPACE
             case 'j':