Alexandre Julliard : winex11: Moved the X11DRV_WindowMessage function to window.c.
Alexandre Julliard
julliard at winehq.org
Tue Sep 9 05:50:22 CDT 2008
Module: wine
Branch: master
Commit: 370368aace67b0bad2ce7813e800f668eaa8c027
URL: http://source.winehq.org/git/wine.git/?a=commit;h=370368aace67b0bad2ce7813e800f668eaa8c027
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Sep 8 15:42:24 2008 +0200
winex11: Moved the X11DRV_WindowMessage function to window.c.
---
dlls/winex11.drv/event.c | 23 -----------------------
dlls/winex11.drv/window.c | 27 +++++++++++++++++++++++++--
dlls/winex11.drv/x11drv.h | 1 -
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index e431786..32befa4 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -1354,29 +1354,6 @@ static void X11DRV_ClientMessage( HWND hwnd, XEvent *xev )
}
-/**********************************************************************
- * X11DRV_WindowMessage (X11DRV.@)
- */
-LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
-{
- switch(msg)
- {
- case WM_X11DRV_ACQUIRE_SELECTION:
- return X11DRV_AcquireClipboard( hwnd );
- case WM_X11DRV_DELETE_WINDOW:
- return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 );
- case WM_X11DRV_SET_WIN_FORMAT:
- return X11DRV_set_win_format( hwnd, (XID)wp );
- case WM_X11DRV_RESIZE_DESKTOP:
- X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) );
- return 0;
- default:
- FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp );
- return 0;
- }
-}
-
-
/***********************************************************************
* X11DRV_SendInput (X11DRV.@)
*/
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 2bf41a6..4e9c779 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -412,9 +412,9 @@ static void sync_window_text( Display *display, Window win, const WCHAR *text )
/***********************************************************************
- * X11DRV_set_win_format
+ * set_win_format
*/
-BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id )
+static BOOL set_win_format( HWND hwnd, XID fbconfig_id )
{
struct x11drv_win_data *data;
XVisualInfo *vis;
@@ -2153,6 +2153,29 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
}
+/**********************************************************************
+ * X11DRV_WindowMessage (X11DRV.@)
+ */
+LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
+{
+ switch(msg)
+ {
+ case WM_X11DRV_ACQUIRE_SELECTION:
+ return X11DRV_AcquireClipboard( hwnd );
+ case WM_X11DRV_DELETE_WINDOW:
+ return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 );
+ case WM_X11DRV_SET_WIN_FORMAT:
+ return set_win_format( hwnd, (XID)wp );
+ case WM_X11DRV_RESIZE_DESKTOP:
+ X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) );
+ return 0;
+ default:
+ FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp );
+ return 0;
+ }
+}
+
+
/***********************************************************************
* is_netwm_supported
*/
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 8f5c828..a9d1abd 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -715,7 +715,6 @@ extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd );
extern Window X11DRV_get_whole_window( HWND hwnd );
extern Window X11DRV_get_client_window( HWND hwnd );
extern XIC X11DRV_get_ic( HWND hwnd );
-extern BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig );
extern int pixelformat_from_fbconfig_id( XID fbconfig_id );
extern XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id );
More information about the wine-cvs
mailing list