X-Git-Url: https://develop.uap-core.de/gitweb/uwplayer.git/blobdiff_plain/b1fcf2b70eed56402eb7452dd9370e70b6c811c9..18d1fe7ac177615f5f8c0b2b736e535c516e2aa1:/application/window.c

diff --git a/application/window.c b/application/window.c
index c011084..f2c8091 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);
 
@@ -170,6 +172,7 @@ static void playerEH(Widget widget, XtPointer data, XEvent *event, Boolean *disp
 
 #define IGNORE_MOTION_THRESHOLD_MS 1000
 #define MOTION_POS_THRESHOLD_PIX   5
+#define OSD_BOTTOM_THRESHOLD       0.09
 
 #define DOUBLE_CLICK_TIME_MS       500
 
@@ -181,6 +184,10 @@ void WindowHandlePlayerEvent(MainWindow *win, XEvent *event) {
     
     if(etype == MotionNotify) {
         Time cur_motion_time = event->xmotion.time;
+        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) {
@@ -221,14 +228,20 @@ void WindowHandlePlayerEvent(MainWindow *win, XEvent *event) {
         }
     } else if(etype == ButtonPress) {
         Time t = event->xbutton.time;
-        if(t - win->button_press_time < DOUBLE_CLICK_TIME_MS) {
-            // double click
-            WindowFullscreen(main_window, !win->fullscreen);
+        
+        int yi = win->player_widget->core.height - event->xbutton.y;
+        if((float)yi/(float)win->player_widget->core.height < OSD_BOTTOM_THRESHOLD) {
             win->button_press_time = 0;
         } else {
-            win->button_press_time = t;
+            if(t - win->button_press_time < DOUBLE_CLICK_TIME_MS) {
+                // double click
+                WindowFullscreen(main_window, !win->fullscreen);
+                win->button_press_time = 0;
+            } else {
+                win->button_press_time = t;
+            }
+            win->pwbuttonpressed = 1;
         }
-        win->pwbuttonpressed = 1;
     } else if(etype == ButtonRelease) {
         win->player_event_time = event->xbutton.time;
         win->pwbuttonpressed = FALSE;
@@ -285,8 +298,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++;
@@ -299,7 +322,7 @@ MainWindow* WindowCreate(Display *display) {
                  EnterWindowMask | KeyPressMask | KeyReleaseMask |
                   LeaveWindowMask, FALSE, playerEH, window);
     
-    
+     
     // get F keycode
     keycodeF = XKeysymToKeycode(XtDisplay(window->window), XStringToKeysym("F"));
     
@@ -445,6 +468,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)
@@ -600,8 +624,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) {
@@ -656,3 +689,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);
+}
+