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

Moving the X11-specific code from "freeglut_menu.c" into its own file

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1047 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-02-04 16:47:46 +00:00
parent 2aa1b9aa83
commit 9633f12a5b
2 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freeglut/freeglut/src/Common/freeglut_menu.c
View File

@ -142,24 +142,6 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
/* /*
* Private function to get the virtual maximum screen extent * Private function to get the virtual maximum screen extent
*/ */
#if TARGET_HOST_POSIX_X11
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
{
int wx, wy;
Window w;
XTranslateCoordinates(
fgDisplay.pDisplay.Display,
window->Window.Handle,
fgDisplay.pDisplay.RootWindow,
0, 0, &wx, &wy, &w);
*x = fgState.GameModeSize.X + wx;
*y = fgState.GameModeSize.Y + wy;
}
#endif
static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y ) static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
{ {
if( fgStructure.GameModeWindow ) if( fgStructure.GameModeWindow )

49
freeglut/freeglut/src/x11/freeglut_menu_x11.c
View File

@ -0,0 +1,49 @@
/*
* freeglut_callbacks.c
*
* The callbacks setting methods.
*
* Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
* Written by Pawel W. Olszta, <olszta@sourceforge.net>
* Copied for Platform code by Evan Felix <karcaw at gmail.com>
* Creation date: Wed Feb 1, 2012
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
* * Private function to get the virtual maximum screen extent
* */
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
{
int wx, wy;
Window w;
XTranslateCoordinates(
fgDisplay.pDisplay.Display,
window->Window.Handle,
fgDisplay.pDisplay.RootWindow,
0, 0, &wx, &wy, &w);
*x = fgState.GameModeSize.X + wx;
*y = fgState.GameModeSize.Y + wy;
}