frontend: fix screenshot functionality for pollux

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 0a9bed6..aaf1bb0 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -20,12 +20,14 @@
 #include "plugin_lib.h"
 #include "pcnt.h"
 #include "menu.h"
+#include "plat.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "common/plat.h"
-#include "common/input.h"
 #include "common/readpng.h"
+#include "common/input.h"
+#include "linux/in_evdev.h"
 
 // don't include debug.h - it breaks ARM build (R1 redefined)
 void StartDebugger();
@@ -34,7 +36,6 @@ void StopDebugger();
 int ready_to_go;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
-static char *(*real_getenv)(const char *name);
 int state_slot;
 enum sched_action emu_action, emu_action_old;
 char hud_msg[64];
@@ -221,19 +222,6 @@ do_state_slot:
 
 int main(int argc, char *argv[])
 {
-       void *tmp;
-
-       tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
-       if (tmp == NULL)
-               tmp = dlopen("/lib32/libdl.so.2", RTLD_LAZY);
-       if (tmp != NULL)
-               real_getenv = dlsym(tmp, "getenv");
-       if (real_getenv == NULL) {
-               fprintf(stderr, "%s\n", dlerror());
-               return 1;
-       }
-       dlclose(tmp);
-
        // what is the name of the config file?
        // it may be redefined by -cfg on the command line
        strcpy(cfgfile_basename, "pcsx.cfg");
@@ -327,10 +315,12 @@ int main(int argc, char *argv[])
 
        // frontend stuff
        in_init();
+       in_evdev_init();
        //in_probe();
        plat_init();
        menu_init(); // loads config
        pl_init();
+       plat_rescan_inputs();
 
        if (psxout)
                Config.PsxOut = 1;
@@ -658,20 +648,6 @@ void ClosePlugins() {
        }
 }
 
-#if 1
-/* this is to avoid having to hack every plugin to stop using $HOME */
-char *getenv(const char *name)
-{
-       static char ret[8] = ".";
-
-       if (name && strcmp(name, "HOME") == 0 &&
-                       ((int)name >> 28) == 0) // HACK: let libs find home
-               return ret;
-
-       return real_getenv(name);
-}
-#endif
-
 /* we hook statically linked plugins here */
 static const char *builtin_plugins[] = {
        "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad",