[PATCH v2 1/3] dinput: Notify the desktop window when device input is received.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Avoids letting the display go to sleep while a joystick is being used.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/dinput/device.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 7b83a39..daa6406 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -39,6 +39,8 @@
 #include "device_private.h"
 #include "dinput_private.h"
 
+#define WM_WINE_NOTIFY_ACTIVITY WM_USER
+
 WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface)
@@ -935,6 +937,8 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim
     /* Event is being set regardless of the queue state */
     if (This->hEvent) SetEvent(This->hEvent);
 
+    SendMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0);
+
     if (!This->queue_len || This->overflow || ofs < 0) return;
 
     next_pos = (This->queue_head + 1) % This->queue_len;
-- 
2.7.4

[PATCH v2 2/3] winex11.drv: Wake up the display on user input.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winex11.drv/desktop.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
index 4df8784..535fc53 100644
--- a/dlls/winex11.drv/desktop.c
+++ b/dlls/winex11.drv/desktop.c
@@ -167,6 +167,22 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height )
 }
 
 
+static WNDPROC desktop_orig_wndproc;
+
+#define WM_WINE_NOTIFY_ACTIVITY WM_USER
+
+static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
+{
+    switch (msg)
+    {
+    case WM_WINE_NOTIFY_ACTIVITY:
+        XResetScreenSaver( gdi_display );
+        XFlush( gdi_display );
+        break;
+    }
+    return desktop_orig_wndproc( hwnd, msg, wp, lp );
+}
+
 /***********************************************************************
  *		X11DRV_create_desktop
  *
@@ -181,6 +197,9 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height )
 
     TRACE( "%u x %u\n", width, height );
 
+    desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), GWLP_WNDPROC,
+                                                       (LONG_PTR)desktop_wndproc_wrapper );
+
     /* Create window */
     win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask |
                           PointerMotionMask | ButtonPressMask | ButtonReleaseMask | FocusChangeMask;
-- 
2.7.4

[PATCH v2 2/3] winex11.drv: Wake up the display on user input.

[Alexandre Julliard]

Zebediah Figura <z.figura12(a)gmail.com> writes:
> @@ -181,6 +197,9 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height )
>
> TRACE( "%u x %u\n", width, height );
>
> +    desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), GWLP_WNDPROC,
> +                                                       (LONG_PTR)desktop_wndproc_wrapper );

This will only be called in desktop mode, that's probably not what you
want.

-- 
Alexandre Julliard
julliard(a)winehq.org

[PATCH v2 2/3] winex11.drv: Wake up the display on user input.

[Zebediah Figura]

On 03/07/18 22:05, Alexandre Julliard wrote:
> Zebediah Figura <z.figura12(a)gmail.com> writes:
> > @@ -181,6 +197,9 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height )
> >
> > TRACE( "%u x %u\n", width, height );
> >
> > +    desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), GWLP_WNDPROC,
> > +                                                       (LONG_PTR)desktop_wndproc_wrapper );
>
> This will only be called in desktop mode, that's probably not what you
> want.

Thanks; I forgot how the Android driver works. I'll send an updated patch.

[PATCH v2 3/3] winemac.drv: Wake up the display on user input.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 dlls/winemac.drv/window.c         | 24 ++++++++++++++++++++++++
 dlls/winemac.drv/winemac.drv.spec |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index 48b44a6..fea5877 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -2831,3 +2831,27 @@ BOOL query_min_max_info(HWND hwnd)
     sync_window_min_max_info(hwnd);
     return TRUE;
 }
+
+static WNDPROC desktop_orig_wndproc;
+
+#define WM_WINE_NOTIFY_ACTIVITY WM_USER
+
+static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
+{
+    switch (msg)
+    {
+    case WM_WINE_NOTIFY_ACTIVITY:
+    {
+        static IOPMAssertionID assertion;
+        IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion);
+        break;
+    }
+    }
+    return desktop_orig_wndproc( hwnd, msg, wp, lp );
+}
+
+BOOL macdrv_create_desktop( UINT width, UINT height )
+{
+    desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC,
+                                                      (LONG_PTR)desktop_wndproc_wrapper);
+}
diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec
index 6fa723a..c0ffe69 100644
--- a/dlls/winemac.drv/winemac.drv.spec
+++ b/dlls/winemac.drv/winemac.drv.spec
@@ -45,6 +45,9 @@
 @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) macdrv_WindowPosChanged
 @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) macdrv_WindowPosChanging
 
+# Desktop
+@ cdecl wine_create_desktop(long long) macdrv_create_desktop
+
 # System tray
 @ cdecl wine_notify_icon(long ptr)
 
-- 
2.7.4