Commit graph

116 commits

Author SHA1 Message Date
Scott Knauert
082dd4de98 Some more SDL input cleanup in the branch. No gui mode works. The slowdown should be solved but we get faster speed that nogui (branch or trunk) and indistinguishable speed in gui mode from trunk. Also, a few changes to prevent the debugger from crashing no matter how you attempt to close emulation. The debugger still needs a ton of work, but most of crasher bugs are cleaned up. 2008-10-28 06:14:14 +00:00
Scott Knauert
776686d520 SDL cleanup in the branch, only minor slowndown on linux, should fix OSX keyboard input issue. Still may need some more tweaking. 2008-10-28 00:35:17 +00:00
Scott Knauert
4d883d2725 Another possible way to fix the lack of OSX keyboard input issue. This doesn't have the slowdown associated with the other method. 2008-10-26 19:25:45 +00:00
Scott Knauert
5216ab920f Working in progress on keyboard input in OSX. 2008-10-26 04:55:29 +00:00
Louai Al-Khanji
573754f057 Fix up gui_message calls. Clean up gtk implementation. 2008-10-05 20:48:15 +00:00
Scott Knauert
008a65eaeb Primarily implementation of new GUI state API and associated Gtk2 and Qt4 implementations. Fixed one minor Gtk bug (unable to select large toolbar icons). Fixed a could of NO_GUI warnings. Changed romcache.h to not define RCS structures in NO_GUI mode (more optimized NO_GUI binary). Fixed some non-ANSI static code analysis "bugs" mainly function() -> function(void) in C declarations. Also some GPL header updates to the newest template. Sorry for the large commit. 2008-10-05 03:33:52 +00:00
Richard Goedeken
210f946cae added newlines to the end of every source file which was missing one 2008-09-27 15:22:21 +00:00
Scott Knauert
83f614d45c Minor fixes, primarily to allow for compiling with -Wall, but also formatting and comments. A few corner case bugs found. 2008-09-25 21:46:06 +00:00
Scott Knauert
1bd211aa06 First stab at themable Gtk icons for plugins. Extended plugin API with EXPORT void CALL SetInstallDir(char* installDir) based on the config dir work we had done. Modified core to send the install dir. Modified Rice to accept (since glide64 and rice share the same dialog system and we want to remove the windows icons from glide64), checks for a Gtk icon theme and hook into the theme change (does do transient dialog icon changes like the core, yet). Feel free to revert or offer other suggestions as to how best handle this. 2008-09-12 05:46:45 +00:00
Richard Goedeken
18aa4baf5b use SDL instead of pthreads in debugger, remove pthread from library list in makefile, fix small bug in glide64 makefile 2008-09-06 20:09:28 +00:00
Richard Goedeken
b69eb75714 merged r0970-sdl-threads branch into trunk. fixed old bug in signal handler 2008-09-06 05:27:50 +00:00
Scott Knauert
6790b9ce6b Fixed minor icon oversight and win32 pthread bug. 2008-09-05 09:06:24 +00:00
Scott Knauert
e1c56bbc69 Minor cleanup of SDL_opengl.h include fix. Minor threading issue fix. 2008-09-04 04:30:13 +00:00
Louai Al-Khanji
9c1f8ca013 Don't crash on linux. This should be fixed in the plugins. 2008-09-01 20:31:26 +00:00
Louai Al-Khanji
2404721def Properly close plugins when stopping emulation. This gets rid of ghost windows on win32. 2008-09-01 19:05:25 +00:00
Louai Al-Khanji
75f324cfc6 Merge win32 branch 2008-09-01 12:44:16 +00:00
Scott Knauert
a4069b48ad Gtk GUI updates for core and Jttl. Mostly Jttl polishing (add mnemonics) and dialog cleanup. Core config dialog, still needs work. 2008-08-26 21:34:23 +00:00
Louai Al-Khanji
70155cb18d Remove all things KDE. Renaming still needs to be done. 2008-08-22 04:02:28 +00:00
Scott Knauert
bc2476ede2 Removed defunct and unlicensed VCR functions, and language files. FSF address fixes. 2008-08-19 04:28:04 +00:00
Scott Knauert
2440008f10 Real compile guards for PLUGIN_INFO struct in Zilmar plugin spec. Rice video license fixes. 2008-08-18 22:50:55 +00:00
Scott Knauert
6b2000be7c Updated man page with new options more correct syntax and GPL 2+ license. Modified README and binary help messages to all match. 2008-08-14 16:40:26 +00:00
Scott Knauert
620f98bd77 Implemented parts of astrange's portability patch. Mainly header (some missed malloc, some superfluous #includes removed) and plugin makefile improvements to improve OSX portability. 2008-07-28 02:56:08 +00:00
Richard Goedeken
7902490dd8 1. fixed missing tabs near 7zip source files in Makefile
2. added SHAREDIR, BINDIR, LIBDIR, and MANDIR optional parameters to install/uninstall scripts
3. added SHAREDIR, BINDIR, LIBDIR, and MANDIR as makefile install options
4. re-factored Installation Directory search code.  Previously, it searched in this order:
   A. directory specified on command line with --installdir
   B. $PREFIX/share/mupen64plus with $PREFIX given at compile time
   C. same directory as the mupen64plus binary
   D. current working directory
The new code searches in the following order:
   A. directory specified on command line with --installdir
   B. same directory as the mupen64plus binary
   C. /usr/local/share/mupen64plus
   D. /usr/share/mupen64plus
   E. current working directory
5. Added PluginDirectory parameter to mupen64plus.conf file and necessary handling code in main.c
2008-07-27 21:02:18 +00:00
Scott Knauert
12c25b0ab5 Added --romnumber command line option for specifying roms in multifile archives. Two very small cleanups, removed stay ":" from rom properties in Gtk GUI, and removed GameShark Pro V3.3 from .ini as it had the 0 byte MD5 string (bad dump). 2008-07-26 18:32:07 +00:00
Richard Goedeken
edbee1680a new feature: hit F9 for soft reset. According to N64 manuals, this is a 2-step operation: first an external HW2 interrupt fires, and 0.5 seconds later an NMI fires. Im not sure if the HW2 interrupt is proceeding properly; it will require some work with the debugger to walk through this. But the NMI correctly resets the CPU system and the game 2008-07-21 00:09:05 +00:00
Richard Goedeken
80b56a4fff Merged volume changing patch from Wahrhaft, with lots of changes by Richard42. Now both SDL-based and OSS-based volume controls are supported. 2008-07-16 04:39:14 +00:00
Scott Knauert
a2ed083f95 Overhaul of messaging system. Mainly remove guifuncs.c and the associated includes. Double checked GUI=NONE build. Also changed alert_message to error_message as this is the more logical name. Also merged the three gui message functions which included a lot of repeated code as to simplify the gui api. 2008-07-14 06:42:33 +00:00
Scott Knauert
8ce2d351ad Added simple rcs pausing 2008-07-14 03:27:19 +00:00
Scott Knauert
195afbe213 Fix semicolon bug in rom.c's hack detection for loop. Changed noask and messaging to only allow confirmation in GUI mode. Added #ifndefs for GUI=NONE option. Removed console confirmation code from guifuncs and the gui confirm.
-This line, and those below, will be ignored--

M    main/gui_gtk/main_gtk.c
M    main/guifuncs.c
M    main/main.c
M    main/rom.c
2008-07-13 23:46:38 +00:00
Richard Goedeken
96556138a8 merged in r4300 reset/execute cleanup from r0344-soft-reset branch 2008-07-13 02:54:50 +00:00
Richard Goedeken
1c5a242da3 Changed new AlwaysFullscreen parameter name to GuiStartFullscreen. Reworked parameter init logic so this parameter will only affect behaviour in GUI mode 2008-07-02 04:30:35 +00:00
James Hood
61a39ba35d Added "Always Start in Full Screen Mode" checkbox to config dialog. 2008-07-01 18:04:20 +00:00
Richard Goedeken
44bb98d785 remove brackets around single conditional clauses (except romcache.*) 2008-07-01 03:33:05 +00:00
Scott Knauert
b2427e1fb3 Fix bug when changing languages in Gtk GUI, simplify code and try to exit more cleanly. 2008-06-30 23:41:32 +00:00
Scott Knauert
8ea4bb4f53 Two more bugfixes thanks to Valgrind. Free string returned from gtk_combo_box_get_active_text, more correctly hanle RCS pthread. Fixed possible seg fault in filefrompath (although there still seems to be a leak somewhere here). 2008-06-30 17:44:45 +00:00
Scott Knauert
e76c5e94e6 Readded emulation started message, switched rcs messages over to unified messaging system. 2008-06-27 06:12:33 +00:00
Scott Knauert
990d14f8fc Changed open_rom() API. Updated its use in main and the Gtk GUI accordingly. Removed Gtk GUI title change to previous - rom internal name when loading via the file chooser since its silly and we don't do it when loading roms other ways. Moved open_rom() and close_rom() to rom.c and cleaned up the merged open_rom()/rom_read() function consolidating code, fixing a seg fault when the .ini couldn't assign a goodname to the loading rom. 2008-06-26 21:02:53 +00:00
Richard Goedeken
65de6b5d79 fixed OSD crash bug after running a game, disabling OSD, then running another game 2008-06-26 20:01:33 +00:00
Richard Goedeken
4bf03541d0 A few small changes to the new messaging code: dont use newlines in message strings, print to console even if gui is enabled, OSD pause message should be in center, print config/install dir info message to console. Small bugfix in gtk gui statusbar variable-arg code 2008-06-26 02:57:21 +00:00
Richard Goedeken
eaa7093f42 reverted commit 677, which introduced a bug which causes very bad things to happen if you run the same game twice. I suspect this is related to the g_MemHasBeenBSwapped mechanism which was removed in this commit, but there were too many changes to pinpoint the exact cause 2008-06-26 01:10:56 +00:00
Scott Knauert
d607893707 Tied rcs messages with new main_messaging system. Fixed longstanding rcs Gtk GUI bug (cannot load rom via play button), added multifile zip support, cleaned up rom loading functions. 2008-06-25 19:48:49 +00:00
Scott Knauert
059fcd3989 Fixed inability to configure plugins in GUI due to call order in main() from last commit. 2008-06-23 13:46:29 +00:00
Scott Knauert
b39789413d Minor changes to how GUI=NONE is built, mainly to strip out unneeded RCS code. Also since info_message is not needed (and ideally its friends will be phased out too) removed that and the no-op gui functions in guifuncs.c since its confusing and hacky when working in main. 2008-06-23 11:15:04 +00:00
Scott Knauert
b2c2462587 Integrated 2 icons out of 4 icons into theme which I missed, deleted 2 extra unused icons. We now actually make use of the config integration with MainWindowWidth/Height. Many Gtk GUI statusbar improvements. Implemented a unified console/GUI/OSB main_message function as per Richards suggestions. This is a little rough, I'd like suggestions to improve it and include the confirm message code. 2008-06-23 05:32:45 +00:00
Scott Knauert
ec306a5b63 Fixed eeprom issue crash for nogui version due to database RCS dependence. Set default savestate to 0. Savestate now persistent via config integration. Integrated sort column and method with config. Minor speedup to sorting. 2008-06-22 16:20:06 +00:00
Richard Goedeken
9cda3e9d69 dont launch rom cache thread when emulator is in nogui mode. Fixed null pointer access in rom.c 2008-06-22 04:21:55 +00:00
Jesse Dean
59a83f1030 Added version number to information displayed on stdout 2008-06-20 08:07:20 +00:00
Richard Goedeken
9eebbdb55b Rom Cache System has landed in the trunk. 2008-06-19 04:29:35 +00:00
Richard Goedeken
62da9e3122 refactored the recent speed/pause/advance changes to be a bit more object oriented. Instead of making the local variables global and spreading the code around in the files, write new global functions which manipulate the local variables and can be called from other places. This also decreases source code size slightly 2008-06-19 02:13:26 +00:00
Jesse Dean
ec94be6322 Added speedup, slowdown, pause and frame advance to LIRC support 2008-06-18 18:52:17 +00:00