X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=163d4f1aa5ce97c912c15c5aa119f6b816f925e1;hp=f045abb8f2ad59943371f9f63c106d9b3e55f134;hb=215ff9e69c0b845f24e7a3aa9faeef06d9276145;hpb=a76fd9535db9b36dd4d8f2e6bc9d804db807907f

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index f045abb8..163d4f1a 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -180,6 +180,14 @@ static void update_layer_size(int w, int h)
 		g_layer_w = w; g_layer_h = h;
 		break;
 
+	case SCALE_2_2:
+		g_layer_w = w; g_layer_h = h;
+		if (w * 2 <= g_menuscreen_w)
+			g_layer_w = w * 2;
+		if (h * 2 <= g_menuscreen_h)
+			g_layer_h = h * 2;
+		break;
+
 	case SCALE_4_3v2:
 		if (h > g_menuscreen_h || (240 < h && h <= 360))
 			goto fractional_4_3;
@@ -363,6 +371,19 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 		neon_eagle2x_16_16(src, (void *)dest, w,
 			stride * 2, dstride * 2, h);
 	}
+	else if (scanlines != 0 && scanline_level != 100)
+	{
+		int l = scanline_level * 2048 / 100;
+
+		for (; h1 >= 2; h1 -= 2)
+		{
+			bgr555_to_rgb565(dest, src, w * 2);
+			dest += dstride * 2, src += stride;
+
+			bgr555_to_rgb565_b(dest, src, w * 2, l);
+			dest += dstride * 2, src += stride;
+		}
+	}
 #endif
 	else
 	{
@@ -582,19 +603,7 @@ static void update_input(void)
 	in_keystate = actions[IN_BINDTYPE_PLAYER12];
 }
 #else /* MAEMO */
-#include <gtk/gtk.h>
-static void update_input(void)
-{
-	extern int g_maemo_opts;
-	extern int maemo_x11_update_keys();
-	if (g_maemo_opts&8)
-		maemo_x11_update_keys();
-	else{
-		/* process GTK+ events */
-		while (gtk_events_pending())
-			gtk_main_iteration();
-	}
-}
+extern void update_input(void);
 #endif
 
 void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)