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

diff --git a/application/window.c b/application/window.c
index b3f24d7..96a4510 100644
--- a/application/window.c
+++ b/application/window.c
@@ -27,6 +27,9 @@
 #include "window.h"
 #include "main.h"
 #include "player.h"
+#include "playlist.h"
+#include "xdnd.h"
+#include "settings.h"
 
 #include "Fsb.h"
 #include "Sidebar.h"
@@ -40,8 +43,11 @@ static void FileQuitCB(Widget w, void *udata, void *cdata);
 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 PlayRandomCB(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 ViewAdjustWindowSizeCB(Widget w, void *udata, void *cdata);
+static void PrefSingleInstanceCB(Widget w, void *udata, void *cdata);
 
 static void WindowRealized(MainWindow *win);
 
@@ -92,18 +98,16 @@ static void resizeEH(Widget widget, XtPointer data, XEvent *event, Boolean *disp
 static void WindowRealized(MainWindow *win) {
     char *open_file = GetOpenFileArg();
     if(open_file) {
-        size_t len = strlen(open_file);
-        char *file = XtMalloc(len+1);
-        memcpy(file, open_file, len);
-        file[len] = 0;
-        WindowSetFile(win, file);
-        PlayerOpenFile(win);
+        PlayListAddFile(win, open_file);
+        PlayListPlayNext(win, true);
         CleanOpenFileArg();
     }
     
     if(!blank_cursor_init) {
         init_blank_cursor(win->player_widget);
     }
+    
+    XdndEnable(win->window);
 }
 
 static void playerWidgetInputCB(Widget widget, XtPointer u, XtPointer c) {
@@ -172,6 +176,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
 
@@ -227,20 +232,28 @@ 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;
     }
 }
 
+
+
 MainWindow* WindowCreate(Display *display) {
     Arg args[32];
     int n;
@@ -248,7 +261,7 @@ MainWindow* WindowCreate(Display *display) {
     MainWindow *window = malloc(sizeof(MainWindow));
     memset(window, 0, sizeof(MainWindow));
     main_window = window;
-    
+      
     // toplevel window
     n = 0;
     XtSetArg(args[n], XmNtitle, APP_NAME); n++;
@@ -296,9 +309,16 @@ MainWindow* WindowCreate(Display *display) {
     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);
+    XtSetArg(args[n], XmNscrollingPolicy, XmAUTOMATIC); n++;
+    XtSetArg(args[n], XmNscrollBarDisplayPolicy, XmAS_NEEDED); n++;
+    XtSetArg(args[n], XmNspacing, 0); n++;
+    XtSetArg(args[n], XmNshadowThickness, 0); n++;
+    window->sidebar_scrolledwindow = XmCreateScrolledWindow(container, "sw_sidebar", args, n);
+    window->sidebar = CreateSidebar(window->sidebar_scrolledwindow, "sidebar", args, 0);
+    SidebarSetWindow(window->sidebar, window);
+    XtManageChild(window->sidebar);
     //XtManageChild(window->sidebar);
-    
+        
     n = 0;
     XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
     XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
@@ -319,6 +339,11 @@ MainWindow* WindowCreate(Display *display) {
     // get F keycode
     keycodeF = XKeysymToKeycode(XtDisplay(window->window), XStringToKeysym("F"));
     
+    
+    PlayListInit(window);
+    
+    window->adjustWindowSize = true; // auto adjust window size by default
+    
     return window;
 }
 
@@ -408,6 +433,15 @@ static Widget createToggleMenuItem(
     return menuItem;
 }
 
+/*
+ * Creates a menu separator
+ */
+static Widget createMenuSeparator(Widget menu) {
+    Widget w = XmCreateSeparator(menu, "separator", NULL, 0);
+    XtManageChild(w);
+    return w;
+}
+
 static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nmbargs) {
     Widget menubar = XmCreateMenuBar(parent, "menubar", mbargs, nmbargs);
     XtManageChild(menubar);
@@ -447,6 +481,16 @@ static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nm
     XmStringFree(s);
     Widget viewMenu = XmVaCreateSimplePulldownMenu(menubar, "menu", 2, NULL, NULL);
     
+    s = XmStringCreateSimple("Preferences");
+    Widget prefMenuItem = XtVaCreateManagedWidget(
+            "menuitem",
+            xmCascadeButtonWidgetClass,
+            menubar,
+            XmNlabelString, s,
+            NULL);
+    XmStringFree(s);
+    Widget prefMenu = XmVaCreateSimplePulldownMenu(menubar, "menu", 3, NULL, NULL); 
+    
     // file menu
     createMenuItem(fileMenu, "fileOpen", "Open...", 'O', "Ctrl<Key>O", "Ctrl+O", FileOpenCB, NULL);
     createMenuItem(fileMenu, "fileQuit", "Exit", 'E', "Ctrl<Key>Q", "Ctrl+Q", FileQuitCB, NULL);
@@ -454,14 +498,23 @@ static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nm
     // play menu
     win->playRepeatTrackButton = createToggleMenuItem(playMenu, "playRepeatTrack", "Repeat", 'R', False, NULL, NULL, PlayRepeatCB, win);
     win->playRepeatListButton = createToggleMenuItem(playMenu, "playRepeatList", "Repeat List", 'L', False, NULL, NULL, PlayRepeatListCB, win);
+    win->playRandom = createToggleMenuItem(playMenu, "playRandom", "Random Playback", 'P', False, NULL, NULL, PlayRandomCB, win);
     win->playAutoPlayButton = createToggleMenuItem(playMenu, "playAutoNext", "Autoplay Folder", 'A', False, NULL, NULL, PlayAutoPlayCB, win);
     XtVaSetValues(win->playRepeatTrackButton, XmNindicatorType, XmONE_OF_MANY, NULL);
     XtVaSetValues(win->playRepeatListButton, XmNindicatorType, XmONE_OF_MANY, NULL);
     XtVaSetValues(win->playAutoPlayButton, XmNindicatorType, XmONE_OF_MANY, NULL);
+    XtVaSetValues(win->playRandom, XmNindicatorType, XmONE_OF_MANY, NULL);
     
     // 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);
+    
+    createMenuSeparator(viewMenu);
+    
+    win->viewAdjustWindowSize = createToggleMenuItem(viewMenu, "viewAdjustWindowSize", "Adjust Window Size", 'W', TRUE, NULL, NULL, ViewAdjustWindowSizeCB, win);
+    
+    // preferences menu
+     win->prefSingleInstanceButton = createToggleMenuItem(prefMenu, "prefSingleInstance", "Single Instance", 'S', FALSE, NULL, NULL, PrefSingleInstanceCB, win);
 }
 
 void go_fullscreen(Display *dsp, Window win)
@@ -504,6 +557,8 @@ void WindowFullscreen(MainWindow *win, bool enableFullscreen) {
         main_window->fullscreen = FALSE;
     }
     
+    WindowShowSidebar(win, enableFullscreen ? false : win->sidebarvisible);
+    
     XEvent ev;
     memset(&ev, 0, sizeof(XEvent));
     ev.type = ClientMessage;
@@ -526,13 +581,6 @@ void WindowMenubarSetVisible(MainWindow *win, bool visible) {
     }
 }
 
-void WindowSetFile(MainWindow *win, char *file) {
-    if(win->file) {
-        XtFree(win->file);
-    }
-    win->file = file;
-}
-
 static void filedialog_end(
         Widget widget,
         MainWindow *data,
@@ -551,10 +599,9 @@ static void filedialog_select(
     if(selection->value) {
         XmStringGetLtoR(selection->value, XmSTRING_DEFAULT_CHARSET, &value);
         if(value) {
-            WindowSetFile(data, value);
-            // no need to free the value, because it is stored in MainWindow
-            
-            PlayerOpenFile(data);
+            PlayListAddFile(data, value);
+            PlayListPlayNext(data, true);
+            XtFree(value);
         }
     }
     filedialog_end(widget, data, NULL);
@@ -587,29 +634,46 @@ static void FileQuitCB(Widget w, void *udata, void *cdata) {
 
 static void PlayRepeatCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
-    win->repeatTrack = XmToggleButtonGadgetGetState(w);
-    win->repeatList = 0;
-    win->autoplayFolder = 0;
+    win->playlist.repeatTrack = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatList = 0;
+    win->playlist.autoplayFolder = 0;
+    win->playlist.random = 0;
     XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
     XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
+    XtVaSetValues(win->playRandom, XmNset, 0, NULL);
 }
 
 static void PlayRepeatListCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
-    win->repeatList = XmToggleButtonGadgetGetState(w);
-    win->repeatTrack = 0;
-    win->autoplayFolder = 0;
+    win->playlist.repeatList = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatTrack = 0;
+    win->playlist.autoplayFolder = 0;
+    win->playlist.random = 0;
     XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
     XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
+    XtVaSetValues(win->playRandom, XmNset, 0, NULL);
 }
 
 static void PlayAutoPlayCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
-    win->autoplayFolder = XmToggleButtonGadgetGetState(w);
-    win->repeatTrack = 0;
-    win->repeatList = 0;
+    win->playlist.autoplayFolder = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatTrack = 0;
+    win->playlist.repeatList = 0;
+    win->playlist.random = 0;
+    XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
+    XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
+    XtVaSetValues(win->playRandom, XmNset, 0, NULL);
+}
+
+static void PlayRandomCB(Widget w, void *udata, void *cdata) {
+    MainWindow *win = udata;
+    win->playlist.random = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatTrack = 0;
+    win->playlist.repeatList = 0;
+    win->playlist.autoplayFolder = 0;
     XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
     XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
+    XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
 }
 
 static void ViewFullscreenCB(Widget w, void *udata, void *cdata) {
@@ -623,10 +687,34 @@ static void ViewFullscreenCB(Widget w, void *udata, void *cdata) {
 static void ViewSidebarCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
     XmToggleButtonCallbackStruct *cb = cdata;
-    if(cb->set) {
-        WindowShowSidebar(win);
-    } else {
-        WindowHideSidebar(win);
+    win->sidebarvisible = cb->set;
+    WindowShowSidebar(win, cb->set);
+}
+
+static void ViewAdjustWindowSizeCB(Widget w, void *udata, void *cdata) {
+    MainWindow *win = udata;
+    win->adjustWindowSize = XmToggleButtonGadgetGetState(w);
+}
+
+static void PrefSingleInstanceCB(Widget w, void *udata, void *cdata) {
+    MainWindow *win = udata;
+    win->singleInstance = XmToggleButtonGadgetGetState(w);
+    
+    Display *dp = XtDisplay(w);
+    
+    if(!win->singleInstance) {
+        ShutdownInstanceSocket(dp);
+        return;
+    }
+    
+    Bool disable_item = False;
+    if(CreateSingleInstanceSocket(dp, &disable_item)) {
+        // TODO: err
+        disable_item = True;
+    }
+    if(disable_item) {
+        win->singleInstance = 0;
+        XmToggleButtonGadgetSetState(w, False, False);
     }
 }
 
@@ -683,13 +771,16 @@ 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, bool visible) {
+    if(visible) {
+        XtManageChild(win->sidebar_scrolledwindow);
+        XtVaSetValues(win->player_widget, XmNrightAttachment, XmATTACH_WIDGET, XmNrightWidget, win->sidebar_scrolledwindow, NULL);
+    } else {
+        XtUnmanageChild(win->sidebar_scrolledwindow);
+        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);
+void WindowUpdate(MainWindow *win) {
+    SidebarRepaint(win->sidebar);
 }
-