X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=570b0fcf08f1ad2165ef1082c9f391e8ece3eae8;hb=3f2aaff20c940e90e970c008e56f5253d494a92c;hp=e3f11480ad321135b20a824ed17562e9ffbedd90;hpb=e10925be899433d6506407a1171ef534b652327f;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index e3f1148..570b0fc 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -53,7 +53,9 @@ char noticeMsg[64];			// notice msg to draw
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 int reset_timing = 0;
 
-static int pico_pen_x = 0, pico_pen_y = 0, pico_inp_mode = 0;
+#define PICO_PEN_ADJUST_X 4
+#define PICO_PEN_ADJUST_Y 2
+static int pico_pen_x = 320/2, pico_pen_y = 240/2;
 
 static void emu_msg_cb(const char *msg);
 static void emu_msg_tray_open(void);
@@ -138,8 +140,8 @@ void emu_Deinit(void)
 void emu_prepareDefaultConfig(void)
 {
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	defaultConfig.EmuOpt    = 0x1d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds
-	defaultConfig.s_PicoOpt = 0x0f | 0x20e00; // | <- use_940, cd_pcm, cd_cdda, svp drc
+	defaultConfig.EmuOpt    = 0x9d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds
+	defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;
 	defaultConfig.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0; // auto
 	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
@@ -199,7 +201,7 @@ void osd_text(int x, int y, const char *text)
 	}
 }
 
-static void cd_leds(void)
+static void draw_cd_leds(void)
 {
 //	static
 	int old_reg;
@@ -227,6 +229,25 @@ static void cd_leds(void)
 	}
 }
 
+static void draw_pico_ptr(void)
+{
+	unsigned short *p = (unsigned short *)gp2x_screen;
+
+	// only if pen enabled and for 16bit modes
+	if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;
+
+	if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))
+		p += 32;
+
+	p += 320 * (pico_pen_y + PICO_PEN_ADJUST_Y);
+	p += pico_pen_x + PICO_PEN_ADJUST_X;
+	p[0]   ^= 0xffff;
+	p[319] ^= 0xffff;
+	p[320] ^= 0xffff;
+	p[321] ^= 0xffff;
+	p[640] ^= 0xffff;
+}
+
 static int EmuScanBegin16(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
@@ -270,26 +291,39 @@ static void blit(const char *fps, const char *notice)
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal)
 		{
+			int pallen = 0x40;
 			Pico.m.dirtyPal = 0;
-			if(Pico.video.reg[0xC]&8) { // shadow/hilight mode
+			if (Pico.video.reg[0xC]&8) // shadow/hilight mode
+			{
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 				vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
 				vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);
 				memcpy32(localPal+0xc0, localPal+0x40, 0x40);
-				localPal[0xc0] = 0x0000c000;
-				localPal[0xd0] = 0x00c00000;
-				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
-				localPal[0xf0] = 0x00ffffff;
-				gp2x_video_setpalette(localPal, 0x100);
-			} else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
+				pallen = 0x100;
+			}
+			else if (rendstatus & PDRAW_ACC_SPRITES) {
+				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+				memcpy32(localPal+0x40, localPal, 0x40);
+				memcpy32(localPal+0x80, localPal, 0x40);
+				memcpy32(localPal+0xc0, localPal, 0x40);
+				pallen = 0x100;
+			}
+			else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 				vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);
 				vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);
-				gp2x_video_setpalette(localPal, 0xc0);
-			} else {
+				pallen = 0xc0;
+			}
+			else {
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-				gp2x_video_setpalette(localPal, 0x40);
 			}
+			if (pallen > 0xc0) {
+				localPal[0xc0] = 0x0000c000;
+				localPal[0xd0] = 0x00c00000;
+				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
+				localPal[0xf0] = 0x00ffffff;
+			}
+			gp2x_video_setpalette(localPal, pallen);
 		}
 	}
 
@@ -301,7 +335,9 @@ static void blit(const char *fps, const char *notice)
 			osd_text(osd_fps_x, h, fps);
 	}
 	if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
-		cd_leds();
+		draw_cd_leds();
+	if (PicoAHW & PAHW_PICO)
+		draw_pico_ptr();
 
 	//gp2x_video_wait_vsync();
 	gp2x_video_flip();
@@ -400,37 +436,51 @@ static void emu_msg_tray_open(void)
 
 static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
 {
-	if (events & (1 << 3)) {
-		pico_inp_mode++;
-		if (pico_inp_mode > 2) pico_inp_mode = 0;
-		switch (pico_inp_mode) {
-			case 0: strcpy(noticeMsg, "Input: Joytick         "); break;
-			case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break;
-			case 2: strcpy(noticeMsg, "Input: Pen on Pad      "); break;
-		}
-		gettimeofday(&noticeMsgTime, 0);
-	}
-	if (events & (1 << 4)) {
-		PicoPicohw.page--;
-		if (PicoPicohw.page < 0) PicoPicohw.page = 0;
-		sprintf(noticeMsg, "Page %i                 ", PicoPicohw.page);
-		gettimeofday(&noticeMsgTime, 0);
-	}
-	if (events & (1 << 5)) {
-		PicoPicohw.page++;
-		if (PicoPicohw.page > 6) PicoPicohw.page = 6;
-		sprintf(noticeMsg, "Page %i                 ", PicoPicohw.page);
-		gettimeofday(&noticeMsgTime, 0);
-	}
-	if (pico_inp_mode != 0) {
+	int ret, px, py;
+	static int pdown_frames = 0;
+
+	emu_RunEventsPico(events);
+
+	if (pico_inp_mode != 0)
+	{
 		PicoPad[0] &= ~0x0f; // release UDLR
-		if (gp2x_keys & GP2X_UP)   { pico_pen_y--; if (pico_pen_y <   0) pico_pen_y =   0; }
-		if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 251) pico_pen_y = 251; }
-		if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x <   0) pico_pen_x =   0; }
-		if (gp2x_keys & GP2X_RIGHT){ pico_pen_x++; if (pico_pen_x > 353) pico_pen_x = 353; }
-		PicoPicohw.pen_pos[0] = 0x03c + pico_pen_x;
+		if (gp2x_keys & GP2X_UP)   { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
+		if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
+		if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
+		if (gp2x_keys & GP2X_RIGHT) {
+			int lim = (Pico.video.reg[12]&1) ? 319 : 255;
+			pico_pen_x++;
+			if (pico_pen_x > lim-PICO_PEN_ADJUST_X)
+				pico_pen_x = lim-PICO_PEN_ADJUST_X;
+		}
+		PicoPicohw.pen_pos[0] = pico_pen_x;
+		if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;
+		PicoPicohw.pen_pos[0] += 0x3c;
 		PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
 	}
+
+	// for F200
+	ret = gp2x_touchpad_read(&px, &py);
+	if (ret >= 0) {
+		if (ret > 5000) {
+			if (pdown_frames++ > 5)
+				PicoPad[0] |= 0x20;
+
+			pico_pen_x = px;
+			pico_pen_y = py;
+			if (!(Pico.video.reg[12]&1)) {
+				pico_pen_x -= 32;
+				if (pico_pen_x <   0) pico_pen_x = 0;
+				if (pico_pen_x > 248) pico_pen_x = 248;
+			}
+			if (pico_pen_y > 224) pico_pen_y = 224;
+		}
+		else
+			pdown_frames= 0;
+
+		//if (ret == 0)
+		//	PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;
+	}
 }
 
 static void update_volume(int has_changed, int is_up)
@@ -467,31 +517,6 @@ static void update_volume(int has_changed, int is_up)
 	}
 }
 
-static void change_fast_forward(int set_on)
-{
-	static void *set_PsndOut = NULL;
-	static int set_Frameskip, set_EmuOpt, is_on = 0;
-
-	if (set_on && !is_on) {
-		set_PsndOut = PsndOut;
-		set_Frameskip = currentConfig.Frameskip;
-		set_EmuOpt = currentConfig.EmuOpt;
-		PsndOut = NULL;
-		currentConfig.Frameskip = 8;
-		currentConfig.EmuOpt &= ~4;
-		is_on = 1;
-	}
-	else if (!set_on && is_on) {
-		PsndOut = set_PsndOut;
-		currentConfig.Frameskip = set_Frameskip;
-		currentConfig.EmuOpt = set_EmuOpt;
-		PsndRerate(1);
-		update_volume(0, 0);
-		reset_timing = 1;
-		is_on = 0;
-	}
-}
-
 static void RunEvents(unsigned int which)
 {
 	if (which & 0x1800) // save or load (but not both)
@@ -554,7 +579,6 @@ static void RunEvents(unsigned int which)
 	}
 }
 
-
 static void updateKeys(void)
 {
 	unsigned int keys, keys2, allActions[2] = { 0, 0 }, events;
@@ -624,14 +648,16 @@ static void updateKeys(void)
 	if (events & 0x6000)
 		update_volume(1, events & 0x2000);
 
-	if ((events ^ prevEvents) & 0x40)
-		change_fast_forward(events & 0x40);
+	if ((events ^ prevEvents) & 0x40) {
+		emu_changeFastForward(events & 0x40);
+		update_volume(0, 0);
+		reset_timing = 1;
+	}
 
 	events &= ~prevEvents;
 
 	if (PicoAHW == PAHW_PICO)
 		RunEventsPico(events, keys);
-
 	if (events) RunEvents(events);
 	if (movie_data) emu_updateMovie();
 
@@ -657,13 +683,13 @@ static void SkipFrame(int do_audio)
 }
 
 
-void emu_forcedFrame(void)
+void emu_forcedFrame(int opts)
 {
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
 
-	PicoOpt &= ~0x0010;
-	PicoOpt |=  0x4080; // soft_scale | acc_sprites
+	PicoOpt &= ~0x10;
+	PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites
 	currentConfig.EmuOpt |= 0x80;
 
 	//vidResetMode();
@@ -1000,7 +1026,7 @@ void emu_Loop(void)
 		 frames_done++;  frames_shown++;
 	}
 
-	change_fast_forward(0);
+	emu_changeFastForward(0);
 
 	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
@@ -1013,7 +1039,7 @@ void emu_Loop(void)
 
 	// if in 8bit mode, generate 16bit image for menu background
 	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
-		emu_forcedFrame();
+		emu_forcedFrame(POPT_EN_SOFTSCALE);
 }