pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r3087:3089 from branches/SDL-1.2: WM_XBUTTON support.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402365
This commit is contained in:
Ryan C. Gordon 2007-06-16 05:29:28 +00:00
parent cbe1b1f5e0
commit 7fd33f2b2c
2 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/video/win32/SDL_win32events.c
View file

@ -36,6 +36,16 @@
#define REPEATED_KEYMASK (1<<30) #define REPEATED_KEYMASK (1<<30)
#define EXTENDED_KEYMASK (1<<24) #define EXTENDED_KEYMASK (1<<24)
/* Make sure XBUTTON stuff is defined that isn't in older Platform SDKs... */
#ifndef WM_XBUTTONDOWN
#define WM_XBUTTONDOWN 0x020B
#endif
#ifndef WM_XBUTTONUP
#define WM_XBUTTONUP 0x020C
#endif
#ifndef GET_XBUTTON_WPARAM
#define GET_XBUTTON_WPARAM(w) (HIWORD(w))
#endif
static SDLKey static SDLKey
TranslateKey(WPARAM vkey) TranslateKey(WPARAM vkey)
@ -534,7 +544,10 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_MBUTTONUP: case WM_MBUTTONUP:
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
case WM_RBUTTONUP: case WM_RBUTTONUP:
case WM_XBUTTONDOWN:
case WM_XBUTTONUP:
{ {
int xbuttonval = 0;
int index; int index;
SDL_Mouse *mouse; SDL_Mouse *mouse;
Uint8 button, state; Uint8 button, state;
@ -575,6 +588,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
button = SDL_BUTTON_RIGHT; button = SDL_BUTTON_RIGHT;
state = SDL_RELEASED; state = SDL_RELEASED;
break; break;
case WM_XBUTTONDOWN:
xbuttonval = GET_XBUTTON_WPARAM(wParam);
button = SDL_BUTTON_WHEELDOWN + xbuttonval;
state = SDL_PRESSED;
break;
case WM_XBUTTONUP:
xbuttonval = GET_XBUTTON_WPARAM(wParam);
button = SDL_BUTTON_WHEELDOWN + xbuttonval;
state = SDL_RELEASED;
break;
default: default:
/* Eh? Unknown button? */ /* Eh? Unknown button? */
return (0); return (0);
@ -599,6 +622,20 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
SDL_SendMouseMotion(index, 0, x, y); SDL_SendMouseMotion(index, 0, x, y);
} }
SDL_SendMouseButton(index, state, button); SDL_SendMouseButton(index, state, button);
/*
* MSDN says:
* "Unlike the WM_LBUTTONUP, WM_MBUTTONUP, and WM_RBUTTONUP
* messages, an application should return TRUE from [an
* XBUTTON message] if it processes it. Doing so will allow
* software that simulates this message on Microsoft Windows
* systems earlier than Windows 2000 to determine whether
* the window procedure processed the message or called
* DefWindowProc to process it.
*/
if (xbuttonval > 0) {
return(TRUE);
}
} }
return (0); return (0);

6
src/video/win32/wmmsg.h
View file

@ -524,9 +524,9 @@ char *wmtab[] = {
"WM_MBUTTONDOWN", "WM_MBUTTONDOWN",
"WM_MBUTTONUP", "WM_MBUTTONUP",
"WM_MOUSELAST", "WM_MOUSELAST",
"WM_MOUSELAST", "WM_MOUSEWHEEL",
"UNKNOWN (523)", "WM_XBUTTONDOWN",
"UNKNOWN (524)", "WM_XBUTTONUP",
"UNKNOWN (525)", "UNKNOWN (525)",
"UNKNOWN (526)", "UNKNOWN (526)",
"UNKNOWN (527)", "UNKNOWN (527)",