ucx update

[uwplayer.git] / application / main.c

diff --git a/application/main.c b/application/main.c
index 18d534b..d8a3b31 100644 (file)
--- a/application/main.c
+++ b/application/main.c
@@ -32,8 +32,8 @@
 #include "main.h"
 #include "settings.h"
 
-#include <ucx/buffer.h>
-#include <ucx/utils.h>
+#include <cx/buffer.h>
+#include <cx/utils.h>
 
 static XtAppContext app;
 static Display *display;
@@ -51,7 +51,7 @@ static String fallback[] = {
         
         "*pbbutton.shadowThickness: 1",
         "*pbbutton.highlightThickness: 1",
-    
+        
         "*XmText.baseTranslations: #override\\n" \
                                 "Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\\n" \
                                 "Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\\n" \
@@ -122,18 +122,18 @@ int main(int argc, char** argv) {
             NULL);
     
     // load settings
-    if(load_settings()) {
+    if(load_config()) {
         return 1;
     }
-    
+   
     MainWindow *window = WindowCreate(display);
     toplevel_window = window->window;
     
-    // random numbers only used for creating tmp dirs
+    // random numbers used for creating tmp dirs and for random playback
     srand(time(NULL));
     
     WindowShow(window);
-    XtAppMainLoop(app);
+    AppMainLoop(app);
     
     return 0;
 }
@@ -160,3 +160,25 @@ char* GetOpenFileArg(void) {
 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);
+        }
+    }
+}