schandinat · yatli · Sep 19, 2017
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+green
+*.o
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ DESTDIR		:=
 PREFIX		:=	/usr/local
 BINDIR		:=	$(PREFIX)/bin
 SYSCONFDIR	:=	$(PREFIX)/etc
-MANDIR		:=      /usr/share/man
+MANDIR		:=	/usr/share/man
 
 CONFIG	:=	-D GREEN_SYSCONFIG_FILE=\"$(SYSCONFDIR)/green.conf\" -D GREEN_USERCONFIG_FILE=\".green.conf\"
 
@@ -17,12 +17,14 @@ POPPLER_LIBS	:=	$$(pkg-config poppler-glib --libs)
 SDL_CFLAGS	:=	$$(sdl-config --cflags)
 SDL_LIBS	:=	$$(sdl-config --libs)
 
-
 all: green
 
 clean:
 	$(RM) green main.o green.o sdl.o
 
+localinstall: green
+	$(INSTALL) green ~/.local/bin
+
 install: green
 	$(INSTALL) green $(DESTDIR)/$(BINDIR)/
 	$(INSTALL) green.1 $(MANDIR)/man1/

diff --git a/green.c b/green.c
@@ -20,6 +20,8 @@
 #include <string.h>
 #include "green.h"
 
+void Green_GIO_AddWatch(Green_Document*);
+
 
 char*	FilenameToURI( char *filename )
 {
@@ -74,26 +76,26 @@ int	Green_Open( Green_RTD *rtd, char *uri )
 
 	if (!doc)
 		return -1;
-	
+
 	if (!strncmp( uri, "file:", 5 ))
 		doc->uri = strdup( uri );
 	else
 		doc->uri = FilenameToURI( uri );
-	
+
 	if (!doc->uri)
 	{
 		free( doc );
 		return -1;
 	}
-	
+
 	doc->doc = poppler_document_new_from_file( doc->uri, NU
10000
LL, NULL );
 	if (!doc->doc)
 	{
 		free( doc->uri );
 		free( doc );
 		return -2;
 	}
-	
+
 	doc->page_count = poppler_document_get_n_pages( doc->doc );
 	doc->page_cur = 0;
 	doc->xoffset = 0;
@@ -107,6 +109,7 @@ int	Green_Open( Green_RTD *rtd, char *uri )
 	doc->cache.page = -1;
 	doc->cache.tscale = 0;
 	doc->cache.surface = NULL;
+    Green_GIO_AddWatch(doc);
 	for (i = 0; i < rtd->doc_count; i++)
 	{
 		if (rtd->docs[i])

diff --git a/green.h b/green.h
@@ -20,6 +20,7 @@
 
 #include <stdbool.h>
 #include "glib/poppler.h"
+#include <gio/gio.h>
 
 
 #define GREEN_FULLSCREEN	0x0001
@@ -49,6 +50,8 @@ typedef struct
 {
 	PopplerDocument	*doc;
 	char	*uri;
+    GFile   *file;
+    GFileMonitor    *monitor;
 	int	page_count, page_cur,
 		xoffset, yoffset;
 	bool	mirrored;	// is the document mirrored horizontally?

diff --git a/main.c b/main.c
@@ -904,7 +904,7 @@ int	main( int argc, char *argv[] )
 	rtd.c_highlight.b = 0x80;
 	rtd.c_highlight.a = 0x80;
 	rtd.fit_method = NATURAL;
-	rtd.step = 1;
+	rtd.step = 0.3;
 	rtd.zoomstep = 1.1;
 	rtd.bb = 0x04;
 	rtd.mouse.flags = 1;

diff --git a/sdl.c b/sdl.c
@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <SDL.h>
 #include "green.h"
 
@@ -554,6 +555,45 @@ Uint32	live_timer( Uint32 interval, void *param )
 	return interval;
 }
 
+void Green_GIO_Callback(GFileMonitor        *monitor,
+                        GFile               *file,
+                        GFile               *other_file,
+                        GFileMonitorEvent   event_type,
+                        Green_Document      *pdoc)
+{
+	SDL_Event	event;
+    fprintf(stderr, "Receiving GIO callback\n");
+    usleep(1000000);
+
+    g_object_unref( G_OBJECT (pdoc->doc));
+    fprintf(stderr, "Updating %s\n", pdoc->uri);
+    pdoc->doc = poppler_document_new_from_file( pdoc->uri, NULL, NULL );
+    if(pdoc->doc == NULL) { fprintf(stderr, "Failed to reopen %s\n", pdoc->uri); }
+    pdoc->page_count = poppler_document_get_n_pages( pdoc->doc );
+    if(pdoc->page_cur >= pdoc->page_count) { pdoc->page_cur = pdoc->page_count - 1; }
+    pdoc->cache.page = -1;
+
+	event.type = SDL_USEREVENT + 1;
+	SDL_PushEvent( &event );
+}
+
+void Green_GIO_AddWatch(Green_Document *doc)
+{
+    doc->file = g_file_new_for_uri(doc->uri);
+    doc->monitor = g_file_monitor_file(doc->file, G_FILE_MONITOR_NONE, NULL, NULL);
+    g_signal_connect(doc->monitor, "changed", G_CALLBACK(Green_GIO_Callback), doc);
+
+    fprintf(stderr, "Watching %s from %llx\n", doc->uri, doc->monitor);
+}
+
+void* Green_GLibLoop_Proc(void* _)
+{
+    GMainLoop *loop;
+    (void)_;
+    loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (loop);
+}
+
 int	Green_SDL_Main( Green_RTD *rtd )
 {
 	SDL_TimerID	timer = NULL;
@@ -590,12 +630,14 @@ int	Green_SDL_Main( Green_RTD *rtd )
 		fprintf( stderr, "Palettes are not supported!\n" );
                 return 3;
 	}
-	
+
 	timer = SDL_AddTimer( live_interval, live_timer, NULL );
 	mouse_last = SDL_GetTicks();
 	if (!rtd->mouse.visibility)
 		SDL_ShowCursor( SDL_DISABLE );
-
+
+    g_thread_new(NULL, Green_GLibLoop_Proc, NULL);
+
 	do
 	{
 		if (flags&FLAG_RENDER)
@@ -844,6 +886,9 @@ int	Green_SDL_Main( Green_RTD *rtd )
 					}
 
 					break;
+                case SDL_USEREVENT + 1:
+                    Render(rtd);
+                    break;
 			}
 
 			event_count++;