Skip to content

W
wine-winehq
Commit 0b71e0bf authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Add helper functions for converting between root and virtual screen coords.

parent bb45a93d
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 89 deletions
dlls/winex11.drv/desktop.c
View file @ 0b71e0bf
...@@ -188,10 +188,10 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ...@@ -188,10 +188,10 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam
if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY; if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY;
if (mask && data->whole_window) if (mask && data->whole_window)
{ {
POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top );
XWindowChanges changes; XWindowChanges changes;
changes.x = pos.x;
changes.x = data->whole_rect.left - virtual_screen_rect.left; changes.y = pos.y;
changes.y = data->whole_rect.top - virtual_screen_rect.top;
XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes );
} }
release_win_data( data ); release_win_data( data );
......
dlls/winex11.drv/event.c
View file @ 0b71e0bf
...@@ -815,6 +815,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) ...@@ -815,6 +815,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
{ {
XExposeEvent *event = &xev->xexpose; XExposeEvent *event = &xev->xexpose;
RECT rect; RECT rect;
POINT pos;
struct x11drv_win_data *data; struct x11drv_win_data *data;
HRGN surface_region = 0; HRGN surface_region = 0;
UINT flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN; UINT flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN;
...@@ -822,12 +823,19 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) ...@@ -822,12 +823,19 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
TRACE( "win %p (%lx) %d,%d %dx%d\n", TRACE( "win %p (%lx) %d,%d %dx%d\n",
hwnd, event->window, event->x, event->y, event->width, event->height ); hwnd, event->window, event->x, event->y, event->width, event->height );
if (event->window != root_window)
{
pos.x = event->x;
pos.y = event->y;
}
else pos = root_to_virtual_screen( event->x, event->y );
if (!(data = get_win_data( hwnd ))) return; if (!(data = get_win_data( hwnd ))) return;
rect.left = event->x; rect.left = pos.x;
rect.top = event->y; rect.top = pos.y;
rect.right = event->x + event->width; rect.right = pos.x + event->width;
rect.bottom = event->y + event->height; rect.bottom = pos.y + event->height;
if (event->window != data->client_window) if (event->window != data->client_window)
{ {
...@@ -861,11 +869,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) ...@@ -861,11 +869,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
} }
SERVER_END_REQ; SERVER_END_REQ;
} }
else else flags &= ~RDW_ALLCHILDREN;
{
OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top );
flags &= ~RDW_ALLCHILDREN;
}
release_win_data( data ); release_win_data( data );
if (flags) RedrawWindow( hwnd, &rect, surface_region, flags ); if (flags) RedrawWindow( hwnd, &rect, surface_region, flags );
...@@ -1002,6 +1007,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) ...@@ -1002,6 +1007,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
XConfigureEvent *event = &xev->xconfigure; XConfigureEvent *event = &xev->xconfigure;
struct x11drv_win_data *data; struct x11drv_win_data *data;
RECT rect; RECT rect;
POINT pos;
UINT flags; UINT flags;
HWND parent; HWND parent;
BOOL root_coords; BOOL root_coords;
...@@ -1034,11 +1040,18 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) ...@@ -1034,11 +1040,18 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
0, 0, &x, &y, &child ); 0, 0, &x, &y, &child );
root_coords = TRUE; root_coords = TRUE;
} }
rect.left = x;
rect.top = y; if (!root_coords)
rect.right = x + event->width; {
rect.bottom = y + event->height; pos.x = x;
if (root_coords) OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); pos.y = y;
}
else pos = root_to_virtual_screen( x, y );
rect.left = pos.x;
rect.top = pos.y;
rect.right = pos.x + event->width;
rect.bottom = pos.y + event->height;
TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n",
hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
event->x, event->y, event->width, event->height ); event->x, event->y, event->width, event->height );
...@@ -1384,12 +1397,12 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) ...@@ -1384,12 +1397,12 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt )
static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
POINT pt;
unsigned long data_length; unsigned long data_length;
unsigned long aux_long; unsigned long aux_long;
unsigned char* p_data = NULL; unsigned char* p_data = NULL;
Atom atom_aux; Atom atom_aux;
int x, y, cx, cy, dummy; int x, y, cx, cy, dummy;
BOOL bAccept;
Window win, w_aux_root, w_aux_child; Window win, w_aux_root, w_aux_child;
if (!(data = get_win_data( hWnd ))) return; if (!(data = get_win_data( hWnd ))) return;
...@@ -1400,34 +1413,19 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) ...@@ -1400,34 +1413,19 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
XQueryPointer( event->display, win, &w_aux_root, &w_aux_child, XQueryPointer( event->display, win, &w_aux_root, &w_aux_child,
&x, &y, &dummy, &dummy, (unsigned int*)&aux_long); &x, &y, &dummy, &dummy, (unsigned int*)&aux_long);
x += virtual_screen_rect.left; pt = root_to_virtual_screen( x, y );
y += virtual_screen_rect.top;
/* find out drop point and drop window */ /* find out drop point and drop window */
if (x < 0 || y < 0 || x > cx || y > cy) if (pt.x < 0 || pt.y < 0 || pt.x > cx || pt.y > cy)
{ {
bAccept = GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES; if (!(GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return;
x = 0; pt.x = pt.y = 0;
y = 0;
} }
else else
{ {
POINT pt = { x, y }; if (!find_drop_window( hWnd, &pt )) return;
HWND hwndDrop = find_drop_window( hWnd, &pt );
if (hwndDrop)
{
x = pt.x;
y = pt.y;
bAccept = TRUE;
}
else
{
bAccept = FALSE;
}
} }
if (!bAccept) return;
XGetWindowProperty( event->display, DefaultRootWindow(event->display), XGetWindowProperty( event->display, DefaultRootWindow(event->display),
x11drv_atom(DndSelection), 0, 65535, FALSE, x11drv_atom(DndSelection), 0, 65535, FALSE,
AnyPropertyType, &atom_aux, &dummy, AnyPropertyType, &atom_aux, &dummy,
...@@ -1457,8 +1455,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) ...@@ -1457,8 +1455,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
if( lpDrop ) if( lpDrop )
{ {
lpDrop->pFiles = sizeof(DROPFILES); lpDrop->pFiles = sizeof(DROPFILES);
lpDrop->pt.x = x; lpDrop->pt = pt;
lpDrop->pt.y = y;
lpDrop->fNC = FALSE; lpDrop->fNC = FALSE;
lpDrop->fWide = FALSE; lpDrop->fWide = FALSE;
p_drop = (char *)(lpDrop + 1); p_drop = (char *)(lpDrop + 1);
...@@ -1494,6 +1491,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) ...@@ -1494,6 +1491,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
char *p_drop = NULL; char *p_drop = NULL;
char *p, *next; char *p, *next;
int x, y; int x, y;
POINT pos;
DROPFILES *lpDrop; DROPFILES *lpDrop;
HDROP hDrop; HDROP hDrop;
union { union {
...@@ -1535,8 +1533,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) ...@@ -1535,8 +1533,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
if( drop_len && drop_len < 65535 ) { if( drop_len && drop_len < 65535 ) {
XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux, XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux,
&x, &y, &u.i, &u.i, &u.u); &x, &y, &u.i, &u.i, &u.u);
x += virtual_screen_rect.left; pos = root_to_virtual_screen( x, y );
y += virtual_screen_rect.top;
drop_len += sizeof(DROPFILES) + 1; drop_len += sizeof(DROPFILES) + 1;
hDrop = GlobalAlloc( GMEM_SHARE, drop_len ); hDrop = GlobalAlloc( GMEM_SHARE, drop_len );
...@@ -1545,13 +1542,12 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) ...@@ -1545,13 +1542,12 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
if( lpDrop && (win_data = get_win_data( hWnd ))) if( lpDrop && (win_data = get_win_data( hWnd )))
{ {
lpDrop->pFiles = sizeof(DROPFILES); lpDrop->pFiles = sizeof(DROPFILES);
lpDrop->pt.x = x; lpDrop->pt = pos;
lpDrop->pt.y = y;
lpDrop->fNC = lpDrop->fNC =
( x < (win_data->client_rect.left - win_data->whole_rect.left) || (pos.x < (win_data->client_rect.left - win_data->whole_rect.left) ||
y < (win_data->client_rect.top - win_data->whole_rect.top) || pos.y < (win_data->client_rect.top - win_data->whole_rect.top) ||
x > (win_data->client_rect.right - win_data->whole_rect.left) || pos.x > (win_data->client_rect.right - win_data->whole_rect.left) ||
y > (win_data->client_rect.bottom - win_data->whole_rect.top) ); pos.y > (win_data->client_rect.bottom - win_data->whole_rect.top) );
lpDrop->fWide = FALSE; lpDrop->fWide = FALSE;
p_drop = (char*)(lpDrop + 1); p_drop = (char*)(lpDrop + 1);
release_win_data( win_data ); release_win_data( win_data );
......
dlls/winex11.drv/mouse.c
View file @ 0b71e0bf
...@@ -361,6 +361,7 @@ static BOOL grab_clipping_window( const RECT *clip ) ...@@ -361,6 +361,7 @@ static BOOL grab_clipping_window( const RECT *clip )
struct x11drv_thread_data *data = x11drv_thread_data(); struct x11drv_thread_data *data = x11drv_thread_data();
Window clip_window; Window clip_window;
HWND msg_hwnd = 0; HWND msg_hwnd = 0;
POINT pos;
if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId())
return TRUE; /* don't clip in the desktop process */ return TRUE; /* don't clip in the desktop process */
...@@ -386,8 +387,8 @@ static BOOL grab_clipping_window( const RECT *clip ) ...@@ -386,8 +387,8 @@ static BOOL grab_clipping_window( const RECT *clip )
TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window );
if (!data->clip_hwnd) XUnmapWindow( data->display, clip_window ); if (!data->clip_hwnd) XUnmapWindow( data->display, clip_window );
XMoveResizeWindow( data->display, clip_window, pos = virtual_screen_to_root( clip->left, clip->top );
clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, XMoveResizeWindow( data->display, clip_window, pos.x, pos.y,
max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) );
XMapWindow( data->display, clip_window ); XMapWindow( data->display, clip_window );
...@@ -549,20 +550,21 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU ...@@ -549,20 +550,21 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU
return; return;
} }
if (window != root_window)
{
pt.x = input->u.mi.dx;
pt.y = input->u.mi.dy;
}
else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy );
if (!(data = get_win_data( hwnd ))) return; if (!(data = get_win_data( hwnd ))) return;
if (window == data->whole_window) if (window == data->whole_window)
{ {
input->u.mi.dx += data->whole_rect.left - data->client_rect.left; pt.x += data->whole_rect.left - data->client_rect.left;
input->u.mi.dy += data->whole_rect.top - data->client_rect.top; pt.y += data->whole_rect.top - data->client_rect.top;
} }
if (window == root_window)
{
input->u.mi.dx += virtual_screen_rect.left;
input->u.mi.dy += virtual_screen_rect.top;
}
pt.x = input->u.mi.dx;
pt.y = input->u.mi.dy;
if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL)
pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x;
MapWindowPoints( hwnd, 0, &pt, 1 ); MapWindowPoints( hwnd, 0, &pt, 1 );
...@@ -1344,9 +1346,9 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) ...@@ -1344,9 +1346,9 @@ void CDECL X11DRV_SetCursor( HCURSOR handle )
BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) BOOL CDECL X11DRV_SetCursorPos( INT x, INT y )
{ {
struct x11drv_thread_data *data = x11drv_init_thread_data(); struct x11drv_thread_data *data = x11drv_init_thread_data();
POINT pos = virtual_screen_to_root( x, y );
XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, pos.x, pos.y );
x - virtual_screen_rect.left, y - virtual_screen_rect.top );
data->warp_serial = NextRequest( data->display ); data->warp_serial = NextRequest( data->display );
XNoOp( data->display ); XNoOp( data->display );
XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */
...@@ -1369,8 +1371,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) ...@@ -1369,8 +1371,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos)
if (ret) if (ret)
{ {
POINT old = *pos; POINT old = *pos;
pos->x = winX + virtual_screen_rect.left; *pos = root_to_virtual_screen( winX, winY );
pos->y = winY + virtual_screen_rect.top;
TRACE( "pointer at (%d,%d) server pos %d,%d\n", pos->x, pos->y, old.x, old.y ); TRACE( "pointer at (%d,%d) server pos %d,%d\n", pos->x, pos->y, old.x, old.y );
} }
return ret; return ret;
...@@ -1424,7 +1425,8 @@ void move_resize_window( HWND hwnd, int dir ) ...@@ -1424,7 +1425,8 @@ void move_resize_window( HWND hwnd, int dir )
{ {
Display *display = thread_display(); Display *display = thread_display();
DWORD pt; DWORD pt;
int x, y, rootX, rootY, button = 0; POINT pos;
int button = 0;
XEvent xev; XEvent xev;
Window win, root, child; Window win, root, child;
unsigned int xstate; unsigned int xstate;
...@@ -1432,14 +1434,13 @@ void move_resize_window( HWND hwnd, int dir ) ...@@ -1432,14 +1434,13 @@ void move_resize_window( HWND hwnd, int dir )
if (!(win = X11DRV_get_whole_window( hwnd ))) return; if (!(win = X11DRV_get_whole_window( hwnd ))) return;
pt = GetMessagePos(); pt = GetMessagePos();
x = (short)LOWORD( pt ); pos = virtual_screen_to_root( (short)LOWORD( pt ), (short)HIWORD( pt ) );
y = (short)HIWORD( pt );
if (GetKeyState( VK_LBUTTON ) & 0x8000) button = 1; if (GetKeyState( VK_LBUTTON ) & 0x8000) button = 1;
else if (GetKeyState( VK_MBUTTON ) & 0x8000) button = 2; else if (GetKeyState( VK_MBUTTON ) & 0x8000) button = 2;
else if (GetKeyState( VK_RBUTTON ) & 0x8000) button = 3; else if (GetKeyState( VK_RBUTTON ) & 0x8000) button = 3;
TRACE( "hwnd %p/%lx, x %d, y %d, dir %d, button %d\n", hwnd, win, x, y, dir, button ); TRACE( "hwnd %p/%lx, x %d, y %d, dir %d, button %d\n", hwnd, win, pos.x, pos.y, dir, button );
xev.xclient.type = ClientMessage; xev.xclient.type = ClientMessage;
xev.xclient.window = win; xev.xclient.window = win;
...@@ -1448,8 +1449,8 @@ void move_resize_window( HWND hwnd, int dir ) ...@@ -1448,8 +1449,8 @@ void move_resize_window( HWND hwnd, int dir )
xev.xclient.display = display; xev.xclient.display = display;
xev.xclient.send_event = True; xev.xclient.send_event = True;
xev.xclient.format = 32; xev.xclient.format = 32;
xev.xclient.data.l[0] = x - virtual_screen_rect.left; /* x coord */ xev.xclient.data.l[0] = pos.x; /* x coord */
xev.xclient.data.l[1] = y - virtual_screen_rect.top; /* y coord */ xev.xclient.data.l[1] = pos.y; /* y coord */
xev.xclient.data.l[2] = dir; /* direction */ xev.xclient.data.l[2] = dir; /* direction */
xev.xclient.data.l[3] = button; /* button */ xev.xclient.data.l[3] = button; /* button */
xev.xclient.data.l[4] = 0; /* unused */ xev.xclient.data.l[4] = 0; /* unused */
...@@ -1469,15 +1470,17 @@ void move_resize_window( HWND hwnd, int dir ) ...@@ -1469,15 +1470,17 @@ void move_resize_window( HWND hwnd, int dir )
{ {
MSG msg; MSG msg;
INPUT input; INPUT input;
int x, y, rootX, rootY;
if (!XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &x, &y, &xstate )) break; if (!XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &x, &y, &xstate )) break;
if (!(xstate & (Button1Mask << (button - 1)))) if (!(xstate & (Button1Mask << (button - 1))))
{ {
/* fake a button release event */ /* fake a button release event */
pos = root_to_virtual_screen( x, y );
input.type = INPUT_MOUSE; input.type = INPUT_MOUSE;
input.u.mi.dx = x + virtual_screen_rect.left; input.u.mi.dx = pos.x;
input.u.mi.dy = y + virtual_screen_rect.top; input.u.mi.dy = pos.y;
input.u.mi.mouseData = button_up_data[button - 1]; input.u.mi.mouseData = button_up_data[button - 1];
input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
input.u.mi.time = GetTickCount(); input.u.mi.time = GetTickCount();
......
dlls/winex11.drv/window.c
View file @ 0b71e0bf
...@@ -1218,8 +1218,9 @@ static void sync_window_position( struct x11drv_win_data *data, ...@@ -1218,8 +1218,9 @@ static void sync_window_position( struct x11drv_win_data *data,
/* only the size is allowed to change for the desktop window */ /* only the size is allowed to change for the desktop window */
if (data->whole_window != root_window) if (data->whole_window != root_window)
{ {
changes.x = data->whole_rect.left - virtual_screen_rect.left; POINT pt = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top );
changes.y = data->whole_rect.top - virtual_screen_rect.top; changes.x = pt.x;
changes.y = pt.y;
mask |= CWX | CWY; mask |= CWX | CWY;
} }
...@@ -1415,6 +1416,7 @@ static void create_whole_window( struct x11drv_win_data *data ) ...@@ -1415,6 +1416,7 @@ static void create_whole_window( struct x11drv_win_data *data )
BYTE alpha; BYTE alpha;
DWORD layered_flags; DWORD layered_flags;
HRGN win_rgn; HRGN win_rgn;
POINT pos;
if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect ))
{ {
...@@ -1441,9 +1443,8 @@ static void create_whole_window( struct x11drv_win_data *data ) ...@@ -1441,9 +1443,8 @@ static void create_whole_window( struct x11drv_win_data *data )
if (!(cy = data->whole_rect.bottom - data->whole_rect.top)) cy = 1; if (!(cy = data->whole_rect.bottom - data->whole_rect.top)) cy = 1;
else if (cy > 65535) cy = 65535; else if (cy > 65535) cy = 65535;
data->whole_window = XCreateWindow( data->display, root_window, pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top );
data->whole_rect.left - virtual_screen_rect.left, data->whole_window = XCreateWindow( data->display, root_window, pos.y, pos.y,
data->whole_rect.top - virtual_screen_rect.top,
cx, cy, 0, data->vis.depth, InputOutput, cx, cy, 0, data->vis.depth, InputOutput,
data->vis.visual, mask, &attr ); data->vis.visual, mask, &attr );
if (!data->whole_window) goto done; if (!data->whole_window) goto done;
...@@ -1835,6 +1836,7 @@ HWND create_foreign_window( Display *display, Window xwin ) ...@@ -1835,6 +1836,7 @@ HWND create_foreign_window( Display *display, Window xwin )
static BOOL class_registered; static BOOL class_registered;
struct x11drv_win_data *data; struct x11drv_win_data *data;
HWND hwnd, parent; HWND hwnd, parent;
POINT pos;
Window xparent, xroot; Window xparent, xroot;
Window *xchildren; Window *xchildren;
unsigned int nchildren; unsigned int nchildren;
...@@ -1873,16 +1875,17 @@ HWND create_foreign_window( Display *display, Window xwin ) ...@@ -1873,16 +1875,17 @@ HWND create_foreign_window( Display *display, Window xwin )
{ {
parent = GetDesktopWindow(); parent = GetDesktopWindow();
style |= WS_POPUP; style |= WS_POPUP;
attr.x += virtual_screen_rect.left; pos = root_to_virtual_screen( attr.x, attr.y );
attr.y += virtual_screen_rect.top;
} }
else else
{ {
parent = create_foreign_window( display, xparent ); parent = create_foreign_window( display, xparent );
style |= WS_CHILD; style |= WS_CHILD;
pos.x = attr.x;
pos.y = attr.y;
} }
hwnd = CreateWindowW( classW, NULL, style, attr.x, attr.y, attr.width, attr.height, hwnd = CreateWindowW( classW, NULL, style, pos.x, pos.y, attr.width, attr.height,
parent, 0, 0, NULL ); parent, 0, 0, NULL );
if (!(data = alloc_win_data( display, hwnd ))) if (!(data = alloc_win_data( display, hwnd )))
...@@ -1890,7 +1893,7 @@ HWND create_foreign_window( Display *display, Window xwin ) ...@@ -1890,7 +1893,7 @@ HWND create_foreign_window( Display *display, Window xwin )
DestroyWindow( hwnd ); DestroyWindow( hwnd );
return 0; return 0;
} }
SetRect( &data->window_rect, attr.x, attr.y, attr.x + attr.width, attr.y + attr.height ); SetRect( &data->window_rect, pos.x, pos.y, pos.x + attr.width, pos.y + attr.height );
data->whole_rect = data->client_rect = data->window_rect; data->whole_rect = data->client_rect = data->window_rect;
data->whole_window = data->client_window = 0; data->whole_window = data->client_window = 0;
data->embedded = TRUE; data->embedded = TRUE;
...@@ -2355,6 +2358,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) ...@@ -2355,6 +2358,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
int x, y; int x, y;
unsigned int width, height, border, depth; unsigned int width, height, border, depth;
Window root, top; Window root, top;
POINT pos;
DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); DWORD style = GetWindowLongW( hwnd, GWL_STYLE );
struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_thread_data *thread_data = x11drv_thread_data();
struct x11drv_win_data *data = get_win_data( hwnd ); struct x11drv_win_data *data = get_win_data( hwnd );
...@@ -2387,11 +2391,11 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) ...@@ -2387,11 +2391,11 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
XGetGeometry( thread_data->display, data->whole_window, XGetGeometry( thread_data->display, data->whole_window,
&root, &x, &y, &width, &height, &border, &depth ); &root, &x, &y, &width, &height, &border, &depth );
XTranslateCoordinates( thread_data->display, data->whole_window, root, 0, 0, &x, &y, &top ); XTranslateCoordinates( thread_data->display, data->whole_window, root, 0, 0, &x, &y, &top );
rect->left = x; pos = root_to_virtual_screen( x, y );
rect->top = y; rect->left = pos.x;
rect->right = x + width; rect->top = pos.y;
rect->bottom = y + height; rect->right = pos.x + width;
OffsetRect( rect, virtual_screen_rect.left, virtual_screen_rect.top ); rect->bottom = pos.y + height;
X11DRV_X_to_window_rect( data, rect ); X11DRV_X_to_window_rect( data, rect );
swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE);
......
dlls/winex11.drv/x11drv.h
View file @ 0b71e0bf
...@@ -640,6 +640,8 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void ...@@ -640,6 +640,8 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void
extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN;
extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN;
extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) DECLSPEC_HIDDEN;
extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN;
extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN;
extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN;
struct x11drv_mode_info struct x11drv_mode_info
......
dlls/winex11.drv/xdnd.c
View file @ 0b71e0bf
...@@ -278,10 +278,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) ...@@ -278,10 +278,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event )
HWND targetWindow; HWND targetWindow;
HRESULT hr; HRESULT hr;
XDNDxy.x = event->data.l[2] >> 16; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF );
XDNDxy.y = event->data.l[2] & 0xFFFF;
XDNDxy.x += virtual_screen_rect.left;
XDNDxy.y += virtual_screen_rect.top;
targetWindow = WindowFromPoint(XDNDxy); targetWindow = WindowFromPoint(XDNDxy);
pointl.x = XDNDxy.x; pointl.x = XDNDxy.x;
......
dlls/winex11.drv/xinerama.c
View file @ 0b71e0bf
...@@ -157,6 +157,22 @@ static inline int query_screens(void) ...@@ -157,6 +157,22 @@ static inline int query_screens(void)
#endif /* SONAME_LIBXINERAMA */ #endif /* SONAME_LIBXINERAMA */
POINT virtual_screen_to_root( INT x, INT y )
{
POINT pt;
pt.x = x - virtual_screen_rect.left;
pt.y = y - virtual_screen_rect.top;
return pt;
}
POINT root_to_virtual_screen( INT x, INT y )
{
POINT pt;
pt.x = x + virtual_screen_rect.left;
pt.y = y + virtual_screen_rect.top;
return pt;
}
void xinerama_init( unsigned int width, unsigned int height ) void xinerama_init( unsigned int width, unsigned int height )
{ {
MONITORINFOEXW *primary; MONITORINFOEXW *primary;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment