[Scummvm-cvs-logs] CVS: scummvm/wince pocketpc.cpp,1.13,1.14

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv13257/wince

Modified Files:
	pocketpc.cpp 
Log Message:
Skip dialogue with skip button, fixed hardware keys but the right click

Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/pocketpc.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pocketpc.cpp	21 Apr 2002 21:55:48 -0000	1.13
--- pocketpc.cpp	23 Apr 2002 05:36:51 -0000	1.14
***************
*** 129,133 ****
  	HMODULE hInst;
  	HWND hWnd;
! 	bool _display_cursor;
  
  
--- 129,134 ----
  	HMODULE hInst;
  	HWND hWnd;
! 	bool _display_cursor;
! 	bool _simulate_right_up;
  
  
***************
*** 371,376 ****
  		g_scumm = scumm;
  
  		registry_init();
- 		keypad_init();
  		
  		hide_cursor = TRUE;
--- 372,377 ----
  		g_scumm = scumm;
  
+ 		keypad_init();
  		registry_init();
  		
  		hide_cursor = TRUE;
***************
*** 476,481 ****
  			break;
  		case IDC_SKIP:
! 			wm->_event.kbd.ascii = mapKey(VK_ESCAPE);;
! 			wm->_event.event_code = EVENT_KEYDOWN;
  			break;
  		case IDC_LOADSAVE:
--- 477,484 ----
  			break;
  		case IDC_SKIP:
! 			if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! 				wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
! 			else
! 				wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY];						
  			break;
  		case IDC_LOADSAVE:
***************
*** 500,513 ****
        break;
  
! 		case IDC_LANDSCAPE:
! 			SetScreenMode(!GetScreenMode());
! 			SHSipPreference(hWnd,SIP_FORCEDOWN);
! 			SetCapture(hWnd); // to prevent input panel from getting taps
! 			SHFullScreen (hWnd, SHFS_HIDESIPBUTTON | SHFS_HIDETASKBAR | SHFS_HIDESTARTICON);
! 			InvalidateRect(HWND_DESKTOP, NULL, TRUE);
! 			/*
! 			SipShowIM(SIPF_OFF);
! 			SHSipPreference(hWnd, SIP_FORCEDOWN);
! 			*/
  			if (!hide_toolbar)
  				toolbar_drawn = false;
--- 503,513 ----
        break;
  
! 		case IDC_LANDSCAPE:
! 			SHFullScreen (hWnd, SHFS_HIDESIPBUTTON | SHFS_HIDETASKBAR | SHFS_HIDESTARTICON);
! 			InvalidateRect(HWND_DESKTOP, NULL, TRUE);
! 			SetScreenMode(!GetScreenMode());
! 			//SHSipPreference(hWnd,SIP_FORCEDOWN);
! 			MoveWindow(hWnd, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), TRUE);
! 			SetCapture(hWnd); // to prevent input panel from getting taps						
  			if (!hide_toolbar)
  				toolbar_drawn = false;
***************
*** 537,540 ****
--- 537,549 ----
  		}
  
+ 		break;
+ 
+ 	case WM_KEYUP:
+ 		if (wParam) {
+ 			if (wm->_simulate_right_up) {
+ 					wm->_event.event_code = EVENT_RBUTTONUP;
+ 					wm->_simulate_right_up = false;
+ 			}
+ 		}
  		break;
  
***************
*** 633,638 ****
  						break;
  					case ToolbarSkip:
! 						wm->_event.event_code = EVENT_KEYDOWN;
! 						wm->_event.kbd.ascii = mapKey(VK_ESCAPE);				
  						break;
  					case ToolbarSound:
--- 642,650 ----
  						break;
  					case ToolbarSkip:
! 						wm->_event.event_code = EVENT_KEYDOWN;
! 						if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! 							wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY];
! 						else
! 							wm->_event.kbd.ascii = g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY];						
  						break;
  					case ToolbarSound:
***************
*** 655,659 ****
  			wm->_event.event_code = EVENT_LBUTTONUP;
  			wm->_event.mouse.x = x;
! 			wm->_event.mouse.y = y;
  		}
  		break;
--- 667,672 ----
  			wm->_event.event_code = EVENT_LBUTTONUP;
  			wm->_event.mouse.x = x;
! 			wm->_event.mouse.y = y;
! 			wm->_last_mouse_event = wm->_event;
  		}
  		break;
***************
*** 753,757 ****
  void OSystem_WINCE3::addEventRightButtonClicked() {
  	_last_mouse_event.event_code = EVENT_RBUTTONDOWN;
! 	_event = _last_mouse_event;
  }
  
--- 766,771 ----
  void OSystem_WINCE3::addEventRightButtonClicked() {
  	_last_mouse_event.event_code = EVENT_RBUTTONDOWN;
! 	_event = _last_mouse_event;
! 	_simulate_right_up = true;
  }
  
***************
*** 790,795 ****
  	OSystem_WINCE3* system;
  	system = (OSystem_WINCE3*)g_scumm->_system;
! 
! 	system->addEventKeyPressed(mapKey(VK_ESCAPE));
  }
  
--- 804,812 ----
  	OSystem_WINCE3* system;
  	system = (OSystem_WINCE3*)g_scumm->_system;
! 
! 	if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer])
! 		system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY]);
! 	else
! 		system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY]);						
  }
  
***************
*** 1066,1070 ****
  	_ms_hotspot_y = hotspot_y;
  
! 	_ms_buf = (byte*)buf;
  }
  	
--- 1083,1094 ----
  	_ms_hotspot_y = hotspot_y;
  
! 	_ms_buf = (byte*)buf;
! 
! 	// Refresh mouse cursor
! 
! 	if (!hide_cursor) {
! 		undraw_mouse();
! 		draw_mouse();
! 	}
  }
  	
***************
*** 1095,1099 ****
  
  	for (;;) {
! 		MSG msg;
  
  		_event.event_code = -1;
--- 1119,1123 ----
  
  	for (;;) {
! 		MSG msg;
  
  		_event.event_code = -1;