X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=58c67d27a850790001fbdbe0a8a329b90d78d10f;hp=17ed79a98e107782083f31a8e28f07669a43e481;hb=056d67598872b0bac092878972633d6c10aa0ad6;hpb=c89cd762a63a78e30a59955e705e29ff3d5ae3b8

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 17ed79a9..58c67d27 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010
+ * (C) notaz, 2010-2011
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -22,19 +23,18 @@
 #include "common/input.h"
 #include "omap.h"
 #include "menu.h"
+#include "main.h"
 #include "pcnt.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../libpcsxcore/psemu_plugin_defs.h"
 
 void *pl_fbdev_buf;
 int pl_frame_interval;
-int keystate;
+int in_type, in_keystate, in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
 static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
 static float vsps_cur;
-static int plugin_skip_advice;
-// P.E.Op.S.
-extern int UseFrameSkip;
-extern float fps_skip;
+static int vsync_usec_time;
 
 static int get_cpu_ticks(void)
 {
@@ -56,6 +56,12 @@ static int get_cpu_ticks(void)
 	return ret;
 }
 
+static void print_hud(void)
+{
+	if (pl_fbdev_bpp == 16)
+		pl_text_out16(2, pl_fbdev_h - 10, "%s", hud_msg);
+}
+
 static void print_fps(void)
 {
 	if (pl_fbdev_bpp == 16)
@@ -96,8 +102,11 @@ void *pl_fbdev_flip(void)
 	flip_cnt++;
 
 	if (pl_fbdev_buf != NULL) {
-		if (g_opts & OPT_SHOWFPS)
+		if (hud_msg[0] != 0)
+			print_hud();
+		else if (g_opts & OPT_SHOWFPS)
 			print_fps();
+
 		if (g_opts & OPT_SHOWCPU)
 			print_cpu_usage();
 	}
@@ -109,8 +118,18 @@ void *pl_fbdev_flip(void)
 
 int pl_fbdev_open(void)
 {
+	struct timeval now;
+
 	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
 	omap_enable_layer(1);
+
+	// try to align redraws to vsync
+	vout_fbdev_wait_vsync(layer_fb);
+	gettimeofday(&now, 0);
+	vsync_usec_time = now.tv_usec;
+	while (vsync_usec_time >= pl_frame_interval)
+		vsync_usec_time -= pl_frame_interval;
+
 	return 0;
 }
 
@@ -119,18 +138,38 @@ void pl_fbdev_close(void)
 	omap_enable_layer(0);
 }
 
+void *pl_prepare_screenshot(int *w, int *h, int *bpp)
+{
+	*w = pl_fbdev_w;
+	*h = pl_fbdev_h;
+	*bpp = pl_fbdev_bpp;
+
+	return pl_fbdev_buf;
+}
+
 static void update_input(void)
 {
 	int actions[IN_BINDTYPE_COUNT] = { 0, };
+	unsigned int emu_act;
 
 	in_update(actions);
-	if (actions[IN_BINDTYPE_EMU] & PEV_MENU)
-		stop = 1;
-	keystate = actions[IN_BINDTYPE_PLAYER12];
+	if (in_type == PSE_PAD_TYPE_ANALOGPAD)
+		in_update_analogs();
+	emu_act = actions[IN_BINDTYPE_EMU];
+	if (emu_act) {
+		int which = 0;
+		for (; !(emu_act & 1); emu_act >>= 1, which++)
+			;
+		emu_act = which;
+	}
+	emu_set_action(emu_act);
+
+	in_keystate = actions[IN_BINDTYPE_PLAYER12];
 
 #ifdef X11
-	extern int x11_update_keys(void);
-	keystate |= x11_update_keys();
+	extern int x11_update_keys(unsigned int *action);
+	in_keystate |= x11_update_keys(&emu_act);
+	emu_set_action(emu_act);
 #endif
 }
 
@@ -153,7 +192,7 @@ void pl_frame_limit(void)
 	static struct timeval tv_old, tv_expect;
 	static int vsync_cnt_prev;
 	struct timeval now;
-	int diff;
+	int diff, usadj;
 
 	vsync_cnt++;
 
@@ -175,6 +214,12 @@ void pl_frame_limit(void)
 		tv_old = now;
 		if (g_opts & OPT_SHOWCPU)
 			tick_per_sec = get_cpu_ticks();
+
+		if (hud_new_msg > 0) {
+			hud_new_msg--;
+			if (hud_new_msg == 0)
+				hud_msg[0] = 0;
+		}
 	}
 #ifdef PCNT
 	static int ya_vsync_count;
@@ -190,6 +235,11 @@ void pl_frame_limit(void)
 		//printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
 		tv_expect = now;
 		diff = 0;
+		// try to align with vsync
+		usadj = vsync_usec_time;
+		while (usadj < tv_expect.tv_usec - pl_frame_interval)
+			usadj += pl_frame_interval;
+		tv_expect.tv_usec = usadj;
 	}
 
 	if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {
@@ -198,11 +248,11 @@ void pl_frame_limit(void)
 		usleep(diff - pl_frame_interval / 2);
 	}
 
-	plugin_skip_advice = 0;
-	if (UseFrameSkip && diff < -pl_frame_interval) {
-		// P.E.Op.S. makes skip decision based on this
-		fps_skip = 1.0f;
-		plugin_skip_advice = 1;
+	if (pl_rearmed_cbs.frameskip) {
+		if (diff < -pl_frame_interval)
+			pl_rearmed_cbs.fskip_advice = 1;
+		else if (diff >= 0)
+			pl_rearmed_cbs.fskip_advice = 0;
 	}
 
 	pcnt_start(PCNT_ALL);
@@ -252,13 +302,12 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
 	*h = g_layer_h;
 }
 
-const struct rearmed_cbs pl_rearmed_cbs = {
+struct rearmed_cbs pl_rearmed_cbs = {
 	pl_get_layer_pos,
 	pl_fbdev_open,
 	pl_fbdev_set_mode,
 	pl_fbdev_flip,
 	pl_fbdev_close,
-	&plugin_skip_advice,
 };
 
 /* watchdog */
@@ -268,6 +317,10 @@ static void *watchdog_thread(void *unused)
 	int seen_dead = 0;
 	int sleep_time = 5;
 
+#ifndef NDEBUG
+	// don't interfere with debug
+	return NULL;
+#endif
 	while (1)
 	{
 		sleep(sleep_time);