X-Git-Url: https://develop.uap-core.de/gitweb/uwplayer.git/blobdiff_plain/663ac840aba3c8203afd517380d9eba7191787e4..5f4caf1ec3793937210c83b45c54bc4264e30c58:/application/window.c

diff --git a/application/window.c b/application/window.c
index d14861e..b3f24d7 100644
--- a/application/window.c
+++ b/application/window.c
@@ -29,6 +29,7 @@
 #include "player.h"
 
 #include "Fsb.h"
+#include "Sidebar.h"
 
 static MainWindow *main_window;
 
@@ -40,6 +41,7 @@ static void PlayRepeatCB(Widget w, void *udata, void *cdata);
 static void PlayRepeatListCB(Widget w, void *udata, void *cdata);
 static void PlayAutoPlayCB(Widget w, void *udata, void *cdata);
 static void ViewFullscreenCB(Widget w, void *udata, void *cdata);
+static void ViewSidebarCB(Widget w, void *udata, void *cdata);
 
 static void WindowRealized(MainWindow *win);
 
@@ -181,20 +183,48 @@ void WindowHandlePlayerEvent(MainWindow *win, XEvent *event) {
     
     if(etype == MotionNotify) {
         Time cur_motion_time = event->xmotion.time;
-        int x = event->xmotion.x;
-        int y = event->xmotion.y;
+        if(win->player) {
+            win->motion_playback_time = win->player->playback_time;
+        }
+        
+        int x = event->xmotion.x_root;
+        int y = event->xmotion.y_root;
         if(win->cursorhidden && cur_motion_time - win->player_event_time < IGNORE_MOTION_THRESHOLD_MS) {
-            int diff_x = abs(x - win->mouse_x_orig);
-            int diff_y = abs(y - win->mouse_y_orig);
+            int diff_x = abs(x - win->mouse_x);
+            int diff_y = abs(y - win->mouse_y);
             if(diff_x > MOTION_POS_THRESHOLD_PIX || diff_y > MOTION_POS_THRESHOLD_PIX) {
                 WindowShowPlayerCursor(win);
             }
         } else {
-            win->mouse_x_orig = x;
-            win->mouse_y_orig = y;
+            win->mouse_x = x;
+            win->mouse_y = y;
         }
         win->player_event_time = cur_motion_time;
         win->motion_playback_time = win->player->playback_time;
+        
+        
+        
+        if(win->pwbuttonpressed) {
+            Display *dp = XtDisplay(win->window);
+                
+            XtUngrabPointer(win->player_widget, CurrentTime);
+
+            XEvent xev;
+            memset(&xev, 0, sizeof(xev));
+            xev.type = ClientMessage;
+            xev.xclient.message_type = XInternAtom(dp, "_NET_WM_MOVERESIZE", False);
+            xev.xclient.window = XtWindow(win->window);
+            xev.xclient.format = 32;
+            xev.xclient.data.l[0] = x;
+            xev.xclient.data.l[1] = y;
+            xev.xclient.data.l[2] = 8; // _NET_WM_MOVERESIZE_MOVE
+            xev.xclient.data.l[3] = 1; // button1
+            xev.xclient.data.l[4] = 1; // source indication
+
+            XSendEvent(dp, DefaultRootWindow(dp), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+
+            win->pwbuttonpressed = FALSE;  
+        }
     } else if(etype == ButtonPress) {
         Time t = event->xbutton.time;
         if(t - win->button_press_time < DOUBLE_CLICK_TIME_MS) {
@@ -204,8 +234,10 @@ void WindowHandlePlayerEvent(MainWindow *win, XEvent *event) {
         } else {
             win->button_press_time = t;
         }
+        win->pwbuttonpressed = 1;
     } else if(etype == ButtonRelease) {
         win->player_event_time = event->xbutton.time;
+        win->pwbuttonpressed = FALSE;
     }
 }
 
@@ -259,8 +291,18 @@ MainWindow* WindowCreate(Display *display) {
     WindowCreateMenu(window, container, args, n);
     
     n = 0;
+    XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
+    XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
+    XtSetArg(args[n], XmNtopAttachment, XmATTACH_WIDGET); n++;
+    XtSetArg(args[n], XmNtopWidget, window->menubar); n++;
+    XtSetArg(args[n], XmNwidth, 300); n++;
+    window->sidebar = CreateSidebar(container, "sidebar", args, n);
+    //XtManageChild(window->sidebar);
+    
+    n = 0;
     XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
     XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
+    XtSetArg(args[n], XmNrightWidget, window->sidebar); n++;
     XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); n++;
     XtSetArg(args[n], XmNtopAttachment, XmATTACH_WIDGET); n++;
     XtSetArg(args[n], XmNtopWidget, window->menubar); n++;
@@ -273,7 +315,7 @@ MainWindow* WindowCreate(Display *display) {
                  EnterWindowMask | KeyPressMask | KeyReleaseMask |
                   LeaveWindowMask, FALSE, playerEH, window);
     
-    
+     
     // get F keycode
     keycodeF = XKeysymToKeycode(XtDisplay(window->window), XStringToKeysym("F"));
     
@@ -419,6 +461,7 @@ static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nm
     
     // view menu
     createMenuItem(viewMenu, "viewFullscreen", "Fullscreen", 'F', "<Key>F", "F", ViewFullscreenCB, NULL);
+    win->viewSidebarButton = createToggleMenuItem(viewMenu, "viewSidebar", "View Sidebar", 'S', False, NULL, NULL, ViewSidebarCB, win);
 }
 
 void go_fullscreen(Display *dsp, Window win)
@@ -574,8 +617,17 @@ static void ViewFullscreenCB(Widget w, void *udata, void *cdata) {
         WindowFullscreen(main_window, FALSE);
     } else {
         WindowFullscreen(main_window, TRUE);
+    }   
+}
+
+static void ViewSidebarCB(Widget w, void *udata, void *cdata) {
+    MainWindow *win = udata;
+    XmToggleButtonCallbackStruct *cb = cdata;
+    if(cb->set) {
+        WindowShowSidebar(win);
+    } else {
+        WindowHideSidebar(win);
     }
-    
 }
 
 void WindowAdjustAspectRatio(MainWindow *win) {
@@ -630,3 +682,14 @@ void WindowShowPlayerCursor(MainWindow *win) {
     }
     win->cursorhidden = False;
 }
+
+void WindowHideSidebar(MainWindow *win) {
+    XtUnmanageChild(win->sidebar);
+    XtVaSetValues(win->player_widget, XmNrightAttachment, XmATTACH_FORM, NULL);
+}
+
+void WindowShowSidebar(MainWindow *win) {
+    XtManageChild(win->sidebar);
+    XtVaSetValues(win->player_widget, XmNrightAttachment, XmATTACH_WIDGET, XmNrightWidget, win->sidebar, NULL);
+}
+