#include "window.h"
#include "main.h"
#include "player.h"
+#include "playlist.h"
+#include "xdnd.h"
#include "Fsb.h"
+#include "Sidebar.h"
static MainWindow *main_window;
static void FileOpenCB(Widget w, void *udata, void *cdata);
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 WindowRealized(MainWindow *win);
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) {
#define IGNORE_MOTION_THRESHOLD_MS 1000
#define MOTION_POS_THRESHOLD_PIX 5
+#define OSD_BOTTOM_THRESHOLD 0.09
#define DOUBLE_CLICK_TIME_MS 500
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) {
- // 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;
}
} else if(etype == ButtonRelease) {
win->player_event_time = event->xbutton.time;
+ win->pwbuttonpressed = FALSE;
}
}
+
+
MainWindow* WindowCreate(Display *display) {
Arg args[32];
int n;
MainWindow *window = malloc(sizeof(MainWindow));
memset(window, 0, sizeof(MainWindow));
main_window = window;
-
+
// toplevel window
n = 0;
XtSetArg(args[n], XmNtitle, APP_NAME); n++;
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);
+ SidebarSetWindow(window->sidebar, window);
+ //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++;
EnterWindowMask | KeyPressMask | KeyReleaseMask |
LeaveWindowMask, FALSE, playerEH, window);
-
+
// get F keycode
keycodeF = XKeysymToKeycode(XtDisplay(window->window), XStringToKeysym("F"));
+
+ PlayListInit(window);
+
+ window->adjustWindowSize = true; // auto adjust window size by default
+
return window;
}
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);
createMenuItem(fileMenu, "fileQuit", "Exit", 'E', "Ctrl<Key>Q", "Ctrl+Q", FileQuitCB, NULL);
// play menu
- createToggleMenuItem(playMenu, "playRepeatTrack", "Repeat", 'R', False, NULL, NULL, PlayRepeatCB, win);
+ 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->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);
+
+ createMenuSeparator(playMenu);
+
+ win->playRandom = createToggleMenuItem(playMenu, "playRandom", "Random Playback", 'P', False, NULL, NULL, PlayRandomCB, win);
+
// 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);
}
void go_fullscreen(Display *dsp, Window win)
main_window->fullscreen = FALSE;
}
+ WindowShowSidebar(win, enableFullscreen ? false : win->sidebarvisible);
+
XEvent ev;
memset(&ev, 0, sizeof(XEvent));
ev.type = ClientMessage;
}
}
-void WindowSetFile(MainWindow *win, char *file) {
- if(win->file) {
- XtFree(win->file);
- }
- win->file = file;
-}
-
static void filedialog_end(
Widget widget,
MainWindow *data,
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);
static void PlayRepeatCB(Widget w, void *udata, void *cdata) {
MainWindow *win = udata;
- win->repeatTrack = XmToggleButtonGadgetGetState(w);
+ win->playlist.repeatTrack = XmToggleButtonGadgetGetState(w);
+ win->playlist.repeatList = 0;
+ win->playlist.autoplayFolder = 0;
+ XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
+ XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
+}
+
+static void PlayRepeatListCB(Widget w, void *udata, void *cdata) {
+ MainWindow *win = udata;
+ win->playlist.repeatList = XmToggleButtonGadgetGetState(w);
+ win->playlist.repeatTrack = 0;
+ win->playlist.autoplayFolder = 0;
+ XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
+ XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
+}
+
+static void PlayAutoPlayCB(Widget w, void *udata, void *cdata) {
+ MainWindow *win = udata;
+ win->playlist.autoplayFolder = XmToggleButtonGadgetGetState(w);
+ win->playlist.repeatTrack = 0;
+ win->playlist.repeatList = 0;
+ XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
+ XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
+}
+
+static void PlayRandomCB(Widget w, void *udata, void *cdata) {
+ MainWindow *win = udata;
+ win->playlist.random = XmToggleButtonGadgetGetState(w);
}
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;
+ win->sidebarvisible = cb->set;
+ WindowShowSidebar(win, cb->set);
+}
+
+static void ViewAdjustWindowSizeCB(Widget w, void *udata, void *cdata) {
+ MainWindow *win = udata;
+ win->adjustWindowSize = XmToggleButtonGadgetGetState(w);
}
void WindowAdjustAspectRatio(MainWindow *win) {
}
win->cursorhidden = False;
}
+
+void WindowShowSidebar(MainWindow *win, bool visible) {
+ if(visible) {
+ XtManageChild(win->sidebar);
+ XtVaSetValues(win->player_widget, XmNrightAttachment, XmATTACH_WIDGET, XmNrightWidget, win->sidebar, NULL);
+ } else {
+ XtUnmanageChild(win->sidebar);
+ XtVaSetValues(win->player_widget, XmNrightAttachment, XmATTACH_FORM, NULL);
+ }
+}
+
+void WindowUpdate(MainWindow *win) {
+ SidebarRepaint(win->sidebar);
+}
develop.uap-core.de/git / uwplayer.git / blobdiff