X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreeglut_window.c;h=50e900f7dfa4ddc621a10d70cbca3231123de3c9;hb=a630da4d7b24b4147120facf3f7a6a6839d31fb5;hp=dc00029d75973f111bc2c97c4c1e8b9a2c63f20e;hpb=5b2917d3a4709d46262b896af6e996309a48c869;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index dc00029..50e900f 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -32,6 +32,23 @@ #include #include "freeglut_internal.h" +#if TARGET_HOST_WINCE +#include +#pragma comment( lib, "Aygshell.lib" ) + +wchar_t* wstr_from_str(const char* str) +{ + int i,len=strlen(str); + wchar_t* wstr = (wchar_t*)malloc(2*len+2); + for(i=0; iWindow.Device, pixelformat, ppfd ); +#endif /* TARGET_HOST_WINCE */ } #endif @@ -227,7 +248,7 @@ void fgSetWindow ( SFG_Window *window ) window->Window.Handle, window->Window.Context ); -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE if( fgStructure.Window ) ReleaseDC( fgStructure.Window->Window.Handle, fgStructure.Window->Window.Device ); @@ -425,10 +446,17 @@ void fgOpenWindow( SFG_Window* window, const char* title, * that they should replace a window manager that they like, and which * works, just because *we* think that it's not "modern" enough. */ +#if TARGET_HOST_WINCE + sizeHints.x = 0; + sizeHints.y = 0; + sizeHints.width = 320; + sizeHints.height = 240; +#else sizeHints.x = x; sizeHints.y = y; sizeHints.width = w; sizeHints.height = h; +#endif /* TARGET_HOST_WINCE */ wmHints.flags = StateHint; wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState; @@ -454,7 +482,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, XMapWindow( fgDisplay.Display, window->Window.Handle ); -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE WNDCLASS wc; DWORD flags; @@ -466,7 +494,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, /* * Grab the window class we have registered on glutInit(): */ - atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc ); + atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc ); assert( atom != 0 ); if( gameMode ) @@ -481,6 +509,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, } else { +#if !TARGET_HOST_WINCE if ( ( ! isSubWindow ) && ( ! window->IsMenu ) ) { /* @@ -492,6 +521,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 + GetSystemMetrics( SM_CYCAPTION ); } +#endif /* TARGET_HOST_WINCE */ if( ! fgState.Position.Use ) { @@ -515,12 +545,39 @@ void fgOpenWindow( SFG_Window* window, const char* title, flags |= WS_POPUP; exFlags |= WS_EX_TOOLWINDOW; } +#if !TARGET_HOST_WINCE else if( window->Parent == NULL ) flags |= WS_OVERLAPPEDWINDOW; +#endif else flags |= WS_CHILD; } +#if TARGET_HOST_WINCE + { + wchar_t* wstr = wstr_from_str(title); + + window->Window.Handle = CreateWindow( + _T("FREEGLUT"), + wstr, + WS_VISIBLE | WS_POPUP, + 0,0, 240,320, + NULL, + NULL, + fgDisplay.Instance, + (LPVOID) window + ); + + free(wstr); + + SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON); + SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON); + SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR); + MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE); + ShowWindow(window->Window.Handle, SW_SHOW); + UpdateWindow(window->Window.Handle); + } +#else window->Window.Handle = CreateWindowEx( exFlags, "FREEGLUT", @@ -532,11 +589,18 @@ void fgOpenWindow( SFG_Window* window, const char* title, fgDisplay.Instance, (LPVOID) window ); +#endif /* TARGET_HOST_WINCE */ + if( !( window->Window.Handle ) ) fgError( "Failed to create a window (%s)!", title ); +#if TARGET_HOST_WINCE + ShowWindow( window->Window.Handle, SW_SHOW ); +#else ShowWindow( window->Window.Handle, fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW ); +#endif /* TARGET_HOST_WINCE */ + UpdateWindow( window->Window.Handle ); ShowCursor( TRUE ); /* XXX Old comments say "hide cusror"! */ @@ -564,12 +628,10 @@ void fgCloseWindow( SFG_Window* window ) #if TARGET_HOST_UNIX_X11 glXDestroyContext( fgDisplay.Display, window->Window.Context ); - glXDestroyGLXPixmap( fgDisplay.Display, window->Window.Handle ); - XFreePixmap( fgDisplay.Display, window->Window.Pixmap ); - + XDestroyWindow( fgDisplay.Display, window->Window.Handle ); XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE /* * Make sure we don't close a window with current context active @@ -694,7 +756,7 @@ void FGAPIENTRY glutShowWindow( void ) XMapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW ); @@ -722,7 +784,7 @@ void FGAPIENTRY glutHideWindow( void ) fgStructure.Window->Window.Handle ); XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE ); @@ -746,7 +808,7 @@ void FGAPIENTRY glutIconifyWindow( void ) fgDisplay.Screen ); XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE ); @@ -785,6 +847,14 @@ void FGAPIENTRY glutSetWindowTitle( const char* title ) SetWindowText( fgStructure.Window->Window.Handle, title ); +#elif TARGET_HOST_WINCE + { + wchar_t* wstr = wstr_from_str(title); + + SetWindowText( fgStructure.Window->Window.Handle, wstr ); + + free(wstr); + } #endif } } @@ -820,6 +890,14 @@ void FGAPIENTRY glutSetIconTitle( const char* title ) SetWindowText( fgStructure.Window->Window.Handle, title ); +#elif TARGET_HOST_WINCE + { + wchar_t* wstr = wstr_from_str(title); + + SetWindowText( fgStructure.Window->Window.Handle, wstr ); + + free(wstr); + } #endif } } @@ -851,8 +929,8 @@ void FGAPIENTRY glutPositionWindow( int x, int y ) x, y ); XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ -#elif TARGET_HOST_WIN32 - +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE + { RECT winRect; @@ -882,7 +960,7 @@ void FGAPIENTRY glutPushWindow( void ) XLowerWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE SetWindowPos( fgStructure.Window->Window.Handle, @@ -906,7 +984,7 @@ void FGAPIENTRY glutPopWindow( void ) XRaiseWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE SetWindowPos( fgStructure.Window->Window.Handle,