X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=868a486a1a74b10698d441ec51ed381548743dcd;hb=44e76f8ad4944acfc109baf89beda7b723f8a209;hp=ee60df6f96c070cd58d6c8c2951e355a2e0e98b4;hpb=a830538149ed1216279407c85061b9937444ad1c;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index ee60df6f..868a486a 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -9,6 +9,11 @@
  */
 
 #define _GNU_SOURCE 1
+#ifdef __FreeBSD__
+#define STAT stat
+#else
+#define STAT stat64
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -36,7 +41,6 @@
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../plugins/dfinput/externals.h"
 #include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
 #include "arm_features.h"
@@ -215,7 +219,7 @@ static int optional_cdimg_filter(struct dirent **namelist, int count,
 	const char *ext, *p;
 	char buf[256], buf2[256];
 	int i, d, ret, good_cue;
-	struct stat64 statf;
+	struct STAT statf;
 	FILE *f;
 
 	if (count <= 1)
@@ -264,7 +268,7 @@ static int optional_cdimg_filter(struct dirent **namelist, int count,
 					p = buf2;
 
 				snprintf(buf, sizeof(buf), "%s/%s", basedir, p);
-				ret = stat64(buf, &statf);
+				ret = STAT(buf, &statf);
 				if (ret == 0) {
 					rm_namelist_entry(namelist, count, p);
 					good_cue = 1;
@@ -313,11 +317,13 @@ static void menu_sync_config(void)
 	switch (in_type_sel1) {
 	case 1:  in_type[0] = PSE_PAD_TYPE_ANALOGPAD; break;
 	case 2:  in_type[0] = PSE_PAD_TYPE_NEGCON;    break;
+	case 3:  in_type[0] = PSE_PAD_TYPE_NONE;      break;
 	default: in_type[0] = PSE_PAD_TYPE_STANDARD;
 	}
 	switch (in_type_sel2) {
 	case 1:  in_type[1] = PSE_PAD_TYPE_ANALOGPAD; break;
 	case 2:  in_type[1] = PSE_PAD_TYPE_NEGCON;    break;
+	case 3:  in_type[1] = PSE_PAD_TYPE_NONE;      break;
 	default: in_type[1] = PSE_PAD_TYPE_STANDARD;
 	}
 	if (in_evdev_allow_abs_only != allow_abs_only_old) {
@@ -540,7 +546,7 @@ static int menu_do_last_cd_img(int is_get)
 {
 	static const char *defaults[] = { "/media", "/mnt/sd", "/mnt" };
 	char path[256];
-	struct stat64 st;
+	struct STAT st;
 	FILE *f;
 	int i, ret = -1;
 
@@ -563,7 +569,7 @@ static int menu_do_last_cd_img(int is_get)
 out:
 	if (is_get) {
 		for (i = 0; last_selected_fname[0] == 0
-		       || stat64(last_selected_fname, &st) != 0; i++)
+		       || STAT(last_selected_fname, &st) != 0; i++)
 		{
 			if (i >= ARRAY_SIZE(defaults))
 				break;
@@ -588,7 +594,7 @@ static void parse_str_val(char *cval, const char *src)
 
 static void keys_load_all(const char *cfg);
 
-static int menu_load_config(int is_game)
+int menu_load_config(int is_game)
 {
 	char cfgfile[MAXPATHLEN];
 	int i, ret = -1;
@@ -1204,6 +1210,7 @@ static const char *men_in_type_sel[] = {
 	"Standard (SCPH-1080)",
 	"Analog (SCPH-1150)",
 	"GunCon",
+	"None",
 	NULL
 };
 static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change.";
@@ -1257,7 +1264,7 @@ static const char *men_soft_filter[] = { "None",
 #endif
 	NULL };
 static const char *men_dummy[] = { NULL };
-static const char *men_centering[] = { "Auto", "Ingame", "Force", NULL };
+static const char *men_centering[] = { "Auto", "Ingame", "Borderless", "Force", NULL };
 static const char h_scaler[]    = "int. 2x  - scales w. or h. 2x if it fits on screen\n"
 				  "int. 4:3 - uses integer if possible, else fractional";
 static const char h_cscaler[]   = "Displays the scaler layer, you can resize it\n"
@@ -2696,8 +2703,6 @@ void menu_prepare_emu(void)
 		if (ret)
 			fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
 	}
-
-	dfinput_activate();
 }
 
 void menu_update_msg(const char *msg)