wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 765815729fc4af2472e60551364e3b29dccfbcff.

Browse Source
This commit is contained in:
Zebediah Figura 2019-09-06 17:38:54 -05:00
parent bc1aa54891
commit 734918298c
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "92c00c51b21594987d342b5ce00c174ab4e84595"
echo "765815729fc4af2472e60551364e3b29dccfbcff"
}
# Show version information

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

@ -1,4 +1,4 @@
From e7e33093dfa9f46069dbc7fa53dcdb2330cbdc57 Mon Sep 17 00:00:00 2001
From b628604e599f96eda85be0f8677419f8f591a7c6 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
@ -9,18 +9,18 @@ Subject: winex11: Enable/disable windows when they are (un)mapped by foreign
1 file changed, 17 insertions(+)
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index d81ff2e..c8ce8ad 100644
index f79f40c23..04a4c3c94 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -929,6 +929,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev )
@@ -983,6 +983,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)
{
@@ -943,7 +944,12 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
if (event->xany.window == x11drv_thread_data()->clip_window) return TRUE;
@@ -994,7 +995,12 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
if (hwndFocus && IsChild( hwnd, hwndFocus ))
set_input_focus( data );
}
@ -33,15 +33,12 @@ index d81ff2e..c8ce8ad 100644
return TRUE;
}
@@ -953,8 +959,19 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
@@ -1004,6 +1010,17 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event )
*/
static BOOL X11DRV_UnmapNotify( HWND hwnd, XEvent *event )
{
+ struct x11drv_win_data *data;
+ BOOL is_embedded;
+
if (event->xany.window == x11drv_thread_data()->clip_window)
clipping_cursor = FALSE;
+
+ if (!(data = get_win_data( hwnd ))) return FALSE;
+
@ -50,9 +47,10 @@ index d81ff2e..c8ce8ad 100644
+
+ if (is_embedded)
+ EnableWindow( hwnd, FALSE );
+
return TRUE;
}
--
2.9.0
2.22.0