projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolution of X11 key-repeat handling
[freeglut]
/
src
/
freeglut_window.c
diff --git
a/src/freeglut_window.c
b/src/freeglut_window.c
index
6217627
..
3723520
100644
(file)
--- a/
src/freeglut_window.c
+++ b/
src/freeglut_window.c
@@
-203,7
+203,7
@@
GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
pfd.cColorBits = (BYTE) GetDeviceCaps( window->Window.Device, BITSPIXEL );
ppfd = &pfd;
pfd.cColorBits = (BYTE) GetDeviceCaps( window->Window.Device, BITSPIXEL );
ppfd = &pfd;
-
+
pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
if( pixelformat == 0 )
return GL_FALSE;
pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
if( pixelformat == 0 )
return GL_FALSE;
@@
-235,8
+235,8
@@
void fgSetWindow ( SFG_Window *window )
if ( window )
{
window->Window.Device = GetDC( window->Window.Handle );
if ( window )
{
window->Window.Device = GetDC( window->Window.Handle );
- wglMakeCurrent(
- window->Window.Device,
+ wglMakeCurrent(
+ window->Window.Device,
window->Window.Context
);
}
window->Window.Context
);
}
@@
-293,7
+293,7
@@
void fgOpenWindow( SFG_Window* window, const char* title,
window->Window.VisualInfo = fgChooseVisual( );
fgState.DisplayMode &= ~GLUT_DOUBLE;
}
window->Window.VisualInfo = fgChooseVisual( );
fgState.DisplayMode &= ~GLUT_DOUBLE;
}
-
+
/*
* GLUT also checks for multi-sampling, but I don't see that
* anywhere else in FREEGLUT so I won't bother with it for the moment.
/*
* GLUT also checks for multi-sampling, but I don't see that
* anywhere else in FREEGLUT so I won't bother with it for the moment.
@@
-471,27
+471,28
@@
void fgOpenWindow( SFG_Window* window, const char* title,
&wmHints,
NULL
);
&wmHints,
NULL
);
-
+
XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
&fgDisplay.DeleteWindow, 1 );
XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
&fgDisplay.DeleteWindow, 1 );
-
+
XMapWindow( fgDisplay.Display, window->Window.Handle );
}
XMapWindow( fgDisplay.Display, window->Window.Handle );
}
-
+
#elif TARGET_HOST_WIN32
WNDCLASS wc;
#elif TARGET_HOST_WIN32
WNDCLASS wc;
- int flags;
+ DWORD flags;
+ DWORD exFlags = 0;
ATOM atom;
freeglut_assert_ready;
ATOM atom;
freeglut_assert_ready;
-
+
/*
* Grab the window class we have registered on glutInit():
*/
atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc );
assert( atom != 0 );
/*
* Grab the window class we have registered on glutInit():
*/
atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc );
assert( atom != 0 );
-
+
if( gameMode )
{
assert( window->Parent == NULL );
if( gameMode )
{
assert( window->Parent == NULL );
@@
-534,14
+535,18
@@
void fgOpenWindow( SFG_Window* window, const char* title,
flags = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE;
if ( window->IsMenu )
flags = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE;
if ( window->IsMenu )
- flags |= WS_POPUP ;
+ {
+ flags |= WS_POPUP;
+ exFlags |= WS_EX_TOOLWINDOW;
+ }
else if( window->Parent == NULL )
flags |= WS_OVERLAPPEDWINDOW;
else
flags |= WS_CHILD;
}
else if( window->Parent == NULL )
flags |= WS_OVERLAPPEDWINDOW;
else
flags |= WS_CHILD;
}
- window->Window.Handle = CreateWindow(
+ window->Window.Handle = CreateWindowEx(
+ exFlags,
"FREEGLUT",
title,
flags,
"FREEGLUT",
title,
flags,
@@
-644,7
+649,7
@@
int FGAPIENTRY glutCreateWindow( const char* title )
int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
{
int ret = 0;
int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
{
int ret = 0;
-
+
if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
{
SFG_Window* window = NULL;
if( GL_FALSE == fgStructure.Window->State.IsOffscreen )
{
SFG_Window* window = NULL;
@@
-799,18
+804,18
@@
void FGAPIENTRY glutSetWindowTitle( const char* title )
#if TARGET_HOST_UNIX_X11
XTextProperty text;
#if TARGET_HOST_UNIX_X11
XTextProperty text;
-
+
text.value = (unsigned char *) title;
text.encoding = XA_STRING;
text.format = 8;
text.nitems = strlen( title );
text.value = (unsigned char *) title;
text.encoding = XA_STRING;
text.format = 8;
text.nitems = strlen( title );
-
+
XSetWMName(
fgDisplay.Display,
fgStructure.Window->Window.Handle,
&text
);
XSetWMName(
fgDisplay.Display,
fgStructure.Window->Window.Handle,
&text
);
-
+
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
#elif TARGET_HOST_WIN32
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
#elif TARGET_HOST_WIN32
@@
-835,7
+840,7
@@
void FGAPIENTRY glutSetIconTitle( const char* title )
#if TARGET_HOST_UNIX_X11
XTextProperty text;
#if TARGET_HOST_UNIX_X11
XTextProperty text;
-
+
text.value = (unsigned char *) title;
text.encoding = XA_STRING;
text.format = 8;
text.value = (unsigned char *) title;
text.encoding = XA_STRING;
text.format = 8;
@@
-893,7
+898,7
@@
void FGAPIENTRY glutPositionWindow( int x, int y )
#elif TARGET_HOST_WIN32
RECT winRect;
#elif TARGET_HOST_WIN32
RECT winRect;
-
+
GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
MoveWindow(
fgStructure.Window->Window.Handle,
GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
MoveWindow(
fgStructure.Window->Window.Handle,