the Win32 seems to be fixed and working now

This commit is contained in:
David Turner 2000-02-28 15:13:08 +00:00
parent 9c84887db3
commit 587bc78f86
1 changed files with 38 additions and 16 deletions

View File

@ -96,6 +96,12 @@
{ VK_F12, grKeyF12 } { VK_F12, grKeyF12 }
}; };
static
Translator syskey_translators[] =
{
{ VK_F1, grKeyF1 }
};
/* This is a minimalist driver, it is only able to display */ /* This is a minimalist driver, it is only able to display */
/* a _single_ window. Moreover, only monochrome and gray */ /* a _single_ window. Moreover, only monochrome and gray */
/* bitmaps are supported.. */ /* bitmaps are supported.. */
@ -209,18 +215,15 @@ void done_surface( grSurface* surface )
SetWindowText( hwndGraphic, the_title ); SetWindowText( hwndGraphic, the_title );
title_set = 1; title_set = 1;
} }
do eventToProcess = 0;
while (GetMessage( &msg, 0, 0, 0 ))
{ {
while ( PeekMessage( &msg, 0, 0, 0, PM_REMOVE ) ) TranslateMessage( &msg );
{ DispatchMessage( &msg );
TranslateMessage( &msg ); if (eventToProcess)
DispatchMessage( &msg ); break;
}
if (!eventToProcess)
WaitMessage();
} }
while (!eventToProcess);
*grevent = ourevent; *grevent = ourevent;
} }
@ -400,7 +403,7 @@ LRESULT CALLBACK Message_Process( HWND handle, UINT mess,
hwndGraphic = 0; hwndGraphic = 0;
PostQuitMessage ( 0 ); PostQuitMessage ( 0 );
DeleteObject ( hbm ); DeleteObject ( hbm );
break; return 0;
case WM_CREATE: case WM_CREATE:
{ {
@ -432,17 +435,33 @@ LRESULT CALLBACK Message_Process( HWND handle, UINT mess,
SelectObject ( memDC, oldbm ); SelectObject ( memDC, oldbm );
DeleteObject ( memDC ); DeleteObject ( memDC );
EndPaint ( handle, &ps ); EndPaint ( handle, &ps );
} return 0;
}
case WM_KEYDOWN:
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
{
int count = sizeof( syskey_translators )/sizeof( syskey_translators[0] );
Translator* trans = syskey_translators;
Translator* limit = trans + count;
for ( ; trans < limit; trans++ )
if ( wParam == trans->winkey )
{
ourevent.key = trans->grkey;
goto Do_Key_Event;
}
return DefWindowProc( handle, mess, wParam, lParam );
}
case WM_KEYDOWN:
switch ( wParam ) switch ( wParam )
{ {
case VK_ESCAPE: case VK_ESCAPE:
ourevent.type = gr_event_key; ourevent.type = gr_event_key;
ourevent.key = grKeyEsc; ourevent.key = grKeyEsc;
eventToProcess = 1; eventToProcess = 1;
break; PostQuitMessage ( 0 );
return 0;
default: default:
/* lookup list of translated keys */ /* lookup list of translated keys */
@ -457,7 +476,11 @@ LRESULT CALLBACK Message_Process( HWND handle, UINT mess,
goto Do_Key_Event; goto Do_Key_Event;
} }
} }
}
/* the key isn't found, default processing */
/* return DefWindowProc( handle, mess, wParam, lParam ); */
return DefWindowProc( handle, mess, wParam, lParam );
}
case WM_CHAR: case WM_CHAR:
{ {
@ -472,7 +495,6 @@ LRESULT CALLBACK Message_Process( HWND handle, UINT mess,
default: default:
return DefWindowProc( handle, mess, wParam, lParam ); return DefWindowProc( handle, mess, wParam, lParam );
} }
return 0; return 0;
} }