comparison libvo/x11_common.c @ 26405:d557441dc9c5

Always calculate the xinerama screen mplayer is on. Bug reported by thomas.lindroth(<at>)gmail.com

26404:d549dcb766df

    XA_INIT(WM_DELETE_WINDOW);
}

void update_xinerama_info(void) {
    int screen = xinerama_screen;
    xinerama_x = xinerama_y = 0;
#ifdef HAVE_XINERAMA
    if (screen >= -1 && XineramaIsActive(mDisplay))
    {
        XineramaScreenInfo *screens;
        int num_screens;

        screens = XineramaQueryScreens(mDisplay, &num_screens);
        if (screen >= num_screens)
            screen = num_screens - 1;
        if (screen == -1) {
            int x = vo_dx + vo_dwidth / 2;
            int y = vo_dy + vo_dheight / 2;
            for (screen = num_screens - 1; screen > 0; screen--) {
               int left = screens[screen].x_org;
               int right = left + screens[screen].width;
               int top = screens[screen].y_org;
               int bottom = top + screens[screen].height;
               if (left <= x && x <= right && top <= y && y <= bottom)
                   break;
            }
        }
        if (screen < 0)
            screen = 0;
        vo_screenwidth = screens[screen].width;
        vo_screenheight = screens[screen].height;
        xinerama_x = screens[screen].x_org;

26405:d557441dc9c5

    XA_INIT(WM_DELETE_WINDOW);
}

void update_xinerama_info(void) {
    int screen = xinerama_screen;
    // center coordinates of the window
    int x = vo_dx + vo_dwidth / 2;
    int y = vo_dy + vo_dheight / 2;
    xinerama_x = xinerama_y = 0;
#ifdef HAVE_XINERAMA
    if (screen >= -1 && XineramaIsActive(mDisplay))
    {
        XineramaScreenInfo *screens;
        int num_screens;

        screens = XineramaQueryScreens(mDisplay, &num_screens);
            for (screen = num_screens - 1; screen > 0; screen--) {
               int left = screens[screen].x_org;
               int right = left + screens[screen].width;
               int top = screens[screen].y_org;
               int bottom = top + screens[screen].height;
               if (left <= x && x <= right && top <= y && y <= bottom)
                   break;
            }
        if (screen < 0)
            screen = 0;
        vo_screenwidth = screens[screen].width;
        vo_screenheight = screens[screen].height;
        xinerama_x = screens[screen].x_org;