Commit Graph

47 Commits

Author SHA1 Message Date
Soren Jorvang 3ab27a7d87 Revert parts of r5576 and r5598 for Sonicadvance1's sake.
This reenables the option for building without wx on OS X,
but still leaves wxgl as the default.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5599 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-04 04:59:07 +00:00
hrydgard a3c96ac42c Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.
Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
Shawn Hoffman e4085f0f04 Merge GCPadNew into Dolphin. This takes place in three segments: Core, InputCommon, and InputUICommon. From now on it can be referred to just as "GCPad".
Switch to Billiard's IniFile implementation throughout Dolphin (it's faster!!).

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5579 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 04:55:39 +00:00
Soren Jorvang 52c912a59e Make wxgl mandatory on OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 01:24:26 +00:00
Soren Jorvang 30e437f9e3 Fix some cases of variables being used uninitialized. Also some unused
variables, writeable strings and dangerously shadowed variables.

index(), gamma(), exp() and y0() are POSIX functions and using those
names can cause namespace confusion.

A number of C files were missing the final newline required by ANSI C
and some versions of GCC are pedantic enough to complain about this.

These changes simply the scons build, allowing us to get rid of
filterWarnings which is simply more trouble than it's worth.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5574 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-02 20:35:12 +00:00
Soren Jorvang cf62b10956 Move platform-specific variables into proper scope.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5484 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-05-26 20:46:51 +00:00
Glenn Rice 33a64d5db0 Big restructuring of how the video plugin works. In linux and windows you shouldn't see a change in the functionality; however, there are changes in how render to main or not, and fullscreen modes, and such are handled. Input is largely restructured for the video plugin. It is now handled by the host. Keys for pausing and changing fullscreen are configurable. More will probably be later. This is probably classified as highly experimental.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5336 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-12 01:33:10 +00:00
Sonicadvance1 4173cd5876 Disable divwux until we find out what's wrong with it, enable subfcx, and also JIT64 now sets cr[0] correctly.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5233 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-24 22:51:06 +00:00
Glenn Rice 721935c6ff Several little fixes.
Fixed a segfault in linux when a cd/dvd drive is empty or invalid and "Boot from DVD" or "Show Drives" are selected.
On all platforms if a game fails to load show the game list again.
The other things here are essentially code cleanup and won't be noticeable by most users.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5204 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-17 01:54:40 +00:00
Glenn Rice 2015d252f0 Rewrite of fullscreen toggling in linux. This goes back to using the EWMH specifications. I wasn't using it right before, but now it should work on all EWMH compliant window managers (like KDE, Metacity, Compiz, etc). Since this doesn't need an override redirect Alt-Tab works even in fullscreen mode. This also allows for some other nice things to be done.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5199 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-15 23:25:11 +00:00
Glenn Rice beba3b7f5b Removed more compiler warnings in linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5170 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-07 22:48:37 +00:00
Sonicadvance1 e79dc93a5c Fix noWX compiling, Fix OSX crashing when opening options because of dumb code. Fix OSX Wiimote, will fix multi-wiimote in OSX later.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5154 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-05 07:03:44 +00:00
sl1nk3.s 6da7695843 Fix issue 2364 + another issue introduced in r5129 causing the main window to lose the focus on windows
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5133 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 17:50:08 +00:00
luisr142004 7f5a10222e heh, builds fix, sorry :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5131 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 07:31:03 +00:00
luisr142004 816febd3b0 finish proper window handling, fix the modal state of the config dialogs, plus some minor cleanup/changes :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5129 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 06:12:35 +00:00
Glenn Rice aa1081348d Oops, should have tested my copy and paste from wiimote to gcpad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5126 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 03:08:50 +00:00
Glenn Rice a048ad52b4 Fix input focus in fullscreen on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5125 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-25 03:05:53 +00:00
Glenn Rice 74883a1735 Fix some wxChoice events that were still wxComboBox events.
Fixes issue 2334


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5114 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-23 01:59:59 +00:00
sl1nk3.s ffdf087aad Fixes issue 2331, plugins won't cause a crash/hang on stop anymore if their config dialog was opened, note that stopping a game while a config dialog is open still causes a crash (that should not be possible in the first place since the dialogs are modals, but heh...).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5109 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-22 04:59:57 +00:00
j4ck.fr0st fdd635d273 Warning cleanup, mainly shadowed variables, const/non-const and ctor initialization order
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5098 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:55:00 +00:00
Sonicadvance1 f833cc7601 Convert a few Comboboxes over to choiceboxes. WX OSX doesn't support Comboboxes with Readonly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5087 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-19 22:56:37 +00:00
Glenn Rice 634f6e512e Minor tweaks to fullscreen in linux, and make FullScr button in GUI work.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5074 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-17 17:53:08 +00:00
Glenn Rice 666a33eeed Fix mouse emulation in fullscreen mode in linux. The window doesn't have focus then.
Also minor tweak to mouse hiding.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5063 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-15 01:09:34 +00:00
j4ck.fr0st 14bb1b5f01 ...and a buildfix for non-win32
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5060 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 16:44:16 +00:00
j4ck.fr0st cd321feb83 attempt to fix the main window closing from r5056. i'm not sure how this affects window deletion tho.
apply eol-style native to GCPad, pretty annoying to break patches and stuff

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5059 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 16:33:53 +00:00
Glenn Rice dc7029e7f4 Remove HaveFocus, and put that code into IsFocus. Thanks ayuanx.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5058 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 14:48:19 +00:00
Sonicadvance1 5b1d21d1a1 Bunch of tiny memory leaks fixed and cleanup, フウ〜!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5056 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-14 14:06:33 +00:00
Glenn Rice e5afde67ce In linux only read keyboard and mouse input when the emulator window has focus.
Also other code clean up.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5053 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 23:56:24 +00:00
Glenn Rice 5e6eecf0af Ok, this really does it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5052 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 21:19:41 +00:00
Glenn Rice 24a4d1a1e0 Ok, now the mac build should be fixed
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5051 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 21:12:16 +00:00
Glenn Rice 47609c4524 Mac build fix to the issue caused by my last commit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5050 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 21:06:19 +00:00
Glenn Rice c2e0c75c93 EXPERIMENTAL
Removed X event loops from GCPad and Wiimote plugins, and implemented an asynchronous check for keyboard and mouse buttons.
Also added an X event loop in core that handles events while the emulator is paused.  Prevents unexpected behavior from events that occur while the emulator is paused.
Now there is only one event loop running at a time (besides those hidden in SDL).
I will revert this commit if other devs are unhappy with it.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5048 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-13 20:47:23 +00:00
Glenn Rice 13437c1f6b Fix segfault in linux if user clicks on the window manager close button of the
emulator.  Also added the ability to close the emulator with the escape key.
Fixed an issue that caused a segmentation fault when trying to close the
emulator when running in fullscreen mode, which can also be done using the
escape key.  This makes fullscreen mode useable in linux!


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5023 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-07 02:41:02 +00:00
ayuanx 961aad5aa6 Merges the original copyright header from both nJoy & PadSimple
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4996 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-03 02:12:46 +00:00
Glenn Rice feba09f7a3 Linux global build. At least the basic footwork is done here.
Basic usage:  "sudo scons install=global install"
Hopefully this doesn't break builds on Macs.  I have tested this on linux and windows.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-02 21:56:29 +00:00
ayuanx 4692f1084f Re-added Semi-Pressure
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4990 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-02 02:39:21 +00:00
ayuanx fdaa0e8d4c Fixes Issue 2164
Conflicts are due to same file name when omitting full path

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4982 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-29 04:42:19 +00:00
ayuanx f9dd509459 Fixes Issue 2180
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4981 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-29 03:11:29 +00:00
Glenn Rice e780d844fb Oops. Forgot a semicolon. Sorry, I usually test before I commit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4974 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-28 01:46:46 +00:00
Glenn Rice f32fc9667c In linux the controller plugins need to put back some events for the video plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4972 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-28 00:35:35 +00:00
Glenn Rice a241a469b8 Make arrow keys (and others) work with the GCPad plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4970 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-27 15:55:04 +00:00
ayuanx e988a7487c Adapts emulated trigger range to Gamecube trigger range
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4963 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-26 05:43:00 +00:00
Glenn Rice fe10a1b5b0 Fix the linux keyboard in the GCPad plugin too.
Thanks j4ck.fr0st


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4953 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-24 18:41:47 +00:00
Glenn Rice cb47eb27cc Don't delete dialogs. Let wxWidgets take care of this.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4950 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-24 16:39:47 +00:00
Glenn Rice afb82b1d8c Fix the PadSimple and GCPad plugins so their dialogs close properly.
Get rid of g_FrameOpen variable in Wiimote plugin.  It isn't needed anymore.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4948 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-24 14:41:53 +00:00
nakeee 156e357164 fix linux gcpad symbol missing
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4943 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-24 06:57:06 +00:00
ayuanx 0128e92068 Fixes the capital letter as well as path that could cause problem in future (Finish)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4935 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-23 17:30:40 +00:00