add handler for motion/button events

[uwplayer.git] / application / player.c

diff --git a/application/player.c b/application/player.c
index 381132e..6cdba87 100644 (file)
--- a/application/player.c
+++ b/application/player.c
@@ -39,6 +39,7 @@
 #include <pthread.h>
 
 #include "json.h"
+#include "settings.h"
 
 extern char **environ;
 
@@ -109,6 +110,7 @@ static void* wait_for_process(void *data) {
 
     player->isactive = FALSE;
     player->status = status;
+    SetPlayerWindow(0);
     
     return NULL;
 }
@@ -121,7 +123,11 @@ static int start_player_process(Player *player, MainWindow *win) {
         return 1;
     }
     
-    char *player_bin = "/usr/local/bin/mpv"; // TODO: get bin from settings
+    char *player_bin = SettingsGetPlayerBin();
+    if(!player_bin) {
+        fprintf(stderr, "No mpv binary available\n");
+        return 1;
+    }
     
     // -wid parameter value for embedding the player in the player_widget
     Window wid = XtWindow(win->player_widget);
@@ -324,7 +330,6 @@ static void handle_json_rpc_msg(Player *player, JSONValue *v) {
     }
     
     //json_print(v, NULL, 0);
-    fflush(stdout);
 }
 
 static Boolean player_widget_set_size(XtPointer data) {
@@ -394,23 +399,55 @@ static void handle_json_rpc_reqid(Player *player, JSONValue *v, int reqid) {
     }
 }
 
+static Boolean get_player_window(XtPointer data) {
+    Player *p = data;
+    MainWindow *win = GetMainWindow();
+    
+    Widget player_wid = win->player_widget;
+    Window root, parent;
+    Window *child;
+    unsigned int nchild;
+    XQueryTree(XtDisplay(player_wid), XtWindow(player_wid), &root, &parent, &child, &nchild);
+    if(nchild > 0) {
+        p->window = child[0];
+        XFree(child);
+        
+        SetPlayerWindow(p->window);
+        XSelectInput(XtDisplay(win->player_widget), p->window, PointerMotionMask);
+    }
+    
+    return 0;
+}
+
 static void handle_json_rpc_event(Player *p, JSONValue *v, JSONValue *event) {
     if(!json_strcmp(event, "property-change")) {
         JSONValue *name = json_obj_get(&v->value.object, "name");
         JSONValue *data = json_obj_get(&v->value.object, "data");
-        if(!json_strcmp(name, "eof-reached")) {
+        if(!json_strcmp(name, "playback-time")) {
+            if(data && data->type == JSON_NUMBER) {
+                p->playback_time = data->value.number.value;
+                //printf("playback-time: %f\n", p->playback_time);
+            }
+        } else if(!json_strcmp(name, "eof-reached")) {
             if(data && data->type == JSON_LITERAL && data->value.literal.literal == JSON_TRUE) {
                 PlayerEOF(p);
             }
+        } else if(!json_strcmp(name, "osd-height")) {
+            if(data->type == JSON_NUMBER) {
+                p->osd_height = data->value.number.value;
+            }
         }
     } else if(!p->isstarted && !json_strcmp(event, "playback-restart")) {
         char *cmd = "{ \"command\": [\"observe_property\", 1, \"playback-time\"] }\n"
                     "{ \"command\": [\"observe_property\", 1, \"eof-reached\"] }\n"
+                    "{ \"command\": [\"observe_property\", 1, \"osd-height\"] }\n"
                     "{ \"command\": [\"get_property\", \"width\"], request_id=\"" REQ_ID_WIDTH "\" }\n"
                     "{ \"command\": [\"get_property\", \"height\"], request_id=\"" REQ_ID_HEIGHT "\" }\n"
                     "{ \"command\": [\"set_property\", \"keep-open\", true] }\n";
         write(p->ipc, cmd, strlen(cmd));
         p->isstarted = TRUE;
+        
+        AppExecProc(get_player_window, p);
     }
 }
 
@@ -430,6 +467,7 @@ void PlayerDestroy(Player *p) {
         kill(p->process, SIGTERM);
     }
     
+    SetPlayerWindow(0);
     free(p);
 }
 
@@ -510,34 +548,5 @@ void PlayerEOF(Player *p) {
 }
 
 void PlayerHandleInput(MainWindow *win, Player *p, XmDrawingAreaCallbackStruct *cb) {
-    if(cb->event->type == KeyPress) {
-        XKeyEvent *xkey = &cb->event->xkey;
-
-        static XComposeStatus compose = {NULL, 0};
-        char chars[8];
-        KeySym keysym;
-        int nchars;
-        
-        char keystr[64];
-        keystr[0] = 0;
-
-        nchars = XLookupString(xkey, chars, 8, &keysym, &compose);
-        if(nchars == 1) {
-            if(chars[0] >= 'a' && chars[0] <= 'z') {
-                keystr[0] = chars[0];
-                keystr[1] = 0;
-            } else if(chars[0] == ' ') {
-                memcpy(keystr, "space", 6);
-            } 
-        }
-        
-        if(keystr[0] != 0) {
-            char cmdbuf[STR_BUFSIZE];
-            if(snprintf(cmdbuf, STR_BUFSIZE, "{ \"command\": [\"keypress\", \"%s\"] }\n", keystr) >= STR_BUFSIZE) {
-                // error: buffer to small
-                return;
-            }
-            write(p->ipc, cmdbuf, strlen(cmdbuf));
-        }
-    } 
+    
 }