asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/okamstudio/godot

Browse source
This commit is contained in:
Carl Olsson 2015-02-13 06:26:53 +10:00
commit 5c3c730bad
2 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
platform/windows/os_windows.cpp
View file

@ -54,6 +54,8 @@
#include "io/marshalls.h" #include "io/marshalls.h"
#include "shlobj.h" #include "shlobj.h"
#include <regstr.h>
static const WORD MAX_CONSOLE_LINES = 1500; static const WORD MAX_CONSOLE_LINES = 1500;
extern "C" { extern "C" {
@ -685,6 +687,48 @@ LRESULT CALLBACK WndProc(HWND hWnd,UINT uMsg, WPARAM wParam, LPARAM lParam) {
} }
String OS_Windows::get_joystick_name(int id, JOYCAPS jcaps)
{
char buffer [256];
char OEM [256];
HKEY hKey;
DWORD sz;
int res;
_snprintf(buffer, sizeof(buffer), "%s\\%s\\%s",
REGSTR_PATH_JOYCONFIG, jcaps.szRegKey,
REGSTR_KEY_JOYCURR );
res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey);
if (res != ERROR_SUCCESS)
{
res = RegOpenKeyEx(HKEY_CURRENT_USER, buffer, 0, KEY_QUERY_VALUE, &hKey);
if (res != ERROR_SUCCESS)
return "";
}
sz = sizeof(OEM);
_snprintf( buffer, sizeof(buffer), "Joystick%d%s", id + 1, REGSTR_VAL_JOYOEMNAME);
res = RegQueryValueEx ( hKey, buffer, 0, 0, (LPBYTE) OEM, &sz);
RegCloseKey ( hKey );
if (res != ERROR_SUCCESS)
return "";
_snprintf( buffer, sizeof(buffer), "%s\\%s", REGSTR_PATH_JOYOEM, OEM);
res = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey);
if (res != ERROR_SUCCESS)
return "";
sz = sizeof(buffer);
res = RegQueryValueEx(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, (LPBYTE) buffer,
&sz);
RegCloseKey(hKey);
if (res != ERROR_SUCCESS)
return "";
return String(buffer);
}
void OS_Windows::probe_joysticks() { void OS_Windows::probe_joysticks() {
static uint32_t last_attached = 0; static uint32_t last_attached = 0;
@ -726,7 +770,13 @@ void OS_Windows::probe_joysticks() {
JOYCAPS jcaps; JOYCAPS jcaps;
MMRESULT res = joyGetDevCaps(JOYSTICKID1 + i, &jcaps, sizeof(jcaps)); MMRESULT res = joyGetDevCaps(JOYSTICKID1 + i, &jcaps, sizeof(jcaps));
if (res == JOYERR_NOERROR) { if (res == JOYERR_NOERROR) {
joy.name = jcaps.szPname; String name = get_joystick_name(JOYSTICKID1 + i, jcaps);
if ( name == "")
joy.name = jcaps.szPname;
else
joy.name = name;
}; };
}; };

1
platform/windows/os_windows.h
View file

@ -187,6 +187,7 @@ protected:
void probe_joysticks(); void probe_joysticks();
void process_joysticks(); void process_joysticks();
void process_key_events(); void process_key_events();
String get_joystick_name( int id, JOYCAPS jcaps);
struct ProcessInfo { struct ProcessInfo {