X-Git-Url: https://develop.uap-core.de/gitweb/uwplayer.git/blobdiff_plain/57cee2c27458b34d1f407877b04ad3dee7915708..b1fcf2b70eed56402eb7452dd9370e70b6c811c9:/application/window.c diff --git a/application/window.c b/application/window.c index e7c85df..c011084 100644 --- a/application/window.c +++ b/application/window.c @@ -35,13 +35,34 @@ static MainWindow *main_window; static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *args, int nargs); 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 ViewFullscreenCB(Widget w, void *udata, void *cdata); static void WindowRealized(MainWindow *win); +static int blank_cursor_init = 0; +static Pixmap blank_cursor_pixmap; +static Cursor blank_cursor; + +static void init_blank_cursor(Widget w) { + char data = 0; + + XColor c; + + blank_cursor_pixmap = XCreateBitmapFromData(XtDisplay(w), XtWindow(w), &data, 1, 1); + if(!blank_cursor_pixmap) return; + + blank_cursor = XCreatePixmapCursor(XtDisplay(w), blank_cursor_pixmap, blank_cursor_pixmap, &c, &c, 0, 0); + + XFreePixmap(XtDisplay(w), blank_cursor_pixmap); + blank_cursor_init = 1; +} + static void window_close_handler(Widget window, void *udata, void *cdata) { - WindowClosePlayer(main_window); - ApplicationExit(); + FileQuitCB(window, NULL, NULL); } static unsigned int keycodeF; @@ -56,7 +77,7 @@ static void windowKeyEH(Widget widget, XtPointer data, XEvent *event, Boolean *d static int main_window_is_realized = 0; -static void resizeEH(Widget widget, XtPointer data, XEvent *event, Boolean *dispatch) { +static void resizeEH(Widget widget, XtPointer data, XEvent *event, Boolean *dispatch) { if(!main_window_is_realized) { if(XtIsRealized(widget)) { main_window_is_realized = 1; @@ -77,6 +98,10 @@ static void WindowRealized(MainWindow *win) { PlayerOpenFile(win); CleanOpenFileArg(); } + + if(!blank_cursor_init) { + init_blank_cursor(win->player_widget); + } } static void playerWidgetInputCB(Widget widget, XtPointer u, XtPointer c) { @@ -88,40 +113,51 @@ static void playerWidgetInputCB(Widget widget, XtPointer u, XtPointer c) { } } -static void playerEH(Widget widget, XtPointer data, XEvent *event, Boolean *dispatch) { - MainWindow *win = data; - if(!win->player || win->player->window == 0) return; - - /* - if(event->type == EnterNotify) { - printf("enter: grab pointer\n"); - - XtGrabPointer( +static void windowGrabButton(MainWindow *win) { + //printf("grab\n"); + XtGrabButton( win->player_widget, + AnyButton, + AnyModifier, True, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask | EnterWindowMask | LeaveWindowMask, GrabModeAsync, GrabModeAsync, None, - None, - CurrentTime); - + None); + win->buttongrab = True; +} + +static void playerEH(Widget widget, XtPointer data, XEvent *event, Boolean *dispatch) { + MainWindow *win = data; + int etype = event->type; + + ///* + if(etype == EnterNotify) { + //printf("enter\n"); + windowGrabButton(win); return; } - if(event->type == LeaveNotify) { - printf("leave\n"); - XtUngrabPointer(win->player_widget, CurrentTime); + if(etype == LeaveNotify) { + //printf("leave\n"); + //XtUngrabButton(win->player_widget, AnyButton, AnyModifier); + //win->buttongrab = False; return; } - if(event->type == MotionNotify) { - static int testv = 0; - printf("test %d\n", testv++); + int pass = 0; + if(etype == ButtonPress || etype == ButtonRelease || etype == KeyPress || etype == KeyRelease) { + //printf("button press\n"); + pass = 1; } - */ - if(event->type == KeyPress || event->type == KeyRelease) { + if(!win->player || win->player->window == 0) return; + + WindowHandlePlayerEvent(win, event); + + if(pass) { // redirect key events to the player window + //printf("redirect\n"); event->xkey.window = win->player->window; XSendEvent( XtDisplay(win->player_widget), @@ -132,10 +168,77 @@ static void playerEH(Widget widget, XtPointer data, XEvent *event, Boolean *disp } } +#define IGNORE_MOTION_THRESHOLD_MS 1000 +#define MOTION_POS_THRESHOLD_PIX 5 + +#define DOUBLE_CLICK_TIME_MS 500 + +void WindowHandlePlayerEvent(MainWindow *win, XEvent *event) { + // event handler for intercepted player mouse events + // win->player is not NULL + + int etype = event->type; + + if(etype == MotionNotify) { + Time cur_motion_time = event->xmotion.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); + 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 = 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); + 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; @@ -249,6 +352,46 @@ static Widget createMenuItem( return menuItem; } +/* + * Creates a XmToggleButton menu item + */ +static Widget createToggleMenuItem( + Widget menu, + char *name, + char *label, + char mnemonic, + Boolean defaultValue, + const char *accelerator, + char *accelerator_text, + XtCallbackProc callback, + void *cbData) +{ + Arg args[16]; + int n = 0; + + XmString s1 = XmStringCreateSimple(label); + XtSetArg(args[n], XmNlabelString, s1); n++; + XtSetArg(args[n], XmNmnemonic, mnemonic); n++; + XtSetArg(args[n], XmNset, defaultValue); n++; + XmString at = NULL; + if(accelerator && accelerator_text) { + at = XmStringCreateSimple(accelerator_text); + XtSetArg(args[n], XmNaccelerator, accelerator); n++; + XtSetArg(args[n], XmNacceleratorText, at); n++; + } + + Widget menuItem = XmCreateToggleButtonGadget(menu, name, args, n); + XtManageChild(menuItem); + XmStringFree(s1); + if(at) XmStringFree(at); + + if(callback) { + XtAddCallback(menuItem, XmNvalueChangedCallback, (XtCallbackProc)callback, cbData); + } + + return menuItem; +} + static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nmbargs) { Widget menubar = XmCreateMenuBar(parent, "menubar", mbargs, nmbargs); XtManageChild(menubar); @@ -259,7 +402,7 @@ static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nm // menus XmString s = XmStringCreateSimple("File"); - Widget fileMenuItem = XtVaCreateManagedWidget( + XtVaCreateManagedWidget( "menuitem", xmCascadeButtonWidgetClass, menubar, @@ -269,7 +412,7 @@ static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nm Widget fileMenu = XmVaCreateSimplePulldownMenu(menubar, "menu", 0, NULL, NULL); s = XmStringCreateSimple("Playback"); - Widget playMenuItem = XtVaCreateManagedWidget( + XtVaCreateManagedWidget( "menuitem", xmCascadeButtonWidgetClass, menubar, @@ -290,6 +433,15 @@ static void WindowCreateMenu(MainWindow *win, Widget parent, Arg *mbargs, int nm // file menu createMenuItem(fileMenu, "fileOpen", "Open...", 'O', "CtrlO", "Ctrl+O", FileOpenCB, NULL); + createMenuItem(fileMenu, "fileQuit", "Exit", 'E', "CtrlQ", "Ctrl+Q", FileQuitCB, NULL); + + // 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->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); // view menu createMenuItem(viewMenu, "viewFullscreen", "Fullscreen", 'F', "F", "F", ViewFullscreenCB, NULL); @@ -411,6 +563,38 @@ static void FileOpenCB(Widget w, void *udata, void *cdata) { XtManageChild(dialog); } +static void FileQuitCB(Widget w, void *udata, void *cdata) { + WindowClosePlayer(main_window); + ApplicationExit(); +} + +static void PlayRepeatCB(Widget w, void *udata, void *cdata) { + MainWindow *win = udata; + win->repeatTrack = XmToggleButtonGadgetGetState(w); + win->repeatList = 0; + win->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->repeatList = XmToggleButtonGadgetGetState(w); + win->repeatTrack = 0; + win->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->autoplayFolder = XmToggleButtonGadgetGetState(w); + win->repeatTrack = 0; + win->repeatList = 0; + XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL); + XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL); +} + static void ViewFullscreenCB(Widget w, void *udata, void *cdata) { if(main_window->fullscreen) { WindowFullscreen(main_window, FALSE); @@ -423,7 +607,7 @@ static void ViewFullscreenCB(Widget w, void *udata, void *cdata) { void WindowAdjustAspectRatio(MainWindow *win) { if(!win->player) return; if(!win->player->isactive || win->player->width <= 0 || win->player->height <= 0) return; - + // we have a running player width video // adjust window aspect ratio (the window aspect ratio is different from // the video, because of window decoration, menubar and other extra controls) @@ -454,4 +638,21 @@ void WindowClosePlayer(MainWindow *win) { PlayerDestroy(win->player); } win->player = NULL; + WindowShowPlayerCursor(win); +} + +void WindowHidePlayerCursor(MainWindow *win) { + if(!win->cursorhidden && win->player && win->player->window != 0) { + XDefineCursor(XtDisplay(win->player_widget), XtWindow(win->player_widget), blank_cursor); + win->cursorhidden = True; + XFlush(XtDisplay(win->player_widget)); + } +} + +void WindowShowPlayerCursor(MainWindow *win) { + if(win->cursorhidden && win->player && win->player->window != 0) { + XDefineCursor(XtDisplay(win->player_widget), XtWindow(win->player_widget), None); + XFlush(XtDisplay(win->player_widget)); + } + win->cursorhidden = False; }