add new json based config file

[uwplayer.git] / application / main.c

diff --git a/application/main.c b/application/main.c
index 55a9d4f..42078dc 100644 (file)
--- a/application/main.c
+++ b/application/main.c
@@ -26,6 +26,7 @@
 #include <locale.h>
 #include <time.h>
 #include <inttypes.h>
+#include <sys/stat.h>
 
 #include "window.h"
 #include "main.h"
@@ -38,6 +39,10 @@ static XtAppContext app;
 static Display *display;
 static Widget toplevel_window;
 
+static char *open_file_arg;
+
+static int event_pipe[2];
+
 static String fallback[] = {
         "*renderTable: rt",
         "*rt*fontType: FONT_IS_XFT",
@@ -66,10 +71,30 @@ static String langProc(Display *dp, String xnl, XtPointer closure) {
     return setlocale(LC_ALL, NULL);
 }
 
+typedef struct EventLoopCB {
+    XtWorkProc proc;
+    XtPointer data;
+} EventLoopCB;
+
+static void input_proc(XtPointer data, int *source, XtInputId *iid) {
+    EventLoopCB cb[16];
+    ssize_t r = read(event_pipe[0], cb, sizeof(EventLoopCB)*16);
+    size_t n = r / sizeof(EventLoopCB);
+    for(int i=0;i<n;i++) {
+        cb[i].proc(cb[i].data);
+    }
+}
+
 int main(int argc, char** argv) {  
     // disable stdout buffering, because the netbeans's internal terminal
     // has a bug on freebsd and doesn't flush the output after a newline
     setvbuf(stdout, NULL, _IONBF, 0);
+    
+    // init event pipe for xt event loop
+    if(pipe(event_pipe)) {
+        perror("pipe");
+        return 2;
+    }
      
     // initialize toolkit
     XtToolkitInitialize();
@@ -79,8 +104,25 @@ int main(int argc, char** argv) {
        
     display =  XtOpenDisplay(app, NULL, APP_NAME, APP_CLASS, NULL, 0, &argc, argv);
     
+    if(argc > 1) {
+        struct stat s;
+        if(stat(argv[1], &s)) {
+            fprintf(stderr, "Cannot open file: %s\n", argv[1]);
+            perror("");
+            return 1;
+        }
+        open_file_arg = argv[1];
+    }
+    
+    XtAppAddInput(
+            app,
+            event_pipe[0],
+            (XtPointer)XtInputReadMask,
+            input_proc,
+            NULL);
+    
     // load settings
-    if(load_settings()) {
+    if(load_config()) {
         return 1;
     }
     
@@ -91,7 +133,7 @@ int main(int argc, char** argv) {
     srand(time(NULL));
     
     WindowShow(window);
-    XtAppMainLoop(app);
+    AppMainLoop(app);
     
     return 0;
 }
@@ -104,18 +146,39 @@ void ApplicationExit(void) {
     XtAppSetExitFlag(app);
 }
 
-void AppAddTimeOut(unsigned long interval, XtTimerCallbackProc proc, XtPointer data) {
-    XtAppAddTimeOut(app, interval, proc, data);
-    
-    if(!toplevel_window) return;
-    
-    // send a dummy X11 event, because the event loop may be waiting
-    // and the timeout proc is only called when an event is processed
-    XClientMessageEvent event;
-    memset(&event, 0, sizeof(XClientMessageEvent));
-    event.type = ClientMessage;
-    event.window = XtWindow(toplevel_window);
-    event.format = 32;
-    XSendEvent(display, XtWindow(toplevel_window), 0, 0, (XEvent*)&event);
-    XFlush(display);
+void AppExecProc(XtWorkProc proc, XtPointer data) {
+    EventLoopCB cb;
+    cb.proc = proc;
+    cb.data = data;
+    write(event_pipe[1], &cb, sizeof(cb));
+}
+
+char* GetOpenFileArg(void) {
+    return open_file_arg;
+}
+
+void CleanOpenFileArg(void) {
+    open_file_arg = NULL;
+}
+
+static Window app_player_window = 0;
+
+void SetPlayerWindow(Window w) {
+    app_player_window = w;
+}
+
+/*
+ * Extended Xt main loop, that also handles external window events
+ */
+void AppMainLoop(XtAppContext app) {
+    while(!XtAppGetExitFlag(app)) {
+        XEvent event;
+        XtAppNextEvent(app, &event);
+        
+        if(app_player_window != 0 && event.xany.window == app_player_window) {
+            WindowHandlePlayerEvent(GetMainWindow(), &event);
+        } else {
+            XtDispatchEvent(&event);
+        }
+    }
 }