X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=93640c358cbd5303b0d9032be976acca98509665;hp=0ca45ce602deb9e7bd78509d1e8a5d3228a6f9d0;hb=447783f8d0108feedf3a5801c1f61853d046a733;hpb=6d1a1ac2f1100c69dd3e1084aede6646d6c48f1e

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 0ca45ce6..93640c35 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -62,7 +62,7 @@ static void print_cpu_usage(void)
 		pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
 }
 
-int pl_fbdev_set_mode(int w, int h, int bpp)
+void *pl_fbdev_set_mode(int w, int h, int bpp)
 {
 	void *ret;
 
@@ -82,19 +82,23 @@ int pl_fbdev_set_mode(int w, int h, int bpp)
 
 	menu_notify_mode_change(w, h, bpp);
 
-	return (ret != NULL) ? 0 : -1;
+	return pl_fbdev_buf;
 }
 
-void pl_fbdev_flip(void)
+void *pl_fbdev_flip(void)
 {
 	flip_cnt++;
-	if (g_opts & OPT_SHOWFPS)
-		print_fps();
-	if (g_opts & OPT_SHOWCPU)
-		print_cpu_usage();
+
+	if (pl_fbdev_buf != NULL) {
+		if (g_opts & OPT_SHOWFPS)
+			print_fps();
+		if (g_opts & OPT_SHOWCPU)
+			print_cpu_usage();
+	}
 
 	// let's flip now
 	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
+	return pl_fbdev_buf;
 }
 
 int pl_fbdev_open(void)
@@ -117,6 +121,11 @@ static void update_input(void)
 	if (actions[IN_BINDTYPE_EMU] & PEV_MENU)
 		stop = 1;
 	keystate = actions[IN_BINDTYPE_PLAYER12];
+
+#ifdef X11
+	extern void x11_update_keys(void);
+	x11_update_keys();
+#endif
 }
 
 /* called on every vsync */
@@ -189,3 +198,22 @@ void pl_text_out16(int x, int y, const char *texto, ...)
 	pl_text_out16_(x, y, buffer);
 }
 
+static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
+{
+	*x = g_layer_x;
+	*y = g_layer_y;
+	*w = g_layer_w;
+	*h = g_layer_h;
+}
+
+extern int UseFrameSkip; // hmh
+
+const struct rearmed_cbs pl_rearmed_cbs = {
+	pl_get_layer_pos,
+	pl_fbdev_open,
+	pl_fbdev_set_mode,
+	pl_fbdev_flip,
+	pl_fbdev_close,
+	&UseFrameSkip,
+};
+