comparison libvo/x11_common.c @ 18287:292337d09af2

Remove updating of vo_mouse_timer_const from the main loop and also remove the variable itself. Convert code in x11_common.c and OSD timing that depended on the variable to use real time instead.

18286:e0470e00b3bd

        vo_fs = 0;
        vo_old_width = vo_old_height = 0;
    }
}

int vo_mouse_timer_const = 30;
static int vo_mouse_counter = 30;

int vo_x11_check_events(Display * mydisplay)
{
    int ret = 0;
    XEvent Event;

    KeySym keySym;
    static XComposeStatus stat;

// unsigned long  vo_KeyTable[512];

    if ((vo_mouse_autohide) && (--vo_mouse_counter == 0))
        vo_hidecursor(mydisplay, vo_window);

    while (XPending(mydisplay))
    {
        XNextEvent(mydisplay, &Event);
#ifdef HAVE_NEW_GUI

                break;
            case MotionNotify:
                if (vo_mouse_autohide)
                {
                    vo_showcursor(mydisplay, vo_window);
                    vo_mouse_counter = vo_mouse_timer_const;
                }
                break;
            case ButtonPress:
                if (vo_mouse_autohide)
                {
                    vo_showcursor(mydisplay, vo_window);
                    vo_mouse_counter = vo_mouse_timer_const;
                }
                // Ignore mouse whell press event
                if (Event.xbutton.button > 3)
                {
                    mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1);

                break;
            case ButtonRelease:
                if (vo_mouse_autohide)
                {
                    vo_showcursor(mydisplay, vo_window);
                    vo_mouse_counter = vo_mouse_timer_const;
                }
#ifdef HAVE_NEW_GUI
                // Ignor mouse button 1 - 3 under gui 
                if (use_gui && (Event.xbutton.button >= 1)
                    && (Event.xbutton.button <= 3))

18287:292337d09af2

        vo_fs = 0;
        vo_old_width = vo_old_height = 0;
    }
}

static unsigned int mouse_timer;
static int mouse_waiting_hide;

int vo_x11_check_events(Display * mydisplay)
{
    int ret = 0;
    XEvent Event;

    KeySym keySym;
    static XComposeStatus stat;

// unsigned long  vo_KeyTable[512];

    if ((vo_mouse_autohide) && mouse_waiting_hide &&
                                 (GetTimerMS() - mouse_timer >= 1000)) {
        vo_hidecursor(mydisplay, vo_window);
        mouse_waiting_hide = 0;
    }

    while (XPending(mydisplay))
    {
        XNextEvent(mydisplay, &Event);
#ifdef HAVE_NEW_GUI

                break;
            case MotionNotify:
                if (vo_mouse_autohide)
                {
                    vo_showcursor(mydisplay, vo_window);
                    mouse_waiting_hide = 1;
                    mouse_timer = GetTimerMS();
                }
                break;
            case ButtonPress:
                if (vo_mouse_autohide)
                {
                    vo_showcursor(mydisplay, vo_window);
                    mouse_waiting_hide = 1;
                    mouse_timer = GetTimerMS();
                }
                // Ignore mouse whell press event
                if (Event.xbutton.button > 3)
                {
                    mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1);

                break;
            case ButtonRelease:
                if (vo_mouse_autohide)
                {
                    vo_showcursor(mydisplay, vo_window);
                    mouse_waiting_hide = 1;
                    mouse_timer = GetTimerMS();
                }
#ifdef HAVE_NEW_GUI
                // Ignor mouse button 1 - 3 under gui 
                if (use_gui && (Event.xbutton.button >= 1)
                    && (Event.xbutton.button <= 3))