mirror of
https://github.com/mpv-player/mpv
synced 2025-03-11 08:37:59 +00:00
xinerama fix part 1 - count your paranthesis
xvidix should now work too git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8992 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
74ecd509c8
commit
ad666c747c
@ -76,6 +76,10 @@ static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
|
|||||||
|
|
||||||
extern void set_video_eq( int cap );
|
extern void set_video_eq( int cap );
|
||||||
|
|
||||||
|
#ifdef HAVE_XINERAMA
|
||||||
|
extern int xinerama_screen;
|
||||||
|
#endif
|
||||||
|
|
||||||
static void set_window(int force_update)
|
static void set_window(int force_update)
|
||||||
{
|
{
|
||||||
Window mRoot;
|
Window mRoot;
|
||||||
@ -127,10 +131,26 @@ static void set_window(int force_update)
|
|||||||
screens = XineramaQueryScreens(mDisplay, &num_screens);
|
screens = XineramaQueryScreens(mDisplay, &num_screens);
|
||||||
|
|
||||||
/* find the screen we are on */
|
/* find the screen we are on */
|
||||||
while ((screens[i].x_org <= drwcX) || (screens[i].y_org <= drwcY) ||
|
while (i<num_screens &&
|
||||||
|
((screens[i].x_org < drwcX) || (screens[i].y_org < drwcY) ||
|
||||||
(screens[i].x_org + screens[i].width >= drwcX) ||
|
(screens[i].x_org + screens[i].width >= drwcX) ||
|
||||||
(screens[i].y_org + screens[i].height >= drwcY))
|
(screens[i].y_org + screens[i].height >= drwcY)))
|
||||||
i++;
|
{
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(i<num_screens)
|
||||||
|
{
|
||||||
|
/* save the screen we are on */
|
||||||
|
xinerama_screen = i;
|
||||||
|
} else {
|
||||||
|
/* oops.. couldnt find the screen we are on
|
||||||
|
* because the upper left corner left the
|
||||||
|
* visual range. assume we are still on the
|
||||||
|
* same screen
|
||||||
|
*/
|
||||||
|
i = xinerama_screen;
|
||||||
|
}
|
||||||
|
|
||||||
/* set drwcX and drwcY to the right values */
|
/* set drwcX and drwcY to the right values */
|
||||||
drwcX = drwcX - screens[i].x_org;
|
drwcX = drwcX - screens[i].x_org;
|
||||||
|
Loading…
Reference in New Issue
Block a user