wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b5bc026798c127d5bb4c471d94f7fb5e32b4861c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2023-04-06 09:14:54 +10:00
parent 9cb0330037
commit 9d5115a9ee
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
View File

@@ -1,4 +1,4 @@
From c7e30e022ebe93ed29114af743c63898bc15c04d Mon Sep 17 00:00:00 2001
From 322b0ade65ffd9f5e8cfdcd7faaaf5a3826c9ce4 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@gmail.com>
Date: Tue, 23 Sep 2014 23:22:17 +0800
Subject: [PATCH] winex11.drv: Update a candidate window's position with
@@ -90,7 +90,7 @@ index 2d056a359ef..eb57a2fcffb 100644
};
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index fcae7bbc9df..77b4c1a3b81 100644
index d5b0855035b..85a20c1e7c5 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -253,6 +253,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
@@ -102,7 +102,7 @@ index fcae7bbc9df..77b4c1a3b81 100644
/* X11 driver internal functions */
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 9f238e0cb83..2bda8ffc65f 100644
index b7f5f696ba5..51fb6bdff62 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -34,6 +34,7 @@
@@ -113,8 +113,8 @@ index 9f238e0cb83..2bda8ffc65f 100644
WINE_DEFAULT_DEBUG_CHANNEL(xim);
@@ -459,6 +460,49 @@ static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg )
return TRUE;
@@ -432,6 +433,49 @@ void xim_thread_attach( struct x11drv_thread_data *data )
else XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data );
}
+/***********************************************************************
@@ -122,7 +122,7 @@ index 9f238e0cb83..2bda8ffc65f 100644
+ */
+void X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
+{
+ if (ximStyle & XIMPreeditPosition)
+ if (input_style & XIMPreeditPosition)
+ {
+ struct x11drv_win_data *data;
+ HWND parent;
@@ -160,14 +160,14 @@ index 9f238e0cb83..2bda8ffc65f 100644
+ }
+}
+
XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data )
static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg )
{
XICCallback destroy = {.callback = xic_destroy, .client_data = (XPointer)hwnd};
@@ -492,5 +536,31 @@ XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data )
struct x11drv_win_data *data;
@@ -485,6 +529,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win )
XFree( preedit );
XFree( status );
+ if (xic != NULL && (ximStyle & XIMPreeditPosition))
+ if (xic != NULL && (input_style & XIMPreeditPosition))
+ {
+ SERVER_START_REQ( set_caret_info )
+ {
@@ -195,8 +195,9 @@ index 9f238e0cb83..2bda8ffc65f 100644
+
return xic;
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 52bfaaefbfd..8afb19fd6ec 100644
index 1ffaa409c72..219eb75d3de 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -334,6 +334,8 @@ struct user_driver_funcs