Commit graph

68 commits

Author SHA1 Message Date
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
9d686fc1d3 Standardization of Zilmar spec. plugin headers, license fixes. 2008-08-18 09:29:44 +00:00
Scott Knauert
e14b6a936d Replaced flags and n64cart icon Nmn added with original icon work to satifsy license issues. Also added base SVG files for our logo and GUI sheel integration icon. Minor GUI changes to use new icons. 2008-08-18 07:53:29 +00:00
Scott Knauert
1a655027ec Many KDE4 GUI improvements. Fixed Play issue (selecting ROM and pressing play would not load ROM), re-added settings menu (removed in KXmlGUI rework), integrated with config system. Possible to hide filter. Uses toolbar settings from config system. Added plugin config options. Gtk GUI code is mainly an optimization of config integration. 2008-07-29 05:34:52 +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
Scott Knauert
8f8b089899 Add OSX malloc.patch to trunk as <malloc.h> is non standard and there is no reason not to #include <stdlib.h> instead. In the process did some minor janitorial work on Gtk GUI, cleaning up extra #includes no longer needed (mainly non-RCS rom cache), gui_messages of messagetype = 1 would never occur, and gcc found a bug in filefrompath(). 2008-07-26 10:04:08 +00:00
Scott Knauert
9263428e6d KDE4 GUI slots now work (if slot is changed elsewhere, menu shows correct slot), slot is persistant. Added multirom archive suport to KDE4 GUI rombrowser. Minor KDE4 and Gtk GUI menu text / accelerator and mnemonic updates. 2008-07-22 18:23:46 +00:00
Scott Knauert
a67da4502b Fixed reload() compiler warning. Shouldn't be in header since its not a public function. 2008-07-14 06:45:28 +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
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
Scott Knauert
e3b1481a59 Changed rombrowser.cache format, added 4 bytes worth of 0s to the header so older (non RCS) versions simply ignore and rebuild the cache (as opposed to generally running out of memory or segfaulting). When switching back to an RCS version the cache will need to be rebuilt. Also changed some cache_entry types from unsigned short to unsigned chars to save space. Fixed two minor RCS bugs. Also added Penny Racers to the .ini. 2008-07-13 22:25:55 +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
Richard Goedeken
30a1228913 style corrections for rev 722 - do not change C comments to C++ comments in a C file 2008-07-01 02:35:20 +00:00
Scott Knauert
59b84b98db Added MainWindowXPosition and MainWindowYPosition so Gtk GUI remembers screen location along with sane fallbacks in case the user changes resolution. 2008-07-01 00:27:01 +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
a15ed3a458 Two memory bugs found with valgrind (not freeing 7zip db and having an if(buffer[counter]) for possible unitialized values of buffer). 2008-06-30 13:10:16 +00:00
Scott Knauert
685f42a28e Rough 7zip support. 2008-06-30 01:13:04 +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
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
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
Scott Knauert
91efd5b04b Added basic view menu (Toolbar, Filter, Statusbar) fixing Issue 88, also integrated view menu into config system. Haven't integrated the Debugger or VCR menus into it yet, would like to discuss on the best way to do so. Made the rom properties dialogue look nicer and be able to fit on 800x600 screens. Integrated rombrowser columns into config system so one can set which columns are viewable and those selected columns will show up the same way when the emulator is restarted. Ideally we'd also track the order of the columns, but Gtk does not seem to be able to do that. Also changed the way column names are provided as to ease future translation efforts. 2008-06-22 12:19:10 +00:00
Scott Knauert
c6e067fbd2 Added bzip2 support, readded unstream fixes from minizip library and redeleted MupenIniApi (cleanup from merge). 2008-06-19 07:40:49 +00:00
Richard Goedeken
9eebbdb55b Rom Cache System has landed in the trunk. 2008-06-19 04:29:35 +00:00
Scott Knauert
02cc55fd0c Fixed gtk bug discovered by compiling against gtk 2.12.10-2. 2008-06-13 02:00:41 +00:00
Richard Goedeken
ca505dce6d Fixed a whole bunch of warnings in the debugger. Most were 64-bit issues 2008-06-12 18:23:51 +00:00
Richard Goedeken
38e92c3a76 Merged r0286-debugger branch into trunk 2008-06-06 18:25:59 +00:00
Scott Knauert
b865e7ae9a Merged Gtk toolbar style and spacing bugfix from rcs branch upon developer request. 2008-05-21 19:57:30 +00:00
Scott Knauert
eb8755b000 Overhaul of rom handling functions.
- Calculating MD5 in Gtk GUI rom properties dialogue now works.
- Gtk GUI open rom filter now  has .z64, .v64, and .n64 extensions.
- Rom file decompression handled at single point (as opposed to 
2-3) to prevent duplication of code and make adding 7zip support easier.
- General code cleanup, renaming / comments, etc.

Testing done:
- Tested .zipped (singe and multifile archives), .gzipped, and 
uncompressed .z64 amd .v64 roms.
2008-05-11 08:20:37 +00:00
Scott Knauert
1eff426fe1 Savestate overhaul complete, messages when saving or loading, size_t / int type abuse fixed, general cleanup. 2008-05-08 00:48:13 +00:00
Scott Knauert
bef4ea9b63 - Further cleanup of savestate code.
- Now traps slot changes from core.
2008-05-07 16:50:19 +00:00
Scott Knauert
66620a6331 Changes:
- Cleaned up Gtk GUI emulation menu.
- Added accelerator group for non-meta accelerators so the don't  
interfere with entries (like the filter)
- Added savestate_get_filename() helper function. 
- Changing the savestate in the Gtk GUI is relayed to the user via the 
statusbar.
2008-05-07 09:22:29 +00:00
Jesse Dean
4a0ae5000f Resubmitting fixes to debugger. 2008-04-30 23:34:47 +00:00
James Hood
a6199536e4 Made the following changes to gtk gui menu for save slots (see issue 35 for details):
-Renamed menu to "Current save slot"
 -When save slot menu is opened, gui checks the current save slot and makes sure the selected slot in the menu matches it.
 -Removed "Default" slot option and replaced with slot 0. Slot 0 is the default on mupen64plus startup.
2008-04-25 21:38:36 +00:00
Richard Goedeken
47623cc7e6 reverted changes in 287 because debugger has a branch 2008-04-23 12:29:16 +00:00
Jesse Dean
e2fb5b7dd2 Initial cleanup of debugger & gtk gui code to allow use of DBG=1 flag. Code now compiles, and debugger shows up,
although at this time it does little else, and does prevent emulation from running properly.  --Jes
2008-04-23 11:25:24 +00:00
James Hood
16a274adb6 -Rewrote cheat dialog to handle add/edit and enable of cheats all in one dialog.
-Removed Cheat menu and replaced it with "Cheats..." menu item in the Options menu.
-Modified alert_message and confirm_message so they handle line wrap of the message internally, so now it's no longer necessary to insert newline chars into strings passed to alert_message and confirm_message.
-added list_find_node utility function to util.c.
-added utility functions to create/delete cheat structures for use by the gui.
2008-04-23 06:46:47 +00:00
James Hood
605a4a02b1 Changed pause/continue keyboard shortcut to Pause/Break key because the previous shortcut 'p' was conflicting with the new rom filter. 2008-04-22 20:49:45 +00:00
Scott Knauert
c456b9bfc1 Fixed a collision from variable rename. 2008-04-22 13:57:05 +00:00
Scott Knauert
cd92cf9f9a Gtk GUI filter and improved sorting functions. 2008-04-22 13:10:42 +00:00
Scott Knauert
e984cab71a Removed second status bar which was not used (even in 0.5)
as it caused two Gtk resize handles to be drawn on the 
main window. Left in framework for multiple status bars
in case we actually want to use this in the future.
2008-04-20 22:51:23 +00:00
James Hood
d37739f761 Fixed segfault introduced by r244. Segfault would happen if you start mupen64plus, press the play button without selecting any roms in the rombrowser. When the dialog pops up asking if you want to load a rom, select yes and select a rom via the file chooser and click open. 2008-04-20 15:24:54 +00:00
Scott Knauert
f272302d26 Fixed Issue 6, if a ROM is selected in the ROM browser and
the 'play' is pressed, emulation will start if mupen can 
load the ROM.
2008-04-20 09:28:49 +00:00
James Hood
64fcb851fe -Moved ability for start emulation to also continue emulation (committed in r237) to startEmulation function of main/main.c, so other gui's don't have to re-implement it.
-Also removed gui code that tries to change the name of the pause toolbar item to either "Pause" or "Resume". I think most users understand that the pause key will also unpause. Plus the name can get out of sync due to the many alternative ways to pause/continue emulation (lirc, keyboard shortcut, mapped controller button).
2008-04-19 23:32:34 +00:00
Scott Knauert
f3a922e71f Adds the ability for GUI start to also continue emulation. This minor GUI fix
makes our Play/Pause/Stop follow convention.
2008-04-19 22:02:23 +00:00
Richard Goedeken
cbc32cb208 Removed unused LimitFPS option 2008-04-17 15:27:04 +00:00