wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 839995d5e9afcbcdcd084eac3a8e6e48a2173eda.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-08-25 23:43:12 +02:00
parent f2fd04974f
commit deb73bfa7c
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/winex11-XEMBED/0001-winex11-Enable-disable-windows-when-they-are-un-mapped.patch
View File

@@ -1,26 +1,26 @@
From 90f7d78cf1ee2bf4329b298cb24e0e5145637557 Mon Sep 17 00:00:00 2001
From e7e33093dfa9f46069dbc7fa53dcdb2330cbdc57 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 22 Nov 2013 18:54:18 +0100
Subject: winex11: Enable/disable windows when they are (un)mapped by foreign
applications
---
dlls/winex11.drv/event.c | 17 +++++++++++++++++
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
index 767c003..f39b922 100644
index d81ff2e..c8ce8ad 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -922,6 +922,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
@@ -929,6 +929,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev )
static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
{
struct x11drv_win_data *data;
+ BOOL is_embedded;
if (event->xany.window == x11drv_thread_data()->clip_window)
{
@@ -936,7 +937,12 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
@@ -943,7 +944,12 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
if (hwndFocus && IsChild( hwnd, hwndFocus ))
set_input_focus( data );
}
@@ -30,12 +30,12 @@ index 767c003..f39b922 100644
+
+ if (is_embedded)
+ EnableWindow( hwnd, TRUE );
return TRUE;
}
@@ -945,8 +951,19 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
@@ -953,8 +959,19 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
*/
static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event )
static BOOL X11DRV_UnmapNotify( HWND hwnd, XEvent *event )
{
+ struct x11drv_win_data *data;
+ BOOL is_embedded;
@@ -43,16 +43,16 @@ index 767c003..f39b922 100644
if (event->xany.window == x11drv_thread_data()->clip_window)
clipping_cursor = FALSE;
+
+ if (!(data = get_win_data( hwnd ))) return;
+ if (!(data = get_win_data( hwnd ))) return FALSE;
+
+ is_embedded = data->embedded;
+ release_win_data( data );
+
+ if (is_embedded)
+ EnableWindow( hwnd, FALSE );
return TRUE;
}
--
1.7.9.5
2.9.0