2013-11-22 10:54:41 -08:00
|
|
|
From 90f7d78cf1ee2bf4329b298cb24e0e5145637557 Mon Sep 17 00:00:00 2001
|
2013-11-21 12:33:37 -08:00
|
|
|
From: Sebastian Lackner <sebastian@fds-team.de>
|
2013-11-22 10:54:41 -08:00
|
|
|
Date: Fri, 22 Nov 2013 18:54:18 +0100
|
2013-11-22 11:06:28 -08:00
|
|
|
Subject: winex11: Enable/disable windows when they are (un)mapped by foreign
|
2013-11-21 12:33:37 -08:00
|
|
|
applications
|
|
|
|
|
|
|
|
---
|
|
|
|
dlls/winex11.drv/event.c | 17 +++++++++++++++++
|
|
|
|
1 file changed, 17 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
|
2013-11-22 10:54:41 -08:00
|
|
|
index 767c003..f39b922 100644
|
2013-11-21 12:33:37 -08:00
|
|
|
--- a/dlls/winex11.drv/event.c
|
|
|
|
+++ b/dlls/winex11.drv/event.c
|
2013-11-22 10:54:41 -08:00
|
|
|
@@ -922,6 +922,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
|
2013-11-21 12:33:37 -08:00
|
|
|
static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
|
|
|
|
{
|
|
|
|
struct x11drv_win_data *data;
|
|
|
|
+ BOOL is_embedded;
|
|
|
|
|
|
|
|
if (event->xany.window == x11drv_thread_data()->clip_window)
|
|
|
|
{
|
2013-11-22 10:54:41 -08:00
|
|
|
@@ -936,7 +937,12 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
|
2013-11-21 12:33:37 -08:00
|
|
|
if (hwndFocus && IsChild( hwnd, hwndFocus ))
|
2013-11-22 10:54:41 -08:00
|
|
|
set_input_focus( data );
|
2013-11-21 12:33:37 -08:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ is_embedded = data->embedded;
|
|
|
|
release_win_data( data );
|
|
|
|
+
|
|
|
|
+ if (is_embedded)
|
|
|
|
+ EnableWindow( hwnd, TRUE );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-29 17:30:37 -08:00
|
|
|
@@ -945,8 +951,19 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
|
2013-11-21 12:33:37 -08:00
|
|
|
*/
|
|
|
|
static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event )
|
|
|
|
{
|
|
|
|
+ struct x11drv_win_data *data;
|
|
|
|
+ BOOL is_embedded;
|
|
|
|
+
|
2013-11-29 17:30:37 -08:00
|
|
|
if (event->xany.window == x11drv_thread_data()->clip_window)
|
|
|
|
clipping_cursor = FALSE;
|
2013-11-21 12:33:37 -08:00
|
|
|
+
|
|
|
|
+ if (!(data = get_win_data( hwnd ))) return;
|
|
|
|
+
|
|
|
|
+ is_embedded = data->embedded;
|
|
|
|
+ release_win_data( data );
|
2013-11-22 10:54:41 -08:00
|
|
|
+
|
2013-11-21 12:33:37 -08:00
|
|
|
+ if (is_embedded)
|
|
|
|
+ EnableWindow( hwnd, FALSE );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
1.7.9.5
|
|
|
|
|