Commit Graph

882 Commits

Author SHA1 Message Date
twinaphex cdcc068a18 (360 RMenu XUI) Rename rarch_quickmenu to rarch_video_options 2013-05-10 18:25:17 +02:00
twinaphex c1757f7a3d (360 RMenu XUI) Take out some unnecessary HXUIOBJs and just have a root_menu and
current_menu HXUIOBJ instead
2013-05-10 17:14:22 +02:00
twinaphex 70af692622 (360 RMenu XUI) Easier way to declare new XUI menu classes 2013-05-10 03:54:20 +02:00
twinaphex 0ca3a52172 (360) Move more video options from 'Settings' to 'Video Options' 2013-05-10 03:36:32 +02:00
twinaphex 388a2d9830 (360) HD XUI overlay better positioned for 4:3 screen - make
gamma correction toggle a 'restart app' option
2013-05-10 03:22:59 +02:00
twinaphex c9d5f8ba67 (RMenu XUI) Make text bottom label work 2013-05-09 22:27:18 +02:00
twinaphex 75edb0fa43 (RMenu XUI) Have filebrowsers use the same XUI file 2013-05-09 21:46:13 +02:00
twinaphex 18fe85bc1b (RMenu XUI) Restore rotation functionality + other tweaks 2013-05-09 20:24:58 +02:00
twinaphex 17ea68b9cd (RMenu XUI) Implement more options in main menu 2013-05-09 20:07:12 +02:00
twinaphex 34ec600190 (RMenu XUI) Build fix 2013-05-09 18:46:06 +02:00
twinaphex c5be3d957a (RMenu XUI) Cleanups + indenting 2013-05-09 18:44:35 +02:00
twinaphex 1ba7659c3f (RMenu XUI) Change rarch_main.xui into list view as well 2013-05-09 18:13:27 +02:00
twinaphex 4fc4c294c2 (360) Have 'controls' screen use same XUI screen as rarch_controls /
rarch_quickmenu - 'slider' will be reimplemented as a simple
list option
2013-05-09 15:13:09 +02:00
twinaphex 9f16c5eee5 (360 XUI) Start using the same XUI file for several screens (Quick Menu /
settings screen now use the same xui file only duplicated)
2013-05-09 13:25:02 +02:00
ToadKing 9b7bd42cc0 fix compiler warning 2013-05-08 19:12:18 -04:00
Themaister 7f88b51828 Split video and shader toggle options.
Fixes crashes when left/right was used on browser options.
2013-05-08 18:17:30 +02:00
twinaphex b45ce8a998 (XUI) Use XuiUnregisterClass directly 2013-05-08 02:11:06 +02:00
Themaister 3b06905329 Update RGUI shader menu when a preset is loaded. 2013-05-06 16:41:31 +02:00
twinaphex 7067b2eeb1 (RMenu XUI) Have one common m_back 2013-05-06 03:05:21 +02:00
twinaphex bbcd7b535b (360 RMenu XUI) Programmatically fill in Input Options menu 2013-05-06 02:55:39 +02:00
twinaphex 21a50bdd65 (360 RMenu XUI) Use only one m_settingslist 2013-05-06 02:44:13 +02:00
twinaphex 1a3a86d824 (360 RMenu XUI) Programmatically fill in Quick Menu list 2013-05-06 02:40:15 +02:00
twinaphex d481bc61fc (360) Programmatically fill in XUI list for 'Settings' 2013-05-06 02:07:33 +02:00
twinaphex 7d075514b3 (360) Fix 'Default filter' labels 2013-05-06 01:22:15 +02:00
twinaphex a4c9e7cffd (360) Gamma correction toggle should no longer crash 2013-05-06 01:11:20 +02:00
twinaphex dd1a0476d8 (360 RMenu XUI) Take out more unnecessary info messages 2013-05-06 00:57:29 +02:00
twinaphex 3e39c1ebef (GX/RGUI) Build fix 2013-05-06 00:54:17 +02:00
twinaphex 900ee2e9ae (XDK360) Get rid of no longer needed message queue messages 2013-05-06 00:47:22 +02:00
ToadKing 5e839e5d74 fix compile warnings 2013-05-05 16:19:27 -04:00
twinaphex f2e8f1f1fd (RGUI) Create Settings menu 2013-05-05 22:02:47 +02:00
ToadKing 858ad034c8 don't scroll tickers for entries not highlighted 2013-05-05 15:42:45 -04:00
twinaphex 87c59df6ea (RMenu/XDK1) Build fixes 2013-05-05 21:16:34 +02:00
twinaphex 9d2d0e5844 (RMenu) Split up Shader Options into submenu - same as RGUI 2013-05-05 21:11:34 +02:00
twinaphex e8ef68345b (RMenu) Use more sane define names 2013-05-05 20:10:26 +02:00
twinaphex c5e0c2ad2b (RMenu) Update some labels 2013-05-05 17:38:20 +02:00
twinaphex 5f441fbd43 (XDK1) Shows rotation option again on Xbox 1 2013-05-05 17:31:30 +02:00
twinaphex 26acc84596 (RMenu) Adjust amount of characters to consider as 'max' for ticker
for Xbox 1
2013-05-05 17:21:15 +02:00
twinaphex 84ed664fd1 (RMenu) Use menu_ticker_line for RMenu as well 2013-05-05 17:03:57 +02:00
twinaphex 40ba6cf9e2 (GX/RMenu) Have per-core configuration use g_extern.input_config_path - have
RMenu use it as well
2013-05-05 16:29:32 +02:00
twinaphex 6a1eb0c0b1 (PS3/RMenu) Move oskutil_handle to menu_common.h 2013-05-05 16:12:06 +02:00
twinaphex 9c3d943600 (RGUI/RMenu) Get rid of SRAM/Savestate dir enable - obsolete now 2013-05-05 16:02:57 +02:00
twinaphex 092b2625dd (RMenu/RGUI) Drop MODE_MENU_INGAME 2013-05-05 15:20:45 +02:00
Themaister 1540cb9bba Use ticker line across the board. 2013-05-05 11:31:43 +02:00
Themaister 65deccfcad Refactor ticker line creation.
Move to menu_common. Can be reused.
2013-05-05 11:26:02 +02:00
Themaister 5b8257d62c Add ticker line to settings in RGUI.
Adds a ticker line so that long paths can still display in full
without overflowing the terminal.
2013-05-05 11:17:27 +02:00
Themaister e88b3204bc Clarify Hard VSync wording.
Can use Hard Sync even without VSync.
2013-05-05 09:54:54 +02:00
twinaphex de1f159178 (RMenu) Change title of 'Screenshot Mode' to 'Take Screenshot' - same as
RGUI
2013-05-05 04:48:06 +02:00
twinaphex 2c557c1eef (RMenu) Menu now more or less synced with RGUI's menu ordering 2013-05-05 04:42:06 +02:00
twinaphex ed97079b89 (RMenu) Path settings submenu 2013-05-05 03:41:41 +02:00
twinaphex a0b07c8d7d (RMenu) Fix labels 2013-05-05 02:58:48 +02:00
twinaphex 374a8c065d (RMenu) Move input settings to submenu 2013-05-05 00:27:55 +02:00
twinaphex 2ac2df09d4 (RMenu) Sync name labels with that of RGUI 2013-05-05 00:27:55 +02:00
Themaister a12d163bde Move Video Options out of shader manager branch. 2013-05-04 23:44:50 +02:00
Themaister fdfdb43ada Move shader settings to their own sub-menu. 2013-05-04 23:44:50 +02:00
twinaphex 57949c7c46 (RMenu) Cleanups 2013-05-04 23:26:54 +02:00
Themaister 086db7c24a Remove RATE_CONTROL in RGUI.
It's redundant as 0.000 delta disables it anyways.
2013-05-04 23:20:38 +02:00
twinaphex 58899bbbf2 (RGUI) Fixup config file 'option' 2013-05-04 22:54:17 +02:00
Themaister f5d4008018 Check g_settings.video.hard_sync per frame.
Don't use hard_sync default in RGUI.
2013-05-04 22:49:06 +02:00
twinaphex 6992ab8943 (RGUI) Add placeholder rate control option - needs way to be 'enabled'
/ 'disabled' ingame
2013-05-04 22:47:14 +02:00
twinaphex d447dba432 (RGUI) Add Vsync and Hard sync options 2013-05-04 22:29:22 +02:00
twinaphex f1d55b9360 (RGUI) Add Path options (note - not yet changeable - we will need 'scrolling'
if a label on the right side is too long to fit the screen - something
like a 'ticker' that increments the text from right to left by one
character per frame)
2013-05-04 21:17:47 +02:00
twinaphex 7c21bb1496 (RGUI) Split up 'disk options' into Disk submenu 2013-05-04 19:26:34 +02:00
twinaphex f93513113d (RGUI) Split up audio options into 'Audio Options' submenu 2013-05-04 19:00:57 +02:00
Themaister e3d78af36c Fix off-by-one bug.
Rename "Device No." to Player to clarify a bit.
2013-05-04 17:03:06 +02:00
Themaister 254d9b36d6 Flush RGUI menu stack correctly.
Menu stack wasn't flushed out correctly on ROM load.
2013-05-04 16:56:44 +02:00
twinaphex a5f89d88ce (RGUI) Make 'input' into its own category (should have been done from the start
really)
2013-05-04 16:48:53 +02:00
twinaphex e6b3bb079b (RMenu/RGUI) Add rgui->current_pad 2013-05-04 16:15:05 +02:00
Themaister 946a2a2fc1 Update rgui->load_no_rom in the right place. 2013-05-04 14:55:29 +02:00
Themaister 13f0a8548f Fix crash when rgui->info.library_name is NULL.
If retroarch was started with g_settings.libretro as a directory, and a
ROM loaded. Going into RGUI would see g_settings.libretro as a directory
and rgui->info wouldn't be properly initialized.

Fixed by updating g_settings.libretro if a specific core is resolved.
2013-05-04 14:32:00 +02:00
Themaister 1dfcc8a2b0 Fix MSVC2010 build. 2013-05-04 00:59:59 +02:00
Themaister 175e657071 Clear out load_no_rom after rom load. 2013-05-02 15:43:11 +02:00
Themaister 99990173cc Can load without ROM in RGUI (HAVE_DYNAMIC).
Not sure how this will work on RARCH_CONSOLE, but it'll probably be
checked for in startup on core load somehow and either start in menu or args->no_rom.
2013-05-02 14:46:05 +02:00
Themaister 2f61e3c65d Fix punctuation. 2013-05-01 16:49:23 +02:00
ToadKing a2247272ef add back in ROM load failure message 2013-04-30 21:45:02 -04:00
Themaister 81e8a51728 Should fix RMenu zip support. 2013-05-01 01:18:01 +02:00
Themaister e2229ec3c3 Use strcasecmp in extension checking. 2013-04-30 23:58:49 +02:00
Themaister c87e79556d Add zip extensions to RMenu as well. 2013-04-30 23:48:14 +02:00
Themaister 1d9eea880a Add zip as extension in RGUI file browser. 2013-04-30 23:36:29 +02:00
Themaister 19f5d53b9d Fix capitalization. 2013-04-29 22:02:46 +02:00
ToadKing 210afcb23f (RGUI) fix ROM loading message not appearing 2013-04-29 16:01:41 -04:00
twinaphex eeaa53b127 (XDK1/RMenu) Build fix 2013-04-29 17:08:24 +02:00
Themaister 1cab391be8 Add SRAM autosave option to RGUI. 2013-04-29 16:12:15 +02:00
Themaister e15ba44c50 Drop ROM history if config_path isn't set.
Avoid loading and saving history from/to a potential broken path.
2013-04-29 14:12:39 +02:00
twinaphex 6cee86c768 (RMenu) Get rid of main_wrap savestate_dir/sram_dir 2013-04-29 05:44:32 +02:00
twinaphex b0968790c6 (RMenu) Add preliminary Load Game History - now just need to
properly set up rarch_console_exec for arg passing (PS3/Xbox 1/360)
2013-04-29 05:17:22 +02:00
twinaphex 7eafb676e3 (RMenu) Cleanups 2013-04-29 04:55:49 +02:00
twinaphex 51aa5b170f (RMenu) Fixes/cleanups 2013-04-29 03:59:48 +02:00
twinaphex 86628d3462 Add param to load_menu_game_history - rgui->selection_ptr is
unused yet in RMenu/RMenu XUI, so need to pass a param to function
2013-04-29 03:10:26 +02:00
twinaphex 4a772c3fa8 (Wii) Working Load Game History 2013-04-29 03:05:46 +02:00
twinaphex ebda8425dc (Wii) Ability to use custom libogc library 2013-04-28 18:37:55 +02:00
twinaphex 3b5c85f485 (CONSOLE) Fixes history list on console when g_extern.fullpath
does not point to a ROM path
2013-04-28 17:30:08 +02:00
twinaphex 775ed24633 Fix for consoles in load_game_menu_prepare 2013-04-28 16:58:58 +02:00
twinaphex 63ba647018 Move all of the code to menu_common.c to avoid code duplication
across frontends
2013-04-28 16:38:13 +02:00
Themaister ca5db6d5b7 Include config.h correctly. 2013-04-28 15:25:22 +02:00
twinaphex 5aa4101620 (Menu) Move MODE_LOAD_GAME mechanics to upper function rarch_main 2013-04-28 15:00:37 +02:00
twinaphex 8768a69bc6 Move history_free and history_init to higher-level menu_common.c 2013-04-28 03:48:35 +02:00
Themaister d70a7df8ae Fix CXX_BUILD. 2013-04-28 02:01:25 +02:00
Themaister ecbda2497c Fix some casing consistencies. 2013-04-28 01:52:58 +02:00
Themaister 62e2586116 Fixups to display in history. 2013-04-28 01:47:20 +02:00
Themaister 5293f0e1fc Begin intergrating ROM history. 2013-04-28 01:47:20 +02:00
Themaister 901516d283 Load history. 2013-04-28 01:44:39 +02:00
Themaister 30ac2ebfcf Start in settings menu on menu entry. 2013-04-28 01:44:39 +02:00
Themaister 2ccea2299d Add initial ROM history. 2013-04-28 01:44:38 +02:00
twinaphex 582cfce1f8 (RGUI) Move all video settings over to 'Video Options' submenu 2013-04-28 01:41:38 +02:00
twinaphex 370ed0cef4 (RGUI) Move first video option ('Rotate') to Video Options submenu 2013-04-28 01:04:34 +02:00
twinaphex c02725f091 (RGUI) Rename SHADER MANAGER to VIDEO OPTIONS - build it in when
HAVE_SHADER_MANAGER is not defined as well
2013-04-28 00:32:25 +02:00
twinaphex 11e2577a87 (RMenu XUI) Add menu toggle hack for now 2013-04-27 22:49:43 +02:00
twinaphex cd9c6aa95d Drop delay_timer 2013-04-27 21:27:41 +02:00
twinaphex 6b6dd4fc4e (RMenu) Fixes rotation 2013-04-27 18:37:05 +02:00
twinaphex 40ac65f8ef (RMenu) Cleanups 2013-04-27 18:09:47 +02:00
twinaphex e61ef2322c (RMenu) fixes menu toggle 2013-04-27 17:44:39 +02:00
twinaphex c92585e6a3 (RMenu) Sligtly better menu toggle but still screwed up 2013-04-27 16:49:39 +02:00
Themaister bd1f4ce72d Go back to settings menu after appending disk. 2013-04-27 16:48:17 +02:00
twinaphex 74b5b8549e (RMenu) Drop ifndef for RMenu 2013-04-27 16:40:01 +02:00
twinaphex 19b8877e18 (RMenu )(Very glitchy) menu toggle 2013-04-27 16:22:26 +02:00
Themaister 767ad59857 Support disk append. 2013-04-27 15:49:29 +02:00
twinaphex 3dba1b2cb4 (RMenu) Menu pop/push stack refactors 2013-04-27 15:42:33 +02:00
twinaphex 28eaf7b128 (RARCH_CONSOLE) Build fix 2013-04-27 15:07:59 +02:00
twinaphex 3b2d41360c (RMenu) Initial 'doing menu toggle' without delay timers 2013-04-27 14:52:39 +02:00
Themaister f918191d3c Add basic disk swapping to RGUI. 2013-04-27 13:29:01 +02:00
Themaister 3bb7280b46 Can change libretro device on the fly. 2013-04-27 12:57:34 +02:00
Themaister 9e2392051d Refactor libretro device type handling.
Show devices in RGUI.
2013-04-27 12:32:30 +02:00
Hans-Kristian Arntzen 6871d42ee9 Merge pull request #189 from Themaister/joypad-autoconfig
Joypad autoconfig.
2013-04-27 01:07:20 -07:00
twinaphex 5f449fc870 (RMenu) Add Settings link to Quick Menu 2013-04-27 03:50:42 +02:00
Themaister f637a89423 Can toggle devices in run time on PC.
Drop some input options if set_keybinds isn't implemented. Only adds
confusion.
2013-04-27 00:37:20 +02:00
Themaister ac6c576d29 Drop dependency on delay_timer in RGUI. 2013-04-26 23:52:29 +02:00
Themaister 9a3875d99a Don't hardcode new delay timers in RGUI.
Delay timers are reset in driver.c.
2013-04-26 20:16:58 +02:00
Themaister 66a1c01419 Make device name show up in RGUI. 2013-04-26 00:22:12 +02:00
twinaphex 0addc6d885 (RMenu) Use proper extensions 2013-04-24 18:58:07 +02:00
twinaphex 34619412bc (RARCH_CONSOLE) Get rid of video_stop_func 2013-04-24 16:08:18 +02:00
twinaphex 1e22908756 (RGUI) Cleaner rotation label 2013-04-23 23:25:05 +02:00
twinaphex 36d34871fb (RMenu) Change ingame menu ordering to match RGUI's 2013-04-23 23:22:50 +02:00
twinaphex fa3da2eff4 (RMenu XUI) Fix build 2013-04-23 22:38:00 +02:00
twinaphex fda5db7476 (CONSOLE) Get rid of system_deinit_save and system_post_init 2013-04-23 01:55:00 +02:00
twinaphex e303156ffc (RMenu) Fix title at bootup 2013-04-22 22:25:57 +02:00
twinaphex 7a2c78ae68 Start unifying global init/deinit code for console 2013-04-22 22:16:46 +02:00
Themaister 911f782c50 Fix BB build. 2013-04-22 20:25:00 +02:00
Themaister 14f8291e57 Display core version in RGUI as well. 2013-04-22 20:16:26 +02:00
Themaister 7e4ef13520 Get core information when statically linked. 2013-04-22 20:10:22 +02:00
Themaister c146206d30 Allow game selection directly if core is set.
Don't require core to be loaded if it's found in g_settings.libretro.
2013-04-22 16:58:00 +02:00
Themaister 45357cabdf Fix version rendering in RGUI. 2013-04-21 18:56:17 +02:00
Themaister b40933ba3b Allow core selection to traverse directories.
Drop use of RGUI_FILE_DEVICE as it adds many extra special casing for no
real gain.
2013-04-21 18:22:28 +02:00
Themaister 1f96c5aeb3 Don't spam apply_state_changes in RGUI. 2013-04-21 15:43:14 +02:00
Themaister 96c0fbc8bc Fix #ifdef for fullscreen toggle. 2013-04-21 11:15:30 +02:00
Themaister bb36aecadb Fix MSVC 2010 build. 2013-04-21 10:05:26 +02:00
Themaister b3eca2bb68 Fix back button in Core Options. 2013-04-21 01:25:56 +02:00
Themaister 4681fe2578 Fix casing consistency. 2013-04-21 00:11:55 +02:00
Themaister 610f33962a Add fullscreen toggle to RGUI.
Drop hotkey handling. Needed to add delay timer hackery in that case.
2013-04-21 00:01:49 +02:00
Themaister 43dc80c430 Don't push a file list before settings.
Not really needed, and is a source for confusion.
2013-04-20 23:37:57 +02:00
Themaister 4f7d3b5ea0 Add custom viewport + integer scale mode. 2013-04-20 12:48:33 +02:00
Themaister 7120e5842d Add integer scale to RGUI. 2013-04-20 11:48:26 +02:00
Themaister be01a0ea59 Refactor aspect ratio handling.
Rework aspect ratio handling in RGUI.
Custom viewports work on PC. Ensure that aspect_ratio_idx persist
through reentrancy. Change ASPECT_RATIO_AUTO to ASPECT_RATIO_SQUARE to
better signal that it's the square pixel option.

Add ASPECT_RATIO_CONFIG as an option to use config file defined aspect
ratio.
2013-04-20 10:56:04 +02:00
twinaphex c68d3fd512 (RMenu) Reduce calls to browser_update 2013-04-20 00:47:21 +02:00
twinaphex 419620a49e (360) Add viewport hack for now so that XUI doesn't get
cut off depending on the viewport of the game
2013-04-19 23:22:58 +02:00
twinaphex 0f067fd093 (RMenu XUI) Start unwrapping macros 2013-04-19 21:50:19 +02:00
twinaphex dca93a406d (360) Improve menu_iterate_xui 2013-04-19 21:04:08 +02:00
twinaphex b7e71f17b8 (RMenu/RGUI) Move menu_iterate to upper-layer menu_common 2013-04-19 17:53:01 +02:00
twinaphex dd9e6029c2 (RMenu/RGUI) Make menu_iterate almost the same in both RGUI and RMenu - now we
can start moving it to the upper layer
2013-04-19 17:34:46 +02:00
twinaphex 2cef7466a8 (RMenu/RGUI) Don't set first delay timer 2013-04-19 00:52:37 +02:00
twinaphex 576aafd5e4 (360) Drop setting timer_delay on deinit: in rmenu_iterate 2013-04-19 00:32:13 +02:00
twinaphex a979cba13c (RMenu/RGUI) Standardization pt. 1 2013-04-18 23:00:27 +02:00
twinaphex 16a40af173 (RGUI) Move menu_stack code back into rgui.c 2013-04-18 22:22:25 +02:00
twinaphex fbb82177f3 (RMenu XUI) Build fix 2013-04-18 19:09:38 +02:00
twinaphex 24e3f0d2ee (RMenu/RGUI) Move DEVICE_NAV_* enums to menu_common.h 2013-04-18 19:08:17 +02:00
twinaphex 798f40b6a1 (RMenu/RMenu XUI) Move browser_update to upper-layer menu_common.c -
use same function for both RMenu and RMenu XUI
2013-04-18 19:05:43 +02:00
twinaphex 1f6d3a8610 (RMenu XUI) Build fix 2013-04-18 18:39:52 +02:00
twinaphex 96f2ecce20 (RMenu/RGUI) Move filebrowser/menu stack initialization to upper-layer
menu_init() function
2013-04-18 18:33:03 +02:00
twinaphex 5b35feddae (RMenu/RGUI) Free rgui and filebrowser in upper-layer menu_free() function 2013-04-18 17:29:04 +02:00
twinaphex bc4bd6b684 (RMenu XUI) Use rgui->browser 2013-04-18 17:27:11 +02:00
twinaphex d18e6d1315 (RMenu XUI) Don't use CXuiControl anymore 2013-04-18 17:18:34 +02:00
twinaphex 44661638b6 (RMenu XUI) Use m_controlnoslider directly 2013-04-18 16:52:30 +02:00
twinaphex c1f6f097df Use m_controlslist directly 2013-04-18 16:47:49 +02:00
twinaphex 3580d3fe67 (Rmenu XUI) Use m_list directly 2013-04-18 16:35:50 +02:00
twinaphex e3ee31cdb5 (RMenu XUI) Use m_settingslist directly 2013-04-18 16:26:46 +02:00
twinaphex 7b8709c61a (RMenu XUI) Use m_quickmenulist directly 2013-04-18 16:14:39 +02:00
twinaphex a6d7026cc5 (RMenu XUI) Use XuiTextElementSetText directly 2013-04-18 16:04:10 +02:00
twinaphex ca6e661663 (Rmenu XUI) Use XuiSceneNavigateForward 2013-04-18 15:48:13 +02:00
twinaphex b746d56e5c (RMenu XUI) Start using some non-OOP functions 2013-04-18 15:33:25 +02:00
twinaphex 0127f5eadd (RMenu/RGUI) menu_init - check for NULL return value and fail gracefully
if so
2013-04-18 15:14:19 +02:00
twinaphex ab5092d643 (RMenu XUI) Build fix 2013-04-18 15:11:28 +02:00
twinaphex a2fc2b1e4f (RMenu XUI) Use menu_common 2013-04-18 15:04:09 +02:00
twinaphex 7c4b730e51 (RMenu/RGUI) Move menu_init/menu_free to menu_common.c 2013-04-18 14:58:47 +02:00
Themaister 41573976b0 Fix ROM loading in RGUI.
menu_input_process() was skipped, so MODE_INIT wasn't set.
2013-04-18 09:44:47 +02:00
twinaphex 54725d009c (RMenu/RGUI) Use similar defines for menu 2013-04-18 02:48:18 +02:00
twinaphex 84f80dc2c1 (RMenu/RGUI) Create menu_common to tie RMenu/RGUI more closely together 2013-04-17 23:31:49 +02:00
twinaphex 161dd5741f (RGUI/RMenu) Standardize somewhat 2013-04-17 21:11:13 +02:00
twinaphex 99358421f1 (RMenu XUI) Don't increment g_extern.frame_count in
menu_iterate
2013-04-16 14:37:45 +02:00
twinaphex 892a8b1d48 (RMenu XUI) Take out msg_queue_pull in menu_iterate 2013-04-16 14:31:12 +02:00
Themaister a0f7a184fd Avoid potential segfaults if files are deleted.
Potentially, on a refresh, selection_ptr could be out of range
if files have been removed.
2013-04-16 12:32:03 +02:00
twinaphex 6f226c1c01 (RMenu) Drop msg_queue_pull from menu_iterate 2013-04-16 02:13:53 +02:00
Themaister 46f1374a27 Refactor selection_ptr push/pop logic.
Should make more sense now.
2013-04-16 01:53:07 +02:00
twinaphex c0deb826de (RMenu) Backport shader_manager_init to RMenu 2013-04-16 01:27:43 +02:00
twinaphex 909e1fadc8 (RMenu) Refactors - create rmenu_iterate - try to make
menu_iterate / menu_free / menu_init as much like RGUI as possible
2013-04-16 01:10:53 +02:00
twinaphex 71faee1d4d (RMenu) Fix logic error in applying CGP changes 2013-04-16 00:16:26 +02:00
Themaister 2c8ddeb109 Add gfx_shader_resolve_relative.
Translates relative paths (from CGP) into absolute paths,
suitable for loading files, and saving cgp some place else.
2013-04-15 23:48:25 +02:00
Themaister 4c15814bf7 Ensure that terminal doesn't get overflowed. 2013-04-14 23:27:15 +02:00
Themaister 2853e50aa2 Move Hardware Filtering to GEKKO ifdef. 2013-04-14 23:17:48 +02:00
Themaister 8c58ff191a Fix strange use of pointers in screenshot code. 2013-04-14 23:14:38 +02:00
Themaister 926707ae44 Avoid needless branch. 2013-04-14 23:05:25 +02:00
Themaister f8ac159fc2 Properly set RGUI shader struct on init.
Use g_settings.video.shader_path if configured.
2013-04-14 22:59:36 +02:00
Themaister 6373819a16 Use default shader type correctly.
Don't hardcode Cg as it's not supported everywhere.
2013-04-14 22:48:35 +02:00
Themaister c9a02273bb Check for fullscreen in RGUI. 2013-04-14 16:40:17 +02:00
Themaister 829840b415 Fallback in RGUI if libretro_path isn't set. 2013-04-14 16:34:42 +02:00
Themaister 5e45c31f06 Set selection_ptr when calling OPEN_FILEBROWSER. 2013-04-14 16:29:35 +02:00
twinaphex 6e56c552b4 (RMenu) Use g_settings.video.shader_path - properly set g_settings.video.shader_enable
based on return of video_set_shader_func - remove g_extern.file_state.cgp_path
2013-04-14 15:43:02 +02:00
twinaphex f9c383e86e (RMenu/XDK1) Fix some warnings 2013-04-14 14:59:36 +02:00
twinaphex c1f6b80be9 (RMenu) Draw menu panel for currently selected Core option 2013-04-14 12:52:39 +02:00
Themaister ca5ff43b6f Add default filtering option to RGUI. 2013-04-14 01:45:33 +02:00
Themaister 241d55ccbf Add CGP preset load to RGUI. 2013-04-14 01:27:13 +02:00
twinaphex 23fff4cb9d (RMenu) Xbox build fix 2013-04-13 23:51:13 +02:00
twinaphex 0fa54e6db0 (RMenu) Need to call set_texture_frame when menu texture changes as well 2013-04-13 22:43:59 +02:00
twinaphex b006f01029 (RMenu) Do set_texture_frame only once in menu_init - solves busy loop
problem with XMB overlay
2013-04-13 22:38:57 +02:00
twinaphex 08f5ee4dc0 (RMenu) Shader Manager build fix 2013-04-13 22:20:02 +02:00
twinaphex 4586b12173 (RMenu) Fix Shader Manager bug 2013-04-13 22:07:20 +02:00
twinaphex e575e3acc7 (RMenu) Pop menu behavior management 2013-04-13 21:40:48 +02:00
twinaphex 16c984b5e0 (RMenu) Cleanups 2013-04-13 19:13:00 +02:00
twinaphex a7a4b071c4 (RMenu) Cleanups to select_setting 2013-04-13 18:56:05 +02:00
twinaphex a4ae3f0679 (RMenu) Don't use item struct anymore 2013-04-13 18:47:42 +02:00
twinaphex 5a7f6b4471 (RMenu) Less verbose help messages, less clutter 2013-04-13 18:10:39 +02:00
twinaphex 1485da361b (RMenu XUI) Build fix 2013-04-13 17:07:47 +02:00
twinaphex 6824617031 (XDK1/RMenu) Build fix 2013-04-13 17:00:46 +02:00
twinaphex e9fb07e352 (RMenu) ifndef HW_TEXTURE_FILTER so that Hardware Filtering only appears
for devices with fixed-function GPUs
2013-04-13 16:53:58 +02:00
Themaister c17714ffbb Add full screen mode to set_texture_enable. 2013-04-13 16:49:25 +02:00
twinaphex 53d5678b85 (RMenu) Take out RMENU_LOW_RAM_MODE 2013-04-13 16:32:40 +02:00
twinaphex 34a66a45ea (RMenu) Only set y member of menu_panel 2013-04-13 15:53:44 +02:00
twinaphex 6b01ce78cc (XDK1) Reduce menu image to 320x240 and upscale to 640x480 -
to hell with how this looks - it saves over 2MB of RAM - you
try and justify that over stupid eye candy on an outdated
console and I'll call you a damn fool
2013-04-13 15:19:57 +02:00
twinaphex 6b94b53bfc (XDK1) Reduced size of menu panel PNG - SFA3 now fits into RAM 2013-04-13 14:55:11 +02:00
Themaister e389220df8 Refactor frame_counter.
Graphics drivers get the task of updating this.
If threaded driver is used, main thread cannot update the counter
due to race conditions.
2013-04-13 14:28:12 +02:00
twinaphex c51347c532 Drop MODE_VIDEO_SCREENSHOTS_ENABLE 2013-04-13 09:09:56 +02:00
ToadKing 4782522dbd (WII) fix RGUI controls
(CONSOLES) fix logging
2013-04-12 09:19:02 -04:00
twinaphex 0ef62f24c4 (360 RMenu XUI) Cleanups 2013-04-12 15:03:31 +02:00
twinaphex d53d92967c (360 RMenu XUI) Works now with refactored filebrowser
code
2013-04-12 14:23:25 +02:00
twinaphex 2b3334fc23 (RMenu) use memcpy/memset to copy over/flush from one struct to another
(for pop_menu_stack/push_menu_stack purposes)
2013-04-12 12:41:49 +02:00
twinaphex f8a040e286 (Filebrowser) Refactor filebrowser - get rid of second filebrowser
instance in rmenu.c
2013-04-12 12:25:36 +02:00
twinaphex 345a9c77e8 (Filebrowser) Don't expose filebrowser_get_current_path function 2013-04-12 10:33:55 +02:00
twinaphex 54ec513e7e (Filebrowser) Cleanup to directory_parse 2013-04-12 10:07:47 +02:00
twinaphex 8d8abcbdc5 (RMenu XUI) Move to new filebrowser dir popping logic 2013-04-12 09:58:16 +02:00
twinaphex 4e188a0e00 (Wii/RGUI) Take out QUIT_KEY button combo shortcuts - current
RGUI works such that it goes directly into the ingame menu
after pressing menu toggle and you can quit from there.
2013-04-12 09:28:12 +02:00
Themaister 97095852f0 Should fix Wii and shader manager. 2013-04-12 09:08:07 +02:00
ToadKing ded105746c fix RGUI file browser 2013-04-11 21:00:13 -04:00
twinaphex e75ed86fde (Filebrowser) Cleanups 2013-04-12 00:27:00 +02:00
twinaphex 459a371982 (RMenu) Slimmer filebrowser dir popping 2013-04-12 00:16:23 +02:00
twinaphex 9d53311e33 (Filebrowser) Get rid of unnecessary filebrowser_init 2013-04-11 23:00:01 +02:00
twinaphex 30e190bdae Remove superfluous wcstombs / mbstowcs wrappers 2013-04-11 17:18:23 +02:00
twinaphex 74edbf7339 (RMenu XUI / 360) Made RMenu XUI independent of MODE_MENU_DRAW - MODE_MENU_DRAW
removed
2013-04-11 16:38:41 +02:00
Themaister 91c8fea8e9 Fix crash in shader browser. 2013-04-11 16:15:09 +02:00
Themaister aebb2cb52e Add initial GLSL loading in RGUI. 2013-04-11 16:15:09 +02:00
twinaphex a49fe27d21 (GX) Make Wii/Gamecube gx_video no longer depend on MODE_MENU_DRAW 2013-04-11 16:10:09 +02:00
twinaphex 7bb9f0d288 (RMenu) No longer rely on MODE_MENU_DRAW 2013-04-11 15:29:43 +02:00
twinaphex ea969282f4 (XDK1 RMenu) Don't call texture_image_render for panel anymore in rmenu.c 2013-04-11 15:05:42 +02:00
twinaphex 0f60833cac (RMenu) Do video rendering in RMenu after input - same as RGUI - will also
avoid having to 'skip' video swap when doing the render cached
frame call
2013-04-11 15:00:58 +02:00
twinaphex 8c777110f7 (RMenu) Run glClear or equivalent function at start of driver_frame function
so that we can use rarch_render_cached_frame for menu purposes at
all times (instead of doing explicit clearing in our menu loops
beforehand for low-RAM modes where no menu texture is being drawn
but we don't want ghosting in the picture)
2013-04-11 13:42:02 +02:00
twinaphex 1171b7576a Get rid of set_blend callback - the rgui draw texture function is
now in charge of making sure texture is properly blended - note
to OV2/maister - test if this breaks D3D9 PC driver and if so
fix accordingly
2013-04-11 13:13:37 +02:00
Themaister acd3b481be Let RGUI CGP be used across driver reinit. 2013-04-10 21:04:28 +02:00
twinaphex 2c29884d7d (RMenu) Don't break menu stack when shortcut exiting from screenshot mode 2013-04-10 19:12:25 +02:00
twinaphex 37b90574ac (PS3 RMenu) Fullblown shader manager support - still unsure whether
I'm setting FBO values right though - maister - please code review
the FBO scaling incrementing/decrementing logic
2013-04-10 15:57:36 +02:00
twinaphex adbfa4af90 (RMenu) Get rid of checks for main_is_init (for load/save CGP) 2013-04-10 13:24:56 +02:00
twinaphex 872c0a8133 (RMenu XDK1) Build fix 2013-04-10 13:24:27 +02:00
twinaphex ad31643b51 (PS3 RMenu) Add initial options to Shader Manager - Load CGP function
works
2013-04-10 13:17:01 +02:00
twinaphex c52530d03e (RMenu) Stub Shader Manager menu in - now to fill it in 2013-04-10 11:20:28 +02:00
twinaphex 4c0da898ae (RMenu) Simplify some more lengthy strings that won't fit on 640x480
screen
2013-04-10 10:20:27 +02:00
twinaphex 65bc6850d5 (RMenu) shorter descriptions so that they fit on Xbox 1 resolution 2013-04-10 10:15:03 +02:00
twinaphex a871b6da54 (XDK) Remove texture_image_free - will have to manually do freeing
memory management without a public function for Xbox
2013-04-10 09:59:29 +02:00
twinaphex de31ccef3e Revert "(XDK1 RMenu) Free up tmpBrowser for every switch between game and menu as well"
This reverts commit 4fa02a1952.
2013-04-10 09:57:13 +02:00
twinaphex 4fa02a1952 (XDK1 RMenu) Free up tmpBrowser for every switch between game and menu as well 2013-04-10 09:49:04 +02:00
twinaphex c0f9c0dc6f (RMenu) Get casts working for C99 as well - argh 2013-04-10 09:48:56 +02:00
twinaphex 9cabedca58 (RMenu) C++98 compatibility casts 2013-04-10 09:46:52 +02:00
twinaphex 5f24e5daf4 (RMenu) Put menu_texture and menu_panel textures on heap - free
them for Xbox 1 after going out of the menu and into the game
2013-04-10 09:34:46 +02:00
twinaphex 22ce22ca14 (360) Take out obsolete resampler type option 2013-04-10 07:55:59 +02:00
twinaphex 87d0843b13 (360) RMenu XUI now goes through the same RGUI functions for
rendering
2013-04-10 07:47:11 +02:00
twinaphex 9d6f4590e8 (RMenu XDK1) Updated RMenu for Xbox 1 to use new
RGUI/RMenu rendering funtions
2013-04-10 06:54:16 +02:00
twinaphex d313e9b8f9 (PS3 RMenu) RMenu now renders background texture the same way
as RGUI
2013-04-10 06:22:37 +02:00
twinaphex 7cf75e5eb4 SETTING_EMU_SKIN action was mistakenly inside a HAVE_SHADER_MANAGER
ifdef
2013-04-10 04:57:49 +02:00
twinaphex af5dcd106a (XDK1 RMenu) Show panel again even in low RAM mode 2013-04-10 04:54:22 +02:00
twinaphex 80390d8143 (XDK1 RMenu) Build fixes 2013-04-10 04:51:36 +02:00
twinaphex 43c9195a77 Get rid of rarch_position_t structure and move RMenu texture to
rmenu.c instead of somewhere in g_extern global
2013-04-10 04:26:18 +02:00
twinaphex 7728e80e0f (RMenu) Get rid of messy set_default_pos functions 2013-04-10 01:34:40 +02:00
twinaphex 6a87900f1a (RMenu) Use HAVE_SHADER_MANAGER define for RMenu now as well 2013-04-10 00:47:14 +02:00
Themaister 37a276af9b Load RGUI CGP on startup. 2013-04-09 21:48:03 +02:00
Themaister d2f9eb300b Clarify error message. 2013-04-09 21:41:38 +02:00
Themaister a8f2317400 Can apply shaders in RGUI.
Kinda hoky, but basics seem to be down now.
2013-04-09 21:39:02 +02:00
Themaister fc353f0582 Pop menu stack correctly after picking shader. 2013-04-09 21:23:34 +02:00
Themaister 16b8bff6a7 Can browse for shader files.
Directory stack is not popped correctly however.
Pathnames are not correctly truncated in browser either. Looks kinda
ugly atm.
2013-04-09 21:01:43 +02:00
Themaister fdf7a443ad More work on shader manager.
Mostly missing filebrowser for shaders now.
2013-04-09 19:43:24 +02:00
twinaphex b91527749e (RMenu) Some RMenu fixes - deal with overflow on 'pressed up'
state in core options menu along with some other things
2013-04-09 09:58:26 +02:00
twinaphex 6a845dec64 (RMenu) Fix - Pops menu stack for a submenu - hack - needs a cleaner implementation 2013-04-09 09:16:23 +02:00
twinaphex 56de3696d0 (RMenu) Initial core options working - only FBA core currently shows
'extra garbage' characters when updating a specific option -
"CPU Speed Overclock; 100%|110%|120%|130%|140%" etc - doesn't
happen in RGUI - could be the percentage sign
2013-04-09 08:55:54 +02:00
twinaphex 99945f43a6 (RGUI) Fix RGUI 'Core' setting 2013-04-08 01:51:39 +02:00
twinaphex 035e9d2624 (RGUI) Fix RGUI actions 2013-04-07 23:43:07 +02:00
twinaphex c57b8f26a6 (RGUI) Fix 'Change Game' in RGUI 2013-04-07 23:39:52 +02:00
twinaphex 6f7b38221e (RGUI) Compile in Shader Manager as well for GLSL and HLSL 2013-04-07 23:24:24 +02:00
twinaphex b02e9f374c (RMenu) Further implement ingame_menu_core_options 2013-04-07 19:21:20 +02:00
Themaister b62a2b602a More work on RGUI shader manager.
Still a long way to go, but shows most of the intended interface.
2013-04-07 16:45:05 +02:00
Themaister 651e088deb Start adding skeleton for shader manager. 2013-04-07 15:46:36 +02:00
Themaister a5722aef3a Fix RGUI rewind setting. 2013-04-07 15:15:16 +02:00
Themaister 4cdfcf30d5 Refactor set_rgui_texture.
More generic and avoids poking directly into RGUI state.
2013-04-07 14:07:45 +02:00
twinaphex 3b82e779fe (RMenu) Implement stub Core Options menu - real implementation
tomorrow
2013-04-07 08:30:30 +02:00
twinaphex b430ded254 (RMenu/Xbox 1) Hardcode some positioning values 2013-04-07 05:20:19 +02:00
twinaphex 4102d1cfb8 Make sinc resampler the default and remove Hermite - audio
quality at high samplerates was too bad to be of any use
2013-04-07 03:41:06 +02:00
twinaphex 229891db59 (360) Build fix 2013-04-07 03:00:08 +02:00
twinaphex 15eba51b22 (PS3) Get it at least compiling 2013-04-07 02:34:41 +02:00
twinaphex 909122122d Take out obsolete console-style overscan options - just use
Resize Mode instead
2013-04-07 01:23:10 +02:00
twinaphex 69c460bbec (RMenu) Set 'selected' to FIRST_VIDEO_SETTING after selecting 'Change Game'
in Ingame Menu
2013-04-07 00:31:12 +02:00
twinaphex 81896840f0 (RMenu) Remove ingame_menu function / make it part of select_setting 2013-04-06 23:49:28 +02:00
twinaphex 2ab049fd05 (Xbox 1) Addendum to 'always load panel' prior commit 2013-04-06 23:17:50 +02:00
twinaphex ff19ff671d (Xbox 1) Panel should always be loaded regardless of low RAM mode 2013-04-06 23:13:35 +02:00
twinaphex bb0821b514 Remove screenshots_dir and cgp_dir from default_paths - cgp_dir
is now the same as shaders_dir
2013-04-06 22:37:07 +02:00
twinaphex bcbac5aac7 (RARCH_CONSOLE) Remove shader_dir from default_paths struct 2013-04-06 22:16:12 +02:00
twinaphex cc05981455 (PS3/360) Now uses embedded shaders instead of stock shader from
common-shaders
2013-04-06 21:53:03 +02:00
twinaphex ec0e3e6087 (RMenu) Remove RMenu screenshot_dump function pointer - implement
screenshot_dump instead for XDK1
2013-04-06 18:14:06 +02:00
twinaphex 1c5144f9bd (RMenu) Move RMenu logic out of graphics driver context files 2013-04-06 17:44:07 +02:00
twinaphex a2d9129782 Kill off set_fbo_state and get_fbo_state function pointers 2013-04-06 06:21:11 +02:00
twinaphex f94ddb2eab (RMenu) Remove now redundant enum ID 2013-04-06 05:58:26 +02:00
twinaphex eb0feac9e3 (PS3/All) Purge fixed-style shaders again - this time avoiding
breakage on PS3. Maister -you will need to redo shader_parse.c
again though - and this time I need to test it on PS3 to avoid
a regression that happened two pages prior again
2013-04-06 05:46:09 +02:00
twinaphex 4f1cd6a5ee Revert "(PS3) Remove fixed shader slots"
This reverts commit f58a038a5f.
2013-04-06 03:54:57 +02:00
twinaphex cbb300f863 Revert "(RMenu XUI) Take out fixed second pass shader slot"
This reverts commit a61437c3db.
2013-04-06 03:54:47 +02:00
twinaphex cbfe5ff111 Revert "More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,"
This reverts commit 7155dd9ca9.
2013-04-06 03:53:57 +02:00
twinaphex 09c123859d Revert "(RMenu) take out no longer used HAVE_FBO ifdef"
This reverts commit 5f6601ac7e.
2013-04-06 03:53:18 +02:00
twinaphex 5f6601ac7e (RMenu) take out no longer used HAVE_FBO ifdef 2013-04-06 00:24:11 +02:00
twinaphex 7155dd9ca9 More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,
etc
2013-04-06 00:16:10 +02:00
twinaphex a61437c3db (RMenu XUI) Take out fixed second pass shader slot 2013-04-06 00:03:09 +02:00
twinaphex f58a038a5f (PS3) Remove fixed shader slots 2013-04-05 23:58:30 +02:00
Themaister cf92211254 Update overlay when in RGUI. 2013-04-04 23:10:38 +02:00
Themaister 7c3e4ef12d Fix unsigned bug in RGUI. 2013-04-04 22:27:16 +02:00
Themaister d7797f8497 Core options work in RGUI. 2013-04-04 22:08:23 +02:00
Themaister 435eec44f0 Start adding core options to RGUI.
Broken atm.
2013-04-04 21:48:09 +02:00
Themaister 262b867ae0 Update MSVC2010 build.
Add RGUI, add folder query for Windows, fix GL HW render bug.
2013-04-04 20:25:41 +02:00
twinaphex 896d5d66d6 (RGUI) Add 'Change Game' option to RGUI Settings 2013-04-04 04:56:04 +02:00
twinaphex 52d6c0158f (RMenu) Fixes INGAME_MENU_CHANGE_GAME 2013-04-01 09:53:31 +02:00
twinaphex f5667f0297 (RMenu) Fixed 'Change Game' action 2013-04-01 09:38:16 +02:00
twinaphex 5d3949c610 (RMenu) Rewritten ingame menu 2013-04-01 09:18:30 +02:00
twinaphex 6f8a008d1b (RMenu) Change menu labels 2013-04-01 06:31:17 +02:00
twinaphex 684197ee77 (RGUI) Sets and resets MODE_MENU_INGAME flag for whenever we go
in and out of Settings
2013-03-31 06:15:56 +02:00
twinaphex 241ed9286a (RGUI) Menu toggle now goes to 'Settings' screen by default when
already ingame - will make the 'home screen' configurable to either
filebrowser or settings menu later on
2013-03-31 06:04:32 +02:00
twinaphex d2521204a0 (RMenu) Change 'Return to menu' to 'Change game' 2013-03-31 01:47:00 +01:00
twinaphex 57b4de45a3 (RMenu) Can now use L3 + R3 to exit ingame menu 2013-03-30 19:56:16 +01:00
twinaphex 43a4979dc9 (360) RMenu XUI build fix 2013-03-30 08:16:58 +01:00
twinaphex 58a98e3043 (GX RGUI) Resolution additions for Wii - by request 2013-03-30 05:38:22 +01:00
twinaphex 426b3a255d Revert "(PS3) Add third-pass shaders (ifdeffed for PS3 for now - could" -
going to do this better

This reverts commit 8b4e6bed93.
2013-03-29 01:55:08 +01:00
twinaphex 8b4e6bed93 (PS3) Add third-pass shaders (ifdeffed for PS3 for now - could
be added to PC as well)
2013-03-28 20:59:49 +01:00
twinaphex fa80fbf5bb (RMenu) select_setting - cleanups 2013-03-26 15:26:16 +01:00
twinaphex d58122c655 (RMenu) select_setting refactor pt. 2 - don't put array of struct
on heap anymore
2013-03-26 15:15:38 +01:00
twinaphex 32791fe59c (RMenu) Refactor of select_setting 2013-03-26 15:06:08 +01:00
twinaphex 7d9ca5bf6a (RMenu) Rewrite select_setting 2013-03-26 08:15:48 +01:00
twinaphex 0fb415fa82 (RMenu) Move pressed_down/pressed_up logic inside for loop - select_settings 2013-03-26 00:23:05 +01:00
twinaphex d1b691a696 (RMenu) Take input states out of rmenu_state 2013-03-25 22:37:40 +01:00
twinaphex f0794daa34 (RMenu) Pass input states by value instead of by reference 2013-03-25 22:31:09 +01:00
twinaphex 9b893e2154 (RMenu) More cleanups pt. 2 2013-03-25 21:55:42 +01:00
twinaphex afda4b1a63 (RMenu) More cleanups 2013-03-25 21:24:51 +01:00
twinaphex 8568246454 (RMenu) Clean up init_filebrowser and free_filebrowser - make part of
RMenu
2013-03-25 21:01:04 +01:00