mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
261 lines
8.7 KiB
Diff
261 lines
8.7 KiB
Diff
From 19a4bd8f76819adf43158402935a3b49f37d946e 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
|
|
over-the-spot style. (try 2)
|
|
|
|
In the current implementation, the candidate window position of a input
|
|
method is fixed because XNSpotLocation isn't updated after an input
|
|
context (XIC) is created in X11DRV_CreateIC().
|
|
X11DRV_UpdateCandidatePos() in this patch updates the position. You can
|
|
see the change of a position with ibus, scim or fcitx when input style
|
|
is set to "over the spot" in the registry key:
|
|
|
|
[HKEY_CURRENT_USER\Software\Wine\X11 Driver]
|
|
"InputStyle"="OverTheSpot"
|
|
|
|
This patch was based on the original work by Muneyuki Noguchi, and
|
|
received a lot of help from Sebastian Lackner.
|
|
---
|
|
dlls/user32/caret.c | 4 +++
|
|
dlls/user32/driver.c | 7 ++++
|
|
dlls/win32u/driver.c | 7 ++++
|
|
dlls/winex11.drv/init.c | 1 +
|
|
dlls/winex11.drv/x11drv.h | 1 +
|
|
dlls/winex11.drv/xim.c | 72 ++++++++++++++++++++++++++++++++++++++-
|
|
include/wine/gdi_driver.h | 5 +++
|
|
7 files changed, 96 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
|
|
index 2da7e02ca1a..1dd3ff29de4 100644
|
|
--- a/dlls/user32/caret.c
|
|
+++ b/dlls/user32/caret.c
|
|
@@ -27,6 +27,8 @@
|
|
#include "winbase.h"
|
|
#include "wingdi.h"
|
|
#include "winuser.h"
|
|
+#include "user_private.h"
|
|
+
|
|
#include "wine/server.h"
|
|
#include "wine/debug.h"
|
|
|
|
@@ -274,6 +276,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y )
|
|
r.left = x;
|
|
r.top = y;
|
|
CARET_DisplayCaret( hwnd, &r );
|
|
+ USER_Driver->pUpdateCandidatePos( hwnd, &r );
|
|
SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
|
|
}
|
|
return ret;
|
|
@@ -352,6 +355,7 @@ BOOL WINAPI ShowCaret( HWND hwnd )
|
|
if (ret && (hidden == 1)) /* hidden was 1 so it's now 0 */
|
|
{
|
|
CARET_DisplayCaret( hwnd, &r );
|
|
+ USER_Driver->pUpdateCandidatePos( hwnd, &r );
|
|
SetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
|
|
}
|
|
return ret;
|
|
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
|
|
index 7e9f63ad1c7..1a144bb78c9 100644
|
|
--- a/dlls/user32/driver.c
|
|
+++ b/dlls/user32/driver.c
|
|
@@ -341,6 +341,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
|
|
return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
|
|
}
|
|
|
|
+static void CDECL loaderdrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
|
+{
|
|
+ load_driver()->pUpdateCandidatePos( hwnd, caret_rect );
|
|
+}
|
|
+
|
|
static struct user_driver_funcs lazy_load_driver =
|
|
{
|
|
{ NULL },
|
|
@@ -393,6 +398,8 @@ static struct user_driver_funcs lazy_load_driver =
|
|
NULL,
|
|
/* vulkan support */
|
|
NULL,
|
|
+ /* candidate pos functions */
|
|
+ loaderdrv_UpdateCandidatePos,
|
|
/* thread management */
|
|
NULL
|
|
};
|
|
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
|
|
index b3a3e70f83f..3f8542e3b20 100644
|
|
--- a/dlls/win32u/driver.c
|
|
+++ b/dlls/win32u/driver.c
|
|
@@ -931,11 +931,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
|
|
return FALSE;
|
|
}
|
|
|
|
+
|
|
static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT version )
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
+static void CDECL nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
|
+{
|
|
+
|
|
+}
|
|
+
|
|
static void CDECL nulldrv_ThreadDetach( void )
|
|
{
|
|
}
|
|
@@ -1133,6 +1139,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
|
|
SET_USER_FUNC(WindowPosChanged);
|
|
SET_USER_FUNC(SystemParametersInfo);
|
|
SET_USER_FUNC(wine_get_vulkan_driver);
|
|
+ SET_USER_FUNC(UpdateCandidatePos);
|
|
SET_USER_FUNC(ThreadDetach);
|
|
#undef SET_USER_FUNC
|
|
|
|
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
|
|
index 1f0549e4d39..7ed3ef7183c 100644
|
|
--- a/dlls/winex11.drv/init.c
|
|
+++ b/dlls/winex11.drv/init.c
|
|
@@ -422,6 +422,7 @@ static const struct user_driver_funcs x11drv_funcs =
|
|
.pWindowPosChanged = X11DRV_WindowPosChanged,
|
|
.pSystemParametersInfo = X11DRV_SystemParametersInfo,
|
|
.pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver,
|
|
+ .pUpdateCandidatePos = X11DRV_UpdateCandidatePos,
|
|
.pThreadDetach = X11DRV_ThreadDetach,
|
|
};
|
|
|
|
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
|
index ce9a254fb5b..9b6d83ae4f3 100644
|
|
--- a/dlls/winex11.drv/x11drv.h
|
|
+++ b/dlls/winex11.drv/x11drv.h
|
|
@@ -242,6 +242,7 @@ extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT sw
|
|
struct window_surface *surface ) DECLSPEC_HIDDEN;
|
|
extern BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
|
|
UINT flags ) DECLSPEC_HIDDEN;
|
|
+extern void CDECL X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect ) DECLSPEC_HIDDEN;
|
|
extern void CDECL X11DRV_ThreadDetach(void) DECLSPEC_HIDDEN;
|
|
|
|
/* X11 driver internal functions */
|
|
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
|
|
index 3994c2106cc..ec943dcd623 100644
|
|
--- a/dlls/winex11.drv/xim.c
|
|
+++ b/dlls/winex11.drv/xim.c
|
|
@@ -30,6 +30,7 @@
|
|
#include "x11drv.h"
|
|
#include "imm.h"
|
|
#include "wine/debug.h"
|
|
+#include "wine/server.h"
|
|
|
|
WINE_DEFAULT_DEBUG_CHANNEL(xim);
|
|
|
|
@@ -456,6 +457,48 @@ static BOOL X11DRV_DestroyIC(XIC xic, XPointer p, XPointer data)
|
|
return TRUE;
|
|
}
|
|
|
|
+/***********************************************************************
|
|
+ * X11DRV_UpdateCandidatePos
|
|
+ */
|
|
+void CDECL X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
|
+{
|
|
+ if (ximStyle & XIMPreeditPosition)
|
|
+ {
|
|
+ struct x11drv_win_data *data;
|
|
+ HWND parent;
|
|
+
|
|
+ for (parent = hwnd; parent && parent != GetDesktopWindow(); parent = GetAncestor( parent, GA_PARENT ))
|
|
+ {
|
|
+ if (!(data = get_win_data( parent ))) continue;
|
|
+ if (data->xic)
|
|
+ {
|
|
+ XVaNestedList preedit;
|
|
+ XPoint xpoint;
|
|
+ POINT pt;
|
|
+
|
|
+ pt.x = caret_rect->left;
|
|
+ pt.y = caret_rect->bottom;
|
|
+
|
|
+ if (hwnd != data->hwnd)
|
|
+ MapWindowPoints( hwnd, data->hwnd, &pt, 1 );
|
|
+
|
|
+ if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL)
|
|
+ pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x;
|
|
+
|
|
+ xpoint.x = pt.x + data->client_rect.left - data->whole_rect.left;
|
|
+ xpoint.y = pt.y + data->client_rect.top - data->whole_rect.top;
|
|
+
|
|
+ preedit = XVaCreateNestedList( 0, XNSpotLocation, &xpoint, NULL );
|
|
+ if (preedit)
|
|
+ {
|
|
+ XSetICValues( data->xic, XNPreeditAttributes, preedit, NULL );
|
|
+ XFree( preedit );
|
|
+ }
|
|
+ }
|
|
+ release_win_data( data );
|
|
+ }
|
|
+ }
|
|
+}
|
|
|
|
XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data)
|
|
{
|
|
@@ -483,7 +526,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data)
|
|
XNDestroyCallback, &destroy,
|
|
NULL);
|
|
data->xic = xic;
|
|
- return xic;
|
|
+ goto return_xic;
|
|
}
|
|
|
|
/* create callbacks */
|
|
@@ -581,5 +624,32 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data)
|
|
if (status != NULL)
|
|
XFree(status);
|
|
|
|
+return_xic:
|
|
+ if (xic != NULL && (ximStyle & XIMPreeditPosition))
|
|
+ {
|
|
+ SERVER_START_REQ( set_caret_info )
|
|
+ {
|
|
+ req->flags = 0; /* don't set anything */
|
|
+ req->handle = 0;
|
|
+ req->x = 0;
|
|
+ req->y = 0;
|
|
+ req->hide = 0;
|
|
+ req->state = 0;
|
|
+ if (!wine_server_call_err( req ))
|
|
+ {
|
|
+ HWND hwnd;
|
|
+ RECT r;
|
|
+
|
|
+ hwnd = wine_server_ptr_handle( reply->full_handle );
|
|
+ r.left = reply->old_rect.left;
|
|
+ r.top = reply->old_rect.top;
|
|
+ r.right = reply->old_rect.right;
|
|
+ r.bottom = reply->old_rect.bottom;
|
|
+ X11DRV_UpdateCandidatePos( hwnd, &r );
|
|
+ }
|
|
+ }
|
|
+ SERVER_END_REQ;
|
|
+ }
|
|
+
|
|
return xic;
|
|
}
|
|
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
|
|
index 567a6c21608..ff92d097f7d 100644
|
|
--- a/include/wine/gdi_driver.h
|
|
+++ b/include/wine/gdi_driver.h
|
|
@@ -319,8 +319,13 @@ struct user_driver_funcs
|
|
const RECT *,struct window_surface*);
|
|
/* system parameters */
|
|
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);
|
|
+
|
|
/* vulkan support */
|
|
const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT);
|
|
+
|
|
+ /* IME functions */
|
|
+ void (CDECL *pUpdateCandidatePos)(HWND, const RECT *);
|
|
+
|
|
/* thread management */
|
|
void (CDECL *pThreadDetach)(void);
|
|
};
|
|
--
|
|
2.34.1
|
|
|