Commit Graph

138 Commits

Author SHA1 Message Date
daco65 128313cdea fixed the analogue config bug ( at least for me o.o )
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2157 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 19:23:25 +00:00
John Peterson 2757dbe2a8 InputCommon and Wiimote: Detect pads in the Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2151 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 15:39:28 +00:00
John Peterson 94d8eb5d4e InputCommon and nJoy: Moved more functions to InputCommon
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2150 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 15:05:03 +00:00
John Peterson c6b4f5c819 InputCommon and nJoy: Moved functions to InputCommon, to be shared with the Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2147 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 14:34:23 +00:00
John Peterson e926bc61d1 Wiimote: Added logging messages for the speaker configuration and for the 0x18 sound reports, the speaker currently produce a low humming noise in the wpad tools demo, but no real sound
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2141 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 10:15:55 +00:00
John Peterson 60e89dfc6f nJoy: Fixed bug that would cause the settings to be lost when nJoy was started without any detected gamepad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2131 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 05:57:28 +00:00
John Peterson 2b8d2134e5 nJoy: Slight oversight in last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2088 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 10:25:45 +00:00
John Peterson fcb951c0c9 nJoy: Made the out of focus option only apply to gamepad input. As I understand it it's primarily used to allow keyboard input at the same time as Dolphin is used. Then it would probably be annoying to send the keyboard input to Dolphin while you are typing. Keyboard inputs was also the main idea with the out of focus option, I think that it's not as important for gamepad input as you are less likely to use the gamepad in two different programs simultaneously.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2087 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 10:17:01 +00:00
LPFaint99 f999ae94df Make checking for focus optional for njoy input.
So if one wants, on one monitor play Dolphin, and on the other use the keyboard for something else

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2082 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 06:21:22 +00:00
John Peterson eb91942fd6 nJoy: Fixed bugs in settings saving and loading
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2069 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-02 03:16:59 +00:00
John Peterson 2199b15ca6 nJoy: Updated IsFocus() to allow config window input to
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2068 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 20:45:27 +00:00
John Peterson 2620257f47 nJoy: Fixed the digital L and R buttons
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2066 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 20:19:21 +00:00
John Peterson 8c9d07b26b nJoy: Don't allow input when Dolphin is not in focus (supports both the
rendering to main window and render to separate window options)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2062 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 16:29:35 +00:00
John Peterson c9ca6ef55a nJoy: Fixed a bug that would sometimes cause settings to not be saved correctly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2010 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-25 18:20:16 +00:00
nakeee 2e92b94e4a Compile fix on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2005 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:24:44 +00:00
John Peterson 0db67cf51c nJoy: Small change
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2004 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:17:51 +00:00
John Peterson a3c383ad4a nJoy: Made it tolerate a bad device (the Wiimote DirectInput device for example)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2003 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:13:53 +00:00
John Peterson fa7e857161 nJoy: Readded some fixes to nJoy (Notice: these changes have nothing to do with the argument earlier. These are only for fixing nJoy (point one and three in the 1991 revision)). Now opening the Wiimote plugin doesn't crash either (it was just a typo in GetWiimote()).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2000 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 12:09:30 +00:00
omegadox 8f98f0b778 Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 00:45:46 +00:00
hrydgard 70bc8167f8 Warp back to 1983!!! (rev 1983, that is, not the year :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 21:28:55 +00:00
John Peterson 7ecf884f9a nJoy: Fix to last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1996 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 16:50:07 +00:00
John Peterson f15c53eba7 nJoy: Compile fix (missing #endif)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1995 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 16:48:04 +00:00
John Peterson 361aed6811 nJoy: Added #ifdef INPUTCOMMON
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1994 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 13:31:00 +00:00
John Peterson 63ad74f9e8 nJoy and PluginManager:
1. Avoided LoadLibrary() and FreeLibrary() in favor of using an existing LoadLibrary() because of an unresolved crash related to LoadLibrary() and nJoy. After several times of LoadLibrary() and FreeLibrary() of nJoy these seems to be some kind of memory corruption that brings up several error boxes from different places (not just nJoy) and then cause a crash.

2. Slowed down the moving of the pad initialization to InputCommon. I'm not against InputCommon at all, but I have to spend some more time with it before it works on Windows

3. Partly fixed a somewhat frequent failure of nJoy with SDL 1.3 that would give a strange DirectInput error message and cause the pads to not function. It's still present before the nJoy config windows is opened. It's only fixed on booting a game.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1991 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 10:00:59 +00:00
nakeee 8a87001778 forgot include
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1986 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 00:15:57 +00:00
nakeee 87bfe821eb Added input manager handles the sdl init/quit for now
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1984 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 22:32:57 +00:00
John Peterson e4c96ece51 nJoy: Non-windows build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1982 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 19:53:16 +00:00
John Peterson e332e18ce6 nJoy and SerialInterface: Fixed the crashes with MAXPADS more than 1, the downside is that it doesn't work well one the second boot
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1980 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 11:18:46 +00:00
John Peterson bb06dfb823 nJoy and SerialInterface: Fixed the nJoy crashes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1978 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 00:31:12 +00:00
John Peterson 7f9dc55fbc nJoy: Improvements to the configuration, the SaveById option should now be simpler and better
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1977 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-21 18:09:31 +00:00
tmator 8f2d1136a7 fix njoy build for non win32 os, and small osx64 build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1965 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 20:21:05 +00:00
John Peterson 140ba01794 nJoy: Fixed configuration bug
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1957 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:41:58 +00:00
John Peterson 85a53457de nJoy: Forgot the header file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1956 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:32:15 +00:00
John Peterson 1386ad69ff nJoy: Comment change
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1955 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:28:45 +00:00
John Peterson 4f0298df1b nJoy: Added ifdefs for the XInput files
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1954 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:26:56 +00:00
John Peterson a10c603255 nJoy: Fixed the 360 pad triggers with XInput, now they are separate triggers that work just like they should
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1953 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:25:33 +00:00
nakeee 8c997e90d9 Empty kills the string:(
Using IsEmpty()


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1951 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:58:31 +00:00
nakeee 68cfd3618e opss
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1950 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:53:15 +00:00
nakeee 6730645dd8 Small compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1949 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:44:32 +00:00
John Peterson 0c9a1a9595 nJoy: The triggers were inversed
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1948 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 11:11:02 +00:00
nakeee af89d9e511 and today we'll learn about why not to cast pointer to int....
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1947 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 10:41:05 +00:00
John Peterson 969f34bbd0 nJoy: Escape key stops waiting for input when configuring the pad, changed the display of a disabled button from -1 to ""
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1946 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 10:37:48 +00:00
John Peterson 6f4cbb89f9 nJoy: Configuration bugfixes, and show the digital shoulder button status in the advanced settings to
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1945 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 06:38:29 +00:00
John Peterson 00bca8d807 nJoy: Fixed the analog shoulder buttons for the XBox 360 pad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1944 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 05:28:30 +00:00
John Peterson bede48c6b1 nJoy: Fix halfpress button configuration
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1943 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 23:17:29 +00:00
Shawn Hoffman 05a5333c80 fix build and change /EHsc to /EHa. jakestine (pcsx2-playground) says it is the Right Thing To Do.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1942 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 23:01:17 +00:00
John Peterson c2c6e2bd47 nJoy: Fixed some misplaced values
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1935 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 18:09:03 +00:00
John Peterson 8f40075f8f nJoy: Fixed the analog trigger buttons
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1934 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 17:47:00 +00:00
John Peterson 4a88f31ddb nJoy: Preparation for fixing the digital pad and the analog triggers
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1928 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 05:49:25 +00:00
Shawn Hoffman ba8c2aa7e4 nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1875 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-15 06:48:15 +00:00