You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Move 04-XEMBED to winex11-XEMBED.
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
From f9b183ba340f5dd0f8cf558c91e5a30bf2d09dfd Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 26 Oct 2013 18:40:07 +0200
|
||||
Subject: winex11: Update gl_drawable for embedded windows
|
||||
|
||||
---
|
||||
dlls/winex11.drv/window.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
|
||||
index ebbfd45..6a8d63b 100644
|
||||
--- a/dlls/winex11.drv/window.c
|
||||
+++ b/dlls/winex11.drv/window.c
|
||||
@@ -2286,7 +2286,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags
|
||||
|
||||
sync_client_position( data, &old_client_rect, &old_whole_rect );
|
||||
|
||||
- if (!data->whole_window)
|
||||
+ if (data->embedded || !data->whole_window)
|
||||
{
|
||||
release_win_data( data );
|
||||
sync_gl_drawable( hwnd, visible_rect, rectClient );
|
||||
--
|
||||
1.7.9.5
|
||||
|
@@ -0,0 +1,58 @@
|
||||
From 90f7d78cf1ee2bf4329b298cb24e0e5145637557 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 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
|
||||
index 767c003..f39b922 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 )
|
||||
{
|
||||
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 )
|
||||
if (hwndFocus && IsChild( hwnd, hwndFocus ))
|
||||
set_input_focus( data );
|
||||
}
|
||||
+
|
||||
+ is_embedded = data->embedded;
|
||||
release_win_data( data );
|
||||
+
|
||||
+ if (is_embedded)
|
||||
+ EnableWindow( hwnd, TRUE );
|
||||
}
|
||||
|
||||
|
||||
@@ -945,8 +951,19 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
|
||||
*/
|
||||
static void 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;
|
||||
+
|
||||
+ is_embedded = data->embedded;
|
||||
+ release_win_data( data );
|
||||
+
|
||||
+ if (is_embedded)
|
||||
+ EnableWindow( hwnd, FALSE );
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
9
patches/winex11-XEMBED/definition
Normal file
9
patches/winex11-XEMBED/definition
Normal file
@@ -0,0 +1,9 @@
|
||||
Author: Sebastian Lackner
|
||||
Subject: Enable/disable windows when they are (un)mapped by foreign applications.
|
||||
Revision: 1
|
||||
|
||||
Author: Sebastian Lackner
|
||||
Subject: Update gl_drawable for embedded windows.
|
||||
Revision: 1
|
||||
|
||||
Fixes: XEMBED support for embedding Wine windows inside Linux applications
|
Reference in New Issue
Block a user