April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Remove COM from the swapchain implementation.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 3ec19590d50e63c417ea795e6f9e35900adcf4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec19590d50e63c417ea795e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:14:31 2011 +0200 wined3d: Remove COM from the swapchain implementation. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/d3d8_private.h | 8 +-- dlls/d3d8/device.c | 6 +- dlls/d3d8/swapchain.c | 13 ++-- dlls/d3d9/d3d9_private.h | 8 +-- dlls/d3d9/device.c | 12 ++-- dlls/d3d9/swapchain.c | 22 ++++--- dlls/ddraw/ddraw.c | 14 ++-- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 20 +++---- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/factory.c | 6 +- dlls/dxgi/swapchain.c | 21 ++----- dlls/wined3d/device.c | 84 ++++++++++++++-------------- dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/surface.c | 10 +-- dlls/wined3d/surface_gdi.c | 3 +- dlls/wined3d/swapchain.c | 123 +++++++++++----------------------------- dlls/wined3d/wined3d.spec | 14 +++++ dlls/wined3d/wined3d_private.h | 27 ++++----- include/wine/wined3d.idl | 77 +++++++++---------------- include/wine/winedxgi.idl | 2 +- 23 files changed, 198 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ec19590d50e63c417ea7…

1 0

Alexandre Julliard : winex11: Make sure the clipping window is initialized in every thread.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 2ed57f9b96509f9bb20a28cf705414c47edff26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed57f9b96509f9bb20a28cf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 12:04:45 2011 +0200 winex11: Make sure the clipping window is initialized in every thread. --- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/mouse.c | 5 +++-- dlls/winex11.drv/window.c | 42 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/x11drv.h | 3 ++- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 62aea5e..97c6f29 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -774,7 +774,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - if (event->xany.window == clip_window) + if (event->xany.window == x11drv_thread_data()->clip_window) { clipping_cursor = 1; return; @@ -795,7 +795,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == clip_window) clipping_window_unmapped(); + if (event->xany.window == x11drv_thread_data()->clip_window) clipping_window_unmapped(); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a1c913f..2768d8e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -379,7 +379,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU input->type = INPUT_MOUSE; - if (!hwnd && window == clip_window) + if (!hwnd && window == x11drv_thread_data()->clip_window) { input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; @@ -1032,7 +1032,7 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) GetTickCount() - last_cursor_change > 100) { last_cursor_change = GetTickCount(); - if (clipping_cursor) set_window_cursor( clip_window, handle ); + if (clipping_cursor) set_window_cursor( init_clip_window(), handle ); else if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } @@ -1085,6 +1085,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { Display *display = thread_init_display(); + Window clip_window = init_clip_window(); if (!clip_window) return TRUE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 648ed59..15ee1c2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -68,8 +68,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) -/* cursor clipping window */ -Window clip_window = 0; +/* is cursor clipping active? */ int clipping_cursor = 0; /* X context to associate a hwnd to an X window */ @@ -1208,6 +1207,24 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /*********************************************************************** + * init_clip_window + */ +Window init_clip_window(void) +{ + struct x11drv_thread_data *data = x11drv_init_thread_data(); + + if (!data->clip_window && + (data->clip_window = (Window)GetPropA( GetDesktopWindow(), clip_window_prop ))) + { + wine_tsx11_lock(); + XSelectInput( data->display, data->clip_window, StructureNotifyMask ); + wine_tsx11_unlock(); + } + return data->clip_window; +} + + +/*********************************************************************** * update_user_time */ void update_user_time( Time time ) @@ -1711,6 +1728,8 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; sync_window_opacity( display, data->whole_window, key, alpha, layered_flags ); + init_clip_window(); /* make sure the clip window is initialized in this thread */ + wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); @@ -1964,35 +1983,26 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) */ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) { - Display *display = thread_init_display(); - if (hwnd == GetDesktopWindow()) { + struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; if (root_window != DefaultRootWindow( gdi_display )) { /* the desktop win data can't be created lazily */ - if (!create_desktop_win_data( display, hwnd )) return FALSE; + if (!create_desktop_win_data( data->display, hwnd )) return FALSE; } /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask; wine_tsx11_lock(); - clip_window = XCreateWindow( display, root_window, 0, 0, 1, 1, 0, 0, - InputOnly, visual, CWOverrideRedirect | CWEventMask, &attr ); + data->clip_window = XCreateWindow( data->display, root_window, 0, 0, 1, 1, 0, 0, + InputOnly, visual, CWOverrideRedirect | CWEventMask, &attr ); wine_tsx11_unlock(); - SetPropA( hwnd, clip_window_prop, (HANDLE)clip_window ); + SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); } - else if (!clip_window) - { - clip_window = (Window)GetPropA( GetDesktopWindow(), clip_window_prop ); - wine_tsx11_lock(); - XSelectInput( display, clip_window, StructureNotifyMask ); - wine_tsx11_unlock(); - } - return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8d05e27..cbc563b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -550,6 +550,7 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + Window clip_window; /* window used for cursor clipping */ HKL kbd_layout; /* active keyboard layout */ enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ }; @@ -585,7 +586,6 @@ static inline size_t get_property_size( int format, unsigned long count ) extern Visual *visual; extern Window root_window; -extern Window clip_window; extern int clipping_cursor; extern unsigned int screen_width; extern unsigned int screen_height; @@ -800,6 +800,7 @@ extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap par extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ); +extern Window init_clip_window(void); extern void update_user_time( Time time ); extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data );

1 0

Henri Verbeet : wined3d: Merge the GL and GDI swapchain vtbls.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 178061d3c150ce1905802b97757dedebbc735d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178061d3c150ce1905802b977… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:14:30 2011 +0200 wined3d: Merge the GL and GDI swapchain vtbls. --- dlls/wined3d/swapchain.c | 230 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 9 +- 2 files changed, 120 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=178061d3c150ce1905802…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DSwapChain typedefs.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: d30da7ae39c451dfdfaf970fb6aad9f34208dd41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30da7ae39c451dfdfaf970fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:14:32 2011 +0200 wined3d: Get rid of the IWineD3DSwapChain typedefs. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 6 +- dlls/wined3d/device.c | 113 ++++++++++++++++++++----------------- dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/surface.c | 14 ++-- dlls/wined3d/surface_gdi.c | 8 +- dlls/wined3d/swapchain.c | 26 ++++---- dlls/wined3d/wined3d_private.h | 12 ++-- 8 files changed, 97 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d30da7ae39c451dfdfaf9…

1 0

Alexandre Julliard : winex11: Retrieve raw mouse events through XInput2 while the cursor is clipped.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: bd3ec1a973fef5ff46a6242aa4e04dd4b7a40799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3ec1a973fef5ff46a6242aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 20:18:30 2011 +0200 winex11: Retrieve raw mouse events through XInput2 while the cursor is clipped. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 178 +++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 179 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d3ed4b0..62aea5e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -795,7 +795,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == clip_window) clipping_cursor = 0; + if (event->xany.window == clip_window) clipping_window_unmapped(); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e3774dc..a1c913f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -128,6 +128,17 @@ static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +static BOOL xinput2_available; +static int xinput2_opcode; +static int xinput2_core_pointer; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(XIFreeDeviceInfo); +MAKE_FUNCPTR(XIQueryDevice); +MAKE_FUNCPTR(XIQueryVersion); +MAKE_FUNCPTR(XISelectEvents); +#undef MAKE_FUNCPTR +#endif /*********************************************************************** * X11DRV_Xcursor_Init @@ -239,6 +250,124 @@ void sync_window_cursor( Window window ) } /*********************************************************************** + * enable_xinput2 + */ +static void enable_xinput2(void) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + struct x11drv_thread_data *data = x11drv_thread_data(); + XIDeviceInfo *devices; + XIEventMask mask; + unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; + int i, count; + + if (!xinput2_available) return; + + if (data->xi2_state == xi_unknown) + { + int major = 2, minor = 0; + wine_tsx11_lock(); + if (!pXIQueryVersion( data->display, &major, &minor )) data->xi2_state = xi_disabled; + else + { + data->xi2_state = xi_unavailable; + WARN( "X Input 2 not available\n" ); + } + wine_tsx11_unlock(); + } + if (data->xi2_state == xi_unavailable) return; + + wine_tsx11_lock(); + devices = pXIQueryDevice( data->display, XIAllDevices, &count ); + for (i = 0; i < count; ++i) + { + if (devices[i].use != XIMasterPointer) continue; + TRACE( "Using %u (%s) as core pointer\n", + devices[i].deviceid, debugstr_a(devices[i].name) ); + xinput2_core_pointer = devices[i].deviceid; + break; + } + + mask.mask = mask_bits; + mask.mask_len = sizeof(mask_bits); + memset( mask_bits, 0, sizeof(mask_bits) ); + + XISetMask( mask_bits, XI_RawButtonPress ); + XISetMask( mask_bits, XI_RawButtonRelease ); + XISetMask( mask_bits, XI_RawMotion ); + + for (i = 0; i < count; ++i) + { + if (devices[i].use == XISlavePointer && devices[i].attachment == xinput2_core_pointer) + { + TRACE( "Device %u (%s) is attached to the core pointer\n", + devices[i].deviceid, debugstr_a(devices[i].name) ); + mask.deviceid = devices[i].deviceid; + pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + data->xi2_state = xi_enabled; + } + } + + pXIFreeDeviceInfo( devices ); + wine_tsx11_unlock(); +#endif +} + +/*********************************************************************** + * disable_xinput2 + */ +static void disable_xinput2(void) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + struct x11drv_thread_data *data = x11drv_thread_data(); + XIEventMask mask; + XIDeviceInfo *devices; + int i, count; + + if (data->xi2_state != xi_enabled) return; + + TRACE( "disabling\n" ); + data->xi2_state = xi_disabled; + + mask.mask = NULL; + mask.mask_len = 0; + + wine_tsx11_lock(); + devices = pXIQueryDevice( data->display, XIAllDevices, &count ); + for (i = 0; i < count; ++i) + { + if (devices[i].use == XISlavePointer && devices[i].attachment == xinput2_core_pointer) + { + mask.deviceid = devices[i].deviceid; + pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + } + } + pXIFreeDeviceInfo( devices ); + wine_tsx11_unlock(); +#endif +} + +/*********************************************************************** + * clipping_window_unmapped + * + * Turn off clipping when the window got unmapped. + */ +void clipping_window_unmapped(void) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + + clipping_cursor = 0; + if (data->xi2_state == xi_enabled) + { + RECT rect; + GetClipCursor( &rect ); + if (EqualRect( &rect, &clip_rect )) return; /* still clipped */ + disable_xinput2(); + } +} + + +/*********************************************************************** * send_mouse_input * * Update the various window states on a mouse event. @@ -254,7 +383,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU { input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; - __wine_send_input( hwnd, input ); + if (x11drv_thread_data()->xi2_state != xi_enabled) __wine_send_input( hwnd, input ); return; } @@ -913,14 +1042,16 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) */ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) { - Display *display = thread_init_display(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); + + if (data->xi2_state == xi_enabled) return TRUE; TRACE( "warping to (%d,%d)\n", x, y ); wine_tsx11_lock(); - XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, + XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, x - virtual_screen_rect.left, y - virtual_screen_rect.top ); - XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ + XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ wine_tsx11_unlock(); return TRUE; } @@ -983,6 +1114,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (clipping_cursor) { + enable_xinput2(); sync_window_cursor( clip_window ); clip_rect = *clip; return TRUE; @@ -996,6 +1128,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) XUnmapWindow( display, clip_window ); wine_tsx11_unlock(); clipping_cursor = 0; + disable_xinput2(); return TRUE; } @@ -1175,6 +1308,42 @@ static void X11DRV_RawMotion( XIRawEvent *event ) /*********************************************************************** + * X11DRV_XInput2_Init + */ +void X11DRV_XInput2_Init(void) +{ +#if defined(SONAME_LIBXI) && defined(HAVE_X11_EXTENSIONS_XINPUT2_H) + int event, error; + void *libxi_handle = wine_dlopen( SONAME_LIBXI, RTLD_NOW, NULL, 0 ); + + if (!libxi_handle) + { + WARN( "couldn't load %s\n", SONAME_LIBXI ); + return; + } +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libxi_handle, #f, NULL, 0))) \ + { \ + WARN("Failed to load %s.\n", #f); \ + return; \ + } + + LOAD_FUNCPTR(XIFreeDeviceInfo); + LOAD_FUNCPTR(XIQueryDevice); + LOAD_FUNCPTR(XIQueryVersion); + LOAD_FUNCPTR(XISelectEvents); +#undef LOAD_FUNCPTR + + wine_tsx11_lock(); + xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error ); + wine_tsx11_unlock(); +#else + TRACE( "X Input 2 support not compiled in.\n" ); +#endif +} + + +/*********************************************************************** * X11DRV_GenericEvent */ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) @@ -1183,6 +1352,7 @@ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) XGenericEventCookie *event = &xev->xcookie; if (!event->data) return; + if (event->extension != xinput2_opcode) return; switch (event->evtype) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ae91fc9..8d05e27 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -258,6 +258,7 @@ extern void X11DRV_OpenGL_Cleanup(void); extern void X11DRV_Xcursor_Init(void); extern void X11DRV_BITMAP_Init(void); extern void X11DRV_FONT_Init( int log_pixels_x, int log_pixels_y ); +extern void X11DRV_XInput2_Init(void); extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ); extern XImage *X11DRV_DIB_CreateXImage( int width, int height, int depth ); @@ -550,6 +551,7 @@ struct x11drv_thread_data XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ HKL kbd_layout; /* active keyboard layout */ + enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ }; extern struct x11drv_thread_data *x11drv_init_thread_data(void); @@ -823,6 +825,7 @@ extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( Window window ); +extern void clipping_window_unmapped(void); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9ac20c3..cb6d793 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -595,6 +595,7 @@ static BOOL process_attach(void) #ifdef SONAME_LIBXCOMPOSITE X11DRV_XComposite_Init(); #endif + X11DRV_XInput2_Init(); #ifdef HAVE_XKB if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL );

1 0

Alexandre Julliard : winex11: Add handlers for the XInput2 raw mouse events .
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 338fe8b9acf5085172662e9cf3109370dad77a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=338fe8b9acf5085172662e9cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 18:56:37 2011 +0200 winex11: Add handlers for the XInput2 raw mouse events. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 115 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 117 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a05e906..d3ed4b0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -140,7 +140,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = NULL, /* 32 ColormapNotify */ X11DRV_ClientMessage, /* 33 ClientMessage */ X11DRV_MappingNotify, /* 34 MappingNotify */ - NULL /* 35 GenericEvent */ + X11DRV_GenericEvent /* 35 GenericEvent */ }; static const char * event_names[MAX_EVENT_HANDLERS] = diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1716916..e3774dc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -25,6 +25,9 @@ #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <stdarg.h> +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif #ifdef SONAME_LIBXCURSOR # include <X11/Xcursor/Xcursor.h> @@ -1089,3 +1092,115 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) send_mouse_input( hwnd, event->window, event->state, &input ); } + +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + +/*********************************************************************** + * X11DRV_RawButtonPress + */ +static void X11DRV_RawButtonPress( XIRawEvent *event ) +{ + int button = event->detail - 1; + INPUT input; + + if (button >= NB_BUTTONS) return; + + TRACE( "button %u\n", button ); + + input.type = INPUT_MOUSE; + input.u.mi.dx = 0; + input.u.mi.dy = 0; + input.u.mi.mouseData = button_down_data[button]; + input.u.mi.dwFlags = button_down_flags[button]; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + update_user_time( event->time ); + input.type = INPUT_MOUSE; + __wine_send_input( 0, &input ); +} + + +/*********************************************************************** + * X11DRV_RawButtonRelease + */ +static void X11DRV_RawButtonRelease( XIRawEvent *event ) +{ + int button = event->detail - 1; + INPUT input; + + if (button >= NB_BUTTONS) return; + + TRACE( "button %u\n", button ); + + input.u.mi.dx = 0; + input.u.mi.dy = 0; + input.u.mi.mouseData = button_up_data[button]; + input.u.mi.dwFlags = button_up_flags[button]; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + input.type = INPUT_MOUSE; + __wine_send_input( 0, &input ); +} + + +/*********************************************************************** + * X11DRV_RawMotion + */ +static void X11DRV_RawMotion( XIRawEvent *event ) +{ + const double *values = event->valuators.values; + INPUT input; + + if (!event->valuators.mask_len) return; + + input.u.mi.dx = 0; + input.u.mi.dy = 0; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + if (XIMaskIsSet( event->valuators.mask, 0 )) input.u.mi.dx = *values++; + if (XIMaskIsSet( event->valuators.mask, 1 )) input.u.mi.dy = *values++; + + TRACE( "pos %d,%d\n", input.u.mi.dx, input.u.mi.dy ); + + input.type = INPUT_MOUSE; + __wine_send_input( 0, &input ); +} + +#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ + + +/*********************************************************************** + * X11DRV_GenericEvent + */ +void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + XGenericEventCookie *event = &xev->xcookie; + + if (!event->data) return; + + switch (event->evtype) + { + case XI_RawButtonPress: + X11DRV_RawButtonPress( event->data ); + break; + + case XI_RawButtonRelease: + X11DRV_RawButtonRelease( event->data ); + break; + + case XI_RawMotion: + X11DRV_RawMotion( event->data ); + break; + + default: + TRACE( "Unhandled event %#x\n", event->evtype ); + break; + } +#endif +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5f6c5cf..ae91fc9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -728,6 +728,7 @@ extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event ); +extern void X11DRV_GenericEvent( HWND hwnd, XEvent *event ); extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );

1 0

Jeremy Newman : winetest: Add a php script for POST tests.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: tools Branch: master Commit: 04e04cfb2d886a02a64d366e1033a685a7f5d359 URL: http://source.winehq.org/git/tools.git/?a=commit;h=04e04cfb2d886a02a64d366e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 14 17:54:30 2011 +0200 winetest: Add a php script for POST tests. --- winetest/tests/post.php | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/winetest/tests/post.php b/winetest/tests/post.php new file mode 100644 index 0000000..e8d6e17 --- /dev/null +++ b/winetest/tests/post.php @@ -0,0 +1,21 @@ +<?php + +/* + * Simple POST test script used by Wine Regression tests + */ + +header("Content-Type: text/plain"); + +if (is_array($_POST) and count($_POST) > 0) +{ + foreach ($_POST as $name => $value) + { + echo "$name => $value\n"; + } +} +else +{ + echo "FAILED"; +} + +?>

1 0

Jeremy Newman : rename the ubuntu and debian pages, link to the download page
by Jeremy Newman April 14, 2011

April 14, 2011

Module: website Branch: master Commit: 5b27924f7d25e4bbb8f66e52d2a4e347c9c2e096 URL: http://source.winehq.org/git/website.git/?a=commit;h=5b27924f7d25e4bbb8f66e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 14 09:02:43 2011 -0500 rename the ubuntu and debian pages, link to the download page --- templates/en/download.template | 8 ++++---- .../download/{debsid.template => debian.template} | 0 .../en/download/{deb.template => ubuntu.template} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 33b79f1..c5cd4c5 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -57,19 +57,19 @@ requested in exchange for hosting the Wine web site.</p> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/deb"> + <td align="center"><a href="{$root}/download/ubuntu"> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> - <td> <b><a href="{$root}/download/deb">Download Ubuntu packages</a></b> + <td> <b><a href="{$root}/download/ubuntu">Download Ubuntu packages</a></b> - binary and source .debs for Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), and Natty (11.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/download/deblenny"> + <td align=center><a href="{$root}/download/debian"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <b><a href="{$root}/download/deblenny">Download Debian packages</a></b> + <td> <b><a href="{$root}/download/debian">Download Debian packages</a></b> - binary .debs for Debian Lenny, Squeeze and Sid</td> <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br><a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a></td> </tr> diff --git a/templates/en/download/debsid.template b/templates/en/download/debian.template similarity index 100% rename from templates/en/download/debsid.template rename to templates/en/download/debian.template diff --git a/templates/en/download/deb.template b/templates/en/download/ubuntu.template similarity index 100% rename from templates/en/download/deb.template rename to templates/en/download/ubuntu.template

1 0

Austin English : [website] update debian download information
by Jeremy Newman April 14, 2011

April 14, 2011

Module: website Branch: master Commit: 0832675f6f079e85b428dfd19b2ccf7e48067f42 URL: http://source.winehq.org/git/website.git/?a=commit;h=0832675f6f079e85b428df… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 14 08:59:11 2011 -0500 [website] update debian download information --- templates/en/download/deblenny.template | 45 ------------------------------- templates/en/download/debsid.template | 22 +++++++++++++++ 2 files changed, 22 insertions(+), 45 deletions(-) diff --git a/templates/en/download/deblenny.template b/templates/en/download/deblenny.template deleted file mode 100644 index 0356ee6..0000000 --- a/templates/en/download/deblenny.template +++ /dev/null @@ -1,45 +0,0 @@ - - - -<h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> -Wine for Debian Lenny, Squeeze and Sid -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> - -<p>Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, however we keep our own repository of the latest available beta packages here for download.</p> - -<p><b>Warning: These are beta packages</b><br> -<i>This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an update may break functionality in Wine. If the latest stable release of Wine (currently Wine 1.2) works for you, then you may not want to use these beta packages.</i></p> - -<p>This repository contains packages for i386 and amd64 architecture.</p> - -<p>To install wine packages you can use two methods: add the repository or download a .deb package and manually install it, but first of all you have to remove older wine version. If you use the first method you'll have wine automatically upgraded by apt, otherwise you'll need to manually download and install every new version.</p> - -<h2>Remove old version</h2> -<div style="position:relative;left:20px">Open a terminal</div> -<div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> -<div style="position:relative;left:20px"><i>apt-get remove libwine wine</i> <font color="gray">#to remove outdated version of wine</font></div><p></p> -<h2>Method 1: Add the repository</h2> -<div style="position:relative;left:20px">Open a terminal</div> -<div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> -<div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> <font color="gray">#to open repository file with a text editor (you can use gedit or another)</font></div> -<div style="position:relative;left:20px">Add this line for Lenny: <i>deb http://www.lamaresh.net/apt lenny main</i></div> -<div style="position:relative;left:20px">Add this line for Squeeze: <i>deb http://www.lamaresh.net/apt squeeze main</i></div> -<div style="position:relative;left:20px">Add this line for Sid: <i>deb http://www.lamaresh.net/apt sid main</i></div> -<div style="position:relative;left:20px">Save and close sources.list</div> -<div style="position:relative;left:20px"><i>wget -O - http://www.lamaresh.net/apt/key.gpg | apt-key add - </i> <font color="gray">#to add gpg key</font></div> -<div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> -<div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> -<h2>Method 2: Download .deb and manually install it</h2> -<div style="position:relative;left:20px">Chose a .deb package from <a href="http://www.lamaresh.net/binary.php" target="_blank">binary list</a> and save it in your home directory</div> -<div style="position:relative;left:20px">Open a terminal</div> -<div style="position:relative;left:20px"><i>cd ~</i> <font color="gray">#to go to your home directory</font></div> -<div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> -<div style="position:relative;left:20px"><i>dpkg -i wine_1.1.xxx.deb</i> <font color="gray">#change xxx with your chosen package, this will install wine</font></div> - -<br><br><p style="font-size:12px;text-align:left;font-style: italic;"> -Homepage: <a href="http://www.lamaresh.net" target="_blank">http://www.lamaresh.net/</a><br> -Repository maintainer: <a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br> -Package builder: <a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a> -</p> - - diff --git a/templates/en/download/debsid.template b/templates/en/download/debsid.template new file mode 100644 index 0000000..a745e11 --- /dev/null +++ b/templates/en/download/debsid.template @@ -0,0 +1,22 @@ + + + +<h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> +Wine for Debian Sid +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> + +<p>Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, however we keep our own repository of the latest available beta packages here for download.</p> + +<p><b>Warning: These are beta packages</b><br> +<i>This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an update may break functionality in Wine. If the latest stable release of Wine (currently Wine 1.2.3) works for you, then you may not want to use these beta packages.</i></p> + +<p>This website has packages for i386 and amd64 architecture.</p> + +<p>To install wine packages you must download the .deb files and manually install them. See the page for more details.</p> + +<br><br><p style="font-size:12px;text-align:left;font-style: italic;"> +Homepage: <a href="http://dev.carbon-project.org/debian/wine-unstable/" target="_blank">http://dev.carbon-project.org/debian/wine-unstable/</a><br> +Package builder: <a href="mailto:curan(a)debian.org">Kai Wasserbäch</a> +</p> + +

1 0

Detlef Riekenberg : inetcpl: Display description and security level for a zone.
by Alexandre Julliard April 13, 2011

April 13, 2011

1 0