mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup menu_common.h

Browse Source
This commit is contained in:
twinaphex 2014-05-31 16:48:07 +02:00
parent cc08dd30d9
commit b4256ac0ed
3 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
driver.h
View File

@ -31,6 +31,7 @@
#include "input/overlay.h" #include "input/overlay.h"
#include "frontend/frontend_context.h" #include "frontend/frontend_context.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif

17
frontend/menu/menu_common.c
View File

@ -14,24 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <ctype.h>
#include "menu_common.h" #include "menu_common.h"
#include "menu_navigation.h"
#include "../../gfx/gfx_common.h"
#include "../../performance.h"
#include "../../driver.h"
#include "../../file.h"
#include "../../file_ext.h"
#include "../../input/input_common.h"
#include "../../input/keyboard_line.h"
#include "../../compat/posix_string.h"
void menu_update_system_info(void *data, bool *load_no_rom) void menu_update_system_info(void *data, bool *load_no_rom)
{ {

45
frontend/menu/menu_common.h
View File

@ -17,29 +17,30 @@
#ifndef MENU_COMMON_H__ #ifndef MENU_COMMON_H__
#define MENU_COMMON_H__ #define MENU_COMMON_H__
#include "../../general.h" #include <stdint.h>
#include "../info/core_info.h" #include <stddef.h>
#include <stdlib.h>
#ifdef HAVE_RGUI #include <string.h>
#define MENU_TEXTURE_FULLSCREEN false #include <ctype.h>
#else
#define MENU_TEXTURE_FULLSCREEN true
#endif
#include "../../boolean.h" #include "../../boolean.h"
#include "../../general.h"
#ifdef __cplusplus #include "menu_navigation.h"
extern "C" { #include "../info/core_info.h"
#endif
#include "file_list.h" #include "file_list.h"
#include "history.h"
#include "../../input/input_common.h"
#include "../../input/keyboard_line.h"
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
#define HAVE_SHADER_MANAGER #define HAVE_SHADER_MANAGER
#include "../../gfx/shader_parse.h" #include "../../gfx/shader_parse.h"
#endif #endif
#include "history.h" #ifdef HAVE_RGUI
#define MENU_TEXTURE_FULLSCREEN false
#else
#define MENU_TEXTURE_FULLSCREEN true
#endif
#ifndef GFX_MAX_SHADERS #ifndef GFX_MAX_SHADERS
#define GFX_MAX_SHADERS 16 #define GFX_MAX_SHADERS 16
@ -49,6 +50,16 @@ extern "C" {
#define RGUI_SETTINGS_CORE_OPTION_NONE 0xffff #define RGUI_SETTINGS_CORE_OPTION_NONE 0xffff
#define RGUI_SETTINGS_CORE_OPTION_START 0x10000 #define RGUI_SETTINGS_CORE_OPTION_START 0x10000
#define RGUI_MAX_BUTTONS 32
#define RGUI_MAX_AXES 32
#define RGUI_MAX_HATS 4
#define RGUI_KEYBOARD_BIND_TIMEOUT_SECONDS 5
#ifdef __cplusplus
extern "C" {
#endif
typedef enum typedef enum
{ {
RGUI_FILE_PLAIN, RGUI_FILE_PLAIN,
@ -79,9 +90,6 @@ typedef enum
RGUI_ACTION_NOOP RGUI_ACTION_NOOP
} rgui_action_t; } rgui_action_t;
#define RGUI_MAX_BUTTONS 32
#define RGUI_MAX_AXES 32
#define RGUI_MAX_HATS 4
struct rgui_bind_state_port struct rgui_bind_state_port
{ {
bool buttons[RGUI_MAX_BUTTONS]; bool buttons[RGUI_MAX_BUTTONS];
@ -97,7 +105,6 @@ struct rgui_bind_axis_state
int16_t locked_axes[RGUI_MAX_AXES]; int16_t locked_axes[RGUI_MAX_AXES];
}; };
#define RGUI_KEYBOARD_BIND_TIMEOUT_SECONDS 5
struct rgui_bind_state struct rgui_bind_state
{ {
struct retro_keybind *target; struct retro_keybind *target;