FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert X11 fgCloseWindow to 1.38 pre-offscreen implementation.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@486 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
nigels 2004-03-16 00:15:05 +00:00
parent 154a985699
commit 4e304b51b9
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
freeglut/freeglut/src/freeglut_window.c
View File

@ -43,7 +43,7 @@ wchar_t* wstr_from_str(const char* str)
for(i=0; i<len; i++) for(i=0; i<len; i++)
wstr[i] = str[i]; wstr[i] = str[i];
wstr[len] = 0; wstr[len] = 0;
return wstr; return wstr;
} }
@ -172,7 +172,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type ) unsigned char layer_type )
{ {
#if TARGET_HOST_WINCE #if TARGET_HOST_WINCE
return GL_TRUE; return GL_TRUE;
#else #else
PIXELFORMATDESCRIPTOR* ppfd, pfd; PIXELFORMATDESCRIPTOR* ppfd, pfd;
int flags, pixelformat; int flags, pixelformat;
@ -554,29 +554,29 @@ void fgOpenWindow( SFG_Window* window, const char* title,
} }
#if TARGET_HOST_WINCE #if TARGET_HOST_WINCE
{ {
wchar_t* wstr = wstr_from_str(title); wchar_t* wstr = wstr_from_str(title);
window->Window.Handle = CreateWindow( window->Window.Handle = CreateWindow(
_T("FREEGLUT"), _T("FREEGLUT"),
wstr, wstr,
WS_VISIBLE | WS_POPUP, WS_VISIBLE | WS_POPUP,
0,0, 240,320, 0,0, 240,320,
NULL, NULL,
NULL, NULL,
fgDisplay.Instance, fgDisplay.Instance,
(LPVOID) window (LPVOID) window
); );
free(wstr); free(wstr);
SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON); SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON);
SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON); SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON);
SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR); SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR);
MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE); MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE);
ShowWindow(window->Window.Handle, SW_SHOW); ShowWindow(window->Window.Handle, SW_SHOW);
UpdateWindow(window->Window.Handle); UpdateWindow(window->Window.Handle);
} }
#else #else
window->Window.Handle = CreateWindowEx( window->Window.Handle = CreateWindowEx(
exFlags, exFlags,
@ -628,9 +628,7 @@ void fgCloseWindow( SFG_Window* window )
#if TARGET_HOST_UNIX_X11 #if TARGET_HOST_UNIX_X11
glXDestroyContext( fgDisplay.Display, window->Window.Context ); glXDestroyContext( fgDisplay.Display, window->Window.Context );
glXDestroyGLXPixmap( fgDisplay.Display, window->Window.Handle ); XDestroyWindow( fgDisplay.Display, window->Window.Handle );
XFreePixmap( fgDisplay.Display, window->Window.Pixmap );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
@ -850,13 +848,13 @@ void FGAPIENTRY glutSetWindowTitle( const char* title )
SetWindowText( fgStructure.Window->Window.Handle, title ); SetWindowText( fgStructure.Window->Window.Handle, title );
#elif TARGET_HOST_WINCE #elif TARGET_HOST_WINCE
{ {
wchar_t* wstr = wstr_from_str(title); wchar_t* wstr = wstr_from_str(title);
SetWindowText( fgStructure.Window->Window.Handle, wstr ); SetWindowText( fgStructure.Window->Window.Handle, wstr );
free(wstr); free(wstr);
} }
#endif #endif
} }
} }
@ -893,13 +891,13 @@ void FGAPIENTRY glutSetIconTitle( const char* title )
SetWindowText( fgStructure.Window->Window.Handle, title ); SetWindowText( fgStructure.Window->Window.Handle, title );
#elif TARGET_HOST_WINCE #elif TARGET_HOST_WINCE
{ {
wchar_t* wstr = wstr_from_str(title); wchar_t* wstr = wstr_from_str(title);
SetWindowText( fgStructure.Window->Window.Handle, wstr ); SetWindowText( fgStructure.Window->Window.Handle, wstr );
free(wstr); free(wstr);
} }
#endif #endif
} }
} }
@ -932,7 +930,7 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
{ {
RECT winRect; RECT winRect;