win32 Pico mostly finished

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@452 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/platform/win32/GenaDrive/Direct.cpp b/platform/win32/GenaDrive/Direct.cpp
index 38c2bd8..3c8f376 100644 (file)
--- a/platform/win32/GenaDrive/Direct.cpp
+++ b/platform/win32/GenaDrive/Direct.cpp
@@ -160,7 +160,9 @@ static int DirectClearDDraw(unsigned int colour)
 \r
 static int DirectPresentDDraw()\r
 {\r
-  int ret = m_pddsFrontBuffer->Blt(&FrameRectMy, m_pddsBackBuffer, &EmuScreenRect, DDBLT_WAIT, NULL);\r
+  int ret = 0;\r
+  if (FrameRectMy.right - FrameRectMy.left > 0 && FrameRectMy.bottom - FrameRectMy.top > 0)\r
+    ret = m_pddsFrontBuffer->Blt(&FrameRectMy, m_pddsBackBuffer, &EmuScreenRect, DDBLT_WAIT, NULL);\r
   if (ret) { LOGFAIL(); return 1; }\r
   return 0;\r
 }\r

diff --git a/platform/win32/GenaDrive/Emu.cpp b/platform/win32/GenaDrive/Emu.cpp
index 7532353..46fa27a 100644 (file)
--- a/platform/win32/GenaDrive/Emu.cpp
+++ b/platform/win32/GenaDrive/Emu.cpp
@@ -4,7 +4,7 @@
 unsigned short *EmuScreen=NULL;\r
 int EmuWidth=320,EmuHeight=224;\r
 RECT EmuScreenRect = { 0, 0, 320, 224 };\r
-int picohw_pen_pressed = 0;\r
+int PicoPadAdd = 0;\r
 \r
 static int EmuScan(unsigned int num);\r
 unsigned char *PicoDraw2FB = NULL;\r
@@ -59,7 +59,7 @@ int EmuFrame()
   }\r
 \r
   PicoPad[0]=input;\r
-  if (picohw_pen_pressed) PicoPad[0] |= 0x20;\r
+  PicoPad[0]|=PicoPadAdd;\r
 \r
   PsndOut=(short *)DSoundNext;\r
   PicoFrame();\r

diff --git a/platform/win32/GenaDrive/Main.cpp b/platform/win32/GenaDrive/Main.cpp
index a25d89f..b54c8e4 100644 (file)
--- a/platform/win32/GenaDrive/Main.cpp
+++ b/platform/win32/GenaDrive/Main.cpp
@@ -15,7 +15,7 @@ int MainWidth=720,MainHeight=480;
 static HMENU mmain = 0, mdisplay = 0, mpicohw = 0;\r
 static int rom_loaded = 0;\r
 static HBITMAP ppad_bmp = 0;\r
-static HBITMAP ppage_bmps[6] = { 0, };\r
+static HBITMAP ppage_bmps[7] = { 0, };\r
 static char rom_name[0x20*3+1];\r
 \r
 static void UpdateRect()\r
@@ -103,7 +103,7 @@ static void PrepareForROM(unsigned char *rom_data)
 \r
   PicoPicohw.pen_pos[0] =\r
   PicoPicohw.pen_pos[1] = 0x8000;\r
-  picohw_pen_pressed = 0;\r
+  PicoPadAdd = 0;\r
 \r
   ret = extract_rom_name(rom_name, rom_data + 0x150, 0x20);\r
   if (ret == 0)\r
@@ -121,7 +121,7 @@ static void PrepareForROM(unsigned char *rom_data)
       ppad_bmp = png2hb(path, 0);\r
     }\r
 \r
-    for (i = 0; i < 6; i++) {\r
+    for (i = 0; i < 7; i++) {\r
       if (ppage_bmps[i] != NULL) DeleteObject(ppage_bmps[i]);\r
       sprintf(p, "pico\\%s_%i.png", rom_name, i);\r
       ppage_bmps[i] = png2hb(path, 1);\r
@@ -267,13 +267,35 @@ static LRESULT CALLBACK WndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam)
       if (PtInRect(&rc, pt)) break;\r
       PicoPicohw.pen_pos[0] |= 0x8000;\r
       PicoPicohw.pen_pos[1] |= 0x8000;\r
-      picohw_pen_pressed = 0;\r
+      PicoPadAdd = 0;\r
       break;\r
   }\r
 \r
   return DefWindowProc(hwnd,msg,wparam,lparam);\r
 }\r
 \r
+static void key_down(WPARAM key)\r
+{\r
+  switch (key) {\r
+    case VK_LEFT:  PicoPadAdd |=    4; break;\r
+    case VK_RIGHT: PicoPadAdd |=    8; break;\r
+    case VK_UP:    PicoPadAdd |=    1; break;\r
+    case VK_DOWN:  PicoPadAdd |=    2; break;\r
+    case 'X':      PicoPadAdd |= 0x10; break;\r
+  }\r
+}\r
+\r
+static void key_up(WPARAM key)\r
+{\r
+  switch (key) {\r
+    case VK_LEFT:  PicoPadAdd &= ~0x04; break;\r
+    case VK_RIGHT: PicoPadAdd &= ~0x08; break;\r
+    case VK_UP:    PicoPadAdd &= ~0x01; break;\r
+    case VK_DOWN:  PicoPadAdd &= ~0x02; break;\r
+    case 'X':      PicoPadAdd &= ~0x10; break;\r
+  }\r
+}\r
+\r
 static LRESULT CALLBACK PicoSwWndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam)\r
 {\r
   PAINTSTRUCT ps;\r
@@ -281,15 +303,17 @@ static LRESULT CALLBACK PicoSwWndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lp
 \r
   switch (msg)\r
   {\r
-    case WM_CLOSE: return 0;\r
     case WM_DESTROY: PicoSwWnd=NULL; break;\r
-    case WM_LBUTTONDOWN: picohw_pen_pressed = 1; return 0;\r
-    case WM_LBUTTONUP:   picohw_pen_pressed = 0; return 0;\r
+    case WM_LBUTTONDOWN: PicoPadAdd |=  0x20; return 0;\r
+    case WM_LBUTTONUP:   PicoPadAdd &= ~0x20; return 0;\r
     case WM_MOUSEMOVE:\r
+      if (HIWORD(lparam) < 0x20) break;\r
       PicoPicohw.pen_pos[0] = 0x03c + LOWORD(lparam) * 2/3;\r
-      PicoPicohw.pen_pos[1] = 0x2f8 + HIWORD(lparam);\r
+      PicoPicohw.pen_pos[1] = 0x2f8 + HIWORD(lparam) - 0x20;\r
       SetTimer(FrameWnd, 100, 1000, NULL);\r
       break;\r
+    case WM_KEYDOWN: key_down(wparam); break;\r
+    case WM_KEYUP:   key_up(wparam);   break;\r
     case WM_PAINT:\r
       hdc = BeginPaint(hwnd, &ps);\r
       if (ppage_bmps[PicoPicohw.page] == NULL)\r
@@ -321,15 +345,16 @@ static LRESULT CALLBACK PicoPadWndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM l
 \r
   switch (msg)\r
   {\r
-    case WM_CLOSE: return 0;\r
     case WM_DESTROY: PicoPadWnd=NULL; break;\r
-    case WM_LBUTTONDOWN: picohw_pen_pressed = 1; return 0;\r
-    case WM_LBUTTONUP:   picohw_pen_pressed = 0; return 0;\r
+    case WM_LBUTTONDOWN: PicoPadAdd |=  0x20; return 0;\r
+    case WM_LBUTTONUP:   PicoPadAdd &= ~0x20; return 0;\r
     case WM_MOUSEMOVE:\r
       PicoPicohw.pen_pos[0] = 0x03c + LOWORD(lparam);\r
       PicoPicohw.pen_pos[1] = 0x1fc + HIWORD(lparam);\r
       SetTimer(FrameWnd, 100, 1000, NULL);\r
       break;\r
+    case WM_KEYDOWN: key_down(wparam); break;\r
+    case WM_KEYUP:   key_up(wparam);   break;\r
     case WM_PAINT:\r
       if (ppad_bmp == NULL) break;\r
       hdc = BeginPaint(hwnd, &ps);\r

diff --git a/platform/win32/GenaDrive/app.h b/platform/win32/GenaDrive/app.h
index 65ed542..30d59cb 100644 (file)
--- a/platform/win32/GenaDrive/app.h
+++ b/platform/win32/GenaDrive/app.h
@@ -24,7 +24,7 @@
 extern unsigned short *EmuScreen;\r
 extern int EmuWidth,EmuHeight;\r
 extern RECT EmuScreenRect;\r
-extern int picohw_pen_pressed;\r
+extern int PicoPadAdd;\r
 int EmuInit();\r
 void EmuExit();\r
 int EmuRomLoad(char *name);\r