- &mouse_pos->X, &mouse_pos->Y,
- &junk_pos, &junk_pos, &junk_mask);
+ &mouse_pos->X, &mouse_pos->Y, /* Screen coords relative to root window's top-left */
+ &clientX, &clientY, /* Client coords relative to window's top-left */
+ &junk_mask);
+
+ if (client && window && window->Window.Handle)
+ {
+ mouse_pos->X = clientX;
+ mouse_pos->Y = clientY;
+ }