winex11: Moved the MapNotify handler to event.c.
This commit is contained in:
parent
585da9296d
commit
64e8128409
|
@ -76,6 +76,7 @@ extern BOOL ximInComposeMode;
|
||||||
static void X11DRV_FocusIn( HWND hwnd, XEvent *event );
|
static void X11DRV_FocusIn( HWND hwnd, XEvent *event );
|
||||||
static void X11DRV_FocusOut( HWND hwnd, XEvent *event );
|
static void X11DRV_FocusOut( HWND hwnd, XEvent *event );
|
||||||
static void X11DRV_Expose( HWND hwnd, XEvent *event );
|
static void X11DRV_Expose( HWND hwnd, XEvent *event );
|
||||||
|
static void X11DRV_MapNotify( HWND hwnd, XEvent *event );
|
||||||
static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event );
|
static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event );
|
||||||
static void X11DRV_ClientMessage( HWND hwnd, XEvent *event );
|
static void X11DRV_ClientMessage( HWND hwnd, XEvent *event );
|
||||||
|
|
||||||
|
@ -711,6 +712,24 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**********************************************************************
|
||||||
|
* X11DRV_MapNotify
|
||||||
|
*/
|
||||||
|
static void X11DRV_MapNotify( HWND hwnd, XEvent *event )
|
||||||
|
{
|
||||||
|
struct x11drv_win_data *data;
|
||||||
|
|
||||||
|
if (!(data = X11DRV_get_win_data( hwnd ))) return;
|
||||||
|
if (!data->mapped) return;
|
||||||
|
|
||||||
|
if (!data->managed)
|
||||||
|
{
|
||||||
|
HWND hwndFocus = GetFocus();
|
||||||
|
if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* get_window_wm_state
|
* get_window_wm_state
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -478,24 +478,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**********************************************************************
|
|
||||||
* X11DRV_MapNotify
|
|
||||||
*/
|
|
||||||
void X11DRV_MapNotify( HWND hwnd, XEvent *event )
|
|
||||||
{
|
|
||||||
struct x11drv_win_data *data;
|
|
||||||
|
|
||||||
if (!(data = X11DRV_get_win_data( hwnd ))) return;
|
|
||||||
if (!data->mapped) return;
|
|
||||||
|
|
||||||
if (!data->managed)
|
|
||||||
{
|
|
||||||
HWND hwndFocus = GetFocus();
|
|
||||||
if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
struct desktop_resize_data
|
struct desktop_resize_data
|
||||||
{
|
{
|
||||||
RECT old_screen_rect;
|
RECT old_screen_rect;
|
||||||
|
|
|
@ -642,7 +642,6 @@ extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event );
|
||||||
extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event );
|
extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event );
|
||||||
extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event );
|
extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event );
|
||||||
extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event );
|
extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event );
|
||||||
extern void X11DRV_MapNotify( HWND hwnd, XEvent *event );
|
|
||||||
extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event );
|
extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event );
|
||||||
extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event );
|
extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event );
|
||||||
extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );
|
extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );
|
||||||
|
|
Loading…
Reference in New Issue