* callback is hooked, the viewport size is updated to
* match the new window size.
*/
-static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle,
- int width, int height )
+static void fghReshapeWindow ( SFG_Window *window, int width, int height )
{
SFG_Window *current_window = fgStructure.Window;
- SFG_Window* window = fgWindowByHandle( handle );
freeglut_return_if_fail( window != NULL );
* Calls a window's redraw method. This is used when
* a redraw is forced by the incoming window messages.
*/
-static void fghRedrawWindowByHandle ( SFG_WindowHandleType handle )
+static void fghRedrawWindow ( SFG_Window *window )
{
- SFG_Window* window = fgWindowByHandle( handle );
+ SFG_Window *current_window = fgStructure.Window;
+
freeglut_return_if_fail( window );
freeglut_return_if_fail( FETCH_WCB ( *window, Display ) );
freeglut_return_if_fail( window->State.Visible );
+ fgSetWindow( window );
+
if( window->State.NeedToResize )
{
- SFG_Window *current_window = fgStructure.Window;
-
- fgSetWindow( window );
-
- fghReshapeWindowByHandle(
- window->Window.Handle,
+ fghReshapeWindow(
+ window,
window->State.Width,
window->State.Height
);
window->State.NeedToResize = GL_FALSE;
- fgSetWindow( current_window );
}
INVOKE_WCB( *window, Display, ( ) );
+
+ fgSetWindow( current_window );
}
/*
static void fghcbDisplayWindow( SFG_Window *window,
SFG_Enumerator *enumerator )
{
- if( window->State.NeedToResize )
- {
- SFG_Window *current_window = fgStructure.Window;
-
- fgSetWindow( window );
-
- fghReshapeWindowByHandle(
- window->Window.Handle,
- window->State.Width,
- window->State.Height
- );
-
- window->State.NeedToResize = GL_FALSE;
- fgSetWindow ( current_window );
- }
-
if( window->State.Redisplay &&
window->State.Visible )
{
window->State.Redisplay = GL_FALSE;
#if TARGET_HOST_UNIX_X11
- {
- SFG_Window *current_window = fgStructure.Window;
-
- INVOKE_WCB( *window, Display, ( ) );
- fgSetWindow( current_window );
- }
+ fghRedrawWindow ( window ) ;
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
RedrawWindow(
window->Window.Handle, NULL, NULL,
special_cb = FETCH_WCB( *window, SpecialUp );
}
- /*
- * Is there a keyboard/special callback hooked for this window?
- */
+ /* Is there a keyboard/special callback hooked for this window? */
if( keyboard_cb || special_cb )
{
XComposeStatus composeStatus;
KeySym keySym;
int len;
- /*
- * Check for the ASCII/KeySym codes associated with the event:
- */
+ /* Check for the ASCII/KeySym codes associated with the event: */
len = XLookupString( &event.xkey, asciiCode, sizeof(asciiCode),
&keySym, &composeStatus
);
- /*
- * GLUT API tells us to have two separate callbacks...
- */
+ /* GLUT API tells us to have two separate callbacks... */
if( len > 0 )
{
- /*
- * ...one for the ASCII translateable keypresses...
- */
+ /* ...one for the ASCII translateable keypresses... */
if( keyboard_cb )
{
fgSetWindow( window );
* XXX function (or perhaps invoke glutSetCursor())?
* XXX That is, why are we duplicating code, here, from
* XXX glutSetCursor()? The WIN32 code should be able to just
- * XXX call glutSetCurdsor() instead of defining two macros
+ * XXX call glutSetCursor() instead of defining two macros
* XXX and implementing a nested case in-line.
*/
case WM_SETCURSOR:
/* Turn on the visibility in case it was turned off somehow */
window->State.Visible = GL_TRUE;
BeginPaint( hWnd, &ps );
- fghRedrawWindowByHandle( hWnd );
+ fghRedrawWindow( window );
EndPaint( hWnd, &ps );
break;
window->State.MouseX = LOWORD( lParam );
window->State.MouseY = HIWORD( lParam );
#endif /* TARGET_HOST_WINCE */
+ /* Restrict to [-32768, 32767] to match X11 behaviour */
+ /* See comment in "freeglut_developer" mailing list 10/4/04 */
+ if ( window->State.MouseX > 32767 ) window->State.MouseX -= 65536;
+ if ( window->State.MouseY > 32767 ) window->State.MouseY -= 65536;
if ( window->ActiveMenu )
{
window->State.MouseY = HIWORD( lParam );
#endif /* TARGET_HOST_WINCE */
+ /* Restrict to [-32768, 32767] to match X11 behaviour */
+ /* See comment in "freeglut_developer" mailing list 10/4/04 */
+ if ( window->State.MouseX > 32767 ) window->State.MouseX -= 65536;
+ if ( window->State.MouseY > 32767 ) window->State.MouseY -= 65536;
+
switch( uMsg )
{
case WM_LBUTTONDOWN:
break;
}
+ /* Set capture so that the window captures all the mouse messages */
+ /*
+ * XXX - Multiple button support: Under X11, the mouse is not released
+ * XXX - from the window until all buttons have been released, even if the
+ * XXX - user presses a button in another window. This will take more
+ * XXX - code changes than I am up to at the moment (10/5/04). The present
+ * XXX - is a 90 percent solution.
+ */
+ if ( pressed == GL_TRUE )
+ SetCapture ( window->Window.Handle ) ;
+ else
+ ReleaseCapture () ;
+
if( ! FETCH_WCB( *window, Mouse ) )
break;
window->State.MouseX = mouse_pos.x;
window->State.MouseY = mouse_pos.y;
- /*
- * Convert the Win32 keystroke codes to GLUTtish way
- */
+ /* Convert the Win32 keystroke codes to GLUTtish way */
# define KEY(a,b) case a: keypress = b; break;
switch( wParam )
KEY( VK_INSERT, GLUT_KEY_INSERT );
case VK_DELETE:
- /*
- * The delete key should be treated as an ASCII keypress:
- */
+ /* The delete key should be treated as an ASCII keypress: */
INVOKE_WCB( *window, Keyboard,
( 127, window->State.MouseX, window->State.MouseY )
);
KEY( VK_INSERT, GLUT_KEY_INSERT );
case VK_DELETE:
- /*
- * The delete key should be treated as an ASCII keypress:
- */
+ /* The delete key should be treated as an ASCII keypress: */
INVOKE_WCB( *window, KeyboardUp,
( 127, window->State.MouseX, window->State.MouseY )
);
/*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); */
break;
- /*
- * Other messages that I have seen and which are not handled already
- */
+ /* Other messages that I have seen and which are not handled already */
case WM_SETTEXT: /* 0x000c */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
/* Pass it on to "DefWindowProc" to set the window text */
break;
default:
- /*
- * Handle unhandled messages
- */
+ /* Handle unhandled messages */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
break;
}
projects / freeglut / blobdiff