diff --git a/CMakeLists.txt b/CMakeLists.txt index f55234ebef..a9a1380b3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 3.23) project(soar VERSION 9.6.3 - LANGUAGES CXX) + LANGUAGES CXX C) + +set(SOAR_LIB "${PROJECT_NAME}_lib") find_package(SQLite3 REQUIRED) @@ -61,14 +63,35 @@ file(GLOB_RECURSE HEADERS "Core/shared/portability_posix.h" ) -if(NOT SVS) +# Add additional files/dependencies if SVS is enabled +if(SVS) + message(STATUS "Soar: Enabling SVS") + find_package(asio REQUIRED) + find_package(Eigen3 REQUIRED) + + # Build ccd as a static library (conan's libccd does not work for our needs) + add_subdirectory(Core/SVS/ccd) + + list(APPEND SOURCES + Core/SVS/SVS_cmake.cxx + ) + + file(GLOB_RECURSE SVS_HEADERS + "Core/SVS/src/*.h" + "Core/SVS/src/commands/*.h" + "Core/SVS/src/filters/*.h" + ) + list(APPEND HEADERS ${SVS_HEADERS}) +else() message(STATUS "Soar: Disabling SVS") add_compile_definitions(NO_SVS) endif() + + # Add executable/library target -add_library(${PROJECT_NAME}_lib ${SOURCES}) -target_include_directories(${PROJECT_NAME}_lib PUBLIC +add_library(${SOAR_LIB} ${SOURCES}) +target_include_directories(${SOAR_LIB} PUBLIC $ $ $ @@ -90,23 +113,37 @@ target_include_directories(${PROJECT_NAME}_lib PUBLIC $ $ ) -target_link_libraries(${PROJECT_NAME}_lib PUBLIC SQLite::SQLite3) +target_link_libraries(${SOAR_LIB} PUBLIC SQLite::SQLite3) + +if(SVS) + target_include_directories(${SOAR_LIB} PUBLIC + $ + $ + $ + $ + ) + + target_link_libraries(${SOAR_LIB} PUBLIC asio::asio) + target_link_libraries(${SOAR_LIB} PUBLIC Eigen3::Eigen) + target_link_libraries(${SOAR_LIB} PUBLIC ccd) +endif() + -set_target_properties(${PROJECT_NAME}_lib +set_target_properties(${SOAR_LIB} PROPERTIES PUBLIC_HEADER "${HEADERS}") set(CXX_STANDARD_REQUIRED True) # Set the C++ standard for this and all downstream targets -target_compile_features(${PROJECT_NAME}_lib PUBLIC +target_compile_features(${SOAR_LIB} PUBLIC cxx_std_17 ) if($) - target_compile_options(${PROJECT_NAME}_lib PRIVATE $<$: -Wall -Wpedantic>) + target_compile_options(${SOAR_LIB} PRIVATE $<$: -Wall -Wpedantic>) - target_compile_options(${PROJECT_NAME}_lib PRIVATE $<$: /Wall /permissive>) + target_compile_options(${SOAR_LIB} PRIVATE $<$: /Wall /permissive>) if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if(ASAN) @@ -135,7 +172,7 @@ write_basic_package_version_file( COMPATIBILITY SameMajorVersion) # This only sets up the install structure, but no installation happens yet. -install(TARGETS ${PROJECT_NAME}_lib +install(TARGETS ${SOAR_LIB} EXPORT SoarTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -170,7 +207,7 @@ export(EXPORT SoarTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/SoarTargets.cmake" ) -add_library(soar::soar_lib ALIAS ${PROJECT_NAME}_lib) +add_library(soar::soar_lib ALIAS ${SOAR_LIB}) if(CLI) message(STATUS "Soar: Building CLI") diff --git a/CMakePresets.json b/CMakePresets.json index 421e0f8df9..df62523859 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -55,6 +55,18 @@ "SVS": "OFF", "CLI": "ON" } + }, + { + "name": "Release-svs-test", + "displayName": "Release with SVS Test Configuration", + "inherits": "conan-release", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "BUILD_TESTS": "ON", + "ASAN": "OFF", + "SVS": "ON", + "CLI": "ON" + } } ], "buildPresets": [ @@ -85,6 +97,13 @@ "configurePreset": "Release-test", "configuration": "release", "inherits": "conan-release" + }, + { + "name": "Release-svs-test", + "displayName": "Build Release with SVS Test", + "configurePreset": "Release-svs-test", + "configuration": "release", + "inherits": "conan-release" } ], "testPresets": [ @@ -113,6 +132,14 @@ "output": { "outputOnFailure": true } + }, + { + "name": "Release-svs-test", + "displayName": "Test Release with SVS", + "configurePreset": "Release-svs-test", + "output": { + "outputOnFailure": true + } } ], "packagePresets": [ @@ -122,6 +149,13 @@ "configurePreset": "Release-test", "generators": ["TGZ"], "packageDirectory": "${sourceDir}/" + }, + { + "name": "Release-svs-test", + "displayName": "Package Release with SVS Test", + "configurePreset": "Release-svs-test", + "generators": ["TGZ"], + "packageDirectory": "${sourceDir}/" } ], "workflowPresets": [ diff --git a/Core/SVS/SConscript b/Core/SVS/SConscript index 16f3fc4b81..01cc1b744d 100644 --- a/Core/SVS/SConscript +++ b/Core/SVS/SConscript @@ -2,75 +2,6 @@ import sys, platform Import('env', 'compiler', 'lsb_build') -# svs viewer -viewer_env = env.Clone() -viewer_env['LIBS'] = [] -viewer_env['CPPPATH'] = [ 'viewer', 'glfw/lib' ] -viewer_env.Append(CPPPATH = 'glfw/include') -viewer_src = Glob('viewer/*.c') + Glob('glfw/lib/*.c') - -if compiler == 'msvc': - opengl_libs = [ 'opengl32', 'glu32' ] - viewer_env.Append( - CPPPATH = [ 'glfw/lib/win32' ], - LIBS = [ 'Ws2_32', 'Mswsock', 'AdvApi32', 'user32' ] + opengl_libs, - LINKFLAGS = [ '/SUBSYSTEM:CONSOLE' ] - ) - viewer_src.append('viewer/platform_specific/windows.c') - viewer_src.extend(Glob('glfw/lib/win32/*.c')) -else: - viewer_src.append('viewer/platform_specific/posix.c') - if sys.platform == 'darwin': - viewer_src.extend(Glob('glfw/lib/cocoa/*.c') + Glob('glfw/lib/cocoa/*.m')) - opengl_libs = [] # osx uses opengl as a framework instead of libraries - viewer_env.Append( - CPPFLAGS = [ '-fno-common' ], - CPPPATH = [ 'glfw/lib/cocoa/' ], - ) - for f in [ 'Cocoa', 'OpenGL', 'IOKit' ]: - viewer_env.Append(LINKFLAGS = [ '-framework', f ]) - else: - viewer_src.extend(Glob('glfw/lib/x11/*.c')) - opengl_libs = [ 'GL', 'GLU' ] - viewer_env.Append( - CPPFLAGS = [ - '-pthread', - '-D_GLFW_HAS_PTHREAD', - '-D_GLFW_HAS_SYSCONF', - '-D_GLFW_HAS_SCHED_YIELD', - ], - CPPPATH = [ 'glfw/lib/x11' ], - LIBS = [ 'm', 'pthread', 'X11', 'rt' ] + opengl_libs, - ) - -conf = Configure(viewer_env) -missing_libs = [ l for l in opengl_libs if not conf.CheckLib(l) ] - -if platform.system().startswith('Linux'): - PROCADDRESS_FUNCS = [ - ('glXGetProcAddressARB', 'GLXGETPROCADDRESSARB'), - ('glXGetProcAddress', 'GLXGETPROCADDRESS'), - ('glXGetProcAddressEXT', 'GLXGETPROCADDRESSEXT'), - ] - macro = '_GLFW_HAS_DLOPEN' # fallback - for f, m in PROCADDRESS_FUNCS: - if conf.CheckLibWithHeader('GL', 'GL/gl.h', 'C', '%s("");' % f): - macro = m - break; - viewer_env.Append(CPPFLAGS='-D_GLFW_HAS_' + macro) -elif platform.system() == 'Darwin': - viewer_env.Append(CPPFLAGS='-D_GLFW_HAS_GLXGETPROCADDRESS') - -conf.Finish() - -if not platform.system() == 'Darwin': - if not missing_libs: - viewer_prog = viewer_env.Program('svs_viewer', viewer_src) - viewer_install = viewer_env.Alias('svs_viewer', viewer_env.Install('$OUT_DIR', viewer_prog)) - else: - print('Cannot find %s, not building svs_viewer' % ', '.join(missing_libs)) -else: - print('Not building svs_viewer for OSX') # svs library objects svs_env = env.Clone() diff --git a/Core/SVS/SVS_cmake.cxx b/Core/SVS/SVS_cmake.cxx new file mode 100644 index 0000000000..e44ff65c1d --- /dev/null +++ b/Core/SVS/SVS_cmake.cxx @@ -0,0 +1,38 @@ +#include "src/commands/add_node.cpp" +#include "src/commands/extract.cpp" +#include "src/commands/set_transform.cpp" +#include "src/commands/set_tag.cpp" +#include "src/commands/delete_tag.cpp" +#include "src/commands/copy_node.cpp" +#include "src/commands/copy_transform.cpp" +#include "src/commands/delete_node.cpp" + +#include "src/filters/axis_distance.cpp" +#include "src/filters/axis_relation.cpp" +#include "src/filters/base_node_filters.cpp" +#include "src/filters/calculate_placement.cpp" +#include "src/filters/contain.cpp" +#include "src/filters/distance.cpp" +#include "src/filters/intersect.cpp" +#include "src/filters/monitor_object.cpp" +#include "src/filters/node.cpp" +#include "src/filters/occlusion.cpp" +#include "src/filters/overlap.cpp" +#include "src/filters/tag_select.cpp" +#include "src/filters/volume.cpp" + +#include "src/cliproxy.cpp" +#include "src/command.cpp" +#include "src/command_table.cpp" +#include "src/common.cpp" +#include "src/drawer_asio.cpp" +#include "src/filter.cpp" +#include "src/filter_input.cpp" +#include "src/filter_table.cpp" +#include "src/mat.cpp" +#include "src/scene.cpp" +#include "src/serialize.cpp" +#include "src/sgnode.cpp" +#include "src/sgnode_algs.cpp" +#include "src/soar_interface.cpp" +#include "src/svs.cpp" diff --git a/Core/SVS/ccd/CMakeLists.txt b/Core/SVS/ccd/CMakeLists.txt new file mode 100644 index 0000000000..3485d82edc --- /dev/null +++ b/Core/SVS/ccd/CMakeLists.txt @@ -0,0 +1,33 @@ +# ccd/CMakeLists.txt + +set(CCD_SRC + ccd.c + mpr.c + polytope.c + support.c + vec3.c +) + +# Create a static library named ccd +add_library(ccd STATIC ${CCD_SRC}) + +# Include the current directory as a public include path +target_include_directories(ccd PUBLIC + $ + $) + +# Set C standard explicitly +target_compile_features(ccd PUBLIC c_std_99) + +set_target_properties(ccd PROPERTIES LINKER_LANGUAGE C) + +# Installation Structure +install(TARGETS ccd + EXPORT SoarTargets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES DESTINATION include +) + + diff --git a/Core/SVS/glfw/include/GL/glfw.h b/Core/SVS/glfw/include/GL/glfw.h deleted file mode 100644 index c124716fc1..0000000000 --- a/Core/SVS/glfw/include/GL/glfw.h +++ /dev/null @@ -1,518 +0,0 @@ -/************************************************************************ - * GLFW - An OpenGL framework - * API version: 2.7 - * WWW: http://www.glfw.org/ - *------------------------------------------------------------------------ - * Copyright (c) 2002-2006 Marcus Geelnard - * Copyright (c) 2006-2010 Camilla Berglund - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would - * be appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not - * be misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. - * - *************************************************************************/ - -#ifndef __glfw_h_ -#define __glfw_h_ - -#ifdef __cplusplus -extern "C" { -#endif - - -/************************************************************************* - * Global definitions - *************************************************************************/ - -/* We need a NULL pointer from time to time */ -#ifndef NULL - #ifdef __cplusplus - #define NULL 0 - #else - #define NULL ((void *)0) - #endif -#endif /* NULL */ - - -/* ------------------- BEGIN SYSTEM/COMPILER SPECIFIC -------------------- */ - -/* Please report any probles that you find with your compiler, which may - * be solved in this section! There are several compilers that I have not - * been able to test this file with yet. - * - * First: If we are we on Windows, we want a single define for it (_WIN32) - * (Note: For Cygwin the compiler flag -mwin32 should be used, but to - * make sure that things run smoothly for Cygwin users, we add __CYGWIN__ - * to the list of "valid Win32 identifiers", which removes the need for - * -mwin32) - */ -#if !defined(_WIN32) && (defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__)) - #define _WIN32 -#endif /* _WIN32 */ - -/* In order for extension support to be portable, we need to define an - * OpenGL function call method. We use the keyword APIENTRY, which is - * defined for Win32. (Note: Windows also needs this for ) - */ -#ifndef APIENTRY - #ifdef _WIN32 - #define APIENTRY __stdcall - #else - #define APIENTRY - #endif - #define GL_APIENTRY_DEFINED -#endif /* APIENTRY */ - - -/* The following three defines are here solely to make some Windows-based - * files happy. Theoretically we could include , but - * it has the major drawback of severely polluting our namespace. - */ - -/* Under Windows, we need WINGDIAPI defined */ -#if !defined(WINGDIAPI) && defined(_WIN32) - #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__) - /* Microsoft Visual C++, Borland C++ Builder and Pelles C */ - #define WINGDIAPI __declspec(dllimport) - #elif defined(__LCC__) - /* LCC-Win32 */ - #define WINGDIAPI __stdcall - #else - /* Others (e.g. MinGW, Cygwin) */ - #define WINGDIAPI extern - #endif - #define GL_WINGDIAPI_DEFINED -#endif /* WINGDIAPI */ - -/* Some files also need CALLBACK defined */ -#if !defined(CALLBACK) && defined(_WIN32) - #if defined(_MSC_VER) - /* Microsoft Visual C++ */ - #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) - #define CALLBACK __stdcall - #else - #define CALLBACK - #endif - #else - /* Other Windows compilers */ - #define CALLBACK __stdcall - #endif - #define GLU_CALLBACK_DEFINED -#endif /* CALLBACK */ - -/* Microsoft Visual C++, Borland C++ and Pelles C needs wchar_t */ -#if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)) && !defined(_WCHAR_T_DEFINED) - typedef unsigned short wchar_t; - #define _WCHAR_T_DEFINED -#endif /* _WCHAR_T_DEFINED */ - - -/* ---------------- GLFW related system specific defines ----------------- */ - -#if defined(_WIN32) && defined(GLFW_BUILD_DLL) - - /* We are building a Win32 DLL */ - #define GLFWAPI __declspec(dllexport) - #define GLFWAPIENTRY __stdcall - #define GLFWCALL __stdcall - -#elif defined(_WIN32) && defined(GLFW_DLL) - - /* We are calling a Win32 DLL */ - #if defined(__LCC__) - #define GLFWAPI extern - #else - #define GLFWAPI __declspec(dllimport) - #endif - #define GLFWAPIENTRY __stdcall - #define GLFWCALL __stdcall - -#else - - /* We are either building/calling a static lib or we are non-win32 */ - #define GLFWAPIENTRY - #define GLFWAPI - #define GLFWCALL - -#endif - -/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */ - -/* Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is - * convenient for the user to only have to include . This also - * solves the problem with Windows and needing some - * special defines which normally requires the user to include - * (which is not a nice solution for portable programs). - */ -#if defined(__APPLE_CC__) - #if defined(GLFW_INCLUDE_GL3) - #include - #else - #define GL_GLEXT_LEGACY - #include - #endif - #ifndef GLFW_NO_GLU - #include - #endif -#else - #if defined(GLFW_INCLUDE_GL3) - #include - #else - #include - #endif - #ifndef GLFW_NO_GLU - #include - #endif -#endif - - -/************************************************************************* - * GLFW version - *************************************************************************/ - -#define GLFW_VERSION_MAJOR 2 -#define GLFW_VERSION_MINOR 7 -#define GLFW_VERSION_REVISION 8 - - -/************************************************************************* - * Input handling definitions - *************************************************************************/ - -/* Key and button state/action definitions */ -#define GLFW_RELEASE 0 -#define GLFW_PRESS 1 - -/* Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used - * for printable keys (such as A-Z, 0-9 etc), and values above 256 - * represent special (non-printable) keys (e.g. F1, Page Up etc). - */ -#define GLFW_KEY_UNKNOWN -1 -#define GLFW_KEY_SPACE 32 -#define GLFW_KEY_SPECIAL 256 -#define GLFW_KEY_ESC (GLFW_KEY_SPECIAL+1) -#define GLFW_KEY_F1 (GLFW_KEY_SPECIAL+2) -#define GLFW_KEY_F2 (GLFW_KEY_SPECIAL+3) -#define GLFW_KEY_F3 (GLFW_KEY_SPECIAL+4) -#define GLFW_KEY_F4 (GLFW_KEY_SPECIAL+5) -#define GLFW_KEY_F5 (GLFW_KEY_SPECIAL+6) -#define GLFW_KEY_F6 (GLFW_KEY_SPECIAL+7) -#define GLFW_KEY_F7 (GLFW_KEY_SPECIAL+8) -#define GLFW_KEY_F8 (GLFW_KEY_SPECIAL+9) -#define GLFW_KEY_F9 (GLFW_KEY_SPECIAL+10) -#define GLFW_KEY_F10 (GLFW_KEY_SPECIAL+11) -#define GLFW_KEY_F11 (GLFW_KEY_SPECIAL+12) -#define GLFW_KEY_F12 (GLFW_KEY_SPECIAL+13) -#define GLFW_KEY_F13 (GLFW_KEY_SPECIAL+14) -#define GLFW_KEY_F14 (GLFW_KEY_SPECIAL+15) -#define GLFW_KEY_F15 (GLFW_KEY_SPECIAL+16) -#define GLFW_KEY_F16 (GLFW_KEY_SPECIAL+17) -#define GLFW_KEY_F17 (GLFW_KEY_SPECIAL+18) -#define GLFW_KEY_F18 (GLFW_KEY_SPECIAL+19) -#define GLFW_KEY_F19 (GLFW_KEY_SPECIAL+20) -#define GLFW_KEY_F20 (GLFW_KEY_SPECIAL+21) -#define GLFW_KEY_F21 (GLFW_KEY_SPECIAL+22) -#define GLFW_KEY_F22 (GLFW_KEY_SPECIAL+23) -#define GLFW_KEY_F23 (GLFW_KEY_SPECIAL+24) -#define GLFW_KEY_F24 (GLFW_KEY_SPECIAL+25) -#define GLFW_KEY_F25 (GLFW_KEY_SPECIAL+26) -#define GLFW_KEY_UP (GLFW_KEY_SPECIAL+27) -#define GLFW_KEY_DOWN (GLFW_KEY_SPECIAL+28) -#define GLFW_KEY_LEFT (GLFW_KEY_SPECIAL+29) -#define GLFW_KEY_RIGHT (GLFW_KEY_SPECIAL+30) -#define GLFW_KEY_LSHIFT (GLFW_KEY_SPECIAL+31) -#define GLFW_KEY_RSHIFT (GLFW_KEY_SPECIAL+32) -#define GLFW_KEY_LCTRL (GLFW_KEY_SPECIAL+33) -#define GLFW_KEY_RCTRL (GLFW_KEY_SPECIAL+34) -#define GLFW_KEY_LALT (GLFW_KEY_SPECIAL+35) -#define GLFW_KEY_RALT (GLFW_KEY_SPECIAL+36) -#define GLFW_KEY_TAB (GLFW_KEY_SPECIAL+37) -#define GLFW_KEY_ENTER (GLFW_KEY_SPECIAL+38) -#define GLFW_KEY_BACKSPACE (GLFW_KEY_SPECIAL+39) -#define GLFW_KEY_INSERT (GLFW_KEY_SPECIAL+40) -#define GLFW_KEY_DEL (GLFW_KEY_SPECIAL+41) -#define GLFW_KEY_PAGEUP (GLFW_KEY_SPECIAL+42) -#define GLFW_KEY_PAGEDOWN (GLFW_KEY_SPECIAL+43) -#define GLFW_KEY_HOME (GLFW_KEY_SPECIAL+44) -#define GLFW_KEY_END (GLFW_KEY_SPECIAL+45) -#define GLFW_KEY_KP_0 (GLFW_KEY_SPECIAL+46) -#define GLFW_KEY_KP_1 (GLFW_KEY_SPECIAL+47) -#define GLFW_KEY_KP_2 (GLFW_KEY_SPECIAL+48) -#define GLFW_KEY_KP_3 (GLFW_KEY_SPECIAL+49) -#define GLFW_KEY_KP_4 (GLFW_KEY_SPECIAL+50) -#define GLFW_KEY_KP_5 (GLFW_KEY_SPECIAL+51) -#define GLFW_KEY_KP_6 (GLFW_KEY_SPECIAL+52) -#define GLFW_KEY_KP_7 (GLFW_KEY_SPECIAL+53) -#define GLFW_KEY_KP_8 (GLFW_KEY_SPECIAL+54) -#define GLFW_KEY_KP_9 (GLFW_KEY_SPECIAL+55) -#define GLFW_KEY_KP_DIVIDE (GLFW_KEY_SPECIAL+56) -#define GLFW_KEY_KP_MULTIPLY (GLFW_KEY_SPECIAL+57) -#define GLFW_KEY_KP_SUBTRACT (GLFW_KEY_SPECIAL+58) -#define GLFW_KEY_KP_ADD (GLFW_KEY_SPECIAL+59) -#define GLFW_KEY_KP_DECIMAL (GLFW_KEY_SPECIAL+60) -#define GLFW_KEY_KP_EQUAL (GLFW_KEY_SPECIAL+61) -#define GLFW_KEY_KP_ENTER (GLFW_KEY_SPECIAL+62) -#define GLFW_KEY_KP_NUM_LOCK (GLFW_KEY_SPECIAL+63) -#define GLFW_KEY_CAPS_LOCK (GLFW_KEY_SPECIAL+64) -#define GLFW_KEY_SCROLL_LOCK (GLFW_KEY_SPECIAL+65) -#define GLFW_KEY_PAUSE (GLFW_KEY_SPECIAL+66) -#define GLFW_KEY_LSUPER (GLFW_KEY_SPECIAL+67) -#define GLFW_KEY_RSUPER (GLFW_KEY_SPECIAL+68) -#define GLFW_KEY_MENU (GLFW_KEY_SPECIAL+69) -#define GLFW_KEY_LAST GLFW_KEY_MENU - -/* Mouse button definitions */ -#define GLFW_MOUSE_BUTTON_1 0 -#define GLFW_MOUSE_BUTTON_2 1 -#define GLFW_MOUSE_BUTTON_3 2 -#define GLFW_MOUSE_BUTTON_4 3 -#define GLFW_MOUSE_BUTTON_5 4 -#define GLFW_MOUSE_BUTTON_6 5 -#define GLFW_MOUSE_BUTTON_7 6 -#define GLFW_MOUSE_BUTTON_8 7 -#define GLFW_MOUSE_BUTTON_LAST GLFW_MOUSE_BUTTON_8 - -/* Mouse button aliases */ -#define GLFW_MOUSE_BUTTON_LEFT GLFW_MOUSE_BUTTON_1 -#define GLFW_MOUSE_BUTTON_RIGHT GLFW_MOUSE_BUTTON_2 -#define GLFW_MOUSE_BUTTON_MIDDLE GLFW_MOUSE_BUTTON_3 - - -/* Joystick identifiers */ -#define GLFW_JOYSTICK_1 0 -#define GLFW_JOYSTICK_2 1 -#define GLFW_JOYSTICK_3 2 -#define GLFW_JOYSTICK_4 3 -#define GLFW_JOYSTICK_5 4 -#define GLFW_JOYSTICK_6 5 -#define GLFW_JOYSTICK_7 6 -#define GLFW_JOYSTICK_8 7 -#define GLFW_JOYSTICK_9 8 -#define GLFW_JOYSTICK_10 9 -#define GLFW_JOYSTICK_11 10 -#define GLFW_JOYSTICK_12 11 -#define GLFW_JOYSTICK_13 12 -#define GLFW_JOYSTICK_14 13 -#define GLFW_JOYSTICK_15 14 -#define GLFW_JOYSTICK_16 15 -#define GLFW_JOYSTICK_LAST GLFW_JOYSTICK_16 - - -/************************************************************************* - * Other definitions - *************************************************************************/ - -/* glfwOpenWindow modes */ -#define GLFW_WINDOW 0x00010001 -#define GLFW_FULLSCREEN 0x00010002 - -/* glfwGetWindowParam tokens */ -#define GLFW_OPENED 0x00020001 -#define GLFW_ACTIVE 0x00020002 -#define GLFW_ICONIFIED 0x00020003 -#define GLFW_ACCELERATED 0x00020004 -#define GLFW_RED_BITS 0x00020005 -#define GLFW_GREEN_BITS 0x00020006 -#define GLFW_BLUE_BITS 0x00020007 -#define GLFW_ALPHA_BITS 0x00020008 -#define GLFW_DEPTH_BITS 0x00020009 -#define GLFW_STENCIL_BITS 0x0002000A - -/* The following constants are used for both glfwGetWindowParam - * and glfwOpenWindowHint - */ -#define GLFW_REFRESH_RATE 0x0002000B -#define GLFW_ACCUM_RED_BITS 0x0002000C -#define GLFW_ACCUM_GREEN_BITS 0x0002000D -#define GLFW_ACCUM_BLUE_BITS 0x0002000E -#define GLFW_ACCUM_ALPHA_BITS 0x0002000F -#define GLFW_AUX_BUFFERS 0x00020010 -#define GLFW_STEREO 0x00020011 -#define GLFW_WINDOW_NO_RESIZE 0x00020012 -#define GLFW_FSAA_SAMPLES 0x00020013 -#define GLFW_OPENGL_VERSION_MAJOR 0x00020014 -#define GLFW_OPENGL_VERSION_MINOR 0x00020015 -#define GLFW_OPENGL_FORWARD_COMPAT 0x00020016 -#define GLFW_OPENGL_DEBUG_CONTEXT 0x00020017 -#define GLFW_OPENGL_PROFILE 0x00020018 - -/* GLFW_OPENGL_PROFILE tokens */ -#define GLFW_OPENGL_CORE_PROFILE 0x00050001 -#define GLFW_OPENGL_COMPAT_PROFILE 0x00050002 - -/* glfwEnable/glfwDisable tokens */ -#define GLFW_MOUSE_CURSOR 0x00030001 -#define GLFW_STICKY_KEYS 0x00030002 -#define GLFW_STICKY_MOUSE_BUTTONS 0x00030003 -#define GLFW_SYSTEM_KEYS 0x00030004 -#define GLFW_KEY_REPEAT 0x00030005 -#define GLFW_AUTO_POLL_EVENTS 0x00030006 - -/* glfwWaitThread wait modes */ -#define GLFW_WAIT 0x00040001 -#define GLFW_NOWAIT 0x00040002 - -/* glfwGetJoystickParam tokens */ -#define GLFW_PRESENT 0x00050001 -#define GLFW_AXES 0x00050002 -#define GLFW_BUTTONS 0x00050003 - -/* glfwReadImage/glfwLoadTexture2D flags */ -#define GLFW_NO_RESCALE_BIT 0x00000001 /* Only for glfwReadImage */ -#define GLFW_ORIGIN_UL_BIT 0x00000002 -#define GLFW_BUILD_MIPMAPS_BIT 0x00000004 /* Only for glfwLoadTexture2D */ -#define GLFW_ALPHA_MAP_BIT 0x00000008 - -/* Time spans longer than this (seconds) are considered to be infinity */ -#define GLFW_INFINITY 100000.0 - - -/************************************************************************* - * Typedefs - *************************************************************************/ - -/* The video mode structure used by glfwGetVideoModes() */ -typedef struct { - int Width, Height; - int RedBits, BlueBits, GreenBits; -} GLFWvidmode; - -/* Image/texture information */ -typedef struct { - int Width, Height; - int Format; - int BytesPerPixel; - unsigned char *Data; -} GLFWimage; - -/* Thread ID */ -typedef int GLFWthread; - -/* Mutex object */ -typedef void * GLFWmutex; - -/* Condition variable object */ -typedef void * GLFWcond; - -/* Function pointer types */ -typedef void (GLFWCALL * GLFWwindowsizefun)(int,int); -typedef int (GLFWCALL * GLFWwindowclosefun)(void); -typedef void (GLFWCALL * GLFWwindowrefreshfun)(void); -typedef void (GLFWCALL * GLFWmousebuttonfun)(int,int); -typedef void (GLFWCALL * GLFWmouseposfun)(int,int); -typedef void (GLFWCALL * GLFWmousewheelfun)(int); -typedef void (GLFWCALL * GLFWkeyfun)(int,int); -typedef void (GLFWCALL * GLFWcharfun)(int,int); -typedef void (GLFWCALL * GLFWthreadfun)(void *); - - -/************************************************************************* - * Prototypes - *************************************************************************/ - -/* GLFW initialization, termination and version querying */ -GLFWAPI int GLFWAPIENTRY glfwInit( void ); -GLFWAPI void GLFWAPIENTRY glfwTerminate( void ); -GLFWAPI void GLFWAPIENTRY glfwGetVersion( int *major, int *minor, int *rev ); - -/* Window handling */ -GLFWAPI int GLFWAPIENTRY glfwOpenWindow( int width, int height, int redbits, int greenbits, int bluebits, int alphabits, int depthbits, int stencilbits, int mode ); -GLFWAPI void GLFWAPIENTRY glfwOpenWindowHint( int target, int hint ); -GLFWAPI void GLFWAPIENTRY glfwCloseWindow( void ); -GLFWAPI void GLFWAPIENTRY glfwSetWindowTitle( const char *title ); -GLFWAPI void GLFWAPIENTRY glfwGetWindowSize( int *width, int *height ); -GLFWAPI void GLFWAPIENTRY glfwSetWindowSize( int width, int height ); -GLFWAPI void GLFWAPIENTRY glfwSetWindowPos( int x, int y ); -GLFWAPI void GLFWAPIENTRY glfwIconifyWindow( void ); -GLFWAPI void GLFWAPIENTRY glfwRestoreWindow( void ); -GLFWAPI void GLFWAPIENTRY glfwSwapBuffers( void ); -GLFWAPI void GLFWAPIENTRY glfwSwapInterval( int interval ); -GLFWAPI int GLFWAPIENTRY glfwGetWindowParam( int param ); -GLFWAPI void GLFWAPIENTRY glfwSetWindowSizeCallback( GLFWwindowsizefun cbfun ); -GLFWAPI void GLFWAPIENTRY glfwSetWindowCloseCallback( GLFWwindowclosefun cbfun ); -GLFWAPI void GLFWAPIENTRY glfwSetWindowRefreshCallback( GLFWwindowrefreshfun cbfun ); - -/* Video mode functions */ -GLFWAPI int GLFWAPIENTRY glfwGetVideoModes( GLFWvidmode *list, int maxcount ); -GLFWAPI void GLFWAPIENTRY glfwGetDesktopMode( GLFWvidmode *mode ); - -/* Input handling */ -GLFWAPI void GLFWAPIENTRY glfwPollEvents( void ); -GLFWAPI void GLFWAPIENTRY glfwWaitEvents( void ); -GLFWAPI int GLFWAPIENTRY glfwGetKey( int key ); -GLFWAPI int GLFWAPIENTRY glfwGetMouseButton( int button ); -GLFWAPI void GLFWAPIENTRY glfwGetMousePos( int *xpos, int *ypos ); -GLFWAPI void GLFWAPIENTRY glfwSetMousePos( int xpos, int ypos ); -GLFWAPI int GLFWAPIENTRY glfwGetMouseWheel( void ); -GLFWAPI void GLFWAPIENTRY glfwSetMouseWheel( int pos ); -GLFWAPI void GLFWAPIENTRY glfwSetKeyCallback( GLFWkeyfun cbfun ); -GLFWAPI void GLFWAPIENTRY glfwSetCharCallback( GLFWcharfun cbfun ); -GLFWAPI void GLFWAPIENTRY glfwSetMouseButtonCallback( GLFWmousebuttonfun cbfun ); -GLFWAPI void GLFWAPIENTRY glfwSetMousePosCallback( GLFWmouseposfun cbfun ); -GLFWAPI void GLFWAPIENTRY glfwSetMouseWheelCallback( GLFWmousewheelfun cbfun ); - -/* Joystick input */ -GLFWAPI int GLFWAPIENTRY glfwGetJoystickParam( int joy, int param ); -GLFWAPI int GLFWAPIENTRY glfwGetJoystickPos( int joy, float *pos, int numaxes ); -GLFWAPI int GLFWAPIENTRY glfwGetJoystickButtons( int joy, unsigned char *buttons, int numbuttons ); - -/* Time */ -GLFWAPI double GLFWAPIENTRY glfwGetTime( void ); -GLFWAPI void GLFWAPIENTRY glfwSetTime( double time ); -GLFWAPI void GLFWAPIENTRY glfwSleep( double time ); - -/* Extension support */ -GLFWAPI int GLFWAPIENTRY glfwExtensionSupported( const char *extension ); -GLFWAPI void* GLFWAPIENTRY glfwGetProcAddress( const char *procname ); -GLFWAPI void GLFWAPIENTRY glfwGetGLVersion( int *major, int *minor, int *rev ); - -/* Threading support */ -GLFWAPI GLFWthread GLFWAPIENTRY glfwCreateThread( GLFWthreadfun fun, void *arg ); -GLFWAPI void GLFWAPIENTRY glfwDestroyThread( GLFWthread ID ); -GLFWAPI int GLFWAPIENTRY glfwWaitThread( GLFWthread ID, int waitmode ); -GLFWAPI GLFWthread GLFWAPIENTRY glfwGetThreadID( void ); -GLFWAPI GLFWmutex GLFWAPIENTRY glfwCreateMutex( void ); -GLFWAPI void GLFWAPIENTRY glfwDestroyMutex( GLFWmutex mutex ); -GLFWAPI void GLFWAPIENTRY glfwLockMutex( GLFWmutex mutex ); -GLFWAPI void GLFWAPIENTRY glfwUnlockMutex( GLFWmutex mutex ); -GLFWAPI GLFWcond GLFWAPIENTRY glfwCreateCond( void ); -GLFWAPI void GLFWAPIENTRY glfwDestroyCond( GLFWcond cond ); -GLFWAPI void GLFWAPIENTRY glfwWaitCond( GLFWcond cond, GLFWmutex mutex, double timeout ); -GLFWAPI void GLFWAPIENTRY glfwSignalCond( GLFWcond cond ); -GLFWAPI void GLFWAPIENTRY glfwBroadcastCond( GLFWcond cond ); -GLFWAPI int GLFWAPIENTRY glfwGetNumberOfProcessors( void ); - -/* Enable/disable functions */ -GLFWAPI void GLFWAPIENTRY glfwEnable( int token ); -GLFWAPI void GLFWAPIENTRY glfwDisable( int token ); - -/* Image/texture I/O support */ -GLFWAPI int GLFWAPIENTRY glfwReadImage( const char *name, GLFWimage *img, int flags ); -GLFWAPI int GLFWAPIENTRY glfwReadMemoryImage( const void *data, long size, GLFWimage *img, int flags ); -GLFWAPI void GLFWAPIENTRY glfwFreeImage( GLFWimage *img ); -GLFWAPI int GLFWAPIENTRY glfwLoadTexture2D( const char *name, int flags ); -GLFWAPI int GLFWAPIENTRY glfwLoadMemoryTexture2D( const void *data, long size, int flags ); -GLFWAPI int GLFWAPIENTRY glfwLoadTextureImage2D( GLFWimage *img, int flags ); - - -#ifdef __cplusplus -} -#endif - -#endif /* __glfw_h_ */ - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_enable.m b/Core/SVS/glfw/lib/cocoa/cocoa_enable.m deleted file mode 100644 index 7e194766c7..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_enable.m +++ /dev/null @@ -1,51 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Enable and disable system keys -//======================================================================== - -void _glfwPlatformEnableSystemKeys( void ) -{ - // This is checked in macosx_window.m; we take no action here -} - -void _glfwPlatformDisableSystemKeys( void ) -{ - // This is checked in macosx_window.m; we take no action here - // I don't think it's really possible to disable stuff like Exposé - // except in full-screen mode. -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_fullscreen.m b/Core/SVS/glfw/lib/cocoa/cocoa_fullscreen.m deleted file mode 100644 index 9a7e3f58af..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_fullscreen.m +++ /dev/null @@ -1,104 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -//======================================================================== -// Check whether the display mode should be included in enumeration -//======================================================================== - -static BOOL modeIsGood( NSDictionary *mode ) -{ - // This is a bit controversial, if you've got something other than an - // LCD computer monitor as an output device you might not want these - // checks. You might also want to reject modes which are interlaced, - // or TV out. There is no one-size-fits-all policy that can work here. - // This seems like a decent compromise, but certain applications may - // wish to patch this... - return [[mode objectForKey:(id)kCGDisplayBitsPerPixel] intValue] >= 15 && - [mode objectForKey:(id)kCGDisplayModeIsSafeForHardware] != nil && - [mode objectForKey:(id)kCGDisplayModeIsStretched] == nil; -} - - -//======================================================================== -// Convert Core Graphics display mode to GLFW video mode -//======================================================================== - -static GLFWvidmode vidmodeFromCGDisplayMode( NSDictionary *mode ) -{ - unsigned int width = [[mode objectForKey:(id)kCGDisplayWidth] unsignedIntValue]; - unsigned int height = [[mode objectForKey:(id)kCGDisplayHeight] unsignedIntValue]; - unsigned int bps = [[mode objectForKey:(id)kCGDisplayBitsPerSample] unsignedIntValue]; - - GLFWvidmode result; - result.Width = width; - result.Height = height; - result.RedBits = bps; - result.GreenBits = bps; - result.BlueBits = bps; - return result; -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Get a list of available video modes -//======================================================================== - -int _glfwPlatformGetVideoModes( GLFWvidmode *list, int maxcount ) -{ - NSArray *modes = (NSArray *)CGDisplayAvailableModes( CGMainDisplayID() ); - - unsigned int i, j = 0, n = [modes count]; - for( i = 0; i < n && j < (unsigned)maxcount; i++ ) - { - NSDictionary *mode = [modes objectAtIndex:i]; - if( modeIsGood( mode ) ) - { - list[j++] = vidmodeFromCGDisplayMode( mode ); - } - } - - return j; -} - - -//======================================================================== -// Get the desktop video mode -//======================================================================== - -void _glfwPlatformGetDesktopMode( GLFWvidmode *mode ) -{ - *mode = vidmodeFromCGDisplayMode( CGDisplayCurrentMode( CGMainDisplayID() ) ); -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_glext.m b/Core/SVS/glfw/lib/cocoa/cocoa_glext.m deleted file mode 100644 index b1288be1ba..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_glext.m +++ /dev/null @@ -1,64 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Check if an OpenGL extension is available at runtime -//======================================================================== - -int _glfwPlatformExtensionSupported( const char *extension ) -{ - // There are no AGL, CGL or NSGL extensions. - return GL_FALSE; -} - - -//======================================================================== -// Get the function pointer to an OpenGL function -//======================================================================== - -void * _glfwPlatformGetProcAddress( const char *procname ) -{ - CFStringRef symbolName = CFStringCreateWithCString( kCFAllocatorDefault, - procname, - kCFStringEncodingASCII ); - - void *symbol = CFBundleGetFunctionPointerForName( _glfwLibrary.OpenGLFramework, - symbolName ); - - CFRelease( symbolName ); - - return symbol; -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_init.m b/Core/SVS/glfw/lib/cocoa/cocoa_init.m deleted file mode 100644 index bd9be571b3..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_init.m +++ /dev/null @@ -1,195 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include - -#include "internal.h" - -@interface GLFWThread : NSThread -@end - -@implementation GLFWThread - -- (void)main -{ -} - -@end - -//======================================================================== -// Change to our application bundle's resources directory, if present -//======================================================================== - -static void changeToResourcesDirectory( void ) -{ - char resourcesPath[MAXPATHLEN]; - - CFBundleRef bundle = CFBundleGetMainBundle(); - if( !bundle ) - return; - - CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL( bundle ); - - CFStringRef last = CFURLCopyLastPathComponent( resourcesURL ); - if( CFStringCompare( CFSTR( "Resources" ), last, 0 ) != kCFCompareEqualTo ) - { - CFRelease( last ); - CFRelease( resourcesURL ); - return; - } - - CFRelease( last ); - - if( !CFURLGetFileSystemRepresentation( resourcesURL, - true, - (UInt8*) resourcesPath, - MAXPATHLEN) ) - { - CFRelease( resourcesURL ); - return; - } - - CFRelease( resourcesURL ); - - chdir( resourcesPath ); -} - - -//======================================================================== -// Terminate GLFW when exiting application -//======================================================================== - -static void glfw_atexit( void ) -{ - glfwTerminate(); -} - - -//======================================================================== -// Initialize GLFW thread package -//======================================================================== - -static void initThreads( void ) -{ - // Initialize critical section handle - (void) pthread_mutex_init( &_glfwThrd.CriticalSection, NULL ); - - // The first thread (the main thread) has ID 0 - _glfwThrd.NextID = 0; - - // Fill out information about the main thread (this thread) - _glfwThrd.First.ID = _glfwThrd.NextID ++; - _glfwThrd.First.Function = NULL; - _glfwThrd.First.PosixID = pthread_self(); - _glfwThrd.First.Previous = NULL; - _glfwThrd.First.Next = NULL; -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Initialize the GLFW library -//======================================================================== - -int _glfwPlatformInit( void ) -{ - _glfwLibrary.autoreleasePool = [[NSAutoreleasePool alloc] init]; - - _glfwLibrary.OpenGLFramework = - CFBundleGetBundleWithIdentifier( CFSTR( "com.apple.opengl" ) ); - if( _glfwLibrary.OpenGLFramework == NULL ) - { - return GL_FALSE; - } - - GLFWThread* thread = [[GLFWThread alloc] init]; - [thread start]; - [thread release]; - - changeToResourcesDirectory(); - - _glfwPlatformGetDesktopMode( &_glfwLibrary.desktopMode ); - - // Install atexit routine - atexit( glfw_atexit ); - - initThreads(); - - _glfwInitTimer(); - - _glfwInitJoysticks(); - - _glfwLibrary.eventSource = CGEventSourceCreate( kCGEventSourceStateHIDSystemState ); - if( !_glfwLibrary.eventSource ) - { - return GL_FALSE; - } - - CGEventSourceSetLocalEventsSuppressionInterval( _glfwLibrary.eventSource, - 0.0 ); - - _glfwPlatformSetTime( 0.0 ); - - return GL_TRUE; -} - - -//======================================================================== -// Close window, if open, and shut down GLFW -//======================================================================== - -int _glfwPlatformTerminate( void ) -{ - if( pthread_self() != _glfwThrd.First.PosixID ) - { - return GL_FALSE; - } - - glfwCloseWindow(); - - // TODO: Kill all non-main threads? - // TODO: Probably other cleanup - - if( _glfwLibrary.eventSource ) - { - CFRelease( _glfwLibrary.eventSource ); - _glfwLibrary.eventSource = NULL; - } - - _glfwTerminateJoysticks(); - - [_glfwLibrary.autoreleasePool release]; - _glfwLibrary.autoreleasePool = nil; - - return GL_TRUE; -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_joystick.m b/Core/SVS/glfw/lib/cocoa/cocoa_joystick.m deleted file mode 100644 index fa1976ad59..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_joystick.m +++ /dev/null @@ -1,648 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - - -//------------------------------------------------------------------------ -// Joystick state -//------------------------------------------------------------------------ - -typedef struct -{ - int present; - char product[256]; - - IOHIDDeviceInterface** interface; - - int numAxes; - int numButtons; - int numHats; - - CFMutableArrayRef axes; - CFMutableArrayRef buttons; - CFMutableArrayRef hats; - -} _glfwJoystick; - -static _glfwJoystick _glfwJoysticks[GLFW_JOYSTICK_LAST + 1]; - - -typedef struct -{ - IOHIDElementCookie cookie; - - long value; - - long min; - long max; - - long minReport; - long maxReport; - -} _glfwJoystickElement; - - -void GetElementsCFArrayHandler( const void* value, void* parameter ); - - -//======================================================================== -// Adds an element to the specified joystick -//======================================================================== - -static void addJoystickElement( _glfwJoystick* joystick, CFTypeRef refElement ) -{ - long elementType, usagePage, usage; - CFTypeRef refElementType, refUsagePage, refUsage; - - refElementType = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementTypeKey ) ); - refUsagePage = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementUsagePageKey ) ); - refUsage = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementUsageKey ) ); - - CFMutableArrayRef elementsArray = NULL; - - CFNumberGetValue( refElementType, kCFNumberLongType, &elementType ); - CFNumberGetValue( refUsagePage, kCFNumberLongType, &usagePage ); - CFNumberGetValue( refUsage, kCFNumberLongType, &usage ); - - if( elementType == kIOHIDElementTypeInput_Axis || - elementType == kIOHIDElementTypeInput_Button || - elementType == kIOHIDElementTypeInput_Misc ) - { - switch( usagePage ) /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */ - { - case kHIDPage_GenericDesktop: - { - switch( usage ) - { - case kHIDUsage_GD_X: - case kHIDUsage_GD_Y: - case kHIDUsage_GD_Z: - case kHIDUsage_GD_Rx: - case kHIDUsage_GD_Ry: - case kHIDUsage_GD_Rz: - case kHIDUsage_GD_Slider: - case kHIDUsage_GD_Dial: - case kHIDUsage_GD_Wheel: - joystick->numAxes++; - elementsArray = joystick->axes; - break; - case kHIDUsage_GD_Hatswitch: - joystick->numHats++; - elementsArray = joystick->hats; - break; - } - - break; - } - - case kHIDPage_Button: - joystick->numButtons++; - elementsArray = joystick->buttons; - break; - default: - break; - } - - if( elementsArray ) - { - long number; - CFTypeRef refType; - - _glfwJoystickElement* element = (_glfwJoystickElement*) malloc( sizeof( _glfwJoystickElement ) ); - - CFArrayAppendValue( elementsArray, element ); - - refType = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementCookieKey ) ); - if( refType && CFNumberGetValue( refType, kCFNumberLongType, &number ) ) - { - element->cookie = (IOHIDElementCookie) number; - } - - refType = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementMinKey ) ); - if( refType && CFNumberGetValue( refType, kCFNumberLongType, &number ) ) - { - element->minReport = element->min = number; - } - - refType = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementMaxKey ) ); - if( refType && CFNumberGetValue( refType, kCFNumberLongType, &number ) ) - { - element->maxReport = element->max = number; - } - } - } - else - { - CFTypeRef refElementTop = CFDictionaryGetValue( refElement, CFSTR( kIOHIDElementKey ) ); - if( refElementTop ) - { - CFTypeID type = CFGetTypeID( refElementTop ); - if( type == CFArrayGetTypeID() ) /* if element is an array */ - { - CFRange range = { 0, CFArrayGetCount( refElementTop ) }; - CFArrayApplyFunction( refElementTop, range, GetElementsCFArrayHandler, joystick ); - } - } - } -} - - -//======================================================================== -// Adds an element to the specified joystick -//======================================================================== - -void GetElementsCFArrayHandler( const void* value, void* parameter ) -{ - if( CFGetTypeID( value ) == CFDictionaryGetTypeID() ) - { - addJoystickElement( (_glfwJoystick*) parameter, (CFTypeRef) value ); - } -} - - -//======================================================================== -// Returns the value of the specified element of the specified joystick -//======================================================================== - -static long getElementValue( _glfwJoystick* joystick, _glfwJoystickElement* element ) -{ - IOReturn result = kIOReturnSuccess; - IOHIDEventStruct hidEvent; - hidEvent.value = 0; - - if( joystick && element && joystick->interface ) - { - result = (*(joystick->interface))->getElementValue( joystick->interface, - element->cookie, - &hidEvent ); - if( kIOReturnSuccess == result ) - { - /* record min and max for auto calibration */ - if( hidEvent.value < element->minReport ) - { - element->minReport = hidEvent.value; - } - if( hidEvent.value > element->maxReport ) - { - element->maxReport = hidEvent.value; - } - } - } - - /* auto user scale */ - return (long) hidEvent.value; -} - - -//======================================================================== -// Removes the specified joystick -//======================================================================== - -static void removeJoystick( _glfwJoystick* joystick ) -{ - int i; - - if( joystick->present ) - { - joystick->present = GL_FALSE; - - for( i = 0; i < joystick->numAxes; i++ ) - { - _glfwJoystickElement* axes = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick->axes, i ); - free( axes ); - } - CFArrayRemoveAllValues( joystick->axes ); - joystick->numAxes = 0; - - for( i = 0; i < joystick->numButtons; i++ ) - { - _glfwJoystickElement* button = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick->buttons, i ); - free( button ); - } - CFArrayRemoveAllValues( joystick->buttons ); - joystick->numButtons = 0; - - for( i = 0; i < joystick->numHats; i++ ) - { - _glfwJoystickElement* hat = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick->hats, i ); - free( hat ); - } - CFArrayRemoveAllValues( joystick->hats ); - joystick->hats = 0; - - (*(joystick->interface))->close( joystick->interface ); - (*(joystick->interface))->Release( joystick->interface ); - - joystick->interface = NULL; - } -} - - -//======================================================================== -// Callback for user-initiated joystick removal -//======================================================================== - -static void removalCallback( void* target, IOReturn result, void* refcon, void* sender ) -{ - removeJoystick( (_glfwJoystick*) refcon ); -} - - -//======================================================================== -// Polls for joystick events and updates GFLW state -//======================================================================== - -static void pollJoystickEvents( void ) -{ - int i; - CFIndex j; - - for( i = 0; i < GLFW_JOYSTICK_LAST + 1; i++ ) - { - _glfwJoystick* joystick = &_glfwJoysticks[i]; - - if( joystick->present ) - { - for( j = 0; j < joystick->numButtons; j++ ) - { - _glfwJoystickElement* button = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick->buttons, j ); - button->value = getElementValue( joystick, button ); - } - - for( j = 0; j < joystick->numAxes; j++ ) - { - _glfwJoystickElement* axes = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick->axes, j ); - axes->value = getElementValue( joystick, axes ); - } - - for( j = 0; j < joystick->numHats; j++ ) - { - _glfwJoystickElement* hat = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick->hats, j ); - hat->value = getElementValue( joystick, hat ); - } - } - } -} - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Initialize joystick interface -//======================================================================== - -void _glfwInitJoysticks( void ) -{ - int deviceCounter = 0; - IOReturn result = kIOReturnSuccess; - mach_port_t masterPort = 0; - io_iterator_t objectIterator = 0; - CFMutableDictionaryRef hidMatchDictionary = NULL; - io_object_t ioHIDDeviceObject = 0; - - result = IOMasterPort( bootstrap_port, &masterPort ); - hidMatchDictionary = IOServiceMatching( kIOHIDDeviceKey ); - if( kIOReturnSuccess != result || !hidMatchDictionary ) - { - if( hidMatchDictionary ) - { - CFRelease( hidMatchDictionary ); - } - - return; - } - - result = IOServiceGetMatchingServices( masterPort, - hidMatchDictionary, - &objectIterator ); - if( result != kIOReturnSuccess ) - { - return; - } - - if( !objectIterator ) /* there are no joysticks */ - { - return; - } - - while( ( ioHIDDeviceObject = IOIteratorNext( objectIterator ) ) ) - { - CFMutableDictionaryRef hidProperties = 0; - kern_return_t result; - CFTypeRef refCF = 0; - - IOCFPlugInInterface** ppPlugInInterface = NULL; - HRESULT plugInResult = S_OK; - SInt32 score = 0; - - long usagePage, usage; - - result = IORegistryEntryCreateCFProperties( ioHIDDeviceObject, - &hidProperties, - kCFAllocatorDefault, - kNilOptions ); - - if( result != kIOReturnSuccess ) - { - continue; - } - - /* Check device type */ - refCF = CFDictionaryGetValue( hidProperties, CFSTR( kIOHIDPrimaryUsagePageKey ) ); - if( refCF ) - { - CFNumberGetValue( refCF, kCFNumberLongType, &usagePage ); - if( usagePage != kHIDPage_GenericDesktop ) - { - /* We are not interested in this device */ - continue; - } - } - - refCF = CFDictionaryGetValue( hidProperties, CFSTR( kIOHIDPrimaryUsageKey ) ); - if( refCF ) - { - CFNumberGetValue( refCF, kCFNumberLongType, &usage ); - - if( usage != kHIDUsage_GD_Joystick && - usage != kHIDUsage_GD_GamePad && - usage != kHIDUsage_GD_MultiAxisController ) - { - /* We are not interested in this device */ - continue; - } - } - - _glfwJoystick* joystick = &_glfwJoysticks[deviceCounter]; - - joystick->present = GL_TRUE; - - result = IOCreatePlugInInterfaceForService( ioHIDDeviceObject, - kIOHIDDeviceUserClientTypeID, - kIOCFPlugInInterfaceID, - &ppPlugInInterface, - &score ); - - if( kIOReturnSuccess != result ) - { - return; - } - - plugInResult = (*ppPlugInInterface)->QueryInterface( ppPlugInInterface, - CFUUIDGetUUIDBytes( kIOHIDDeviceInterfaceID ), - (void *) &(joystick->interface) ); - - if( plugInResult != S_OK ) - { - return; - } - - (*ppPlugInInterface)->Release( ppPlugInInterface ); - - (*(joystick->interface))->open( joystick->interface, 0 ); - (*(joystick->interface))->setRemovalCallback( joystick->interface, - removalCallback, - joystick, - joystick ); - - /* Get product string */ - refCF = CFDictionaryGetValue( hidProperties, CFSTR( kIOHIDProductKey ) ); - if( refCF ) - { - CFStringGetCString( refCF, - (char*) &(joystick->product), - 256, - CFStringGetSystemEncoding() ); - } - - joystick->numAxes = 0; - joystick->numButtons = 0; - joystick->numHats = 0; - joystick->axes = CFArrayCreateMutable( NULL, 0, NULL ); - joystick->buttons = CFArrayCreateMutable( NULL, 0, NULL ); - joystick->hats = CFArrayCreateMutable( NULL, 0, NULL ); - - CFTypeRef refTopElement = CFDictionaryGetValue( hidProperties, - CFSTR( kIOHIDElementKey ) ); - CFTypeID type = CFGetTypeID( refTopElement ); - if( type == CFArrayGetTypeID() ) - { - CFRange range = { 0, CFArrayGetCount( refTopElement ) }; - CFArrayApplyFunction( refTopElement, - range, - GetElementsCFArrayHandler, - (void*) joystick); - } - - deviceCounter++; - } -} - - -//======================================================================== -// Close all opened joystick handles -//======================================================================== - -void _glfwTerminateJoysticks( void ) -{ - int i; - - for( i = 0; i < GLFW_JOYSTICK_LAST + 1; i++ ) - { - _glfwJoystick* joystick = &_glfwJoysticks[i]; - removeJoystick( joystick ); - } -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Determine joystick capabilities -//======================================================================== - -int _glfwPlatformGetJoystickParam( int joy, int param ) -{ - if( !_glfwJoysticks[joy].present ) - { - // TODO: Figure out if this is an error - return GL_FALSE; - } - - switch( param ) - { - case GLFW_PRESENT: - return GL_TRUE; - - case GLFW_AXES: - return (int) CFArrayGetCount( _glfwJoysticks[joy].axes ); - - case GLFW_BUTTONS: - return (int) CFArrayGetCount( _glfwJoysticks[joy].buttons ) + - ((int) CFArrayGetCount( _glfwJoysticks[joy].hats )) * 4; - - default: - break; - } - - return GL_FALSE; -} - - -//======================================================================== -// Get joystick axis positions -//======================================================================== - -int _glfwPlatformGetJoystickPos( int joy, float *pos, int numaxes ) -{ - int i; - - if( joy < GLFW_JOYSTICK_1 || joy > GLFW_JOYSTICK_LAST ) - { - return 0; - } - - _glfwJoystick joystick = _glfwJoysticks[joy]; - - if( !joystick.present ) - { - // TODO: Figure out if this is an error - return 0; - } - - numaxes = numaxes < joystick.numAxes ? numaxes : joystick.numAxes; - - // Update joystick state - pollJoystickEvents(); - - for( i = 0; i < numaxes; i++ ) - { - _glfwJoystickElement* axes = - (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick.axes, i ); - - long readScale = axes->maxReport - axes->minReport; - - if( readScale == 0 ) - { - pos[i] = axes->value; - } - else - { - pos[i] = (2.0f * (axes->value - axes->minReport) / readScale) - 1.0f; - } - - //printf("%ld, %ld, %ld\n", axes->value, axes->minReport, axes->maxReport); - - if( i & 1 ) - { - pos[i] = -pos[i]; - } - } - - return numaxes; -} - - -//======================================================================== -// Get joystick button states -//======================================================================== - -int _glfwPlatformGetJoystickButtons( int joy, unsigned char *buttons, int numbuttons ) -{ - int i, j, button; - - if( joy < GLFW_JOYSTICK_1 || joy > GLFW_JOYSTICK_LAST ) - { - return 0; - } - - _glfwJoystick joystick = _glfwJoysticks[joy]; - - if( !joystick.present ) - { - // TODO: Figure out if this is an error - return 0; - } - - // Update joystick state - pollJoystickEvents(); - - for( button = 0; button < numbuttons && button < joystick.numButtons; button++ ) - { - _glfwJoystickElement* element = (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick.buttons, button ); - buttons[button] = element->value ? GLFW_PRESS : GLFW_RELEASE; - } - - // Virtual buttons - Inject data from hats - // Each hat is exposed as 4 buttons which exposes 8 directions with concurrent button presses - - const int directions[9] = { 1, 3, 2, 6, 4, 12, 8, 9, 0 }; // Bit fields of button presses for each direction, including nil - - for( i = 0; i < joystick.numHats; i++ ) - { - _glfwJoystickElement* hat = (_glfwJoystickElement*) CFArrayGetValueAtIndex( joystick.hats, i ); - int value = hat->value; - if( value < 0 || value > 8 ) - { - value = 8; - } - - for( j = 0; j < 4 && button < numbuttons; j++ ) - { - buttons[button++] = directions[value] & (1 << j) ? GLFW_PRESS : GLFW_RELEASE; - } - } - - return button; -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_thread.c b/Core/SVS/glfw/lib/cocoa/cocoa_thread.c deleted file mode 100644 index baaf989238..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_thread.c +++ /dev/null @@ -1,414 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include -#include - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// _glfwNewThread() - This is simply a "wrapper" for calling the user -// thread function. -//======================================================================== - -void * _glfwNewThread( void * arg ) -{ - GLFWthreadfun threadfun; - _GLFWthread *t; - - // Get pointer to thread information for current thread - t = _glfwGetThreadPointer( glfwGetThreadID() ); - if( t == NULL ) - { - return 0; - } - - // Get user thread function pointer - threadfun = t->Function; - - // Call the user thread function - threadfun( arg ); - - // Remove thread from thread list - ENTER_THREAD_CRITICAL_SECTION - _glfwRemoveThread( t ); - LEAVE_THREAD_CRITICAL_SECTION - - // When the thread function returns, the thread will die... - return NULL; -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// _glfwPlatformCreateThread() - Create a new thread -//======================================================================== - -GLFWthread _glfwPlatformCreateThread( GLFWthreadfun fun, void *arg ) -{ - GLFWthread ID; - _GLFWthread *t; - int result; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Create a new thread information memory area - t = (_GLFWthread *) malloc( sizeof(_GLFWthread) ); - if( t == NULL ) - { - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - return -1; - } - - // Get a new unique thread id - ID = _glfwThrd.NextID ++; - - // Store thread information in the thread list - t->Function = fun; - t->ID = ID; - - // Create thread - result = pthread_create( - &t->PosixID, // Thread handle - NULL, // Default thread attributes - _glfwNewThread, // Thread function (a wrapper function) - (void *)arg // Argument to thread is user argument - ); - - // Did the thread creation fail? - if( result != 0 ) - { - free( (void *) t ); - LEAVE_THREAD_CRITICAL_SECTION - return -1; - } - - // Append thread to thread list - _glfwAppendThread( t ); - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Return the GLFW thread ID - return ID; -} - - -//======================================================================== -// _glfwPlatformDestroyThread() - Kill a thread. NOTE: THIS IS A VERY -// DANGEROUS OPERATION, AND SHOULD NOT BE USED EXCEPT IN EXTREME -// SITUATIONS! -//======================================================================== - -void _glfwPlatformDestroyThread( GLFWthread ID ) -{ - _GLFWthread *t; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Get thread information pointer - t = _glfwGetThreadPointer( ID ); - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return; - } - - // Simply murder the process, no mercy! - pthread_kill( t->PosixID, SIGKILL ); - - // Remove thread from thread list - _glfwRemoveThread( t ); - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION -} - - -//======================================================================== -// _glfwPlatformWaitThread() - Wait for a thread to die -//======================================================================== - -int _glfwPlatformWaitThread( GLFWthread ID, int waitmode ) -{ - pthread_t thread; - _GLFWthread *t; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Get thread information pointer - t = _glfwGetThreadPointer( ID ); - - // Is the thread already dead? - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return GL_TRUE; - } - - // If got this far, the thread is alive => polling returns FALSE - if( waitmode == GLFW_NOWAIT ) - { - LEAVE_THREAD_CRITICAL_SECTION - return GL_FALSE; - } - - // Get thread handle - thread = t->PosixID; - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Wait for thread to die - (void) pthread_join( thread, NULL ); - - return GL_TRUE; -} - - -//======================================================================== -// _glfwPlatformGetThreadID() - Return the thread ID for the current -// thread -//======================================================================== - -GLFWthread _glfwPlatformGetThreadID( void ) -{ - _GLFWthread *t; - GLFWthread ID = -1; - pthread_t posixID; - - // Get current thread ID - posixID = pthread_self(); - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Loop through entire list of threads to find the matching POSIX - // thread ID - for( t = &_glfwThrd.First; t != NULL; t = t->Next ) - { - if( t->PosixID == posixID ) - { - ID = t->ID; - break; - } - } - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Return the found GLFW thread identifier - return ID; -} - - -//======================================================================== -// _glfwPlatformCreateMutex() - Create a mutual exclusion object -//======================================================================== - -GLFWmutex _glfwPlatformCreateMutex( void ) -{ - pthread_mutex_t *mutex; - - // Allocate memory for mutex - mutex = (pthread_mutex_t *) malloc( sizeof( pthread_mutex_t ) ); - if( !mutex ) - { - return NULL; - } - - // Initialise a mutex object - (void) pthread_mutex_init( mutex, NULL ); - - // Cast to GLFWmutex and return - return (GLFWmutex) mutex; -} - - -//======================================================================== -// _glfwPlatformDestroyMutex() - Destroy a mutual exclusion object -//======================================================================== - -void _glfwPlatformDestroyMutex( GLFWmutex mutex ) -{ - // Destroy the mutex object - pthread_mutex_destroy( (pthread_mutex_t *) mutex ); - - // Free memory for mutex object - free( (void *) mutex ); -} - - -//======================================================================== -// _glfwPlatformLockMutex() - Request access to a mutex -//======================================================================== - -void _glfwPlatformLockMutex( GLFWmutex mutex ) -{ - // Wait for mutex to be released - (void) pthread_mutex_lock( (pthread_mutex_t *) mutex ); -} - - -//======================================================================== -// _glfwPlatformUnlockMutex() - Release a mutex -//======================================================================== - -void _glfwPlatformUnlockMutex( GLFWmutex mutex ) -{ - // Release mutex - pthread_mutex_unlock( (pthread_mutex_t *) mutex ); -} - - -//======================================================================== -// _glfwPlatformCreateCond() - Create a new condition variable object -//======================================================================== - -GLFWcond _glfwPlatformCreateCond( void ) -{ - pthread_cond_t *cond; - - // Allocate memory for condition variable - cond = (pthread_cond_t *) malloc( sizeof(pthread_cond_t) ); - if( !cond ) - { - return NULL; - } - - // Initialise condition variable - (void) pthread_cond_init( cond, NULL ); - - // Cast to GLFWcond and return - return (GLFWcond) cond; -} - - -//======================================================================== -// _glfwPlatformDestroyCond() - Destroy a condition variable object -//======================================================================== - -void _glfwPlatformDestroyCond( GLFWcond cond ) -{ - // Destroy the condition variable object - (void) pthread_cond_destroy( (pthread_cond_t *) cond ); - - // Free memory for condition variable object - free( (void *) cond ); -} - - -//======================================================================== -// _glfwPlatformWaitCond() - Wait for a condition to be raised -//======================================================================== - -void _glfwPlatformWaitCond( GLFWcond cond, GLFWmutex mutex, - double timeout ) -{ - struct timeval currenttime; - struct timespec wait; - long dt_sec, dt_usec; - - // Select infinite or timed wait - if( timeout >= GLFW_INFINITY ) - { - // Wait for condition (infinite wait) - (void) pthread_cond_wait( (pthread_cond_t *) cond, - (pthread_mutex_t *) mutex ); - } - else - { - // Set timeout time, relatvie to current time - gettimeofday( ¤ttime, NULL ); - dt_sec = (long) timeout; - dt_usec = (long) ((timeout - (double)dt_sec) * 1000000.0); - wait.tv_nsec = (currenttime.tv_usec + dt_usec) * 1000L; - if( wait.tv_nsec > 1000000000L ) - { - wait.tv_nsec -= 1000000000L; - dt_sec ++; - } - wait.tv_sec = currenttime.tv_sec + dt_sec; - - // Wait for condition (timed wait) - (void) pthread_cond_timedwait( (pthread_cond_t *) cond, - (pthread_mutex_t *) mutex, &wait ); - } -} - - -//======================================================================== -// _glfwPlatformSignalCond() - Signal a condition to one waiting thread -//======================================================================== - -void _glfwPlatformSignalCond( GLFWcond cond ) -{ - // Signal condition - (void) pthread_cond_signal( (pthread_cond_t *) cond ); -} - - -//======================================================================== -// _glfwPlatformBroadcastCond() - Broadcast a condition to all waiting -// threads -//======================================================================== - -void _glfwPlatformBroadcastCond( GLFWcond cond ) -{ - // Broadcast condition - (void) pthread_cond_broadcast( (pthread_cond_t *) cond ); -} - - -//======================================================================== -// _glfwPlatformGetNumberOfProcessors() - Return the number of processors -// in the system. -//======================================================================== - -int _glfwPlatformGetNumberOfProcessors( void ) -{ - int n; - - // Get number of processors online - _glfw_numprocessors( n ); - return n; -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_time.m b/Core/SVS/glfw/lib/cocoa/cocoa_time.m deleted file mode 100644 index 5765b1ba09..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_time.m +++ /dev/null @@ -1,135 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include -#include - - -//======================================================================== -// Return raw time -//======================================================================== - -static uint64_t getRawTime( void ) -{ - return mach_absolute_time(); -} - - -//======================================================================== -// Initialise timer -//======================================================================== - -void _glfwInitTimer( void ) -{ - mach_timebase_info_data_t info; - mach_timebase_info( &info ); - - _glfwLibrary.timer.resolution = (double) info.numer / ( info.denom * 1.0e9 ); - _glfwLibrary.timer.base = getRawTime(); -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Return timer value in seconds -//======================================================================== - -double _glfwPlatformGetTime( void ) -{ - return (double) ( getRawTime() - _glfwLibrary.timer.base ) * - _glfwLibrary.timer.resolution; -} - - -//======================================================================== -// Set timer value in seconds -//======================================================================== - -void _glfwPlatformSetTime( double time ) -{ - _glfwLibrary.timer.base = getRawTime() - - (uint64_t) ( time / _glfwLibrary.timer.resolution ); -} - - -//======================================================================== -// Put a thread to sleep for a specified amount of time -//======================================================================== - -void _glfwPlatformSleep( double time ) -{ - if( time == 0.0 ) - { - sched_yield(); - return; - } - - struct timeval currenttime; - struct timespec wait; - pthread_mutex_t mutex; - pthread_cond_t cond; - long dt_sec, dt_usec; - - // Not all pthread implementations have a pthread_sleep() function. We - // do it the portable way, using a timed wait for a condition that we - // will never signal. NOTE: The unistd functions sleep/usleep suspends - // the entire PROCESS, not a signle thread, which is why we can not - // use them to implement glfwSleep. - - // Set timeout time, relatvie to current time - gettimeofday( ¤ttime, NULL ); - dt_sec = (long) time; - dt_usec = (long) ((time - (double)dt_sec) * 1000000.0); - wait.tv_nsec = (currenttime.tv_usec + dt_usec) * 1000L; - if( wait.tv_nsec > 1000000000L ) - { - wait.tv_nsec -= 1000000000L; - dt_sec ++; - } - wait.tv_sec = currenttime.tv_sec + dt_sec; - - // Initialize condition and mutex objects - pthread_mutex_init( &mutex, NULL ); - pthread_cond_init( &cond, NULL ); - - // Do a timed wait - pthread_mutex_lock( &mutex ); - pthread_cond_timedwait( &cond, &mutex, &wait ); - pthread_mutex_unlock( &mutex ); - - // Destroy condition and mutex objects - pthread_mutex_destroy( &mutex ); - pthread_cond_destroy( &cond ); -} - diff --git a/Core/SVS/glfw/lib/cocoa/cocoa_window.m b/Core/SVS/glfw/lib/cocoa/cocoa_window.m deleted file mode 100644 index 3916737988..0000000000 --- a/Core/SVS/glfw/lib/cocoa/cocoa_window.m +++ /dev/null @@ -1,1139 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include - -// Needed for _NSGetProgname -#include - -//======================================================================== -// GLFW application class -//======================================================================== - -@interface GLFWApplication : NSApplication -@end - -@implementation GLFWApplication - -// From http://cocoadev.com/index.pl?GameKeyboardHandlingAlmost -// This works around an AppKit bug, where key up events while holding -// down the command key don't get sent to the key window. -- (void)sendEvent:(NSEvent *)event -{ - if( [event type] == NSKeyUp && ( [event modifierFlags] & NSCommandKeyMask ) ) - { - [[self keyWindow] sendEvent:event]; - } - else - { - [super sendEvent:event]; - } -} - -@end - -// Prior to Snow Leopard, we need to use this oddly-named semi-private API -// to get the application menu working properly. Need to be careful in -// case it goes away in a future OS update. -@interface NSApplication (NSAppleMenu) -- (void)setAppleMenu:(NSMenu *)m; -@end - -//======================================================================== -// Try to figure out what the calling application is called -//======================================================================== - -static NSString *findAppName( void ) -{ - // Keys to search for as potential application names - NSString *keys[] = - { - @"CFBundleDisplayName", - @"CFBundleName", - @"CFBundleExecutable", - }; - - NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; - - unsigned int i; - for( i = 0; i < sizeof(keys) / sizeof(keys[0]); i++ ) - { - id name = [infoDictionary objectForKey:keys[i]]; - if( name && - [name isKindOfClass:[NSString class]] && - ![@"" isEqualToString:name] ) - { - return name; - } - } - - // Could do this only if we discover we're unbundled, but it should - // do no harm... - ProcessSerialNumber psn = { 0, kCurrentProcess }; - TransformProcessType( &psn, kProcessTransformToForegroundApplication ); - - // Having the app in front of the terminal window is also generally - // handy. There is an NSApplication API to do this, but... - SetFrontProcess( &psn ); - - char **progname = _NSGetProgname(); - if( progname && *progname ) - { - // TODO: UTF8? - return [NSString stringWithUTF8String:*progname]; - } - - // Really shouldn't get here - return @"GLFW Application"; -} - - -//======================================================================== -// Set up the menu bar (manually) -// This is nasty, nasty stuff -- calls to undocumented semi-private APIs that -// could go away at any moment, lots of stuff that really should be -// localize(d|able), etc. Loading a nib would save us this horror, but that -// doesn't seem like a good thing to require of GLFW's clients. -//======================================================================== - -static void setUpMenuBar( void ) -{ - NSString *appName = findAppName(); - - NSMenu *bar = [[NSMenu alloc] init]; - [NSApp setMainMenu:bar]; - - NSMenuItem *appMenuItem = - [bar addItemWithTitle:@"" action:NULL keyEquivalent:@""]; - NSMenu *appMenu = [[NSMenu alloc] init]; - [appMenuItem setSubmenu:appMenu]; - - [appMenu addItemWithTitle:[NSString stringWithFormat:@"About %@", appName] - action:@selector(orderFrontStandardAboutPanel:) - keyEquivalent:@""]; - [appMenu addItem:[NSMenuItem separatorItem]]; - NSMenu *servicesMenu = [[NSMenu alloc] init]; - [NSApp setServicesMenu:servicesMenu]; - [[appMenu addItemWithTitle:@"Services" - action:NULL - keyEquivalent:@""] setSubmenu:servicesMenu]; - [appMenu addItem:[NSMenuItem separatorItem]]; - [appMenu addItemWithTitle:[NSString stringWithFormat:@"Hide %@", appName] - action:@selector(hide:) - keyEquivalent:@"h"]; - [[appMenu addItemWithTitle:@"Hide Others" - action:@selector(hideOtherApplications:) - keyEquivalent:@"h"] - setKeyEquivalentModifierMask:NSAlternateKeyMask | NSCommandKeyMask]; - [appMenu addItemWithTitle:@"Show All" - action:@selector(unhideAllApplications:) - keyEquivalent:@""]; - [appMenu addItem:[NSMenuItem separatorItem]]; - [appMenu addItemWithTitle:[NSString stringWithFormat:@"Quit %@", appName] - action:@selector(terminate:) - keyEquivalent:@"q"]; - - NSMenuItem *windowMenuItem = - [bar addItemWithTitle:@"" action:NULL keyEquivalent:@""]; - NSMenu *windowMenu = [[NSMenu alloc] initWithTitle:@"Window"]; - [NSApp setWindowsMenu:windowMenu]; - [windowMenuItem setSubmenu:windowMenu]; - - [windowMenu addItemWithTitle:@"Miniaturize" - action:@selector(performMiniaturize:) - keyEquivalent:@"m"]; - [windowMenu addItemWithTitle:@"Zoom" - action:@selector(performZoom:) - keyEquivalent:@""]; - [windowMenu addItem:[NSMenuItem separatorItem]]; - [windowMenu addItemWithTitle:@"Bring All to Front" - action:@selector(arrangeInFront:) - keyEquivalent:@""]; - - // At least guard the call to private API to avoid an exception if it - // goes away. Hopefully that means the worst we'll break in future is to - // look ugly... - if( [NSApp respondsToSelector:@selector(setAppleMenu:)] ) - { - [NSApp setAppleMenu:appMenu]; - } -} - - -//======================================================================== -// Initialize the Cocoa Application Kit -//======================================================================== - -static GLboolean initializeAppKit( void ) -{ - if( NSApp ) - { - return GL_TRUE; - } - - // Implicitly create shared NSApplication instance - [GLFWApplication sharedApplication]; - - // Setting up the menu bar must go between sharedApplication - // above and finishLaunching below, in order to properly emulate the - // behavior of NSApplicationMain - setUpMenuBar(); - - [NSApp finishLaunching]; - - return GL_TRUE; -} - - -//======================================================================== -// Delegate for window related notifications -// (but also used as an application delegate) -//======================================================================== - -@interface GLFWWindowDelegate : NSObject -@end - -@implementation GLFWWindowDelegate - -- (BOOL)windowShouldClose:(id)window -{ - if( _glfwWin.windowCloseCallback ) - { - if( !_glfwWin.windowCloseCallback() ) - { - return NO; - } - } - - // This is horribly ugly, but it works - glfwCloseWindow(); - return NO; -} - -- (void)windowDidResize:(NSNotification *)notification -{ - [_glfwWin.context update]; - - NSRect contentRect = - [_glfwWin.window contentRectForFrameRect:[_glfwWin.window frame]]; - _glfwWin.width = contentRect.size.width; - _glfwWin.height = contentRect.size.height; - - if( _glfwWin.windowSizeCallback ) - { - _glfwWin.windowSizeCallback( _glfwWin.width, _glfwWin.height ); - } -} - -- (void)windowDidMove:(NSNotification *)notification -{ - NSPoint point = [_glfwWin.window mouseLocationOutsideOfEventStream]; - _glfwInput.MousePosX = lround(floor(point.x)); - _glfwInput.MousePosY = _glfwWin.height - lround(ceil(point.y)); - - if( _glfwWin.mousePosCallback ) - { - _glfwWin.mousePosCallback( _glfwInput.MousePosX, _glfwInput.MousePosY ); - } -} - -- (void)windowDidMiniaturize:(NSNotification *)notification -{ - _glfwWin.iconified = GL_TRUE; -} - -- (void)windowDidDeminiaturize:(NSNotification *)notification -{ - _glfwWin.iconified = GL_FALSE; -} - -- (void)windowDidBecomeKey:(NSNotification *)notification -{ - _glfwWin.active = GL_TRUE; -} - -- (void)windowDidResignKey:(NSNotification *)notification -{ - _glfwWin.active = GL_FALSE; - _glfwInputDeactivation(); -} - -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender -{ - if( _glfwWin.windowCloseCallback ) - { - if( !_glfwWin.windowCloseCallback() ) - { - return NSTerminateCancel; - } - } - - // This is horribly ugly, but it works - glfwCloseWindow(); - return NSTerminateCancel; -} - -@end - -//======================================================================== -// Converts a Mac OS X keycode to a GLFW keycode -//======================================================================== - -static int convertMacKeyCode( unsigned int macKeyCode ) -{ - // TODO: Need to find mappings for F13-F15, volume down/up/mute, and eject. - static const unsigned int table[128] = - { - /* 00 */ 'A', - /* 01 */ 'S', - /* 02 */ 'D', - /* 03 */ 'F', - /* 04 */ 'H', - /* 05 */ 'G', - /* 06 */ 'Z', - /* 07 */ 'X', - /* 08 */ 'C', - /* 09 */ 'V', - /* 0a */ -1, - /* 0b */ 'B', - /* 0c */ 'Q', - /* 0d */ 'W', - /* 0e */ 'E', - /* 0f */ 'R', - /* 10 */ 'Y', - /* 11 */ 'T', - /* 12 */ '1', - /* 13 */ '2', - /* 14 */ '3', - /* 15 */ '4', - /* 16 */ '6', - /* 17 */ '5', - /* 18 */ '=', - /* 19 */ '9', - /* 1a */ '7', - /* 1b */ '-', - /* 1c */ '8', - /* 1d */ '0', - /* 1e */ ']', - /* 1f */ 'O', - /* 20 */ 'U', - /* 21 */ '[', - /* 22 */ 'I', - /* 23 */ 'P', - /* 24 */ GLFW_KEY_ENTER, - /* 25 */ 'L', - /* 26 */ 'J', - /* 27 */ '\'', - /* 28 */ 'K', - /* 29 */ ';', - /* 2a */ '\\', - /* 2b */ ',', - /* 2c */ '/', - /* 2d */ 'N', - /* 2e */ 'M', - /* 2f */ '.', - /* 30 */ GLFW_KEY_TAB, - /* 31 */ GLFW_KEY_SPACE, - /* 32 */ '`', - /* 33 */ GLFW_KEY_BACKSPACE, - /* 34 */ -1, - /* 35 */ GLFW_KEY_ESC, - /* 36 */ GLFW_KEY_RSUPER, - /* 37 */ GLFW_KEY_LSUPER, - /* 38 */ GLFW_KEY_LSHIFT, - /* 39 */ GLFW_KEY_CAPS_LOCK, - /* 3a */ GLFW_KEY_LALT, - /* 3b */ GLFW_KEY_LCTRL, - /* 3c */ GLFW_KEY_RSHIFT, - /* 3d */ GLFW_KEY_RALT, - /* 3e */ GLFW_KEY_RCTRL, - /* 3f */ -1, /*Function*/ - /* 40 */ GLFW_KEY_F17, - /* 41 */ GLFW_KEY_KP_DECIMAL, - /* 42 */ -1, - /* 43 */ GLFW_KEY_KP_MULTIPLY, - /* 44 */ -1, - /* 45 */ GLFW_KEY_KP_ADD, - /* 46 */ -1, - /* 47 */ -1, /*KeypadClear*/ - /* 48 */ -1, /*VolumeUp*/ - /* 49 */ -1, /*VolumeDown*/ - /* 4a */ -1, /*Mute*/ - /* 4b */ GLFW_KEY_KP_DIVIDE, - /* 4c */ GLFW_KEY_KP_ENTER, - /* 4d */ -1, - /* 4e */ GLFW_KEY_KP_SUBTRACT, - /* 4f */ GLFW_KEY_F18, - /* 50 */ GLFW_KEY_F19, - /* 51 */ GLFW_KEY_KP_EQUAL, - /* 52 */ GLFW_KEY_KP_0, - /* 53 */ GLFW_KEY_KP_1, - /* 54 */ GLFW_KEY_KP_2, - /* 55 */ GLFW_KEY_KP_3, - /* 56 */ GLFW_KEY_KP_4, - /* 57 */ GLFW_KEY_KP_5, - /* 58 */ GLFW_KEY_KP_6, - /* 59 */ GLFW_KEY_KP_7, - /* 5a */ GLFW_KEY_F20, - /* 5b */ GLFW_KEY_KP_8, - /* 5c */ GLFW_KEY_KP_9, - /* 5d */ -1, - /* 5e */ -1, - /* 5f */ -1, - /* 60 */ GLFW_KEY_F5, - /* 61 */ GLFW_KEY_F6, - /* 62 */ GLFW_KEY_F7, - /* 63 */ GLFW_KEY_F3, - /* 64 */ GLFW_KEY_F8, - /* 65 */ GLFW_KEY_F9, - /* 66 */ -1, - /* 67 */ GLFW_KEY_F11, - /* 68 */ -1, - /* 69 */ GLFW_KEY_F13, - /* 6a */ GLFW_KEY_F16, - /* 6b */ GLFW_KEY_F14, - /* 6c */ -1, - /* 6d */ GLFW_KEY_F10, - /* 6e */ -1, - /* 6f */ GLFW_KEY_F12, - /* 70 */ -1, - /* 71 */ GLFW_KEY_F15, - /* 72 */ GLFW_KEY_INSERT, /*Help*/ - /* 73 */ GLFW_KEY_HOME, - /* 74 */ GLFW_KEY_PAGEUP, - /* 75 */ GLFW_KEY_DEL, - /* 76 */ GLFW_KEY_F4, - /* 77 */ GLFW_KEY_END, - /* 78 */ GLFW_KEY_F2, - /* 79 */ GLFW_KEY_PAGEDOWN, - /* 7a */ GLFW_KEY_F1, - /* 7b */ GLFW_KEY_LEFT, - /* 7c */ GLFW_KEY_RIGHT, - /* 7d */ GLFW_KEY_DOWN, - /* 7e */ GLFW_KEY_UP, - /* 7f */ -1, - }; - - if( macKeyCode >= 128 ) - { - return -1; - } - - // This treats keycodes as *positional*; that is, we'll return 'a' - // for the key left of 's', even on an AZERTY keyboard. The charInput - // function should still get 'q' though. - return table[macKeyCode]; -} - - -//======================================================================== -// Content view class for the GLFW window -//======================================================================== - -@interface GLFWContentView : NSView -@end - -@implementation GLFWContentView - -- (BOOL)isOpaque -{ - return YES; -} - -- (BOOL)canBecomeKeyView -{ - return YES; -} - -- (BOOL)acceptsFirstResponder -{ - return YES; -} - -- (void)mouseDown:(NSEvent *)event -{ - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_LEFT, GLFW_PRESS ); -} - -- (void)mouseDragged:(NSEvent *)event -{ - [self mouseMoved:event]; -} - -- (void)mouseUp:(NSEvent *)event -{ - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_LEFT, GLFW_RELEASE ); -} - -- (void)mouseMoved:(NSEvent *)event -{ - if( _glfwWin.mouseLock ) - { - _glfwInput.MousePosX += [event deltaX]; - _glfwInput.MousePosY += [event deltaY]; - } - else - { - NSPoint p = [event locationInWindow]; - - // Cocoa coordinate system has origin at lower left - _glfwInput.MousePosX = p.x; - _glfwInput.MousePosY = _glfwWin.height - p.y; - } - - if( _glfwWin.mousePosCallback ) - { - _glfwWin.mousePosCallback( _glfwInput.MousePosX, _glfwInput.MousePosY ); - } -} - -- (void)rightMouseDown:(NSEvent *)event -{ - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_RIGHT, GLFW_PRESS ); -} - -- (void)rightMouseDragged:(NSEvent *)event -{ - [self mouseMoved:event]; -} - -- (void)rightMouseUp:(NSEvent *)event -{ - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_RIGHT, GLFW_RELEASE ); -} - -- (void)otherMouseDown:(NSEvent *)event -{ - _glfwInputMouseClick( [event buttonNumber], GLFW_PRESS ); -} - -- (void)otherMouseDragged:(NSEvent *)event -{ - [self mouseMoved:event]; -} - -- (void)otherMouseUp:(NSEvent *)event -{ - _glfwInputMouseClick( [event buttonNumber], GLFW_RELEASE ); -} - -- (void)keyDown:(NSEvent *)event -{ - NSUInteger length; - NSString* characters; - int i, code = convertMacKeyCode( [event keyCode] ); - - if( code != -1 ) - { - _glfwInputKey( code, GLFW_PRESS ); - - if( [event modifierFlags] & NSCommandKeyMask ) - { - if( !_glfwWin.sysKeysDisabled ) - { - [super keyDown:event]; - } - } - else - { - characters = [event characters]; - length = [characters length]; - - for( i = 0; i < length; i++ ) - { - _glfwInputChar( [characters characterAtIndex:i], GLFW_PRESS ); - } - } - } -} - -- (void)flagsChanged:(NSEvent *)event -{ - unsigned int newModifierFlags = [event modifierFlags] | NSDeviceIndependentModifierFlagsMask; - int mode; - - if( newModifierFlags > _glfwWin.modifierFlags ) - { - mode = GLFW_PRESS; - } - else - { - mode = GLFW_RELEASE; - } - - _glfwWin.modifierFlags = newModifierFlags; - _glfwInputKey( convertMacKeyCode( [event keyCode] ), mode ); -} - -- (void)keyUp:(NSEvent *)event -{ - NSUInteger length; - NSString* characters; - int i, code = convertMacKeyCode( [event keyCode] ); - - if( code != -1 ) - { - _glfwInputKey( code, GLFW_RELEASE ); - - characters = [event characters]; - length = [characters length]; - - for( i = 0; i < length; i++ ) - { - _glfwInputChar( [characters characterAtIndex:i], GLFW_RELEASE ); - } - } -} - -- (void)scrollWheel:(NSEvent *)event -{ - _glfwInput.WheelPosFloating += [event deltaY]; - _glfwInput.WheelPos = lrint( _glfwInput.WheelPosFloating ); - - if( _glfwWin.mouseWheelCallback ) - { - _glfwWin.mouseWheelCallback( _glfwInput.WheelPos ); - } -} - -@end - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Here is where the window is created, and the OpenGL rendering context is -// created -//======================================================================== - -int _glfwPlatformOpenWindow( int width, int height, - const _GLFWwndconfig *wndconfig, - const _GLFWfbconfig *fbconfig ) -{ - int colorBits; - - _glfwWin.windowNoResize = wndconfig->windowNoResize; - - if( !initializeAppKit() ) - { - return GL_FALSE; - } - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - // Fail if any OpenGL version above 2.1 other than 3.2 was requested - if( wndconfig->glMajor > 3 || - ( wndconfig->glMajor == 3 && wndconfig->glMinor != 2 ) ) - { - return GL_FALSE; - } - - if( wndconfig->glProfile ) - { - // Fail if a profile other than core was explicitly selected - if( wndconfig->glProfile != GLFW_OPENGL_CORE_PROFILE ) - { - return GL_FALSE; - } - } -#else - // Fail if OpenGL 3.0 or above was requested - if( wndconfig->glMajor > 2 ) - { - return GL_FALSE; - } -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ - - _glfwWin.delegate = [[GLFWWindowDelegate alloc] init]; - if( _glfwWin.delegate == nil ) - { - return GL_FALSE; - } - - [NSApp setDelegate:_glfwWin.delegate]; - - // Mac OS X needs non-zero color size, so set resonable values - colorBits = fbconfig->redBits + fbconfig->greenBits + fbconfig->blueBits; - if( colorBits == 0 ) - { - colorBits = 24; - } - else if( colorBits < 15 ) - { - colorBits = 15; - } - - // Ignored hints: - // OpenGLDebug - // pending it meaning anything on Mac OS X - - // Don't use accumulation buffer support; it's not accelerated - // Aux buffers probably aren't accelerated either - - CFDictionaryRef fullscreenMode = NULL; - if( wndconfig->mode == GLFW_FULLSCREEN ) - { - fullscreenMode = - // I think it's safe to pass 0 to the refresh rate for this function - // rather than conditionalizing the code to call the version which - // doesn't specify refresh... - CGDisplayBestModeForParametersAndRefreshRateWithProperty( - CGMainDisplayID(), - colorBits + fbconfig->alphaBits, - width, - height, - wndconfig->refreshRate, - // Controversial, see macosx_fullscreen.m for discussion - kCGDisplayModeIsSafeForHardware, - NULL); - - width = [[(id)fullscreenMode objectForKey:(id)kCGDisplayWidth] intValue]; - height = [[(id)fullscreenMode objectForKey:(id)kCGDisplayHeight] intValue]; - } - - unsigned int styleMask = 0; - if( wndconfig->mode == GLFW_WINDOW ) - { - styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask; - - if( !wndconfig->windowNoResize ) - { - styleMask |= NSResizableWindowMask; - } - } - else - { - styleMask = NSBorderlessWindowMask; - } - - _glfwWin.window = [[NSWindow alloc] - initWithContentRect:NSMakeRect( 0, 0, width, height ) - styleMask:styleMask - backing:NSBackingStoreBuffered - defer:NO]; - [_glfwWin.window setContentView:[[GLFWContentView alloc] init]]; - [_glfwWin.window setDelegate:_glfwWin.delegate]; - [_glfwWin.window setAcceptsMouseMovedEvents:YES]; - [_glfwWin.window center]; - - if( [_glfwWin.window respondsToSelector:@selector(setRestorable:)] ) - { - [_glfwWin.window setRestorable:NO]; - } - - if( wndconfig->mode == GLFW_FULLSCREEN ) - { - _glfwLibrary.originalMode = (NSDictionary*) - CGDisplayCurrentMode( CGMainDisplayID() ); - - CGCaptureAllDisplays(); - CGDisplaySwitchToMode( CGMainDisplayID(), fullscreenMode ); - } - - unsigned int attribute_count = 0; -#define ADD_ATTR(x) attributes[attribute_count++] = x -#define ADD_ATTR2(x, y) (void)({ ADD_ATTR(x); ADD_ATTR(y); }) -#define MAX_ATTRS 64 // urrgh - NSOpenGLPixelFormatAttribute attributes[MAX_ATTRS]; - - ADD_ATTR( NSOpenGLPFADoubleBuffer ); - - if( wndconfig->mode == GLFW_FULLSCREEN ) - { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 - ADD_ATTR( NSOpenGLPFAFullScreen ); -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ - - ADD_ATTR( NSOpenGLPFANoRecovery ); - ADD_ATTR2( NSOpenGLPFAScreenMask, - CGDisplayIDToOpenGLDisplayMask( CGMainDisplayID() ) ); - } - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - if( wndconfig->glMajor > 2 ) - { - ADD_ATTR2( NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core ); - } -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ - - ADD_ATTR2( NSOpenGLPFAColorSize, colorBits ); - - if( fbconfig->alphaBits > 0) - { - ADD_ATTR2( NSOpenGLPFAAlphaSize, fbconfig->alphaBits ); - } - - if( fbconfig->depthBits > 0) - { - ADD_ATTR2( NSOpenGLPFADepthSize, fbconfig->depthBits ); - } - - if( fbconfig->stencilBits > 0) - { - ADD_ATTR2( NSOpenGLPFAStencilSize, fbconfig->stencilBits ); - } - - int accumBits = fbconfig->accumRedBits + fbconfig->accumGreenBits + - fbconfig->accumBlueBits + fbconfig->accumAlphaBits; - - if( accumBits > 0) - { - ADD_ATTR2( NSOpenGLPFAAccumSize, accumBits ); - } - - if( fbconfig->auxBuffers > 0) - { - ADD_ATTR2( NSOpenGLPFAAuxBuffers, fbconfig->auxBuffers ); - } - - if( fbconfig->stereo) - { - ADD_ATTR( NSOpenGLPFAStereo ); - } - - if( fbconfig->samples > 0) - { - ADD_ATTR2( NSOpenGLPFASampleBuffers, 1 ); - ADD_ATTR2( NSOpenGLPFASamples, fbconfig->samples ); - } - - ADD_ATTR( 0 ); - - _glfwWin.pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; - if( _glfwWin.pixelFormat == nil ) - { - return GL_FALSE; - } - - _glfwWin.context = [[NSOpenGLContext alloc] initWithFormat:_glfwWin.pixelFormat - shareContext:nil]; - if( _glfwWin.context == nil ) - { - return GL_FALSE; - } - - [_glfwWin.window makeKeyAndOrderFront:nil]; - [_glfwWin.context setView:[_glfwWin.window contentView]]; - - if( wndconfig->mode == GLFW_FULLSCREEN ) - { - // TODO: Make this work on pre-Leopard systems - [[_glfwWin.window contentView] enterFullScreenMode:[NSScreen mainScreen] - withOptions:nil]; - } - - [_glfwWin.context makeCurrentContext]; - - NSPoint point = [_glfwWin.window mouseLocationOutsideOfEventStream]; - _glfwInput.MousePosX = point.x; - _glfwInput.MousePosY = _glfwWin.height - point.y; - - return GL_TRUE; -} - - -//======================================================================== -// Properly kill the window / video display -//======================================================================== - -void _glfwPlatformCloseWindow( void ) -{ - [_glfwWin.window orderOut:nil]; - - if( _glfwWin.fullscreen ) - { - [[_glfwWin.window contentView] exitFullScreenModeWithOptions:nil]; - CGDisplaySwitchToMode( CGMainDisplayID(), - (CFDictionaryRef)_glfwLibrary.originalMode ); - CGReleaseAllDisplays(); - } - - [_glfwWin.pixelFormat release]; - _glfwWin.pixelFormat = nil; - - [NSOpenGLContext clearCurrentContext]; - [_glfwWin.context release]; - _glfwWin.context = nil; - - [_glfwWin.window setDelegate:nil]; - [NSApp setDelegate:nil]; - [_glfwWin.delegate release]; - _glfwWin.delegate = nil; - - [_glfwWin.window close]; - _glfwWin.window = nil; - - // TODO: Probably more cleanup -} - - -//======================================================================== -// Set the window title -//======================================================================== - -void _glfwPlatformSetWindowTitle( const char *title ) -{ - [_glfwWin.window setTitle:[NSString stringWithCString:title - encoding:NSISOLatin1StringEncoding]]; -} - - -//======================================================================== -// Set the window size -//======================================================================== - -void _glfwPlatformSetWindowSize( int width, int height ) -{ - [_glfwWin.window setContentSize:NSMakeSize( width, height )]; -} - - -//======================================================================== -// Set the window position -//======================================================================== - -void _glfwPlatformSetWindowPos( int x, int y ) -{ - NSRect contentRect = [_glfwWin.window contentRectForFrameRect:[_glfwWin.window frame]]; - - // We assume here that the client code wants to position the window within the - // screen the window currently occupies - NSRect screenRect = [[_glfwWin.window screen] visibleFrame]; - contentRect.origin = NSMakePoint(screenRect.origin.x + x, - screenRect.origin.y + screenRect.size.height - - y - contentRect.size.height); - - [_glfwWin.window setFrame:[_glfwWin.window frameRectForContentRect:contentRect] - display:YES]; -} - - -//======================================================================== -// Iconify the window -//======================================================================== - -void _glfwPlatformIconifyWindow( void ) -{ - [_glfwWin.window miniaturize:nil]; -} - - -//======================================================================== -// Restore (un-iconify) the window -//======================================================================== - -void _glfwPlatformRestoreWindow( void ) -{ - [_glfwWin.window deminiaturize:nil]; -} - - -//======================================================================== -// Swap buffers -//======================================================================== - -void _glfwPlatformSwapBuffers( void ) -{ - // ARP appears to be unnecessary, but this is future-proof - [_glfwWin.context flushBuffer]; -} - - -//======================================================================== -// Set double buffering swap interval -//======================================================================== - -void _glfwPlatformSwapInterval( int interval ) -{ - GLint sync = interval; - [_glfwWin.context setValues:&sync forParameter:NSOpenGLCPSwapInterval]; -} - - -//======================================================================== -// Write back window parameters into GLFW window structure -//======================================================================== - -void _glfwPlatformRefreshWindowParams( void ) -{ - GLint value; - - // Since GLFW 2.x doesn't understand screens, we use virtual screen zero - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAAccelerated - forVirtualScreen:0]; - _glfwWin.accelerated = value; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAAlphaSize - forVirtualScreen:0]; - _glfwWin.alphaBits = value; - - // It seems that the color size includes the size of the alpha channel - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAColorSize - forVirtualScreen:0]; - value -= _glfwWin.alphaBits; - _glfwWin.redBits = value / 3; - _glfwWin.greenBits = value / 3; - _glfwWin.blueBits = value / 3; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFADepthSize - forVirtualScreen:0]; - _glfwWin.depthBits = value; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAStencilSize - forVirtualScreen:0]; - _glfwWin.stencilBits = value; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAAccumSize - forVirtualScreen:0]; - _glfwWin.accumRedBits = value / 3; - _glfwWin.accumGreenBits = value / 3; - _glfwWin.accumBlueBits = value / 3; - - // TODO: Figure out what to set this value to - _glfwWin.accumAlphaBits = 0; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAAuxBuffers - forVirtualScreen:0]; - _glfwWin.auxBuffers = value; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFAStereo - forVirtualScreen:0]; - _glfwWin.stereo = value; - - [_glfwWin.pixelFormat getValues:&value - forAttribute:NSOpenGLPFASamples - forVirtualScreen:0]; - _glfwWin.samples = value; -} - - -//======================================================================== -// Poll for new window and input events -//======================================================================== - -void _glfwPlatformPollEvents( void ) -{ - NSEvent *event; - - do - { - event = [NSApp nextEventMatchingMask:NSAnyEventMask - untilDate:[NSDate distantPast] - inMode:NSDefaultRunLoopMode - dequeue:YES]; - - if( event ) - { - [NSApp sendEvent:event]; - } - } - while( event ); - - [_glfwLibrary.autoreleasePool drain]; - _glfwLibrary.autoreleasePool = [[NSAutoreleasePool alloc] init]; -} - - -//======================================================================== -// Wait for new window and input events -//======================================================================== - -void _glfwPlatformWaitEvents( void ) -{ - // I wanted to pass NO to dequeue:, and rely on PollEvents to - // dequeue and send. For reasons not at all clear to me, passing - // NO to dequeue: causes this method never to return. - NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask - untilDate:[NSDate distantFuture] - inMode:NSDefaultRunLoopMode - dequeue:YES]; - [NSApp sendEvent:event]; - - _glfwPlatformPollEvents(); -} - - -//======================================================================== -// Hide mouse cursor (lock it) -//======================================================================== - -void _glfwPlatformHideMouseCursor( void ) -{ - [NSCursor hide]; - CGAssociateMouseAndMouseCursorPosition( false ); -} - - -//======================================================================== -// Show mouse cursor (unlock it) -//======================================================================== - -void _glfwPlatformShowMouseCursor( void ) -{ - [NSCursor unhide]; - CGAssociateMouseAndMouseCursorPosition( true ); -} - - -//======================================================================== -// Set physical mouse cursor position -//======================================================================== - -void _glfwPlatformSetMouseCursorPos( int x, int y ) -{ - if( _glfwWin.fullscreen ) - { - CGPoint globalPoint = CGPointMake( x, y ); - CGDisplayMoveCursorToPoint( CGMainDisplayID(), globalPoint ); - } - else - { - NSPoint localPoint = NSMakePoint( x, _glfwWin.height - y - 1 ); - NSPoint globalPoint = [_glfwWin.window convertBaseToScreen:localPoint]; - CGPoint mainScreenOrigin = CGDisplayBounds( CGMainDisplayID() ).origin; - double mainScreenHeight = CGDisplayBounds( CGMainDisplayID() ).size.height; - CGPoint targetPoint = CGPointMake( globalPoint.x - mainScreenOrigin.x, - mainScreenHeight - globalPoint.y - - mainScreenOrigin.y ); - CGDisplayMoveCursorToPoint( CGMainDisplayID(), targetPoint ); - } -} - diff --git a/Core/SVS/glfw/lib/cocoa/platform.h b/Core/SVS/glfw/lib/cocoa/platform.h deleted file mode 100644 index dadb0f20af..0000000000 --- a/Core/SVS/glfw/lib/cocoa/platform.h +++ /dev/null @@ -1,268 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Cocoa/NSOpenGL -// API Version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2009-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#ifndef _platform_h_ -#define _platform_h_ - - -// This is the Mac OS X version of GLFW -#define _GLFW_MAC_OS_X - -#if defined(__OBJC__) -#import -#else -#include -typedef void *id; -#endif - -#include - -#include "../../include/GL/glfw.h" - - -#ifndef GL_VERSION_3_0 - -typedef const GLubyte * (APIENTRY *PFNGLGETSTRINGIPROC) (GLenum, GLuint); - -#endif /*GL_VERSION_3_0*/ - - -//======================================================================== -// GLFW platform specific types -//======================================================================== - -//------------------------------------------------------------------------ -// Pointer length integer -//------------------------------------------------------------------------ -typedef intptr_t GLFWintptr; - -//------------------------------------------------------------------------ -// Window structure -//------------------------------------------------------------------------ -typedef struct _GLFWwin_struct _GLFWwin; - -struct _GLFWwin_struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // User callback functions - GLFWwindowsizefun windowSizeCallback; - GLFWwindowclosefun windowCloseCallback; - GLFWwindowrefreshfun windowRefreshCallback; - GLFWmousebuttonfun mouseButtonCallback; - GLFWmouseposfun mousePosCallback; - GLFWmousewheelfun mouseWheelCallback; - GLFWkeyfun keyCallback; - GLFWcharfun charCallback; - - // User selected window settings - int fullscreen; // Fullscreen flag - int mouseLock; // Mouse-lock flag - int autoPollEvents; // Auto polling flag - int sysKeysDisabled; // System keys disabled flag - int windowNoResize; // Resize- and maximize gadgets disabled flag - int refreshRate; // Vertical monitor refresh rate - - // Window status & parameters - int opened; // Flag telling if window is opened or not - int active; // Application active flag - int iconified; // Window iconified flag - int width, height; // Window width and heigth - int accelerated; // GL_TRUE if window is HW accelerated - - // Framebuffer attributes - int redBits; - int greenBits; - int blueBits; - int alphaBits; - int depthBits; - int stencilBits; - int accumRedBits; - int accumGreenBits; - int accumBlueBits; - int accumAlphaBits; - int auxBuffers; - int stereo; - int samples; - - // OpenGL extensions and context attributes - int has_GL_SGIS_generate_mipmap; - int has_GL_ARB_texture_non_power_of_two; - int glMajor, glMinor, glRevision; - int glForward, glDebug, glProfile; - - PFNGLGETSTRINGIPROC GetStringi; - -// ========= PLATFORM SPECIFIC PART ====================================== - - id window; - id pixelFormat; - id context; - id delegate; - unsigned int modifierFlags; -}; - -GLFWGLOBAL _GLFWwin _glfwWin; - - -//------------------------------------------------------------------------ -// Library global data -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Window opening hints - _GLFWhints hints; - - // Initial desktop mode - GLFWvidmode desktopMode; - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Timer data - struct { - double base; - double resolution; - } timer; - - // dlopen handle for dynamically-loading extension function pointers - void *OpenGLFramework; - - id originalMode; - - id autoreleasePool; - - CGEventSourceRef eventSource; - -} _glfwLibrary; - - -//------------------------------------------------------------------------ -// User input status (some of this should go in _GLFWwin) -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Mouse status - int MousePosX, MousePosY; - int WheelPos; - char MouseButton[ GLFW_MOUSE_BUTTON_LAST+1 ]; - - // Keyboard status - char Key[ GLFW_KEY_LAST+1 ]; - int LastChar; - - // User selected settings - int StickyKeys; - int StickyMouseButtons; - int KeyRepeat; - - -// ========= PLATFORM SPECIFIC PART ====================================== - - double WheelPosFloating; - -} _glfwInput; - -//------------------------------------------------------------------------ -// Thread information -//------------------------------------------------------------------------ -typedef struct _GLFWthread_struct _GLFWthread; - -// Thread record (one for each thread) -struct _GLFWthread_struct { - - // Pointer to previous and next threads in linked list - _GLFWthread *Previous, *Next; - - // GLFW user side thread information - GLFWthread ID; - GLFWthreadfun Function; - - // System side thread information - pthread_t PosixID; -}; - -// General thread information -GLFWGLOBAL struct { - - // Critical section lock - pthread_mutex_t CriticalSection; - - // Next thread ID to use (increments for every created thread) - GLFWthread NextID; - - // First thread in linked list (always the main thread) - _GLFWthread First; - -} _glfwThrd; - - -//======================================================================== -// Macros for encapsulating critical code sections (i.e. making parts -// of GLFW thread safe) -//======================================================================== - -// Define so we can use the same thread code as X11 -#define _glfw_numprocessors(n) { \ - int mib[2], ncpu; \ - size_t len = 1; \ - mib[0] = CTL_HW; \ - mib[1] = HW_NCPU; \ - n = 1; \ - if( sysctl( mib, 2, &ncpu, &len, NULL, 0 ) != -1 ) \ - { \ - if( len > 0 ) \ - { \ - n = ncpu; \ - } \ - } \ -} - -// Thread list management -#define ENTER_THREAD_CRITICAL_SECTION \ -pthread_mutex_lock( &_glfwThrd.CriticalSection ); -#define LEAVE_THREAD_CRITICAL_SECTION \ -pthread_mutex_unlock( &_glfwThrd.CriticalSection ); - - -//======================================================================== -// Prototypes for platform specific internal functions -//======================================================================== - -// Time -void _glfwInitTimer( void ); - -// Joystick -void _glfwInitJoysticks( void ); -void _glfwTerminateJoysticks( void ); - -#endif // _platform_h_ diff --git a/Core/SVS/glfw/lib/enable.c b/Core/SVS/glfw/lib/enable.c deleted file mode 100644 index 704ff88d3f..0000000000 --- a/Core/SVS/glfw/lib/enable.c +++ /dev/null @@ -1,306 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Enable (show) mouse cursor -//======================================================================== - -static void enableMouseCursor( void ) -{ - int centerPosX, centerPosY; - - if( !_glfwWin.opened || !_glfwWin.mouseLock ) - { - return; - } - - // Show mouse cursor - _glfwPlatformShowMouseCursor(); - - centerPosX = _glfwWin.width / 2; - centerPosY = _glfwWin.height / 2; - - if( centerPosX != _glfwInput.MousePosX || centerPosY != _glfwInput.MousePosY ) - { - _glfwPlatformSetMouseCursorPos( centerPosX, centerPosY ); - - _glfwInput.MousePosX = centerPosX; - _glfwInput.MousePosY = centerPosY; - - if( _glfwWin.mousePosCallback ) - { - _glfwWin.mousePosCallback( _glfwInput.MousePosX, - _glfwInput.MousePosY ); - } - } - - // From now on the mouse is unlocked - _glfwWin.mouseLock = GL_FALSE; -} - -//======================================================================== -// Disable (hide) mouse cursor -//======================================================================== - -static void disableMouseCursor( void ) -{ - if( !_glfwWin.opened || _glfwWin.mouseLock ) - { - return; - } - - // Hide mouse cursor - _glfwPlatformHideMouseCursor(); - - // From now on the mouse is locked - _glfwWin.mouseLock = GL_TRUE; -} - - -//======================================================================== -// Enable sticky keys -//======================================================================== - -static void enableStickyKeys( void ) -{ - _glfwInput.StickyKeys = 1; -} - -//======================================================================== -// Disable sticky keys -//======================================================================== - -static void disableStickyKeys( void ) -{ - int i; - - _glfwInput.StickyKeys = 0; - - // Release all sticky keys - for( i = 0; i <= GLFW_KEY_LAST; i++ ) - { - if( _glfwInput.Key[ i ] == 2 ) - { - _glfwInput.Key[ i ] = 0; - } - } -} - - -//======================================================================== -// Enable sticky mouse buttons -//======================================================================== - -static void enableStickyMouseButtons( void ) -{ - _glfwInput.StickyMouseButtons = 1; -} - -//======================================================================== -// Disable sticky mouse buttons -//======================================================================== - -static void disableStickyMouseButtons( void ) -{ - int i; - - _glfwInput.StickyMouseButtons = 0; - - // Release all sticky mouse buttons - for( i = 0; i <= GLFW_MOUSE_BUTTON_LAST; i++ ) - { - if( _glfwInput.MouseButton[ i ] == 2 ) - { - _glfwInput.MouseButton[ i ] = 0; - } - } -} - - -//======================================================================== -// Enable system keys -//======================================================================== - -static void enableSystemKeys( void ) -{ - if( !_glfwWin.sysKeysDisabled ) - { - return; - } - - _glfwPlatformEnableSystemKeys(); - - // Indicate that system keys are no longer disabled - _glfwWin.sysKeysDisabled = GL_FALSE; -} - -//======================================================================== -// Disable system keys -//======================================================================== - -static void disableSystemKeys( void ) -{ - if( _glfwWin.sysKeysDisabled ) - { - return; - } - - _glfwPlatformDisableSystemKeys(); - - // Indicate that system keys are now disabled - _glfwWin.sysKeysDisabled = GL_TRUE; -} - - -//======================================================================== -// Enable key repeat -//======================================================================== - -static void enableKeyRepeat( void ) -{ - _glfwInput.KeyRepeat = 1; -} - -//======================================================================== -// Disable key repeat -//======================================================================== - -static void disableKeyRepeat( void ) -{ - _glfwInput.KeyRepeat = 0; -} - - -//======================================================================== -// Enable automatic event polling -//======================================================================== - -static void enableAutoPollEvents( void ) -{ - _glfwWin.autoPollEvents = 1; -} - -//======================================================================== -// Disable automatic event polling -//======================================================================== - -static void disableAutoPollEvents( void ) -{ - _glfwWin.autoPollEvents = 0; -} - - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Enable certain GLFW/window/system functions. -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwEnable( int token ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - switch( token ) - { - case GLFW_MOUSE_CURSOR: - enableMouseCursor(); - break; - case GLFW_STICKY_KEYS: - enableStickyKeys(); - break; - case GLFW_STICKY_MOUSE_BUTTONS: - enableStickyMouseButtons(); - break; - case GLFW_SYSTEM_KEYS: - enableSystemKeys(); - break; - case GLFW_KEY_REPEAT: - enableKeyRepeat(); - break; - case GLFW_AUTO_POLL_EVENTS: - enableAutoPollEvents(); - break; - default: - break; - } -} - - -//======================================================================== -// Disable certain GLFW/window/system functions. -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwDisable( int token ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - switch( token ) - { - case GLFW_MOUSE_CURSOR: - disableMouseCursor(); - break; - case GLFW_STICKY_KEYS: - disableStickyKeys(); - break; - case GLFW_STICKY_MOUSE_BUTTONS: - disableStickyMouseButtons(); - break; - case GLFW_SYSTEM_KEYS: - disableSystemKeys(); - break; - case GLFW_KEY_REPEAT: - disableKeyRepeat(); - break; - case GLFW_AUTO_POLL_EVENTS: - disableAutoPollEvents(); - break; - default: - break; - } -} - diff --git a/Core/SVS/glfw/lib/fullscreen.c b/Core/SVS/glfw/lib/fullscreen.c deleted file mode 100644 index 970e7138bc..0000000000 --- a/Core/SVS/glfw/lib/fullscreen.c +++ /dev/null @@ -1,94 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Get a list of available video modes -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetVideoModes( GLFWvidmode *list, int maxcount ) -{ - int count, i, swap, res1, res2, depth1, depth2; - GLFWvidmode vm; - - if( !_glfwInitialized || maxcount <= 0 || list == (GLFWvidmode*) 0 ) - { - return 0; - } - - // Get list of video modes - count = _glfwPlatformGetVideoModes( list, maxcount ); - - // Sort list (bubble sort) - do - { - swap = 0; - for( i = 0; i < count-1; ++ i ) - { - res1 = list[i].Width*list[i].Height; - depth1 = list[i].RedBits+list[i].GreenBits+list[i].BlueBits; - res2 = list[i+1].Width*list[i+1].Height; - depth2 = list[i+1].RedBits+list[i+1].GreenBits+ - list[i+1].BlueBits; - if( (depth2 -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -#ifndef GL_VERSION_3_0 -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 -#endif - -#ifndef GL_VERSION_3_2 -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_CONTEXT_PROFILE_MASK 0x9126 -#endif - -//======================================================================== -// Parses the OpenGL version string and extracts the version number -//======================================================================== - -void _glfwParseGLVersion( int *major, int *minor, int *rev ) -{ - GLuint _major, _minor = 0, _rev = 0; - const GLubyte *version; - const GLubyte *ptr; - - // Get OpenGL version string - version = glGetString( GL_VERSION ); - if( !version ) - { - return; - } - - // Parse string - ptr = version; - for( _major = 0; *ptr >= '0' && *ptr <= '9'; ptr ++ ) - { - _major = 10*_major + (*ptr - '0'); - } - if( *ptr == '.' ) - { - ptr ++; - for( _minor = 0; *ptr >= '0' && *ptr <= '9'; ptr ++ ) - { - _minor = 10*_minor + (*ptr - '0'); - } - if( *ptr == '.' ) - { - ptr ++; - for( _rev = 0; *ptr >= '0' && *ptr <= '9'; ptr ++ ) - { - _rev = 10*_rev + (*ptr - '0'); - } - } - } - - // Return parsed values - *major = _major; - *minor = _minor; - *rev = _rev; -} - -//======================================================================== -// Check if a string can be found in an OpenGL extension string -//======================================================================== - -int _glfwStringInExtensionString( const char *string, - const GLubyte *extensions ) -{ - const GLubyte *start; - GLubyte *where, *terminator; - - // It takes a bit of care to be fool-proof about parsing the - // OpenGL extensions string. Don't be fooled by sub-strings, - // etc. - start = extensions; - while( 1 ) - { - where = (GLubyte *) strstr( (const char *) start, string ); - if( !where ) - { - return GL_FALSE; - } - terminator = where + strlen( string ); - if( where == start || *(where - 1) == ' ' ) - { - if( *terminator == ' ' || *terminator == '\0' ) - { - break; - } - } - start = terminator; - } - - return GL_TRUE; -} - - -//======================================================================== -// Reads back OpenGL context properties from the current context -//======================================================================== - -void _glfwRefreshContextParams( void ) -{ - _glfwParseGLVersion( &_glfwWin.glMajor, &_glfwWin.glMinor, - &_glfwWin.glRevision ); - - _glfwWin.glProfile = 0; - _glfwWin.glForward = GL_FALSE; - - // Read back the context profile, if applicable - if( _glfwWin.glMajor >= 3 ) - { - GLint flags; - glGetIntegerv( GL_CONTEXT_FLAGS, &flags ); - - if( flags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT ) - { - _glfwWin.glForward = GL_TRUE; - } - } - - if( _glfwWin.glMajor > 3 || - ( _glfwWin.glMajor == 3 && _glfwWin.glMinor >= 2 ) ) - { - GLint mask; - glGetIntegerv( GL_CONTEXT_PROFILE_MASK, &mask ); - - if( mask & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT ) - { - _glfwWin.glProfile = GLFW_OPENGL_COMPAT_PROFILE; - } - else if( mask & GL_CONTEXT_CORE_PROFILE_BIT ) - { - _glfwWin.glProfile = GLFW_OPENGL_CORE_PROFILE; - } - } -} - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Check if an OpenGL extension is available at runtime -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwExtensionSupported( const char *extension ) -{ - const GLubyte *extensions; - GLubyte *where; - - // Is GLFW initialized? - if( !_glfwInitialized || !_glfwWin.opened ) - { - return GL_FALSE; - } - - // Extension names should not have spaces - where = (GLubyte *) strchr( extension, ' ' ); - if( where || *extension == '\0' ) - { - return GL_FALSE; - } - - if( _glfwWin.glMajor < 3 ) - { - // Check if extension is in the old style OpenGL extensions string - - extensions = glGetString( GL_EXTENSIONS ); - if( extensions != NULL ) - { - if( _glfwStringInExtensionString( extension, extensions ) ) - { - return GL_TRUE; - } - } - } - else - { - // Check if extension is in the modern OpenGL extensions string list - - GLint count; - int i; - - glGetIntegerv( GL_NUM_EXTENSIONS, &count ); - - for( i = 0; i < count; i++ ) - { - if( strcmp( (const char*) _glfwWin.GetStringi( GL_EXTENSIONS, i ), - extension ) == 0 ) - { - return GL_TRUE; - } - } - } - - // Additional platform specific extension checking (e.g. WGL) - if( _glfwPlatformExtensionSupported( extension ) ) - { - return GL_TRUE; - } - - return GL_FALSE; -} - - -//======================================================================== -// Get the function pointer to an OpenGL function. This function can be -// used to get access to extended OpenGL functions. -//======================================================================== - -GLFWAPI void * GLFWAPIENTRY glfwGetProcAddress( const char *procname ) -{ - // Is GLFW initialized? - if( !_glfwInitialized || !_glfwWin.opened ) - { - return NULL; - } - - return _glfwPlatformGetProcAddress( procname ); -} - - -//======================================================================== -// Returns the OpenGL version -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwGetGLVersion( int *major, int *minor, int *rev ) -{ - // Is GLFW initialized? - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - if( major != NULL ) - { - *major = _glfwWin.glMajor; - } - if( minor != NULL ) - { - *minor = _glfwWin.glMinor; - } - if( rev != NULL ) - { - *rev = _glfwWin.glRevision; - } -} - diff --git a/Core/SVS/glfw/lib/image.c b/Core/SVS/glfw/lib/image.c deleted file mode 100644 index 1e70cbbc05..0000000000 --- a/Core/SVS/glfw/lib/image.c +++ /dev/null @@ -1,629 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -//======================================================================== -// Description: -// -// This module acts as an interface for different image file formats (the -// image file format is detected automatically). -// -// By default the loaded image is rescaled (using bilinear interpolation) -// to the next higher 2^N x 2^M resolution, unless it has a valid -// 2^N x 2^M resolution. The interpolation is quite slow, even if the -// routine has been optimized for speed (a 200x200 RGB image is scaled to -// 256x256 in ~30 ms on a P3-500). -// -// Paletted images are converted to RGB/RGBA images. -// -// A convenience function is also included (glfwLoadTexture2D), which -// loads a texture image from a file directly to OpenGL texture memory, -// with an option to generate all mipmap levels. GL_SGIS_generate_mipmap -// is used whenever available, which should give an optimal mipmap -// generation speed (possibly performed in hardware). A software fallback -// method is included when GL_SGIS_generate_mipmap is not supported (it -// generates all mipmaps of a 256x256 RGB texture in ~3 ms on a P3-500). -// -//======================================================================== - - -#include "internal.h" - - -// We want to support automatic mipmap generation -#ifndef GL_SGIS_generate_mipmap - #define GL_GENERATE_MIPMAP_SGIS 0x8191 - #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 - #define GL_SGIS_generate_mipmap 1 -#endif // GL_SGIS_generate_mipmap - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Upsample image, from size w1 x h1 to w2 x h2 -//======================================================================== - -static void UpsampleImage( unsigned char *src, unsigned char *dst, - int w1, int h1, int w2, int h2, int bpp ) -{ - int m, n, k, x, y, col8; - float dx, dy, xstep, ystep, col, col1, col2; - unsigned char *src1, *src2, *src3, *src4; - - // Calculate scaling factor - xstep = (float)(w1-1) / (float)(w2-1); - ystep = (float)(h1-1) / (float)(h2-1); - - // Copy source data to destination data with bilinear interpolation - // Note: The rather strange look of this routine is a direct result of - // my attempts at optimizing it. Improvements are welcome! - dy = 0.0f; - y = 0; - for( n = 0; n < h2; n ++ ) - { - dx = 0.0f; - src1 = &src[ y*w1*bpp ]; - src3 = y < (h1-1) ? src1 + w1*bpp : src1; - src2 = src1 + bpp; - src4 = src3 + bpp; - x = 0; - for( m = 0; m < w2; m ++ ) - { - for( k = 0; k < bpp; k ++ ) - { - col1 = *src1 ++; - col2 = *src2 ++; - col = col1 + (col2 - col1) * dx; - col1 = *src3 ++; - col2 = *src4 ++; - col2 = col1 + (col2 - col1) * dx; - col += (col2 - col) * dy; - col8 = (int) (col + 0.5); - if( col8 >= 256 ) col8 = 255; - *dst++ = (unsigned char) col8; - } - dx += xstep; - if( dx >= 1.0f ) - { - x ++; - dx -= 1.0f; - if( x >= (w1-1) ) - { - src2 = src1; - src4 = src3; - } - } - else - { - src1 -= bpp; - src2 -= bpp; - src3 -= bpp; - src4 -= bpp; - } - } - dy += ystep; - if( dy >= 1.0f ) - { - y ++; - dy -= 1.0f; - } - } -} - - -//======================================================================== -// Build the next mip-map level -//======================================================================== - -static int HalveImage( GLubyte *src, int *width, int *height, - int components ) -{ - int halfwidth, halfheight, m, n, k, idx1, idx2; - GLubyte *dst; - - // Last level? - if( *width <= 1 && *height <= 1 ) - { - return GL_FALSE; - } - - // Calculate new width and height (handle 1D case) - halfwidth = *width > 1 ? *width / 2 : 1; - halfheight = *height > 1 ? *height / 2 : 1; - - // Downsample image with a simple box-filter - dst = src; - if( *width == 1 || *height == 1 ) - { - // 1D case - for( m = 0; m < halfwidth+halfheight-1; m ++ ) - { - for( k = 0; k < components; k ++ ) - { - *dst ++ = (GLubyte) (((int)*src + - (int)src[components] + 1) >> 1); - src ++; - } - src += components; - } - } - else - { - // 2D case - idx1 = *width*components; - idx2 = (*width+1)*components; - for( m = 0; m < halfheight; m ++ ) - { - for( n = 0; n < halfwidth; n ++ ) - { - for( k = 0; k < components; k ++ ) - { - *dst ++ = (GLubyte) (((int)*src + - (int)src[components] + - (int)src[idx1] + - (int)src[idx2] + 2) >> 2); - src ++; - } - src += components; - } - src += components * (*width); - } - } - - // Return new width and height - *width = halfwidth; - *height = halfheight; - - return GL_TRUE; -} - - -//======================================================================== -// Rescales an image into power-of-two dimensions -//======================================================================== - -static int RescaleImage( GLFWimage* image ) -{ - int width, height, log2, newsize; - unsigned char *data; - - // Calculate next larger 2^N width - for( log2 = 0, width = image->Width; width > 1; width >>= 1, log2 ++ ) - ; - - width = (int) 1 << log2; - if( width < image->Width ) - { - width <<= 1; - } - - // Calculate next larger 2^M height - for( log2 = 0, height = image->Height; height > 1; height >>= 1, log2 ++ ) - ; - - height = (int) 1 << log2; - if( height < image->Height ) - { - height <<= 1; - } - - // Do we really need to rescale? - if( width != image->Width || height != image->Height ) - { - // Allocate memory for new (upsampled) image data - newsize = width * height * image->BytesPerPixel; - data = (unsigned char *) malloc( newsize ); - if( data == NULL ) - { - free( image->Data ); - return GL_FALSE; - } - - // Copy old image data to new image data with interpolation - UpsampleImage( image->Data, data, image->Width, image->Height, - width, height, image->BytesPerPixel ); - - // Free memory for old image data (not needed anymore) - free( image->Data ); - - // Set pointer to new image data, and set new image dimensions - image->Data = data; - image->Width = width; - image->Height = height; - } - - return GL_TRUE; -} - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Read an image from a named file -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwReadImage( const char *name, GLFWimage *img, - int flags ) -{ - _GLFWstream stream; - - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return GL_FALSE; - } - - // Start with an empty image descriptor - img->Width = 0; - img->Height = 0; - img->BytesPerPixel = 0; - img->Data = NULL; - - // Open file - if( !_glfwOpenFileStream( &stream, name, "rb" ) ) - { - return GL_FALSE; - } - - // We only support TGA files at the moment - if( !_glfwReadTGA( &stream, img, flags ) ) - { - _glfwCloseStream( &stream ); - return GL_FALSE; - } - - // Close stream - _glfwCloseStream( &stream ); - - // Should we rescale the image to closest 2^N x 2^M resolution? - if( !(flags & GLFW_NO_RESCALE_BIT) ) - { - if( !RescaleImage( img ) ) - { - return GL_FALSE; - } - } - - // Interpret BytesPerPixel as an OpenGL format - switch( img->BytesPerPixel ) - { - default: - case 1: - if( flags & GLFW_ALPHA_MAP_BIT ) - { - img->Format = GL_ALPHA; - } - else - { - img->Format = GL_LUMINANCE; - } - break; - case 3: - img->Format = GL_RGB; - break; - case 4: - img->Format = GL_RGBA; - break; - } - - return GL_TRUE; -} - - -//======================================================================== -// Read an image file from a memory buffer -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwReadMemoryImage( const void *data, long size, GLFWimage *img, int flags ) -{ - _GLFWstream stream; - - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return GL_FALSE; - } - - // Start with an empty image descriptor - img->Width = 0; - img->Height = 0; - img->BytesPerPixel = 0; - img->Data = NULL; - - // Open buffer - if( !_glfwOpenBufferStream( &stream, (void*) data, size ) ) - { - return GL_FALSE; - } - - // We only support TGA files at the moment - if( !_glfwReadTGA( &stream, img, flags ) ) - { - _glfwCloseStream( &stream ); - return GL_FALSE; - } - - // Close stream - _glfwCloseStream( &stream ); - - // Should we rescale the image to closest 2^N x 2^M resolution? - if( !(flags & GLFW_NO_RESCALE_BIT) ) - { - if( !RescaleImage( img ) ) - { - return GL_FALSE; - } - } - - // Interpret BytesPerPixel as an OpenGL format - switch( img->BytesPerPixel ) - { - default: - case 1: - if( flags & GLFW_ALPHA_MAP_BIT ) - { - img->Format = GL_ALPHA; - } - else - { - img->Format = GL_LUMINANCE; - } - break; - case 3: - img->Format = GL_RGB; - break; - case 4: - img->Format = GL_RGBA; - break; - } - - return GL_TRUE; -} - - -//======================================================================== -// Free allocated memory for an image -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwFreeImage( GLFWimage *img ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - // Free memory - if( img->Data != NULL ) - { - free( img->Data ); - img->Data = NULL; - } - - // Clear all fields - img->Width = 0; - img->Height = 0; - img->Format = 0; - img->BytesPerPixel = 0; -} - - -//======================================================================== -// Read an image from a file, and upload it to texture memory -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwLoadTexture2D( const char *name, int flags ) -{ - GLFWimage img; - - // Is GLFW initialized? - if( !_glfwInitialized || !_glfwWin.opened ) - { - return GL_FALSE; - } - - // Force rescaling if necessary - if( !_glfwWin.has_GL_ARB_texture_non_power_of_two ) - { - flags &= (~GLFW_NO_RESCALE_BIT); - } - - // Read image from file - if( !glfwReadImage( name, &img, flags ) ) - { - return GL_FALSE; - } - - if( !glfwLoadTextureImage2D( &img, flags ) ) - { - return GL_FALSE; - } - - // Data buffer is not needed anymore - glfwFreeImage( &img ); - - return GL_TRUE; -} - - -//======================================================================== -// Read an image from a buffer, and upload it to texture memory -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwLoadMemoryTexture2D( const void *data, long size, int flags ) -{ - GLFWimage img; - - // Is GLFW initialized? - if( !_glfwInitialized || !_glfwWin.opened ) - { - return GL_FALSE; - } - - // Force rescaling if necessary - if( !_glfwWin.has_GL_ARB_texture_non_power_of_two ) - { - flags &= (~GLFW_NO_RESCALE_BIT); - } - - // Read image from file - if( !glfwReadMemoryImage( data, size, &img, flags ) ) - { - return GL_FALSE; - } - - if( !glfwLoadTextureImage2D( &img, flags ) ) - { - return GL_FALSE; - } - - // Data buffer is not needed anymore - glfwFreeImage( &img ); - - return GL_TRUE; -} - - -//======================================================================== -// Upload an image object to texture memory -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwLoadTextureImage2D( GLFWimage *img, int flags ) -{ - GLint UnpackAlignment, GenMipMap; - int level, format, AutoGen, newsize, n; - unsigned char *data, *dataptr; - - // Is GLFW initialized? - if( !_glfwInitialized || !_glfwWin.opened ) - { - return GL_FALSE; - } - - // TODO: Use GL_MAX_TEXTURE_SIZE or GL_PROXY_TEXTURE_2D to determine - // whether the image size is valid. - // NOTE: May require box filter downsampling routine. - - // Do we need to convert the alpha map to RGBA format (OpenGL 1.0)? - if( (_glfwWin.glMajor == 1) && (_glfwWin.glMinor == 0) && - (img->Format == GL_ALPHA) ) - { - // We go to RGBA representation instead - img->BytesPerPixel = 4; - - // Allocate memory for new RGBA image data - newsize = img->Width * img->Height * img->BytesPerPixel; - data = (unsigned char *) malloc( newsize ); - if( data == NULL ) - { - free( img->Data ); - return GL_FALSE; - } - - // Convert Alpha map to RGBA - dataptr = data; - for( n = 0; n < (img->Width*img->Height); ++ n ) - { - *dataptr ++ = 255; - *dataptr ++ = 255; - *dataptr ++ = 255; - *dataptr ++ = img->Data[n]; - } - - // Free memory for old image data (not needed anymore) - free( img->Data ); - - // Set pointer to new image data - img->Data = data; - } - - // Set unpack alignment to one byte - glGetIntegerv( GL_UNPACK_ALIGNMENT, &UnpackAlignment ); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - - // Should we use automatic mipmap generation? - AutoGen = ( flags & GLFW_BUILD_MIPMAPS_BIT ) && - _glfwWin.has_GL_SGIS_generate_mipmap; - - // Enable automatic mipmap generation - if( AutoGen ) - { - glGetTexParameteriv( GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, - &GenMipMap ); - glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, - GL_TRUE ); - } - - // Format specification is different for OpenGL 1.0 - if( _glfwWin.glMajor == 1 && _glfwWin.glMinor == 0 ) - { - format = img->BytesPerPixel; - } - else - { - format = img->Format; - } - - // Upload to texture memeory - level = 0; - do - { - // Upload this mipmap level - glTexImage2D( GL_TEXTURE_2D, level, format, - img->Width, img->Height, 0, format, - GL_UNSIGNED_BYTE, (void*) img->Data ); - - // Build next mipmap level manually, if required - if( ( flags & GLFW_BUILD_MIPMAPS_BIT ) && !AutoGen ) - { - level = HalveImage( img->Data, &img->Width, - &img->Height, img->BytesPerPixel ) ? - level + 1 : 0; - } - } - while( level != 0 ); - - // Restore old automatic mipmap generation state - if( AutoGen ) - { - glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, - GenMipMap ); - } - - // Restore old unpack alignment - glPixelStorei( GL_UNPACK_ALIGNMENT, UnpackAlignment ); - - return GL_TRUE; -} - diff --git a/Core/SVS/glfw/lib/init.c b/Core/SVS/glfw/lib/init.c deleted file mode 100644 index a0472abd97..0000000000 --- a/Core/SVS/glfw/lib/init.c +++ /dev/null @@ -1,110 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#define _init_c_ -#include "internal.h" - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Initialize various GLFW state -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwInit( void ) -{ - // Is GLFW already initialized? - if( _glfwInitialized ) - { - return GL_TRUE; - } - - memset( &_glfwLibrary, 0, sizeof( _glfwLibrary ) ); - memset( &_glfwWin, 0, sizeof( _glfwWin ) ); - - // Window is not yet opened - _glfwWin.opened = GL_FALSE; - - // Default enable/disable settings - _glfwWin.sysKeysDisabled = GL_FALSE; - - // Clear window hints - _glfwClearWindowHints(); - - // Platform specific initialization - if( !_glfwPlatformInit() ) - { - return GL_FALSE; - } - - // Form now on, GLFW state is valid - _glfwInitialized = GL_TRUE; - - return GL_TRUE; -} - - - -//======================================================================== -// Close window and kill all threads. -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwTerminate( void ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - // Platform specific termination - if( !_glfwPlatformTerminate() ) - { - return; - } - - // GLFW is no longer initialized - _glfwInitialized = GL_FALSE; -} - - -//======================================================================== -// Get GLFW version -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwGetVersion( int *major, int *minor, int *rev ) -{ - if( major != NULL ) *major = GLFW_VERSION_MAJOR; - if( minor != NULL ) *minor = GLFW_VERSION_MINOR; - if( rev != NULL ) *rev = GLFW_VERSION_REVISION; -} - diff --git a/Core/SVS/glfw/lib/input.c b/Core/SVS/glfw/lib/input.c deleted file mode 100644 index 0c5d1909a5..0000000000 --- a/Core/SVS/glfw/lib/input.c +++ /dev/null @@ -1,269 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//======================================================================== -// Return key state -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetKey( int key ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return GLFW_RELEASE; - } - - // Is it a valid key? - if( key < 0 || key > GLFW_KEY_LAST ) - { - return GLFW_RELEASE; - } - - if( _glfwInput.Key[ key ] == GLFW_STICK ) - { - // Sticky mode: release key now - _glfwInput.Key[ key ] = GLFW_RELEASE; - return GLFW_PRESS; - } - - return (int) _glfwInput.Key[ key ]; -} - - -//======================================================================== -// Return mouse button state -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetMouseButton( int button ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return GLFW_RELEASE; - } - - // Is it a valid mouse button? - if( button < 0 || button > GLFW_MOUSE_BUTTON_LAST ) - { - return GLFW_RELEASE; - } - - if( _glfwInput.MouseButton[ button ] == GLFW_STICK ) - { - // Sticky mode: release mouse button now - _glfwInput.MouseButton[ button ] = GLFW_RELEASE; - return GLFW_PRESS; - } - - return (int) _glfwInput.MouseButton[ button ]; -} - - -//======================================================================== -// Return mouse cursor position -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwGetMousePos( int *xpos, int *ypos ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Return mouse position - if( xpos != NULL ) - { - *xpos = _glfwInput.MousePosX; - } - if( ypos != NULL ) - { - *ypos = _glfwInput.MousePosY; - } -} - - -//======================================================================== -// Sets the mouse cursor position -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetMousePos( int xpos, int ypos ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Don't do anything if the mouse position did not change - if( xpos == _glfwInput.MousePosX && ypos == _glfwInput.MousePosY ) - { - return; - } - - // Set GLFW mouse position - _glfwInput.MousePosX = xpos; - _glfwInput.MousePosY = ypos; - - // If we have a locked mouse, do not change cursor position - if( _glfwWin.mouseLock ) - { - return; - } - - // Update physical cursor position - _glfwPlatformSetMouseCursorPos( xpos, ypos ); -} - - -//======================================================================== -// Return mouse wheel position -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetMouseWheel( void ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return 0; - } - - // Return mouse wheel position - return _glfwInput.WheelPos; -} - - -//======================================================================== -// Set mouse wheel position -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetMouseWheel( int pos ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set mouse wheel position - _glfwInput.WheelPos = pos; -} - - -//======================================================================== -// Set callback function for keyboard input -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetKeyCallback( GLFWkeyfun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.keyCallback = cbfun; -} - - -//======================================================================== -// Set callback function for character input -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetCharCallback( GLFWcharfun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.charCallback = cbfun; -} - - -//======================================================================== -// Set callback function for mouse clicks -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetMouseButtonCallback( GLFWmousebuttonfun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.mouseButtonCallback = cbfun; -} - - -//======================================================================== -// Set callback function for mouse moves -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetMousePosCallback( GLFWmouseposfun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.mousePosCallback = cbfun; - - // Call the callback function to let the application know the current - // mouse position - if( cbfun ) - { - cbfun( _glfwInput.MousePosX, _glfwInput.MousePosY ); - } -} - - -//======================================================================== -// Set callback function for mouse wheel -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetMouseWheelCallback( GLFWmousewheelfun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.mouseWheelCallback = cbfun; - - // Call the callback function to let the application know the current - // mouse wheel position - if( cbfun ) - { - cbfun( _glfwInput.WheelPos ); - } -} - diff --git a/Core/SVS/glfw/lib/internal.h b/Core/SVS/glfw/lib/internal.h deleted file mode 100644 index 0563728176..0000000000 --- a/Core/SVS/glfw/lib/internal.h +++ /dev/null @@ -1,266 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#ifndef _internal_h_ -#define _internal_h_ - -//======================================================================== -// GLFWGLOBAL is a macro that places all global variables in the init.c -// module (all other modules reference global variables as 'extern') -//======================================================================== - -#if defined( _init_c_ ) -#define GLFWGLOBAL -#else -#define GLFWGLOBAL extern -#endif - - -//======================================================================== -// Input handling definitions -//======================================================================== - -// Internal key and button state/action definitions -#define GLFW_STICK 2 - - -//======================================================================== -// System independent include files -//======================================================================== - -#include -#include -#include - - -//------------------------------------------------------------------------ -// Window opening hints (set by glfwOpenWindowHint) -// A bucket of semi-random stuff bunched together for historical reasons -// This is used only by the platform independent code and only to store -// parameters passed to us by glfwOpenWindowHint -//------------------------------------------------------------------------ -typedef struct { - int refreshRate; - int accumRedBits; - int accumGreenBits; - int accumBlueBits; - int accumAlphaBits; - int auxBuffers; - int stereo; - int windowNoResize; - int samples; - int glMajor; - int glMinor; - int glForward; - int glDebug; - int glProfile; -} _GLFWhints; - - -//------------------------------------------------------------------------ -// Platform specific definitions goes in platform.h (which also includes -// glfw.h) -//------------------------------------------------------------------------ - -#include "platform.h" - - -//------------------------------------------------------------------------ -// Parameters relating to the creation of the context and window but not -// directly related to the properties of the framebuffer -// This is used to pass window and context creation parameters from the -// platform independent code to the platform specific code -//------------------------------------------------------------------------ -typedef struct { - int mode; - int refreshRate; - int windowNoResize; - int glMajor; - int glMinor; - int glForward; - int glDebug; - int glProfile; -} _GLFWwndconfig; - - -//------------------------------------------------------------------------ -// Framebuffer configuration descriptor, i.e. buffers and their sizes -// Also a platform specific ID used to map back to the actual backend APIs -// This is used to pass framebuffer parameters from the platform independent -// code to the platform specific code, and also to enumerate and select -// available framebuffer configurations -//------------------------------------------------------------------------ -typedef struct { - int redBits; - int greenBits; - int blueBits; - int alphaBits; - int depthBits; - int stencilBits; - int accumRedBits; - int accumGreenBits; - int accumBlueBits; - int accumAlphaBits; - int auxBuffers; - int stereo; - int samples; - GLFWintptr platformID; -} _GLFWfbconfig; - - -//======================================================================== -// System independent global variables (GLFW internals) -//======================================================================== - -// Flag indicating if GLFW has been initialized -#if defined( _init_c_ ) -int _glfwInitialized = 0; -#else -GLFWGLOBAL int _glfwInitialized; -#endif - - -//------------------------------------------------------------------------ -// Abstract data stream (for image I/O) -//------------------------------------------------------------------------ -typedef struct { - FILE* file; - void* data; - long position; - long size; -} _GLFWstream; - - -//======================================================================== -// Prototypes for platform specific implementation functions -//======================================================================== - -// Init/terminate -int _glfwPlatformInit( void ); -int _glfwPlatformTerminate( void ); - -// Enable/Disable -void _glfwPlatformEnableSystemKeys( void ); -void _glfwPlatformDisableSystemKeys( void ); - -// Fullscreen -int _glfwPlatformGetVideoModes( GLFWvidmode *list, int maxcount ); -void _glfwPlatformGetDesktopMode( GLFWvidmode *mode ); - -// OpenGL extensions -int _glfwPlatformExtensionSupported( const char *extension ); -void * _glfwPlatformGetProcAddress( const char *procname ); - -// Joystick -int _glfwPlatformGetJoystickParam( int joy, int param ); -int _glfwPlatformGetJoystickPos( int joy, float *pos, int numaxes ); -int _glfwPlatformGetJoystickButtons( int joy, unsigned char *buttons, int numbuttons ); - -// Threads -GLFWthread _glfwPlatformCreateThread( GLFWthreadfun fun, void *arg ); -void _glfwPlatformDestroyThread( GLFWthread ID ); -int _glfwPlatformWaitThread( GLFWthread ID, int waitmode ); -GLFWthread _glfwPlatformGetThreadID( void ); -GLFWmutex _glfwPlatformCreateMutex( void ); -void _glfwPlatformDestroyMutex( GLFWmutex mutex ); -void _glfwPlatformLockMutex( GLFWmutex mutex ); -void _glfwPlatformUnlockMutex( GLFWmutex mutex ); -GLFWcond _glfwPlatformCreateCond( void ); -void _glfwPlatformDestroyCond( GLFWcond cond ); -void _glfwPlatformWaitCond( GLFWcond cond, GLFWmutex mutex, double timeout ); -void _glfwPlatformSignalCond( GLFWcond cond ); -void _glfwPlatformBroadcastCond( GLFWcond cond ); -int _glfwPlatformGetNumberOfProcessors( void ); - -// Time -double _glfwPlatformGetTime( void ); -void _glfwPlatformSetTime( double time ); -void _glfwPlatformSleep( double time ); - -// Window management -int _glfwPlatformOpenWindow( int width, int height, const _GLFWwndconfig *wndconfig, const _GLFWfbconfig *fbconfig ); -void _glfwPlatformCloseWindow( void ); -void _glfwPlatformSetWindowTitle( const char *title ); -void _glfwPlatformSetWindowSize( int width, int height ); -void _glfwPlatformSetWindowPos( int x, int y ); -void _glfwPlatformIconifyWindow( void ); -void _glfwPlatformRestoreWindow( void ); -void _glfwPlatformSwapBuffers( void ); -void _glfwPlatformSwapInterval( int interval ); -void _glfwPlatformRefreshWindowParams( void ); -void _glfwPlatformPollEvents( void ); -void _glfwPlatformWaitEvents( void ); -void _glfwPlatformHideMouseCursor( void ); -void _glfwPlatformShowMouseCursor( void ); -void _glfwPlatformSetMouseCursorPos( int x, int y ); - - -//======================================================================== -// Prototypes for platform independent internal functions -//======================================================================== - -// Window management (window.c) -void _glfwClearWindowHints( void ); - -// Input handling (window.c) -void _glfwClearInput( void ); -void _glfwInputDeactivation( void ); -void _glfwInputKey( int key, int action ); -void _glfwInputChar( int character, int action ); -void _glfwInputMouseClick( int button, int action ); - -// Threads (thread.c) -_GLFWthread * _glfwGetThreadPointer( int ID ); -void _glfwAppendThread( _GLFWthread * t ); -void _glfwRemoveThread( _GLFWthread * t ); - -// OpenGL extensions (glext.c) -void _glfwParseGLVersion( int *major, int *minor, int *rev ); -int _glfwStringInExtensionString( const char *string, const GLubyte *extensions ); -void _glfwRefreshContextParams( void ); - -// Abstracted data streams (stream.c) -int _glfwOpenFileStream( _GLFWstream *stream, const char *name, const char *mode ); -int _glfwOpenBufferStream( _GLFWstream *stream, void *data, long size ); -long _glfwReadStream( _GLFWstream *stream, void *data, long size ); -long _glfwTellStream( _GLFWstream *stream ); -int _glfwSeekStream( _GLFWstream *stream, long offset, int whence ); -void _glfwCloseStream( _GLFWstream *stream ); - -// Targa image I/O (tga.c) -int _glfwReadTGA( _GLFWstream *s, GLFWimage *img, int flags ); - -// Framebuffer configs -const _GLFWfbconfig *_glfwChooseFBConfig( const _GLFWfbconfig *desired, - const _GLFWfbconfig *alternatives, - unsigned int count ); - - -#endif // _internal_h_ diff --git a/Core/SVS/glfw/lib/joystick.c b/Core/SVS/glfw/lib/joystick.c deleted file mode 100644 index 007d18e0cc..0000000000 --- a/Core/SVS/glfw/lib/joystick.c +++ /dev/null @@ -1,99 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Determine joystick capabilities -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetJoystickParam( int joy, int param ) -{ - if( !_glfwInitialized ) - { - return 0; - } - - return _glfwPlatformGetJoystickParam( joy, param ); -} - - -//======================================================================== -// Get joystick axis positions -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetJoystickPos( int joy, float *pos, int numaxes ) -{ - int i; - - if( !_glfwInitialized ) - { - return 0; - } - - // Clear positions - for( i = 0; i < numaxes; i++ ) - { - pos[ i ] = 0.0f; - } - - return _glfwPlatformGetJoystickPos( joy, pos, numaxes ); -} - - -//======================================================================== -// Get joystick button states -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetJoystickButtons( int joy, - unsigned char *buttons, - int numbuttons ) -{ - int i; - - if( !_glfwInitialized ) - { - return 0; - } - - // Clear button states - for( i = 0; i < numbuttons; i++ ) - { - buttons[ i ] = GLFW_RELEASE; - } - - return _glfwPlatformGetJoystickButtons( joy, buttons, numbuttons ); -} - diff --git a/Core/SVS/glfw/lib/stream.c b/Core/SVS/glfw/lib/stream.c deleted file mode 100644 index de75937d2c..0000000000 --- a/Core/SVS/glfw/lib/stream.c +++ /dev/null @@ -1,195 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#define _CRT_SECURE_NO_WARNINGS - -#include "internal.h" - - -//======================================================================== -// Opens a GLFW stream with a file -//======================================================================== - -int _glfwOpenFileStream( _GLFWstream *stream, const char* name, const char* mode ) -{ - memset( stream, 0, sizeof(_GLFWstream) ); - - stream->file = fopen( name, mode ); - if( stream->file == NULL ) - { - return GL_FALSE; - } - - return GL_TRUE; -} - - -//======================================================================== -// Opens a GLFW stream with a memory block -//======================================================================== - -int _glfwOpenBufferStream( _GLFWstream *stream, void *data, long size ) -{ - memset( stream, 0, sizeof(_GLFWstream) ); - - stream->data = data; - stream->size = size; - return GL_TRUE; -} - - -//======================================================================== -// Reads data from a GLFW stream -//======================================================================== - -long _glfwReadStream( _GLFWstream *stream, void *data, long size ) -{ - if( stream->file != NULL ) - { - return (long) fread( data, 1, size, stream->file ); - } - - if( stream->data != NULL ) - { - // Check for EOF - if( stream->position == stream->size ) - { - return 0; - } - - // Clamp read size to available data - if( stream->position + size > stream->size ) - { - size = stream->size - stream->position; - } - - // Perform data read - memcpy( data, (unsigned char*) stream->data + stream->position, size ); - stream->position += size; - return size; - } - - return 0; -} - - -//======================================================================== -// Returns the current position of a GLFW stream -//======================================================================== - -long _glfwTellStream( _GLFWstream *stream ) -{ - if( stream->file != NULL ) - { - return ftell( stream->file ); - } - - if( stream->data != NULL ) - { - return stream->position; - } - - return 0; -} - - -//======================================================================== -// Sets the current position of a GLFW stream -//======================================================================== - -int _glfwSeekStream( _GLFWstream *stream, long offset, int whence ) -{ - long position; - - if( stream->file != NULL ) - { - if( fseek( stream->file, offset, whence ) != 0 ) - { - return GL_FALSE; - } - - return GL_TRUE; - } - - if( stream->data != NULL ) - { - position = offset; - - // Handle whence parameter - if( whence == SEEK_CUR ) - { - position += stream->position; - } - else if( whence == SEEK_END ) - { - position += stream->size; - } - else if( whence != SEEK_SET ) - { - return GL_FALSE; - } - - // Clamp offset to buffer bounds and apply it - if( position > stream->size ) - { - stream->position = stream->size; - } - else if( position < 0 ) - { - stream->position = 0; - } - else - { - stream->position = position; - } - - return GL_TRUE; - } - - return GL_FALSE; -} - - -//======================================================================== -// Closes a GLFW stream -//======================================================================== - -void _glfwCloseStream( _GLFWstream *stream ) -{ - if( stream->file != NULL ) - { - fclose( stream->file ); - } - - // Nothing to be done about (user allocated) memory blocks - - memset( stream, 0, sizeof(_GLFWstream) ); -} - diff --git a/Core/SVS/glfw/lib/tga.c b/Core/SVS/glfw/lib/tga.c deleted file mode 100644 index 7e0697fa9c..0000000000 --- a/Core/SVS/glfw/lib/tga.c +++ /dev/null @@ -1,404 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -//======================================================================== -// Description: -// -// TGA format image file loader. This module supports version 1 Targa -// images, with these restrictions: -// - Pixel format may only be 8, 24 or 32 bits -// - Colormaps must be no longer than 256 entries -// -//======================================================================== - - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions & declarations **** -//************************************************************************ - -//======================================================================== -// TGA file header information -//======================================================================== - -typedef struct { - int idlen; // 1 byte - int cmaptype; // 1 byte - int imagetype; // 1 byte - int cmapfirstidx; // 2 bytes - int cmaplen; // 2 bytes - int cmapentrysize; // 1 byte - int xorigin; // 2 bytes - int yorigin; // 2 bytes - int width; // 2 bytes - int height; // 2 bytes - int bitsperpixel; // 1 byte - int imageinfo; // 1 byte - int _alphabits; // (derived from imageinfo) - int _origin; // (derived from imageinfo) -} _tga_header_t; - -#define _TGA_CMAPTYPE_NONE 0 -#define _TGA_CMAPTYPE_PRESENT 1 - -#define _TGA_IMAGETYPE_NONE 0 -#define _TGA_IMAGETYPE_CMAP 1 -#define _TGA_IMAGETYPE_TC 2 -#define _TGA_IMAGETYPE_GRAY 3 -#define _TGA_IMAGETYPE_CMAP_RLE 9 -#define _TGA_IMAGETYPE_TC_RLE 10 -#define _TGA_IMAGETYPE_GRAY_RLE 11 - -#define _TGA_IMAGEINFO_ALPHA_MASK 0x0f -#define _TGA_IMAGEINFO_ALPHA_SHIFT 0 -#define _TGA_IMAGEINFO_ORIGIN_MASK 0x30 -#define _TGA_IMAGEINFO_ORIGIN_SHIFT 4 - -#define _TGA_ORIGIN_BL 0 -#define _TGA_ORIGIN_BR 1 -#define _TGA_ORIGIN_UL 2 -#define _TGA_ORIGIN_UR 3 - - -//======================================================================== -// Read TGA file header (and check that it is valid) -//======================================================================== - -static int ReadTGAHeader( _GLFWstream *s, _tga_header_t *h ) -{ - unsigned char buf[ 18 ]; - int pos; - - // Read TGA file header from file - pos = _glfwTellStream( s ); - _glfwReadStream( s, buf, 18 ); - - // Interpret header (endian independent parsing) - h->idlen = (int) buf[0]; - h->cmaptype = (int) buf[1]; - h->imagetype = (int) buf[2]; - h->cmapfirstidx = (int) buf[3] | (((int) buf[4]) << 8); - h->cmaplen = (int) buf[5] | (((int) buf[6]) << 8); - h->cmapentrysize = (int) buf[7]; - h->xorigin = (int) buf[8] | (((int) buf[9]) << 8); - h->yorigin = (int) buf[10] | (((int) buf[11]) << 8); - h->width = (int) buf[12] | (((int) buf[13]) << 8); - h->height = (int) buf[14] | (((int) buf[15]) << 8); - h->bitsperpixel = (int) buf[16]; - h->imageinfo = (int) buf[17]; - - // Extract alphabits and origin information - h->_alphabits = (int) (h->imageinfo & _TGA_IMAGEINFO_ALPHA_MASK) >> - _TGA_IMAGEINFO_ALPHA_SHIFT; - h->_origin = (int) (h->imageinfo & _TGA_IMAGEINFO_ORIGIN_MASK) >> - _TGA_IMAGEINFO_ORIGIN_SHIFT; - - // Validate TGA header (is this a TGA file?) - if( (h->cmaptype == 0 || h->cmaptype == 1) && - ((h->imagetype >= 1 && h->imagetype <= 3) || - (h->imagetype >= 9 && h->imagetype <= 11)) && - (h->bitsperpixel == 8 || h->bitsperpixel == 24 || - h->bitsperpixel == 32) ) - { - // Skip the ID field - _glfwSeekStream( s, h->idlen, SEEK_CUR ); - - // Indicate that the TGA header was valid - return GL_TRUE; - } - else - { - // Restore file position - _glfwSeekStream( s, pos, SEEK_SET ); - - // Indicate that the TGA header was invalid - return GL_FALSE; - } -} - -//======================================================================== -// Read Run-Length Encoded data -//======================================================================== - -static void ReadTGA_RLE( unsigned char *buf, int size, int bpp, - _GLFWstream *s ) -{ - int repcount, bytes, k, n; - unsigned char pixel[ 4 ]; - char c; - - // Dummy check - if( bpp > 4 ) - { - return; - } - - while( size > 0 ) - { - // Get repetition count - _glfwReadStream( s, &c, 1 ); - repcount = (unsigned int) c; - bytes = ((repcount & 127) + 1) * bpp; - if( size < bytes ) - { - bytes = size; - } - - // Run-Length packet? - if( repcount & 128 ) - { - _glfwReadStream( s, pixel, bpp ); - for( n = 0; n < (repcount & 127) + 1; n ++ ) - { - for( k = 0; k < bpp; k ++ ) - { - *buf ++ = pixel[ k ]; - } - } - } - else - { - // It's a Raw packet - _glfwReadStream( s, buf, bytes ); - buf += bytes; - } - - size -= bytes; - } -} - - -//======================================================================== -// Read a TGA image from a file -//======================================================================== - -int _glfwReadTGA( _GLFWstream *s, GLFWimage *img, int flags ) -{ - _tga_header_t h; - unsigned char *cmap, *pix, tmp, *src, *dst; - int cmapsize, pixsize, pixsize2; - int bpp, bpp2, k, m, n, swapx, swapy; - - // Read TGA header - if( !ReadTGAHeader( s, &h ) ) - { - return 0; - } - - // Is there a colormap? - cmapsize = (h.cmaptype == _TGA_CMAPTYPE_PRESENT ? 1 : 0) * h.cmaplen * - ((h.cmapentrysize+7) / 8); - if( cmapsize > 0 ) - { - // Is it a colormap that we can handle? - if( (h.cmapentrysize != 24 && h.cmapentrysize != 32) || - h.cmaplen == 0 || h.cmaplen > 256 ) - { - return 0; - } - - // Allocate memory for colormap - cmap = (unsigned char *) malloc( cmapsize ); - if( cmap == NULL ) - { - return 0; - } - - // Read colormap from file - _glfwReadStream( s, cmap, cmapsize ); - } - else - { - cmap = NULL; - } - - // Size of pixel data - pixsize = h.width * h.height * ((h.bitsperpixel + 7) / 8); - - // Bytes per pixel (pixel data - unexpanded) - bpp = (h.bitsperpixel + 7) / 8; - - // Bytes per pixel (expanded pixels - not colormap indeces) - if( cmap ) - { - bpp2 = (h.cmapentrysize + 7) / 8; - } - else - { - bpp2 = bpp; - } - - // For colormaped images, the RGB/RGBA image data may use more memory - // than the stored pixel data - pixsize2 = h.width * h.height * bpp2; - - // Allocate memory for pixel data - pix = (unsigned char *) malloc( pixsize2 ); - if( pix == NULL ) - { - if( cmap ) - { - free( cmap ); - } - return 0; - } - - // Read pixel data from file - if( h.imagetype >= _TGA_IMAGETYPE_CMAP_RLE ) - { - ReadTGA_RLE( pix, pixsize, bpp, s ); - } - else - { - _glfwReadStream( s, pix, pixsize ); - } - - // If the image origin is not what we want, re-arrange the pixels - switch( h._origin ) - { - default: - case _TGA_ORIGIN_UL: - swapx = 0; - swapy = 1; - break; - - case _TGA_ORIGIN_BL: - swapx = 0; - swapy = 0; - break; - - case _TGA_ORIGIN_UR: - swapx = 1; - swapy = 1; - break; - - case _TGA_ORIGIN_BR: - swapx = 1; - swapy = 0; - break; - } - if( (swapy && !(flags & GLFW_ORIGIN_UL_BIT)) || - (!swapy && (flags & GLFW_ORIGIN_UL_BIT)) ) - { - src = pix; - dst = &pix[ (h.height-1)*h.width*bpp ]; - for( n = 0; n < h.height/2; n ++ ) - { - for( m = 0; m < h.width ; m ++ ) - { - for( k = 0; k < bpp; k ++ ) - { - tmp = *src; - *src ++ = *dst; - *dst ++ = tmp; - } - } - dst -= 2*h.width*bpp; - } - } - if( swapx ) - { - src = pix; - dst = &pix[ (h.width-1)*bpp ]; - for( n = 0; n < h.height; n ++ ) - { - for( m = 0; m < h.width/2 ; m ++ ) - { - for( k = 0; k < bpp; k ++ ) - { - tmp = *src; - *src ++ = *dst; - *dst ++ = tmp; - } - dst -= 2*bpp; - } - src += ((h.width+1)/2)*bpp; - dst += ((3*h.width+1)/2)*bpp; - } - } - - // Convert BGR/BGRA to RGB/RGBA, and optionally colormap indeces to - // RGB/RGBA values - if( cmap ) - { - // Convert colormap pixel format (BGR -> RGB or BGRA -> RGBA) - if( bpp2 == 3 || bpp2 == 4 ) - { - for( n = 0; n < h.cmaplen; n ++ ) - { - tmp = cmap[ n*bpp2 ]; - cmap[ n*bpp2 ] = cmap[ n*bpp2 + 2 ]; - cmap[ n*bpp2 + 2 ] = tmp; - } - } - - // Convert pixel data to RGB/RGBA data - for( m = h.width * h.height - 1; m >= 0; m -- ) - { - n = pix[ m ]; - for( k = 0; k < bpp2; k ++ ) - { - pix[ m*bpp2 + k ] = cmap[ n*bpp2 + k ]; - } - } - - // Free memory for colormap (it's not needed anymore) - free( cmap ); - } - else - { - // Convert image pixel format (BGR -> RGB or BGRA -> RGBA) - if( bpp2 == 3 || bpp2 == 4 ) - { - src = pix; - dst = &pix[ 2 ]; - for( n = 0; n < h.height * h.width; n ++ ) - { - tmp = *src; - *src = *dst; - *dst = tmp; - src += bpp2; - dst += bpp2; - } - } - } - - // Fill out GLFWimage struct (the Format field will be set by - // glfwReadImage) - img->Width = h.width; - img->Height = h.height; - img->BytesPerPixel = bpp2; - img->Data = pix; - - return 1; -} - diff --git a/Core/SVS/glfw/lib/thread.c b/Core/SVS/glfw/lib/thread.c deleted file mode 100644 index 42a567903b..0000000000 --- a/Core/SVS/glfw/lib/thread.c +++ /dev/null @@ -1,341 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Find pointer to thread with a matching ID -//======================================================================== - -_GLFWthread * _glfwGetThreadPointer( int ID ) -{ - _GLFWthread *t; - - for( t = &_glfwThrd.First; t != NULL; t = t->Next ) - { - if( t->ID == ID ) - { - break; - } - } - - return t; -} - - -//======================================================================== -// Append thread to thread list -//======================================================================== - -void _glfwAppendThread( _GLFWthread * t ) -{ - _GLFWthread *t_tmp; - - t_tmp = &_glfwThrd.First; - while( t_tmp->Next != NULL ) - { - t_tmp = t_tmp->Next; - } - t_tmp->Next = t; - t->Previous = t_tmp; - t->Next = NULL; -} - - -//======================================================================== -// Remove thread from thread list -//======================================================================== - -void _glfwRemoveThread( _GLFWthread * t ) -{ - if( t->Previous != NULL ) - { - t->Previous->Next = t->Next; - } - if( t->Next != NULL ) - { - t->Next->Previous = t->Previous; - } - free( (void *) t ); -} - - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Create a new thread -//======================================================================== - -GLFWAPI GLFWthread GLFWAPIENTRY glfwCreateThread( GLFWthreadfun fun, - void *arg ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return -1; - } - - // Return the GLFW thread ID - return _glfwPlatformCreateThread( fun, arg ); -} - - -//======================================================================== -// Kill a thread. NOTE: THIS IS A VERY DANGEROUS OPERATION, AND SHOULD NOT -// BE USED EXCEPT IN EXTREME SITUATIONS! -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwDestroyThread( GLFWthread ID ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - // Is it a valid thread? (killing the main thread is not allowed) - if( ID < 1 ) - { - return; - } - - _glfwPlatformDestroyThread( ID ); -} - - -//======================================================================== -// Wait for a thread to die -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwWaitThread( GLFWthread ID, int waitmode ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return GL_TRUE; - } - - // Is it a valid thread? (waiting for the main thread is not allowed) - if( ID < 1 ) - { - return GL_TRUE; - } - - return _glfwPlatformWaitThread( ID, waitmode ); -} - - -//======================================================================== -// Return the thread ID for the current thread -//======================================================================== - -GLFWAPI GLFWthread GLFWAPIENTRY glfwGetThreadID( void ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return 0; - } - - return _glfwPlatformGetThreadID(); -} - - -//======================================================================== -// Create a mutual exclusion object -//======================================================================== - -GLFWAPI GLFWmutex GLFWAPIENTRY glfwCreateMutex( void ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return (GLFWmutex) 0; - } - - return _glfwPlatformCreateMutex(); -} - - -//======================================================================== -// Destroy a mutual exclusion object -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwDestroyMutex( GLFWmutex mutex ) -{ - // Initialized & valid mutex (no real way of assuring this)? - if( !_glfwInitialized || !mutex ) - { - return; - } - - _glfwPlatformDestroyMutex( mutex ); -} - - -//======================================================================== -// Request access to a mutex -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwLockMutex( GLFWmutex mutex ) -{ - // Initialized & valid mutex (no real way of assuring this)? - if( !_glfwInitialized && !mutex ) - { - return; - } - - _glfwPlatformLockMutex( mutex ); -} - - -//======================================================================== -// Release a mutex -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwUnlockMutex( GLFWmutex mutex ) -{ - // Initialized & valid mutex (no real way of assuring this)? - if( !_glfwInitialized && !mutex ) - { - return; - } - - _glfwPlatformUnlockMutex( mutex ); -} - - -//======================================================================== -// Create a new condition variable object -//======================================================================== - -GLFWAPI GLFWcond GLFWAPIENTRY glfwCreateCond( void ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return (GLFWcond) 0; - } - - return _glfwPlatformCreateCond(); -} - - -//======================================================================== -// Destroy a condition variable object -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwDestroyCond( GLFWcond cond ) -{ - // Initialized & valid condition variable? - if( !_glfwInitialized || !cond ) - { - return; - } - - _glfwPlatformDestroyCond( cond ); -} - - -//======================================================================== -// Wait for a condition to be raised -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwWaitCond( GLFWcond cond, GLFWmutex mutex, - double timeout ) -{ - // Initialized & valid condition variable and mutex? - if( !_glfwInitialized || !cond || !mutex ) - { - return; - } - - _glfwPlatformWaitCond( cond, mutex, timeout ); -} - - -//======================================================================== -// Signal a condition to one waiting thread -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSignalCond( GLFWcond cond ) -{ - // Initialized & valid condition variable? - if( !_glfwInitialized || !cond ) - { - return; - } - - _glfwPlatformSignalCond( cond ); -} - - -//======================================================================== -// Broadcast a condition to all waiting threads -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwBroadcastCond( GLFWcond cond ) -{ - // Initialized & valid condition variable? - if( !_glfwInitialized || !cond ) - { - return; - } - - _glfwPlatformBroadcastCond( cond ); -} - - -//======================================================================== -// Return the number of processors in the system. This information can be -// useful for determining the optimal number of threads to use for -// performing a certain task. -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetNumberOfProcessors( void ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return 0; - } - - return _glfwPlatformGetNumberOfProcessors(); -} - diff --git a/Core/SVS/glfw/lib/time.c b/Core/SVS/glfw/lib/time.c deleted file mode 100644 index fc95f44dcd..0000000000 --- a/Core/SVS/glfw/lib/time.c +++ /dev/null @@ -1,84 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Return timer value in seconds -//======================================================================== - -GLFWAPI double GLFWAPIENTRY glfwGetTime( void ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return 0.0; - } - - return _glfwPlatformGetTime(); -} - - -//======================================================================== -// Set timer value in seconds -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetTime( double time ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - _glfwPlatformSetTime( time ); -} - - -//======================================================================== -// Put a thread to sleep for a specified amount of time -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSleep( double time ) -{ - // Is GLFW initialized? - if( !_glfwInitialized ) - { - return; - } - - _glfwPlatformSleep( time ); -} - diff --git a/Core/SVS/glfw/lib/win32/platform.h b/Core/SVS/glfw/lib/win32/platform.h deleted file mode 100644 index 4dc63408ed..0000000000 --- a/Core/SVS/glfw/lib/win32/platform.h +++ /dev/null @@ -1,558 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#ifndef _platform_h_ -#define _platform_h_ - - -// This is the Windows version of GLFW -#define _GLFW_WIN32 - -// We don't need all the fancy stuff -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN -#define VC_EXTRALEAN - -// Include files -#include -#include -#include "../../include/GL/glfw.h" - - -//======================================================================== -// Hack: Define things that some 's do not define -//======================================================================== - -// Some old versions of w32api (used by MinGW and Cygwin) define -// WH_KEYBOARD_LL without typedef:ing KBDLLHOOKSTRUCT (!) -#if defined(__MINGW32__) || defined(__CYGWIN__) -#include -#if defined(WH_KEYBOARD_LL) && (__W32API_MAJOR_VERSION == 1) && (__W32API_MINOR_VERSION <= 2) -#undef WH_KEYBOARD_LL -#endif -#endif - -//------------------------------------------------------------------------ -// ** NOTE ** If this gives you compiler errors and you are using MinGW -// (or Dev-C++), update to w32api version 1.3 or later: -// http://sourceforge.net/project/showfiles.php?group_id=2435 -//------------------------------------------------------------------------ -#ifndef WH_KEYBOARD_LL -#define WH_KEYBOARD_LL 13 -typedef struct tagKBDLLHOOKSTRUCT { - DWORD vkCode; - DWORD scanCode; - DWORD flags; - DWORD time; - DWORD dwExtraInfo; -} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT; -#endif // WH_KEYBOARD_LL - -#ifndef LLKHF_ALTDOWN -#define LLKHF_ALTDOWN 0x00000020 -#endif - -#ifndef SPI_SETSCREENSAVERRUNNING -#define SPI_SETSCREENSAVERRUNNING 97 -#endif -#ifndef SPI_GETANIMATION -#define SPI_GETANIMATION 72 -#endif -#ifndef SPI_SETANIMATION -#define SPI_SETANIMATION 73 -#endif -#ifndef SPI_GETFOREGROUNDLOCKTIMEOUT -#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000 -#endif -#ifndef SPI_SETFOREGROUNDLOCKTIMEOUT -#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001 -#endif - -#ifndef CDS_FULLSCREEN -#define CDS_FULLSCREEN 4 -#endif - -#ifndef PFD_GENERIC_ACCELERATED -#define PFD_GENERIC_ACCELERATED 0x00001000 -#endif -#ifndef PFD_DEPTH_DONTCARE -#define PFD_DEPTH_DONTCARE 0x20000000 -#endif - -#ifndef ENUM_CURRENT_SETTINGS -#define ENUM_CURRENT_SETTINGS -1 -#endif -#ifndef ENUM_REGISTRY_SETTINGS -#define ENUM_REGISTRY_SETTINGS -2 -#endif - -#ifndef WM_MOUSEWHEEL -#define WM_MOUSEWHEEL 0x020A -#endif -#ifndef WHEEL_DELTA -#define WHEEL_DELTA 120 -#endif - -#ifndef WM_XBUTTONDOWN -#define WM_XBUTTONDOWN 0x020B -#endif -#ifndef WM_XBUTTONUP -#define WM_XBUTTONUP 0x020C -#endif -#ifndef XBUTTON1 -#define XBUTTON1 1 -#endif -#ifndef XBUTTON2 -#define XBUTTON2 2 -#endif - -#ifndef WGL_EXT_swap_control - -/* Entry points */ -typedef int (APIENTRY * PFNWGLSWAPINTERVALEXTPROC) (int); - -#endif /*WGL_EXT_swap_control*/ - -#ifndef WGL_ARB_extensions_string - -/* Entry points */ -typedef const char *(APIENTRY * PFNWGLGETEXTENSIONSSTRINGARBPROC)( HDC ); - -#endif /*WGL_ARB_extensions_string*/ - -#ifndef WGL_EXT_extension_string - -/* Entry points */ -typedef const char *(APIENTRY * PFNWGLGETEXTENSIONSSTRINGEXTPROC)( void ); - -#endif /*WGL_EXT_extension_string*/ - -#ifndef WGL_ARB_pixel_format - -/* Entry points */ -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC, int, int, UINT, const int *, int *); - -/* Constants for wglGetPixelFormatAttribivARB */ -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_ACCUM_BITS_ARB 0x201D -#define WGL_ACCUM_RED_BITS_ARB 0x201E -#define WGL_ACCUM_GREEN_BITS_ARB 0x201F -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 - -/* Constants for WGL_ACCELERATION_ARB */ -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 - -/* Constants for WGL_PIXEL_TYPE_ARB */ -#define WGL_TYPE_RGBA_ARB 0x202B -#define WGL_TYPE_COLORINDEX_ARB 0x202C - -#endif /*WGL_ARB_pixel_format*/ - - -#ifndef WGL_ARB_create_context - -/* Entry points */ -typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC, HGLRC, const int *); - -/* Tokens for wglCreateContextAttribsARB attributes */ -#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 -#define WGL_CONTEXT_FLAGS_ARB 0x2094 -#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 - -/* Bits for WGL_CONTEXT_FLAGS_ARB */ -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 - -/* Bits for WGL_CONTEXT_PROFILE_MASK_ARB */ -#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 - -#endif /*WGL_ARB_create_context*/ - - -#ifndef GL_VERSION_3_0 - -typedef const GLubyte * (APIENTRY *PFNGLGETSTRINGIPROC) (GLenum, GLuint); - -#endif /*GL_VERSION_3_0*/ - - -//======================================================================== -// DLLs that are loaded at glfwInit() -//======================================================================== - -// gdi32.dll function pointer typedefs -#ifndef _GLFW_NO_DLOAD_GDI32 -typedef int (WINAPI * CHOOSEPIXELFORMAT_T) (HDC,CONST PIXELFORMATDESCRIPTOR*); -typedef int (WINAPI * DESCRIBEPIXELFORMAT_T) (HDC,int,UINT,LPPIXELFORMATDESCRIPTOR); -typedef int (WINAPI * GETPIXELFORMAT_T) (HDC); -typedef BOOL (WINAPI * SETPIXELFORMAT_T) (HDC,int,const PIXELFORMATDESCRIPTOR*); -typedef BOOL (WINAPI * SWAPBUFFERS_T) (HDC); -#endif // _GLFW_NO_DLOAD_GDI32 - -// winmm.dll function pointer typedefs -#ifndef _GLFW_NO_DLOAD_WINMM -typedef MMRESULT (WINAPI * JOYGETDEVCAPSA_T) (UINT,LPJOYCAPSA,UINT); -typedef MMRESULT (WINAPI * JOYGETPOS_T) (UINT,LPJOYINFO); -typedef MMRESULT (WINAPI * JOYGETPOSEX_T) (UINT,LPJOYINFOEX); -typedef DWORD (WINAPI * TIMEGETTIME_T) (void); -#endif // _GLFW_NO_DLOAD_WINMM - - -// gdi32.dll shortcuts -#ifndef _GLFW_NO_DLOAD_GDI32 -#define _glfw_ChoosePixelFormat _glfwLibrary.Libs.ChoosePixelFormat -#define _glfw_DescribePixelFormat _glfwLibrary.Libs.DescribePixelFormat -#define _glfw_GetPixelFormat _glfwLibrary.Libs.GetPixelFormat -#define _glfw_SetPixelFormat _glfwLibrary.Libs.SetPixelFormat -#define _glfw_SwapBuffers _glfwLibrary.Libs.SwapBuffers -#else -#define _glfw_ChoosePixelFormat ChoosePixelFormat -#define _glfw_DescribePixelFormat DescribePixelFormat -#define _glfw_GetPixelFormat GetPixelFormat -#define _glfw_SetPixelFormat SetPixelFormat -#define _glfw_SwapBuffers SwapBuffers -#endif // _GLFW_NO_DLOAD_GDI32 - -// winmm.dll shortcuts -#ifndef _GLFW_NO_DLOAD_WINMM -#define _glfw_joyGetDevCaps _glfwLibrary.Libs.joyGetDevCapsA -#define _glfw_joyGetPos _glfwLibrary.Libs.joyGetPos -#define _glfw_joyGetPosEx _glfwLibrary.Libs.joyGetPosEx -#define _glfw_timeGetTime _glfwLibrary.Libs.timeGetTime -#else -#define _glfw_joyGetDevCaps joyGetDevCapsA -#define _glfw_joyGetPos joyGetPos -#define _glfw_joyGetPosEx joyGetPosEx -#define _glfw_timeGetTime timeGetTime -#endif // _GLFW_NO_DLOAD_WINMM - - -//======================================================================== -// GLFW platform specific types -//======================================================================== - -//------------------------------------------------------------------------ -// Pointer length integer -//------------------------------------------------------------------------ -typedef INT_PTR GLFWintptr; - - -//------------------------------------------------------------------------ -// Window structure -//------------------------------------------------------------------------ -typedef struct _GLFWwin_struct _GLFWwin; - -struct _GLFWwin_struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // User callback functions - GLFWwindowsizefun windowSizeCallback; - GLFWwindowclosefun windowCloseCallback; - GLFWwindowrefreshfun windowRefreshCallback; - GLFWmousebuttonfun mouseButtonCallback; - GLFWmouseposfun mousePosCallback; - GLFWmousewheelfun mouseWheelCallback; - GLFWkeyfun keyCallback; - GLFWcharfun charCallback; - - // User selected window settings - int fullscreen; // Fullscreen flag - int mouseLock; // Mouse-lock flag - int autoPollEvents; // Auto polling flag - int sysKeysDisabled; // System keys disabled flag - int windowNoResize; // Resize- and maximize gadgets disabled flag - int refreshRate; // Vertical monitor refresh rate - - // Window status & parameters - int opened; // Flag telling if window is opened or not - int active; // Application active flag - int iconified; // Window iconified flag - int width, height; // Window width and heigth - int accelerated; // GL_TRUE if window is HW accelerated - - // Framebuffer attributes - int redBits; - int greenBits; - int blueBits; - int alphaBits; - int depthBits; - int stencilBits; - int accumRedBits; - int accumGreenBits; - int accumBlueBits; - int accumAlphaBits; - int auxBuffers; - int stereo; - int samples; - - // OpenGL extensions and context attributes - int has_GL_SGIS_generate_mipmap; - int has_GL_ARB_texture_non_power_of_two; - int glMajor, glMinor, glRevision; - int glForward, glDebug, glProfile; - - PFNGLGETSTRINGIPROC GetStringi; - - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Platform specific window resources - HDC DC; // Private GDI device context - HGLRC context; // Permanent rendering context - HWND window; // Window handle - ATOM classAtom; // Window class atom - int modeID; // Mode ID for fullscreen mode - HHOOK keyboardHook; // Keyboard hook handle - DWORD dwStyle; // Window styles used for window creation - DWORD dwExStyle; // --"-- - - // Platform specific extensions (context specific) - PFNWGLSWAPINTERVALEXTPROC SwapIntervalEXT; - PFNWGLGETPIXELFORMATATTRIBIVARBPROC GetPixelFormatAttribivARB; - PFNWGLGETEXTENSIONSSTRINGEXTPROC GetExtensionsStringEXT; - PFNWGLGETEXTENSIONSSTRINGARBPROC GetExtensionsStringARB; - PFNWGLCREATECONTEXTATTRIBSARBPROC CreateContextAttribsARB; - GLboolean has_WGL_EXT_swap_control; - GLboolean has_WGL_ARB_multisample; - GLboolean has_WGL_ARB_pixel_format; - GLboolean has_WGL_ARB_create_context; - GLboolean has_WGL_ARB_create_context_profile; - - // Various platform specific internal variables - int oldMouseLock; // Old mouse-lock flag (used for remembering - // mouse-lock state when iconifying) - int oldMouseLockValid; - int desiredRefreshRate; // Desired vertical monitor refresh rate - -}; - -GLFWGLOBAL _GLFWwin _glfwWin; - - -//------------------------------------------------------------------------ -// User input status (most of this should go in _GLFWwin) -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Mouse status - int MousePosX, MousePosY; - int WheelPos; - char MouseButton[ GLFW_MOUSE_BUTTON_LAST+1 ]; - - // Keyboard status - char Key[ GLFW_KEY_LAST+1 ]; - int LastChar; - - // User selected settings - int StickyKeys; - int StickyMouseButtons; - int KeyRepeat; - - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Platform specific internal variables - int MouseMoved, OldMouseX, OldMouseY; - -} _glfwInput; - - -//------------------------------------------------------------------------ -// Library global data -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - - // Window opening hints - _GLFWhints hints; - - // Initial desktop mode - GLFWvidmode desktopMode; - -// ========= PLATFORM SPECIFIC PART ====================================== - - HINSTANCE instance; // Instance of the application - - // Timer data - struct { - int HasPerformanceCounter; - double Resolution; - unsigned int t0_32; - __int64 t0_64; - } Timer; - - // System information - struct { - int winVer; - int hasUnicode; - DWORD foregroundLockTimeout; - } Sys; - -#if !defined(_GLFW_NO_DLOAD_WINMM) || !defined(_GLFW_NO_DLOAD_GDI32) - // Library handles and function pointers - struct { -#ifndef _GLFW_NO_DLOAD_GDI32 - // gdi32.dll - HINSTANCE gdi32; - CHOOSEPIXELFORMAT_T ChoosePixelFormat; - DESCRIBEPIXELFORMAT_T DescribePixelFormat; - GETPIXELFORMAT_T GetPixelFormat; - SETPIXELFORMAT_T SetPixelFormat; - SWAPBUFFERS_T SwapBuffers; -#endif // _GLFW_NO_DLOAD_GDI32 - - // winmm.dll -#ifndef _GLFW_NO_DLOAD_WINMM - HINSTANCE winmm; - JOYGETDEVCAPSA_T joyGetDevCapsA; - JOYGETPOS_T joyGetPos; - JOYGETPOSEX_T joyGetPosEx; - TIMEGETTIME_T timeGetTime; -#endif // _GLFW_NO_DLOAD_WINMM - } Libs; -#endif - -} _glfwLibrary; - - -//------------------------------------------------------------------------ -// Thread record (one for each thread) -//------------------------------------------------------------------------ -typedef struct _GLFWthread_struct _GLFWthread; - -struct _GLFWthread_struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Pointer to previous and next threads in linked list - _GLFWthread *Previous, *Next; - - // GLFW user side thread information - GLFWthread ID; - GLFWthreadfun Function; - -// ========= PLATFORM SPECIFIC PART ====================================== - - // System side thread information - HANDLE Handle; - DWORD WinID; - -}; - - -//------------------------------------------------------------------------ -// General thread information -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Next thread ID to use (increments for every created thread) - GLFWthread NextID; - - // First thread in linked list (always the main thread) - _GLFWthread First; - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Critical section lock - CRITICAL_SECTION CriticalSection; - -} _glfwThrd; - - - -//======================================================================== -// Macros for encapsulating critical code sections (i.e. making parts -// of GLFW thread safe) -//======================================================================== - -// Thread list management -#define ENTER_THREAD_CRITICAL_SECTION \ - EnterCriticalSection( &_glfwThrd.CriticalSection ); -#define LEAVE_THREAD_CRITICAL_SECTION \ - LeaveCriticalSection( &_glfwThrd.CriticalSection ); - - -//======================================================================== -// Various Windows version constants -//======================================================================== - -#define _GLFW_WIN_UNKNOWN 0x0000 // Earlier than 95 or NT4 -#define _GLFW_WIN_95 0x0001 -#define _GLFW_WIN_98 0x0002 -#define _GLFW_WIN_ME 0x0003 -#define _GLFW_WIN_UNKNOWN_9x 0x0004 // Later than ME -#define _GLFW_WIN_NT4 0x0101 -#define _GLFW_WIN_2K 0x0102 -#define _GLFW_WIN_XP 0x0103 -#define _GLFW_WIN_NET_SERVER 0x0104 -#define _GLFW_WIN_UNKNOWN_NT 0x0105 // Later than .NET Server - - -//======================================================================== -// Prototypes for platform specific internal functions -//======================================================================== - -// Time -void _glfwInitTimer( void ); - -// Fullscreen support -int _glfwGetClosestVideoModeBPP( int *w, int *h, int *bpp, int *refresh ); -int _glfwGetClosestVideoMode( int *w, int *h, int *r, int *g, int *b, int *refresh ); -void _glfwSetVideoModeMODE( int mode ); -void _glfwSetVideoMode( int *w, int *h, int r, int g, int b, int refresh ); - - -#endif // _platform_h_ diff --git a/Core/SVS/glfw/lib/win32/win32_dllmain.c b/Core/SVS/glfw/lib/win32/win32_dllmain.c deleted file mode 100644 index d7a9c1a9fb..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_dllmain.c +++ /dev/null @@ -1,49 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -#if defined(GLFW_BUILD_DLL) - -//======================================================================== -// GLFW DLL entry point -//======================================================================== - -BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, LPVOID reserved ) -{ - // NOTE: Some compilers complains about instance and x never being used - - // never mind that (we don't want to use them)! - - return TRUE; -} - -#endif // GLFW_BUILD_DLL - diff --git a/Core/SVS/glfw/lib/win32/win32_enable.c b/Core/SVS/glfw/lib/win32/win32_enable.c deleted file mode 100644 index 3e72b78744..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_enable.c +++ /dev/null @@ -1,155 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Low level keyboard hook (system callback) function -// Used to disable system keys under Windows NT -//======================================================================== - -static LRESULT CALLBACK keyboardHook( int nCode, WPARAM wParam, LPARAM lParam ) -{ - BOOL syskeys = FALSE; - PKBDLLHOOKSTRUCT p; - - // We are only looking for keyboard events - interpret lParam as a - // pointer to a KBDLLHOOKSTRUCT - p = (PKBDLLHOOKSTRUCT) lParam; - - if( nCode == HC_ACTION ) - { - // We have a keyboard event - - switch( wParam ) - { - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - case WM_KEYUP: - case WM_SYSKEYUP: - // Detect: ALT+TAB, ALT+ESC, ALT+F4, CTRL+ESC, - // LWIN, RWIN, APPS (mysterious menu key) - syskeys = ( p->vkCode == VK_TAB && - p->flags & LLKHF_ALTDOWN ) || - ( p->vkCode == VK_ESCAPE && - p->flags & LLKHF_ALTDOWN ) || - ( p->vkCode == VK_F4 && - p->flags & LLKHF_ALTDOWN ) || - ( p->vkCode == VK_ESCAPE && - (GetKeyState(VK_CONTROL) & 0x8000)) || - p->vkCode == VK_LWIN || - p->vkCode == VK_RWIN || - p->vkCode == VK_APPS; - break; - - default: - break; - } - } - - // Was it a system key combination (e.g. ALT+TAB)? - if( syskeys ) - { - // Pass the key event to our window message loop - if( _glfwWin.opened ) - { - PostMessage( _glfwWin.window, (UINT) wParam, p->vkCode, 0 ); - } - - // We've taken care of it - don't let the system know about this - // key event - return 1; - } - else - { - // It's a harmless key press, let the system deal with it - return CallNextHookEx( _glfwWin.keyboardHook, nCode, wParam, lParam ); - } -} - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Enable system keys -//======================================================================== - -void _glfwPlatformEnableSystemKeys( void ) -{ - BOOL dummy; - - // Use different methods depending on operating system version - if( _glfwLibrary.Sys.winVer >= _GLFW_WIN_NT4 ) - { - if( _glfwWin.keyboardHook != NULL ) - { - UnhookWindowsHookEx( _glfwWin.keyboardHook ); - _glfwWin.keyboardHook = NULL; - } - } - else - { - (void) SystemParametersInfo( SPI_SETSCREENSAVERRUNNING, FALSE, &dummy, 0 ); - } -} - -//======================================================================== -// Disable system keys -//======================================================================== - -void _glfwPlatformDisableSystemKeys( void ) -{ - BOOL dummy; - - // Use different methods depending on operating system version - if( _glfwLibrary.Sys.winVer >= _GLFW_WIN_NT4 ) - { - // Under Windows NT, install a low level keyboard hook - _glfwWin.keyboardHook = SetWindowsHookEx( WH_KEYBOARD_LL, - keyboardHook, - _glfwLibrary.instance, - 0 ); - } - else - { - // Under Windows 95/98/ME, fool Windows that a screensaver - // is running => prevents ALT+TAB, CTRL+ESC and CTRL+ALT+DEL - (void) SystemParametersInfo( SPI_SETSCREENSAVERRUNNING, TRUE, &dummy, 0 ); - } -} - diff --git a/Core/SVS/glfw/lib/win32/win32_fullscreen.c b/Core/SVS/glfw/lib/win32/win32_fullscreen.c deleted file mode 100644 index d36710d957..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_fullscreen.c +++ /dev/null @@ -1,320 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Convert BPP to RGB bits based on "best guess" -//======================================================================== - -static void bpp2rgb( int bpp, int *r, int *g, int *b ) -{ - int delta; - - // We assume that by 32 they really meant 24 - if( bpp == 32 ) - { - bpp = 24; - } - - // Convert "bits per pixel" to red, green & blue sizes - - *r = *g = *b = bpp / 3; - delta = bpp - (*r * 3); - if( delta >= 1 ) - { - *g = *g + 1; - } - if( delta == 2 ) - { - *r = *r + 1; - } -} - - -//======================================================================== -// Return closest video mode by dimensions, refresh rate and bits per pixel -//======================================================================== - -int _glfwGetClosestVideoModeBPP( int *w, int *h, int *bpp, int *refresh ) -{ - int mode, bestmode, match, bestmatch, rr, bestrr, success; - DEVMODE dm; - - // Find best match - bestmatch = 0x7fffffff; - bestrr = 0x7fffffff; - mode = bestmode = 0; - do - { - dm.dmSize = sizeof( DEVMODE ); - success = EnumDisplaySettings( NULL, mode, &dm ); - if( success ) - { - match = dm.dmBitsPerPel - *bpp; - if( match < 0 ) match = -match; - match = ( match << 25 ) | - ( (dm.dmPelsWidth - *w) * - (dm.dmPelsWidth - *w) + - (dm.dmPelsHeight - *h) * - (dm.dmPelsHeight - *h) ); - if( match < bestmatch ) - { - bestmatch = match; - bestmode = mode; - bestrr = (dm.dmDisplayFrequency - *refresh) * - (dm.dmDisplayFrequency - *refresh); - } - else if( match == bestmatch && *refresh > 0 ) - { - rr = (dm.dmDisplayFrequency - *refresh) * - (dm.dmDisplayFrequency - *refresh); - if( rr < bestrr ) - { - bestmatch = match; - bestmode = mode; - bestrr = rr; - } - } - } - mode ++; - } - while( success ); - - // Get the parameters for the best matching display mode - dm.dmSize = sizeof( DEVMODE ); - (void) EnumDisplaySettings( NULL, bestmode, &dm ); - - // Fill out actual width and height - *w = dm.dmPelsWidth; - *h = dm.dmPelsHeight; - - // Return bits per pixel - *bpp = dm.dmBitsPerPel; - - // Return vertical refresh rate - *refresh = dm.dmDisplayFrequency; - - return bestmode; -} - - -//======================================================================== -// Return closest video mode by dimensions, refresh rate and channel sizes -//======================================================================== - -static int getClosestVideoMode( int *w, int *h, - int *r, int *g, int *b, - int *refresh ) -{ - int bpp, bestmode; - - // Colorbits = sum of red/green/blue bits - bpp = *r + *g + *b; - - // If colorbits < 15 (e.g. 0) or >= 24, default to 32 bpp - if( bpp < 15 || bpp >= 24 ) - { - bpp = 32; - } - - // Find best match - bestmode = _glfwGetClosestVideoModeBPP( w, h, &bpp, refresh ); - - // Convert "bits per pixel" to red, green & blue sizes - bpp2rgb( bpp, r, g, b ); - - return bestmode; -} - - -//======================================================================== -// Change the current video mode -//======================================================================== - -void _glfwSetVideoModeMODE( int mode ) -{ - DEVMODE dm; - int success; - - // Get the parameters for the best matching display mode - dm.dmSize = sizeof( DEVMODE ); - (void) EnumDisplaySettings( NULL, mode, &dm ); - - // Set which fields we want to specify - dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; - - // Do we have a prefered refresh rate? - if( _glfwWin.desiredRefreshRate > 0 ) - { - dm.dmFields = dm.dmFields | DM_DISPLAYFREQUENCY; - dm.dmDisplayFrequency = _glfwWin.desiredRefreshRate; - } - - // Change display setting - dm.dmSize = sizeof( DEVMODE ); - success = ChangeDisplaySettings( &dm, CDS_FULLSCREEN ); - - // If the mode change was not possible, query the current display - // settings (we'll use the desktop resolution for fullscreen mode) - if( success == DISP_CHANGE_SUCCESSFUL ) - { - _glfwWin.modeID = mode; - } - else - { - _glfwWin.modeID = ENUM_REGISTRY_SETTINGS; - EnumDisplaySettings( NULL, ENUM_REGISTRY_SETTINGS, &dm ); - } - - // Set the window size to that of the display mode - _glfwWin.width = dm.dmPelsWidth; - _glfwWin.height = dm.dmPelsHeight; -} - - -//======================================================================== -// Change the current video mode -//======================================================================== - -void _glfwSetVideoMode( int *w, int *h, int r, int g, int b, int refresh ) -{ - int bestmode; - - // Find a best match mode - bestmode = getClosestVideoMode( w, h, &r, &g, &b, &refresh ); - - // Change mode - _glfwSetVideoModeMODE( bestmode ); -} - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Get a list of available video modes -//======================================================================== - -int _glfwPlatformGetVideoModes( GLFWvidmode *list, int maxcount ) -{ - int count, success, mode, i, j; - int m1, m2, bpp, r, g, b; - DEVMODE dm; - - // Loop through all video modes and extract all the UNIQUE modes - count = 0; - mode = 0; - do - { - // Get video mode properties - dm.dmSize = sizeof( DEVMODE ); - success = EnumDisplaySettings( NULL, mode, &dm ); - - // Is it a valid mode? (only list depths >= 15 bpp) - if( success && dm.dmBitsPerPel >= 15 ) - { - // Convert to RGB, and back to bpp ("mask out" alpha bits etc) - bpp2rgb( dm.dmBitsPerPel, &r, &g, &b ); - bpp = r + g + b; - - // Mode "code" for this mode - m1 = (bpp << 25) | (dm.dmPelsWidth * dm.dmPelsHeight); - - // Insert mode in list (sorted), and avoid duplicates - for( i = 0; i < count; i ++ ) - { - // Mode "code" for already listed mode - bpp = list[i].RedBits + list[i].GreenBits + - list[i].BlueBits; - m2 = (bpp << 25) | (list[i].Width * list[i].Height); - if( m1 <= m2 ) - { - break; - } - } - - // New entry at the end of the list? - if( i >= count ) - { - list[count].Width = dm.dmPelsWidth; - list[count].Height = dm.dmPelsHeight; - list[count].RedBits = r; - list[count].GreenBits = g; - list[count].BlueBits = b; - count ++; - } - // Insert new entry in the list? - else if( m1 < m2 ) - { - for( j = count; j > i; j -- ) - { - list[j] = list[j-1]; - } - list[i].Width = dm.dmPelsWidth; - list[i].Height = dm.dmPelsHeight; - list[i].RedBits = r; - list[i].GreenBits = g; - list[i].BlueBits = b; - count ++; - } - } - mode ++; - } - while( success && (count < maxcount) ); - - return count; -} - - -//======================================================================== -// Get the desktop video mode -//======================================================================== - -void _glfwPlatformGetDesktopMode( GLFWvidmode *mode ) -{ - DEVMODE dm; - - // Get desktop display mode - dm.dmSize = sizeof( DEVMODE ); - (void) EnumDisplaySettings( NULL, ENUM_REGISTRY_SETTINGS, &dm ); - - // Return desktop mode parameters - mode->Width = dm.dmPelsWidth; - mode->Height = dm.dmPelsHeight; - bpp2rgb( dm.dmBitsPerPel, &mode->RedBits, &mode->GreenBits, &mode->BlueBits ); -} - diff --git a/Core/SVS/glfw/lib/win32/win32_glext.c b/Core/SVS/glfw/lib/win32/win32_glext.c deleted file mode 100644 index 820adc500b..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_glext.c +++ /dev/null @@ -1,82 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Check if the current context supports the specified WGL extension -//======================================================================== - -int _glfwPlatformExtensionSupported( const char *extension ) -{ - const GLubyte *extensions; - - if( _glfwWin.GetExtensionsStringEXT != NULL ) - { - extensions = (GLubyte *) _glfwWin.GetExtensionsStringEXT(); - if( extensions != NULL ) - { - if( _glfwStringInExtensionString( extension, extensions ) ) - { - return GL_TRUE; - } - } - } - - if( _glfwWin.GetExtensionsStringARB != NULL ) - { - extensions = (GLubyte *) _glfwWin.GetExtensionsStringARB( _glfwWin.DC ); - if( extensions != NULL ) - { - if( _glfwStringInExtensionString( extension, extensions ) ) - { - return GL_TRUE; - } - } - } - - return GL_FALSE; -} - - -//======================================================================== -// Get the function pointer to an OpenGL function -//======================================================================== - -void *_glfwPlatformGetProcAddress( const char *procname ) -{ - return (void *) wglGetProcAddress( procname ); -} - diff --git a/Core/SVS/glfw/lib/win32/win32_init.c b/Core/SVS/glfw/lib/win32/win32_init.c deleted file mode 100644 index e7e9b39c8f..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_init.c +++ /dev/null @@ -1,358 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -// With the Borland C++ compiler, we want to disable FPU exceptions -#ifdef __BORLANDC__ -#include -#endif // __BORLANDC__ - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Load necessary libraries (DLLs) -//======================================================================== - -static int _glfwInitLibraries( void ) -{ - // gdi32.dll (OpenGL pixel format functions & SwapBuffers) -#ifndef _GLFW_NO_DLOAD_GDI32 - _glfwLibrary.Libs.gdi32 = LoadLibrary( "gdi32.dll" ); - if( _glfwLibrary.Libs.gdi32 != NULL ) - { - _glfwLibrary.Libs.ChoosePixelFormat = (CHOOSEPIXELFORMAT_T) - GetProcAddress( _glfwLibrary.Libs.gdi32, "ChoosePixelFormat" ); - _glfwLibrary.Libs.DescribePixelFormat = (DESCRIBEPIXELFORMAT_T) - GetProcAddress( _glfwLibrary.Libs.gdi32, "DescribePixelFormat" ); - _glfwLibrary.Libs.GetPixelFormat = (GETPIXELFORMAT_T) - GetProcAddress( _glfwLibrary.Libs.gdi32, "GetPixelFormat" ); - _glfwLibrary.Libs.SetPixelFormat = (SETPIXELFORMAT_T) - GetProcAddress( _glfwLibrary.Libs.gdi32, "SetPixelFormat" ); - _glfwLibrary.Libs.SwapBuffers = (SWAPBUFFERS_T) - GetProcAddress( _glfwLibrary.Libs.gdi32, "SwapBuffers" ); - if( _glfwLibrary.Libs.ChoosePixelFormat == NULL || - _glfwLibrary.Libs.DescribePixelFormat == NULL || - _glfwLibrary.Libs.GetPixelFormat == NULL || - _glfwLibrary.Libs.SetPixelFormat == NULL || - _glfwLibrary.Libs.SwapBuffers == NULL ) - { - FreeLibrary( _glfwLibrary.Libs.gdi32 ); - _glfwLibrary.Libs.gdi32 = NULL; - return GL_FALSE; - } - } - else - { - return GL_FALSE; - } -#endif // _GLFW_NO_DLOAD_GDI32 - - // winmm.dll (for joystick and timer support) -#ifndef _GLFW_NO_DLOAD_WINMM - _glfwLibrary.Libs.winmm = LoadLibrary( "winmm.dll" ); - if( _glfwLibrary.Libs.winmm != NULL ) - { - _glfwLibrary.Libs.joyGetDevCapsA = (JOYGETDEVCAPSA_T) - GetProcAddress( _glfwLibrary.Libs.winmm, "joyGetDevCapsA" ); - _glfwLibrary.Libs.joyGetPos = (JOYGETPOS_T) - GetProcAddress( _glfwLibrary.Libs.winmm, "joyGetPos" ); - _glfwLibrary.Libs.joyGetPosEx = (JOYGETPOSEX_T) - GetProcAddress( _glfwLibrary.Libs.winmm, "joyGetPosEx" ); - _glfwLibrary.Libs.timeGetTime = (TIMEGETTIME_T) - GetProcAddress( _glfwLibrary.Libs.winmm, "timeGetTime" ); - if( _glfwLibrary.Libs.joyGetDevCapsA == NULL || - _glfwLibrary.Libs.joyGetPos == NULL || - _glfwLibrary.Libs.joyGetPosEx == NULL || - _glfwLibrary.Libs.timeGetTime == NULL ) - { - FreeLibrary( _glfwLibrary.Libs.winmm ); - _glfwLibrary.Libs.winmm = NULL; - return GL_FALSE; - } - } - else - { - return GL_FALSE; - } -#endif // _GLFW_NO_DLOAD_WINMM - - return GL_TRUE; -} - - -//======================================================================== -// Unload used libraries (DLLs) -//======================================================================== - -static void _glfwFreeLibraries( void ) -{ - // gdi32.dll -#ifndef _GLFW_NO_DLOAD_GDI32 - if( _glfwLibrary.Libs.gdi32 != NULL ) - { - FreeLibrary( _glfwLibrary.Libs.gdi32 ); - _glfwLibrary.Libs.gdi32 = NULL; - } -#endif // _GLFW_NO_DLOAD_GDI32 - - // winmm.dll -#ifndef _GLFW_NO_DLOAD_WINMM - if( _glfwLibrary.Libs.winmm != NULL ) - { - FreeLibrary( _glfwLibrary.Libs.winmm ); - _glfwLibrary.Libs.winmm = NULL; - } -#endif // _GLFW_NO_DLOAD_WINMM -} - - -//======================================================================== -// Initialize GLFW thread package -//======================================================================== - -static void _glfwInitThreads( void ) -{ - // Initialize critical section handle - InitializeCriticalSection( &_glfwThrd.CriticalSection ); - - // The first thread (the main thread) has ID 0 - _glfwThrd.NextID = 0; - - // Fill out information about the main thread (this thread) - _glfwThrd.First.ID = _glfwThrd.NextID ++; - _glfwThrd.First.Function = NULL; - _glfwThrd.First.Handle = GetCurrentThread(); - _glfwThrd.First.WinID = GetCurrentThreadId(); - _glfwThrd.First.Previous = NULL; - _glfwThrd.First.Next = NULL; -} - - -//======================================================================== -// Terminate GLFW thread package -//======================================================================== - -static void _glfwTerminateThreads( void ) -{ - _GLFWthread *t, *t_next; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Kill all threads (NOTE: THE USER SHOULD WAIT FOR ALL THREADS TO - // DIE, _BEFORE_ CALLING glfwTerminate()!!!) - t = _glfwThrd.First.Next; - while( t != NULL ) - { - // Get pointer to next thread - t_next = t->Next; - - // Simply murder the process, no mercy! - if( TerminateThread( t->Handle, 0 ) ) - { - // Close thread handle - CloseHandle( t->Handle ); - - // Free memory allocated for this thread - free( (void *) t ); - } - - // Select next thread in list - t = t_next; - } - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Delete critical section handle - DeleteCriticalSection( &_glfwThrd.CriticalSection ); -} - - -//======================================================================== -// Terminate GLFW when exiting application -//======================================================================== - -void _glfwTerminate_atexit( void ) -{ - glfwTerminate(); -} - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Initialize various GLFW state -//======================================================================== - -int _glfwPlatformInit( void ) -{ - OSVERSIONINFO osi; - - // To make SetForegroundWindow() work as we want, we need to fiddle - // with the FOREGROUNDLOCKTIMEOUT system setting (we do this as early - // as possible in the hope of still being the foreground process) - SystemParametersInfo( SPI_GETFOREGROUNDLOCKTIMEOUT, 0, - &_glfwLibrary.Sys.foregroundLockTimeout, 0 ); - SystemParametersInfo( SPI_SETFOREGROUNDLOCKTIMEOUT, 0, (LPVOID)0, - SPIF_SENDCHANGE ); - - // Check which OS version we are running - osi.dwOSVersionInfoSize = sizeof( OSVERSIONINFO ); - GetVersionEx( &osi ); - _glfwLibrary.Sys.winVer = _GLFW_WIN_UNKNOWN; - if( osi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) - { - if( osi.dwMajorVersion == 4 && osi.dwMinorVersion < 10 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_95; - } - else if( osi.dwMajorVersion == 4 && osi.dwMinorVersion < 90 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_98; - } - else if( osi.dwMajorVersion == 4 && osi.dwMinorVersion == 90 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_ME; - } - else if( osi.dwMajorVersion >= 4 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_UNKNOWN_9x; - } - } - else if( osi.dwPlatformId == VER_PLATFORM_WIN32_NT ) - { - if( osi.dwMajorVersion == 4 && osi.dwMinorVersion == 0 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_NT4; - } - else if( osi.dwMajorVersion == 5 && osi.dwMinorVersion == 0 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_2K; - } - else if( osi.dwMajorVersion == 5 && osi.dwMinorVersion == 1 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_XP; - } - else if( osi.dwMajorVersion == 5 && osi.dwMinorVersion == 2 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_NET_SERVER; - } - else if( osi.dwMajorVersion >= 5 ) - { - _glfwLibrary.Sys.winVer = _GLFW_WIN_UNKNOWN_NT; - } - } - - // Do we have Unicode support? - if( _glfwLibrary.Sys.winVer >= _GLFW_WIN_NT4 ) - { - // Windows NT/2000/XP/.NET has Unicode support - _glfwLibrary.Sys.hasUnicode = GL_TRUE; - } - else - { - // Windows 9x/ME does not have Unicode support - _glfwLibrary.Sys.hasUnicode = GL_FALSE; - } - - // Load libraries (DLLs) - if( !_glfwInitLibraries() ) - { - return GL_FALSE; - } - - // With the Borland C++ compiler, we want to disable FPU exceptions - // (this is recommended for OpenGL applications under Windows) -#ifdef __BORLANDC__ - _control87( MCW_EM, MCW_EM ); -#endif - - // Retrieve GLFW instance handle - _glfwLibrary.instance = GetModuleHandle( NULL ); - - // System keys are not disabled - _glfwWin.keyboardHook = NULL; - - // Initialise thread package - _glfwInitThreads(); - - _glfwPlatformGetDesktopMode( &_glfwLibrary.desktopMode ); - - // Install atexit() routine - atexit( _glfwTerminate_atexit ); - - // Start the timer - _glfwInitTimer(); - - return GL_TRUE; -} - - -//======================================================================== -// Close window and kill all threads -//======================================================================== - -int _glfwPlatformTerminate( void ) -{ - // Only the main thread is allowed to do this... - if( GetCurrentThreadId() != _glfwThrd.First.WinID ) - { - return GL_FALSE; - } - - // Close OpenGL window - glfwCloseWindow(); - - // Kill thread package - _glfwTerminateThreads(); - - // Enable system keys again (if they were disabled) - glfwEnable( GLFW_SYSTEM_KEYS ); - - // Unload libraries (DLLs) - _glfwFreeLibraries(); - - // Restore FOREGROUNDLOCKTIMEOUT system setting - SystemParametersInfo( SPI_SETFOREGROUNDLOCKTIMEOUT, 0, - (LPVOID) (INT_PTR) _glfwLibrary.Sys.foregroundLockTimeout, - SPIF_SENDCHANGE ); - - return GL_TRUE; -} - diff --git a/Core/SVS/glfw/lib/win32/win32_joystick.c b/Core/SVS/glfw/lib/win32/win32_joystick.c deleted file mode 100644 index eecd1c5a24..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_joystick.c +++ /dev/null @@ -1,233 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Return GL_TRUE if joystick is present, else return GL_FALSE. -//======================================================================== - -static int _glfwJoystickPresent( int joy ) -{ - JOYINFO ji; - - // Windows NT 4.0 MMSYSTEM only supports 2 sticks (other Windows - // versions support 16 sticks) - if( _glfwLibrary.Sys.winVer == _GLFW_WIN_NT4 && joy > GLFW_JOYSTICK_2 ) - { - return GL_FALSE; - } - - // Is it a valid stick ID (Windows don't support more than 16 sticks)? - if( joy < GLFW_JOYSTICK_1 || joy > GLFW_JOYSTICK_16 ) - { - return GL_FALSE; - } - - // Is the joystick present? - if( _glfw_joyGetPos( joy - GLFW_JOYSTICK_1, &ji ) != JOYERR_NOERROR ) - { - return GL_FALSE; - } - - return GL_TRUE; -} - - -//======================================================================== -// Calculate joystick position -//======================================================================== - -static float _glfwCalcJoystickPos( DWORD pos, DWORD min, DWORD max ) -{ - float fpos = (float) pos; - float fmin = (float) min; - float fmax = (float) max; - return (2.0f*(fpos - fmin) / (fmax - fmin)) - 1.0f; -} - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Determine joystick capabilities -//======================================================================== - -int _glfwPlatformGetJoystickParam( int joy, int param ) -{ - JOYCAPS jc; - -// return 0; - - // Is joystick present? - if( !_glfwJoystickPresent( joy ) ) - { - return 0; - } - - // We got this far, the joystick is present - if( param == GLFW_PRESENT ) - { - return GL_TRUE; - } - - // Get joystick capabilities - _glfw_joyGetDevCaps( joy - GLFW_JOYSTICK_1, &jc, sizeof(JOYCAPS) ); - - switch( param ) - { - case GLFW_AXES: - // Return number of joystick axes - return jc.wNumAxes; - - case GLFW_BUTTONS: - // Return number of joystick axes - return jc.wNumButtons; - - default: - break; - } - - return 0; -} - - -//======================================================================== -// Get joystick axis positions -//======================================================================== - -int _glfwPlatformGetJoystickPos( int joy, float *pos, int numaxes ) -{ - JOYCAPS jc; - JOYINFOEX ji; - int axis; - -// return 0; - - // Is joystick present? - if( !_glfwJoystickPresent( joy ) ) - { - return 0; - } - - // Get joystick capabilities - _glfw_joyGetDevCaps( joy - GLFW_JOYSTICK_1, &jc, sizeof(JOYCAPS) ); - - // Get joystick state - ji.dwSize = sizeof( JOYINFOEX ); - ji.dwFlags = JOY_RETURNX | JOY_RETURNY | JOY_RETURNZ | - JOY_RETURNR | JOY_RETURNU | JOY_RETURNV; - _glfw_joyGetPosEx( joy - GLFW_JOYSTICK_1, &ji ); - - // Get position values for all axes - axis = 0; - if( axis < numaxes ) - { - pos[ axis++ ] = _glfwCalcJoystickPos( ji.dwXpos, jc.wXmin, - jc.wXmax ); - } - if( axis < numaxes ) - { - pos[ axis++ ] = -_glfwCalcJoystickPos( ji.dwYpos, jc.wYmin, - jc.wYmax ); - } - if( axis < numaxes && jc.wCaps & JOYCAPS_HASZ ) - { - pos[ axis++ ] = _glfwCalcJoystickPos( ji.dwZpos, jc.wZmin, - jc.wZmax ); - } - if( axis < numaxes && jc.wCaps & JOYCAPS_HASR ) - { - pos[ axis++ ] = _glfwCalcJoystickPos( ji.dwRpos, jc.wRmin, - jc.wRmax ); - } - if( axis < numaxes && jc.wCaps & JOYCAPS_HASU ) - { - pos[ axis++ ] = _glfwCalcJoystickPos( ji.dwUpos, jc.wUmin, - jc.wUmax ); - } - if( axis < numaxes && jc.wCaps & JOYCAPS_HASV ) - { - pos[ axis++ ] = -_glfwCalcJoystickPos( ji.dwVpos, jc.wVmin, - jc.wVmax ); - } - - // Return number of returned axes - return axis; -} - - -//======================================================================== -// Get joystick button states -//======================================================================== - -int _glfwPlatformGetJoystickButtons( int joy, unsigned char *buttons, - int numbuttons ) -{ - JOYCAPS jc; - JOYINFOEX ji; - int button; - -// return 0; - - // Is joystick present? - if( !_glfwJoystickPresent( joy ) ) - { - return 0; - } - - // Get joystick capabilities - _glfw_joyGetDevCaps( joy - GLFW_JOYSTICK_1, &jc, sizeof(JOYCAPS) ); - - // Get joystick state - ji.dwSize = sizeof( JOYINFOEX ); - ji.dwFlags = JOY_RETURNBUTTONS; - _glfw_joyGetPosEx( joy - GLFW_JOYSTICK_1, &ji ); - - // Get states of all requested buttons - button = 0; - while( button < numbuttons && button < (int) jc.wNumButtons ) - { - buttons[ button ] = (unsigned char) - (ji.dwButtons & (1UL << button) ? GLFW_PRESS : GLFW_RELEASE); - button ++; - } - - return button; -} - diff --git a/Core/SVS/glfw/lib/win32/win32_thread.c b/Core/SVS/glfw/lib/win32/win32_thread.c deleted file mode 100644 index 57e2fdc695..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_thread.c +++ /dev/null @@ -1,506 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -// This is an implementation of POSIX "compatible" condition variables for -// Win32, as described by Douglas C. Schmidt and Irfan Pyarali: -// http://www.cs.wustl.edu/~schmidt/win32-cv-1.html -//************************************************************************ - -enum { - _GLFW_COND_SIGNAL = 0, - _GLFW_COND_BROADCAST = 1 -}; - -typedef struct { - // Signal and broadcast event HANDLEs - HANDLE events[ 2 ]; - - // Count of the number of waiters - unsigned int waiters_count; - - // Serialize access to - CRITICAL_SECTION waiters_count_lock; -} _GLFWcond; - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// This is simply a "wrapper" for calling the user thread function. -//======================================================================== - -DWORD WINAPI _glfwNewThread( LPVOID lpParam ) -{ - GLFWthreadfun threadfun; - _GLFWthread *t; - - // Get pointer to thread information for current thread - t = _glfwGetThreadPointer( _glfwPlatformGetThreadID() ); - if( t == NULL ) - { - return 0; - } - - // Get user thread function pointer - threadfun = t->Function; - - // Call the user thread function - threadfun( (void *) lpParam ); - - // Remove thread from thread list - ENTER_THREAD_CRITICAL_SECTION - _glfwRemoveThread( t ); - LEAVE_THREAD_CRITICAL_SECTION - - // When the thread function returns, the thread will die... - return 0; -} - - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Create a new thread -//======================================================================== - -GLFWthread _glfwPlatformCreateThread( GLFWthreadfun fun, void *arg ) -{ - GLFWthread ID; - _GLFWthread *t, *t_tmp; - HANDLE hThread; - DWORD dwThreadId; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Create a new thread information memory area - t = (_GLFWthread *) malloc( sizeof(_GLFWthread) ); - if( t == NULL ) - { - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - return -1; - } - - // Get a new unique thread id - ID = _glfwThrd.NextID ++; - - // Store thread information in the thread list - t->Function = fun; - t->ID = ID; - - // Create thread - hThread = CreateThread( - NULL, // Default security attributes - 0, // Default stack size (1 MB) - _glfwNewThread, // Thread function (a wrapper function) - (LPVOID)arg, // Argument to thread is the user argument - 0, // Default creation flags - &dwThreadId // Returned thread identifier - ); - - // Did the thread creation fail? - if( hThread == NULL ) - { - free( (void *) t ); - LEAVE_THREAD_CRITICAL_SECTION - return -1; - } - - // Store more thread information in the thread list - t->Handle = hThread; - t->WinID = dwThreadId; - - // Append thread to thread list - t_tmp = &_glfwThrd.First; - while( t_tmp->Next != NULL ) - { - t_tmp = t_tmp->Next; - } - t_tmp->Next = t; - t->Previous = t_tmp; - t->Next = NULL; - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Return the GLFW thread ID - return ID; -} - - -//======================================================================== -// Kill a thread. NOTE: THIS IS A VERY DANGEROUS OPERATION, AND SHOULD NOT -// BE USED EXCEPT IN EXTREME SITUATIONS! -//======================================================================== - -void _glfwPlatformDestroyThread( GLFWthread ID ) -{ - _GLFWthread *t; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Get thread information pointer - t = _glfwGetThreadPointer( ID ); - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return; - } - - // Simply murder the process, no mercy! - if( TerminateThread( t->Handle, 0 ) ) - { - // Close thread handle - CloseHandle( t->Handle ); - - // Remove thread from thread list - _glfwRemoveThread( t ); - } - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION -} - - -//======================================================================== -// Wait for a thread to die -//======================================================================== - -int _glfwPlatformWaitThread( GLFWthread ID, int waitmode ) -{ - DWORD result; - HANDLE hThread; - _GLFWthread *t; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Get thread information pointer - t = _glfwGetThreadPointer( ID ); - - // Is the thread already dead? - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return GL_TRUE; - } - - // Get thread handle - hThread = t->Handle; - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Wait for thread to die - if( waitmode == GLFW_WAIT ) - { - result = WaitForSingleObject( hThread, INFINITE ); - } - else if( waitmode == GLFW_NOWAIT ) - { - result = WaitForSingleObject( hThread, 0 ); - } - else - { - return GL_FALSE; - } - - // Did we have a time-out? - if( result == WAIT_TIMEOUT ) - { - return GL_FALSE; - } - return GL_TRUE; -} - - -//======================================================================== -// Return the thread ID for the current thread -//======================================================================== - -GLFWthread _glfwPlatformGetThreadID( void ) -{ - _GLFWthread *t; - GLFWthread ID = -1; - DWORD WinID; - - // Get Windows thread ID - WinID = GetCurrentThreadId(); - - // Enter critical section (to avoid an inconsistent thread list) - ENTER_THREAD_CRITICAL_SECTION - - // Loop through entire list of threads to find the matching Windows - // thread ID - for( t = &_glfwThrd.First; t != NULL; t = t->Next ) - { - if( t->WinID == WinID ) - { - ID = t->ID; - break; - } - } - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Return the found GLFW thread identifier - return ID; -} - - -//======================================================================== -// Create a mutual exclusion object -//======================================================================== - -GLFWmutex _glfwPlatformCreateMutex( void ) -{ - CRITICAL_SECTION *mutex; - - // Allocate memory for mutex - mutex = (CRITICAL_SECTION *) malloc( sizeof(CRITICAL_SECTION) ); - if( !mutex ) - { - return NULL; - } - - // Initialize mutex - InitializeCriticalSection( mutex ); - - // Cast to GLFWmutex and return - return (GLFWmutex) mutex; -} - - -//======================================================================== -// Destroy a mutual exclusion object -//======================================================================== - -void _glfwPlatformDestroyMutex( GLFWmutex mutex ) -{ - // Destroy mutex - DeleteCriticalSection( (CRITICAL_SECTION *) mutex ); - free( mutex ); -} - - -//======================================================================== -// Request access to a mutex -//======================================================================== - -void _glfwPlatformLockMutex( GLFWmutex mutex ) -{ - // Wait for mutex to be released - EnterCriticalSection( (CRITICAL_SECTION *) mutex ); -} - - -//======================================================================== -// Release a mutex -//======================================================================== - -void _glfwPlatformUnlockMutex( GLFWmutex mutex ) -{ - // Release mutex - LeaveCriticalSection( (CRITICAL_SECTION *) mutex ); -} - - -//======================================================================== -// Create a new condition variable object -//======================================================================== - -GLFWcond _glfwPlatformCreateCond( void ) -{ - _GLFWcond *cond; - - // Allocate memory for condition variable - cond = (_GLFWcond *) malloc( sizeof(_GLFWcond) ); - if( !cond ) - { - return NULL; - } - - // Initialize condition variable - cond->waiters_count = 0; - cond->events[ _GLFW_COND_SIGNAL ] = CreateEvent( NULL, FALSE, - FALSE, NULL ); - cond->events[ _GLFW_COND_BROADCAST ] = CreateEvent( NULL, TRUE, - FALSE, NULL ); - InitializeCriticalSection( &cond->waiters_count_lock ); - - // Cast to GLFWcond and return - return (GLFWcond) cond; -} - - -//======================================================================== -// Destroy a condition variable object -//======================================================================== - -void _glfwPlatformDestroyCond( GLFWcond cond ) -{ - // Close the condition variable handles - CloseHandle( ((_GLFWcond *)cond)->events[ _GLFW_COND_SIGNAL ] ); - CloseHandle( ((_GLFWcond *)cond)->events[ _GLFW_COND_BROADCAST ] ); - - // Delete critical section - DeleteCriticalSection( &((_GLFWcond *)cond)->waiters_count_lock ); - - // Free memory for condition variable - free( (void *) cond ); -} - - -//======================================================================== -// Wait for a condition to be raised -//======================================================================== - -void _glfwPlatformWaitCond( GLFWcond cond, GLFWmutex mutex, double timeout ) -{ - _GLFWcond *cv = (_GLFWcond *) cond; - int result, last_waiter; - DWORD timeout_ms; - - // Avoid race conditions - EnterCriticalSection( &cv->waiters_count_lock ); - cv->waiters_count ++; - LeaveCriticalSection( &cv->waiters_count_lock ); - - // It's ok to release the mutex here since Win32 manual-reset events - // maintain state when used with SetEvent() - LeaveCriticalSection( (CRITICAL_SECTION *) mutex ); - - // Translate timeout into milliseconds - if( timeout >= GLFW_INFINITY ) - { - timeout_ms = INFINITE; - } - else - { - timeout_ms = (DWORD) (1000.0 * timeout + 0.5); - if( timeout_ms <= 0 ) - { - timeout_ms = 1; - } - } - - // Wait for either event to become signaled due to glfwSignalCond or - // glfwBroadcastCond being called - result = WaitForMultipleObjects( 2, cv->events, FALSE, timeout_ms ); - - // Check if we are the last waiter - EnterCriticalSection( &cv->waiters_count_lock ); - cv->waiters_count --; - last_waiter = (result == WAIT_OBJECT_0 + _GLFW_COND_BROADCAST) && - (cv->waiters_count == 0); - LeaveCriticalSection( &cv->waiters_count_lock ); - - // Some thread called glfwBroadcastCond - if( last_waiter ) - { - // We're the last waiter to be notified or to stop waiting, so - // reset the manual event - ResetEvent( cv->events[ _GLFW_COND_BROADCAST ] ); - } - - // Reacquire the mutex - EnterCriticalSection( (CRITICAL_SECTION *) mutex ); -} - - -//======================================================================== -// Signal a condition to one waiting thread -//======================================================================== - -void _glfwPlatformSignalCond( GLFWcond cond ) -{ - _GLFWcond *cv = (_GLFWcond *) cond; - int have_waiters; - - // Avoid race conditions - EnterCriticalSection( &cv->waiters_count_lock ); - have_waiters = cv->waiters_count > 0; - LeaveCriticalSection( &cv->waiters_count_lock ); - - if( have_waiters ) - { - SetEvent( cv->events[ _GLFW_COND_SIGNAL ] ); - } -} - - -//======================================================================== -// Broadcast a condition to all waiting threads -//======================================================================== - -void _glfwPlatformBroadcastCond( GLFWcond cond ) -{ - _GLFWcond *cv = (_GLFWcond *) cond; - int have_waiters; - - // Avoid race conditions - EnterCriticalSection( &cv->waiters_count_lock ); - have_waiters = cv->waiters_count > 0; - LeaveCriticalSection( &cv->waiters_count_lock ); - - if( have_waiters ) - { - SetEvent( cv->events[ _GLFW_COND_BROADCAST ] ); - } -} - - -//======================================================================== -// Return the number of processors in the system. -//======================================================================== - -int _glfwPlatformGetNumberOfProcessors( void ) -{ - SYSTEM_INFO si; - - // Get hardware system information - GetSystemInfo( &si ); - - return (int) si.dwNumberOfProcessors; -} - diff --git a/Core/SVS/glfw/lib/win32/win32_time.c b/Core/SVS/glfw/lib/win32/win32_time.c deleted file mode 100644 index b1751ebc1d..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_time.c +++ /dev/null @@ -1,146 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Initialise timer -//======================================================================== - -void _glfwInitTimer( void ) -{ - __int64 freq; - - // Check if we have a performance counter - if( QueryPerformanceFrequency( (LARGE_INTEGER *)&freq ) ) - { - // Performance counter is available => use it! - _glfwLibrary.Timer.HasPerformanceCounter = GL_TRUE; - - // Counter resolution is 1 / counter frequency - _glfwLibrary.Timer.Resolution = 1.0 / (double)freq; - - // Set start time for timer - QueryPerformanceCounter( (LARGE_INTEGER *)&_glfwLibrary.Timer.t0_64 ); - } - else - { - // No performace counter available => use the tick counter - _glfwLibrary.Timer.HasPerformanceCounter = GL_FALSE; - - // Counter resolution is 1 ms - _glfwLibrary.Timer.Resolution = 0.001; - - // Set start time for timer - _glfwLibrary.Timer.t0_32 = _glfw_timeGetTime(); - } -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Return timer value in seconds -//======================================================================== - -double _glfwPlatformGetTime( void ) -{ - double t; - __int64 t_64; - - if( _glfwLibrary.Timer.HasPerformanceCounter ) - { - QueryPerformanceCounter( (LARGE_INTEGER *)&t_64 ); - t = (double)(t_64 - _glfwLibrary.Timer.t0_64); - } - else - { - t = (double)(_glfw_timeGetTime() - _glfwLibrary.Timer.t0_32); - } - - // Calculate the current time in seconds - return t * _glfwLibrary.Timer.Resolution; -} - - -//======================================================================== -// Set timer value in seconds -//======================================================================== - -void _glfwPlatformSetTime( double t ) -{ - __int64 t_64; - - if( _glfwLibrary.Timer.HasPerformanceCounter ) - { - QueryPerformanceCounter( (LARGE_INTEGER *)&t_64 ); - _glfwLibrary.Timer.t0_64 = t_64 - (__int64)(t/_glfwLibrary.Timer.Resolution); - } - else - { - _glfwLibrary.Timer.t0_32 = _glfw_timeGetTime() - (int)(t*1000.0); - } -} - - -//======================================================================== -// Put a thread to sleep for a specified amount of time -//======================================================================== - -void _glfwPlatformSleep( double time ) -{ - DWORD t; - - if( time == 0.0 ) - { - t = 0; - } - else if( time < 0.001 ) - { - t = 1; - } - else if( time > 2147483647.0 ) - { - t = 2147483647; - } - else - { - t = (DWORD)(time*1000.0 + 0.5); - } - Sleep( t ); -} - diff --git a/Core/SVS/glfw/lib/win32/win32_window.c b/Core/SVS/glfw/lib/win32/win32_window.c deleted file mode 100644 index db754c2fff..0000000000 --- a/Core/SVS/glfw/lib/win32/win32_window.c +++ /dev/null @@ -1,1887 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Win32/WGL -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -// We use versioned window class names in order not to cause conflicts -// between applications using different versions of GLFW -#define _GLFW_WNDCLASSNAME "GLFW27" - - -//======================================================================== -// Enable/disable minimize/restore animations -//======================================================================== - -static int setMinMaxAnimations( int enable ) -{ - ANIMATIONINFO AI; - int old_enable; - - // Get old animation setting - AI.cbSize = sizeof( ANIMATIONINFO ); - SystemParametersInfo( SPI_GETANIMATION, AI.cbSize, &AI, 0 ); - old_enable = AI.iMinAnimate; - - // If requested, change setting - if( old_enable != enable ) - { - AI.iMinAnimate = enable; - SystemParametersInfo( SPI_SETANIMATION, AI.cbSize, &AI, - SPIF_SENDCHANGE ); - } - - return old_enable; -} - - -//======================================================================== -// Focus the window and bring it to the top of the stack -// Due to some nastiness with how Win98/ME/2k/XP handles SetForegroundWindow, -// we have to go through some really bizarre measures to achieve this -//======================================================================== - -static void setForegroundWindow( HWND hWnd ) -{ - int try_count = 0; - int old_animate; - - // Try the standard approach first... - BringWindowToTop( hWnd ); - SetForegroundWindow( hWnd ); - - // If it worked, return now - if( hWnd == GetForegroundWindow() ) - { - // Try to modify the system settings (since this is the foreground - // process, we are allowed to do this) - SystemParametersInfo( SPI_SETFOREGROUNDLOCKTIMEOUT, 0, (LPVOID)0, - SPIF_SENDCHANGE ); - return; - } - - // For other Windows versions than 95 & NT4.0, the standard approach - // may not work, so if we failed we have to "trick" Windows into - // making our window the foureground window: Iconify and restore - // again. It is ugly, but it seems to work (we turn off those annoying - // zoom animations to make it look a bit better at least). - - // Turn off minimize/restore animations - old_animate = setMinMaxAnimations( 0 ); - - // We try this a few times, just to be on the safe side of things... - do - { - // Iconify & restore - ShowWindow( hWnd, SW_HIDE ); - ShowWindow( hWnd, SW_SHOWMINIMIZED ); - ShowWindow( hWnd, SW_SHOWNORMAL ); - - // Try to get focus - BringWindowToTop( hWnd ); - SetForegroundWindow( hWnd ); - - // We do not want to keep going on forever, so we keep track of - // how many times we tried - try_count ++; - } - while( hWnd != GetForegroundWindow() && try_count <= 3 ); - - // Restore the system minimize/restore animation setting - (void) setMinMaxAnimations( old_animate ); - - // Try to modify the system settings (since this is now hopefully the - // foreground process, we are probably allowed to do this) - SystemParametersInfo( SPI_SETFOREGROUNDLOCKTIMEOUT, 0, (LPVOID)0, - SPIF_SENDCHANGE ); -} - - -//======================================================================== -// Returns the specified attribute of the specified pixel format -// NOTE: Do not call this unless we have found WGL_ARB_pixel_format -//======================================================================== - -static int getPixelFormatAttrib(int pixelFormat, int attrib) -{ - int value = 0; - - if( !_glfwWin.GetPixelFormatAttribivARB( _glfwWin.DC, pixelFormat, 0, 1, &attrib, &value) ) - { - // NOTE: We should probably handle this error somehow - return 0; - } - - return value; -} - - -//======================================================================== -// Return a list of available and usable framebuffer configs -//======================================================================== - -static _GLFWfbconfig *getFBConfigs( unsigned int *found ) -{ - _GLFWfbconfig *fbconfigs; - PIXELFORMATDESCRIPTOR pfd; - int i, count; - - *found = 0; - - if( _glfwWin.has_WGL_ARB_pixel_format ) - { - count = getPixelFormatAttrib( 1, WGL_NUMBER_PIXEL_FORMATS_ARB ); - } - else - { - count = _glfw_DescribePixelFormat( _glfwWin.DC, 1, sizeof( PIXELFORMATDESCRIPTOR ), NULL ); - } - - if( !count ) - { - fprintf( stderr, "No Win32 pixel formats available\n" ); - return NULL; - } - - fbconfigs = (_GLFWfbconfig*) malloc( sizeof( _GLFWfbconfig ) * count ); - if( !fbconfigs ) - { - fprintf(stderr, "Out of memory"); - return NULL; - } - - for( i = 1; i <= count; i++ ) - { - _GLFWfbconfig *fbconfig = fbconfigs + *found; - - if( _glfwWin.has_WGL_ARB_pixel_format ) - { - // Get pixel format attributes through WGL_ARB_pixel_format - - if( !getPixelFormatAttrib( i, WGL_SUPPORT_OPENGL_ARB ) || - !getPixelFormatAttrib( i, WGL_DRAW_TO_WINDOW_ARB ) || - !getPixelFormatAttrib( i, WGL_DOUBLE_BUFFER_ARB ) ) - { - // Only consider doublebuffered OpenGL pixel formats for windows - continue; - } - - if( getPixelFormatAttrib( i, WGL_PIXEL_TYPE_ARB ) != WGL_TYPE_RGBA_ARB ) - { - // Only consider RGBA pixel formats - continue; - } - - // Only consider "hardware-accelerated" pixel formats - if( getPixelFormatAttrib( i, WGL_ACCELERATION_ARB ) == - WGL_NO_ACCELERATION_ARB ) - { - continue; - } - - fbconfig->redBits = getPixelFormatAttrib( i, WGL_RED_BITS_ARB ); - fbconfig->greenBits = getPixelFormatAttrib( i, WGL_GREEN_BITS_ARB ); - fbconfig->blueBits = getPixelFormatAttrib( i, WGL_BLUE_BITS_ARB ); - fbconfig->alphaBits = getPixelFormatAttrib( i, WGL_ALPHA_BITS_ARB ); - - fbconfig->depthBits = getPixelFormatAttrib( i, WGL_DEPTH_BITS_ARB ); - fbconfig->stencilBits = getPixelFormatAttrib( i, WGL_STENCIL_BITS_ARB ); - - fbconfig->accumRedBits = getPixelFormatAttrib( i, WGL_ACCUM_RED_BITS_ARB ); - fbconfig->accumGreenBits = getPixelFormatAttrib( i, WGL_ACCUM_GREEN_BITS_ARB ); - fbconfig->accumBlueBits = getPixelFormatAttrib( i, WGL_ACCUM_BLUE_BITS_ARB ); - fbconfig->accumAlphaBits = getPixelFormatAttrib( i, WGL_ACCUM_ALPHA_BITS_ARB ); - - fbconfig->auxBuffers = getPixelFormatAttrib( i, WGL_AUX_BUFFERS_ARB ); - fbconfig->stereo = getPixelFormatAttrib( i, WGL_STEREO_ARB ); - - if( _glfwWin.has_WGL_ARB_multisample ) - { - fbconfig->samples = getPixelFormatAttrib( i, WGL_SAMPLES_ARB ); - } - else - { - fbconfig->samples = 0; - } - } - else - { - // Get pixel format attributes through old-fashioned PFDs - - if( !_glfw_DescribePixelFormat( _glfwWin.DC, i, sizeof( PIXELFORMATDESCRIPTOR ), &pfd ) ) - { - continue; - } - - if( !( pfd.dwFlags & PFD_DRAW_TO_WINDOW ) || - !( pfd.dwFlags & PFD_SUPPORT_OPENGL ) || - !( pfd.dwFlags & PFD_DOUBLEBUFFER ) ) - { - // Only consider doublebuffered OpenGL pixel formats for windows - continue; - } - - if( !( pfd.dwFlags & PFD_GENERIC_ACCELERATED ) && - ( pfd.dwFlags & PFD_GENERIC_FORMAT ) ) - { - // If this is true, this pixel format is only supported by the - // generic software implementation - continue; - } - - if( pfd.iPixelType != PFD_TYPE_RGBA ) - { - // Only RGBA pixel formats considered - continue; - } - - fbconfig->redBits = pfd.cRedBits; - fbconfig->greenBits = pfd.cGreenBits; - fbconfig->blueBits = pfd.cBlueBits; - fbconfig->alphaBits = pfd.cAlphaBits; - - fbconfig->depthBits = pfd.cDepthBits; - fbconfig->stencilBits = pfd.cStencilBits; - - fbconfig->accumRedBits = pfd.cAccumRedBits; - fbconfig->accumGreenBits = pfd.cAccumGreenBits; - fbconfig->accumBlueBits = pfd.cAccumBlueBits; - fbconfig->accumAlphaBits = pfd.cAccumAlphaBits; - - fbconfig->auxBuffers = pfd.cAuxBuffers; - fbconfig->stereo = ( pfd.dwFlags & PFD_STEREO ) ? GL_TRUE : GL_FALSE; - - // PFD pixel formats do not support FSAA - fbconfig->samples = 0; - } - - fbconfig->platformID = i; - - (*found)++; - } - - if( *found == 0 ) - { - free( fbconfigs ); - return NULL; - } - - return fbconfigs; -} - - -//======================================================================== -// Creates an OpenGL context on the specified device context -//======================================================================== - -static GLboolean createContext( HDC dc, const _GLFWwndconfig* wndconfig, int pixelFormat ) -{ - PIXELFORMATDESCRIPTOR pfd; - int flags, i = 0, attribs[40]; - - if( !_glfw_DescribePixelFormat( dc, pixelFormat, sizeof(pfd), &pfd ) ) - { - return GL_FALSE; - } - - if( !_glfw_SetPixelFormat( dc, pixelFormat, &pfd ) ) - { - return GL_FALSE; - } - - if( _glfwWin.has_WGL_ARB_create_context ) - { - // Use the newer wglCreateContextAttribsARB - - if( wndconfig->glMajor != 1 || wndconfig->glMinor != 0 ) - { - // Request an explicitly versioned context - - attribs[i++] = WGL_CONTEXT_MAJOR_VERSION_ARB; - attribs[i++] = wndconfig->glMajor; - attribs[i++] = WGL_CONTEXT_MINOR_VERSION_ARB; - attribs[i++] = wndconfig->glMinor; - } - - if( wndconfig->glForward || wndconfig->glDebug ) - { - flags = 0; - - if( wndconfig->glForward ) - { - flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; - } - - if( wndconfig->glDebug ) - { - flags |= WGL_CONTEXT_DEBUG_BIT_ARB; - } - - attribs[i++] = WGL_CONTEXT_FLAGS_ARB; - attribs[i++] = flags; - } - - if( wndconfig->glProfile ) - { - if( !_glfwWin.has_WGL_ARB_create_context_profile ) - { - return GL_FALSE; - } - - if( wndconfig->glProfile == GLFW_OPENGL_CORE_PROFILE ) - { - flags = WGL_CONTEXT_CORE_PROFILE_BIT_ARB; - } - else - { - flags = WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB; - } - - attribs[i++] = WGL_CONTEXT_PROFILE_MASK_ARB; - attribs[i++] = flags; - } - - attribs[i++] = 0; - - _glfwWin.context = _glfwWin.CreateContextAttribsARB( dc, NULL, attribs ); - if( !_glfwWin.context ) - { - return GL_FALSE; - } - - // Copy the debug context hint as there's no way of verifying it - // This is the only code path capable of creating a debug context, - // so leave it as false (from the earlier memset) otherwise - _glfwWin.glDebug = wndconfig->glDebug; - } - else - { - _glfwWin.context = wglCreateContext( dc ); - if( !_glfwWin.context ) - { - return GL_FALSE; - } - } - - return GL_TRUE; -} - - -//======================================================================== -// Translates a Windows key to the corresponding GLFW key -//======================================================================== - -static int translateKey( WPARAM wParam, LPARAM lParam ) -{ - MSG next_msg; - DWORD msg_time; - DWORD scan_code; - - // Check for numeric keypad keys - // Note: This way we always force "NumLock = ON", which at least - // enables GLFW users to detect numeric keypad keys - int hiFlags = HIWORD( lParam ); - - if ( !( hiFlags & 0x100 ) ) - { - switch( MapVirtualKey( hiFlags & 0xFF, 1 ) ) - { - case VK_INSERT: return GLFW_KEY_KP_0; - case VK_END: return GLFW_KEY_KP_1; - case VK_DOWN: return GLFW_KEY_KP_2; - case VK_NEXT: return GLFW_KEY_KP_3; - case VK_LEFT: return GLFW_KEY_KP_4; - case VK_CLEAR: return GLFW_KEY_KP_5; - case VK_RIGHT: return GLFW_KEY_KP_6; - case VK_HOME: return GLFW_KEY_KP_7; - case VK_UP: return GLFW_KEY_KP_8; - case VK_PRIOR: return GLFW_KEY_KP_9; - case VK_DIVIDE: return GLFW_KEY_KP_DIVIDE; - case VK_MULTIPLY: return GLFW_KEY_KP_MULTIPLY; - case VK_SUBTRACT: return GLFW_KEY_KP_SUBTRACT; - case VK_ADD: return GLFW_KEY_KP_ADD; - case VK_DELETE: return GLFW_KEY_KP_DECIMAL; - } - } - - // Check which key was pressed or released - switch( wParam ) - { - // The SHIFT keys require special handling - case VK_SHIFT: - { - // Compare scan code for this key with that of VK_RSHIFT in - // order to determine which shift key was pressed (left or - // right) - scan_code = MapVirtualKey( VK_RSHIFT, 0 ); - if( ((lParam & 0x01ff0000) >> 16) == scan_code ) - { - return GLFW_KEY_RSHIFT; - } - - return GLFW_KEY_LSHIFT; - } - - // The CTRL keys require special handling - case VK_CONTROL: - { - // Is this an extended key (i.e. right key)? - if( lParam & 0x01000000 ) - { - return GLFW_KEY_RCTRL; - } - - // Here is a trick: "Alt Gr" sends LCTRL, then RALT. We only - // want the RALT message, so we try to see if the next message - // is a RALT message. In that case, this is a false LCTRL! - msg_time = GetMessageTime(); - if( PeekMessage( &next_msg, NULL, 0, 0, PM_NOREMOVE ) ) - { - if( next_msg.message == WM_KEYDOWN || - next_msg.message == WM_SYSKEYDOWN ) - { - if( next_msg.wParam == VK_MENU && - (next_msg.lParam & 0x01000000) && - next_msg.time == msg_time ) - { - // Next message is a RALT down message, which - // means that this is NOT a proper LCTRL message! - return GLFW_KEY_UNKNOWN; - } - } - } - - return GLFW_KEY_LCTRL; - } - - // The ALT keys require special handling - case VK_MENU: - { - // Is this an extended key (i.e. right key)? - if( lParam & 0x01000000 ) - { - return GLFW_KEY_RALT; - } - - return GLFW_KEY_LALT; - } - - // The ENTER keys require special handling - case VK_RETURN: - { - // Is this an extended key (i.e. right key)? - if( lParam & 0x01000000 ) - { - return GLFW_KEY_KP_ENTER; - } - - return GLFW_KEY_ENTER; - } - - // Special keys (non character keys) - case VK_ESCAPE: return GLFW_KEY_ESC; - case VK_TAB: return GLFW_KEY_TAB; - case VK_BACK: return GLFW_KEY_BACKSPACE; - case VK_HOME: return GLFW_KEY_HOME; - case VK_END: return GLFW_KEY_END; - case VK_PRIOR: return GLFW_KEY_PAGEUP; - case VK_NEXT: return GLFW_KEY_PAGEDOWN; - case VK_INSERT: return GLFW_KEY_INSERT; - case VK_DELETE: return GLFW_KEY_DEL; - case VK_LEFT: return GLFW_KEY_LEFT; - case VK_UP: return GLFW_KEY_UP; - case VK_RIGHT: return GLFW_KEY_RIGHT; - case VK_DOWN: return GLFW_KEY_DOWN; - case VK_F1: return GLFW_KEY_F1; - case VK_F2: return GLFW_KEY_F2; - case VK_F3: return GLFW_KEY_F3; - case VK_F4: return GLFW_KEY_F4; - case VK_F5: return GLFW_KEY_F5; - case VK_F6: return GLFW_KEY_F6; - case VK_F7: return GLFW_KEY_F7; - case VK_F8: return GLFW_KEY_F8; - case VK_F9: return GLFW_KEY_F9; - case VK_F10: return GLFW_KEY_F10; - case VK_F11: return GLFW_KEY_F11; - case VK_F12: return GLFW_KEY_F12; - case VK_F13: return GLFW_KEY_F13; - case VK_F14: return GLFW_KEY_F14; - case VK_F15: return GLFW_KEY_F15; - case VK_F16: return GLFW_KEY_F16; - case VK_F17: return GLFW_KEY_F17; - case VK_F18: return GLFW_KEY_F18; - case VK_F19: return GLFW_KEY_F19; - case VK_F20: return GLFW_KEY_F20; - case VK_F21: return GLFW_KEY_F21; - case VK_F22: return GLFW_KEY_F22; - case VK_F23: return GLFW_KEY_F23; - case VK_F24: return GLFW_KEY_F24; - case VK_SPACE: return GLFW_KEY_SPACE; - - // Numeric keypad - case VK_NUMPAD0: return GLFW_KEY_KP_0; - case VK_NUMPAD1: return GLFW_KEY_KP_1; - case VK_NUMPAD2: return GLFW_KEY_KP_2; - case VK_NUMPAD3: return GLFW_KEY_KP_3; - case VK_NUMPAD4: return GLFW_KEY_KP_4; - case VK_NUMPAD5: return GLFW_KEY_KP_5; - case VK_NUMPAD6: return GLFW_KEY_KP_6; - case VK_NUMPAD7: return GLFW_KEY_KP_7; - case VK_NUMPAD8: return GLFW_KEY_KP_8; - case VK_NUMPAD9: return GLFW_KEY_KP_9; - case VK_DIVIDE: return GLFW_KEY_KP_DIVIDE; - case VK_MULTIPLY: return GLFW_KEY_KP_MULTIPLY; - case VK_SUBTRACT: return GLFW_KEY_KP_SUBTRACT; - case VK_ADD: return GLFW_KEY_KP_ADD; - case VK_DECIMAL: return GLFW_KEY_KP_DECIMAL; - case VK_NUMLOCK: return GLFW_KEY_KP_NUM_LOCK; - - case VK_CAPITAL: return GLFW_KEY_CAPS_LOCK; - case VK_SCROLL: return GLFW_KEY_SCROLL_LOCK; - case VK_PAUSE: return GLFW_KEY_PAUSE; - - case VK_LWIN: return GLFW_KEY_LSUPER; - case VK_RWIN: return GLFW_KEY_RSUPER; - case VK_APPS: return GLFW_KEY_MENU; - - // The rest (should be printable keys) - default: - { - // Convert to printable character (ISO-8859-1 or Unicode) - wParam = MapVirtualKey( (UINT) wParam, 2 ) & 0x0000FFFF; - - // Make sure that the character is uppercase - if( _glfwLibrary.Sys.hasUnicode ) - { - wParam = (WPARAM) CharUpperW( (LPWSTR) wParam ); - } - else - { - wParam = (WPARAM) CharUpperA( (LPSTR) wParam ); - } - - // Valid ISO-8859-1 character? - if( (wParam >= 32 && wParam <= 126) || - (wParam >= 160 && wParam <= 255) ) - { - return (int) wParam; - } - - return GLFW_KEY_UNKNOWN; - } - } -} - - -//======================================================================== -// Translates a Windows key to Unicode -//======================================================================== - -static void translateChar( DWORD wParam, DWORD lParam, int action ) -{ - BYTE keyboard_state[ 256 ]; - UCHAR char_buf[ 10 ]; - WCHAR unicode_buf[ 10 ]; - UINT scan_code; - int i, num_chars, unicode; - - GetKeyboardState( keyboard_state ); - - // Derive scan code from lParam and action - scan_code = (lParam & 0x01ff0000) >> 16; - if( action == GLFW_RELEASE ) - { - scan_code |= 0x8000000; - } - - if( _glfwLibrary.Sys.hasUnicode ) - { - num_chars = ToUnicode( - wParam, // virtual-key code - scan_code, // scan code - keyboard_state, // key-state array - unicode_buf, // buffer for translated key - 10, // size of translated key buffer - 0 // active-menu flag - ); - unicode = 1; - } - else - { - // Convert to ISO-8859-1 - num_chars = ToAscii( - wParam, // virtual-key code - scan_code, // scan code - keyboard_state, // key-state array - (LPWORD) char_buf, // buffer for translated key - 0 // active-menu flag - ); - unicode = 0; - } - - // Report characters - for( i = 0; i < num_chars; i++ ) - { - // Get next character from buffer - if( unicode ) - { - _glfwInputChar( (int) unicode_buf[ i ], action ); - } - else - { - _glfwInputChar( (int) char_buf[ i ], action ); - } - } -} - - -//======================================================================== -// Window callback function (handles window events) -//======================================================================== - -static LRESULT CALLBACK windowProc( HWND hWnd, UINT uMsg, - WPARAM wParam, LPARAM lParam ) -{ - int wheelDelta, iconified; - - switch( uMsg ) - { - // Window activate message? (iconification?) - case WM_ACTIVATE: - { - _glfwWin.active = LOWORD(wParam) != WA_INACTIVE ? GL_TRUE : GL_FALSE; - - iconified = HIWORD(wParam) ? GL_TRUE : GL_FALSE; - - // Were we deactivated/iconified? - if( (!_glfwWin.active || iconified) && !_glfwWin.iconified ) - { - _glfwInputDeactivation(); - - // If we are in fullscreen mode we need to iconify - if( _glfwWin.opened && _glfwWin.fullscreen ) - { - // Do we need to manually iconify? - if( !iconified ) - { - // Minimize window - ShowWindow( _glfwWin.window, SW_MINIMIZE ); - iconified = GL_TRUE; - } - - // Restore the original desktop resolution - ChangeDisplaySettings( NULL, CDS_FULLSCREEN ); - } - - // Unlock mouse if locked - if( !_glfwWin.oldMouseLockValid ) - { - _glfwWin.oldMouseLock = _glfwWin.mouseLock; - _glfwWin.oldMouseLockValid = GL_TRUE; - glfwEnable( GLFW_MOUSE_CURSOR ); - } - } - else if( _glfwWin.active || !iconified ) - { - // If we are in fullscreen mode we need to maximize - if( _glfwWin.opened && _glfwWin.fullscreen && _glfwWin.iconified ) - { - // Change display settings to the user selected mode - _glfwSetVideoModeMODE( _glfwWin.modeID ); - - // Do we need to manually restore window? - if( iconified ) - { - // Restore window - ShowWindow( _glfwWin.window, SW_RESTORE ); - iconified = GL_FALSE; - - // Activate window - ShowWindow( hWnd, SW_SHOW ); - setForegroundWindow( _glfwWin.window ); - SetFocus( _glfwWin.window ); - } - } - - // Lock mouse, if necessary - if( _glfwWin.oldMouseLockValid && _glfwWin.oldMouseLock ) - { - glfwDisable( GLFW_MOUSE_CURSOR ); - } - _glfwWin.oldMouseLockValid = GL_FALSE; - } - - _glfwWin.iconified = iconified; - return 0; - } - - case WM_SYSCOMMAND: - { - switch( wParam & 0xfff0 ) - { - case SC_SCREENSAVE: - case SC_MONITORPOWER: - { - if( _glfwWin.fullscreen ) - { - // Disallow screen saver and screen blanking if we are - // running in fullscreen mode - return 0; - } - else - { - break; - } - } - - // User trying to access application menu using ALT? - case SC_KEYMENU: - return 0; - } - break; - } - - case WM_CLOSE: - { - // Translate this to WM_QUIT so that we can handle all cases in the - // same place - PostQuitMessage( 0 ); - return 0; - } - - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - { - _glfwInputKey( translateKey( wParam, lParam ), GLFW_PRESS ); - - if( _glfwWin.charCallback ) - { - translateChar( (DWORD) wParam, (DWORD) lParam, GLFW_PRESS ); - } - break; - } - - case WM_KEYUP: - case WM_SYSKEYUP: - { - // Special trick: release both shift keys on SHIFT up event - if( wParam == VK_SHIFT ) - { - _glfwInputKey( GLFW_KEY_LSHIFT, GLFW_RELEASE ); - _glfwInputKey( GLFW_KEY_RSHIFT, GLFW_RELEASE ); - } - else - { - _glfwInputKey( translateKey( wParam, lParam ), GLFW_RELEASE ); - } - - if( _glfwWin.charCallback ) - { - translateChar( (DWORD) wParam, (DWORD) lParam, GLFW_RELEASE ); - } - - break; - } - - case WM_LBUTTONDOWN: - SetCapture(hWnd); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_LEFT, GLFW_PRESS ); - return 0; - case WM_RBUTTONDOWN: - SetCapture(hWnd); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_RIGHT, GLFW_PRESS ); - return 0; - case WM_MBUTTONDOWN: - SetCapture(hWnd); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_MIDDLE, GLFW_PRESS ); - return 0; - case WM_XBUTTONDOWN: - { - if( HIWORD(wParam) == XBUTTON1 ) - { - SetCapture(hWnd); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_4, GLFW_PRESS ); - } - else if( HIWORD(wParam) == XBUTTON2 ) - { - SetCapture(hWnd); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_5, GLFW_PRESS ); - } - return 1; - } - - case WM_LBUTTONUP: - ReleaseCapture(); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_LEFT, GLFW_RELEASE ); - return 0; - case WM_RBUTTONUP: - ReleaseCapture(); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_RIGHT, GLFW_RELEASE ); - return 0; - case WM_MBUTTONUP: - ReleaseCapture(); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_MIDDLE, GLFW_RELEASE ); - return 0; - case WM_XBUTTONUP: - { - if( HIWORD(wParam) == XBUTTON1 ) - { - ReleaseCapture(); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_4, GLFW_RELEASE ); - } - else if( HIWORD(wParam) == XBUTTON2 ) - { - ReleaseCapture(); - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_5, GLFW_RELEASE ); - } - return 1; - } - - case WM_MOUSEMOVE: - { - int NewMouseX, NewMouseY; - - // Get signed (!) mouse position - NewMouseX = (int)((short)LOWORD(lParam)); - NewMouseY = (int)((short)HIWORD(lParam)); - - if( NewMouseX != _glfwInput.OldMouseX || - NewMouseY != _glfwInput.OldMouseY ) - { - if( _glfwWin.mouseLock ) - { - _glfwInput.MousePosX += NewMouseX - - _glfwInput.OldMouseX; - _glfwInput.MousePosY += NewMouseY - - _glfwInput.OldMouseY; - } - else - { - _glfwInput.MousePosX = NewMouseX; - _glfwInput.MousePosY = NewMouseY; - } - _glfwInput.OldMouseX = NewMouseX; - _glfwInput.OldMouseY = NewMouseY; - _glfwInput.MouseMoved = GL_TRUE; - - if( _glfwWin.mousePosCallback ) - { - _glfwWin.mousePosCallback( _glfwInput.MousePosX, - _glfwInput.MousePosY ); - } - } - return 0; - } - - case WM_MOUSEWHEEL: - { - // WM_MOUSEWHEEL is not supported under Windows 95 - if( _glfwLibrary.Sys.winVer != _GLFW_WIN_95 ) - { - wheelDelta = (((int)wParam) >> 16) / WHEEL_DELTA; - _glfwInput.WheelPos += wheelDelta; - if( _glfwWin.mouseWheelCallback ) - { - _glfwWin.mouseWheelCallback( _glfwInput.WheelPos ); - } - return 0; - } - break; - } - - case WM_SIZE: - { - _glfwWin.width = LOWORD(lParam); - _glfwWin.height = HIWORD(lParam); - - // If the mouse is locked, update the clipping rect - if( _glfwWin.mouseLock ) - { - RECT ClipWindowRect; - if( GetWindowRect( _glfwWin.window, &ClipWindowRect ) ) - { - ClipCursor( &ClipWindowRect ); - } - } - - if( _glfwWin.windowSizeCallback ) - { - _glfwWin.windowSizeCallback( LOWORD(lParam), HIWORD(lParam) ); - } - return 0; - } - - case WM_MOVE: - { - // If the mouse is locked, update the clipping rect - if( _glfwWin.mouseLock ) - { - RECT ClipWindowRect; - if( GetWindowRect( _glfwWin.window, &ClipWindowRect ) ) - { - ClipCursor( &ClipWindowRect ); - } - } - return 0; - } - - // Was the window contents damaged? - case WM_PAINT: - { - if( _glfwWin.windowRefreshCallback ) - { - _glfwWin.windowRefreshCallback(); - } - break; - } - - case WM_DISPLAYCHANGE: - { - // TODO: Do stuff here. - - break; - } - } - - // Pass all unhandled messages to DefWindowProc - return DefWindowProc( hWnd, uMsg, wParam, lParam ); -} - - -//======================================================================== -// Translate client window size to full window size (including window borders) -//======================================================================== - -static void getFullWindowSize( int clientWidth, int clientHeight, - int *fullWidth, int *fullHeight ) -{ - RECT rect; - - // Create a window rectangle - rect.left = (long)0; - rect.right = (long)clientWidth - 1; - rect.top = (long)0; - rect.bottom = (long)clientHeight - 1; - - // Adjust according to window styles - AdjustWindowRectEx( &rect, _glfwWin.dwStyle, FALSE, _glfwWin.dwExStyle ); - - // Calculate width and height of full window - *fullWidth = rect.right - rect.left + 1; - *fullHeight = rect.bottom - rect.top + 1; -} - - -//======================================================================== -// Initialize WGL-specific extensions -//======================================================================== - -static void initWGLExtensions( void ) -{ - // This needs to include every function pointer loaded below, because - // context re-creation means we cannot assume the struct has been cleared - _glfwWin.SwapIntervalEXT = NULL; - _glfwWin.GetPixelFormatAttribivARB = NULL; - _glfwWin.GetExtensionsStringARB = NULL; - _glfwWin.GetExtensionsStringEXT = NULL; - _glfwWin.CreateContextAttribsARB = NULL; - - // This needs to include every extension boolean used below, because context - // re-creation means we cannot assume the struct has been cleared - _glfwWin.has_WGL_EXT_swap_control = GL_FALSE; - _glfwWin.has_WGL_ARB_pixel_format = GL_FALSE; - _glfwWin.has_WGL_ARB_multisample = GL_FALSE; - _glfwWin.has_WGL_ARB_create_context = GL_FALSE; - _glfwWin.has_WGL_ARB_create_context_profile = GL_FALSE; - - _glfwWin.GetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC) - wglGetProcAddress( "wglGetExtensionsStringEXT" ); - if( !_glfwWin.GetExtensionsStringEXT ) - { - _glfwWin.GetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC) - wglGetProcAddress( "wglGetExtensionsStringARB" ); - if( !_glfwWin.GetExtensionsStringARB ) - { - return; - } - } - - if( _glfwPlatformExtensionSupported( "WGL_ARB_multisample" ) ) - { - _glfwWin.has_WGL_ARB_multisample = GL_TRUE; - } - - if( _glfwPlatformExtensionSupported( "WGL_ARB_create_context" ) ) - { - _glfwWin.has_WGL_ARB_create_context = GL_TRUE; - _glfwWin.CreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) - wglGetProcAddress( "wglCreateContextAttribsARB" ); - } - - if( _glfwWin.has_WGL_ARB_create_context ) - { - if( _glfwPlatformExtensionSupported( "WGL_ARB_create_context_profile" ) ) - { - _glfwWin.has_WGL_ARB_create_context_profile = GL_TRUE; - } - } - - if( _glfwPlatformExtensionSupported( "WGL_EXT_swap_control" ) ) - { - _glfwWin.has_WGL_EXT_swap_control = GL_TRUE; - _glfwWin.SwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) - wglGetProcAddress( "wglSwapIntervalEXT" ); - } - - if( _glfwPlatformExtensionSupported( "WGL_ARB_pixel_format" ) ) - { - _glfwWin.has_WGL_ARB_pixel_format = GL_TRUE; - _glfwWin.GetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC) - wglGetProcAddress( "wglGetPixelFormatAttribivARB" ); - } -} - - -//======================================================================== -// Registers the GLFW window class -//======================================================================== - -static ATOM registerWindowClass( void ) -{ - WNDCLASS wc; - ZeroMemory( &wc, sizeof( wc ) ); - - // Set window class parameters - wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; // Redraw on... - wc.lpfnWndProc = (WNDPROC) windowProc; // Message handler - wc.hInstance = _glfwLibrary.instance; // Set instance - wc.hCursor = LoadCursor( NULL, IDC_ARROW ); // Load arrow pointer - wc.lpszClassName = _GLFW_WNDCLASSNAME; // Set class name - - // Load user-provided icon if available - wc.hIcon = LoadIcon( _glfwLibrary.instance, "GLFW_ICON" ); - if( !wc.hIcon ) - { - // Load default icon - wc.hIcon = LoadIcon( NULL, IDI_WINLOGO ); - } - - return RegisterClass( &wc ); -} - - -//======================================================================== -// Returns the closest matching pixel format, or zero on error -//======================================================================== - -static int choosePixelFormat( const _GLFWfbconfig *fbconfig ) -{ - unsigned int fbcount; - int pixelFormat; - _GLFWfbconfig *fbconfigs; - const _GLFWfbconfig *closest; - - fbconfigs = getFBConfigs( &fbcount ); - if( !fbconfigs ) - { - fprintf( stderr, "Failed to find any usable GLFWFBConfigs\n" ); - return 0; - } - - closest = _glfwChooseFBConfig( fbconfig, fbconfigs, fbcount ); - if( !closest ) - { - fprintf( stderr, "Failed to select a GLFWFBConfig from the alternatives\n" ); - free( fbconfigs ); - return 0; - } - - pixelFormat = (int) closest->platformID; - - free( fbconfigs ); - fbconfigs = NULL; - closest = NULL; - - return pixelFormat; -} - - -//======================================================================== -// Creates the GLFW window and rendering context -//======================================================================== - -static int createWindow( const _GLFWwndconfig *wndconfig, - const _GLFWfbconfig *fbconfig ) -{ - DWORD dwStyle, dwExStyle; - int pixelFormat, fullWidth, fullHeight; - RECT wa; - POINT pos; - - _glfwWin.DC = NULL; - _glfwWin.context = NULL; - _glfwWin.window = NULL; - - // Set common window styles - dwStyle = WS_CLIPSIBLINGS | WS_CLIPCHILDREN; - dwExStyle = WS_EX_APPWINDOW; - - // Set window style, depending on fullscreen mode - if( _glfwWin.fullscreen ) - { - dwStyle |= WS_POPUP; - - // Here's a trick for helping us getting window focus - // (SetForegroundWindow doesn't work properly under - // Win98/ME/2K/.NET/+) - /* - if( _glfwLibrary.Sys.WinVer != _GLFW_WIN_95 && - _glfwLibrary.Sys.WinVer != _GLFW_WIN_NT4 && - _glfwLibrary.Sys.WinVer != _GLFW_WIN_XP ) - { - dwStyle |= WS_MINIMIZE; - } - */ - } - else - { - dwStyle |= WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; - - if( !wndconfig->windowNoResize ) - { - dwStyle |= ( WS_MAXIMIZEBOX | WS_SIZEBOX ); - dwExStyle |= WS_EX_WINDOWEDGE; - } - } - - // Remember window styles (used by getFullWindowSize) - _glfwWin.dwStyle = dwStyle; - _glfwWin.dwExStyle = dwExStyle; - - // Adjust window size for frame and title bar - getFullWindowSize( _glfwWin.width, _glfwWin.height, &fullWidth, &fullHeight ); - - // Adjust window position to working area (e.g. if the task bar is at - // the top of the display). Fullscreen windows are always opened in - // the upper left corner regardless of the desktop working area. - if( _glfwWin.fullscreen ) - { - wa.left = wa.top = 0; - } - else - { - SystemParametersInfo( SPI_GETWORKAREA, 0, &wa, 0 ); - } - - _glfwWin.window = CreateWindowEx( _glfwWin.dwExStyle, // Extended style - _GLFW_WNDCLASSNAME, // Class name - "GLFW Window", // Window title - _glfwWin.dwStyle, // Defined window style - wa.left, wa.top, // Window position - fullWidth, // Decorated window width - fullHeight, // Decorated window height - NULL, // No parent window - NULL, // No menu - _glfwLibrary.instance, // Instance - NULL ); // Nothing to WM_CREATE - - if( !_glfwWin.window ) - { - fprintf( stderr, "Unable to create Win32 window\n" ); - return GL_FALSE; - } - - _glfwWin.DC = GetDC( _glfwWin.window ); - if( !_glfwWin.DC ) - { - fprintf( stderr, "Unable to retrieve GLFW window DC\n" ); - return GL_FALSE; - } - - pixelFormat = choosePixelFormat( fbconfig ); - if( !pixelFormat ) - { - fprintf( stderr, "Unable to find a usable pixel format\n" ); - return GL_FALSE; - } - - if( !createContext( _glfwWin.DC, wndconfig, pixelFormat ) ) - { - fprintf( stderr, "Unable to create OpenGL context\n" ); - return GL_FALSE; - } - - if( !wglMakeCurrent( _glfwWin.DC, _glfwWin.context ) ) - { - fprintf( stderr, "Unable to make OpenGL context current\n" ); - return GL_FALSE; - } - - initWGLExtensions(); - - // Initialize mouse position data - GetCursorPos( &pos ); - ScreenToClient( _glfwWin.window, &pos ); - _glfwInput.OldMouseX = _glfwInput.MousePosX = pos.x; - _glfwInput.OldMouseY = _glfwInput.MousePosY = pos.y; - - return GL_TRUE; -} - - -//======================================================================== -// Destroys the GLFW window and rendering context -//======================================================================== - -static void destroyWindow( void ) -{ - if( _glfwWin.context ) - { - wglMakeCurrent( NULL, NULL ); - wglDeleteContext( _glfwWin.context ); - _glfwWin.context = NULL; - } - - if( _glfwWin.DC ) - { - ReleaseDC( _glfwWin.window, _glfwWin.DC ); - _glfwWin.DC = NULL; - } - - if( _glfwWin.window ) - { - if( _glfwLibrary.Sys.winVer <= _GLFW_WIN_NT4 ) - { - // Note: Hiding the window first fixes an annoying W98/NT4 - // remaining icon bug for fullscreen displays - ShowWindow( _glfwWin.window, SW_HIDE ); - } - - DestroyWindow( _glfwWin.window ); - _glfwWin.window = NULL; - } -} - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Here is where the window is created, and the OpenGL rendering context is -// created -//======================================================================== - -int _glfwPlatformOpenWindow( int width, int height, - const _GLFWwndconfig *wndconfig, - const _GLFWfbconfig *fbconfig ) -{ - GLboolean recreateContext = GL_FALSE; - - _glfwWin.desiredRefreshRate = wndconfig->refreshRate; - _glfwWin.windowNoResize = wndconfig->windowNoResize; - - _glfwWin.classAtom = registerWindowClass(); - if( !_glfwWin.classAtom ) - { - fprintf( stderr, "Failed to register GLFW window class\n" ); - return GL_FALSE; - } - - if( _glfwWin.fullscreen ) - { - _glfwSetVideoMode( &_glfwWin.width, &_glfwWin.height, - fbconfig->redBits, fbconfig->greenBits, fbconfig->blueBits, - wndconfig->refreshRate ); - } - - if( !createWindow( wndconfig, fbconfig ) ) - { - fprintf( stderr, "Failed to create GLFW window\n" ); - return GL_FALSE; - } - - _glfwRefreshContextParams(); - - if( fbconfig->samples > 0 ) - { - // We want FSAA, but can we get it? - // FSAA is not a hard constraint, so otherwise we just don't care - - if( _glfwWin.has_WGL_ARB_multisample && _glfwWin.has_WGL_ARB_pixel_format ) - { - // We appear to have both the FSAA extension and the means to ask for it - recreateContext = GL_TRUE; - } - } - - if( wndconfig->glDebug ) - { - // Debug contexts are not a hard constraint, so we don't fail here if - // the extension isn't available - - if( _glfwWin.has_WGL_ARB_create_context ) - { - recreateContext = GL_TRUE; - } - } - - if( wndconfig->glMajor > 2 ) - { - if ( wndconfig->glMajor != _glfwWin.glMajor || - wndconfig->glMinor != _glfwWin.glMinor ) - { - // We want a different OpenGL version, but can we get it? - // Otherwise, if we got a version greater than required, that's fine, - // whereas if we got a version lesser than required, it will be dealt - // with in glfwOpenWindow - - if( _glfwWin.has_WGL_ARB_create_context ) - { - recreateContext = GL_TRUE; - } - } - - if( wndconfig->glForward ) - { - if( !_glfwWin.has_WGL_ARB_create_context ) - { - // Forward-compatibility is a hard constraint - return GL_FALSE; - } - - recreateContext = GL_TRUE; - } - - if( wndconfig->glProfile ) - { - if( !_glfwWin.has_WGL_ARB_create_context_profile ) - { - // Context profile is a hard constraint - return GL_FALSE; - } - - recreateContext = GL_TRUE; - } - } - - if( recreateContext ) - { - // Some window hints require us to re-create the context using WGL - // extensions retrieved through the current context, as we cannot check - // for WGL extensions or retrieve WGL entry points before we have a - // current context (actually until we have implicitly loaded the ICD) - - // Yes, this is strange, and yes, this is the proper way on Win32 - - // As Windows only allows you to set the pixel format once for a - // window, we need to destroy the current window and create a new one - // to be able to use the new pixel format - - // Technically, it may be possible to keep the old window around if - // we're just creating an OpenGL 3.0+ context with the same pixel - // format, but it's not worth the potential compatibility problems - - destroyWindow(); - - if( !createWindow( wndconfig, fbconfig ) ) - { - fprintf( stderr, "Unable to re-create GLFW window\n" ); - return GL_FALSE; - } - } - - if( _glfwWin.fullscreen ) - { - // Place the window above all topmost windows - SetWindowPos( _glfwWin.window, HWND_TOPMOST, 0,0,0,0, - SWP_NOMOVE | SWP_NOSIZE ); - } - - ShowWindow( _glfwWin.window, SW_SHOWNORMAL ); - setForegroundWindow( _glfwWin.window ); - SetFocus( _glfwWin.window ); - - return GL_TRUE; -} - - -//======================================================================== -// Properly kill the window / video display -//======================================================================== - -void _glfwPlatformCloseWindow( void ) -{ - destroyWindow(); - - if( _glfwWin.classAtom ) - { - UnregisterClass( _GLFW_WNDCLASSNAME, _glfwLibrary.instance ); - _glfwWin.classAtom = 0; - } - - if( _glfwWin.fullscreen ) - { - // Restore original desktop resolution - ChangeDisplaySettings( NULL, CDS_FULLSCREEN ); - } -} - - -//======================================================================== -// Set the window title -//======================================================================== - -void _glfwPlatformSetWindowTitle( const char *title ) -{ - (void) SetWindowText( _glfwWin.window, title ); -} - - -//======================================================================== -// Set the window size. -//======================================================================== - -void _glfwPlatformSetWindowSize( int width, int height ) -{ - int bpp, mode = 0, refresh; - int sizechanged = GL_FALSE; - GLint drawbuffer; - GLfloat clearcolor[4]; - - if( _glfwWin.fullscreen ) - { - // Get some info about the current mode - - DEVMODE dm; - - // Get current BPP settings - dm.dmSize = sizeof( DEVMODE ); - if( EnumDisplaySettings( NULL, _glfwWin.modeID, &dm ) ) - { - // Get bpp - bpp = dm.dmBitsPerPel; - - // Get closest match for target video mode - refresh = _glfwWin.desiredRefreshRate; - mode = _glfwGetClosestVideoModeBPP( &width, &height, &bpp, - &refresh ); - } - else - { - mode = _glfwWin.modeID; - } - } - else - { - // If we are in windowed mode, adjust the window size to - // compensate for window decorations - getFullWindowSize( width, height, &width, &height ); - } - - // Change window size before changing fullscreen mode? - if( _glfwWin.fullscreen && (width > _glfwWin.width) ) - { - SetWindowPos( _glfwWin.window, HWND_TOP, 0, 0, width, height, - SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOZORDER ); - sizechanged = GL_TRUE; - } - - // Change fullscreen video mode? - if( _glfwWin.fullscreen && mode != _glfwWin.modeID ) - { - _glfwSetVideoModeMODE( mode ); - - // Clear the front buffer to black (avoid ugly desktop remains in - // our OpenGL window) - glGetIntegerv( GL_DRAW_BUFFER, &drawbuffer ); - glGetFloatv( GL_COLOR_CLEAR_VALUE, clearcolor ); - glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); - glClear( GL_COLOR_BUFFER_BIT ); - if( drawbuffer == GL_BACK ) - { - _glfw_SwapBuffers( _glfwWin.DC ); - } - glClearColor( clearcolor[0], clearcolor[1], clearcolor[2], - clearcolor[3] ); - } - - // Set window size (if not already changed) - if( !sizechanged ) - { - SetWindowPos( _glfwWin.window, HWND_TOP, 0, 0, width, height, - SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOZORDER ); - } -} - - -//======================================================================== -// Set the window position -//======================================================================== - -void _glfwPlatformSetWindowPos( int x, int y ) -{ - (void) SetWindowPos( _glfwWin.window, HWND_TOP, x, y, 0, 0, - SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER ); -} - - -//======================================================================== -// Window iconification -//======================================================================== - -void _glfwPlatformIconifyWindow( void ) -{ - // Iconify window - ShowWindow( _glfwWin.window, SW_MINIMIZE ); - _glfwWin.iconified = GL_TRUE; - - // If we are in fullscreen mode we need to change video modes - if( _glfwWin.fullscreen ) - { - // Change display settings to the desktop resolution - ChangeDisplaySettings( NULL, CDS_FULLSCREEN ); - } - - // Unlock mouse - if( !_glfwWin.oldMouseLockValid ) - { - _glfwWin.oldMouseLock = _glfwWin.mouseLock; - _glfwWin.oldMouseLockValid = GL_TRUE; - glfwEnable( GLFW_MOUSE_CURSOR ); - } -} - - -//======================================================================== -// Window un-iconification -//======================================================================== - -void _glfwPlatformRestoreWindow( void ) -{ - // If we are in fullscreen mode we need to change video modes - if( _glfwWin.fullscreen ) - { - // Change display settings to the user selected mode - _glfwSetVideoModeMODE( _glfwWin.modeID ); - } - - // Un-iconify window - ShowWindow( _glfwWin.window, SW_RESTORE ); - - // Make sure that our window ends up on top of things - ShowWindow( _glfwWin.window, SW_SHOW ); - setForegroundWindow( _glfwWin.window ); - SetFocus( _glfwWin.window ); - - // Window is no longer iconified - _glfwWin.iconified = GL_FALSE; - - // Lock mouse, if necessary - if( _glfwWin.oldMouseLockValid && _glfwWin.oldMouseLock ) - { - glfwDisable( GLFW_MOUSE_CURSOR ); - } - _glfwWin.oldMouseLockValid = GL_FALSE; -} - - -//======================================================================== -// Swap buffers (double-buffering) -//======================================================================== - -void _glfwPlatformSwapBuffers( void ) -{ - _glfw_SwapBuffers( _glfwWin.DC ); -} - - -//======================================================================== -// Set double buffering swap interval -//======================================================================== - -void _glfwPlatformSwapInterval( int interval ) -{ - if( _glfwWin.has_WGL_EXT_swap_control ) - { - _glfwWin.SwapIntervalEXT( interval ); - } -} - - -//======================================================================== -// Write back window parameters into GLFW window structure -//======================================================================== - -void _glfwPlatformRefreshWindowParams( void ) -{ - PIXELFORMATDESCRIPTOR pfd; - DEVMODE dm; - int pixelFormat, mode; - - // Obtain a detailed description of current pixel format - pixelFormat = _glfw_GetPixelFormat( _glfwWin.DC ); - - if( _glfwWin.has_WGL_ARB_pixel_format ) - { - if( getPixelFormatAttrib( pixelFormat, WGL_ACCELERATION_ARB ) != - WGL_NO_ACCELERATION_ARB ) - { - _glfwWin.accelerated = GL_TRUE; - } - else - { - _glfwWin.accelerated = GL_FALSE; - } - - _glfwWin.redBits = getPixelFormatAttrib( pixelFormat, WGL_RED_BITS_ARB ); - _glfwWin.greenBits = getPixelFormatAttrib( pixelFormat, WGL_GREEN_BITS_ARB ); - _glfwWin.blueBits = getPixelFormatAttrib( pixelFormat, WGL_BLUE_BITS_ARB ); - - _glfwWin.alphaBits = getPixelFormatAttrib( pixelFormat, WGL_ALPHA_BITS_ARB ); - _glfwWin.depthBits = getPixelFormatAttrib( pixelFormat, WGL_DEPTH_BITS_ARB ); - _glfwWin.stencilBits = getPixelFormatAttrib( pixelFormat, WGL_STENCIL_BITS_ARB ); - - _glfwWin.accumRedBits = getPixelFormatAttrib( pixelFormat, WGL_ACCUM_RED_BITS_ARB ); - _glfwWin.accumGreenBits = getPixelFormatAttrib( pixelFormat, WGL_ACCUM_GREEN_BITS_ARB ); - _glfwWin.accumBlueBits = getPixelFormatAttrib( pixelFormat, WGL_ACCUM_BLUE_BITS_ARB ); - _glfwWin.accumAlphaBits = getPixelFormatAttrib( pixelFormat, WGL_ACCUM_ALPHA_BITS_ARB ); - - _glfwWin.auxBuffers = getPixelFormatAttrib( pixelFormat, WGL_AUX_BUFFERS_ARB ); - _glfwWin.stereo = getPixelFormatAttrib( pixelFormat, WGL_STEREO_ARB ) ? GL_TRUE : GL_FALSE; - - if( _glfwWin.has_WGL_ARB_multisample ) - { - _glfwWin.samples = getPixelFormatAttrib( pixelFormat, WGL_SAMPLES_ARB ); - // Should we force 1 to 0 here for consistency, or keep 1 for transparency? - } - else - { - _glfwWin.samples = 0; - } - } - else - { - _glfw_DescribePixelFormat( _glfwWin.DC, pixelFormat, - sizeof(PIXELFORMATDESCRIPTOR), &pfd ); - - // Is current OpenGL context accelerated? - _glfwWin.accelerated = (pfd.dwFlags & PFD_GENERIC_ACCELERATED) || - !(pfd.dwFlags & PFD_GENERIC_FORMAT) ? 1 : 0; - - // "Standard" window parameters - _glfwWin.redBits = pfd.cRedBits; - _glfwWin.greenBits = pfd.cGreenBits; - _glfwWin.blueBits = pfd.cBlueBits; - _glfwWin.alphaBits = pfd.cAlphaBits; - _glfwWin.depthBits = pfd.cDepthBits; - _glfwWin.stencilBits = pfd.cStencilBits; - _glfwWin.accumRedBits = pfd.cAccumRedBits; - _glfwWin.accumGreenBits = pfd.cAccumGreenBits; - _glfwWin.accumBlueBits = pfd.cAccumBlueBits; - _glfwWin.accumAlphaBits = pfd.cAccumAlphaBits; - _glfwWin.auxBuffers = pfd.cAuxBuffers; - _glfwWin.stereo = (pfd.dwFlags & PFD_STEREO) ? GL_TRUE : GL_FALSE; - - // If we don't have WGL_ARB_pixel_format then we can't have created a - // multisampling context, so it's safe to hardcode zero here - _glfwWin.samples = 0; - } - - // Get refresh rate - mode = _glfwWin.fullscreen ? _glfwWin.modeID : ENUM_CURRENT_SETTINGS; - dm.dmSize = sizeof( DEVMODE ); - - if( EnumDisplaySettings( NULL, mode, &dm ) ) - { - _glfwWin.refreshRate = dm.dmDisplayFrequency; - if( _glfwWin.refreshRate <= 1 ) - { - _glfwWin.refreshRate = 0; - } - } - else - { - _glfwWin.refreshRate = 0; - } -} - - -//======================================================================== -// Poll for new window and input events -//======================================================================== - -void _glfwPlatformPollEvents( void ) -{ - MSG msg; - int winclosed = GL_FALSE; - - // Flag: mouse was not moved (will be changed by _glfwGetNextEvent if - // there was a mouse move event) - _glfwInput.MouseMoved = GL_FALSE; - - // Check for new window messages - while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) ) - { - switch( msg.message ) - { - // QUIT-message (from close window)? - case WM_QUIT: - winclosed = GL_TRUE; - break; - - // Ok, send it to the window message handler - default: - DispatchMessage( &msg ); - break; - } - } - - // LSHIFT/RSHIFT fixup (keys tend to "stick" without this fix) - // This is the only async event handling in GLFW, but it solves some - // nasty problems. - // Caveat: Does not work under Win 9x/ME. - if( _glfwLibrary.Sys.winVer >= _GLFW_WIN_NT4 ) - { - int lshift_down, rshift_down; - - // Get current state of left and right shift keys - lshift_down = (GetAsyncKeyState( VK_LSHIFT ) >> 15) & 1; - rshift_down = (GetAsyncKeyState( VK_RSHIFT ) >> 15) & 1; - - // See if this differs from our belief of what has happened - // (we only have to check for lost key up events) - if( !lshift_down && _glfwInput.Key[ GLFW_KEY_LSHIFT ] == 1 ) - { - _glfwInputKey( GLFW_KEY_LSHIFT, GLFW_RELEASE ); - } - if( !rshift_down && _glfwInput.Key[ GLFW_KEY_RSHIFT ] == 1 ) - { - _glfwInputKey( GLFW_KEY_RSHIFT, GLFW_RELEASE ); - } - } - - // Did we have mouse movement in locked cursor mode? - if( _glfwInput.MouseMoved && _glfwWin.mouseLock ) - { - _glfwPlatformSetMouseCursorPos( _glfwWin.width / 2, - _glfwWin.height / 2 ); - } - - // Was there a window close request? - if( winclosed && _glfwWin.windowCloseCallback ) - { - // Check if the program wants us to close the window - winclosed = _glfwWin.windowCloseCallback(); - } - if( winclosed ) - { - glfwCloseWindow(); - } -} - - -//======================================================================== -// Wait for new window and input events -//======================================================================== - -void _glfwPlatformWaitEvents( void ) -{ - WaitMessage(); - - _glfwPlatformPollEvents(); -} - - -//======================================================================== -// Hide mouse cursor (lock it) -//======================================================================== - -void _glfwPlatformHideMouseCursor( void ) -{ - RECT ClipWindowRect; - - ShowCursor( FALSE ); - - // Clip cursor to the window - if( GetWindowRect( _glfwWin.window, &ClipWindowRect ) ) - { - ClipCursor( &ClipWindowRect ); - } - - // Capture cursor to user window - SetCapture( _glfwWin.window ); - - // Move cursor to the middle of the window - _glfwPlatformSetMouseCursorPos( _glfwWin.width / 2, _glfwWin.height / 2 ); -} - - -//======================================================================== -// Show mouse cursor (unlock it) -//======================================================================== - -void _glfwPlatformShowMouseCursor( void ) -{ - // Un-capture cursor - ReleaseCapture(); - - // Release the cursor from the window - ClipCursor( NULL ); - - ShowCursor( TRUE ); -} - - -//======================================================================== -// Set physical mouse cursor position -//======================================================================== - -void _glfwPlatformSetMouseCursorPos( int x, int y ) -{ - POINT pos; - - // Convert client coordinates to screen coordinates - pos.x = x; - pos.y = y; - ClientToScreen( _glfwWin.window, &pos ); - - _glfwInput.OldMouseX = x; - _glfwInput.OldMouseY = y; - - SetCursorPos( pos.x, pos.y ); -} - diff --git a/Core/SVS/glfw/lib/window.c b/Core/SVS/glfw/lib/window.c deleted file mode 100644 index 60447439fe..0000000000 --- a/Core/SVS/glfw/lib/window.c +++ /dev/null @@ -1,1005 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: Any -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include - - -#ifndef GL_VERSION_3_2 - -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_CONTEXT_PROFILE_MASK 0x9126 - -#endif /*GL_VERSION_3_2*/ - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -static int Max(int a, int b) -{ - return (a > b) ? a : b; -} - -//======================================================================== -// Clear all open window hints -//======================================================================== - -void _glfwClearWindowHints( void ) -{ - memset( &_glfwLibrary.hints, 0, sizeof( _glfwLibrary.hints ) ); - _glfwLibrary.hints.glMajor = 1; -} - - -//======================================================================== -// Handle the input tracking part of window deactivation -//======================================================================== - -void _glfwInputDeactivation( void ) -{ - int i; - - // Release all keyboard keys - for( i = 0; i <= GLFW_KEY_LAST; i ++ ) - { - if( _glfwInput.Key[ i ] == GLFW_PRESS ) - { - _glfwInputKey( i, GLFW_RELEASE ); - } - } - - // Release all mouse buttons - for( i = 0; i <= GLFW_MOUSE_BUTTON_LAST; i ++ ) - { - if( _glfwInput.MouseButton[ i ] == GLFW_PRESS ) - { - _glfwInputMouseClick( i, GLFW_RELEASE ); - } - } -} - - -//======================================================================== -// Clear all input state -//======================================================================== - -void _glfwClearInput( void ) -{ - int i; - - // Release all keyboard keys - for( i = 0; i <= GLFW_KEY_LAST; i ++ ) - { - _glfwInput.Key[ i ] = GLFW_RELEASE; - } - - // Clear last character - _glfwInput.LastChar = 0; - - // Release all mouse buttons - for( i = 0; i <= GLFW_MOUSE_BUTTON_LAST; i ++ ) - { - _glfwInput.MouseButton[ i ] = GLFW_RELEASE; - } - - // Set mouse position to (0,0) - _glfwInput.MousePosX = 0; - _glfwInput.MousePosY = 0; - - // Set mouse wheel position to 0 - _glfwInput.WheelPos = 0; - - // The default is to use non sticky keys and mouse buttons - _glfwInput.StickyKeys = GL_FALSE; - _glfwInput.StickyMouseButtons = GL_FALSE; - - // The default is to disable key repeat - _glfwInput.KeyRepeat = GL_FALSE; -} - - -//======================================================================== -// Register keyboard activity -//======================================================================== - -void _glfwInputKey( int key, int action ) -{ - int keyrepeat = 0; - - if( key < 0 || key > GLFW_KEY_LAST ) - { - return; - } - - // Are we trying to release an already released key? - if( action == GLFW_RELEASE && _glfwInput.Key[ key ] != GLFW_PRESS ) - { - return; - } - - // Register key action - if( action == GLFW_RELEASE && _glfwInput.StickyKeys ) - { - _glfwInput.Key[ key ] = GLFW_STICK; - } - else - { - keyrepeat = (_glfwInput.Key[ key ] == GLFW_PRESS) && - (action == GLFW_PRESS); - _glfwInput.Key[ key ] = (char) action; - } - - // Call user callback function - if( _glfwWin.keyCallback && (_glfwInput.KeyRepeat || !keyrepeat) ) - { - _glfwWin.keyCallback( key, action ); - } -} - - -//======================================================================== -// Register (keyboard) character activity -//======================================================================== - -void _glfwInputChar( int character, int action ) -{ - int keyrepeat = 0; - - // Valid Unicode (ISO 10646) character? - if( !( (character >= 32 && character <= 126) || character >= 160 ) ) - { - return; - } - - // Is this a key repeat? - if( action == GLFW_PRESS && _glfwInput.LastChar == character ) - { - keyrepeat = 1; - } - - // Store this character as last character (or clear it, if released) - if( action == GLFW_PRESS ) - { - _glfwInput.LastChar = character; - } - else - { - _glfwInput.LastChar = 0; - } - - if( action != GLFW_PRESS ) - { - // This intentionally breaks release notifications for Unicode - // characters, partly to see if anyone cares but mostly because it's - // a nonsensical concept to begin with - // - // It will remain broken either until its removal in the 3.0 API or - // until someone explains, in a way that makes sense to people outside - // the US and Scandinavia, what "Unicode character up" actually means - // - // If what you want is "physical key up" then you should be using the - // key functions and/or the key callback, NOT the Unicode input - // - // However, if your particular application uses this misfeature for... - // something, you can re-enable it by removing this if-statement - return; - } - - if( _glfwWin.charCallback && (_glfwInput.KeyRepeat || !keyrepeat) ) - { - _glfwWin.charCallback( character, action ); - } -} - - -//======================================================================== -// Register mouse button clicks -//======================================================================== - -void _glfwInputMouseClick( int button, int action ) -{ - if( button >= 0 && button <= GLFW_MOUSE_BUTTON_LAST ) - { - // Register mouse button action - if( action == GLFW_RELEASE && _glfwInput.StickyMouseButtons ) - { - _glfwInput.MouseButton[ button ] = GLFW_STICK; - } - else - { - _glfwInput.MouseButton[ button ] = (char) action; - } - - // Call user callback function - if( _glfwWin.mouseButtonCallback ) - { - _glfwWin.mouseButtonCallback( button, action ); - } - } -} - - -//======================================================================== -// Return the available framebuffer config closest to the desired values -// This is based on the manual GLX Visual selection from 2.6 -//======================================================================== - -const _GLFWfbconfig *_glfwChooseFBConfig( const _GLFWfbconfig *desired, - const _GLFWfbconfig *alternatives, - unsigned int count ) -{ - unsigned int i; - unsigned int missing, leastMissing = UINT_MAX; - unsigned int colorDiff, leastColorDiff = UINT_MAX; - unsigned int extraDiff, leastExtraDiff = UINT_MAX; - const _GLFWfbconfig *current; - const _GLFWfbconfig *closest = NULL; - - for( i = 0; i < count; i++ ) - { - current = alternatives + i; - - if( desired->stereo > 0 && current->stereo == 0 ) - { - // Stereo is a hard constraint - continue; - } - - // Count number of missing buffers - { - missing = 0; - - if( desired->alphaBits > 0 && current->alphaBits == 0 ) - { - missing++; - } - - if( desired->depthBits > 0 && current->depthBits == 0 ) - { - missing++; - } - - if( desired->stencilBits > 0 && current->stencilBits == 0 ) - { - missing++; - } - - if( desired->auxBuffers > 0 && current->auxBuffers < desired->auxBuffers ) - { - missing += desired->auxBuffers - current->auxBuffers; - } - - if( desired->samples > 0 && current->samples == 0 ) - { - // Technically, several multisampling buffers could be - // involved, but that's a lower level implementation detail and - // not important to us here, so we count them as one - missing++; - } - } - - // These polynomials make many small channel size differences matter - // less than one large channel size difference - - // Calculate color channel size difference value - { - colorDiff = 0; - - if ( desired->redBits > 0 ) - { - colorDiff += ( desired->redBits - current->redBits ) * - ( desired->redBits - current->redBits ); - } - - if ( desired->greenBits > 0 ) - { - colorDiff += ( desired->greenBits - current->greenBits ) * - ( desired->greenBits - current->greenBits ); - } - - if ( desired->blueBits > 0 ) - { - colorDiff += ( desired->blueBits - current->blueBits ) * - ( desired->blueBits - current->blueBits ); - } - } - - // Calculate non-color channel size difference value - { - extraDiff = 0; - - if( desired->alphaBits > 0 ) - { - extraDiff += ( desired->alphaBits - current->alphaBits ) * - ( desired->alphaBits - current->alphaBits ); - } - - if( desired->depthBits > 0 ) - { - extraDiff += ( desired->depthBits - current->depthBits ) * - ( desired->depthBits - current->depthBits ); - } - - if( desired->stencilBits > 0 ) - { - extraDiff += ( desired->stencilBits - current->stencilBits ) * - ( desired->stencilBits - current->stencilBits ); - } - - if( desired->accumRedBits > 0 ) - { - extraDiff += ( desired->accumRedBits - current->accumRedBits ) * - ( desired->accumRedBits - current->accumRedBits ); - } - - if( desired->accumGreenBits > 0 ) - { - extraDiff += ( desired->accumGreenBits - current->accumGreenBits ) * - ( desired->accumGreenBits - current->accumGreenBits ); - } - - if( desired->accumBlueBits > 0 ) - { - extraDiff += ( desired->accumBlueBits - current->accumBlueBits ) * - ( desired->accumBlueBits - current->accumBlueBits ); - } - - if( desired->accumAlphaBits > 0 ) - { - extraDiff += ( desired->accumAlphaBits - current->accumAlphaBits ) * - ( desired->accumAlphaBits - current->accumAlphaBits ); - } - - if( desired->samples > 0 ) - { - extraDiff += ( desired->samples - current->samples ) * - ( desired->samples - current->samples ); - } - } - - // Figure out if the current one is better than the best one found so far - - if( missing < leastMissing ) - { - closest = current; - } - else if( missing == leastMissing ) - { - if( ( colorDiff < leastColorDiff ) || - ( colorDiff == leastColorDiff && extraDiff < leastExtraDiff ) ) - { - closest = current; - } - } - - if( current == closest ) - { - leastMissing = missing; - leastColorDiff = colorDiff; - leastExtraDiff = extraDiff; - } - } - - return closest; -} - - -//************************************************************************ -//**** GLFW user functions **** -//************************************************************************ - -//======================================================================== -// Create the GLFW window and its associated context -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwOpenWindow( int width, int height, - int redbits, int greenbits, int bluebits, int alphabits, - int depthbits, int stencilbits, int mode ) -{ - _GLFWfbconfig fbconfig; - _GLFWwndconfig wndconfig; - - if( !_glfwInitialized || _glfwWin.opened ) - { - return GL_FALSE; - } - - // Set up desired framebuffer config - fbconfig.redBits = Max( redbits, 0 ); - fbconfig.greenBits = Max( greenbits, 0 ); - fbconfig.blueBits = Max( bluebits, 0 ); - fbconfig.alphaBits = Max( alphabits, 0 ); - fbconfig.depthBits = Max( depthbits, 0 ); - fbconfig.stencilBits = Max( stencilbits, 0 ); - fbconfig.accumRedBits = Max( _glfwLibrary.hints.accumRedBits, 0 ); - fbconfig.accumGreenBits = Max( _glfwLibrary.hints.accumGreenBits, 0 ); - fbconfig.accumBlueBits = Max( _glfwLibrary.hints.accumBlueBits, 0 ); - fbconfig.accumAlphaBits = Max( _glfwLibrary.hints.accumAlphaBits, 0 ); - fbconfig.auxBuffers = Max( _glfwLibrary.hints.auxBuffers, 0 ); - fbconfig.stereo = _glfwLibrary.hints.stereo ? GL_TRUE : GL_FALSE; - fbconfig.samples = Max( _glfwLibrary.hints.samples, 0 ); - - // Set up desired window config - wndconfig.mode = mode; - wndconfig.refreshRate = Max( _glfwLibrary.hints.refreshRate, 0 ); - wndconfig.windowNoResize = _glfwLibrary.hints.windowNoResize ? GL_TRUE : GL_FALSE; - wndconfig.glMajor = Max( _glfwLibrary.hints.glMajor, 1 ); - wndconfig.glMinor = Max( _glfwLibrary.hints.glMinor, 0 ); - wndconfig.glForward = _glfwLibrary.hints.glForward ? GL_TRUE : GL_FALSE; - wndconfig.glDebug = _glfwLibrary.hints.glDebug ? GL_TRUE : GL_FALSE; - wndconfig.glProfile = _glfwLibrary.hints.glProfile; - - if( wndconfig.glMajor == 1 && wndconfig.glMinor > 5 ) - { - // OpenGL 1.x series ended with version 1.5 - return GL_FALSE; - } - else if( wndconfig.glMajor == 2 && wndconfig.glMinor > 1 ) - { - // OpenGL 2.x series ended with version 2.1 - return GL_FALSE; - } - else if( wndconfig.glMajor == 3 && wndconfig.glMinor > 3 ) - { - // OpenGL 3.x series ended with version 3.3 - return GL_FALSE; - } - else - { - // For now, let everything else through - } - - if( wndconfig.glProfile && - ( wndconfig.glMajor < 3 || ( wndconfig.glMajor == 3 && wndconfig.glMinor < 2 ) ) ) - { - // Context profiles are only defined for OpenGL version 3.2 and above - return GL_FALSE; - } - - if( wndconfig.glForward && wndconfig.glMajor < 3 ) - { - // Forward-compatible contexts are only defined for OpenGL version 3.0 and above - return GL_FALSE; - } - - // Clear for next open call - _glfwClearWindowHints(); - - // Check input arguments - if( mode != GLFW_WINDOW && mode != GLFW_FULLSCREEN ) - { - return GL_FALSE; - } - - // Clear GLFW window state - _glfwWin.active = GL_TRUE; - _glfwWin.iconified = GL_FALSE; - _glfwWin.mouseLock = GL_FALSE; - _glfwWin.autoPollEvents = GL_TRUE; - _glfwClearInput(); - - // Unregister all callback functions - _glfwWin.windowSizeCallback = NULL; - _glfwWin.windowCloseCallback = NULL; - _glfwWin.windowRefreshCallback = NULL; - _glfwWin.keyCallback = NULL; - _glfwWin.charCallback = NULL; - _glfwWin.mousePosCallback = NULL; - _glfwWin.mouseButtonCallback = NULL; - _glfwWin.mouseWheelCallback = NULL; - - // Check width & height - if( width > 0 && height <= 0 ) - { - // Set the window aspect ratio to 4:3 - height = (width * 3) / 4; - } - else if( width <= 0 && height > 0 ) - { - // Set the window aspect ratio to 4:3 - width = (height * 4) / 3; - } - else if( width <= 0 && height <= 0 ) - { - // Default window size - width = 640; - height = 480; - } - - // Remember window settings - _glfwWin.width = width; - _glfwWin.height = height; - _glfwWin.fullscreen = (mode == GLFW_FULLSCREEN ? GL_TRUE : GL_FALSE); - - // Platform specific window opening routine - if( !_glfwPlatformOpenWindow( width, height, &wndconfig, &fbconfig ) ) - { - glfwCloseWindow(); - return GL_FALSE; - } - - // Flag that window is now opened - _glfwWin.opened = GL_TRUE; - - // Read back window and context parameters - _glfwPlatformRefreshWindowParams(); - _glfwRefreshContextParams(); - - if( _glfwWin.glMajor < wndconfig.glMajor || - ( _glfwWin.glMajor == wndconfig.glMajor && - _glfwWin.glMinor < wndconfig.glMinor ) ) - { - glfwCloseWindow(); - return GL_FALSE; - } - - // Do we have non-power-of-two textures (added to core in version 2.0)? - _glfwWin.has_GL_ARB_texture_non_power_of_two = - ( _glfwWin.glMajor >= 2 ) || - glfwExtensionSupported( "GL_ARB_texture_non_power_of_two" ); - - // Do we have automatic mipmap generation (added to core in version 1.4)? - _glfwWin.has_GL_SGIS_generate_mipmap = - ( _glfwWin.glMajor >= 2 ) || ( _glfwWin.glMinor >= 4 ) || - glfwExtensionSupported( "GL_SGIS_generate_mipmap" ); - - if( _glfwWin.glMajor > 2 ) - { - _glfwWin.GetStringi = (PFNGLGETSTRINGIPROC) glfwGetProcAddress( "glGetStringi" ); - if( !_glfwWin.GetStringi ) - { - // This is a very common problem among people who compile GLFW - // on X11/GLX using custom build systems, as the glfwGetProcAddress - // code path selection needs explicit configuration - // - // See readme.html section 2.2 for details - - glfwCloseWindow(); - return GL_FALSE; - } - } - - // If full-screen mode was requested, disable mouse cursor - if( mode == GLFW_FULLSCREEN ) - { - glfwDisable( GLFW_MOUSE_CURSOR ); - } - - // Start by clearing the front buffer to black (avoid ugly desktop - // remains in our OpenGL window) - glClear( GL_COLOR_BUFFER_BIT ); - _glfwPlatformSwapBuffers(); - - return GL_TRUE; -} - - -//======================================================================== -// Set hints for opening the window -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwOpenWindowHint( int target, int hint ) -{ - if( !_glfwInitialized ) - { - return; - } - - switch( target ) - { - case GLFW_REFRESH_RATE: - _glfwLibrary.hints.refreshRate = hint; - break; - case GLFW_ACCUM_RED_BITS: - _glfwLibrary.hints.accumRedBits = hint; - break; - case GLFW_ACCUM_GREEN_BITS: - _glfwLibrary.hints.accumGreenBits = hint; - break; - case GLFW_ACCUM_BLUE_BITS: - _glfwLibrary.hints.accumBlueBits = hint; - break; - case GLFW_ACCUM_ALPHA_BITS: - _glfwLibrary.hints.accumAlphaBits = hint; - break; - case GLFW_AUX_BUFFERS: - _glfwLibrary.hints.auxBuffers = hint; - break; - case GLFW_STEREO: - _glfwLibrary.hints.stereo = hint; - break; - case GLFW_WINDOW_NO_RESIZE: - _glfwLibrary.hints.windowNoResize = hint; - break; - case GLFW_FSAA_SAMPLES: - _glfwLibrary.hints.samples = hint; - break; - case GLFW_OPENGL_VERSION_MAJOR: - _glfwLibrary.hints.glMajor = hint; - break; - case GLFW_OPENGL_VERSION_MINOR: - _glfwLibrary.hints.glMinor = hint; - break; - case GLFW_OPENGL_FORWARD_COMPAT: - _glfwLibrary.hints.glForward = hint; - break; - case GLFW_OPENGL_DEBUG_CONTEXT: - _glfwLibrary.hints.glDebug = hint; - break; - case GLFW_OPENGL_PROFILE: - _glfwLibrary.hints.glProfile = hint; - break; - default: - break; - } -} - - -//======================================================================== -// Properly kill the window / video display -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwCloseWindow( void ) -{ - if( !_glfwInitialized ) - { - return; - } - - // Show mouse pointer again (if hidden) - glfwEnable( GLFW_MOUSE_CURSOR ); - - _glfwPlatformCloseWindow(); - - memset( &_glfwWin, 0, sizeof(_glfwWin) ); -} - - -//======================================================================== -// Set the window title -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetWindowTitle( const char *title ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set window title - _glfwPlatformSetWindowTitle( title ); -} - - -//======================================================================== -// Get the window size -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwGetWindowSize( int *width, int *height ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - if( width != NULL ) - { - *width = _glfwWin.width; - } - if( height != NULL ) - { - *height = _glfwWin.height; - } -} - - -//======================================================================== -// Set the window size -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetWindowSize( int width, int height ) -{ - if( !_glfwInitialized || !_glfwWin.opened || _glfwWin.iconified ) - { - return; - } - - // Don't do anything if the window size did not change - if( width == _glfwWin.width && height == _glfwWin.height ) - { - return; - } - - // Change window size - _glfwPlatformSetWindowSize( width, height ); - - // Refresh window parameters (may have changed due to changed video - // modes) - _glfwPlatformRefreshWindowParams(); -} - - -//======================================================================== -// Set the window position -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetWindowPos( int x, int y ) -{ - if( !_glfwInitialized || !_glfwWin.opened || _glfwWin.fullscreen || - _glfwWin.iconified ) - { - return; - } - - // Set window position - _glfwPlatformSetWindowPos( x, y ); -} - - -//======================================================================== -// Window iconification -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwIconifyWindow( void ) -{ - if( !_glfwInitialized || !_glfwWin.opened || _glfwWin.iconified ) - { - return; - } - - // Iconify window - _glfwPlatformIconifyWindow(); -} - - -//======================================================================== -// Window un-iconification -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwRestoreWindow( void ) -{ - if( !_glfwInitialized || !_glfwWin.opened || !_glfwWin.iconified ) - { - return; - } - - // Restore iconified window - _glfwPlatformRestoreWindow(); - - // Refresh window parameters - _glfwPlatformRefreshWindowParams(); -} - - -//======================================================================== -// Swap buffers (double-buffering) and poll any new events -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSwapBuffers( void ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - _glfwPlatformSwapBuffers(); - - // Check for window messages - if( _glfwWin.autoPollEvents ) - { - glfwPollEvents(); - } -} - - -//======================================================================== -// Set double buffering swap interval (0 = vsync off) -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSwapInterval( int interval ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set double buffering swap interval - _glfwPlatformSwapInterval( interval ); -} - - -//======================================================================== -// Get window parameter -//======================================================================== - -GLFWAPI int GLFWAPIENTRY glfwGetWindowParam( int param ) -{ - if( !_glfwInitialized ) - { - return 0; - } - - // Is the window opened? - if( !_glfwWin.opened ) - { - if( param == GLFW_OPENED ) - { - return GL_FALSE; - } - return 0; - } - - // Window parameters - switch( param ) - { - case GLFW_OPENED: - return GL_TRUE; - case GLFW_ACTIVE: - return _glfwWin.active; - case GLFW_ICONIFIED: - return _glfwWin.iconified; - case GLFW_ACCELERATED: - return _glfwWin.accelerated; - case GLFW_RED_BITS: - return _glfwWin.redBits; - case GLFW_GREEN_BITS: - return _glfwWin.greenBits; - case GLFW_BLUE_BITS: - return _glfwWin.blueBits; - case GLFW_ALPHA_BITS: - return _glfwWin.alphaBits; - case GLFW_DEPTH_BITS: - return _glfwWin.depthBits; - case GLFW_STENCIL_BITS: - return _glfwWin.stencilBits; - case GLFW_ACCUM_RED_BITS: - return _glfwWin.accumRedBits; - case GLFW_ACCUM_GREEN_BITS: - return _glfwWin.accumGreenBits; - case GLFW_ACCUM_BLUE_BITS: - return _glfwWin.accumBlueBits; - case GLFW_ACCUM_ALPHA_BITS: - return _glfwWin.accumAlphaBits; - case GLFW_AUX_BUFFERS: - return _glfwWin.auxBuffers; - case GLFW_STEREO: - return _glfwWin.stereo; - case GLFW_REFRESH_RATE: - return _glfwWin.refreshRate; - case GLFW_WINDOW_NO_RESIZE: - return _glfwWin.windowNoResize; - case GLFW_FSAA_SAMPLES: - return _glfwWin.samples; - case GLFW_OPENGL_VERSION_MAJOR: - return _glfwWin.glMajor; - case GLFW_OPENGL_VERSION_MINOR: - return _glfwWin.glMinor; - case GLFW_OPENGL_FORWARD_COMPAT: - return _glfwWin.glForward; - case GLFW_OPENGL_DEBUG_CONTEXT: - return _glfwWin.glDebug; - case GLFW_OPENGL_PROFILE: - return _glfwWin.glProfile; - default: - return 0; - } -} - - -//======================================================================== -// Set callback function for window size changes -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetWindowSizeCallback( GLFWwindowsizefun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.windowSizeCallback = cbfun; - - // Call the callback function to let the application know the current - // window size - if( cbfun ) - { - cbfun( _glfwWin.width, _glfwWin.height ); - } -} - -//======================================================================== -// Set callback function for window close events -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetWindowCloseCallback( GLFWwindowclosefun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.windowCloseCallback = cbfun; -} - - -//======================================================================== -// Set callback function for window refresh events -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwSetWindowRefreshCallback( GLFWwindowrefreshfun cbfun ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Set callback function - _glfwWin.windowRefreshCallback = cbfun; -} - - -//======================================================================== -// Poll for new window and input events -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwPollEvents( void ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Poll for new events - _glfwPlatformPollEvents(); -} - - -//======================================================================== -// Wait for new window and input events -//======================================================================== - -GLFWAPI void GLFWAPIENTRY glfwWaitEvents( void ) -{ - if( !_glfwInitialized || !_glfwWin.opened ) - { - return; - } - - // Poll for new events - _glfwPlatformWaitEvents(); -} - diff --git a/Core/SVS/glfw/lib/x11/platform.h b/Core/SVS/glfw/lib/x11/platform.h deleted file mode 100644 index 69ae5d3afc..0000000000 --- a/Core/SVS/glfw/lib/x11/platform.h +++ /dev/null @@ -1,529 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#ifndef _platform_h_ -#define _platform_h_ - - -// This is the X11 version of GLFW -#define _GLFW_X11 - - -// Include files -#include -#include -#include -#include -#include -#include -#include -#include -#include "../../include/GL/glfw.h" - -// Do we have pthread support? -#ifdef _GLFW_HAS_PTHREAD - #include - #include -#endif - -// We need declarations for GLX version 1.3 or above even if the server doesn't -// support version 1.3 -#ifndef GLX_VERSION_1_3 - #error "GLX header version 1.3 or above is required" -#endif - -#if defined( _GLFW_HAS_XF86VIDMODE ) && defined( _GLFW_HAS_XRANDR ) - #error "Xf86VidMode and RandR extensions cannot both be enabled" -#endif - -// With XFree86, we can use the XF86VidMode extension -#if defined( _GLFW_HAS_XF86VIDMODE ) - #include -#endif - -#if defined( _GLFW_HAS_XRANDR ) - #include -#endif - -// Do we have support for dlopen/dlsym? -#if defined( _GLFW_HAS_DLOPEN ) - #include -#endif - -// We support two different ways for getting the number of processors in -// the system: sysconf (POSIX) and sysctl (BSD?) -#if defined( _GLFW_HAS_SYSCONF ) - - // Use a single constant for querying number of online processors using - // the sysconf function (e.g. SGI defines _SC_NPROC_ONLN instead of - // _SC_NPROCESSORS_ONLN) - #ifndef _SC_NPROCESSORS_ONLN - #ifdef _SC_NPROC_ONLN - #define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN - #else - #error POSIX constant _SC_NPROCESSORS_ONLN not defined! - #endif - #endif - - // Macro for querying the number of processors - #define _glfw_numprocessors(n) n=(int)sysconf(_SC_NPROCESSORS_ONLN) - -#elif defined( _GLFW_HAS_SYSCTL ) - - #include - #include - - // Macro for querying the number of processors - #define _glfw_numprocessors(n) { \ - int mib[2], ncpu; \ - size_t len = 1; \ - mib[0] = CTL_HW; \ - mib[1] = HW_NCPU; \ - n = 1; \ - if( sysctl( mib, 2, &ncpu, &len, NULL, 0 ) != -1 ) \ - { \ - if( len > 0 ) \ - { \ - n = ncpu; \ - } \ - } \ - } - -#else - - // If neither sysconf nor sysctl is supported, assume single processor - // system - #define _glfw_numprocessors(n) n=1 - -#endif - -// Pointer length integer -// One day, this will most likely move into glfw.h -typedef intptr_t GLFWintptr; - - -#ifndef GLX_EXT_swap_control - -typedef void (*PFNGLXSWAPINTERVALEXTPROC)(Display*,GLXDrawable,int); - -#endif /*GLX_MESA_swap_control*/ - - -#ifndef GLX_MESA_swap_control - -typedef int (*PFNGLXSWAPINTERVALMESAPROC)(int); - -#endif /*GLX_MESA_swap_control*/ - - -#ifndef GLX_SGI_swap_control - -// Function signature for GLX_SGI_swap_control -typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval); - -#endif /*GLX_SGI_swap_control*/ - - -#ifndef GLX_SGIX_fbconfig - -/* Type definitions for GLX_SGIX_fbconfig */ -typedef XID GLXFBConfigIDSGIX; -typedef struct __GLXFBConfigRec *GLXFBConfigSGIX; - -/* Function signatures for GLX_SGIX_fbconfig */ -typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value); -typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements); -typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct); -typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config); - -/* Tokens for GLX_SGIX_fbconfig */ -#define GLX_WINDOW_BIT_SGIX 0x00000001 -#define GLX_PIXMAP_BIT_SGIX 0x00000002 -#define GLX_RGBA_BIT_SGIX 0x00000001 -#define GLX_COLOR_INDEX_BIT_SGIX 0x00000002 -#define GLX_DRAWABLE_TYPE_SGIX 0x8010 -#define GLX_RENDER_TYPE_SGIX 0x8011 -#define GLX_X_RENDERABLE_SGIX 0x8012 -#define GLX_FBCONFIG_ID_SGIX 0x8013 -#define GLX_RGBA_TYPE_SGIX 0x8014 -#define GLX_COLOR_INDEX_TYPE_SGIX 0x8015 -#define GLX_SCREEN_EXT 0x800C - -#endif /*GLX_SGIX_fbconfig*/ - - -#ifndef GLX_ARB_create_context - -/* Tokens for glXCreateContextAttribsARB attributes */ -#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define GLX_CONTEXT_FLAGS_ARB 0x2094 - -/* Bits for WGL_CONTEXT_FLAGS_ARB */ -#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 -#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 - -/* Prototype for glXCreateContextAttribs */ -typedef GLXContext (*PFNGLXCREATECONTEXTATTRIBSARBPROC)( Display *display, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); - -#endif /*GLX_ARB_create_context*/ - - -#ifndef GLX_ARB_create_context_profile - -/* Tokens for glXCreateContextAttribsARB attributes */ -#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 - -/* BIts for GLX_CONTEXT_PROFILE_MASK_ARB */ -#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 - -#endif /*GLX_ARB_create_context_profile*/ - - -#ifndef GL_VERSION_3_0 - -typedef const GLubyte * (APIENTRY *PFNGLGETSTRINGIPROC) (GLenum, GLuint); - -#endif /*GL_VERSION_3_0*/ - - - -//======================================================================== -// Global variables (GLFW internals) -//======================================================================== - -//------------------------------------------------------------------------ -// Window structure -//------------------------------------------------------------------------ -typedef struct _GLFWwin_struct _GLFWwin; - -struct _GLFWwin_struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // User callback functions - GLFWwindowsizefun windowSizeCallback; - GLFWwindowclosefun windowCloseCallback; - GLFWwindowrefreshfun windowRefreshCallback; - GLFWmousebuttonfun mouseButtonCallback; - GLFWmouseposfun mousePosCallback; - GLFWmousewheelfun mouseWheelCallback; - GLFWkeyfun keyCallback; - GLFWcharfun charCallback; - - // User selected window settings - int fullscreen; // Fullscreen flag - int mouseLock; // Mouse-lock flag - int autoPollEvents; // Auto polling flag - int sysKeysDisabled; // System keys disabled flag - int windowNoResize; // Resize- and maximize gadgets disabled flag - int refreshRate; // Vertical monitor refresh rate - - // Window status & parameters - int opened; // Flag telling if window is opened or not - int active; // Application active flag - int iconified; // Window iconified flag - int width, height; // Window width and heigth - int accelerated; // GL_TRUE if window is HW accelerated - - // Framebuffer attributes - int redBits; - int greenBits; - int blueBits; - int alphaBits; - int depthBits; - int stencilBits; - int accumRedBits; - int accumGreenBits; - int accumBlueBits; - int accumAlphaBits; - int auxBuffers; - int stereo; - int samples; - - // OpenGL extensions and context attributes - int has_GL_SGIS_generate_mipmap; - int has_GL_ARB_texture_non_power_of_two; - int glMajor, glMinor, glRevision; - int glForward, glDebug, glProfile; - - PFNGLGETSTRINGIPROC GetStringi; - - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Platform specific window resources - Colormap colormap; // Window colormap - Window window; // Window - Window root; // Root window for screen - int screen; // Screen ID - XVisualInfo *visual; // Visual for selected GLXFBConfig - GLXFBConfigID fbconfigID; // ID of selected GLXFBConfig - GLXContext context; // OpenGL rendering context - Atom wmDeleteWindow; // WM_DELETE_WINDOW atom - Atom wmPing; // _NET_WM_PING atom - Atom wmState; // _NET_WM_STATE atom - Atom wmStateFullscreen; // _NET_WM_STATE_FULLSCREEN atom - Atom wmActiveWindow; // _NET_ACTIVE_WINDOW atom - Cursor cursor; // Invisible cursor for hidden cursor - - // GLX extensions - PFNGLXSWAPINTERVALEXTPROC SwapIntervalEXT; - PFNGLXSWAPINTERVALMESAPROC SwapIntervalMESA; - PFNGLXSWAPINTERVALSGIPROC SwapIntervalSGI; - PFNGLXGETFBCONFIGATTRIBSGIXPROC GetFBConfigAttribSGIX; - PFNGLXCHOOSEFBCONFIGSGIXPROC ChooseFBConfigSGIX; - PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC CreateContextWithConfigSGIX; - PFNGLXGETVISUALFROMFBCONFIGSGIXPROC GetVisualFromFBConfigSGIX; - PFNGLXCREATECONTEXTATTRIBSARBPROC CreateContextAttribsARB; - GLboolean has_GLX_SGIX_fbconfig; - GLboolean has_GLX_EXT_swap_control; - GLboolean has_GLX_MESA_swap_control; - GLboolean has_GLX_SGI_swap_control; - GLboolean has_GLX_ARB_multisample; - GLboolean has_GLX_ARB_create_context; - GLboolean has_GLX_ARB_create_context_profile; - - // Various platform specific internal variables - GLboolean hasEWMH; // True if window manager supports EWMH - GLboolean overrideRedirect; // True if window is OverrideRedirect - GLboolean keyboardGrabbed; // True if keyboard is currently grabbed - GLboolean pointerGrabbed; // True if pointer is currently grabbed - GLboolean pointerHidden; // True if pointer is currently hidden - - // Screensaver data - struct { - int changed; - int timeout; - int interval; - int blanking; - int exposure; - } Saver; - - // Fullscreen data - struct { - int modeChanged; -#if defined( _GLFW_HAS_XF86VIDMODE ) - XF86VidModeModeInfo oldMode; -#endif -#if defined( _GLFW_HAS_XRANDR ) - SizeID oldSizeID; - int oldWidth; - int oldHeight; - Rotation oldRotation; -#endif - } FS; -}; - -GLFWGLOBAL _GLFWwin _glfwWin; - - -//------------------------------------------------------------------------ -// User input status (most of this should go in _GLFWwin) -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Mouse status - int MousePosX, MousePosY; - int WheelPos; - char MouseButton[ GLFW_MOUSE_BUTTON_LAST+1 ]; - - // Keyboard status - char Key[ GLFW_KEY_LAST+1 ]; - int LastChar; - - // User selected settings - int StickyKeys; - int StickyMouseButtons; - int KeyRepeat; - - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Platform specific internal variables - int MouseMoved, CursorPosX, CursorPosY; - -} _glfwInput; - - -//------------------------------------------------------------------------ -// Library global data -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Window opening hints - _GLFWhints hints; - - // Initial desktop mode - GLFWvidmode desktopMode; - -// ========= PLATFORM SPECIFIC PART ====================================== - - Display *display; - - struct { - int versionMajor, versionMinor; - int eventBase; - int errorBase; - } GLX; - - struct { - int available; - int eventBase; - int errorBase; - } XF86VidMode; - - struct { - int available; - int eventBase; - int errorBase; - } XRandR; - - // Timer data - struct { - GLboolean monotonic; - double resolution; - long long base; - } Timer; - -#if defined(_GLFW_HAS_DLOPEN) - struct { - void *libGL; // dlopen handle for libGL.so - } Libs; -#endif -} _glfwLibrary; - - -//------------------------------------------------------------------------ -// Thread record (one for each thread) -//------------------------------------------------------------------------ -typedef struct _GLFWthread_struct _GLFWthread; - -struct _GLFWthread_struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Pointer to previous and next threads in linked list - _GLFWthread *Previous, *Next; - - // GLFW user side thread information - GLFWthread ID; - GLFWthreadfun Function; - -// ========= PLATFORM SPECIFIC PART ====================================== - - // System side thread information -#ifdef _GLFW_HAS_PTHREAD - pthread_t PosixID; -#endif - -}; - - -//------------------------------------------------------------------------ -// General thread information -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - -// ========= PLATFORM INDEPENDENT MANDATORY PART ========================= - - // Next thread ID to use (increments for every created thread) - GLFWthread NextID; - - // First thread in linked list (always the main thread) - _GLFWthread First; - -// ========= PLATFORM SPECIFIC PART ====================================== - - // Critical section lock -#ifdef _GLFW_HAS_PTHREAD - pthread_mutex_t CriticalSection; -#endif - -} _glfwThrd; - - -//------------------------------------------------------------------------ -// Joystick information & state -//------------------------------------------------------------------------ -GLFWGLOBAL struct { - int Present; - int fd; - int NumAxes; - int NumButtons; - float *Axis; - unsigned char *Button; -} _glfwJoy[ GLFW_JOYSTICK_LAST + 1 ]; - - -//======================================================================== -// Macros for encapsulating critical code sections (i.e. making parts -// of GLFW thread safe) -//======================================================================== - -// Thread list management -#ifdef _GLFW_HAS_PTHREAD - #define ENTER_THREAD_CRITICAL_SECTION \ - pthread_mutex_lock( &_glfwThrd.CriticalSection ); - #define LEAVE_THREAD_CRITICAL_SECTION \ - pthread_mutex_unlock( &_glfwThrd.CriticalSection ); -#else - #define ENTER_THREAD_CRITICAL_SECTION - #define LEAVE_THREAD_CRITICAL_SECTION -#endif - - -//======================================================================== -// Prototypes for platform specific internal functions -//======================================================================== - -// Time -void _glfwInitTimer( void ); - -// Fullscreen support -int _glfwGetClosestVideoMode( int screen, int *width, int *height, int *rate ); -void _glfwSetVideoModeMODE( int screen, int mode, int rate ); -void _glfwSetVideoMode( int screen, int *width, int *height, int *rate ); -void _glfwRestoreVideoMode( void ); - -// Joystick input -void _glfwInitJoysticks( void ); -void _glfwTerminateJoysticks( void ); - -// Unicode support -long _glfwKeySym2Unicode( KeySym keysym ); - - -#endif // _platform_h_ diff --git a/Core/SVS/glfw/lib/x11/x11_enable.c b/Core/SVS/glfw/lib/x11/x11_enable.c deleted file mode 100644 index 88308d5a4c..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_enable.c +++ /dev/null @@ -1,64 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11 (Unix) -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Enable system keys -//======================================================================== - -void _glfwPlatformEnableSystemKeys( void ) -{ - if( _glfwWin.keyboardGrabbed ) - { - XUngrabKeyboard( _glfwLibrary.display, CurrentTime ); - _glfwWin.keyboardGrabbed = GL_FALSE; - } -} - -//======================================================================== -// Disable system keys -//======================================================================== - -void _glfwPlatformDisableSystemKeys( void ) -{ - if( XGrabKeyboard( _glfwLibrary.display, _glfwWin.window, True, - GrabModeAsync, GrabModeAsync, CurrentTime ) == - GrabSuccess ) - { - _glfwWin.keyboardGrabbed = GL_TRUE; - } -} - diff --git a/Core/SVS/glfw/lib/x11/x11_fullscreen.c b/Core/SVS/glfw/lib/x11/x11_fullscreen.c deleted file mode 100644 index ee2d6df8ec..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_fullscreen.c +++ /dev/null @@ -1,567 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Convert BPP to RGB bits (based on "best guess") -//======================================================================== - -static void BPP2RGB( int bpp, int *r, int *g, int *b ) -{ - int delta; - - // Special case: BPP = 32 (I don't think this is necessary for X11??) - if( bpp == 32 ) - bpp = 24; - - // Convert "bits per pixel" to red, green & blue sizes - *r = *g = *b = bpp / 3; - delta = bpp - (*r * 3); - if( delta >= 1 ) - { - *g = *g + 1; - } - if( delta == 2 ) - { - *r = *r + 1; - } -} - - -//======================================================================== -// Finds the video mode closest in size to the specified desired size -//======================================================================== - -int _glfwGetClosestVideoMode( int screen, int *width, int *height, int *rate ) -{ -#if defined( _GLFW_HAS_XRANDR ) - int i, match, bestmatch; - int sizecount, bestsize; - int ratecount, bestrate; - short *ratelist; - XRRScreenConfiguration *sc; - XRRScreenSize *sizelist; - - if( _glfwLibrary.XRandR.available ) - { - sc = XRRGetScreenInfo( _glfwLibrary.display, - RootWindow( _glfwLibrary.display, screen ) ); - - sizelist = XRRConfigSizes( sc, &sizecount ); - - // Find the best matching mode - bestsize = -1; - bestmatch = INT_MAX; - for( i = 0; i < sizecount; i++ ) - { - match = (*width - sizelist[i].width) * - (*width - sizelist[i].width) + - (*height - sizelist[i].height) * - (*height - sizelist[i].height); - if( match < bestmatch ) - { - bestmatch = match; - bestsize = i; - } - } - - if( bestsize != -1 ) - { - // Report width & height of best matching mode - *width = sizelist[bestsize].width; - *height = sizelist[bestsize].height; - - if( *rate > 0 ) - { - ratelist = XRRConfigRates( sc, bestsize, &ratecount ); - - bestrate = -1; - bestmatch = INT_MAX; - for( i = 0; i < ratecount; i++ ) - { - match = abs( ratelist[i] - *rate ); - if( match < bestmatch ) - { - bestmatch = match; - bestrate = ratelist[i]; - } - } - - if( bestrate != -1 ) - { - *rate = bestrate; - } - } - } - - // Free modelist - XRRFreeScreenConfigInfo( sc ); - - if( bestsize != -1 ) - { - return bestsize; - } - } -#elif defined( _GLFW_HAS_XF86VIDMODE ) - XF86VidModeModeInfo **modelist; - int modecount, i, bestmode, bestmatch, match; - - // Use the XF86VidMode extension to control video resolution - if( _glfwLibrary.XF86VidMode.available ) - { - // Get a list of all available display modes - XF86VidModeGetAllModeLines( _glfwLibrary.display, screen, - &modecount, &modelist ); - - // Find the best matching mode - bestmode = -1; - bestmatch = INT_MAX; - for( i = 0; i < modecount; i++ ) - { - match = (*width - modelist[i]->hdisplay) * - (*width - modelist[i]->hdisplay) + - (*height - modelist[i]->vdisplay) * - (*height - modelist[i]->vdisplay); - if( match < bestmatch ) - { - bestmatch = match; - bestmode = i; - } - } - - if( bestmode != -1 ) - { - // Report width & height of best matching mode - *width = modelist[ bestmode ]->hdisplay; - *height = modelist[ bestmode ]->vdisplay; - } - - // Free modelist - XFree( modelist ); - - if( bestmode != -1 ) - { - return bestmode; - } - } -#endif - - // Default: Simply use the screen resolution - *width = DisplayWidth( _glfwLibrary.display, screen ); - *height = DisplayHeight( _glfwLibrary.display, screen ); - - return 0; -} - - -//======================================================================== -// Change the current video mode -//======================================================================== - -void _glfwSetVideoModeMODE( int screen, int mode, int rate ) -{ -#if defined( _GLFW_HAS_XRANDR ) - XRRScreenConfiguration *sc; - Window root; - - if( _glfwLibrary.XRandR.available ) - { - root = RootWindow( _glfwLibrary.display, screen ); - sc = XRRGetScreenInfo( _glfwLibrary.display, root ); - - // Remember old size and flag that we have changed the mode - if( !_glfwWin.FS.modeChanged ) - { - _glfwWin.FS.oldSizeID = XRRConfigCurrentConfiguration( sc, &_glfwWin.FS.oldRotation ); - _glfwWin.FS.oldWidth = DisplayWidth( _glfwLibrary.display, screen ); - _glfwWin.FS.oldHeight = DisplayHeight( _glfwLibrary.display, screen ); - - _glfwWin.FS.modeChanged = GL_TRUE; - } - - if( rate > 0 ) - { - // Set desired configuration - XRRSetScreenConfigAndRate( _glfwLibrary.display, - sc, - root, - mode, - RR_Rotate_0, - (short) rate, - CurrentTime ); - } - else - { - // Set desired configuration - XRRSetScreenConfig( _glfwLibrary.display, - sc, - root, - mode, - RR_Rotate_0, - CurrentTime ); - } - - XRRFreeScreenConfigInfo( sc ); - } -#elif defined( _GLFW_HAS_XF86VIDMODE ) - XF86VidModeModeInfo **modelist; - int modecount; - - // Use the XF86VidMode extension to control video resolution - if( _glfwLibrary.XF86VidMode.available ) - { - // Get a list of all available display modes - XF86VidModeGetAllModeLines( _glfwLibrary.display, screen, - &modecount, &modelist ); - - // Unlock mode switch if necessary - if( _glfwWin.FS.modeChanged ) - { - XF86VidModeLockModeSwitch( _glfwLibrary.display, screen, 0 ); - } - - // Change the video mode to the desired mode - XF86VidModeSwitchToMode( _glfwLibrary.display, screen, - modelist[ mode ] ); - - // Set viewport to upper left corner (where our window will be) - XF86VidModeSetViewPort( _glfwLibrary.display, screen, 0, 0 ); - - // Lock mode switch - XF86VidModeLockModeSwitch( _glfwLibrary.display, screen, 1 ); - - // Remember old mode and flag that we have changed the mode - if( !_glfwWin.FS.modeChanged ) - { - _glfwWin.FS.oldMode = *modelist[ 0 ]; - _glfwWin.FS.modeChanged = GL_TRUE; - } - - // Free mode list - XFree( modelist ); - } -#endif -} - - -//======================================================================== -// Change the current video mode -//======================================================================== - -void _glfwSetVideoMode( int screen, int *width, int *height, int *rate ) -{ - int bestmode; - - // Find a best match mode - bestmode = _glfwGetClosestVideoMode( screen, width, height, rate ); - - // Change mode - _glfwSetVideoModeMODE( screen, bestmode, *rate ); -} - - -//======================================================================== -// Restore the previously saved (original) video mode -//======================================================================== - -void _glfwRestoreVideoMode( void ) -{ - if( _glfwWin.FS.modeChanged ) - { -#if defined( _GLFW_HAS_XRANDR ) - if( _glfwLibrary.XRandR.available ) - { - XRRScreenConfiguration *sc; - - sc = XRRGetScreenInfo( _glfwLibrary.display, _glfwWin.root ); - - XRRSetScreenConfig( _glfwLibrary.display, - sc, - _glfwWin.root, - _glfwWin.FS.oldSizeID, - _glfwWin.FS.oldRotation, - CurrentTime ); - - XRRFreeScreenConfigInfo( sc ); - } -#elif defined( _GLFW_HAS_XF86VIDMODE ) - if( _glfwLibrary.XF86VidMode.available ) - { - // Unlock mode switch - XF86VidModeLockModeSwitch( _glfwLibrary.display, _glfwWin.screen, 0 ); - - // Change the video mode back to the old mode - XF86VidModeSwitchToMode( _glfwLibrary.display, - _glfwWin.screen, - &_glfwWin.FS.oldMode ); - } -#endif - _glfwWin.FS.modeChanged = GL_FALSE; - } -} - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -struct _glfwResolution -{ - int width; - int height; -}; - -//======================================================================== -// List available video modes -//======================================================================== - -int _glfwPlatformGetVideoModes( GLFWvidmode *list, int maxcount ) -{ - int count, k, l, r, g, b, rgba, gl; - int depth, screen; - Display *dpy; - XVisualInfo *vislist, dummy; - int viscount, rgbcount, rescount; - int *rgbarray; - struct _glfwResolution *resarray; - - // Get display and screen - dpy = _glfwLibrary.display; - screen = DefaultScreen( dpy ); - - // Get list of visuals - vislist = XGetVisualInfo( dpy, 0, &dummy, &viscount ); - if( vislist == NULL ) - { - return 0; - } - - rgbarray = (int*) malloc( sizeof(int) * viscount ); - rgbcount = 0; - - // Build RGB array - for( k = 0; k < viscount; k++ ) - { - // Does the visual support OpenGL & true color? - glXGetConfig( dpy, &vislist[k], GLX_USE_GL, &gl ); - glXGetConfig( dpy, &vislist[k], GLX_RGBA, &rgba ); - if( gl && rgba ) - { - // Get color depth for this visual - depth = vislist[k].depth; - - // Convert to RGB - BPP2RGB( depth, &r, &g, &b ); - depth = (r<<16) | (g<<8) | b; - - // Is this mode unique? - for( l = 0; l < rgbcount; l++ ) - { - if( depth == rgbarray[ l ] ) - { - break; - } - } - if( l >= rgbcount ) - { - rgbarray[ rgbcount ] = depth; - rgbcount++; - } - } - } - - rescount = 0; - resarray = NULL; - - // Build resolution array -#if defined( _GLFW_HAS_XRANDR ) - if( _glfwLibrary.XRandR.available ) - { - XRRScreenConfiguration *sc; - XRRScreenSize *sizelist; - int sizecount; - - sc = XRRGetScreenInfo( dpy, RootWindow( dpy, screen ) ); - sizelist = XRRConfigSizes( sc, &sizecount ); - - resarray = (struct _glfwResolution*) malloc( sizeof(struct _glfwResolution) * sizecount ); - - for( k = 0; k < sizecount; k++ ) - { - resarray[ rescount ].width = sizelist[ k ].width; - resarray[ rescount ].height = sizelist[ k ].height; - rescount++; - } - - XRRFreeScreenConfigInfo( sc ); - } -#elif defined( _GLFW_HAS_XF86VIDMODE ) - if( _glfwLibrary.XF86VidMode.available ) - { - XF86VidModeModeInfo **modelist; - int modecount, width, height; - - XF86VidModeGetAllModeLines( dpy, screen, &modecount, &modelist ); - - resarray = (struct _glfwResolution*) malloc( sizeof(struct _glfwResolution) * modecount ); - - for( k = 0; k < modecount; k++ ) - { - width = modelist[ k ]->hdisplay; - height = modelist[ k ]->vdisplay; - - // Is this mode unique? - for( l = 0; l < rescount; l++ ) - { - if( width == resarray[ l ].width && height == resarray[ l ].height ) - { - break; - } - } - - if( l >= rescount ) - { - resarray[ rescount ].width = width; - resarray[ rescount ].height = height; - rescount++; - } - } - - XFree( modelist ); - } -#endif - - if( !resarray ) - { - rescount = 1; - resarray = (struct _glfwResolution*) malloc( sizeof(struct _glfwResolution) * rescount ); - - resarray[ 0 ].width = DisplayWidth( dpy, screen ); - resarray[ 0 ].height = DisplayHeight( dpy, screen ); - } - - // Build permutations of colors and resolutions - count = 0; - for( k = 0; k < rgbcount && count < maxcount; k++ ) - { - for( l = 0; l < rescount && count < maxcount; l++ ) - { - list[count].Width = resarray[ l ].width; - list[count].Height = resarray[ l ].height; - list[count].RedBits = (rgbarray[ k ] >> 16) & 255; - list[count].GreenBits = (rgbarray[ k ] >> 8) & 255; - list[count].BlueBits = rgbarray[ k ] & 255; - count++; - } - } - - // Free visuals list - XFree( vislist ); - - free( resarray ); - free( rgbarray ); - - return count; -} - - -//======================================================================== -// Get the desktop video mode -//======================================================================== - -void _glfwPlatformGetDesktopMode( GLFWvidmode *mode ) -{ - Display *dpy; - int bpp, screen; - - // Get display and screen - dpy = _glfwLibrary.display; - screen = DefaultScreen( dpy ); - - // Get display depth - bpp = DefaultDepth( dpy, screen ); - - // Convert BPP to RGB bits - BPP2RGB( bpp, &mode->RedBits, &mode->GreenBits, &mode->BlueBits ); - -#if defined( _GLFW_HAS_XRANDR ) - if( _glfwLibrary.XRandR.available ) - { - if( _glfwWin.FS.modeChanged ) - { - mode->Width = _glfwWin.FS.oldWidth; - mode->Height = _glfwWin.FS.oldHeight; - return; - } - } -#elif defined( _GLFW_HAS_XF86VIDMODE ) - if( _glfwLibrary.XF86VidMode.available ) - { - XF86VidModeModeInfo **modelist; - int modecount; - - if( _glfwWin.FS.modeChanged ) - { - // The old (desktop) mode is stored in _glfwWin.FS.oldMode - mode->Width = _glfwWin.FS.oldMode.hdisplay; - mode->Height = _glfwWin.FS.oldMode.vdisplay; - } - else - { - // Use the XF86VidMode extension to get list of video modes - XF86VidModeGetAllModeLines( dpy, screen, &modecount, - &modelist ); - - // The first mode in the list is the current (desktio) mode - mode->Width = modelist[ 0 ]->hdisplay; - mode->Height = modelist[ 0 ]->vdisplay; - - // Free list - XFree( modelist ); - } - - return; - } -#endif - - // Get current display width and height - mode->Width = DisplayWidth( dpy, screen ); - mode->Height = DisplayHeight( dpy, screen ); -} - diff --git a/Core/SVS/glfw/lib/x11/x11_glext.c b/Core/SVS/glfw/lib/x11/x11_glext.c deleted file mode 100644 index 523dede828..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_glext.c +++ /dev/null @@ -1,89 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -void (*glXGetProcAddress(const GLubyte *procName))(); -void (*glXGetProcAddressARB(const GLubyte *procName))(); -void (*glXGetProcAddressEXT(const GLubyte *procName))(); - -// We support four different ways for getting addresses for GL/GLX -// extension functions: glXGetProcAddress, glXGetProcAddressARB, -// glXGetProcAddressEXT, and dlsym -#if defined( _GLFW_HAS_GLXGETPROCADDRESSARB ) - #define _glfw_glXGetProcAddress(x) glXGetProcAddressARB(x) -#elif defined( _GLFW_HAS_GLXGETPROCADDRESS ) - #define _glfw_glXGetProcAddress(x) glXGetProcAddress(x) -#elif defined( _GLFW_HAS_GLXGETPROCADDRESSEXT ) - #define _glfw_glXGetProcAddress(x) glXGetProcAddressEXT(x) -#elif defined( _GLFW_HAS_DLOPEN ) - #define _glfw_glXGetProcAddress(x) dlsym(_glfwLibrary.Libs.libGL,x) -#else -#define _glfw_glXGetProcAddress(x) NULL -#endif - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Check if an OpenGL extension is available at runtime -//======================================================================== - -int _glfwPlatformExtensionSupported( const char *extension ) -{ - const GLubyte *extensions; - - // Get list of GLX extensions - extensions = (const GLubyte*) glXQueryExtensionsString( _glfwLibrary.display, - _glfwWin.screen ); - if( extensions != NULL ) - { - if( _glfwStringInExtensionString( extension, extensions ) ) - { - return GL_TRUE; - } - } - - return GL_FALSE; -} - - -//======================================================================== -// Get the function pointer to an OpenGL function -//======================================================================== - -void * _glfwPlatformGetProcAddress( const char *procname ) -{ - return (void *) _glfw_glXGetProcAddress( (const GLubyte *) procname ); -} - diff --git a/Core/SVS/glfw/lib/x11/x11_init.c b/Core/SVS/glfw/lib/x11/x11_init.c deleted file mode 100644 index 5ce78f3660..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_init.c +++ /dev/null @@ -1,290 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Initialize GLFW thread package -//======================================================================== - -static void initThreads( void ) -{ - // Initialize critical section handle -#ifdef _GLFW_HAS_PTHREAD - (void) pthread_mutex_init( &_glfwThrd.CriticalSection, NULL ); -#endif - - // The first thread (the main thread) has ID 0 - _glfwThrd.NextID = 0; - - // Fill out information about the main thread (this thread) - _glfwThrd.First.ID = _glfwThrd.NextID++; - _glfwThrd.First.Function = NULL; - _glfwThrd.First.Previous = NULL; - _glfwThrd.First.Next = NULL; -#ifdef _GLFW_HAS_PTHREAD - _glfwThrd.First.PosixID = pthread_self(); -#endif -} - - -//======================================================================== -// Terminate GLFW thread package -//======================================================================== - -static void terminateThreads( void ) -{ -#ifdef _GLFW_HAS_PTHREAD - - _GLFWthread *t, *t_next; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Kill all threads (NOTE: THE USER SHOULD WAIT FOR ALL THREADS TO - // DIE, _BEFORE_ CALLING glfwTerminate()!!!) - t = _glfwThrd.First.Next; - while( t != NULL ) - { - // Get pointer to next thread - t_next = t->Next; - - // Simply murder the process, no mercy! - pthread_kill( t->PosixID, SIGKILL ); - - // Free memory allocated for this thread - free( (void *) t ); - - // Select next thread in list - t = t_next; - } - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Delete critical section handle - pthread_mutex_destroy( &_glfwThrd.CriticalSection ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Dynamically load libraries -//======================================================================== - -static void initLibraries( void ) -{ -#ifdef _GLFW_DLOPEN_LIBGL - int i; - char *libGL_names[ ] = - { - "libGL.so", - "libGL.so.1", - "/usr/lib/libGL.so", - "/usr/lib/libGL.so.1", - NULL - }; - - _glfwLibrary.Libs.libGL = NULL; - for( i = 0; !libGL_names[ i ] != NULL; i ++ ) - { - _glfwLibrary.Libs.libGL = dlopen( libGL_names[ i ], - RTLD_LAZY | RTLD_GLOBAL ); - if( _glfwLibrary.Libs.libGL ) - break; - } -#endif -} - - -//======================================================================== -// Terminate GLFW when exiting application -//======================================================================== - -static void glfw_atexit( void ) -{ - glfwTerminate(); -} - - -//======================================================================== -// Initialize X11 display -//======================================================================== - -static int initDisplay( void ) -{ - // Open display - _glfwLibrary.display = XOpenDisplay( 0 ); - if( !_glfwLibrary.display ) - { - fprintf(stderr, "Failed to open X display\n"); - return GL_FALSE; - } - - // Check for XF86VidMode extension -#ifdef _GLFW_HAS_XF86VIDMODE - _glfwLibrary.XF86VidMode.available = - XF86VidModeQueryExtension( _glfwLibrary.display, - &_glfwLibrary.XF86VidMode.eventBase, - &_glfwLibrary.XF86VidMode.errorBase); -#else - _glfwLibrary.XF86VidMode.available = 0; -#endif - - // Check for XRandR extension -#ifdef _GLFW_HAS_XRANDR - _glfwLibrary.XRandR.available = - XRRQueryExtension( _glfwLibrary.display, - &_glfwLibrary.XRandR.eventBase, - &_glfwLibrary.XRandR.errorBase ); -#else - _glfwLibrary.XRandR.available = 0; -#endif - - // Fullscreen & screen saver settings - // Check if GLX is supported on this display - if( !glXQueryExtension( _glfwLibrary.display, - &_glfwLibrary.GLX.errorBase, - &_glfwLibrary.GLX.eventBase)) - { - fprintf(stderr, "GLX not supported\n"); - return GL_FALSE; - } - - // Retrieve GLX version - if( !glXQueryVersion( _glfwLibrary.display, - &_glfwLibrary.GLX.versionMajor, - &_glfwLibrary.GLX.versionMinor ) ) - { - fprintf(stderr, "Unable to query GLX version\n"); - return GL_FALSE; - } - - return GL_TRUE; -} - - -//======================================================================== -// Terminate X11 display -//======================================================================== - -static void terminateDisplay( void ) -{ - // Open display - if( _glfwLibrary.display ) - { - XCloseDisplay( _glfwLibrary.display ); - _glfwLibrary.display = NULL; - } -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Initialize various GLFW state -//======================================================================== - -int _glfwPlatformInit( void ) -{ - // Initialize display - if( !initDisplay() ) - { - return GL_FALSE; - } - - // Initialize thread package - initThreads(); - - // Try to load libGL.so if necessary - initLibraries(); - - _glfwPlatformGetDesktopMode( &_glfwLibrary.desktopMode ); - - // Install atexit() routine - atexit( glfw_atexit ); - - // Initialize joysticks - _glfwInitJoysticks(); - - // Start the timer - _glfwInitTimer(); - - return GL_TRUE; -} - - -//======================================================================== -// Close window and kill all threads -//======================================================================== - -int _glfwPlatformTerminate( void ) -{ -#ifdef _GLFW_HAS_PTHREAD - // Only the main thread is allowed to do this... - if( pthread_self() != _glfwThrd.First.PosixID ) - { - return GL_FALSE; - } -#endif // _GLFW_HAS_PTHREAD - - // Close OpenGL window - glfwCloseWindow(); - - // Kill thread package - terminateThreads(); - - // Terminate display - terminateDisplay(); - - // Terminate joysticks - _glfwTerminateJoysticks(); - - // Unload libGL.so if necessary -#ifdef _GLFW_DLOPEN_LIBGL - if( _glfwLibrary.Libs.libGL != NULL ) - { - dlclose( _glfwLibrary.Libs.libGL ); - _glfwLibrary.Libs.libGL = NULL; - } -#endif - - return GL_TRUE; -} - diff --git a/Core/SVS/glfw/lib/x11/x11_joystick.c b/Core/SVS/glfw/lib/x11/x11_joystick.c deleted file mode 100644 index 7ed22d0a77..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_joystick.c +++ /dev/null @@ -1,367 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -//======================================================================== -// Note: Only Linux joystick input is supported at the moment. Other -// systems will behave as if there are no joysticks connected. -//======================================================================== - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -#ifdef _GLFW_USE_LINUX_JOYSTICKS - -//------------------------------------------------------------------------ -// Here are the Linux joystick driver v1.x interface definitions that we -// use (we do not want to rely on ): -//------------------------------------------------------------------------ - -#include -#include -#include - -// Joystick event types -#define JS_EVENT_BUTTON 0x01 /* button pressed/released */ -#define JS_EVENT_AXIS 0x02 /* joystick moved */ -#define JS_EVENT_INIT 0x80 /* initial state of device */ - -// Joystick event structure -struct js_event { - unsigned int time; /* (u32) event timestamp in milliseconds */ - signed short value; /* (s16) value */ - unsigned char type; /* (u8) event type */ - unsigned char number; /* (u8) axis/button number */ -}; - -// Joystick IOCTL commands -#define JSIOCGVERSION _IOR('j', 0x01, int) /* get driver version (u32) */ -#define JSIOCGAXES _IOR('j', 0x11, char) /* get number of axes (u8) */ -#define JSIOCGBUTTONS _IOR('j', 0x12, char) /* get number of buttons (u8) */ - -#endif // _GLFW_USE_LINUX_JOYSTICKS - - -//======================================================================== -// Initialize joystick interface -//======================================================================== - -void _glfwInitJoysticks( void ) -{ -#ifdef _GLFW_USE_LINUX_JOYSTICKS - int k, n, fd, joy_count; - char *joy_base_name, joy_dev_name[ 20 ]; - int driver_version = 0x000800; - char ret_data; -#endif // _GLFW_USE_LINUX_JOYSTICKS - int i; - - // Start by saying that there are no sticks - for( i = 0; i <= GLFW_JOYSTICK_LAST; ++ i ) - { - _glfwJoy[ i ].Present = GL_FALSE; - } - -#ifdef _GLFW_USE_LINUX_JOYSTICKS - - // Try to open joysticks (nonblocking) - joy_count = 0; - for( k = 0; k <= 1 && joy_count <= GLFW_JOYSTICK_LAST; ++ k ) - { - // Pick joystick base name - switch( k ) - { - case 0: - joy_base_name = "/dev/input/js"; // USB sticks - break; - case 1: - joy_base_name = "/dev/js"; // "Legacy" sticks - break; - default: - continue; // (should never happen) - } - - // Try to open a few of these sticks - for( i = 0; i <= 50 && joy_count <= GLFW_JOYSTICK_LAST; ++ i ) - { - sprintf( joy_dev_name, "%s%d", joy_base_name, i ); - fd = open( joy_dev_name, O_NONBLOCK ); - if( fd != -1 ) - { - // Remember fd - _glfwJoy[ joy_count ].fd = fd; - - // Check that the joystick driver version is 1.0+ - ioctl( fd, JSIOCGVERSION, &driver_version ); - if( driver_version < 0x010000 ) - { - // It's an old 0.x interface (we don't support it) - close( fd ); - continue; - } - - // Get number of joystick axes - ioctl( fd, JSIOCGAXES, &ret_data ); - _glfwJoy[ joy_count ].NumAxes = (int) ret_data; - - // Get number of joystick buttons - ioctl( fd, JSIOCGBUTTONS, &ret_data ); - _glfwJoy[ joy_count ].NumButtons = (int) ret_data; - - // Allocate memory for joystick state - _glfwJoy[ joy_count ].Axis = - (float *) malloc( sizeof(float) * - _glfwJoy[ joy_count ].NumAxes ); - if( _glfwJoy[ joy_count ].Axis == NULL ) - { - close( fd ); - continue; - } - _glfwJoy[ joy_count ].Button = - (unsigned char *) malloc( sizeof(char) * - _glfwJoy[ joy_count ].NumButtons ); - if( _glfwJoy[ joy_count ].Button == NULL ) - { - free( _glfwJoy[ joy_count ].Axis ); - close( fd ); - continue; - } - - // Clear joystick state - for( n = 0; n < _glfwJoy[ joy_count ].NumAxes; ++ n ) - { - _glfwJoy[ joy_count ].Axis[ n ] = 0.0f; - } - for( n = 0; n < _glfwJoy[ joy_count ].NumButtons; ++ n ) - { - _glfwJoy[ joy_count ].Button[ n ] = GLFW_RELEASE; - } - - // The joystick is supported and connected - _glfwJoy[ joy_count ].Present = GL_TRUE; - joy_count ++; - } - } - } - -#endif // _GLFW_USE_LINUX_JOYSTICKS - -} - - -//======================================================================== -// Close all opened joystick handles -//======================================================================== - -void _glfwTerminateJoysticks( void ) -{ - -#ifdef _GLFW_USE_LINUX_JOYSTICKS - - int i; - - // Close any opened joysticks - for( i = 0; i <= GLFW_JOYSTICK_LAST; ++ i ) - { - if( _glfwJoy[ i ].Present ) - { - close( _glfwJoy[ i ].fd ); - free( _glfwJoy[ i ].Axis ); - free( _glfwJoy[ i ].Button ); - _glfwJoy[ i ].Present = GL_FALSE; - } - } - -#endif // _GLFW_USE_LINUX_JOYSTICKS - -} - - -//======================================================================== -// Empty joystick event queue -//======================================================================== - -static void pollJoystickEvents( void ) -{ - -#ifdef _GLFW_USE_LINUX_JOYSTICKS - - struct js_event e; - int i; - - // Get joystick events for all GLFW joysticks - for( i = 0; i <= GLFW_JOYSTICK_LAST; ++ i ) - { - // Is the stick present? - if( _glfwJoy[ i ].Present ) - { - // Read all queued events (non-blocking) - while( read(_glfwJoy[i].fd, &e, sizeof(struct js_event)) > 0 ) - { - // We don't care if it's an init event or not - e.type &= ~JS_EVENT_INIT; - - // Check event type - switch( e.type ) - { - case JS_EVENT_AXIS: - _glfwJoy[ i ].Axis[ e.number ] = (float) e.value / - 32767.0f; - // We need to change the sign for the Y axes, so that - // positive = up/forward, according to the GLFW spec. - if( e.number & 1 ) - { - _glfwJoy[ i ].Axis[ e.number ] = - -_glfwJoy[ i ].Axis[ e.number ]; - } - break; - - case JS_EVENT_BUTTON: - _glfwJoy[ i ].Button[ e.number ] = - e.value ? GLFW_PRESS : GLFW_RELEASE; - break; - - default: - break; - } - } - } - } - -#endif // _GLFW_USE_LINUX_JOYSTICKS - -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Determine joystick capabilities -//======================================================================== - -int _glfwPlatformGetJoystickParam( int joy, int param ) -{ - // Is joystick present? - if( !_glfwJoy[ joy ].Present ) - { - return 0; - } - - switch( param ) - { - case GLFW_PRESENT: - return GL_TRUE; - - case GLFW_AXES: - return _glfwJoy[ joy ].NumAxes; - - case GLFW_BUTTONS: - return _glfwJoy[ joy ].NumButtons; - - default: - break; - } - - return 0; -} - - -//======================================================================== -// Get joystick axis positions -//======================================================================== - -int _glfwPlatformGetJoystickPos( int joy, float *pos, int numaxes ) -{ - int i; - - // Is joystick present? - if( !_glfwJoy[ joy ].Present ) - { - return 0; - } - - // Update joystick state - pollJoystickEvents(); - - // Does the joystick support less axes than requested? - if( _glfwJoy[ joy ].NumAxes < numaxes ) - { - numaxes = _glfwJoy[ joy ].NumAxes; - } - - // Copy axis positions from internal state - for( i = 0; i < numaxes; ++ i ) - { - pos[ i ] = _glfwJoy[ joy ].Axis[ i ]; - } - - return numaxes; -} - - -//======================================================================== -// Get joystick button states -//======================================================================== - -int _glfwPlatformGetJoystickButtons( int joy, unsigned char *buttons, - int numbuttons ) -{ - int i; - - // Is joystick present? - if( !_glfwJoy[ joy ].Present ) - { - return 0; - } - - // Update joystick state - pollJoystickEvents(); - - // Does the joystick support less buttons than requested? - if( _glfwJoy[ joy ].NumButtons < numbuttons ) - { - numbuttons = _glfwJoy[ joy ].NumButtons; - } - - // Copy button states from internal state - for( i = 0; i < numbuttons; ++ i ) - { - buttons[ i ] = _glfwJoy[ joy ].Button[ i ]; - } - - return numbuttons; -} - diff --git a/Core/SVS/glfw/lib/x11/x11_keysym2unicode.c b/Core/SVS/glfw/lib/x11/x11_keysym2unicode.c deleted file mode 100644 index 17bfb99766..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_keysym2unicode.c +++ /dev/null @@ -1,901 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - -/* - * Marcus: This code was originally written by Markus G. Kuhn. - * I have made some slight changes (trimmed it down a bit from >60 KB to - * 20 KB), but the functionality is the same. - */ - -/* - * This module converts keysym values into the corresponding ISO 10646 - * (UCS, Unicode) values. - * - * The array keysymtab[] contains pairs of X11 keysym values for graphical - * characters and the corresponding Unicode value. The function - * _glfwKeySym2Unicode() maps a keysym onto a Unicode value using a binary - * search, therefore keysymtab[] must remain SORTED by keysym value. - * - * We allow to represent any UCS character in the range U-00000000 to - * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff. - * This admittedly does not cover the entire 31-bit space of UCS, but - * it does cover all of the characters up to U-10FFFF, which can be - * represented by UTF-16, and more, and it is very unlikely that higher - * UCS codes will ever be assigned by ISO. So to get Unicode character - * U+ABCD you can directly use keysym 0x0100abcd. - * - * Original author: Markus G. Kuhn , University of - * Cambridge, April 2001 - * - * Special thanks to Richard Verhoeven for preparing - * an initial draft of the mapping table. - * - */ - - -//************************************************************************ -//**** KeySym to Unicode mapping table **** -//************************************************************************ - -static struct codepair { - unsigned short keysym; - unsigned short ucs; -} keysymtab[] = { - { 0x01a1, 0x0104 }, - { 0x01a2, 0x02d8 }, - { 0x01a3, 0x0141 }, - { 0x01a5, 0x013d }, - { 0x01a6, 0x015a }, - { 0x01a9, 0x0160 }, - { 0x01aa, 0x015e }, - { 0x01ab, 0x0164 }, - { 0x01ac, 0x0179 }, - { 0x01ae, 0x017d }, - { 0x01af, 0x017b }, - { 0x01b1, 0x0105 }, - { 0x01b2, 0x02db }, - { 0x01b3, 0x0142 }, - { 0x01b5, 0x013e }, - { 0x01b6, 0x015b }, - { 0x01b7, 0x02c7 }, - { 0x01b9, 0x0161 }, - { 0x01ba, 0x015f }, - { 0x01bb, 0x0165 }, - { 0x01bc, 0x017a }, - { 0x01bd, 0x02dd }, - { 0x01be, 0x017e }, - { 0x01bf, 0x017c }, - { 0x01c0, 0x0154 }, - { 0x01c3, 0x0102 }, - { 0x01c5, 0x0139 }, - { 0x01c6, 0x0106 }, - { 0x01c8, 0x010c }, - { 0x01ca, 0x0118 }, - { 0x01cc, 0x011a }, - { 0x01cf, 0x010e }, - { 0x01d0, 0x0110 }, - { 0x01d1, 0x0143 }, - { 0x01d2, 0x0147 }, - { 0x01d5, 0x0150 }, - { 0x01d8, 0x0158 }, - { 0x01d9, 0x016e }, - { 0x01db, 0x0170 }, - { 0x01de, 0x0162 }, - { 0x01e0, 0x0155 }, - { 0x01e3, 0x0103 }, - { 0x01e5, 0x013a }, - { 0x01e6, 0x0107 }, - { 0x01e8, 0x010d }, - { 0x01ea, 0x0119 }, - { 0x01ec, 0x011b }, - { 0x01ef, 0x010f }, - { 0x01f0, 0x0111 }, - { 0x01f1, 0x0144 }, - { 0x01f2, 0x0148 }, - { 0x01f5, 0x0151 }, - { 0x01f8, 0x0159 }, - { 0x01f9, 0x016f }, - { 0x01fb, 0x0171 }, - { 0x01fe, 0x0163 }, - { 0x01ff, 0x02d9 }, - { 0x02a1, 0x0126 }, - { 0x02a6, 0x0124 }, - { 0x02a9, 0x0130 }, - { 0x02ab, 0x011e }, - { 0x02ac, 0x0134 }, - { 0x02b1, 0x0127 }, - { 0x02b6, 0x0125 }, - { 0x02b9, 0x0131 }, - { 0x02bb, 0x011f }, - { 0x02bc, 0x0135 }, - { 0x02c5, 0x010a }, - { 0x02c6, 0x0108 }, - { 0x02d5, 0x0120 }, - { 0x02d8, 0x011c }, - { 0x02dd, 0x016c }, - { 0x02de, 0x015c }, - { 0x02e5, 0x010b }, - { 0x02e6, 0x0109 }, - { 0x02f5, 0x0121 }, - { 0x02f8, 0x011d }, - { 0x02fd, 0x016d }, - { 0x02fe, 0x015d }, - { 0x03a2, 0x0138 }, - { 0x03a3, 0x0156 }, - { 0x03a5, 0x0128 }, - { 0x03a6, 0x013b }, - { 0x03aa, 0x0112 }, - { 0x03ab, 0x0122 }, - { 0x03ac, 0x0166 }, - { 0x03b3, 0x0157 }, - { 0x03b5, 0x0129 }, - { 0x03b6, 0x013c }, - { 0x03ba, 0x0113 }, - { 0x03bb, 0x0123 }, - { 0x03bc, 0x0167 }, - { 0x03bd, 0x014a }, - { 0x03bf, 0x014b }, - { 0x03c0, 0x0100 }, - { 0x03c7, 0x012e }, - { 0x03cc, 0x0116 }, - { 0x03cf, 0x012a }, - { 0x03d1, 0x0145 }, - { 0x03d2, 0x014c }, - { 0x03d3, 0x0136 }, - { 0x03d9, 0x0172 }, - { 0x03dd, 0x0168 }, - { 0x03de, 0x016a }, - { 0x03e0, 0x0101 }, - { 0x03e7, 0x012f }, - { 0x03ec, 0x0117 }, - { 0x03ef, 0x012b }, - { 0x03f1, 0x0146 }, - { 0x03f2, 0x014d }, - { 0x03f3, 0x0137 }, - { 0x03f9, 0x0173 }, - { 0x03fd, 0x0169 }, - { 0x03fe, 0x016b }, - { 0x047e, 0x203e }, - { 0x04a1, 0x3002 }, - { 0x04a2, 0x300c }, - { 0x04a3, 0x300d }, - { 0x04a4, 0x3001 }, - { 0x04a5, 0x30fb }, - { 0x04a6, 0x30f2 }, - { 0x04a7, 0x30a1 }, - { 0x04a8, 0x30a3 }, - { 0x04a9, 0x30a5 }, - { 0x04aa, 0x30a7 }, - { 0x04ab, 0x30a9 }, - { 0x04ac, 0x30e3 }, - { 0x04ad, 0x30e5 }, - { 0x04ae, 0x30e7 }, - { 0x04af, 0x30c3 }, - { 0x04b0, 0x30fc }, - { 0x04b1, 0x30a2 }, - { 0x04b2, 0x30a4 }, - { 0x04b3, 0x30a6 }, - { 0x04b4, 0x30a8 }, - { 0x04b5, 0x30aa }, - { 0x04b6, 0x30ab }, - { 0x04b7, 0x30ad }, - { 0x04b8, 0x30af }, - { 0x04b9, 0x30b1 }, - { 0x04ba, 0x30b3 }, - { 0x04bb, 0x30b5 }, - { 0x04bc, 0x30b7 }, - { 0x04bd, 0x30b9 }, - { 0x04be, 0x30bb }, - { 0x04bf, 0x30bd }, - { 0x04c0, 0x30bf }, - { 0x04c1, 0x30c1 }, - { 0x04c2, 0x30c4 }, - { 0x04c3, 0x30c6 }, - { 0x04c4, 0x30c8 }, - { 0x04c5, 0x30ca }, - { 0x04c6, 0x30cb }, - { 0x04c7, 0x30cc }, - { 0x04c8, 0x30cd }, - { 0x04c9, 0x30ce }, - { 0x04ca, 0x30cf }, - { 0x04cb, 0x30d2 }, - { 0x04cc, 0x30d5 }, - { 0x04cd, 0x30d8 }, - { 0x04ce, 0x30db }, - { 0x04cf, 0x30de }, - { 0x04d0, 0x30df }, - { 0x04d1, 0x30e0 }, - { 0x04d2, 0x30e1 }, - { 0x04d3, 0x30e2 }, - { 0x04d4, 0x30e4 }, - { 0x04d5, 0x30e6 }, - { 0x04d6, 0x30e8 }, - { 0x04d7, 0x30e9 }, - { 0x04d8, 0x30ea }, - { 0x04d9, 0x30eb }, - { 0x04da, 0x30ec }, - { 0x04db, 0x30ed }, - { 0x04dc, 0x30ef }, - { 0x04dd, 0x30f3 }, - { 0x04de, 0x309b }, - { 0x04df, 0x309c }, - { 0x05ac, 0x060c }, - { 0x05bb, 0x061b }, - { 0x05bf, 0x061f }, - { 0x05c1, 0x0621 }, - { 0x05c2, 0x0622 }, - { 0x05c3, 0x0623 }, - { 0x05c4, 0x0624 }, - { 0x05c5, 0x0625 }, - { 0x05c6, 0x0626 }, - { 0x05c7, 0x0627 }, - { 0x05c8, 0x0628 }, - { 0x05c9, 0x0629 }, - { 0x05ca, 0x062a }, - { 0x05cb, 0x062b }, - { 0x05cc, 0x062c }, - { 0x05cd, 0x062d }, - { 0x05ce, 0x062e }, - { 0x05cf, 0x062f }, - { 0x05d0, 0x0630 }, - { 0x05d1, 0x0631 }, - { 0x05d2, 0x0632 }, - { 0x05d3, 0x0633 }, - { 0x05d4, 0x0634 }, - { 0x05d5, 0x0635 }, - { 0x05d6, 0x0636 }, - { 0x05d7, 0x0637 }, - { 0x05d8, 0x0638 }, - { 0x05d9, 0x0639 }, - { 0x05da, 0x063a }, - { 0x05e0, 0x0640 }, - { 0x05e1, 0x0641 }, - { 0x05e2, 0x0642 }, - { 0x05e3, 0x0643 }, - { 0x05e4, 0x0644 }, - { 0x05e5, 0x0645 }, - { 0x05e6, 0x0646 }, - { 0x05e7, 0x0647 }, - { 0x05e8, 0x0648 }, - { 0x05e9, 0x0649 }, - { 0x05ea, 0x064a }, - { 0x05eb, 0x064b }, - { 0x05ec, 0x064c }, - { 0x05ed, 0x064d }, - { 0x05ee, 0x064e }, - { 0x05ef, 0x064f }, - { 0x05f0, 0x0650 }, - { 0x05f1, 0x0651 }, - { 0x05f2, 0x0652 }, - { 0x06a1, 0x0452 }, - { 0x06a2, 0x0453 }, - { 0x06a3, 0x0451 }, - { 0x06a4, 0x0454 }, - { 0x06a5, 0x0455 }, - { 0x06a6, 0x0456 }, - { 0x06a7, 0x0457 }, - { 0x06a8, 0x0458 }, - { 0x06a9, 0x0459 }, - { 0x06aa, 0x045a }, - { 0x06ab, 0x045b }, - { 0x06ac, 0x045c }, - { 0x06ae, 0x045e }, - { 0x06af, 0x045f }, - { 0x06b0, 0x2116 }, - { 0x06b1, 0x0402 }, - { 0x06b2, 0x0403 }, - { 0x06b3, 0x0401 }, - { 0x06b4, 0x0404 }, - { 0x06b5, 0x0405 }, - { 0x06b6, 0x0406 }, - { 0x06b7, 0x0407 }, - { 0x06b8, 0x0408 }, - { 0x06b9, 0x0409 }, - { 0x06ba, 0x040a }, - { 0x06bb, 0x040b }, - { 0x06bc, 0x040c }, - { 0x06be, 0x040e }, - { 0x06bf, 0x040f }, - { 0x06c0, 0x044e }, - { 0x06c1, 0x0430 }, - { 0x06c2, 0x0431 }, - { 0x06c3, 0x0446 }, - { 0x06c4, 0x0434 }, - { 0x06c5, 0x0435 }, - { 0x06c6, 0x0444 }, - { 0x06c7, 0x0433 }, - { 0x06c8, 0x0445 }, - { 0x06c9, 0x0438 }, - { 0x06ca, 0x0439 }, - { 0x06cb, 0x043a }, - { 0x06cc, 0x043b }, - { 0x06cd, 0x043c }, - { 0x06ce, 0x043d }, - { 0x06cf, 0x043e }, - { 0x06d0, 0x043f }, - { 0x06d1, 0x044f }, - { 0x06d2, 0x0440 }, - { 0x06d3, 0x0441 }, - { 0x06d4, 0x0442 }, - { 0x06d5, 0x0443 }, - { 0x06d6, 0x0436 }, - { 0x06d7, 0x0432 }, - { 0x06d8, 0x044c }, - { 0x06d9, 0x044b }, - { 0x06da, 0x0437 }, - { 0x06db, 0x0448 }, - { 0x06dc, 0x044d }, - { 0x06dd, 0x0449 }, - { 0x06de, 0x0447 }, - { 0x06df, 0x044a }, - { 0x06e0, 0x042e }, - { 0x06e1, 0x0410 }, - { 0x06e2, 0x0411 }, - { 0x06e3, 0x0426 }, - { 0x06e4, 0x0414 }, - { 0x06e5, 0x0415 }, - { 0x06e6, 0x0424 }, - { 0x06e7, 0x0413 }, - { 0x06e8, 0x0425 }, - { 0x06e9, 0x0418 }, - { 0x06ea, 0x0419 }, - { 0x06eb, 0x041a }, - { 0x06ec, 0x041b }, - { 0x06ed, 0x041c }, - { 0x06ee, 0x041d }, - { 0x06ef, 0x041e }, - { 0x06f0, 0x041f }, - { 0x06f1, 0x042f }, - { 0x06f2, 0x0420 }, - { 0x06f3, 0x0421 }, - { 0x06f4, 0x0422 }, - { 0x06f5, 0x0423 }, - { 0x06f6, 0x0416 }, - { 0x06f7, 0x0412 }, - { 0x06f8, 0x042c }, - { 0x06f9, 0x042b }, - { 0x06fa, 0x0417 }, - { 0x06fb, 0x0428 }, - { 0x06fc, 0x042d }, - { 0x06fd, 0x0429 }, - { 0x06fe, 0x0427 }, - { 0x06ff, 0x042a }, - { 0x07a1, 0x0386 }, - { 0x07a2, 0x0388 }, - { 0x07a3, 0x0389 }, - { 0x07a4, 0x038a }, - { 0x07a5, 0x03aa }, - { 0x07a7, 0x038c }, - { 0x07a8, 0x038e }, - { 0x07a9, 0x03ab }, - { 0x07ab, 0x038f }, - { 0x07ae, 0x0385 }, - { 0x07af, 0x2015 }, - { 0x07b1, 0x03ac }, - { 0x07b2, 0x03ad }, - { 0x07b3, 0x03ae }, - { 0x07b4, 0x03af }, - { 0x07b5, 0x03ca }, - { 0x07b6, 0x0390 }, - { 0x07b7, 0x03cc }, - { 0x07b8, 0x03cd }, - { 0x07b9, 0x03cb }, - { 0x07ba, 0x03b0 }, - { 0x07bb, 0x03ce }, - { 0x07c1, 0x0391 }, - { 0x07c2, 0x0392 }, - { 0x07c3, 0x0393 }, - { 0x07c4, 0x0394 }, - { 0x07c5, 0x0395 }, - { 0x07c6, 0x0396 }, - { 0x07c7, 0x0397 }, - { 0x07c8, 0x0398 }, - { 0x07c9, 0x0399 }, - { 0x07ca, 0x039a }, - { 0x07cb, 0x039b }, - { 0x07cc, 0x039c }, - { 0x07cd, 0x039d }, - { 0x07ce, 0x039e }, - { 0x07cf, 0x039f }, - { 0x07d0, 0x03a0 }, - { 0x07d1, 0x03a1 }, - { 0x07d2, 0x03a3 }, - { 0x07d4, 0x03a4 }, - { 0x07d5, 0x03a5 }, - { 0x07d6, 0x03a6 }, - { 0x07d7, 0x03a7 }, - { 0x07d8, 0x03a8 }, - { 0x07d9, 0x03a9 }, - { 0x07e1, 0x03b1 }, - { 0x07e2, 0x03b2 }, - { 0x07e3, 0x03b3 }, - { 0x07e4, 0x03b4 }, - { 0x07e5, 0x03b5 }, - { 0x07e6, 0x03b6 }, - { 0x07e7, 0x03b7 }, - { 0x07e8, 0x03b8 }, - { 0x07e9, 0x03b9 }, - { 0x07ea, 0x03ba }, - { 0x07eb, 0x03bb }, - { 0x07ec, 0x03bc }, - { 0x07ed, 0x03bd }, - { 0x07ee, 0x03be }, - { 0x07ef, 0x03bf }, - { 0x07f0, 0x03c0 }, - { 0x07f1, 0x03c1 }, - { 0x07f2, 0x03c3 }, - { 0x07f3, 0x03c2 }, - { 0x07f4, 0x03c4 }, - { 0x07f5, 0x03c5 }, - { 0x07f6, 0x03c6 }, - { 0x07f7, 0x03c7 }, - { 0x07f8, 0x03c8 }, - { 0x07f9, 0x03c9 }, - { 0x08a1, 0x23b7 }, - { 0x08a2, 0x250c }, - { 0x08a3, 0x2500 }, - { 0x08a4, 0x2320 }, - { 0x08a5, 0x2321 }, - { 0x08a6, 0x2502 }, - { 0x08a7, 0x23a1 }, - { 0x08a8, 0x23a3 }, - { 0x08a9, 0x23a4 }, - { 0x08aa, 0x23a6 }, - { 0x08ab, 0x239b }, - { 0x08ac, 0x239d }, - { 0x08ad, 0x239e }, - { 0x08ae, 0x23a0 }, - { 0x08af, 0x23a8 }, - { 0x08b0, 0x23ac }, - { 0x08bc, 0x2264 }, - { 0x08bd, 0x2260 }, - { 0x08be, 0x2265 }, - { 0x08bf, 0x222b }, - { 0x08c0, 0x2234 }, - { 0x08c1, 0x221d }, - { 0x08c2, 0x221e }, - { 0x08c5, 0x2207 }, - { 0x08c8, 0x223c }, - { 0x08c9, 0x2243 }, - { 0x08cd, 0x21d4 }, - { 0x08ce, 0x21d2 }, - { 0x08cf, 0x2261 }, - { 0x08d6, 0x221a }, - { 0x08da, 0x2282 }, - { 0x08db, 0x2283 }, - { 0x08dc, 0x2229 }, - { 0x08dd, 0x222a }, - { 0x08de, 0x2227 }, - { 0x08df, 0x2228 }, - { 0x08ef, 0x2202 }, - { 0x08f6, 0x0192 }, - { 0x08fb, 0x2190 }, - { 0x08fc, 0x2191 }, - { 0x08fd, 0x2192 }, - { 0x08fe, 0x2193 }, - { 0x09e0, 0x25c6 }, - { 0x09e1, 0x2592 }, - { 0x09e2, 0x2409 }, - { 0x09e3, 0x240c }, - { 0x09e4, 0x240d }, - { 0x09e5, 0x240a }, - { 0x09e8, 0x2424 }, - { 0x09e9, 0x240b }, - { 0x09ea, 0x2518 }, - { 0x09eb, 0x2510 }, - { 0x09ec, 0x250c }, - { 0x09ed, 0x2514 }, - { 0x09ee, 0x253c }, - { 0x09ef, 0x23ba }, - { 0x09f0, 0x23bb }, - { 0x09f1, 0x2500 }, - { 0x09f2, 0x23bc }, - { 0x09f3, 0x23bd }, - { 0x09f4, 0x251c }, - { 0x09f5, 0x2524 }, - { 0x09f6, 0x2534 }, - { 0x09f7, 0x252c }, - { 0x09f8, 0x2502 }, - { 0x0aa1, 0x2003 }, - { 0x0aa2, 0x2002 }, - { 0x0aa3, 0x2004 }, - { 0x0aa4, 0x2005 }, - { 0x0aa5, 0x2007 }, - { 0x0aa6, 0x2008 }, - { 0x0aa7, 0x2009 }, - { 0x0aa8, 0x200a }, - { 0x0aa9, 0x2014 }, - { 0x0aaa, 0x2013 }, - { 0x0aae, 0x2026 }, - { 0x0aaf, 0x2025 }, - { 0x0ab0, 0x2153 }, - { 0x0ab1, 0x2154 }, - { 0x0ab2, 0x2155 }, - { 0x0ab3, 0x2156 }, - { 0x0ab4, 0x2157 }, - { 0x0ab5, 0x2158 }, - { 0x0ab6, 0x2159 }, - { 0x0ab7, 0x215a }, - { 0x0ab8, 0x2105 }, - { 0x0abb, 0x2012 }, - { 0x0abc, 0x2329 }, - { 0x0abe, 0x232a }, - { 0x0ac3, 0x215b }, - { 0x0ac4, 0x215c }, - { 0x0ac5, 0x215d }, - { 0x0ac6, 0x215e }, - { 0x0ac9, 0x2122 }, - { 0x0aca, 0x2613 }, - { 0x0acc, 0x25c1 }, - { 0x0acd, 0x25b7 }, - { 0x0ace, 0x25cb }, - { 0x0acf, 0x25af }, - { 0x0ad0, 0x2018 }, - { 0x0ad1, 0x2019 }, - { 0x0ad2, 0x201c }, - { 0x0ad3, 0x201d }, - { 0x0ad4, 0x211e }, - { 0x0ad6, 0x2032 }, - { 0x0ad7, 0x2033 }, - { 0x0ad9, 0x271d }, - { 0x0adb, 0x25ac }, - { 0x0adc, 0x25c0 }, - { 0x0add, 0x25b6 }, - { 0x0ade, 0x25cf }, - { 0x0adf, 0x25ae }, - { 0x0ae0, 0x25e6 }, - { 0x0ae1, 0x25ab }, - { 0x0ae2, 0x25ad }, - { 0x0ae3, 0x25b3 }, - { 0x0ae4, 0x25bd }, - { 0x0ae5, 0x2606 }, - { 0x0ae6, 0x2022 }, - { 0x0ae7, 0x25aa }, - { 0x0ae8, 0x25b2 }, - { 0x0ae9, 0x25bc }, - { 0x0aea, 0x261c }, - { 0x0aeb, 0x261e }, - { 0x0aec, 0x2663 }, - { 0x0aed, 0x2666 }, - { 0x0aee, 0x2665 }, - { 0x0af0, 0x2720 }, - { 0x0af1, 0x2020 }, - { 0x0af2, 0x2021 }, - { 0x0af3, 0x2713 }, - { 0x0af4, 0x2717 }, - { 0x0af5, 0x266f }, - { 0x0af6, 0x266d }, - { 0x0af7, 0x2642 }, - { 0x0af8, 0x2640 }, - { 0x0af9, 0x260e }, - { 0x0afa, 0x2315 }, - { 0x0afb, 0x2117 }, - { 0x0afc, 0x2038 }, - { 0x0afd, 0x201a }, - { 0x0afe, 0x201e }, - { 0x0ba3, 0x003c }, - { 0x0ba6, 0x003e }, - { 0x0ba8, 0x2228 }, - { 0x0ba9, 0x2227 }, - { 0x0bc0, 0x00af }, - { 0x0bc2, 0x22a5 }, - { 0x0bc3, 0x2229 }, - { 0x0bc4, 0x230a }, - { 0x0bc6, 0x005f }, - { 0x0bca, 0x2218 }, - { 0x0bcc, 0x2395 }, - { 0x0bce, 0x22a4 }, - { 0x0bcf, 0x25cb }, - { 0x0bd3, 0x2308 }, - { 0x0bd6, 0x222a }, - { 0x0bd8, 0x2283 }, - { 0x0bda, 0x2282 }, - { 0x0bdc, 0x22a2 }, - { 0x0bfc, 0x22a3 }, - { 0x0cdf, 0x2017 }, - { 0x0ce0, 0x05d0 }, - { 0x0ce1, 0x05d1 }, - { 0x0ce2, 0x05d2 }, - { 0x0ce3, 0x05d3 }, - { 0x0ce4, 0x05d4 }, - { 0x0ce5, 0x05d5 }, - { 0x0ce6, 0x05d6 }, - { 0x0ce7, 0x05d7 }, - { 0x0ce8, 0x05d8 }, - { 0x0ce9, 0x05d9 }, - { 0x0cea, 0x05da }, - { 0x0ceb, 0x05db }, - { 0x0cec, 0x05dc }, - { 0x0ced, 0x05dd }, - { 0x0cee, 0x05de }, - { 0x0cef, 0x05df }, - { 0x0cf0, 0x05e0 }, - { 0x0cf1, 0x05e1 }, - { 0x0cf2, 0x05e2 }, - { 0x0cf3, 0x05e3 }, - { 0x0cf4, 0x05e4 }, - { 0x0cf5, 0x05e5 }, - { 0x0cf6, 0x05e6 }, - { 0x0cf7, 0x05e7 }, - { 0x0cf8, 0x05e8 }, - { 0x0cf9, 0x05e9 }, - { 0x0cfa, 0x05ea }, - { 0x0da1, 0x0e01 }, - { 0x0da2, 0x0e02 }, - { 0x0da3, 0x0e03 }, - { 0x0da4, 0x0e04 }, - { 0x0da5, 0x0e05 }, - { 0x0da6, 0x0e06 }, - { 0x0da7, 0x0e07 }, - { 0x0da8, 0x0e08 }, - { 0x0da9, 0x0e09 }, - { 0x0daa, 0x0e0a }, - { 0x0dab, 0x0e0b }, - { 0x0dac, 0x0e0c }, - { 0x0dad, 0x0e0d }, - { 0x0dae, 0x0e0e }, - { 0x0daf, 0x0e0f }, - { 0x0db0, 0x0e10 }, - { 0x0db1, 0x0e11 }, - { 0x0db2, 0x0e12 }, - { 0x0db3, 0x0e13 }, - { 0x0db4, 0x0e14 }, - { 0x0db5, 0x0e15 }, - { 0x0db6, 0x0e16 }, - { 0x0db7, 0x0e17 }, - { 0x0db8, 0x0e18 }, - { 0x0db9, 0x0e19 }, - { 0x0dba, 0x0e1a }, - { 0x0dbb, 0x0e1b }, - { 0x0dbc, 0x0e1c }, - { 0x0dbd, 0x0e1d }, - { 0x0dbe, 0x0e1e }, - { 0x0dbf, 0x0e1f }, - { 0x0dc0, 0x0e20 }, - { 0x0dc1, 0x0e21 }, - { 0x0dc2, 0x0e22 }, - { 0x0dc3, 0x0e23 }, - { 0x0dc4, 0x0e24 }, - { 0x0dc5, 0x0e25 }, - { 0x0dc6, 0x0e26 }, - { 0x0dc7, 0x0e27 }, - { 0x0dc8, 0x0e28 }, - { 0x0dc9, 0x0e29 }, - { 0x0dca, 0x0e2a }, - { 0x0dcb, 0x0e2b }, - { 0x0dcc, 0x0e2c }, - { 0x0dcd, 0x0e2d }, - { 0x0dce, 0x0e2e }, - { 0x0dcf, 0x0e2f }, - { 0x0dd0, 0x0e30 }, - { 0x0dd1, 0x0e31 }, - { 0x0dd2, 0x0e32 }, - { 0x0dd3, 0x0e33 }, - { 0x0dd4, 0x0e34 }, - { 0x0dd5, 0x0e35 }, - { 0x0dd6, 0x0e36 }, - { 0x0dd7, 0x0e37 }, - { 0x0dd8, 0x0e38 }, - { 0x0dd9, 0x0e39 }, - { 0x0dda, 0x0e3a }, - { 0x0ddf, 0x0e3f }, - { 0x0de0, 0x0e40 }, - { 0x0de1, 0x0e41 }, - { 0x0de2, 0x0e42 }, - { 0x0de3, 0x0e43 }, - { 0x0de4, 0x0e44 }, - { 0x0de5, 0x0e45 }, - { 0x0de6, 0x0e46 }, - { 0x0de7, 0x0e47 }, - { 0x0de8, 0x0e48 }, - { 0x0de9, 0x0e49 }, - { 0x0dea, 0x0e4a }, - { 0x0deb, 0x0e4b }, - { 0x0dec, 0x0e4c }, - { 0x0ded, 0x0e4d }, - { 0x0df0, 0x0e50 }, - { 0x0df1, 0x0e51 }, - { 0x0df2, 0x0e52 }, - { 0x0df3, 0x0e53 }, - { 0x0df4, 0x0e54 }, - { 0x0df5, 0x0e55 }, - { 0x0df6, 0x0e56 }, - { 0x0df7, 0x0e57 }, - { 0x0df8, 0x0e58 }, - { 0x0df9, 0x0e59 }, - { 0x0ea1, 0x3131 }, - { 0x0ea2, 0x3132 }, - { 0x0ea3, 0x3133 }, - { 0x0ea4, 0x3134 }, - { 0x0ea5, 0x3135 }, - { 0x0ea6, 0x3136 }, - { 0x0ea7, 0x3137 }, - { 0x0ea8, 0x3138 }, - { 0x0ea9, 0x3139 }, - { 0x0eaa, 0x313a }, - { 0x0eab, 0x313b }, - { 0x0eac, 0x313c }, - { 0x0ead, 0x313d }, - { 0x0eae, 0x313e }, - { 0x0eaf, 0x313f }, - { 0x0eb0, 0x3140 }, - { 0x0eb1, 0x3141 }, - { 0x0eb2, 0x3142 }, - { 0x0eb3, 0x3143 }, - { 0x0eb4, 0x3144 }, - { 0x0eb5, 0x3145 }, - { 0x0eb6, 0x3146 }, - { 0x0eb7, 0x3147 }, - { 0x0eb8, 0x3148 }, - { 0x0eb9, 0x3149 }, - { 0x0eba, 0x314a }, - { 0x0ebb, 0x314b }, - { 0x0ebc, 0x314c }, - { 0x0ebd, 0x314d }, - { 0x0ebe, 0x314e }, - { 0x0ebf, 0x314f }, - { 0x0ec0, 0x3150 }, - { 0x0ec1, 0x3151 }, - { 0x0ec2, 0x3152 }, - { 0x0ec3, 0x3153 }, - { 0x0ec4, 0x3154 }, - { 0x0ec5, 0x3155 }, - { 0x0ec6, 0x3156 }, - { 0x0ec7, 0x3157 }, - { 0x0ec8, 0x3158 }, - { 0x0ec9, 0x3159 }, - { 0x0eca, 0x315a }, - { 0x0ecb, 0x315b }, - { 0x0ecc, 0x315c }, - { 0x0ecd, 0x315d }, - { 0x0ece, 0x315e }, - { 0x0ecf, 0x315f }, - { 0x0ed0, 0x3160 }, - { 0x0ed1, 0x3161 }, - { 0x0ed2, 0x3162 }, - { 0x0ed3, 0x3163 }, - { 0x0ed4, 0x11a8 }, - { 0x0ed5, 0x11a9 }, - { 0x0ed6, 0x11aa }, - { 0x0ed7, 0x11ab }, - { 0x0ed8, 0x11ac }, - { 0x0ed9, 0x11ad }, - { 0x0eda, 0x11ae }, - { 0x0edb, 0x11af }, - { 0x0edc, 0x11b0 }, - { 0x0edd, 0x11b1 }, - { 0x0ede, 0x11b2 }, - { 0x0edf, 0x11b3 }, - { 0x0ee0, 0x11b4 }, - { 0x0ee1, 0x11b5 }, - { 0x0ee2, 0x11b6 }, - { 0x0ee3, 0x11b7 }, - { 0x0ee4, 0x11b8 }, - { 0x0ee5, 0x11b9 }, - { 0x0ee6, 0x11ba }, - { 0x0ee7, 0x11bb }, - { 0x0ee8, 0x11bc }, - { 0x0ee9, 0x11bd }, - { 0x0eea, 0x11be }, - { 0x0eeb, 0x11bf }, - { 0x0eec, 0x11c0 }, - { 0x0eed, 0x11c1 }, - { 0x0eee, 0x11c2 }, - { 0x0eef, 0x316d }, - { 0x0ef0, 0x3171 }, - { 0x0ef1, 0x3178 }, - { 0x0ef2, 0x317f }, - { 0x0ef3, 0x3181 }, - { 0x0ef4, 0x3184 }, - { 0x0ef5, 0x3186 }, - { 0x0ef6, 0x318d }, - { 0x0ef7, 0x318e }, - { 0x0ef8, 0x11eb }, - { 0x0ef9, 0x11f0 }, - { 0x0efa, 0x11f9 }, - { 0x0eff, 0x20a9 }, - { 0x13a4, 0x20ac }, - { 0x13bc, 0x0152 }, - { 0x13bd, 0x0153 }, - { 0x13be, 0x0178 }, - { 0x20ac, 0x20ac }, - // Numeric keypad with numlock on - { XK_KP_Space, ' ' }, - { XK_KP_Equal, '=' }, - { XK_KP_Multiply, '*' }, - { XK_KP_Add, '+' }, - { XK_KP_Separator, ',' }, - { XK_KP_Subtract, '-' }, - { XK_KP_Decimal, '.' }, - { XK_KP_Divide, '/' }, - { XK_KP_0, 0x0030 }, - { XK_KP_1, 0x0031 }, - { XK_KP_2, 0x0032 }, - { XK_KP_3, 0x0033 }, - { XK_KP_4, 0x0034 }, - { XK_KP_5, 0x0035 }, - { XK_KP_6, 0x0036 }, - { XK_KP_7, 0x0037 }, - { XK_KP_8, 0x0038 }, - { XK_KP_9, 0x0039 } -}; - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Convert X11 KeySym to Unicode -//======================================================================== - -long _glfwKeySym2Unicode( KeySym keysym ) -{ - int min = 0; - int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; - int mid; - - /* First check for Latin-1 characters (1:1 mapping) */ - if( (keysym >= 0x0020 && keysym <= 0x007e) || - (keysym >= 0x00a0 && keysym <= 0x00ff) ) - { return keysym; - } - - /* Also check for directly encoded 24-bit UCS characters */ - if( (keysym & 0xff000000) == 0x01000000 ) - { - return keysym & 0x00ffffff; - } - - /* Binary search in table */ - while( max >= min ) - { - mid = (min + max) / 2; - if( keysymtab[mid].keysym < keysym ) - { - min = mid + 1; - } - else if( keysymtab[mid].keysym > keysym ) - { - max = mid - 1; - } - else - { - /* Found it! */ - return keysymtab[mid].ucs; - } - } - - /* No matching Unicode value found */ - return -1; -} diff --git a/Core/SVS/glfw/lib/x11/x11_thread.c b/Core/SVS/glfw/lib/x11/x11_thread.c deleted file mode 100644 index d4d17977d4..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_thread.c +++ /dev/null @@ -1,503 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -#ifdef _GLFW_HAS_PTHREAD - -//======================================================================== -// This is simply a "wrapper" for calling the user thread function. -//======================================================================== - -void * _glfwNewThread( void * arg ) -{ - GLFWthreadfun threadfun; - _GLFWthread *t; - pthread_t posixID; - - // Get current thread ID - posixID = pthread_self(); - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Loop through entire list of threads to find the matching POSIX - // thread ID - for( t = &_glfwThrd.First; t != NULL; t = t->Next ) - { - if( t->PosixID == posixID ) - { - break; - } - } - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return NULL; - } - - // Get user thread function pointer - threadfun = t->Function; - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Call the user thread function - threadfun( arg ); - - // Remove thread from thread list - ENTER_THREAD_CRITICAL_SECTION - _glfwRemoveThread( t ); - LEAVE_THREAD_CRITICAL_SECTION - - // When the thread function returns, the thread will die... - return NULL; -} - -#endif // _GLFW_HAS_PTHREAD - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Create a new thread -//======================================================================== - -GLFWthread _glfwPlatformCreateThread( GLFWthreadfun fun, void *arg ) -{ -#ifdef _GLFW_HAS_PTHREAD - - GLFWthread ID; - _GLFWthread *t; - int result; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Create a new thread information memory area - t = (_GLFWthread *) malloc( sizeof(_GLFWthread) ); - if( t == NULL ) - { - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - return -1; - } - - // Get a new unique thread id - ID = _glfwThrd.NextID ++; - - // Store thread information in the thread list - t->Function = fun; - t->ID = ID; - - // Create thread - result = pthread_create( - &t->PosixID, // Thread handle - NULL, // Default thread attributes - _glfwNewThread, // Thread function (a wrapper function) - (void *)arg // Argument to thread is user argument - ); - - // Did the thread creation fail? - if( result != 0 ) - { - free( (void *) t ); - LEAVE_THREAD_CRITICAL_SECTION - return -1; - } - - // Append thread to thread list - _glfwAppendThread( t ); - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Return the GLFW thread ID - return ID; - -#else - - return -1; - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Kill a thread. NOTE: THIS IS A VERY DANGEROUS OPERATION, AND SHOULD NOT -// BE USED EXCEPT IN EXTREME SITUATIONS! -//======================================================================== - -void _glfwPlatformDestroyThread( GLFWthread ID ) -{ -#ifdef _GLFW_HAS_PTHREAD - - _GLFWthread *t; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Get thread information pointer - t = _glfwGetThreadPointer( ID ); - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return; - } - - // Simply murder the process, no mercy! - pthread_kill( t->PosixID, SIGKILL ); - - // Remove thread from thread list - _glfwRemoveThread( t ); - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Wait for a thread to die -//======================================================================== - -int _glfwPlatformWaitThread( GLFWthread ID, int waitmode ) -{ -#ifdef _GLFW_HAS_PTHREAD - - pthread_t thread; - _GLFWthread *t; - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Get thread information pointer - t = _glfwGetThreadPointer( ID ); - - // Is the thread already dead? - if( t == NULL ) - { - LEAVE_THREAD_CRITICAL_SECTION - return GL_TRUE; - } - - // If got this far, the thread is alive => polling returns FALSE - if( waitmode == GLFW_NOWAIT ) - { - LEAVE_THREAD_CRITICAL_SECTION - return GL_FALSE; - } - - // Get thread handle - thread = t->PosixID; - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Wait for thread to die - (void) pthread_join( thread, NULL ); - - return GL_TRUE; - -#else - - return GL_TRUE; - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Return the thread ID for the current thread -//======================================================================== - -GLFWthread _glfwPlatformGetThreadID( void ) -{ -#ifdef _GLFW_HAS_PTHREAD - - _GLFWthread *t; - GLFWthread ID = -1; - pthread_t posixID; - - // Get current thread ID - posixID = pthread_self(); - - // Enter critical section - ENTER_THREAD_CRITICAL_SECTION - - // Loop through entire list of threads to find the matching POSIX - // thread ID - for( t = &_glfwThrd.First; t != NULL; t = t->Next ) - { - if( t->PosixID == posixID ) - { - ID = t->ID; - break; - } - } - - // Leave critical section - LEAVE_THREAD_CRITICAL_SECTION - - // Return the found GLFW thread identifier - return ID; - -#else - - return 0; - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Create a mutual exclusion object -//======================================================================== - -GLFWmutex _glfwPlatformCreateMutex( void ) -{ -#ifdef _GLFW_HAS_PTHREAD - - pthread_mutex_t *mutex; - - // Allocate memory for mutex - mutex = (pthread_mutex_t *) malloc( sizeof( pthread_mutex_t ) ); - if( !mutex ) - { - return NULL; - } - - // Initialise a mutex object - (void) pthread_mutex_init( mutex, NULL ); - - // Cast to GLFWmutex and return - return (GLFWmutex) mutex; - -#else - - return (GLFWmutex) 0; - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Destroy a mutual exclusion object -//======================================================================== - -void _glfwPlatformDestroyMutex( GLFWmutex mutex ) -{ -#ifdef _GLFW_HAS_PTHREAD - - // Destroy the mutex object - pthread_mutex_destroy( (pthread_mutex_t *) mutex ); - - // Free memory for mutex object - free( (void *) mutex ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Request access to a mutex -//======================================================================== - -void _glfwPlatformLockMutex( GLFWmutex mutex ) -{ -#ifdef _GLFW_HAS_PTHREAD - - // Wait for mutex to be released - (void) pthread_mutex_lock( (pthread_mutex_t *) mutex ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Release a mutex -//======================================================================== - -void _glfwPlatformUnlockMutex( GLFWmutex mutex ) -{ -#ifdef _GLFW_HAS_PTHREAD - - // Release mutex - pthread_mutex_unlock( (pthread_mutex_t *) mutex ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Create a new condition variable object -//======================================================================== - -GLFWcond _glfwPlatformCreateCond( void ) -{ -#ifdef _GLFW_HAS_PTHREAD - - pthread_cond_t *cond; - - // Allocate memory for condition variable - cond = (pthread_cond_t *) malloc( sizeof(pthread_cond_t) ); - if( !cond ) - { - return NULL; - } - - // Initialise condition variable - (void) pthread_cond_init( cond, NULL ); - - // Cast to GLFWcond and return - return (GLFWcond) cond; - -#else - - return (GLFWcond) 0; - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Destroy a condition variable object -//======================================================================== - -void _glfwPlatformDestroyCond( GLFWcond cond ) -{ -#ifdef _GLFW_HAS_PTHREAD - - // Destroy the condition variable object - (void) pthread_cond_destroy( (pthread_cond_t *) cond ); - - // Free memory for condition variable object - free( (void *) cond ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Wait for a condition to be raised -//======================================================================== - -void _glfwPlatformWaitCond( GLFWcond cond, GLFWmutex mutex, - double timeout ) -{ -#ifdef _GLFW_HAS_PTHREAD - - struct timeval currenttime; - struct timespec wait; - long dt_sec, dt_usec; - - // Select infinite or timed wait - if( timeout >= GLFW_INFINITY ) - { - // Wait for condition (infinite wait) - (void) pthread_cond_wait( (pthread_cond_t *) cond, - (pthread_mutex_t *) mutex ); - } - else - { - // Set timeout time, relatvie to current time - gettimeofday( ¤ttime, NULL ); - dt_sec = (long) timeout; - dt_usec = (long) ((timeout - (double)dt_sec) * 1000000.0); - wait.tv_nsec = (currenttime.tv_usec + dt_usec) * 1000L; - if( wait.tv_nsec > 1000000000L ) - { - wait.tv_nsec -= 1000000000L; - dt_sec ++; - } - wait.tv_sec = currenttime.tv_sec + dt_sec; - - // Wait for condition (timed wait) - (void) pthread_cond_timedwait( (pthread_cond_t *) cond, - (pthread_mutex_t *) mutex, &wait ); - } - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Signal a condition to one waiting thread -//======================================================================== - -void _glfwPlatformSignalCond( GLFWcond cond ) -{ -#ifdef _GLFW_HAS_PTHREAD - - // Signal condition - (void) pthread_cond_signal( (pthread_cond_t *) cond ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Broadcast a condition to all waiting threads -//======================================================================== - -void _glfwPlatformBroadcastCond( GLFWcond cond ) -{ -#ifdef _GLFW_HAS_PTHREAD - - // Broadcast condition - (void) pthread_cond_broadcast( (pthread_cond_t *) cond ); - -#endif // _GLFW_HAS_PTHREAD -} - - -//======================================================================== -// Return the number of processors in the system. -//======================================================================== - -int _glfwPlatformGetNumberOfProcessors( void ) -{ - int n; - - // Get number of processors online - _glfw_numprocessors( n ); - return n; -} - diff --git a/Core/SVS/glfw/lib/x11/x11_time.c b/Core/SVS/glfw/lib/x11/x11_time.c deleted file mode 100644 index d24cd9ad03..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_time.c +++ /dev/null @@ -1,174 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include - - -//======================================================================== -// Return raw time -//======================================================================== - -static uint64_t getRawTime(void) -{ -#if defined( CLOCK_MONOTONIC ) - if( _glfwLibrary.Timer.monotonic ) - { - struct timespec ts; - - clock_gettime( CLOCK_MONOTONIC, &ts ); - return (uint64_t) ts.tv_sec * (uint64_t) 1000000000 + (uint64_t) ts.tv_nsec; - } - else -#endif - { - struct timeval tv; - - gettimeofday( &tv, NULL ); - return (uint64_t) tv.tv_sec * (uint64_t) 1000000 + (uint64_t) tv.tv_usec; - } -} - - -//======================================================================== -// Initialise timer -//======================================================================== - -void _glfwInitTimer( void ) -{ -#if defined( CLOCK_MONOTONIC ) - struct timespec ts; - - if( clock_gettime( CLOCK_MONOTONIC, &ts ) == 0 ) - { - _glfwLibrary.Timer.monotonic = GL_TRUE; - _glfwLibrary.Timer.resolution = 1e-9; - } - else -#endif - { - _glfwLibrary.Timer.resolution = 1e-6; - } - - _glfwLibrary.Timer.base = getRawTime(); -} - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Return timer value in seconds -//======================================================================== - -double _glfwPlatformGetTime( void ) -{ - return (double) (getRawTime() - _glfwLibrary.Timer.base) * - _glfwLibrary.Timer.resolution; -} - - -//======================================================================== -// Set timer value in seconds -//======================================================================== - -void _glfwPlatformSetTime( double time ) -{ - _glfwLibrary.Timer.base = getRawTime() - - (uint64_t) (time / _glfwLibrary.Timer.resolution); -} - - -//======================================================================== -// Put a thread to sleep for a specified amount of time -//======================================================================== - -void _glfwPlatformSleep( double time ) -{ -#ifdef _GLFW_HAS_PTHREAD - - if( time == 0.0 ) - { -#ifdef _GLFW_HAS_SCHED_YIELD - sched_yield(); -#endif - return; - } - - struct timeval currenttime; - struct timespec wait; - pthread_mutex_t mutex; - pthread_cond_t cond; - long dt_sec, dt_usec; - - // Not all pthread implementations have a pthread_sleep() function. We - // do it the portable way, using a timed wait for a condition that we - // will never signal. NOTE: The unistd functions sleep/usleep suspends - // the entire PROCESS, not a signle thread, which is why we can not - // use them to implement glfwSleep. - - // Set timeout time, relatvie to current time - gettimeofday( ¤ttime, NULL ); - dt_sec = (long) time; - dt_usec = (long) ((time - (double)dt_sec) * 1000000.0); - wait.tv_nsec = (currenttime.tv_usec + dt_usec) * 1000L; - if( wait.tv_nsec > 1000000000L ) - { - wait.tv_nsec -= 1000000000L; - dt_sec++; - } - wait.tv_sec = currenttime.tv_sec + dt_sec; - - // Initialize condition and mutex objects - pthread_mutex_init( &mutex, NULL ); - pthread_cond_init( &cond, NULL ); - - // Do a timed wait - pthread_mutex_lock( &mutex ); - pthread_cond_timedwait( &cond, &mutex, &wait ); - pthread_mutex_unlock( &mutex ); - - // Destroy condition and mutex objects - pthread_mutex_destroy( &mutex ); - pthread_cond_destroy( &cond ); - -#else - - // For systems without PTHREAD, use unistd usleep - if( time > 0 ) - { - usleep( (unsigned int) (time*1000000) ); - } - -#endif // _GLFW_HAS_PTHREAD -} - diff --git a/Core/SVS/glfw/lib/x11/x11_window.c b/Core/SVS/glfw/lib/x11/x11_window.c deleted file mode 100644 index c4f9673d23..0000000000 --- a/Core/SVS/glfw/lib/x11/x11_window.c +++ /dev/null @@ -1,1973 +0,0 @@ -//======================================================================== -// GLFW - An OpenGL framework -// Platform: X11/GLX -// API version: 2.7 -// WWW: http://www.glfw.org/ -//------------------------------------------------------------------------ -// Copyright (c) 2002-2006 Marcus Geelnard -// Copyright (c) 2006-2010 Camilla Berglund -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== - -#include "internal.h" - -#include - - -/* Define GLX 1.4 FSAA tokens if not already defined */ -#ifndef GLX_VERSION_1_4 - -#define GLX_SAMPLE_BUFFERS 100000 -#define GLX_SAMPLES 100001 - -#endif /*GLX_VERSION_1_4*/ - -// Action for EWMH client messages -#define _NET_WM_STATE_REMOVE 0 -#define _NET_WM_STATE_ADD 1 -#define _NET_WM_STATE_TOGGLE 2 - -#ifndef GLXBadProfileARB - #define GLXBadProfileARB 13 -#endif - - -//======================================================================== -// The X error code as provided to the X error handler -//======================================================================== - -static unsigned long _glfwErrorCode = Success; - - -//************************************************************************ -//**** GLFW internal functions **** -//************************************************************************ - -//======================================================================== -// Error handler for BadMatch errors when requesting context with -// unavailable OpenGL versions using the GLX_ARB_create_context extension -//======================================================================== - -static int errorHandler( Display *display, XErrorEvent *event ) -{ - _glfwErrorCode = event->error_code; - return 0; -} - - -//======================================================================== -// Checks whether the event is a MapNotify for the specified window -//======================================================================== - -static Bool isMapNotify( Display *d, XEvent *e, char *arg ) -{ - return (e->type == MapNotify) && (e->xmap.window == (Window)arg); -} - - -//======================================================================== -// Retrieve a single window property of the specified type -// Inspired by fghGetWindowProperty from freeglut -//======================================================================== - -static unsigned long getWindowProperty( Window window, - Atom property, - Atom type, - unsigned char** value ) -{ - Atom actualType; - int actualFormat; - unsigned long itemCount, bytesAfter; - - XGetWindowProperty( _glfwLibrary.display, - window, - property, - 0, - LONG_MAX, - False, - type, - &actualType, - &actualFormat, - &itemCount, - &bytesAfter, - value ); - - if( actualType != type ) - { - return 0; - } - - return itemCount; -} - - -//======================================================================== -// Check whether the specified atom is supported -//======================================================================== - -static Atom getSupportedAtom( Atom* supportedAtoms, - unsigned long atomCount, - const char* atomName ) -{ - Atom atom = XInternAtom( _glfwLibrary.display, atomName, True ); - if( atom != None ) - { - unsigned long i; - - for( i = 0; i < atomCount; i++ ) - { - if( supportedAtoms[i] == atom ) - { - return atom; - } - } - } - - return None; -} - - -//======================================================================== -// Check whether the running window manager is EWMH-compliant -//======================================================================== - -static GLboolean checkForEWMH( void ) -{ - Window *windowFromRoot = NULL; - Window *windowFromChild = NULL; - - // Hey kids; let's see if the window manager supports EWMH! - - // First we need a couple of atoms, which should already be there - Atom supportingWmCheck = XInternAtom( _glfwLibrary.display, - "_NET_SUPPORTING_WM_CHECK", - True ); - Atom wmSupported = XInternAtom( _glfwLibrary.display, - "_NET_SUPPORTED", - True ); - if( supportingWmCheck == None || wmSupported == None ) - { - return GL_FALSE; - } - - // Then we look for the _NET_SUPPORTING_WM_CHECK property of the root window - if( getWindowProperty( _glfwWin.root, - supportingWmCheck, - XA_WINDOW, - (unsigned char**) &windowFromRoot ) != 1 ) - { - XFree( windowFromRoot ); - return GL_FALSE; - } - - // It should be the ID of a child window (of the root) - // Then we look for the same property on the child window - if( getWindowProperty( *windowFromRoot, - supportingWmCheck, - XA_WINDOW, - (unsigned char**) &windowFromChild ) != 1 ) - { - XFree( windowFromRoot ); - XFree( windowFromChild ); - return GL_FALSE; - } - - // It should be the ID of that same child window - if( *windowFromRoot != *windowFromChild ) - { - XFree( windowFromRoot ); - XFree( windowFromChild ); - return GL_FALSE; - } - - XFree( windowFromRoot ); - XFree( windowFromChild ); - - // We are now fairly sure that an EWMH-compliant window manager is running - - Atom *supportedAtoms; - unsigned long atomCount; - - // Now we need to check the _NET_SUPPORTED property of the root window - atomCount = getWindowProperty( _glfwWin.root, - wmSupported, - XA_ATOM, - (unsigned char**) &supportedAtoms ); - - // See which of the atoms we support that are supported by the WM - - _glfwWin.wmState = getSupportedAtom( supportedAtoms, - atomCount, - "_NET_WM_STATE" ); - - _glfwWin.wmStateFullscreen = getSupportedAtom( supportedAtoms, - atomCount, - "_NET_WM_STATE_FULLSCREEN" ); - - _glfwWin.wmPing = getSupportedAtom( supportedAtoms, - atomCount, - "_NET_WM_PING" ); - - _glfwWin.wmActiveWindow = getSupportedAtom( supportedAtoms, - atomCount, - "_NET_ACTIVE_WINDOW" ); - - XFree( supportedAtoms ); - - return GL_TRUE; -} - -//======================================================================== -// Translates an X Window key to internal coding -//======================================================================== - -static int translateKey( int keycode ) -{ - KeySym key, key_lc, key_uc; - - // Try secondary keysym, for numeric keypad keys - // Note: This way we always force "NumLock = ON", which at least - // enables GLFW users to detect numeric keypad keys - key = XKeycodeToKeysym( _glfwLibrary.display, keycode, 1 ); - switch( key ) - { - // Numeric keypad - case XK_KP_0: return GLFW_KEY_KP_0; - case XK_KP_1: return GLFW_KEY_KP_1; - case XK_KP_2: return GLFW_KEY_KP_2; - case XK_KP_3: return GLFW_KEY_KP_3; - case XK_KP_4: return GLFW_KEY_KP_4; - case XK_KP_5: return GLFW_KEY_KP_5; - case XK_KP_6: return GLFW_KEY_KP_6; - case XK_KP_7: return GLFW_KEY_KP_7; - case XK_KP_8: return GLFW_KEY_KP_8; - case XK_KP_9: return GLFW_KEY_KP_9; - case XK_KP_Separator: - case XK_KP_Decimal: return GLFW_KEY_KP_DECIMAL; - case XK_KP_Equal: return GLFW_KEY_KP_EQUAL; - case XK_KP_Enter: return GLFW_KEY_KP_ENTER; - default: break; - } - - // Now try pimary keysym - key = XKeycodeToKeysym( _glfwLibrary.display, keycode, 0 ); - switch( key ) - { - // Special keys (non character keys) - case XK_Escape: return GLFW_KEY_ESC; - case XK_Tab: return GLFW_KEY_TAB; - case XK_Shift_L: return GLFW_KEY_LSHIFT; - case XK_Shift_R: return GLFW_KEY_RSHIFT; - case XK_Control_L: return GLFW_KEY_LCTRL; - case XK_Control_R: return GLFW_KEY_RCTRL; - case XK_Meta_L: - case XK_Alt_L: return GLFW_KEY_LALT; - case XK_Mode_switch: // Mapped to Alt_R on many keyboards - case XK_Meta_R: - case XK_ISO_Level3_Shift: // AltGr on at least some machines - case XK_Alt_R: return GLFW_KEY_RALT; - case XK_Super_L: return GLFW_KEY_LSUPER; - case XK_Super_R: return GLFW_KEY_RSUPER; - case XK_Menu: return GLFW_KEY_MENU; - case XK_Num_Lock: return GLFW_KEY_KP_NUM_LOCK; - case XK_Caps_Lock: return GLFW_KEY_CAPS_LOCK; - case XK_Scroll_Lock: return GLFW_KEY_SCROLL_LOCK; - case XK_Pause: return GLFW_KEY_PAUSE; - case XK_KP_Delete: - case XK_Delete: return GLFW_KEY_DEL; - case XK_BackSpace: return GLFW_KEY_BACKSPACE; - case XK_Return: return GLFW_KEY_ENTER; - case XK_KP_Home: - case XK_Home: return GLFW_KEY_HOME; - case XK_KP_End: - case XK_End: return GLFW_KEY_END; - case XK_KP_Page_Up: - case XK_Page_Up: return GLFW_KEY_PAGEUP; - case XK_KP_Page_Down: - case XK_Page_Down: return GLFW_KEY_PAGEDOWN; - case XK_KP_Insert: - case XK_Insert: return GLFW_KEY_INSERT; - case XK_KP_Left: - case XK_Left: return GLFW_KEY_LEFT; - case XK_KP_Right: - case XK_Right: return GLFW_KEY_RIGHT; - case XK_KP_Down: - case XK_Down: return GLFW_KEY_DOWN; - case XK_KP_Up: - case XK_Up: return GLFW_KEY_UP; - case XK_F1: return GLFW_KEY_F1; - case XK_F2: return GLFW_KEY_F2; - case XK_F3: return GLFW_KEY_F3; - case XK_F4: return GLFW_KEY_F4; - case XK_F5: return GLFW_KEY_F5; - case XK_F6: return GLFW_KEY_F6; - case XK_F7: return GLFW_KEY_F7; - case XK_F8: return GLFW_KEY_F8; - case XK_F9: return GLFW_KEY_F9; - case XK_F10: return GLFW_KEY_F10; - case XK_F11: return GLFW_KEY_F11; - case XK_F12: return GLFW_KEY_F12; - case XK_F13: return GLFW_KEY_F13; - case XK_F14: return GLFW_KEY_F14; - case XK_F15: return GLFW_KEY_F15; - case XK_F16: return GLFW_KEY_F16; - case XK_F17: return GLFW_KEY_F17; - case XK_F18: return GLFW_KEY_F18; - case XK_F19: return GLFW_KEY_F19; - case XK_F20: return GLFW_KEY_F20; - case XK_F21: return GLFW_KEY_F21; - case XK_F22: return GLFW_KEY_F22; - case XK_F23: return GLFW_KEY_F23; - case XK_F24: return GLFW_KEY_F24; - case XK_F25: return GLFW_KEY_F25; - - // Numeric keypad (should have been detected in secondary keysym!) - case XK_KP_Divide: return GLFW_KEY_KP_DIVIDE; - case XK_KP_Multiply: return GLFW_KEY_KP_MULTIPLY; - case XK_KP_Subtract: return GLFW_KEY_KP_SUBTRACT; - case XK_KP_Add: return GLFW_KEY_KP_ADD; - case XK_KP_Equal: return GLFW_KEY_KP_EQUAL; - case XK_KP_Enter: return GLFW_KEY_KP_ENTER; - - // The rest (should be printable keys) - default: - // Make uppercase - XConvertCase( key, &key_lc, &key_uc ); - key = key_uc; - - // Valid ISO 8859-1 character? - if( (key >= 32 && key <= 126) || - (key >= 160 && key <= 255) ) - { - return (int) key; - } - return GLFW_KEY_UNKNOWN; - } -} - - -//======================================================================== -// Translates an X Window event to Unicode -//======================================================================== - -static int translateChar( XKeyEvent *event ) -{ - KeySym keysym; - - // Get X11 keysym - XLookupString( event, NULL, 0, &keysym, NULL ); - - // Convert to Unicode (see x11_keysym2unicode.c) - return (int) _glfwKeySym2Unicode( keysym ); -} - - -//======================================================================== -// Create a blank cursor (for locked mouse mode) -//======================================================================== - -static Cursor createNULLCursor( Display *display, Window root ) -{ - Pixmap cursormask; - XGCValues xgc; - GC gc; - XColor col; - Cursor cursor; - - cursormask = XCreatePixmap( display, root, 1, 1, 1 ); - xgc.function = GXclear; - gc = XCreateGC( display, cursormask, GCFunction, &xgc ); - XFillRectangle( display, cursormask, gc, 0, 0, 1, 1 ); - col.pixel = 0; - col.red = 0; - col.flags = 4; - cursor = XCreatePixmapCursor( display, cursormask, cursormask, - &col,&col, 0,0 ); - XFreePixmap( display, cursormask ); - XFreeGC( display, gc ); - - return cursor; -} - - -//======================================================================== -// Returns the specified attribute of the specified GLXFBConfig -// NOTE: Do not call this unless we have found GLX 1.3+ or GLX_SGIX_fbconfig -//======================================================================== - -static int getFBConfigAttrib( GLXFBConfig fbconfig, int attrib ) -{ - int value; - - if( _glfwWin.has_GLX_SGIX_fbconfig ) - { - _glfwWin.GetFBConfigAttribSGIX( _glfwLibrary.display, fbconfig, attrib, &value ); - } - else - { - glXGetFBConfigAttrib( _glfwLibrary.display, fbconfig, attrib, &value ); - } - - return value; -} - - -//======================================================================== -// Return a list of available and usable framebuffer configs -//======================================================================== - -static _GLFWfbconfig *getFBConfigs( unsigned int *found ) -{ - GLXFBConfig *fbconfigs; - _GLFWfbconfig *result; - int i, count = 0; - GLboolean trustWindowBit = GL_TRUE; - - *found = 0; - - if( _glfwLibrary.GLX.versionMajor == 1 && _glfwLibrary.GLX.versionMinor < 3 ) - { - if( !_glfwWin.has_GLX_SGIX_fbconfig ) - { - fprintf( stderr, "GLXFBConfigs are not supported by the X server\n" ); - return NULL; - } - } - - if( strcmp( glXGetClientString( _glfwLibrary.display, GLX_VENDOR ), - "Chromium" ) == 0 ) - { - // This is a (hopefully temporary) workaround for Chromium (VirtualBox - // GL) not setting the window bit on any GLXFBConfigs - trustWindowBit = GL_FALSE; - } - - if( _glfwWin.has_GLX_SGIX_fbconfig ) - { - fbconfigs = _glfwWin.ChooseFBConfigSGIX( _glfwLibrary.display, - _glfwWin.screen, - NULL, - &count ); - if( !count ) - { - fprintf( stderr, "No GLXFBConfigs returned\n" ); - return NULL; - } - } - else - { - fbconfigs = glXGetFBConfigs( _glfwLibrary.display, _glfwWin.screen, &count ); - if( !count ) - { - fprintf( stderr, "No GLXFBConfigs returned\n" ); - return NULL; - } - } - - result = (_GLFWfbconfig*) malloc( sizeof(_GLFWfbconfig) * count ); - if( !result ) - { - fprintf( stderr, "Out of memory\n" ); - return NULL; - } - - for( i = 0; i < count; i++ ) - { - if( !getFBConfigAttrib( fbconfigs[i], GLX_DOUBLEBUFFER ) || - !getFBConfigAttrib( fbconfigs[i], GLX_VISUAL_ID ) ) - { - // Only consider double-buffered GLXFBConfigs with associated visuals - continue; - } - - if( !( getFBConfigAttrib( fbconfigs[i], GLX_RENDER_TYPE ) & GLX_RGBA_BIT ) ) - { - // Only consider RGBA GLXFBConfigs - continue; - } - - if( !( getFBConfigAttrib( fbconfigs[i], GLX_DRAWABLE_TYPE ) & GLX_WINDOW_BIT ) ) - { - if( trustWindowBit ) - { - // Only consider window GLXFBConfigs - continue; - } - } - - result[*found].redBits = getFBConfigAttrib( fbconfigs[i], GLX_RED_SIZE ); - result[*found].greenBits = getFBConfigAttrib( fbconfigs[i], GLX_GREEN_SIZE ); - result[*found].blueBits = getFBConfigAttrib( fbconfigs[i], GLX_BLUE_SIZE ); - - result[*found].alphaBits = getFBConfigAttrib( fbconfigs[i], GLX_ALPHA_SIZE ); - result[*found].depthBits = getFBConfigAttrib( fbconfigs[i], GLX_DEPTH_SIZE ); - result[*found].stencilBits = getFBConfigAttrib( fbconfigs[i], GLX_STENCIL_SIZE ); - - result[*found].accumRedBits = getFBConfigAttrib( fbconfigs[i], GLX_ACCUM_RED_SIZE ); - result[*found].accumGreenBits = getFBConfigAttrib( fbconfigs[i], GLX_ACCUM_GREEN_SIZE ); - result[*found].accumBlueBits = getFBConfigAttrib( fbconfigs[i], GLX_ACCUM_BLUE_SIZE ); - result[*found].accumAlphaBits = getFBConfigAttrib( fbconfigs[i], GLX_ACCUM_ALPHA_SIZE ); - - result[*found].auxBuffers = getFBConfigAttrib( fbconfigs[i], GLX_AUX_BUFFERS ); - result[*found].stereo = getFBConfigAttrib( fbconfigs[i], GLX_STEREO ); - - if( _glfwWin.has_GLX_ARB_multisample ) - { - result[*found].samples = getFBConfigAttrib( fbconfigs[i], GLX_SAMPLES ); - } - else - { - result[*found].samples = 0; - } - - result[*found].platformID = (GLFWintptr) getFBConfigAttrib( fbconfigs[i], GLX_FBCONFIG_ID ); - - (*found)++; - } - - XFree( fbconfigs ); - - return result; -} - - -//======================================================================== -// Create the OpenGL context using the legacy interface -//======================================================================== - -static GLXContext createLegacyContext( GLXFBConfig fbconfig ) -{ - if( _glfwWin.has_GLX_SGIX_fbconfig ) - { - return _glfwWin.CreateContextWithConfigSGIX( _glfwLibrary.display, - fbconfig, - GLX_RGBA_TYPE, - NULL, - True ); - } - else - { - return glXCreateNewContext( _glfwLibrary.display, - fbconfig, - GLX_RGBA_TYPE, - NULL, - True ); - } -} - - -//======================================================================== -// Create the OpenGL context -//======================================================================== - -#define setGLXattrib( attribs, index, attribName, attribValue ) \ - attribs[index++] = attribName; \ - attribs[index++] = attribValue; - -static int createContext( const _GLFWwndconfig *wndconfig, GLXFBConfigID fbconfigID ) -{ - int attribs[40]; - int flags, dummy, index; - GLXFBConfig *fbconfig; - - // Retrieve the previously selected GLXFBConfig - { - index = 0; - - setGLXattrib( attribs, index, GLX_FBCONFIG_ID, (int) fbconfigID ); - setGLXattrib( attribs, index, None, None ); - - if( _glfwWin.has_GLX_SGIX_fbconfig ) - { - fbconfig = _glfwWin.ChooseFBConfigSGIX( _glfwLibrary.display, - _glfwWin.screen, - attribs, - &dummy ); - } - else - { - fbconfig = glXChooseFBConfig( _glfwLibrary.display, - _glfwWin.screen, - attribs, - &dummy ); - } - - if( fbconfig == NULL ) - { - fprintf(stderr, "Unable to retrieve the selected GLXFBConfig\n"); - return GL_FALSE; - } - } - - // Retrieve the corresponding visual - if( _glfwWin.has_GLX_SGIX_fbconfig ) - { - _glfwWin.visual = _glfwWin.GetVisualFromFBConfigSGIX( _glfwLibrary.display, - *fbconfig ); - } - else - { - _glfwWin.visual = glXGetVisualFromFBConfig( _glfwLibrary.display, *fbconfig ); - } - - if( _glfwWin.visual == NULL ) - { - XFree( fbconfig ); - - fprintf(stderr, "Unable to retrieve visual for GLXFBconfig\n"); - return GL_FALSE; - } - - if( _glfwWin.has_GLX_ARB_create_context ) - { - index = 0; - - if( wndconfig->glMajor != 1 || wndconfig->glMinor != 0 ) - { - // Request an explicitly versioned context - - setGLXattrib( attribs, index, GLX_CONTEXT_MAJOR_VERSION_ARB, wndconfig->glMajor ); - setGLXattrib( attribs, index, GLX_CONTEXT_MINOR_VERSION_ARB, wndconfig->glMinor ); - } - - if( wndconfig->glForward || wndconfig->glDebug ) - { - flags = 0; - - if( wndconfig->glForward ) - { - flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; - } - - if( wndconfig->glDebug ) - { - flags |= GLX_CONTEXT_DEBUG_BIT_ARB; - } - - setGLXattrib( attribs, index, GLX_CONTEXT_FLAGS_ARB, flags ); - } - - if( wndconfig->glProfile ) - { - if( !_glfwWin.has_GLX_ARB_create_context_profile ) - { - fprintf( stderr, "OpenGL profile requested but GLX_ARB_create_context_profile " - "is unavailable\n" ); - return GL_FALSE; - } - - if( wndconfig->glProfile == GLFW_OPENGL_CORE_PROFILE ) - { - flags = GLX_CONTEXT_CORE_PROFILE_BIT_ARB; - } - else - { - flags = GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB; - } - - setGLXattrib( attribs, index, GLX_CONTEXT_PROFILE_MASK_ARB, flags ); - } - - setGLXattrib( attribs, index, None, None ); - - // This is the only place we set an Xlib error handler, and we only do - // it because glXCreateContextAttribsARB generates a BadMatch error if - // the requested OpenGL version is unavailable (instead of a civilized - // response like returning NULL) - XSetErrorHandler( errorHandler ); - - _glfwWin.context = _glfwWin.CreateContextAttribsARB( _glfwLibrary.display, - *fbconfig, - NULL, - True, - attribs ); - - // We are done, so unset the error handler again (see above) - XSetErrorHandler( NULL ); - - if( _glfwWin.context == NULL ) - { - // HACK: This is a fallback for the broken Mesa implementation of - // GLX_ARB_create_context_profile, which fails default 1.0 context - // creation with a GLXBadProfileARB error in violation of the spec - if( _glfwErrorCode == _glfwLibrary.GLX.errorBase + GLXBadProfileARB && - wndconfig->glProfile == 0 && - wndconfig->glForward == GL_FALSE ) - { - _glfwWin.context = createLegacyContext( *fbconfig ); - } - } - - // Copy the debug context hint as there's no way of verifying it - // This is the only code path capable of creating a debug context, - // so leave it as false (from the earlier memset) otherwise - _glfwWin.glDebug = wndconfig->glDebug; - } - else - { - _glfwWin.context = createLegacyContext( *fbconfig ); - } - - XFree( fbconfig ); - - if( _glfwWin.context == NULL ) - { - fprintf(stderr, "Unable to create OpenGL context\n"); - return GL_FALSE; - } - - _glfwWin.fbconfigID = fbconfigID; - - return GL_TRUE; -} - -#undef setGLXattrib - - -//======================================================================== -// Initialize GLX-specific extensions -//======================================================================== - -static void initGLXExtensions( void ) -{ - // This needs to include every function pointer loaded below - _glfwWin.SwapIntervalEXT = NULL; - _glfwWin.SwapIntervalMESA = NULL; - _glfwWin.SwapIntervalSGI = NULL; - _glfwWin.GetFBConfigAttribSGIX = NULL; - _glfwWin.ChooseFBConfigSGIX = NULL; - _glfwWin.CreateContextWithConfigSGIX = NULL; - _glfwWin.GetVisualFromFBConfigSGIX = NULL; - _glfwWin.CreateContextAttribsARB = NULL; - - // This needs to include every extension used below - _glfwWin.has_GLX_SGIX_fbconfig = GL_FALSE; - _glfwWin.has_GLX_EXT_swap_control = GL_FALSE; - _glfwWin.has_GLX_MESA_swap_control = GL_FALSE; - _glfwWin.has_GLX_SGI_swap_control = GL_FALSE; - _glfwWin.has_GLX_ARB_multisample = GL_FALSE; - _glfwWin.has_GLX_ARB_create_context = GL_FALSE; - _glfwWin.has_GLX_ARB_create_context_profile = GL_FALSE; - - if( _glfwPlatformExtensionSupported( "GLX_EXT_swap_control" ) ) - { - _glfwWin.SwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC) - _glfwPlatformGetProcAddress( "glXSwapIntervalEXT" ); - - if( _glfwWin.SwapIntervalEXT ) - { - _glfwWin.has_GLX_EXT_swap_control = GL_TRUE; - } - } - - if( _glfwPlatformExtensionSupported( "GLX_MESA_swap_control" ) ) - { - _glfwWin.SwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC) - _glfwPlatformGetProcAddress( "glXSwapIntervalMESA" ); - - if( _glfwWin.SwapIntervalMESA ) - { - _glfwWin.has_GLX_MESA_swap_control = GL_TRUE; - } - } - - if( _glfwPlatformExtensionSupported( "GLX_SGI_swap_control" ) ) - { - _glfwWin.SwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC) - _glfwPlatformGetProcAddress( "glXSwapIntervalSGI" ); - - if( _glfwWin.SwapIntervalSGI ) - { - _glfwWin.has_GLX_SGI_swap_control = GL_TRUE; - } - } - - if( _glfwPlatformExtensionSupported( "GLX_SGIX_fbconfig" ) ) - { - _glfwWin.GetFBConfigAttribSGIX = (PFNGLXGETFBCONFIGATTRIBSGIXPROC) - _glfwPlatformGetProcAddress( "glXGetFBConfigAttribSGIX" ); - _glfwWin.ChooseFBConfigSGIX = (PFNGLXCHOOSEFBCONFIGSGIXPROC) - _glfwPlatformGetProcAddress( "glXChooseFBConfigSGIX" ); - _glfwWin.CreateContextWithConfigSGIX = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) - _glfwPlatformGetProcAddress( "glXCreateContextWithConfigSGIX" ); - _glfwWin.GetVisualFromFBConfigSGIX = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) - _glfwPlatformGetProcAddress( "glXGetVisualFromFBConfigSGIX" ); - - if( _glfwWin.GetFBConfigAttribSGIX && - _glfwWin.ChooseFBConfigSGIX && - _glfwWin.CreateContextWithConfigSGIX && - _glfwWin.GetVisualFromFBConfigSGIX ) - { - _glfwWin.has_GLX_SGIX_fbconfig = GL_TRUE; - } - } - - if( _glfwPlatformExtensionSupported( "GLX_ARB_multisample" ) ) - { - _glfwWin.has_GLX_ARB_multisample = GL_TRUE; - } - - if( _glfwPlatformExtensionSupported( "GLX_ARB_create_context" ) ) - { - _glfwWin.CreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC) - _glfwPlatformGetProcAddress( "glXCreateContextAttribsARB" ); - - if( _glfwWin.CreateContextAttribsARB ) - { - _glfwWin.has_GLX_ARB_create_context = GL_TRUE; - } - } - - if( _glfwPlatformExtensionSupported( "GLX_ARB_create_context_profile" ) ) - { - _glfwWin.has_GLX_ARB_create_context_profile = GL_TRUE; - } -} - - -//======================================================================== -// Create the X11 window (and its colormap) -//======================================================================== - -static GLboolean createWindow( int width, int height, - const _GLFWwndconfig *wndconfig ) -{ - XEvent event; - unsigned long wamask; - XSetWindowAttributes wa; - - // Every window needs a colormap - // Create one based on the visual used by the current context - - _glfwWin.colormap = XCreateColormap( _glfwLibrary.display, - _glfwWin.root, - _glfwWin.visual->visual, - AllocNone ); - - // Create the actual window - { - wamask = CWBorderPixel | CWColormap | CWEventMask; - - wa.colormap = _glfwWin.colormap; - wa.border_pixel = 0; - wa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask | - PointerMotionMask | ButtonPressMask | ButtonReleaseMask | - ExposureMask | FocusChangeMask | VisibilityChangeMask; - - if( wndconfig->mode == GLFW_WINDOW ) - { - // The /only/ reason we are setting the background pixel here is - // that otherwise our window wont get any decorations on systems - // using Compiz on Intel hardware - wa.background_pixel = BlackPixel( _glfwLibrary.display, _glfwWin.screen ); - wamask |= CWBackPixel; - } - - _glfwWin.window = XCreateWindow( - _glfwLibrary.display, - _glfwWin.root, - 0, 0, // Upper left corner of this window on root - _glfwWin.width, _glfwWin.height, - 0, // Border width - _glfwWin.visual->depth, // Color depth - InputOutput, - _glfwWin.visual->visual, - wamask, - &wa - ); - if( !_glfwWin.window ) - { - _glfwPlatformCloseWindow(); - return GL_FALSE; - } - } - - // Check whether an EWMH-compliant window manager is running - _glfwWin.hasEWMH = checkForEWMH(); - - if( _glfwWin.fullscreen && !_glfwWin.hasEWMH ) - { - // This is the butcher's way of removing window decorations - // Setting the override-redirect attribute on a window makes the window - // manager ignore the window completely (ICCCM, section 4) - // The good thing is that this makes undecorated fullscreen windows - // easy to do; the bad thing is that we have to do everything manually - // and some things (like iconify/restore) won't work at all, as they're - // usually performed by the window manager - - XSetWindowAttributes attributes; - attributes.override_redirect = True; - XChangeWindowAttributes( _glfwLibrary.display, - _glfwWin.window, - CWOverrideRedirect, - &attributes ); - - _glfwWin.overrideRedirect = GL_TRUE; - } - - // Find or create the protocol atom for window close notifications - _glfwWin.wmDeleteWindow = XInternAtom( _glfwLibrary.display, - "WM_DELETE_WINDOW", - False ); - - // Declare the WM protocols we support - { - int count = 0; - Atom protocols[2]; - - // The WM_DELETE_WINDOW ICCCM protocol - // Basic window close notification protocol - if( _glfwWin.wmDeleteWindow != None ) - { - protocols[count++] = _glfwWin.wmDeleteWindow; - } - - // The _NET_WM_PING EWMH protocol - // Tells the WM to ping our window and flag us as unresponsive if we - // don't reply within a few seconds - if( _glfwWin.wmPing != None ) - { - protocols[count++] = _glfwWin.wmPing; - } - - if( count > 0 ) - { - XSetWMProtocols( _glfwLibrary.display, _glfwWin.window, - protocols, count ); - } - } - - // Set ICCCM WM_HINTS property - { - XWMHints *hints = XAllocWMHints(); - if( !hints ) - { - _glfwPlatformCloseWindow(); - return GL_FALSE; - } - - hints->flags = StateHint; - hints->initial_state = NormalState; - - XSetWMHints( _glfwLibrary.display, _glfwWin.window, hints ); - XFree( hints ); - } - - // Set ICCCM WM_NORMAL_HINTS property (even if no parts are set) - { - XSizeHints *hints = XAllocSizeHints(); - if( !hints ) - { - _glfwPlatformCloseWindow(); - return GL_FALSE; - } - - hints->flags = 0; - - if( wndconfig->windowNoResize && !_glfwWin.fullscreen ) - { - hints->flags |= (PMinSize | PMaxSize); - hints->min_width = hints->max_width = _glfwWin.width; - hints->min_height = hints->max_height = _glfwWin.height; - } - - XSetWMNormalHints( _glfwLibrary.display, _glfwWin.window, hints ); - XFree( hints ); - } - - _glfwPlatformSetWindowTitle( "GLFW Window" ); - - // Make sure the window is mapped before proceeding - XMapWindow( _glfwLibrary.display, _glfwWin.window ); - XPeekIfEvent( _glfwLibrary.display, &event, isMapNotify, - (char*)_glfwWin.window ); - - return GL_TRUE; -} - - -//======================================================================== -// Enter fullscreen mode -//======================================================================== - -static void enterFullscreenMode( void ) -{ - if( !_glfwWin.Saver.changed ) - { - // Remember old screen saver settings - XGetScreenSaver( _glfwLibrary.display, - &_glfwWin.Saver.timeout, &_glfwWin.Saver.interval, - &_glfwWin.Saver.blanking, &_glfwWin.Saver.exposure ); - - // Disable screen saver - XSetScreenSaver( _glfwLibrary.display, 0, 0, DontPreferBlanking, - DefaultExposures ); - - _glfwWin.Saver.changed = GL_TRUE; - } - - _glfwSetVideoMode( _glfwWin.screen, - &_glfwWin.width, &_glfwWin.height, - &_glfwWin.refreshRate ); - - if( _glfwWin.hasEWMH && - _glfwWin.wmState != None && - _glfwWin.wmStateFullscreen != None ) - { - if( _glfwWin.wmActiveWindow != None ) - { - // Ask the window manager to raise and focus the GLFW window - // Only focused windows with the _NET_WM_STATE_FULLSCREEN state end - // up on top of all other windows ("Stacking order" in EWMH spec) - - XEvent event; - memset( &event, 0, sizeof(event) ); - - event.type = ClientMessage; - event.xclient.window = _glfwWin.window; - event.xclient.format = 32; // Data is 32-bit longs - event.xclient.message_type = _glfwWin.wmActiveWindow; - event.xclient.data.l[0] = 1; // Sender is a normal application - event.xclient.data.l[1] = 0; // We don't really know the timestamp - - XSendEvent( _glfwLibrary.display, - _glfwWin.root, - False, - SubstructureNotifyMask | SubstructureRedirectMask, - &event ); - } - - // Ask the window manager to make the GLFW window a fullscreen window - // Fullscreen windows are undecorated and, when focused, are kept - // on top of all other windows - - XEvent event; - memset( &event, 0, sizeof(event) ); - - event.type = ClientMessage; - event.xclient.window = _glfwWin.window; - event.xclient.format = 32; // Data is 32-bit longs - event.xclient.message_type = _glfwWin.wmState; - event.xclient.data.l[0] = _NET_WM_STATE_ADD; - event.xclient.data.l[1] = _glfwWin.wmStateFullscreen; - event.xclient.data.l[2] = 0; // No secondary property - event.xclient.data.l[3] = 1; // Sender is a normal application - - XSendEvent( _glfwLibrary.display, - _glfwWin.root, - False, - SubstructureNotifyMask | SubstructureRedirectMask, - &event ); - } - else if( _glfwWin.overrideRedirect ) - { - // In override-redirect mode, we have divorced ourselves from the - // window manager, so we need to do everything manually - - XRaiseWindow( _glfwLibrary.display, _glfwWin.window ); - XSetInputFocus( _glfwLibrary.display, _glfwWin.window, - RevertToParent, CurrentTime ); - XMoveWindow( _glfwLibrary.display, _glfwWin.window, 0, 0 ); - XResizeWindow( _glfwLibrary.display, _glfwWin.window, - _glfwWin.width, _glfwWin.height ); - } - - if( _glfwWin.mouseLock ) - { - _glfwPlatformHideMouseCursor(); - } - - // HACK: Try to get window inside viewport (for virtual displays) by moving - // the mouse cursor to the upper left corner (and then to the center) - // This hack should be harmless on saner systems as well - XWarpPointer( _glfwLibrary.display, None, _glfwWin.window, 0,0,0,0, 0,0 ); - XWarpPointer( _glfwLibrary.display, None, _glfwWin.window, 0,0,0,0, - _glfwWin.width / 2, _glfwWin.height / 2 ); -} - -//======================================================================== -// Leave fullscreen mode -//======================================================================== - -static void leaveFullscreenMode( void ) -{ - _glfwRestoreVideoMode(); - - // Did we change the screen saver setting? - if( _glfwWin.Saver.changed ) - { - // Restore old screen saver settings - XSetScreenSaver( _glfwLibrary.display, - _glfwWin.Saver.timeout, - _glfwWin.Saver.interval, - _glfwWin.Saver.blanking, - _glfwWin.Saver.exposure ); - - _glfwWin.Saver.changed = GL_FALSE; - } - - if( _glfwWin.hasEWMH && - _glfwWin.wmState != None && - _glfwWin.wmStateFullscreen != None ) - { - // Ask the window manager to make the GLFW window a normal window - // Normal windows usually have frames and other decorations - - XEvent event; - memset( &event, 0, sizeof(event) ); - - event.type = ClientMessage; - event.xclient.window = _glfwWin.window; - event.xclient.format = 32; // Data is 32-bit longs - event.xclient.message_type = _glfwWin.wmState; - event.xclient.data.l[0] = _NET_WM_STATE_REMOVE; - event.xclient.data.l[1] = _glfwWin.wmStateFullscreen; - event.xclient.data.l[2] = 0; // No secondary property - event.xclient.data.l[3] = 1; // Sender is a normal application - - XSendEvent( _glfwLibrary.display, - _glfwWin.root, - False, - SubstructureNotifyMask | SubstructureRedirectMask, - &event ); - } - - if( _glfwWin.mouseLock ) - { - _glfwPlatformShowMouseCursor(); - } -} - -//======================================================================== -// Get and process next X event (called by _glfwPlatformPollEvents) -// Returns GL_TRUE if a window close request was received -//======================================================================== - -static GLboolean processSingleEvent( void ) -{ - XEvent event; - XNextEvent( _glfwLibrary.display, &event ); - - switch( event.type ) - { - case KeyPress: - { - // A keyboard key was pressed - - // Translate and report key press - _glfwInputKey( translateKey( event.xkey.keycode ), GLFW_PRESS ); - - // Translate and report character input - if( _glfwWin.charCallback ) - { - _glfwInputChar( translateChar( &event.xkey ), GLFW_PRESS ); - } - break; - } - - case KeyRelease: - { - // A keyboard key was released - - // Do not report key releases for key repeats. For key repeats we - // will get KeyRelease/KeyPress pairs with similar or identical - // time stamps. User selected key repeat filtering is handled in - // _glfwInputKey()/_glfwInputChar(). - if( XEventsQueued( _glfwLibrary.display, QueuedAfterReading ) ) - { - XEvent nextEvent; - XPeekEvent( _glfwLibrary.display, &nextEvent ); - - if( nextEvent.type == KeyPress && - nextEvent.xkey.window == event.xkey.window && - nextEvent.xkey.keycode == event.xkey.keycode ) - { - // This last check is a hack to work around key repeats - // leaking through due to some sort of time drift - // Toshiyuki Takahashi can press a button 16 times per - // second so it's fairly safe to assume that no human is - // pressing the key 50 times per second (value is ms) - if( ( nextEvent.xkey.time - event.xkey.time ) < 20 ) - { - // Do not report anything for this event - break; - } - } - } - - // Translate and report key release - _glfwInputKey( translateKey( event.xkey.keycode ), GLFW_RELEASE ); - - // Translate and report character input - if( _glfwWin.charCallback ) - { - _glfwInputChar( translateChar( &event.xkey ), GLFW_RELEASE ); - } - break; - } - - case ButtonPress: - { - // A mouse button was pressed or a scrolling event occurred - - if( event.xbutton.button == Button1 ) - { - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_LEFT, GLFW_PRESS ); - } - else if( event.xbutton.button == Button2 ) - { - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_MIDDLE, GLFW_PRESS ); - } - else if( event.xbutton.button == Button3 ) - { - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_RIGHT, GLFW_PRESS ); - } - - // XFree86 3.3.2 and later translates mouse wheel up/down into - // mouse button 4 & 5 presses - else if( event.xbutton.button == Button4 ) - { - _glfwInput.WheelPos++; // To verify: is this up or down? - if( _glfwWin.mouseWheelCallback ) - { - _glfwWin.mouseWheelCallback( _glfwInput.WheelPos ); - } - } - else if( event.xbutton.button == Button5 ) - { - _glfwInput.WheelPos--; - if( _glfwWin.mouseWheelCallback ) - { - _glfwWin.mouseWheelCallback( _glfwInput.WheelPos ); - } - } - break; - } - - case ButtonRelease: - { - // A mouse button was released - - if( event.xbutton.button == Button1 ) - { - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_LEFT, - GLFW_RELEASE ); - } - else if( event.xbutton.button == Button2 ) - { - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_MIDDLE, - GLFW_RELEASE ); - } - else if( event.xbutton.button == Button3 ) - { - _glfwInputMouseClick( GLFW_MOUSE_BUTTON_RIGHT, - GLFW_RELEASE ); - } - break; - } - - case MotionNotify: - { - // The mouse cursor was moved - - if( event.xmotion.x != _glfwInput.CursorPosX || - event.xmotion.y != _glfwInput.CursorPosY ) - { - // The mouse cursor was moved and we didn't do it - - if( _glfwWin.mouseLock ) - { - if( _glfwWin.pointerHidden ) - { - _glfwInput.MousePosX += event.xmotion.x - - _glfwInput.CursorPosX; - _glfwInput.MousePosY += event.xmotion.y - - _glfwInput.CursorPosY; - } - } - else - { - _glfwInput.MousePosX = event.xmotion.x; - _glfwInput.MousePosY = event.xmotion.y; - } - - _glfwInput.CursorPosX = event.xmotion.x; - _glfwInput.CursorPosY = event.xmotion.y; - _glfwInput.MouseMoved = GL_TRUE; - - if( _glfwWin.mousePosCallback ) - { - _glfwWin.mousePosCallback( _glfwInput.MousePosX, - _glfwInput.MousePosY ); - } - } - break; - } - - case ConfigureNotify: - { - if( event.xconfigure.width != _glfwWin.width || - event.xconfigure.height != _glfwWin.height ) - { - // The window was resized - - _glfwWin.width = event.xconfigure.width; - _glfwWin.height = event.xconfigure.height; - if( _glfwWin.windowSizeCallback ) - { - _glfwWin.windowSizeCallback( _glfwWin.width, - _glfwWin.height ); - } - } - break; - } - - case ClientMessage: - { - if( (Atom) event.xclient.data.l[ 0 ] == _glfwWin.wmDeleteWindow ) - { - // The window manager was asked to close the window, for example by - // the user pressing a 'close' window decoration button - - return GL_TRUE; - } - else if( _glfwWin.wmPing != None && - (Atom) event.xclient.data.l[ 0 ] == _glfwWin.wmPing ) - { - // The window manager is pinging us to make sure we are still - // responding to events - - event.xclient.window = _glfwWin.root; - XSendEvent( _glfwLibrary.display, - event.xclient.window, - False, - SubstructureNotifyMask | SubstructureRedirectMask, - &event ); - } - - break; - } - - case MapNotify: - { - // The window was mapped - - _glfwWin.iconified = GL_FALSE; - break; - } - - case UnmapNotify: - { - // The window was unmapped - - _glfwWin.iconified = GL_TRUE; - break; - } - - case FocusIn: - { - // The window gained focus - - _glfwWin.active = GL_TRUE; - - if( _glfwWin.mouseLock ) - { - _glfwPlatformHideMouseCursor(); - } - - break; - } - - case FocusOut: - { - // The window lost focus - - _glfwWin.active = GL_FALSE; - _glfwInputDeactivation(); - - if( _glfwWin.mouseLock ) - { - _glfwPlatformShowMouseCursor(); - } - - break; - } - - case Expose: - { - // The window's contents was damaged - - if( _glfwWin.windowRefreshCallback ) - { - _glfwWin.windowRefreshCallback(); - } - break; - } - - // Was the window destroyed? - case DestroyNotify: - return GL_FALSE; - - default: - { -#if defined( _GLFW_HAS_XRANDR ) - switch( event.type - _glfwLibrary.XRandR.eventBase ) - { - case RRScreenChangeNotify: - { - // Show XRandR that we really care - XRRUpdateConfiguration( &event ); - break; - } - } -#endif - break; - } - } - - // The window was not destroyed - return GL_FALSE; -} - - - -//************************************************************************ -//**** Platform implementation functions **** -//************************************************************************ - -//======================================================================== -// Here is where the window is created, and -// the OpenGL rendering context is created -//======================================================================== - -int _glfwPlatformOpenWindow( int width, int height, - const _GLFWwndconfig* wndconfig, - const _GLFWfbconfig* fbconfig ) -{ - _GLFWfbconfig closest; - - // Clear platform specific GLFW window state - _glfwWin.refreshRate = wndconfig->refreshRate; - _glfwWin.windowNoResize = wndconfig->windowNoResize; - - // As the 2.x API doesn't understand multiple display devices, we hardcode - // this choice and hope for the best - _glfwWin.screen = DefaultScreen( _glfwLibrary.display ); - _glfwWin.root = RootWindow( _glfwLibrary.display, _glfwWin.screen ); - - // Create the invisible cursor for hidden cursor mode - _glfwWin.cursor = createNULLCursor( _glfwLibrary.display, _glfwWin.root ); - - initGLXExtensions(); - - // Choose the best available fbconfig - { - unsigned int fbcount; - _GLFWfbconfig *fbconfigs; - const _GLFWfbconfig *result; - - fbconfigs = getFBConfigs( &fbcount ); - if( !fbconfigs ) - { - return GL_FALSE; - } - - result = _glfwChooseFBConfig( fbconfig, fbconfigs, fbcount ); - if( !result ) - { - free( fbconfigs ); - return GL_FALSE; - } - - closest = *result; - free( fbconfigs ); - } - - if( !createContext( wndconfig, (GLXFBConfigID) closest.platformID ) ) - { - return GL_FALSE; - } - - if( !createWindow( width, height, wndconfig ) ) - { - return GL_FALSE; - } - - if( wndconfig->mode == GLFW_FULLSCREEN ) - { -#if defined( _GLFW_HAS_XRANDR ) - // Request screen change notifications - if( _glfwLibrary.XRandR.available ) - { - XRRSelectInput( _glfwLibrary.display, - _glfwWin.window, - RRScreenChangeNotifyMask ); - } -#endif - enterFullscreenMode(); - } - - // Process the window map event and any other that may have arrived - _glfwPlatformPollEvents(); - - // Retrieve and set initial cursor position - { - Window window, root; - int windowX, windowY, rootX, rootY; - unsigned int mask; - - XQueryPointer( _glfwLibrary.display, - _glfwWin.window, - &root, - &window, - &rootX, &rootY, - &windowX, &windowY, - &mask ); - - // TODO: Probably check for some corner cases here. - - _glfwInput.MousePosX = windowX; - _glfwInput.MousePosY = windowY; - } - - // Connect the context to the window - glXMakeCurrent( _glfwLibrary.display, _glfwWin.window, _glfwWin.context ); - - return GL_TRUE; -} - - -//======================================================================== -// Properly kill the window/video display -//======================================================================== - -void _glfwPlatformCloseWindow( void ) -{ - if( _glfwWin.fullscreen ) - { - leaveFullscreenMode(); - } - - if( _glfwWin.context ) - { - // Release and destroy the context - glXMakeCurrent( _glfwLibrary.display, None, NULL ); - glXDestroyContext( _glfwLibrary.display, _glfwWin.context ); - _glfwWin.context = NULL; - } - - if( _glfwWin.visual ) - { - XFree( _glfwWin.visual ); - _glfwWin.visual = NULL; - } - - if( _glfwWin.window ) - { - XUnmapWindow( _glfwLibrary.display, _glfwWin.window ); - XDestroyWindow( _glfwLibrary.display, _glfwWin.window ); - _glfwWin.window = (Window) 0; - } - - if( _glfwWin.colormap ) - { - XFreeColormap( _glfwLibrary.display, _glfwWin.colormap ); - _glfwWin.colormap = (Colormap) 0; - } - - if( _glfwWin.cursor ) - { - XFreeCursor( _glfwLibrary.display, _glfwWin.cursor ); - _glfwWin.cursor = (Cursor) 0; - } -} - - -//======================================================================== -// Set the window title -//======================================================================== - -void _glfwPlatformSetWindowTitle( const char *title ) -{ - // Set window & icon title - XStoreName( _glfwLibrary.display, _glfwWin.window, title ); - XSetIconName( _glfwLibrary.display, _glfwWin.window, title ); -} - - -//======================================================================== -// Set the window size -//======================================================================== - -void _glfwPlatformSetWindowSize( int width, int height ) -{ - int mode = 0, rate, sizeChanged = GL_FALSE; - - rate = _glfwWin.refreshRate; - - if( _glfwWin.fullscreen ) - { - // Get the closest matching video mode for the specified window size - mode = _glfwGetClosestVideoMode( _glfwWin.screen, &width, &height, &rate ); - } - - if( _glfwWin.windowNoResize ) - { - // Update window size restrictions to match new window size - - XSizeHints *hints = XAllocSizeHints(); - - hints->flags |= (PMinSize | PMaxSize); - hints->min_width = hints->max_width = width; - hints->min_height = hints->max_height = height; - - XSetWMNormalHints( _glfwLibrary.display, _glfwWin.window, hints ); - XFree( hints ); - } - - // Change window size before changing fullscreen mode? - if( _glfwWin.fullscreen && (width > _glfwWin.width) ) - { - XResizeWindow( _glfwLibrary.display, _glfwWin.window, width, height ); - sizeChanged = GL_TRUE; - } - - if( _glfwWin.fullscreen ) - { - // Change video mode, keeping current refresh rate - _glfwSetVideoModeMODE( _glfwWin.screen, mode, _glfwWin.refreshRate ); - } - - // Set window size (if not already changed) - if( !sizeChanged ) - { - XResizeWindow( _glfwLibrary.display, _glfwWin.window, width, height ); - } -} - - -//======================================================================== -// Set the window position. -//======================================================================== - -void _glfwPlatformSetWindowPos( int x, int y ) -{ - XMoveWindow( _glfwLibrary.display, _glfwWin.window, x, y ); -} - - -//======================================================================== -// Window iconification -//======================================================================== - -void _glfwPlatformIconifyWindow( void ) -{ - if( _glfwWin.overrideRedirect ) - { - // We can't iconify/restore override-redirect windows, as that's - // performed by the window manager - return; - } - - XIconifyWindow( _glfwLibrary.display, _glfwWin.window, _glfwWin.screen ); -} - - -//======================================================================== -// Window un-iconification -//======================================================================== - -void _glfwPlatformRestoreWindow( void ) -{ - if( _glfwWin.overrideRedirect ) - { - // We can't iconify/restore override-redirect windows, as that's - // performed by the window manager - return; - } - - XMapWindow( _glfwLibrary.display, _glfwWin.window ); -} - - -//======================================================================== -// Swap OpenGL buffers and poll any new events -//======================================================================== - -void _glfwPlatformSwapBuffers( void ) -{ - // Update display-buffer - glXSwapBuffers( _glfwLibrary.display, _glfwWin.window ); -} - - -//======================================================================== -// Set double buffering swap interval -//======================================================================== - -void _glfwPlatformSwapInterval( int interval ) -{ - if( _glfwWin.has_GLX_EXT_swap_control ) - { - _glfwWin.SwapIntervalEXT( _glfwLibrary.display, - _glfwWin.window, - interval ); - } - else if( _glfwWin.has_GLX_MESA_swap_control ) - { - _glfwWin.SwapIntervalMESA( interval ); - } - else if( _glfwWin.has_GLX_SGI_swap_control ) - { - if( interval > 0 ) - { - _glfwWin.SwapIntervalSGI( interval ); - } - } -} - - -//======================================================================== -// Read back framebuffer parameters from the context -//======================================================================== - -void _glfwPlatformRefreshWindowParams( void ) -{ - int dummy; - GLXFBConfig *fbconfig; -#if defined( _GLFW_HAS_XRANDR ) - XRRScreenConfiguration *sc; -#elif defined( _GLFW_HAS_XF86VIDMODE ) - XF86VidModeModeLine modeline; - int dotclock; - float pixels_per_second, pixels_per_frame; -#endif - int attribs[] = { GLX_FBCONFIG_ID, _glfwWin.fbconfigID, None }; - - if( _glfwWin.has_GLX_SGIX_fbconfig ) - { - fbconfig = _glfwWin.ChooseFBConfigSGIX( _glfwLibrary.display, - _glfwWin.screen, - attribs, - &dummy ); - } - else - { - fbconfig = glXChooseFBConfig( _glfwLibrary.display, - _glfwWin.screen, - attribs, - &dummy ); - } - - if( fbconfig == NULL ) - { - // This should never ever happen - // TODO: Figure out what to do when this happens - fprintf( stderr, "Cannot find known GLXFBConfig by ID. " - "This cannot happen. Have a nice day.\n"); - abort(); - } - - // There is no clear definition of an "accelerated" context on X11/GLX, and - // true sounds better than false, so we hardcode true here - _glfwWin.accelerated = GL_TRUE; - - _glfwWin.redBits = getFBConfigAttrib( *fbconfig, GLX_RED_SIZE ); - _glfwWin.greenBits = getFBConfigAttrib( *fbconfig, GLX_GREEN_SIZE ); - _glfwWin.blueBits = getFBConfigAttrib( *fbconfig, GLX_BLUE_SIZE ); - - _glfwWin.alphaBits = getFBConfigAttrib( *fbconfig, GLX_ALPHA_SIZE ); - _glfwWin.depthBits = getFBConfigAttrib( *fbconfig, GLX_DEPTH_SIZE ); - _glfwWin.stencilBits = getFBConfigAttrib( *fbconfig, GLX_STENCIL_SIZE ); - - _glfwWin.accumRedBits = getFBConfigAttrib( *fbconfig, GLX_ACCUM_RED_SIZE ); - _glfwWin.accumGreenBits = getFBConfigAttrib( *fbconfig, GLX_ACCUM_GREEN_SIZE ); - _glfwWin.accumBlueBits = getFBConfigAttrib( *fbconfig, GLX_ACCUM_BLUE_SIZE ); - _glfwWin.accumAlphaBits = getFBConfigAttrib( *fbconfig, GLX_ACCUM_ALPHA_SIZE ); - - _glfwWin.auxBuffers = getFBConfigAttrib( *fbconfig, GLX_AUX_BUFFERS ); - _glfwWin.stereo = getFBConfigAttrib( *fbconfig, GLX_STEREO ) ? 1 : 0; - - // Get FSAA buffer sample count - if( _glfwWin.has_GLX_ARB_multisample ) - { - _glfwWin.samples = getFBConfigAttrib( *fbconfig, GLX_SAMPLES ); - } - else - { - _glfwWin.samples = 0; - } - - // Default to refresh rate unknown (=0 according to GLFW spec) - _glfwWin.refreshRate = 0; - - // Retrieve refresh rate if possible -#if defined( _GLFW_HAS_XRANDR ) - if( _glfwLibrary.XRandR.available ) - { - sc = XRRGetScreenInfo( _glfwLibrary.display, _glfwWin.root ); - _glfwWin.refreshRate = XRRConfigCurrentRate( sc ); - XRRFreeScreenConfigInfo( sc ); - } -#elif defined( _GLFW_HAS_XF86VIDMODE ) - if( _glfwLibrary.XF86VidMode.available ) - { - // Use the XF86VidMode extension to get current video mode - XF86VidModeGetModeLine( _glfwLibrary.display, _glfwWin.screen, - &dotclock, &modeline ); - pixels_per_second = 1000.0f * (float) dotclock; - pixels_per_frame = (float) modeline.htotal * modeline.vtotal; - _glfwWin.refreshRate = (int)(pixels_per_second/pixels_per_frame+0.5); - } -#endif - - XFree( fbconfig ); -} - - -//======================================================================== -// Poll for new window and input events -//======================================================================== - -void _glfwPlatformPollEvents( void ) -{ - GLboolean closeRequested = GL_FALSE; - - // Flag that the cursor has not moved - _glfwInput.MouseMoved = GL_FALSE; - - // Process all pending events - while( XPending( _glfwLibrary.display ) ) - { - if( processSingleEvent() ) - { - closeRequested = GL_TRUE; - } - } - - // Did we get mouse movement in fully enabled hidden cursor mode? - if( _glfwInput.MouseMoved && _glfwWin.pointerHidden ) - { - _glfwPlatformSetMouseCursorPos( _glfwWin.width/2, - _glfwWin.height/2 ); - - // NOTE: This is a temporary fix. It works as long as you use offsets - // accumulated over the course of a frame, instead of performing - // the necessary actions per callback call. - XFlush( _glfwLibrary.display ); - } - - if( closeRequested && _glfwWin.windowCloseCallback ) - { - closeRequested = _glfwWin.windowCloseCallback(); - } - if( closeRequested ) - { - glfwCloseWindow(); - } -} - - -//======================================================================== -// Wait for new window and input events -//======================================================================== - -void _glfwPlatformWaitEvents( void ) -{ - XEvent event; - - // Block waiting for an event to arrive - XNextEvent( _glfwLibrary.display, &event ); - XPutBackEvent( _glfwLibrary.display, &event ); - - _glfwPlatformPollEvents(); -} - - -//======================================================================== -// Hide mouse cursor (lock it) -//======================================================================== - -void _glfwPlatformHideMouseCursor( void ) -{ - // Hide cursor - if( !_glfwWin.pointerHidden ) - { - XDefineCursor( _glfwLibrary.display, _glfwWin.window, _glfwWin.cursor ); - _glfwWin.pointerHidden = GL_TRUE; - } - - // Grab cursor to user window - if( !_glfwWin.pointerGrabbed ) - { - if( XGrabPointer( _glfwLibrary.display, _glfwWin.window, True, - ButtonPressMask | ButtonReleaseMask | - PointerMotionMask, GrabModeAsync, GrabModeAsync, - _glfwWin.window, None, CurrentTime ) == - GrabSuccess ) - { - _glfwWin.pointerGrabbed = GL_TRUE; - } - } - - // Move cursor to the middle of the window - _glfwPlatformSetMouseCursorPos( _glfwWin.width / 2, _glfwWin.height / 2 ); -} - - -//======================================================================== -// Show mouse cursor (unlock it) -//======================================================================== - -void _glfwPlatformShowMouseCursor( void ) -{ - // Un-grab cursor (only in windowed mode: in fullscreen mode we still - // want the mouse grabbed in order to confine the cursor to the window - // area) - if( _glfwWin.pointerGrabbed ) - { - XUngrabPointer( _glfwLibrary.display, CurrentTime ); - _glfwWin.pointerGrabbed = GL_FALSE; - } - - // Show cursor - if( _glfwWin.pointerHidden ) - { - XUndefineCursor( _glfwLibrary.display, _glfwWin.window ); - _glfwWin.pointerHidden = GL_FALSE; - } -} - - -//======================================================================== -// Set physical mouse cursor position -//======================================================================== - -void _glfwPlatformSetMouseCursorPos( int x, int y ) -{ - // Store the new position so we can recognise it later - _glfwInput.CursorPosX = x; - _glfwInput.CursorPosY = y; - - XWarpPointer( _glfwLibrary.display, None, _glfwWin.window, 0,0,0,0, x, y ); -} - diff --git a/Core/SVS/src/drawer_asio.cpp b/Core/SVS/src/drawer_asio.cpp new file mode 100644 index 0000000000..e63fcc8063 --- /dev/null +++ b/Core/SVS/src/drawer_asio.cpp @@ -0,0 +1,186 @@ +#include +#include +#include +#include "drawer.h" +#include "common.h" +#include "sgnode.h" + +/**** + * Note: This is a new implementation of the drawer socket that uses the asio library + * it will be used in the cmake build process, replacing the old platform_specific code + ****/ + +std::ostream& write_vec3(std::ostream& os, const vec3& v) +{ + os << v(0) << " " << v(1) << " " << v(2); + return os; +} + +class ipcsocket +{ + public: + ipcsocket() : socket(io_context), is_connected(false) {} + + ~ipcsocket() + { + disconnect(); + } + + bool connect(const std::string& port) + { + if (is_connected) { + disconnect(); + } + try { + asio::ip::tcp::resolver resolver(io_context); + auto endpoints = resolver.resolve("127.0.0.1", port); + + asio::connect(socket, endpoints); + is_connected = true; + } catch (std::exception& e) { + // ignore + } + return is_connected; + } + + void disconnect() + { + if (!is_connected) { + return; + } + try { + socket.close(); + } catch (std::exception& e) { + // ignore + } + is_connected = false; + } + + bool send(const std::string& s) + { + if (!is_connected) { + return false; + } + try { + asio::write(socket, asio::buffer(s)); + return true; + } catch (std::exception& e) { + is_connected = false; + } + return false; + } + + private: + asio::io_context io_context; + asio::ip::tcp::socket socket; + bool is_connected; +}; + +drawer::drawer() : connected(false) +{ + sock = new ipcsocket(); +} + +drawer::~drawer() +{ + delete sock; +} + +bool drawer::connect(const std::string& path) +{ + connected = sock->connect(path); + return connected; +} + +void drawer::disconnect() +{ + if (connected) + { + sock->disconnect(); + } + connected = false; +} + +void drawer::add(const std::string& scn, const sgnode* n) +{ + if (!connected || !n->get_parent()) + { + return; + } + change(scn, n, SHAPE | POS | ROT | SCALE); +} + +void drawer::del(const std::string& scn, const sgnode* n) +{ + if (!connected) + { + return; + } + + std::stringstream ss; + ss << scn << " -" << n->get_id() << std::endl; + send(ss.str()); +} + +void drawer::change(const std::string& scn, const sgnode* n, int props) +{ + if (!connected) + { + return; + } + + vec3 p, s; + vec4 q; + std::stringstream ss; + + n->get_world_trans().to_prs(p, q, s); + ss << "+" << scn << " +" << n->get_id() << " "; + if (props & SHAPE) + { + std::string shape; + n->get_shape_sgel(shape); + ss << " " << shape << " "; + } + if (props & POS) + { + ss << " p "; + write_vec3(ss, p); + } + if (props & ROT) + { + ss << " r " << q(0) << " " << q(1) << " " << q(2) << " " << q(3) << " "; + } + if (props & SCALE) + { + ss << " s "; + write_vec3(ss, s); + } + ss << std::endl; + send(ss.str()); +} + +void drawer::delete_scene(const std::string& scn) +{ + if (!connected) + { + return; + } + + send(std::string("-") + scn + "\n"); +} + +void drawer::send(const std::string& s) +{ + if (!connected) + { + return; + } + if (s[s.size() - 1] != '\n') + { + connected = sock->send(s + '\n'); + } + else + { + connected = sock->send(s); + } +} diff --git a/Core/SVS/tests.txt b/Core/SVS/tests.txt deleted file mode 100644 index 932a65952e..0000000000 --- a/Core/SVS/tests.txt +++ /dev/null @@ -1,133 +0,0 @@ -# This is a sample configuration for the test_svs program. test_svs is intended -# to be a kind of unit test framework for verifying the correctness of filter -# implementations. It allows the user to easily set up a scene in SVS and check -# if filters applied to that scene will generate the expected results. -# -# This file has a line-oriented syntax. Each line can be one of the following: -# -# * An SGEL command -# * A test specification -# * One of the following single words: init, test, repl -# -# Run test_svs as follows: -# -# ./test_svs -# -# test_svs creates a Soar agent and then reads each line in the configuration -# sequentially. If the line is an SGEL command, it is sent to the SVS of the -# test agent. -# -# If the line is a test specification, it is translated into a production that -# puts an extract command on the SVS link. -# -# If the line is "init", the agent is reinitialized and all existing -# productions are excised. This also means that the SVS scene is cleared. -# -# If the line is "test", the agent runs for two decision cycles. This allows it -# to process all queued SGEL inputs and extract commands. Special productions -# in the agent will check the result of each extract command and report it to -# stdout as either success, failure, or syntax error. Existing test productions -# are then excised, but the agent is not reinitialized. Note that if the end of -# the file is reached and there are untested productions, an implicit test is -# executed. -# -# If the line is "repl", test_svs will enter a simple command line interface -# similar to TestCLI so that the user can inspect productions and working -# memory. Exit the REPL by sending Ctrl-D. test_svs will then continue -# processing the rest of the configuration file. -# -# Test specifications have the following syntax: -# -# want ... -# -# specifies the expected outcome of the filter. -# specifies the expected parameter set chosen by the filter, for use with -# many-to-one filters such as "closest". It should have the form -# -# ( ...) -# -# The parentheses are required. Either test can be "*" for don't care. -# -# is either: A node name, a numeric or string constant, or a -# recursive filter specification. Constants have to begin with "c:" so that -# they can be distinguished from node names. Recursive filters are surrounded -# by parentheses, as in -# -# "( ...)" -# -# This file can contain comments prepended with '#'. Long lines can be -# continued by ending the line with a backslash (\). - -# test intersect -a box1 box world v 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1 - -a box2 box world v 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1 - -a box3 box world v 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1 - -a pt1 point world v 0 0 0 p .5 .5 .5 -a line1 line world v 0 0 0 10 0 0 p -5 .5 .5 -c box2 p .5 .5 .5 -c box3 p 10 10 10 - -want t * intersect a box1 b box1 -want t * intersect a box1 b box2 -want f * intersect a box1 b box3 -want f * intersect a box2 b box3 -want t * intersect a pt1 b box1 -want t * intersect a pt1 b box2 -want f * intersect a pt1 b box3 -want t * intersect a line1 b box1 -want f * intersect a line1 b box3 - -# test ontop & above -c box2 p 0 0 1 -c box3 p 0 0 2 - -want t * on-top top box2 bottom box1 -want f * on-top top box1 bottom box2 -want t * on-top top box3 bottom box2 -want f * on-top top box2 bottom box2 -want f * on-top top box3 bottom box1 -want t * z-greater-than a box2 b box1 -want f * z-greater-than a box1 b box2 -want t * z-greater-than a box3 b box1 -want t * z-greater-than a box3 b box2 - -# test ball intersections -c box1 p 0 0 0 -a ball1 ball world b 1 -a ball2 ball world b 2 p -1 -1 -1 -a ball3 ball world b 2 p 2.2 2.2 2.2 - -want t * intersect a ball1 b box1 -want t * intersect a ball2 b box1 -want f * intersect a ball3 b box1 - -want t * compare a c:0.1 b c:1 compare c:lt -want f * compare a c:-.1 b c:2.0 compare c:gt -want t * compare a c:3 b c:3.0 compare c:eq - -# test closest -init -a b1 sometype world -a b2 sometype world p 1.5 0 0 -a b3 sometype world p 2 0 0 - -want * (a b1 b b2) closest a b1 b (combine n1 b2 n2 b3) -want * (a b2 b b3) closest a b2 b (combine n1 b1 n2 b3) - -# test if filter results respond to node changes -init -a b1 box world v 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1 -a b2 box world v 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1 p -10 0 0 - -want t * x-greater-than a b1 b b2 -want 9.0 * distance a b1 b b2 -want 10.0 * centroid_distance a b1 b b2 - -c b2 p 20 0 0 - -want f * x-greater-than a b1 b b2 -want 19.0 * distance a b1 b b2 -want 20.0 * centroid_distance a b1 b b2 diff --git a/Core/SVS/tests/SConstruct b/Core/SVS/tests/SConstruct deleted file mode 100644 index 48a48e4502..0000000000 --- a/Core/SVS/tests/SConstruct +++ /dev/null @@ -1,84 +0,0 @@ -import os - -jp = os.path.join - -HOME = os.environ['HOME'] -BUILD = jp(HOME, 'build/svs2') -OUT = jp(HOME, 'svsout') -SRC = jp('..', 'src') -ALG = jp(SRC, 'algorithms') -MDL = jp(SRC, 'models') - -if os.name == 'posix': - PLATFORM = jp(SRC, 'posix') -else: - PLATFORM = jp(SRC, 'windows') - -env = Environment( - CPPPATH = os.environ.get('CPATH','').split(':') + [SRC, ALG, MDL, PLATFORM, '../eigen' ], - #CPPFLAGS = ['-Og', '-g', '-Wno-enum-compare'], - CPPFLAGS = ['-g', '-Wno-enum-compare'], - LINKFLAGS = ['-g'], - LIBPATH = os.environ.get('LD_LIBRARY_PATH', '').split(':'), - LIBS = [ 'opencv_core', 'opencv_ml' ], -) - -def obj(names): - global env - - o = [] - for n in names: - a = n + '.cpp' - b = n + '.o' - if os.path.exists(a): - o.append(env.StaticObject(source = a, target = jp(BUILD, b))) - elif os.path.exists(jp(SRC, a)): - o.append(env.StaticObject(source = jp(SRC, a), target = jp(BUILD, b))) - elif os.path.exists(jp(ALG, a)): - o.append(env.StaticObject(source = jp(ALG, a), target = jp(BUILD, 'alg', b))) - elif os.path.exists(jp(MDL, a)): - o.append(env.StaticObject(source = jp(MDL, a), target = jp(BUILD, 'mdl', b))) - elif os.path.exists(jp(PLATFORM, a)): - o.append(env.StaticObject(source = jp(PLATFORM, a), target = jp(BUILD, 'platform', b))) - - return o - -def exe(name, objs): - p = env.Program(jp(OUT, name), obj(objs)) - env.Default(p) - -common = ['common', 'mat', 'serialize', 'timer', 'cliproxy', 'relation', 'platform_specific' ] - -run_lda = common + ['lda', 'run_lda'] -run_foil = common + ['foil', 'run_foil'] -test_foil = common + ['foil', 'test_foil'] -test_intervalset = common + ['test_intervalset'] -test_csp = common + ['foil', 'test_csp'] -combine_rels = common + ['combine_rels'] - -test_em = common + [ - 'scene_sig', - 'drawer', - 'ipcsocket', - 'sgnode', - 'model', - - 'nn', - 'lwr', - 'linear', - 'foil', - 'lda', - 'em', - 'classifier', - 'mode', - - 'test_em', -] - -#exe('run_lda', run_lda) -exe('run_foil', run_foil) -exe('combine_rels', combine_rels) -#exe('test_foil', test_foil) -#exe('test_intervalset', test_intervalset) -#exe('test_csp', test_csp) -exe('test_em', test_em) diff --git a/Core/SVS/tests/foil_tests/1.test b/Core/SVS/tests/foil_tests/1.test deleted file mode 100644 index 4748ac02a1..0000000000 --- a/Core/SVS/tests/foil_tests/1.test +++ /dev/null @@ -1,16 +0,0 @@ -O: 100,101,102. -T: 0,1. - -*intersect(T,O,O) #-- -0,100,101 -1,100,102 -. -*ramp(T,O) #- -0,101 -1,101 -. -target(T,O) ## -0,100 -; -1,100 -. diff --git a/Core/SVS/tests/foil_tests/neg.test b/Core/SVS/tests/foil_tests/neg.test deleted file mode 100644 index 379d1342a6..0000000000 --- a/Core/SVS/tests/foil_tests/neg.test +++ /dev/null @@ -1,11 +0,0 @@ -O: 100,101. -T: 0. - -*indicator(T,O) #- -0,101 -. -target(T,O) ## -0,100 -; -0,101 -. diff --git a/Core/SVS/tests/run_foil.cpp b/Core/SVS/tests/run_foil.cpp deleted file mode 100644 index 7dc7d26bda..0000000000 --- a/Core/SVS/tests/run_foil.cpp +++ /dev/null @@ -1,323 +0,0 @@ -#include -#include -#include -#include -#include -#include "foil.h" -#include "common.h" -#include "serialize.h" - -typedef std::vector clause_vec; - -struct multi_classifier -{ - std::vector clses; - map, clause_vec> pair_clauses; -}; - -struct inst -{ - int time; - int cls; -}; - -struct data -{ - relation_table rels; - int target; - std::vector insts; -}; - -data train; -int train_start, train_end, test_start, test_end; -bool print_clauses, print_votes, use_context; -std::vector test_files; - -double gettime() -{ - timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return (ts.tv_sec * 1e9 + ts.tv_nsec) / 1.0e6; -} - -void get_rels_at_time(const relation_table& rels, int time, relation_table& out) -{ - tuple tt(1); - tt[0] = time; - relation_table::const_iterator i, iend; - relation::const_iterator j, jend; - for (i = rels.begin(), iend = rels.end(); i != iend; ++i) - { - relation& r = out[i->first]; - r.reset(i->second.arity()); - for (j = i->second.begin(), jend = i->second.end(); j != jend; ++j) - { - if ((*j)[0] == time) - { - tuple t = *j; - t[0] = 0; - r.add(t); - } - } - } -} - -void learn(const relation& pos, const relation& neg, const relation_table& rels, clause_vec& clauses) -{ - FOIL foil; - - foil.set_problem(pos, neg, rels); - foil.learn(true, false); - for (int i = 0, iend = foil.num_clauses(); i < iend; ++i) - { - clauses.push_back(foil.get_clause(i)); - } -} - -void multi_learn(const data& train, multi_classifier& mc) -{ - map insts_by_class; - for (int i = 0, iend = train.insts.size(); i < iend; ++i) - { - int c = train.insts[i].cls; - relation& r = insts_by_class[c]; - if (r.arity() == 0) - { - r.reset(2); - } - r.add(i, train.target); - } - - map::iterator i, j, end; - for (i = insts_by_class.begin(), end = insts_by_class.end(); i != end; ++i) - { - for ((j = i)++; j != end; ++j) - { - pair p(i->first, j->first); - learn(i->second, j->second, train.rels, mc.pair_clauses[p]); - } - } -} - -bool classify(const std::vector& clauses, const relation_table& rels, int target) -{ - var_domains d; - d[0].insert(0); - d[1].insert(target); - for (int i = 0, iend = clauses.size(); i < iend; ++i) - { - var_domains d1 = d; - if (test_clause(clauses[i], rels, d1)) - { - return true; - } - } - return false; -} - -int multi_classify(const multi_classifier& c, const relation_table& rels, int target) -{ - map votes; - - map, clause_vec>::const_iterator k, kend; - for (k = c.pair_clauses.begin(), kend = c.pair_clauses.end(); k != kend; ++k) - { - int i = k->first.first, j = k->first.second; - if (classify(k->second, rels, target)) - { - votes[i]++; - if (print_votes) - { - std::cout << "[" << i << "]: " << j << std::endl; - } - } - else - { - votes[j]++; - if (print_votes) - { - std::cout << " " << i << " :[" << j << "]" << std::endl; - } - } - } - - int best = -1; - map::iterator i, iend; - for (i = votes.begin(), iend = votes.end(); i != iend; ++i) - { - if (best < 0 || votes[best] < i->second) - { - best = i->first; - } - } - return best; -} - -void print_multi(const multi_classifier& mc) -{ - map, clause_vec>::const_iterator i, iend; - for (i = mc.pair_clauses.begin(), iend = mc.pair_clauses.end(); i != iend; ++i) - { - std::cout << "For classes " << i->first.first << ", " << i->first.second << std::endl; - for (int j = 0, jend = i->second.size(); j < jend; ++j) - { - std::cout << "\t" << i->second[j] << std::endl; - } - } -} - -void parse_args(int argc, char* argv[]) -{ - int opt_end; - string line; - - train_start = test_start = 0; - train_end = test_end = -1; - print_clauses = print_votes = use_context = false; - for (int i = 1; i < argc;) - { - if (strcmp(argv[i], "-train") == 0) - { - if (i + 2 >= argc || !parse_int(argv[i + 1], train_start) || !parse_int(argv[i + 2], train_end)) - { - cerr << "invalid training range" << std::endl; - exit(1); - } - i += 3; - } - else if (strcmp(argv[i], "-test") == 0) - { - if (i + 2 >= argc || !parse_int(argv[i + 1], test_start) || !parse_int(argv[i + 2], test_end)) - { - cerr << "invalid testing range" << std::endl; - exit(1); - } - i += 3; - } - else if (strcmp(argv[i], "-p") == 0) - { - print_clauses = true; - i++; - } - else if (strcmp(argv[i], "-v") == 0) - { - print_votes = true; - i++; - } - else if (strcmp(argv[i], "-c") == 0) - { - use_context = true; - i++; - } - else if (argv[i][0] != '-') - { - opt_end = i; - break; - } - else - { - cerr << "unrecognized option: " << argv[i] << std::endl; - exit(1); - } - } - - if (argc - opt_end < 3) - { - cerr << "usage: " << argv[0] << " [ ... ]" << std::endl; - cerr << "options:" << std::endl - << "\t-train : training range" << std::endl - << "\t-test : testing range" << std::endl - << "\t-p : print clauses" << std::endl - << "\t-v : print votes" << std::endl - << "\t-c : use context only" << std::endl; - exit(1); - } - - if (!parse_int(argv[opt_end], train.target)) - { - cerr << "illegal target" << std::endl; - exit(1); - } - - ifstream train_rels_in(argv[opt_end + 1]), train_class_in(argv[opt_end + 2]); - if (!train_rels_in || !train_class_in) - { - cerr << "error opening files" << std::endl; - exit(1); - } - unserializer(train_rels_in) >> train.rels; - - for (int t = 0; getline(train_class_in, line); ++t) - { - inst i; - i.time = t; - if (!parse_int(line.c_str(), i.cls)) - { - cerr << "invalid training class on line " << t + 1 << std::endl; - exit(1); - } - if (t >= train_start && (t <= train_end || train_end == -1)) - { - train.insts.push_back(i); - } - } - - for (int i = opt_end + 3; i < argc; ++i) - { - test_files.push_back(argv[i]); - } -} - -int main(int argc, char* argv[]) -{ - parse_args(argc, argv); - - multi_classifier mc; - multi_learn(train, mc); - - if (print_clauses) - { - print_multi(mc); - } - - for (int i = 0, iend = test_files.size(); i < iend; ++i) - { - ifstream testin(test_files[i].c_str()); - if (!testin) - { - cerr << "error opening " << test_files[i] << std::endl; - exit(1); - } - relation_table test_rels; - unserializer(testin) >> test_rels; - interval_set test_times; - - test_rels["ball"].at_pos(0, test_times); - interval_set::const_iterator t, tend; - for (t = test_times.begin(), tend = test_times.end(); t != tend; ++t) - { - if (*t >= test_start && (*t <= test_end || test_end == -1)) - { - int c; - relation_table rt, crt; - get_rels_at_time(test_rels, *t, rt); - if (use_context) - { - get_context_rels(train.target, rt, crt); - c = multi_classify(mc, crt, train.target); - } - else - { - c = multi_classify(mc, rt, train.target); - } - if (print_votes) - { - std::cout << "class "; - } - std::cout << c << std::endl; - } - } - } - - return 0; -} diff --git a/Core/SVS/tests/run_lda.cpp b/Core/SVS/tests/run_lda.cpp deleted file mode 100644 index 29e38d89a4..0000000000 --- a/Core/SVS/tests/run_lda.cpp +++ /dev/null @@ -1,311 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "common.h" -#include "foil.h" -#include "serialize.h" -#include "linear.h" -#include "mat.h" -#include "lda.h" - -num_classifier* make_classifier(); -void read_data(const char* path, mat& X, std::vector& classes); -void run_print(int first, int argc, char* argv[]); -void run_test_set(int first, int argc, char* argv[]); -void run_cross_validation(int first, int argc, char* argv[]); -void run_serialize(int first, int argc, char* argv[]); - -bool input_serialized = false; -char* classifier_type = NULL; - -int main(int argc, char* argv[]) -{ - int i = 1; - - if (argc < 3) - { - cerr << "usage: " << argv[0] << " [options] [type] [operation]" << std::endl; - cerr << "options = -s (read serialized data)" << std::endl; - cerr << "type = lda | sign | dtree" << std::endl; - cerr << "operation = print, test_set, cv, serialize" << std::endl; - exit(1); - } - - while (i < argc && argv[i][0] == '-') - { - switch (argv[i][1]) - { - case 's': - input_serialized = true; - break; - default: - cerr << "unrecognized option " << argv[i] << std::endl; - exit(1); - break; - } - ++i; - } - - classifier_type = argv[i++]; - - if (strcmp(argv[i], "print") == 0) - { - run_print(++i, argc, argv); - } - else if (strcmp(argv[i], "test_set") == 0) - { - run_test_set(++i, argc, argv); - } - else if (strcmp(argv[i], "cv") == 0) - { - run_cross_validation(++i, argc, argv); - } - else if (strcmp(argv[i], "serialize") == 0) - { - run_serialize(++i, argc, argv); - } - else - { - cerr << "no such operation" << std::endl; - return 1; - } - - return 0; -} - -num_classifier* make_classifier() -{ - if (strcmp(classifier_type, "lda") == 0) - { - return new num_classifier(NC_LDA); - } - else if (strcmp(classifier_type, "sign") == 0) - { - return new num_classifier(NC_SIGN); - } - else if (strcmp(classifier_type, "dtree") == 0) - { - return new num_classifier(NC_DTREE); - } - cerr << "no such classifier type" << std::endl; - return NULL; -} - -void read_data(const char* path, mat& X, std::vector& classes) -{ - std::string line; - std::vector fields; - std::vector > data; - double x; - - ifstream input(path); - - assert(input); - - if (input_serialized) - { - unserialize(X, input); - unserialize(classes, input); - return; - } - - while (getline(input, line)) - { - fields.clear(); - split(line, "", fields); - if (fields.empty()) - { - continue; - } - - grow_vec(data); - for (int i = 0; i < fields.size(); ++i) - { - if (!parse_double(fields[i], x)) - { - cerr << "non number \"" << fields[i] << "\"" << std::endl;; - exit(1); - } - data.back().push_back(x); - } - } - X.resize(data.size(), data[0].size() - 1); - for (int i = 0; i < data.size(); ++i) - { - assert(data[i].size() - 1 == X.cols()); - for (int j = 0; j < data[i].size() - 1; ++j) - { - X(i, j) = data[i][j]; - } - classes.push_back(static_cast(data[i].back())); - } -} - -void run_print(int first, int argc, char* argv[]) -{ - mat data; - std::vector classes; - num_classifier* cls = make_classifier(); - - if (first >= argc) - { - cerr << "specify training file" << std::endl; - exit(1); - } - - read_data(argv[first], data, classes); - cls->learn(data, classes); - cls->inspect(cout); - delete cls; -} - -void run_test_set(int first, int argc, char* argv[]) -{ - std::string line; - std::vector fields; - std::vector train_classes, test_classes; - mat Xtrain, Xtest; - - if (first + 1 >= argc) - { - cerr << "specify training and test files" << std::endl; - exit(1); - } - - read_data(argv[first], Xtrain, train_classes); - read_data(argv[first + 1], Xtest, test_classes); - - num_classifier* cls = make_classifier(); - cls->learn(Xtrain, train_classes); - - int correct = 0; - for (int i = 0; i < Xtest.rows(); ++i) - { - int pred = cls->classify(Xtest.row(i)); - if (pred == test_classes[i]) - { - ++correct; - } - } - std::cout << correct << " correct out of " << Xtest.rows() << std::endl; - delete cls; -} - -void run_cross_validation(int first, int argc, char* argv[]) -{ - mat data, train; - std::vector classes, train_classes, reorder; - int n, k, chunksize, extra, start, ndata, ncols, correct; - - if (first >= argc) - { - cerr << "specify training file" << std::endl; - exit(1); - } - - read_data(argv[first], data, classes); - ndata = data.rows(); - ncols = data.cols(); - - if (first + 1 < argc) - { - if (!parse_int(argv[first + 1], n)) - { - cerr << "invalid n" << std::endl; - exit(1); - } - } - else - { - n = 10; - } - - reorder.resize(ndata); - for (int i = 0, iend = ndata; i < iend; ++i) - { - reorder[i] = i; - } - random_shuffle(reorder.begin(), reorder.end()); - chunksize = data.rows() / n; - extra = data.rows() - chunksize * n; - correct = 0; - start = 0; - for (int i = 0; i < n; ++i) - { - if (i < extra) - { - k = chunksize + 1; - } - else - { - k = chunksize; - } - train.resize(ndata - k, ncols); - train_classes.resize(ndata - k); - - for (int j = 0; j < ndata - k; ++j) - { - if (j < start) - { - train.row(j) = data.row(reorder[j]); - train_classes[j] = classes[reorder[j]]; - } - else - { - train.row(j) = data.row(reorder[j + k]); - train_classes[j] = classes[reorder[j + k]]; - } - } - - num_classifier* cls = make_classifier(); - cls->learn(train, train_classes); - - for (int j = 0; j < k; ++j) - { - int a = cls->classify(data.row(reorder[start + j])); - if (a == classes[reorder[start + j]]) - { - correct++; - } - } - delete cls; - start += k; - } - - std::cout << correct << " correct out of " << ndata << std::endl; -} - -void run_serialize(int first, int argc, char* argv[]) -{ - mat data; - std::vector classes; - num_classifier* cls = make_classifier(); - - if (first >= argc) - { - cerr << "specify training file" << std::endl; - exit(1); - } - - if (first + 1 >= argc) - { - cerr << "specify output file" << std::endl; - exit(1); - } - - read_data(argv[first], data, classes); - cls->learn(data, classes); - - ofstream out(argv[first + 1]); - cls->serialize(out); - out.close(); - - ifstream input(argv[first + 1]); - cls->unserialize(input); - cls->inspect(cout); - - delete cls; -} diff --git a/Core/SVS/tests/test_csp.cpp b/Core/SVS/tests/test_csp.cpp deleted file mode 100644 index a7630d3914..0000000000 --- a/Core/SVS/tests/test_csp.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include "foil.h" -#include "common.h" - -int main(int argc, char* argv[]) -{ - relation_table rels; - clause c; - std::tuple args; - var_domains d; - - rels["ramp"] = relation(2); - rels["ramp"].add(0, 100); - rels["ramp"].add(1, 100); - rels["floor"] = relation(2); - rels["floor"].add(0, 200); - rels["floor"].add(1, 200); - - args.push_back(0); - args.push_back(-1); - c.push_back(literal("ramp", args, true)); - c.push_back(literal("floor", args, true)); - - d[0].insert(0); - - std::cout << test_clause(c, rels, d) << std::endl; - return 0; -} diff --git a/Core/SVS/tests/test_em.cpp b/Core/SVS/tests/test_em.cpp deleted file mode 100644 index 2fca671443..0000000000 --- a/Core/SVS/tests/test_em.cpp +++ /dev/null @@ -1,178 +0,0 @@ -#include -#include "em.h" -#include "model.h" -#include "common.h" - -void read_sig(const std::vector& fields, scene_sig& sig, int& target) -{ - int id = 0; - scene_sig::entry ent; - if (!parse_int(fields[0], target)) - { - assert(false); - } - sig.clear(); - for (int i = 1, iend = fields.size(); i < iend; ++i) - { - std::vector prop_fields; - split(fields[i], ":", prop_fields); - assert(prop_fields.size() == 3); - if (prop_fields[0] != ent.name) - { - if (!ent.name.empty()) - { - sig.add(ent); - } - ent.id = id++; - ent.start = i - 1; - ent.name = prop_fields[0]; - ent.type = prop_fields[1]; - ent.props.clear(); - } - ent.props.push_back(prop_fields[2]); - } - sig.add(ent); -} - -void read_tabular(std::ifstream& is, model_train_data& data) -{ - std::string line; - std::vector fields; - scene_sig sig; - relation_table empty; // not concerned with relations here - int target; - - while (getline(is, line)) - { - fields.clear(); - split(line, "", fields); - if (fields[0] == "#") - { - fields.erase(fields.begin()); - read_sig(fields, sig, target); - } - else - { - assert(fields.size() == sig.dim() + 1); - rvec x(sig.dim()); - rvec y(1); - for (int i = 0, iend = fields.size() - 1; i < iend; ++i) - { - if (!parse_double(fields[i], x(i))) - { - assert(false); - } - } - if (!parse_double(fields[fields.size() - 1], y(0))) - { - assert(false); - } - data.add(target, sig, empty, x, y); - } - } -} - -void error(const std::string& msg) -{ - cerr << msg << std::endl; - exit(1); -} - -int main(int argc, char* argv[]) -{ - int i = 1; - bool serialized_input = false; - model_train_data data; - double noise_var = 1e-8; - std::string load_path, save_path; - - while (i < argc && argv[i][0] == '-') - { - switch (argv[i][1]) - { - case 'i': - serialized_input = true; - break; - case 'n': - if (++i >= argc || !parse_double(argv[i], noise_var)) - { - error("invalid noise"); - } - break; - case 'l': - if (++i >= argc) - { - error("specify load path"); - } - load_path = argv[++i]; - break; - case 's': - if (++i >= argc) - { - error("specify save path"); - } - save_path = argv[++i]; - break; - default: - error(string("unknown option ") + argv[i]); - } - ++i; - } - - if (i == argc) - { - cerr << "specify data file" << std::endl; - exit(1); - } - - std::ifstream input(argv[i]); - if (!input) - { - error(string("can't open ") + argv[i]); - } - - if (serialized_input) - { - data.unserialize(input); - } - else - { - read_tabular(input, data); - } - - EM em(data); - if (!load_path.empty()) - { - std::ifstream load_file(load_path.c_str()); - if (!load_file) - { - error(string("couldn't read ") + load_path); - } - em.unserialize(load_file); - } - - em.set_noise_var(noise_var); - for (int i = 0, iend = data.size(); i < iend; ++i) - { - em.add_data(i); - if (!em.run(50)) - { - cerr << "max iterations reached" << std::endl; - } - } - - em.print_ptable(); - em.print_modes(cout); - - if (!save_path.empty()) - { - ofstream save_file(save_path.c_str()); - if (!save_file) - { - error(string("couldn't write ") + save_path); - } - em.serialize(save_file); - } - - return 0; -} diff --git a/Core/SVS/tests/test_foil.cpp b/Core/SVS/tests/test_foil.cpp deleted file mode 100644 index 4ea16f94b2..0000000000 --- a/Core/SVS/tests/test_foil.cpp +++ /dev/null @@ -1,335 +0,0 @@ -#include -#include -#include -#include -#include -#include "foil.h" -#include "common.h" - -#define MAX_CLAUSES 10 -#define EQUAL_MARGIN 1.0e-3 - -struct clause_test_spec -{ - const char* clause; - double success_rate; -}; - -struct test_spec -{ - const char* path; - bool prune; - clause_test_spec clauses[MAX_CLAUSES]; -}; - -test_spec tests[] = -{ - { - "foil_tests/1.test", true, { - { "intersect(0,1,2) & ramp(0,2)", 1.0 }, - { NULL, 0.0} - } // sentinel - }, - { - "foil_tests/neg.test", true, { - { "~indicator(0,1)", 1.0 }, - { NULL, 0.0} - } - }, - { - "foil_tests/ramp.test", true, { - { "intersect(0,1,2)", 0.975 }, - { NULL, 0.0} - } - }, - { - "foil_tests/ramp_prune.test", true, { - { "~intersect(0,1,-1)", 0.889 }, - { "intersect(0,1,2) & box(0,2)", 0.405 }, - { NULL, 0.0} - } - }, - { NULL, false, { {NULL, 0.0} } } // sentinel -}; - -typedef vector clause_vec; - -// functions to make literals and clauses from a readable format -literal PL(const string& s); -clause PC(const string& s); - -bool close(double a, double b); -double time(); -void clause_from_str(const string& s, clause& c); -bool run_foil(const char* path, bool prune, clause_vec& clauses, relation& pos, relation& neg, relation_table& all_rels, double& time); -void standalone(const char* path, bool prune); -bool test(); -void test_clauses(clause_vec& clauses, relation& pos, relation& neg, relation_table& all_rels); - -void fix_variables(int num_auto_bound, clause& c); // in foil.cpp -bool test_fix_variables(); - -int main(int argc, char* argv[]) -{ - if (argc > 1) - { - if (strcmp(argv[1], "-p") == 0) - { - standalone(argv[2], false); - } - else - { - standalone(argv[1], true); - } - exit(0); - } - - test(); - test_fix_variables(); - return 0; -} - - -double time() -{ - timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return (ts.tv_sec * 1e9 + ts.tv_nsec) / 1.0e6; -} - - -bool run_foil(const char* path, bool prune, clause_vec& clauses, relation& pos, relation& neg, relation_table& all_rels, double& t) -{ - FOIL foil; - ifstream input(path); - - if (!input) - { - cerr << "could not load " << path << std::endl; - assert(false); - } - - if (!foil.load_foil6(input)) - { - return false; - } - - input.close(); - double t1 = time(); - foil.learn(prune, false); - t = time() - t1; - for (int i = 0, iend = foil.num_clauses(); i < iend; ++i) - { - clauses.push_back(foil.get_clause(i)); - } - pos = foil.get_pos(); - neg = foil.get_neg(); - all_rels = foil.get_relations(); - return true; -} - -void standalone(const char* path, bool prune) -{ - clause_vec clauses; - relation pos, neg; - relation_table all; - double t; - - if (!run_foil(path, prune, clauses, pos, neg, all, t)) - { - assert(false); - } - - std::cout << t << " msecs" << std::endl; - for (int i = 0, iend = clauses.size(); i < iend; ++i) - { - std::cout << i << ": " << clauses[i] << std::endl; - } - test_clauses(clauses, pos, neg, all); -} - -bool test() -{ - stringstream ss; - clause_vec clauses; - relation pos, neg; - relation_table all; - double t, success, fp, fn; - int i, j; - bool result = true; - - for (int i = 0; tests[i].path != NULL; ++i) - { - //if (i == 3) LOG.turn_on(FOILDBG); - clauses.clear(); - if (!run_foil(tests[i].path, tests[i].prune, clauses, pos, neg, all, t)) - { - assert(false); - } - - for (j = 0; tests[i].clauses[j].clause != NULL; ++j) - { - const clause_test_spec& spec = tests[i].clauses[j]; - assert(j < clauses.size()); - ss.str(""); - ss << clauses[j]; - string learned = ss.str(); - if (learned == spec.clause) - { - clause_success_rate(clauses[j], pos, neg, all, success, fp, fn); - if (!close(success, spec.success_rate)) - { - std::cout << "Expected success rate " << spec.success_rate << ", got " << success << std::endl; - result = false; - } - } - else - { - std::cout << "Test " << j << " expected " << spec.clause << ", got " << learned << std::endl; - result = false; - } - } - } - return result; -} - -bool close(double a, double b) -{ - return fabs(a - b) < EQUAL_MARGIN; -} - -int test_clause_vec(const vector& clauses, const relation_table& rels, var_domains& d) -{ - for (int i = 0, iend = clauses.size(); i < iend; ++i) - { - if (test_clause(clauses[i], rels, d)) - { - return i; - } - } - return -1; -} - -void test_clauses(clause_vec& clauses, relation& pos, relation& neg, relation_table& all_rels) -{ - relation::const_iterator i, iend; - int matched, false_negs, false_pos; - var_domains d; - - std::cout << "False negatives" << std::endl; - for (false_negs = 0, i = pos.begin(), iend = pos.end(); i != iend; ++i) - { - d.clear(); - for (int j = 0, jend = i->size(); j < jend; ++j) - { - d[j].insert((*i)[j]); - } - matched = test_clause_vec(clauses, all_rels, d); - if (matched < 0) - { - join(cout, *i, ", ") << std::endl; - ++false_negs; - } - } - - std::cout << "False positives" << std::endl; - for (false_pos = 0, i = neg.begin(), iend = neg.end(); i != iend; ++i) - { - d.clear(); - for (int j = 0, jend = i->size(); j < jend; ++j) - { - d[j].insert((*i)[j]); - } - matched = test_clause_vec(clauses, all_rels, d); - if (matched >= 0) - { - std::cout << "(" << matched << ") "; - join(cout, *i, ", ") << " | "; - var_domains::const_iterator di, diend; - for (di = d.begin(), diend = d.end(); di != diend; ++di) - { - assert(di->second.size() == 1); - int val = *di->second.begin(); - std::cout << di->first << " <- " << val << " "; - } - std::cout << std::endl; - ++false_pos; - } - } - - int total = pos.size() + neg.size(); - int correct = total - false_negs - false_pos; - double success_rate = correct / static_cast(total); - std::cout << std::endl - << success_rate << " success, " << correct << " correct, " << false_negs + false_pos << " incorrect, " - << false_negs << " false negs, " << false_pos << " false pos" << std::endl; -} - -literal PL(const string& s) -{ - bool negate; - string name; - tuple args; - int open, close; - vector arg_str; - - open = s.find_first_of("("); - close = s.find_first_of(")"); - assert(open != string::npos && close != string::npos && open < close); - if (s[0] == '~') - { - negate = true; - name = s.substr(1, open - 1); - } - else - { - negate = false; - name = s.substr(0, open); - } - - split(s.substr(open + 1, close - open - 1), ", ", arg_str); - assert(arg_str.size() > 0); - args.resize(arg_str.size()); - for (int i = 0, iend = arg_str.size(); i < iend; ++i) - { - if (!parse_int(arg_str[i], args[i])) - { - assert(false); - } - } - return literal(name, args, negate); -} - -clause PC(const string& s) -{ - clause c; - vector lit_strs; - split(s, " &", lit_strs); - for (int i = 0, iend = lit_strs.size(); i < iend; ++i) - { - c.push_back(PL(lit_strs[i])); - } - return c; -} - -bool test_fix_variables() -{ - clause c1 = PC("A(0,1,2) & ~B(0,3)"); - clause t1 = PC("A(0,1,2) & ~B(0,-1)"); - fix_variables(3, c1); - if (c1 != t1) - { - std::cout << "Expected " << t1 << ", got " << c1 << std::endl; - return false; - } - - clause c2 = PC("A(0,1) & B(0,3)"); - clause t2 = PC("A(0,1) & B(0,2)"); - fix_variables(1, c2); - if (c2 != t2) - { - std::cout << "Expected " << t2 << ", got " << c2 << std::endl; - return false; - } - return true; -} diff --git a/Core/SVS/tests/test_intervalset.cpp b/Core/SVS/tests/test_intervalset.cpp deleted file mode 100644 index 06844530cd..0000000000 --- a/Core/SVS/tests/test_intervalset.cpp +++ /dev/null @@ -1,242 +0,0 @@ -#include -#include -#include -#include -#include "relation.h" - -set a; -interval_set b; - -void same() -{ - set::const_iterator ai; - interval_set::const_iterator bi; - - for (ai = a.begin(), bi = b.begin(); ai != a.end() && bi != b.end(); ++ai, ++bi) - { - assert(*ai == *bi); - assert(b.contains(*ai)); - } - assert(ai == a.end() && bi == b.end()); - assert(a.size() == b.size()); -} - -void intervals(int n) -{ - assert(b.num_intervals() == n); -} - -void erase(int x) -{ - a.erase(x); - b.erase(x); - same(); -} - -void insert(int x) -{ - a.insert(x); - b.insert(x); - same(); -} - -set make_run(int i, int j) -{ - set s; - for (; i <= j; ++i) - { - s.insert(i); - } - return s; -} - -set make_random(int i, int j, int k) -{ - assert(j - i + 1 >= k); - vector v; - set s; - - sample(k, i, j, v); - for (i = 0; i < v.size(); ++i) - { - s.insert(v[i]); - } - return s; -} - -void unify(const set& s) -{ - set::const_iterator i; - interval_set b1(s), old = b; - - for (i = s.begin(); i != s.end(); ++i) - { - a.insert(*i); - } - b.unify(b1); - - same(); -} - -void intersect(const set& s) -{ - set::const_iterator i; - interval_set b1(s); - - for (i = a.begin(); i != a.end();) - { - if (s.find(*i) == s.end()) - { - a.erase(i++); - } - else - { - i++; - } - } - b.intersect(b1); - - same(); -} - -void subtract(const set& s) -{ - set::const_iterator i; - interval_set b1(s); - - for (i = a.begin(); i != a.end();) - { - if (s.find(*i) != s.end()) - { - a.erase(i++); - } - else - { - i++; - } - } - b.subtract(b1); - - same(); -} - -set combine(const set& s1, const set& s2) -{ - set s; - set::const_iterator i; - for (i = s1.begin(); i != s1.end(); ++i) - { - s.insert(*i); - } - for (i = s2.begin(); i != s2.end(); ++i) - { - s.insert(*i); - } - return s; -} - -int main(int argc, char* argv[]) -{ - interval_set s; - for (int i = 0; i < 5; ++i) - { - s.insert(i); - } - vector v(s.begin(), s.end()); - - for (int i = 0; i < 10; ++i) - { - insert(i); - } - intervals(1); - - // edge deletes - erase(0); - erase(9); - intervals(1); - - // interval split - erase(5); - intervals(2); - - for (int i = 0; i < 5; ++i) - { - erase(i); - } - intervals(1); - - // new interval - insert(1); - intervals(2); - insert(20); - intervals(3); - insert(21); - intervals(3); - - // edge insertions - insert(5); - insert(9); - intervals(3); - - // interval merge - insert(11); - intervals(4); - insert(10); - intervals(3); - insert(-1); - intervals(4); - insert(0); - intervals(3); - - // multiple insert - insert(0); - insert(0); - - // set assign - b = a; - same(); - - a = make_run(0, 5); - b = a; - - // contained union - unify(make_run(0, 5)); - - // edge unions - unify(make_run(-5, -1)); - unify(make_run(6, 10)); - - // disjoint unions - unify(make_run(-10, -7)); - unify(make_run(12, 15)); - - a = make_run(0, 100); - b = a; - - // edge intersections - intersect(make_run(0, 100)); - intersect(make_run(0, 99)); - intersect(make_run(1, 99)); - - intersect(combine(make_run(0, 30), make_run(60, 100))); - intersect(make_run(0, 100)); - - - a = make_run(0, 10); - b = a; - - subtract(make_run(0, 2)); - subtract(make_run(8, 10)); - subtract(make_run(0, 3)); - subtract(make_run(7, 10)); - subtract(make_run(3, 7)); - - for (int i = 0; i < 100; ++i) - { - unify(make_random(-100, 100, 50)); - intersect(make_random(-100, 100, 50)); - subtract(make_random(-100, 100, 50)); - } - - return 0; -} diff --git a/Core/SVS/viewer/font.bmp b/Core/SVS/viewer/font.bmp deleted file mode 100644 index 98124a9cb0..0000000000 Binary files a/Core/SVS/viewer/font.bmp and /dev/null differ diff --git a/Core/SVS/viewer/font.pbm b/Core/SVS/viewer/font.pbm deleted file mode 100644 index da4d56d798..0000000000 --- a/Core/SVS/viewer/font.pbm +++ /dev/null @@ -1,196 +0,0 @@ -P1 -90 84 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 -1 0 0 0 1 0 1 0 0 0 1 1 1 0 0 0 1 1 1 1 0 0 1 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 -0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 1 0 0 0 0 1 0 1 0 0 1 1 1 1 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 0 1 0 0 -0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 0 1 0 0 0 -1 0 1 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 1 1 0 0 0 0 1 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 -1 1 1 1 1 0 0 1 1 1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 -1 0 0 1 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 1 0 1 0 0 0 1 1 0 0 1 0 1 0 0 0 0 0 0 -0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 1 -0 1 0 1 0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 -0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 1 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 1 0 0 1 0 0 0 1 1 0 1 0 0 0 0 0 0 0 -0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 0 1 1 -1 0 0 0 0 0 1 0 0 1 1 1 1 1 0 0 1 1 1 0 0 1 1 1 1 1 0 0 1 1 1 0 0 0 1 1 1 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 1 1 1 -0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 1 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 -1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 -1 0 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 0 1 0 0 1 0 0 0 0 0 -1 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 1 0 0 0 1 1 0 0 0 0 0 1 -0 0 0 1 1 1 1 1 0 0 0 0 1 0 0 1 0 1 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 1 1 0 0 -1 0 0 1 0 0 1 1 1 1 0 0 1 1 1 1 0 0 0 0 0 1 0 0 0 1 1 1 0 0 1 0 0 0 1 0 0 0 1 -1 0 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 0 0 1 0 0 0 1 0 0 0 -0 0 1 0 0 0 0 0 0 0 1 0 1 1 1 1 1 0 0 0 0 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 -0 1 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 1 1 1 1 0 0 0 1 0 0 0 -1 0 0 0 1 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 1 0 1 0 0 -0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 -0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 0 0 -1 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 1 1 0 0 -0 1 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 0 0 1 1 1 1 1 0 1 1 1 -1 1 0 0 1 1 1 0 0 0 0 1 1 1 0 0 1 1 1 0 0 0 1 1 1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 -0 1 1 1 0 0 0 0 1 1 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 1 0 0 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0 0 1 0 0 0 1 1 1 1 0 0 0 1 1 1 0 0 1 1 1 -1 0 0 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 0 1 0 0 0 1 0 1 1 1 1 1 0 0 0 0 0 1 0 -1 0 0 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 1 0 1 0 0 1 0 0 -0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 -0 0 1 0 0 0 0 0 0 0 1 0 1 0 0 1 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 1 0 1 -1 1 0 0 1 0 1 0 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 -1 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 1 0 0 0 0 0 0 0 0 -0 1 0 0 0 0 0 1 0 1 0 1 0 1 0 1 0 0 0 1 0 1 1 1 1 0 0 1 0 0 0 0 0 1 0 0 0 1 0 -1 1 1 1 0 0 1 1 1 1 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0 1 0 0 0 0 0 0 0 1 0 1 1 0 -0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 0 1 1 1 0 1 0 0 0 1 0 1 0 0 0 1 0 -1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 1 1 0 1 0 0 0 1 0 0 0 1 -0 0 0 0 0 0 0 1 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 -1 1 1 1 1 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 -0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 -0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 -0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 1 0 0 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 0 1 0 0 0 1 0 1 1 1 1 0 0 0 1 1 -1 0 0 1 1 1 1 0 0 1 1 1 1 1 0 1 0 0 0 0 0 0 1 1 1 0 0 1 0 0 0 1 0 1 1 1 1 1 0 -0 1 1 1 0 0 1 0 0 0 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 1 0 1 0 0 0 1 0 -0 1 1 1 0 0 1 1 1 1 0 0 0 1 1 1 0 0 1 1 1 1 0 0 0 1 1 1 0 0 1 1 1 1 1 0 1 0 0 -0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 1 1 1 1 0 0 0 1 0 0 0 -1 1 0 1 1 0 1 1 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 -0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 -0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 -0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 -1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0 1 0 1 0 1 0 0 1 1 0 1 0 0 -0 1 0 1 1 1 1 0 0 1 0 0 0 1 0 1 1 1 1 0 0 0 1 1 1 0 0 0 0 1 0 0 0 1 0 0 0 1 0 -1 0 0 0 1 0 1 0 0 0 1 0 0 1 0 1 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 -0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 0 0 1 0 -0 0 1 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 1 0 1 0 1 0 0 0 1 0 0 0 0 1 0 1 0 0 0 1 0 -0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 1 0 -1 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 1 0 1 0 1 0 0 1 0 -1 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 -1 0 0 0 0 0 1 0 1 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 -0 0 0 1 1 0 1 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 -1 0 0 0 1 0 0 1 1 1 0 0 1 0 0 0 0 0 0 1 1 1 0 0 1 0 0 0 1 0 0 1 1 1 0 0 0 0 1 -0 0 0 0 1 1 1 0 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 1 1 1 1 0 -0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 -0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 -1 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 -0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 1 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 1 1 1 1 0 1 1 1 1 0 0 0 1 1 1 0 0 0 1 1 1 1 0 0 1 1 1 0 0 0 0 1 0 0 0 -0 1 1 1 1 0 1 1 1 1 0 0 0 1 1 0 0 0 0 1 1 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 -1 0 0 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 -1 0 0 0 0 0 1 0 0 0 1 0 1 1 1 1 1 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 0 1 -0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0 0 1 1 0 1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 -0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 0 1 1 1 1 0 0 0 1 1 1 1 0 0 1 1 1 1 0 0 1 1 -1 1 0 0 0 1 0 0 0 0 1 1 1 1 0 1 0 0 0 1 0 0 1 1 1 0 0 0 0 1 0 0 0 0 0 0 0 0 1 -0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0 0 1 0 0 0 0 1 0 0 0 1 1 1 1 0 0 1 0 1 1 0 0 0 1 1 1 0 0 1 1 1 1 0 0 0 1 1 -1 1 0 1 0 1 1 0 0 0 1 1 1 1 0 0 1 1 1 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 1 0 1 0 -1 0 0 0 1 0 1 0 0 0 1 0 1 0 1 0 0 0 0 0 1 0 0 0 1 0 1 0 1 0 1 1 0 0 1 0 1 0 0 -0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 -1 0 0 0 1 0 1 0 1 0 1 0 0 1 0 1 0 0 1 0 0 0 1 0 1 1 1 0 0 0 0 0 1 0 0 0 1 0 1 -0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 0 0 0 1 1 1 0 0 -0 0 1 0 0 0 1 0 0 0 1 0 0 1 0 1 0 0 1 0 1 0 1 0 0 0 1 0 0 0 1 0 0 0 1 0 1 0 0 -1 0 0 0 0 1 0 0 0 1 0 1 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 1 0 0 0 1 0 -1 0 0 0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1 0 0 1 1 0 0 1 0 1 0 0 1 0 1 0 1 0 0 1 0 -1 0 0 1 0 0 0 1 0 1 0 0 0 1 0 0 1 1 1 0 0 1 0 1 0 1 0 1 0 0 0 1 0 0 1 1 1 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1 1 1 0 0 0 0 0 1 1 0 0 1 1 0 1 0 0 0 1 -0 0 0 0 1 0 1 0 0 1 0 0 0 1 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 -0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 1 0 1 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 -0 1 1 0 1 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 1 0 0 0 -0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 1 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 -0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 1 -0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 -1 1 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1 0 1 0 1 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 -1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 -0 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/Core/SVS/viewer/input.c b/Core/SVS/viewer/input.c deleted file mode 100644 index 1577f61559..0000000000 --- a/Core/SVS/viewer/input.c +++ /dev/null @@ -1,293 +0,0 @@ -#include -#include -#include -#include "viewer.h" - -#define MAX_FIELDS 1000 -#define MAX_SCENES 1000 -#define MAX_GEOMS 1000 -#define WHITESPACE " \t\n" - -int proc_cmd(char *fields[]); -int proc_geom_cmd(geometry *gs[], int ngeoms, char *fields[]); -int parse_nums(char *fields[], int n, real *v); -int proc_layer_cmd(char *fields[]); - -int wait_for_redraw = 0; - -void GLFWCALL proc_input(void *unused) { - char cmd[MAX_COMMAND]; - char *fields[MAX_FIELDS]; - char *endp, *startp, *startp2, *cp; - int left, n, i; - - startp = endp = cmd; - left = MAX_COMMAND; - - for(;;) { - n = get_input(endp, left); - if (n < 0) { - /* error */ - break; - } - - *(endp + n) = '\0'; - for (; n > 0; ++endp, --n) { - if (*endp == '\n') { - /* for now assume newline denotes end of complete command */ - *endp = '\0'; - /* strip comment */ - cp = strchr(startp, '#'); - if (cp) { - *cp = '\0'; - } - if (debug) - printf("cmd: %s\n", startp); - split(startp, fields, MAX_FIELDS); - - glfwLockMutex(scene_lock); - proc_cmd(fields); - glfwUnlockMutex(scene_lock); - startp = endp + 1; - - set_redraw(); - if (wait_for_redraw) { - semaphore_P(&redraw_semaphore); - wait_for_redraw = 0; - } - } - } - - /* shift remaining input left */ - if (startp != cmd) { - for (startp2 = cmd; startp != endp; ++startp, ++startp2) - *startp2 = *startp; - startp = cmd; - endp = startp2; - } - left = MAX_COMMAND - (endp - startp); - } - fprintf(stderr, "input thread has exited\n"); -} - -int proc_cmd(char *fields[]) { - char *scene_pat, *geom_pat, **args; - scene *scenes[MAX_SCENES], *sp; - geometry *geoms[MAX_GEOMS], *gp; - int nscenes, ngeoms, i; - - if (!fields[0]) { - return 1; - } else if (strcmp(fields[0], "save") == 0) { - if (!fields[1]) { - fprintf(stderr, "specify save path\n"); - return 0; - } - request_screenshot(fields[1], 1); - wait_for_redraw = 1; - return 1; - } else if (strcmp(fields[0], "layer") == 0) { - return proc_layer_cmd(fields + 1); - } else if (strcmp(fields[0], "draw") == 0) { - scene_pat = fields[1]; - geom_pat = fields[2]; - args = fields + 3; - } else { - scene_pat = fields[0]; - geom_pat = fields[1]; - args = fields + 2; - } - - if (!scene_pat) { - return 1; - } - - if (*scene_pat == '-') { - delete_scenes(scene_pat + 1); - return 1; - } else if (*scene_pat == '+') { - scenes[0] = find_or_add_scene(scene_pat + 1); - nscenes = 1; - } else { - nscenes = match_scenes(scene_pat, scenes, MAX_SCENES); - } - - if (!geom_pat) { - return 1; - } - - for (ngeoms = 0, i = 0; i < nscenes; ++i) { - if (*geom_pat == '+') { - geoms[ngeoms++] = find_or_add_geom(scenes[i], geom_pat + 1); - } else if (*geom_pat == '-') { - delete_geoms(scenes[i], geom_pat + 1); - } else { - ngeoms += match_geoms(scenes[i], geom_pat, geoms + ngeoms, MAX_GEOMS); - } - } - - return proc_geom_cmd(geoms, ngeoms, args); -} - -int proc_geom_cmd(geometry *gs[], int ngeoms, char *fields[]) { - real pos[3], rot[4], scale[3], color[3], verts[MAX_FIELDS]; - real radius, line_width, layer; - int i, f, nverts, pos_set, rot_set, scale_set, color_set; - char *text; - - pos_set = 0; - rot_set = 0; - scale_set = 0; - color_set = 0; - radius = -1.0; - line_width = -1.0; - layer = -1.0; - nverts = -1; - text = NULL; - - f = 0; - while (fields[f]) { - if (strlen(fields[f]) != 1) { - fprintf(stderr, "unexpected field: %s\n", fields[f]); - return 0; - } - - switch (fields[f][0]) { - case 'p': /* position */ - if (parse_nums(&fields[f+1], 3, pos) != 3) { - fprintf(stderr, "invalid position\n"); - return 0; - } - pos_set = 1; - f += 4; - break; - case 'r': /* rotation */ - if (parse_nums(&fields[f+1], 4, rot) != 4) { - fprintf(stderr, "invalid rotation\n"); - return 0; - } - rot_set = 1; - f += 5; - break; - case 's': /* scale */ - if (parse_nums(&fields[f+1], 3, scale) != 3) { - fprintf(stderr, "invalid scale\n"); - return 0; - } - scale_set = 1; - f += 4; - break; - case 'c': /* color */ - if (parse_nums(&fields[f+1], 3, color) != 3) { - fprintf(stderr, "invalid color\n"); - return 0; - } - color_set = 1; - f += 4; - break; - case 'v': /* vertices */ - if (nverts != -1) { - fprintf(stderr, "you can only specify one set of vertices\n"); - return 0; - } - nverts = parse_nums(&fields[f+1], -1, verts); - if (nverts % 3 != 0) { - fprintf(stderr, "vertices must be have 3 components\n"); - return 0; - } - f += nverts + 1; - break; - case 'b': /* ball */ - if (parse_nums(&fields[f+1], 1, &radius) < 1 || radius < 0.0) { - fprintf(stderr, "invalid radius\n"); - return 0; - } - f += 2; - break; - case 't': /* text */ - text = fields[f+1]; - f += 2; - break; - case 'l': /* layer */ - if (parse_nums(&fields[f+1], 1, &layer) < 1 || layer < 0.0) { - fprintf(stderr, "expecting layer number (0 - %d)\n", NLAYERS); - return 0; - } - f += 2; - break; - case 'w': /* line width */ - if (parse_nums(&fields[f+1], 1, &line_width) < 1 || line_width < 0.0) { - fprintf(stderr, "invalid line width\n"); - return 0; - } - f += 2; - break; - default: - return 0; - } - } - - for (i = 0; i < ngeoms; ++i) { - if (pos_set) copy_vec3(pos, gs[i]->pos); - if (scale_set) copy_vec3(scale, gs[i]->scale); - if (color_set) copy_vec3(color, gs[i]->color); - if (rot_set) quat_to_axis_angle(rot, gs[i]->axis, &gs[i]->angle); - - if (radius >= 0.0) { - set_geom_radius(gs[i], radius); - } else if (nverts != -1) { - set_geom_vertices(gs[i], verts, nverts); - } else if (text != NULL) { - set_geom_text(gs[i], text); - } - - if (layer >= 0.0) { - gs[i]->layer = layer; - } - if (line_width >= 0.0) { - gs[i]->line_width = line_width; - } - } - return 1; -} - - -int parse_nums(char *fields[], int n, real *v) { - int i; - char *s, *end; - - for (i = 0; i != n && fields[i]; ++i) { - v[i] = strtod(fields[i], &end); - if (*end != '\0') { - return i; - } - } - return i; -} - -int proc_layer_cmd(char *fields[]) { - int layer_num, val, i; - real num; - - if (!fields[0] || parse_nums(&fields[0], 1, &num) != 1) { - fprintf(stderr, "expecting layer number\n"); - return 0; - } - layer_num = (int) num; - if (layer_num < 0 || layer_num >= NLAYERS) { - fprintf(stderr, "layer number has to be between 0 and %d", NLAYERS); - return 0; - } - for (i = 1; i < MAX_FIELDS && fields[i]; i += 2) { - if (!fields[i+1] || parse_nums(&fields[i+1], 1, &num) != 1) { - fprintf(stderr, "expecting 0/1\n"); - return 0; - } - val = ((num == 0.0) ? 0 : 1); - if (!set_layer(layer_num, fields[i][0], val)) { - fprintf(stderr, "no such layer option: %s\n", fields[i]); - return 0; - } - } - return 1; -} diff --git a/Core/SVS/viewer/pbm2hex b/Core/SVS/viewer/pbm2hex deleted file mode 100755 index 016a631336..0000000000 --- a/Core/SVS/viewer/pbm2hex +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -# A little script to translate a text-only pbm file into C source code -# for the font bitmap array initializer. Used to hard-code the font data -# into the program. - -awk ' -function print_char(r, c, byte, bit, sep, i, j) { - sep = "" - - printf("{"); - for (i = charh - 1; i >= 0; --i) { - byte = 0x00 - bit = 0x80 - for (j = 0; j < charw; ++j) { - if (b[r + i, c + j] == 1) - byte += bit - - if (bit == 1) { - printf("%s0x%.2x", sep, byte); - sep = "," - byte = 0x00 - bit = 0x80 - } else { - bit /= 2 - } - } - if (bit != 0x80) { - printf("%s0x%.2x", sep, byte); - sep = "," - } - } - printf("}\n"); -} - -BEGIN { r = 0; c = 0 } -NR == 2 { - w = $1 - h = $2 - charw = w / 15 # 15 = num character cols in bitmap - charh = h / 7 # 7 = num character rows in bitmap -} -NR > 2 { - for (i = 1; i <= NF; ++i) { - b[r, c++] = $i - if (c >= w) { - r++; - c = 0; - } - } -} -END { - for (i = 0; i < h; i += charh) { - for (j = 0; j < w; j += charw) { - print_char(i, j) - } - } -} -' $1 diff --git a/Core/SVS/viewer/platform_specific/posix.c b/Core/SVS/viewer/platform_specific/posix.c deleted file mode 100644 index d036e98608..0000000000 --- a/Core/SVS/viewer/platform_specific/posix.c +++ /dev/null @@ -1,197 +0,0 @@ -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "viewer.h" - -int init_socket(char *path); -int init_file(char *path); - -int read_stdin(char *buf, int n); -int read_socket(char *buf, int n); -int read_file(char *buf, int n); - -int parse_int(char *s, int *v); - -enum Input_type { REGULAR_FILE, SOCKET }; - -static enum Input_type input_type; -static FILE *file = NULL; - -/* persistent vars for socket */ -static fd_set all_fds; -static int listen_fd, max_fd; - -int init_input(int argc, char *argv[]) { - int i; - - for (i = 1; i < argc; ++i) { - if (strcmp(argv[i], "-s") == 0) { - if (i + 1 >= argc) { - fprintf(stderr, "specify a socket path or port\n"); - return 0; - } - input_type = SOCKET; - return init_socket(argv[i + 1]); - } else if (strcmp(argv[i], "-f") == 0) { - if (i + 1 >= argc) { - fprintf(stderr, "specify file path\n"); - return 0; - } - input_type = REGULAR_FILE; - return init_file(argv[i + 1]); - } - } - file = stdin; - input_type = REGULAR_FILE; - return 1; -} - -int get_input(char *buf, int n) { - switch (input_type) { - case REGULAR_FILE: - return read_file(buf, n); - case SOCKET: - return read_socket(buf, n); - } - return 0; -} - -int read_file(char *buf, int n) { - if (!fgets(buf, n, file)) { - if (feof(file)) { - fprintf(stderr, "EOF\n"); - } else if (ferror(file)) { - perror("get_input: "); - } - return -1; - } - return strlen(buf); -} - -int init_socket(char *path_or_port) { - int family, port, yes; - struct sockaddr_in in_name; - struct sockaddr_un un_name; - struct sockaddr *name; - socklen_t name_size; - - if (parse_int(path_or_port, &port)) { - memset(&in_name, 0, sizeof(in_name)); - family = in_name.sin_family = AF_INET; - in_name.sin_port = htons(port); - in_name.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - name = (struct sockaddr*) &in_name; - name_size = sizeof(in_name); - } else { - memset(&un_name, 0, sizeof(un_name)); - family = un_name.sun_family = AF_UNIX; - strncpy(un_name.sun_path, path_or_port, sizeof(un_name.sun_path)); - name = (struct sockaddr*) &un_name; - name_size = sizeof(un_name); - } - if ((listen_fd = socket(family, SOCK_STREAM, 0)) == -1) { - perror("init_socket"); - exit(1); - } - - /* gets rid of "address in use" errors */ - yes = 1; - setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)); - if (bind(listen_fd, name, name_size) == -1) { - perror("init_socket"); - exit(1); - } - if (listen(listen_fd, 10) == -1) { - perror("init_socket"); - exit(1); - } - - FD_ZERO(&all_fds); - FD_SET(listen_fd, &all_fds); - max_fd = listen_fd; - return 1; -} - -int read_socket(char *buf, int n) { - fd_set select_fds; - int n_active, active_fd, new_fd, nrecv; - struct sockaddr_storage client_addr; - socklen_t addr_len; - - for (;;) { - select_fds = all_fds; - n_active = select(max_fd + 1, &select_fds, NULL, NULL, NULL); - if (n_active == -1) { - perror("read_socket"); - exit(1); - } else if (n_active == 0) { - continue; - } - for (active_fd = 0; active_fd <= max_fd; ++active_fd) { - if (!FD_ISSET(active_fd, &select_fds)) { - continue; - } - if (active_fd == listen_fd) { - if ((new_fd = accept(listen_fd, (struct sockaddr*) &client_addr, (socklen_t*) &addr_len)) == -1) { - perror("read_socket"); - exit(1); - } - fprintf(stderr, "client connect\n"); - FD_SET(new_fd, &all_fds); - if (new_fd > max_fd) { - max_fd = new_fd; - } - } else { - if ((nrecv = recv(active_fd, buf, n, 0)) == -1) { - fprintf(stderr, "here\n"); - perror("read_socket"); - exit(1); - } - if (nrecv == 0) { - /* disconnect */ - fprintf(stderr, "client disconnected\n"); - close(active_fd); - FD_CLR(active_fd, &all_fds); - } - return nrecv; - } - } - } -} - -int init_file(char *path) { - if ((file = fopen(path, "r")) == NULL) - return 0; - return 1; -} - -int run_shell(const char *cmd) { - return system(cmd); -} - -char *get_temp(const char *prefix) { - char *path; - int fd; - path = (char *) malloc(FILENAME_MAX); - snprintf(path, FILENAME_MAX, "/tmp/%sXXXXXX", prefix); - if ((fd = mkstemp(path)) == -1) { - perror("get_temp"); - exit(1); - } - close(fd); - return path; -} - -void delete_file(const char *path) { - remove(path); -} diff --git a/Core/SVS/viewer/platform_specific/windows.c b/Core/SVS/viewer/platform_specific/windows.c deleted file mode 100644 index 40c4c18a43..0000000000 --- a/Core/SVS/viewer/platform_specific/windows.c +++ /dev/null @@ -1,191 +0,0 @@ -#define WIN32_LEAN_AND_MEAN -#include -#include -#include -#include -#include - -int init_socket(char *port); -int init_file(char *path); - -int read_socket(char *buf, int n); -int read_file(char *buf, int n); -void socket_error(char *msg); - -enum Input_type { FILE_INPUT, SOCKET_INPUT }; - -static enum Input_type input_type; -static FILE *file = NULL; - -/* persistent vars for socket */ -static fd_set all_fds; -static int listen_fd, max_fd; - -int init_input(int argc, char *argv[]) { - int i; - - for (i = 1; i < argc; ++i) { - if (strcmp(argv[i], "-s") == 0) { - if (i + 1 >= argc) { - fprintf(stderr, "specify a socket path or port\n"); - return 0; - } - input_type = SOCKET_INPUT; - return init_socket(argv[i + 1]); - } else if (strcmp(argv[i], "-f") == 0) { - if (i + 1 >= argc) { - fprintf(stderr, "specify file path\n"); - return 0; - } - input_type = FILE_INPUT; - return init_file(argv[i + 1]); - } - } - file = stdin; - input_type = FILE_INPUT; - return 1; -} - -int get_input(char *buf, int n) { - switch (input_type) { - case FILE_INPUT: - return read_file(buf, n); - case SOCKET_INPUT: - return read_socket(buf, n); - } - return 0; -} - -int read_file(char *buf, int n) { - if (!fgets(buf, n, file)) { - if (feof(file)) { - fprintf(stderr, "EOF\n"); - } else if (ferror(file)) { - perror("get_input: "); - } - return -1; - } - return strlen(buf); -} - -void winsock_cleanup(void) { - WSACleanup(); -} - -int init_socket(char *port) { - struct addrinfo hints, *name = NULL; - WSADATA wsaData; - - if (WSAStartup(MAKEWORD(2,2), &wsaData) != 0) { - fprintf(stderr, "Winsock initialization failed\n"); - exit(1); - } - atexit(winsock_cleanup); - - if ((listen_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) { - fprintf(stderr, "socket() failed\n"); - exit(1); - } - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = IPPROTO_TCP; - if (getaddrinfo("localhost", port, &hints, &name) != 0) { - fprintf(stderr, "getaddrinfo failed\n"); - exit(1); - } - - if (bind(listen_fd, name->ai_addr, (int)name->ai_addrlen) == SOCKET_ERROR) { - fprintf(stderr, "bind failed\n"); - exit(1); - } - - if (listen(listen_fd, 10) == SOCKET_ERROR) { - fprintf(stderr, "listen failed\n"); - exit(1); - } - - FD_ZERO(&all_fds); - FD_SET(listen_fd, &all_fds); - max_fd = listen_fd; - return 1; -} - -int read_socket(char *buf, int n) { - fd_set select_fds; - int n_active, active_fd, new_fd, nrecv; - struct sockaddr client_addr; - int addr_len; - - for (;;) { - select_fds = all_fds; - n_active = select(max_fd + 1, &select_fds, NULL, NULL, NULL); - if (n_active == SOCKET_ERROR) { - fprintf(stderr, "select failed\n"); - exit(1); - } else if (n_active == 0) { - continue; - } - for (active_fd = 0; active_fd <= max_fd; ++active_fd) { - if (!FD_ISSET(active_fd, &select_fds)) { - continue; - } - if (active_fd == listen_fd) { - addr_len = sizeof(client_addr); - if ((new_fd = accept(listen_fd, &client_addr, (socklen_t*) &addr_len)) == INVALID_SOCKET) { - socket_error("accept failed"); - } - fprintf(stderr, "client connect\n"); - FD_SET(new_fd, &all_fds); - if (new_fd > max_fd) { - max_fd = new_fd; - } - } else { - if ((nrecv = recv(active_fd, buf, n, 0)) == SOCKET_ERROR) { - fprintf(stderr, "recv failed: %d\n", WSAGetLastError()); - /* disconnect */ - closesocket(active_fd); - FD_CLR(active_fd, &all_fds); - return 0; - } - return nrecv; - } - } - } -} - -int init_file(char *path) { - if ((file = fopen(path, "r")) == NULL) - return 0; - return 1; -} - -void socket_error(char *msg) { - fprintf(stderr, "%s: %d\n", msg, WSAGetLastError()); - exit(1); -} - -int run_shell(const char *cmd) { - return system(cmd); -} - -char *get_temp(const char *prefix) { - static char tempdir[MAX_PATH] = {'\0'}; - char *path; - - if (strlen(tempdir) == 0) { - if (GetTempPath(MAX_PATH, tempdir) == 0) { - fprintf(stderr, "can't get temporary directory\n"); - exit(1); - } - } - - path = (char *) malloc(MAX_PATH); - GetTempFileName(tempdir, prefix, 0, path); - return path; -} - -void delete_file(const char *path) { - DeleteFile(path); -} diff --git a/Core/SVS/viewer/text.c b/Core/SVS/viewer/text.c deleted file mode 100644 index 3673c94109..0000000000 --- a/Core/SVS/viewer/text.c +++ /dev/null @@ -1,129 +0,0 @@ -#include "viewer.h" -#include - -#define FONT_FIRST ' ' - -GLubyte font[][12] = { - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x20,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x50,0x50,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x50,0xf8,0x50,0xf8,0x50,0x00,0x00}, - {0x00,0x20,0x70,0xa8,0x28,0x28,0x70,0xa0,0xa8,0x70,0x20,0x00}, - {0x00,0x00,0x90,0xa8,0x68,0x30,0x50,0xa8,0xa8,0x78,0x00,0x00}, - {0x00,0x00,0x68,0x90,0xa8,0xa0,0x40,0xa0,0x90,0x60,0x00,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x00}, - {0x00,0x10,0x20,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x10,0x00}, - {0x00,0x40,0x20,0x10,0x10,0x10,0x10,0x10,0x10,0x20,0x40,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00}, - {0x00,0x00,0x00,0x20,0x20,0xf8,0x20,0x20,0x00,0x00,0x00,0x00}, - {0x40,0x20,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x70,0x00,0x00}, - {0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0xe0,0x20,0x00,0x00}, - {0x00,0x00,0xf8,0x80,0x40,0x20,0x10,0x08,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x08,0x08,0x30,0x08,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x38,0x10,0x10,0xf8,0x90,0x50,0x30,0x10,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x88,0xf0,0x80,0x80,0x70,0x00,0x00}, - {0x00,0x00,0x20,0x20,0x20,0x20,0x10,0x08,0x08,0xf8,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x70,0x08,0x08,0x78,0x88,0x88,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00}, - {0x40,0x20,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x00,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00,0x00}, - {0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0xf8,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x00,0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x00,0x00}, - {0x00,0x00,0x20,0x00,0x20,0x10,0x08,0x08,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x78,0x80,0x80,0xb8,0xa8,0xb8,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x50,0x50,0x20,0x00,0x00}, - {0x00,0x00,0xf0,0x88,0x88,0x88,0xf0,0x88,0x88,0xf0,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x80,0x88,0x70,0x00,0x00}, - {0x00,0x00,0xf0,0x88,0x88,0x88,0x88,0x88,0x88,0xf0,0x00,0x00}, - {0x00,0x00,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,0x00}, - {0x00,0x00,0x80,0x80,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x98,0x80,0x80,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x00,0x00}, - {0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0xf8,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x08,0x08,0x08,0x08,0x08,0x00,0x00}, - {0x00,0x00,0x88,0x90,0xa0,0xc0,0xc0,0xa0,0x90,0x88,0x00,0x00}, - {0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x88,0x88,0xa8,0xa8,0xd8,0x88,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x88,0x88,0x98,0xa8,0xc8,0x88,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x80,0x80,0x80,0x80,0xf0,0x88,0x88,0xf0,0x00,0x00}, - {0x00,0x08,0x70,0xa8,0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x88,0x88,0xf0,0x88,0x88,0xf0,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x08,0x08,0x70,0x80,0x88,0x70,0x00,0x00}, - {0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0xf8,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x00}, - {0x00,0x00,0x20,0x20,0x50,0x50,0x88,0x88,0x88,0x88,0x00,0x00}, - {0x00,0x00,0x88,0xd8,0xa8,0xa8,0x88,0x88,0x88,0x88,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x88,0x00,0x00}, - {0x00,0x00,0x20,0x20,0x20,0x50,0x88,0x88,0x88,0x88,0x00,0x00}, - {0x00,0x00,0xf8,0x80,0x80,0x40,0x20,0x10,0x08,0xf8,0x00,0x00}, - {0x00,0x30,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x30,0x00}, - {0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00}, - {0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x50,0x20,0x00,0x00}, - {0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x40,0x00}, - {0x00,0x00,0x68,0x98,0x88,0x88,0x78,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0x80,0x00,0x00}, - {0x00,0x00,0x78,0x80,0x80,0x88,0x70,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x78,0x88,0x88,0x88,0x78,0x08,0x08,0x08,0x00,0x00}, - {0x00,0x00,0x78,0x80,0xf8,0x88,0x70,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x70,0x20,0x18,0x00,0x00}, - {0x70,0x08,0x78,0x88,0x88,0x88,0x78,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x88,0x88,0xf0,0x80,0x80,0x80,0x00,0x00}, - {0x00,0x00,0x70,0x20,0x20,0x20,0x60,0x00,0x00,0x20,0x00,0x00}, - {0xc0,0x20,0x20,0x20,0x20,0x20,0x60,0x00,0x00,0x20,0x00,0x00}, - {0x00,0x00,0x88,0x90,0xe0,0xa0,0x90,0x80,0x80,0x80,0x00,0x00}, - {0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x60,0x00,0x00}, - {0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xf0,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x88,0x88,0x88,0xc8,0xb0,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x00,0x00,0x00,0x00,0x00}, - {0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x00,0x00,0x00,0x00,0x00}, - {0x08,0x08,0x78,0x88,0x88,0x88,0x78,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x80,0x80,0x80,0xc8,0xb0,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0xf0,0x08,0x70,0x80,0x78,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x18,0x20,0x20,0x20,0x70,0x20,0x20,0x20,0x00,0x00}, - {0x00,0x00,0x68,0x98,0x88,0x88,0x88,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x20,0x50,0x50,0x88,0x88,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x50,0xa8,0xa8,0xa8,0xa8,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00}, - {0x70,0x08,0x78,0x88,0x88,0x88,0x88,0x00,0x00,0x00,0x00,0x00}, - {0x00,0x00,0xf8,0x40,0x20,0x10,0xf8,0x00,0x00,0x00,0x00,0x00}, - {0x10,0x20,0x20,0x20,0x20,0x40,0x20,0x20,0x20,0x20,0x10,0x00}, - {0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00}, - {0x40,0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20,0x20,0x40,0x00}, - {0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x68,0x00,0x00,0x00,0x00}, - {0x70,0xf8,0xa8,0xd8,0xf8,0xf8,0xa8,0xa8,0xa8,0xf8,0x70,0x00}, -}; - -GLuint font_offset; - -void init_font() -{ - int nchars; - GLuint i; - - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - font_offset = glGenLists (128); - nchars = sizeof(font) / sizeof(font[0]); - for (i = 0; i < nchars; ++i) { - glNewList(font_offset + FONT_FIRST + i, GL_COMPILE); - glBitmap(FONT_WIDTH, FONT_HEIGHT, 0, 0, FONT_WIDTH, 0.0, font[i]); - glEndList(); - } -} - -void draw_text(char *s, int x, int y) { - glRasterPos2i(x, y); - glPushAttrib (GL_LIST_BIT); - glListBase(font_offset); - glCallLists(strlen(s), GL_UNSIGNED_BYTE, (GLubyte *) s); - glPopAttrib (); -} - diff --git a/Core/SVS/viewer/trackball.c b/Core/SVS/viewer/trackball.c deleted file mode 100644 index a811004bef..0000000000 --- a/Core/SVS/viewer/trackball.c +++ /dev/null @@ -1,337 +0,0 @@ -/* - * (c) Copyright 1993, 1994, Silicon Graphics, Inc. - * ALL RIGHTS RESERVED - * Permission to use, copy, modify, and distribute this software for - * any purpose and without fee is hereby granted, provided that the above - * copyright notice appear in all copies and that both the copyright notice - * and this permission notice appear in supporting documentation, and that - * the name of Silicon Graphics, Inc. not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. - * - * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS" - * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR - * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT, - * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY - * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION, - * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF - * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN - * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE - * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE. - * - * US Government Users Restricted Rights - * Use, duplication, or disclosure by the Government is subject to - * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph - * (c)(1)(ii) of the Rights in Technical Data and Computer Software - * clause at DFARS 252.227-7013 and/or in similar or successor - * clauses in the FAR or the DOD or NASA FAR Supplement. - * Unpublished-- rights reserved under the copyright laws of the - * United States. Contractor/manufacturer is Silicon Graphics, - * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311. - * - * OpenGL(TM) is a trademark of Silicon Graphics, Inc. - */ -/* - * Trackball code: - * - * Implementation of a virtual trackball. - * Implemented by Gavin Bell, lots of ideas from Thant Tessman and - * the August '88 issue of Siggraph's "Computer Graphics," pp. 121-129. - * - * Vector manip code: - * - * Original code from: - * David M. Ciemiewicz, Mark Grossman, Henry Moreton, and Paul Haeberli - * - * Much mucking with by: - * Gavin Bell - */ -#if defined(_WIN32) -#pragma warning (disable:4244) /* disable bogus conversion warnings */ -#endif -#include -#include "trackball.h" - -/* - * This size should really be based on the distance from the center of - * rotation to the point on the object underneath the mouse. That - * point would then track the mouse as closely as possible. This is a - * simple example, though, so that is left as an Exercise for the - * Programmer. - */ -#define TRACKBALLSIZE (0.8f) - -/* - * Local function prototypes (not defined in trackball.h) - */ -static double tb_project_to_sphere(double, double, double); -static void normalize_quat(double [4]); - -static void -vzero(double v[3]) -{ - v[0] = 0.0; - v[1] = 0.0; - v[2] = 0.0; -} - -static void -vset(double v[3], double x, double y, double z) -{ - v[0] = x; - v[1] = y; - v[2] = z; -} - -static void -vsub(const double src1[3], const double src2[3], double dst[3]) -{ - dst[0] = src1[0] - src2[0]; - dst[1] = src1[1] - src2[1]; - dst[2] = src1[2] - src2[2]; -} - -static void -vcopy(const double v1[3], double v2[3]) -{ - register int i; - for (i = 0 ; i < 3 ; i++) - v2[i] = v1[i]; -} - -static void -vcross(const double v1[3], const double v2[3], double cross[3]) -{ - double temp[3]; - - temp[0] = (v1[1] * v2[2]) - (v1[2] * v2[1]); - temp[1] = (v1[2] * v2[0]) - (v1[0] * v2[2]); - temp[2] = (v1[0] * v2[1]) - (v1[1] * v2[0]); - vcopy(temp, cross); -} - -static double -vlength(const double v[3]) -{ - return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); -} - -static void -vscale(double v[3], double div) -{ - v[0] *= div; - v[1] *= div; - v[2] *= div; -} - -static void -vnormal(double v[3]) -{ - vscale(v,1.0/vlength(v)); -} - -static double -vdot(const double v1[3], const double v2[3]) -{ - return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2]; -} - -static void -vadd(const double src1[3], const double src2[3], double dst[3]) -{ - dst[0] = src1[0] + src2[0]; - dst[1] = src1[1] + src2[1]; - dst[2] = src1[2] + src2[2]; -} - -/* - * Ok, simulate a track-ball. Project the points onto the virtual - * trackball, then figure out the axis of rotation, which is the cross - * product of P1 P2 and O P1 (O is the center of the ball, 0,0,0) - * Note: This is a deformed trackball-- is a trackball in the center, - * but is deformed into a hyperbolic sheet of rotation away from the - * center. This particular function was chosen after trying out - * several variations. - * - * It is assumed that the arguments to this routine are in the range - * (-1.0 ... 1.0) - */ -void -trackball(double q[4], double sz, double p1x, double p1y, double p2x, double p2y) -{ - double a[3]; - double p1[3], p2[3], d[3]; - double t, phi; - - if (p1x == p2x && p1y == p2y) { - /* Zero rotation */ - q[0] = 0.0; - q[1] = 0.0; - q[2] = 0.0; - q[3] = 1.0; - return; - } - - /* - * First, figure out z-coordinates for projection of P1 and P2 to - * deformed sphere - */ - vset(p1,p1x,p1y,tb_project_to_sphere(sz,p1x,p1y)); - vset(p2,p2x,p2y,tb_project_to_sphere(sz,p2x,p2y)); - - /* - * Now, we want the cross product of P1 and P2 - */ - vcross(p2,p1,a); - - /* - * Figure out how much to rotate around that axis. - */ - vsub(p1,p2,d); - t = vlength(d) / (2.0*sz); - - /* - * Avoid problems with out-of-control values... - */ - if (t > 1.0) t = 1.0; - if (t < -1.0) t = -1.0; - phi = 2.0 * asin(t); - axis_to_quat(a, phi, q); -} - -/* - * Given an axis and angle, compute quaternion. - */ -void -axis_to_quat(const double a[3], double phi, double q[4]) -{ - vcopy(a,q); - vnormal(q); - vscale(q, sin(phi/2.0)); - q[3] = cos(phi/2.0); -} - -/* - * Project an x,y pair onto a sphere of radius r OR a hyperbolic sheet - * if we are away from the center of the sphere. - */ -static double -tb_project_to_sphere(double r, double x, double y) -{ - double d, t, z; - - d = sqrt(x*x + y*y); - if (d < r * 0.70710678118654752440) { /* Inside sphere */ - z = sqrt(r*r - d*d); - } else { /* On hyperbola */ - t = r / 1.41421356237309504880; - z = t*t / d; - } - return z; -} - -/* - * Given two rotations, e1 and e2, expressed as quaternion rotations, - * figure out the equivalent single rotation and stuff it into dest. - * - * This routine also normalizes the result every RENORMCOUNT times it is - * called, to keep error from creeping in. - * - * NOTE: This routine is written so that q1 or q2 may be the same - * as dest (or each other). - */ - -#define RENORMCOUNT 97 - -void -add_quats(const double q1[4], const double q2[4], double dest[4]) -{ - static int count=0; - double t1[4], t2[4], t3[4]; - double tf[4]; - -#if 0 -printf("q1 = %f %f %f %f\n", q1[0], q1[1], q1[2], q1[3]); -printf("q2 = %f %f %f %f\n", q2[0], q2[1], q2[2], q2[3]); -#endif - - vcopy(q1,t1); - vscale(t1,q2[3]); - - vcopy(q2,t2); - vscale(t2,q1[3]); - - vcross(q2,q1,t3); - vadd(t1,t2,tf); - vadd(t3,tf,tf); - tf[3] = q1[3] * q2[3] - vdot(q1,q2); - -#if 0 -printf("tf = %f %f %f %f\n", tf[0], tf[1], tf[2], tf[3]); -#endif - - dest[0] = tf[0]; - dest[1] = tf[1]; - dest[2] = tf[2]; - dest[3] = tf[3]; - - if (++count > RENORMCOUNT) { - count = 0; - normalize_quat(dest); - } -} - -/* - * Quaternions always obey: a^2 + b^2 + c^2 + d^2 = 1.0 - * If they don't add up to 1.0, dividing by their magnitued will - * renormalize them. - * - * Note: See the following for more information on quaternions: - * - * - Shoemake, K., Animating rotation with quaternion curves, Computer - * Graphics 19, No 3 (Proc. SIGGRAPH'85), 245-254, 1985. - * - Pletinckx, D., Quaternion calculus as a basic tool in computer - * graphics, The Visual Computer 5, 2-13, 1989. - */ -static void -normalize_quat(double q[4]) -{ - int i; - double mag; - - mag = sqrt(q[0]*q[0] + q[1]*q[1] + q[2]*q[2] + q[3]*q[3]); - for (i = 0; i < 4; i++) - q[i] /= mag; -} - -/* - * Build a rotation matrix, given a quaternion rotation. - * - */ -void -build_rotmatrix(double m[4][4], const double q[4]) -{ - m[0][0] = 1.0 - 2.0 * (q[1] * q[1] + q[2] * q[2]); - m[0][1] = 2.0 * (q[0] * q[1] - q[2] * q[3]); - m[0][2] = 2.0 * (q[2] * q[0] + q[1] * q[3]); - m[0][3] = 0.0; - - m[1][0] = 2.0 * (q[0] * q[1] + q[2] * q[3]); - m[1][1]= 1.0 - 2.0 * (q[2] * q[2] + q[0] * q[0]); - m[1][2] = 2.0 * (q[1] * q[2] - q[0] * q[3]); - m[1][3] = 0.0; - - m[2][0] = 2.0 * (q[2] * q[0] - q[1] * q[3]); - m[2][1] = 2.0 * (q[1] * q[2] + q[0] * q[3]); - m[2][2] = 1.0 - 2.0 * (q[1] * q[1] + q[0] * q[0]); - m[2][3] = 0.0; - - m[3][0] = 0.0; - m[3][1] = 0.0; - m[3][2] = 0.0; - m[3][3] = 1.0; -} - diff --git a/Core/SVS/viewer/trackball.h b/Core/SVS/viewer/trackball.h deleted file mode 100644 index 5141ef43d8..0000000000 --- a/Core/SVS/viewer/trackball.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * (c) Copyright 1993, 1994, Silicon Graphics, Inc. - * ALL RIGHTS RESERVED - * Permission to use, copy, modify, and distribute this software for - * any purpose and without fee is hereby granted, provided that the above - * copyright notice appear in all copies and that both the copyright notice - * and this permission notice appear in supporting documentation, and that - * the name of Silicon Graphics, Inc. not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. - * - * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS" - * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR - * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT, - * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY - * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION, - * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF - * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN - * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE - * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE. - * - * US Government Users Restricted Rights - * Use, duplication, or disclosure by the Government is subject to - * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph - * (c)(1)(ii) of the Rights in Technical Data and Computer Software - * clause at DFARS 252.227-7013 and/or in similar or successor - * clauses in the FAR or the DOD or NASA FAR Supplement. - * Unpublished-- rights reserved under the copyright laws of the - * United States. Contractor/manufacturer is Silicon Graphics, - * Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311. - * - * OpenGL(TM) is a trademark of Silicon Graphics, Inc. - */ -/* - * trackball.h - * A virtual trackball implementation - * Written by Gavin Bell for Silicon Graphics, November 1988. - */ - -#ifndef TRACKBALL_H -#define TRACKBALL_H - - -/* - * Pass the x and y coordinates of the last and current positions of - * the mouse, scaled so they are from (-1.0 ... 1.0). - * - * The resulting rotation is returned as a quaternion rotation in the - * first paramater. - */ -void -trackball(double q[4], double sz, double p1x, double p1y, double p2x, double p2y); - -/* - * Given two quaternions, add them together to get a third quaternion. - * Adding quaternions to get a compound rotation is analagous to adding - * translations to get a compound translation. When incrementally - * adding rotations, the first argument here should be the new - * rotation, the second and third the total rotation (which will be - * over-written with the resulting new total rotation). - */ -void -add_quats(const double q1[4], const double q2[4], double dest[4]); - -/* - * A useful function, builds a rotation matrix in Matrix based on - * given quaternion. - */ -void -build_rotmatrix(double m[4][4], const double q[4]); - -/* - * This function computes a quaternion based on an axis (defined by - * the given vector) and an angle about which to rotate. The angle is - * expressed in radians. The result is put into the third argument. - */ -void -axis_to_quat(const double a[3], double phi, double q[4]); - - -#endif /* TRACKBALL_H */ diff --git a/Core/SVS/viewer/util.c b/Core/SVS/viewer/util.c deleted file mode 100644 index 2542f038db..0000000000 --- a/Core/SVS/viewer/util.c +++ /dev/null @@ -1,288 +0,0 @@ -#include -#include -#include -#include -#include "viewer.h" - -static char *qhull_in_path = NULL; -static char *qhull_out_path = NULL; -static char qhull_cmd[1000]; - -void fix_literal_quotes(char *s); -void cleanup_qhull(); - -/* - split using whitespace and double quotes. \" is a literal quote in quoted - fields -*/ -int split(char *s, char *fields[], int maxfields) { - char *p; - int n, quoted, done; - - memset(fields, 0, maxfields * sizeof(char*)); - for (n = 0, quoted = 0, done = 0, p = s; !done && n < maxfields; ++p) { - if (*p == '\0') done = 1; - - if (!fields[n] && *p != '\0' && !isspace(*p)) { - if (*p == '"') { - fields[n] = p + 1; - quoted = 1; - } else { - fields[n] = p; - quoted = 0; - } - } else if (fields[n] && !quoted && (isspace(*p) || *p == '\0')) { - *p = '\0'; - ++n; - } else if (fields[n] && quoted && ((*p == '"' && *(p-1) != '\\') || *p == '\0')) { - *p = '\0'; - fix_literal_quotes(fields[n]); - ++n; - } - } - return n; -} - -void fix_literal_quotes(char *s) { - char *t; - for (t = s; *s != '\0'; ++s, ++t) { - if (*s == '\\' && *(s+1) == '"') { - ++s; - } - if (t != s) { - *t = *s; - } - } - *t = '\0'; -} - -int match(char *pat, char *s) { - char *patcopy, *p1, *p2, *sp1, *sp2; - - if ((patcopy = strdup(pat)) == NULL) { - perror("match: "); - exit(1); - } - - p1 = patcopy; - sp1 = s; - while (*p1 != '\0') { - p2 = strchr(p1, '*'); - if (p2 == NULL) - return (strcmp(p1, sp1) == 0); - *p2 = '\0'; - sp2 = strstr(sp1, p1); - if (sp2 == NULL || (p1 == patcopy && sp2 != sp1)) - return 0; - sp1 = sp2 + strlen(p1); - p1 = p2 + 1; - } - /* will only get here if pat ends with '*' */ - return 1; -} - -int parse_int(char *s, int *v) { - char *end; - *v = strtol(s, &end, 10); - return *s != '\0' && *end == '\0'; -} - -void set_vec3(vec3 a, real x, real y, real z) { - a[0] = x; a[1] = y; a[2] = z; -} - -void set_vec4(vec3 a, real x, real y, real z, real w) { - a[0] = x; a[1] = y; a[2] = z; a[3] = w; -} - -void copy_vec3(vec3 a, vec3 b) { - set_vec3(b, a[0], a[1], a[2]); -} - -void copy_vec4(vec4 a, vec4 b) { - set_vec4(b, a[0], a[1], a[2], a[3]); -} - -void add_vec3(vec3 a, vec3 b) { - a[0] += b[0]; a[1] += b[1]; a[2] += b[2]; -} - -void subtract_vec3(vec3 a, vec3 b) { - a[0] -= b[0]; a[1] -= b[1]; a[2] -= b[2]; -} - -void scale_vec3(vec3 a, real b) { - a[0] *= b; a[1] *= b; a[2] *= b; -} - -void cross_prod(vec3 a, vec3 b, vec3 c) { - c[0] = a[1] * b[2] - a[2] * b[1]; - c[1] = a[2] * b[0] - a[0] * b[2]; - c[2] = a[0] * b[1] - a[1] * b[0]; -} - -void normalize(vec3 a) { - real d = sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]); - if (d == 0.0) { - error("division by zero when normalizing vec3"); - } - a[0] /= d; a[1] /= d; a[2] /= d; -} - -void norm_cross_prod(vec3 a, vec3 b, vec3 c) { - cross_prod(a, b, c); - if (c[0] != 0.0 || c[1] != 0.0 || c[2] != 0.0) - normalize(c); -} - -void set_quat(quaternion q, real x, real y, real z, real w) { - q[0] = x; q[1] = y; q[2] = z; q[3] = w; -} - -void quat_to_axis_angle(quaternion q, vec3 axis, real *angle) { - real s = sqrt(1 - q[3] * q[3]); - *angle = 2.0 * acos(q[3]); - - set_vec3(axis, q[0], q[1], q[2]); - if (s > 0.00001) { - axis[0] /= s; - axis[1] /= s; - axis[2] /= s; - } -} - -void quat_to_mat(quaternion q, real m[16]) { - m[0] = 1.0 - 2.0 * (q[1] * q[1] + q[2] * q[2]); - m[1] = 2.0 * (q[0] * q[1] - q[2] * q[3]); - m[2] = 2.0 * (q[2] * q[0] + q[1] * q[3]); - m[3] = 0.0; - - m[4] = 2.0 * (q[0] * q[1] + q[2] * q[3]); - m[5]= 1.0 - 2.0 * (q[2] * q[2] + q[0] * q[0]); - m[6] = 2.0 * (q[1] * q[2] - q[0] * q[3]); - m[7] = 0.0; - - m[8] = 2.0 * (q[2] * q[0] - q[1] * q[3]); - m[9] = 2.0 * (q[1] * q[2] + q[0] * q[3]); - m[10] = 1.0 - 2.0 * (q[1] * q[1] + q[0] * q[0]); - m[11] = 0.0; - - m[12] = 0.0; - m[13] = 0.0; - m[14] = 0.0; - m[15] = 1.0; -} - -void rotate_vec3(quaternion q, vec3 v) { - real m[16]; - - quat_to_mat(q, m); - v[0] = m[0] * v[0] + m[4] * v[1] + m[8] * v[2]; - v[1] = m[1] * v[0] + m[5] * v[1] + m[9] * v[2]; - v[2] = m[2] * v[0] + m[6] * v[1] + m[10] * v[2]; -} - -void init_semaphore(semaphore *s) { - s->count = 0; - if (!(s->mutex = glfwCreateMutex())) - error("Failed to create semaphore mutex.\n"); - if (!(s->cond = glfwCreateCond())) - error("Failed to create semaphore condition variable.\n"); -} - -void semaphore_P(semaphore *s) { - glfwLockMutex(s->mutex); - while (s->count == 0) { - glfwWaitCond(s->cond, s->mutex, GLFW_INFINITY); // implicitly unlocks mutex - glfwLockMutex(s->mutex); - } - s->count = 0; - glfwUnlockMutex(s->mutex); -} - -void semaphore_V(semaphore *s) { - glfwLockMutex(s->mutex); - s->count = 1; - glfwUnlockMutex(s->mutex); - glfwSignalCond(s->cond); -} - -int qhull(real verts[], int nverts, int indexes[], int max_indexes) { - - FILE *input, *output; - int ret, ntriangles, i, j, k; - char readbuf[4096]; - char *fields[4]; // should be 3 fields per line, one more to detect errors - - if (!qhull_in_path) { - qhull_in_path = get_temp("qhull_in_"); - qhull_out_path = get_temp("qhull_out_"); - fprintf(stderr, "qhull_in = %s, qhull_out = %s\n", qhull_in_path, qhull_out_path); - if (sprintf(qhull_cmd, "qconvex i Qt <%s >%s", qhull_in_path, qhull_out_path) < 0) { - error("error constructing qhull command"); - } - atexit(cleanup_qhull); - } - - input = fopen(qhull_in_path, "w"); - if (!input) { - perror("qhull"); - exit(1); - } - - fprintf(input, "3\n%d\n", nverts / 3); - for (i = 0; i < nverts; i += 3) { - fprintf(input, "%f %f %f\n", verts[i], verts[i+1], verts[i+2]); - } - fclose(input); - - if ((ret = run_shell(qhull_cmd)) != 0) { - fprintf(stderr, "qhull returned with non-zero status %d\n", ret); - exit(1); - } - - output = fopen(qhull_out_path, "r"); - if (!output) { - perror("qhull"); - exit(1); - } - - if (!fgets(readbuf, sizeof(readbuf), output) || - split(readbuf, fields, 2) != 1 || - !parse_int(fields[0], &ntriangles)) - { - error("unexpected qhull output"); - } - - if (ntriangles * 3 > max_indexes) { - error("too many triangles in convex hull"); - } - - for (i = 0, k = 0; i < ntriangles; ++i) { - if (!fgets(readbuf, sizeof(readbuf), output) || - split(readbuf, fields, 4) != 3) - { - error("unexpected qhull output"); - } - for (j = 2; j >= 0; --j) { /* qhull outputs clockwise triangles */ - if (!parse_int(fields[j], &indexes[k++])) { - error("unexpected qhull output"); - } - } - } - - fclose(output); - return ntriangles * 3; -} - -void cleanup_qhull() { - delete_file(qhull_in_path); - delete_file(qhull_out_path); - free(qhull_in_path); - free(qhull_out_path); -} - -void error(const char *msg) { - fprintf(stderr, "%s\n", msg); - exit(1); -} diff --git a/Core/SVS/viewer/viewer.c b/Core/SVS/viewer/viewer.c deleted file mode 100644 index cb227ff68d..0000000000 --- a/Core/SVS/viewer/viewer.c +++ /dev/null @@ -1,930 +0,0 @@ -#include "viewer.h" - -#include -#include -#include -#include -#include -#include "viewer.h" -#include "trackball.h" - -/* - For GRID_LINES = 10, there would be 20 lines along x axis and 20 lines - along y axis (exclude axes). Each line is composed of 4 doubles (x1, y1), (x2, y2) -*/ -#define GRID_VERTS_SIZE (4 * 2 * (GRID_LINES * 2)) -#define SCENE_MENU_OFFSET 20 -#define MAX_INDS 3000 -#define DEPTH_BITS 16 - -GLFWmutex scene_lock; -GLFWmutex redraw_lock; -semaphore redraw_semaphore; -int debug; - -static real grid_verts[GRID_VERTS_SIZE]; -static camera cam; -static layer layers[NLAYERS]; - -/* Colors of all objects */ -static GLfloat light_color[] = { 0.2, 0.2, 0.2, 1.0 }; -static real bg_color[] = { 0.2, 0.2, 0.2, 1.0 }; -static real grid_color[] = { 0.3, 0.3, 0.3, 0.5 }; -static real grid_x_color[] = { 0.7, 0.0, 0.0, 0.5 }; -static real grid_y_color[] = { 0.0, 0.7, 0.0, 0.5 }; -static real scene_text_color[] = { 1.0, 0.0, 0.0 }; -static real active_scene_text_color[] = { 1.0, 1.0, 0.0 }; -static real geom_default_color[] = { 0.8, 0.8, 0.8 }; -static real geom_label_color[] = { 1.0, 0.0, 0.0 }; -static GLfloat geom_specular[] = { 1.0, 1.0, 1.0, 1.0 }; -static GLfloat geom_shininess[] = { 100.0 }; - -static scene *scene_head = NULL; -static scene *curr_scene = NULL; -static int scr_width = 640; -static int scr_height = 480; -static int show_grid = 1; -static real grid_size = 1.0; -static int redraw = 0; - -/* - 0 = screenshots requested by keyboard - 1 = screenshots requested by input -*/ -static char screenshot_path[2][1000] = { { '\0' }, { '\0' } }; - -void reshape (); -void calc_normals(geometry *g); -void init_grid(void); -void draw_grid(void); -void draw_screen(void); -void draw_layer(scene *s, int layer_num); -void draw_labels(void); -void draw_scene_buttons(GLuint x, GLuint y); -int scene_button_hit_test(GLuint x0, GLuint y0, GLuint x, GLuint y); -void free_geom_shape(geometry *g); -void setup3d(); -void init_layers(); -void screenshot(char *path); - -void GLFWCALL keyboard_callback(int key, int state); -void GLFWCALL mouse_button_callback(int button, int state); -void GLFWCALL mouse_wheel_callback(int pos); -void GLFWCALL mouse_position_callback(int x, int y); -void GLFWCALL win_resize_callback(int w, int h); -void GLFWCALL win_refresh_callback(void); - -int main(int argc, char *argv[]) { - int i, signal_redraw; - GLFWthread input_thread; - - if (glfwInit() == GL_FALSE) { - error("Failed to init glfw"); - } - atexit(glfwTerminate); - - if (!(scene_lock = glfwCreateMutex())) - error("Failed to create scene lock mutex."); - if (!(redraw_lock = glfwCreateMutex())) - error("Failed to create redraw lock mutex."); - init_semaphore(&redraw_semaphore); - - for (i = 1; i < argc; ++i) { - if (strcmp(argv[i], "-d") == 0) { - debug = 1; - } - } - - if (!init_input(argc, argv)) - exit(1); - - if (glfwOpenWindow(scr_width, scr_height, 0, 0, 0, 0, DEPTH_BITS, 0, GLFW_WINDOW) == GL_FALSE) - { - error("Failed to open glfw window"); - } - glfwSetWindowTitle("SVS viewer"); - glfwSetMouseWheel(0); - - glfwSetWindowSizeCallback(win_resize_callback); - glfwSetWindowRefreshCallback(win_refresh_callback); - glfwSetKeyCallback(keyboard_callback); - glfwSetMouseButtonCallback(mouse_button_callback); - glfwSetMouseWheelCallback(mouse_wheel_callback); - glfwSetMousePosCallback(mouse_position_callback); - - glClearColor(bg_color[0], bg_color[1], bg_color[2], bg_color[3]); - glShadeModel(GL_FLAT); - glEnable(GL_DEPTH_TEST); - glLightfv(GL_LIGHT0, GL_AMBIENT, light_color); - glEnable(GL_LIGHT0); - glEnable(GL_COLOR_MATERIAL); - glMaterialfv(GL_FRONT, GL_SPECULAR, geom_specular); - glMaterialfv(GL_FRONT, GL_SHININESS, geom_shininess); - - init_grid(); - init_font(); - init_layers(); - - input_thread = glfwCreateThread(proc_input, NULL); - if (input_thread < 0) { - error("Unable to create input thread"); - } - - reset_camera(&cam, '1'); - cam.ortho = 0; - set_redraw(); - signal_redraw = 0; - while(glfwGetWindowParam(GLFW_OPENED)) { - //glfwWaitEvents(); - glfwPollEvents(); - if (redraw) { - draw_screen(); - } else { - glfwSleep(0.01); - } - } - - return 0; -} - -void GLFWCALL keyboard_callback(int key, int state) { - if (state == GLFW_RELEASE) - return; - - switch (key) { - case '1': - case '2': - case '3': - reset_camera(&cam, key); - break; - case 'G': - show_grid = !show_grid; - break; - case 'N': - layers[0].draw_names = !layers[0].draw_names; - break; - case '-': - grid_size /= 10.0; - init_grid(); - break; - case '=': - grid_size *= 10.0; - init_grid(); - break; - case 'W': - layers[0].wireframe = !layers[0].wireframe; - break; - case 'S': - request_screenshot("screen.ppm", 0); - break; - case 'O': - cam.ortho = 1 - cam.ortho; - break; - default: - return; /* return without setting redraw */ - } - set_redraw(); -} - -void GLFWCALL mouse_button_callback(int button, int state) { - int x, y; - - if (button == GLFW_MOUSE_BUTTON_LEFT && state == GLFW_PRESS) { - glfwGetMousePos(&x, &y); - if (scene_button_hit_test(SCENE_MENU_OFFSET, scr_height - SCENE_MENU_OFFSET, x, scr_height - y)) { - set_redraw(); - } - } -} - -void GLFWCALL mouse_wheel_callback(int pos) { - if (pos < 0) { - zoom_camera(&cam, -10); - } else if (pos > 0) { - zoom_camera(&cam, 10); - } - glfwSetMouseWheel(0); -} - -void GLFWCALL mouse_position_callback(int x, int y) { - static int ox = -1, oy = -1; - int shift, ctrl, dx, dy; - - dx = x - ox; - dy = y - oy; - ox = x; - oy = y; - - if (glfwGetMouseButton(GLFW_MOUSE_BUTTON_RIGHT) == GLFW_RELEASE) - return; - - shift = (glfwGetKey(GLFW_KEY_LSHIFT) == GLFW_PRESS) || - (glfwGetKey(GLFW_KEY_RSHIFT) == GLFW_PRESS); - - ctrl = (glfwGetKey(GLFW_KEY_LCTRL) == GLFW_PRESS) || - (glfwGetKey(GLFW_KEY_RCTRL) == GLFW_PRESS); - - if (shift) { - pan_camera(&cam, dx, dy); - } else if (ctrl) { - if (!cam.ortho) { - pull_camera(&cam, dy); - } - } else { - rotate_camera(&cam, x, y, dx, dy); - } -} - -void init_grid() { - int i, j; - real g; - - g = GRID_LINES * grid_size; - i = 0; - for (j = -GRID_LINES; j <= GRID_LINES; ++j) { - if (j == 0) - continue; - grid_verts[i++] = j * grid_size; /* x1 */ - grid_verts[i++] = -g; /* y1 */ - grid_verts[i++] = j * grid_size; /* x2 */ - grid_verts[i++] = g; /* y2 */ - } - - for (j = -GRID_LINES; j <= GRID_LINES; ++j) { - if (j == 0) - continue; - grid_verts[i++] = -g; /* x1 */ - grid_verts[i++] = j * grid_size; /* y1 */ - grid_verts[i++] = g; /* x2 */ - grid_verts[i++] = j * grid_size; /* y2 */ - } - - assert(i == GRID_VERTS_SIZE); -} - -void draw_grid() { - real g = GRID_LINES * grid_size; - - setup3d(); - glDisable(GL_LIGHTING); - glEnableClientState(GL_VERTEX_ARRAY); - glColor4dv(grid_color); - glVertexPointer(2, GL_DOUBLE, 0, grid_verts); - glDrawArrays(GL_LINES, 0, GRID_VERTS_SIZE / 2); - - glColor4dv(grid_x_color); - glBegin(GL_LINES); - glVertex3f(0.0, -g, 0.0); - glVertex3f(0.0, g, 0.0); - glEnd(); - - glColor4dv(grid_y_color); - glBegin(GL_LINES); - glVertex3f(-g, 0.0, 0.0); - glVertex3f(g, 0.0, 0.0); - glEnd(); - glDisableClientState(GL_VERTEX_ARRAY); -} - -void draw_screen() { - int i; - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - if (show_grid) - draw_grid(); - - glfwLockMutex(scene_lock); - if (curr_scene) { - for (i = 0; i < NLAYERS; ++i) { - draw_layer(curr_scene, i); - } - draw_labels(); - } - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluOrtho2D(0.0, (GLfloat) scr_width, 0.0, (GLfloat) scr_height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - draw_scene_buttons(SCENE_MENU_OFFSET, scr_height - SCENE_MENU_OFFSET); - - glFinish(); - for (i = 0; i < 2; ++i) { - if (screenshot_path[i][0] != '\0') { - screenshot(screenshot_path[i]); - screenshot_path[i][0] = '\0'; - if (i == 1) - semaphore_V(&redraw_semaphore); - } - } - redraw = 0; - glfwUnlockMutex(scene_lock); - glfwSwapBuffers(); -} - -void GLFWCALL win_resize_callback(int w, int h) { - scr_width = w; - scr_height = h; - glViewport (0, 0, (GLsizei) scr_width, (GLsizei) scr_height); - set_redraw(); -} - -void GLFWCALL win_refresh_callback(void) { - set_redraw(); -} - -void pan_camera(camera *c, real dx, real dy) { - c->pos[0] += PAN_FACTOR * dx; - c->pos[1] -= PAN_FACTOR * dy; - set_redraw(); -} - -void rotate_camera(camera *c, int x, int y, int dx, int dy) { - int lastx, lasty; - double p1x, p1y, p2x, p2y, q1[4], q2[4]; - - lastx = x - dx; - lasty = y - dy; - p1x = (2.0 * lastx - scr_width) / (double) scr_width; - p1y = (scr_height - 2.0 * lasty) / (double) scr_height; - p2x = (2.0 * x - scr_width) / (double) scr_width; - p2y = (scr_height - 2.0 * y) / (double) scr_height; - - /* printf("rotate in: %g %g %g %g\n", p1x, p1y, p2x, p2y); */ - trackball(q1, 0.8, p1x, p1y, p2x, p2y); - q2[0] = c->q[0]; q2[1] = c->q[1]; q2[2] = c->q[2]; q2[3] = c->q[3]; - add_quats(q1, q2, c->q); - quat_to_mat(c->q, c->rot_mat); - set_redraw(); -} - -void pull_camera(camera *c, real dz) { - c->pos[2] += PAN_FACTOR * dz; - set_redraw(); -} - -void zoom_camera(camera *c, real df) { - c->fovy += df; - if (c->fovy < FOVY_MIN) { - c->fovy = FOVY_MIN; - } else if (c->fovy > FOVY_MAX) { - c->fovy = FOVY_MAX; - } - c->orthoy = (int) (tan(c->fovy * PI / 360.0) * abs(c->pos[2])); - set_redraw(); -} - -void reset_camera(camera *c, int key) { - set_vec3(c->pos, 0.0, 0.0, -10.0); - c->fovy = FOVY_DEF; - zoom_camera(c, 0); - switch (key) { - case '1': - set_quat(c->q, 0.0, 0.0, 0.0, 1.0); - break; - case '2': - set_quat(c->q, 0.5, 0.5, 0.5, 0.5); - break; - case '3': - set_quat(c->q, 0.7071067811865476, 0.0, 0.0, 0.7071067811865476); - break; - } - quat_to_mat(c->q, c->rot_mat); -} - -void apply_camera(camera *c) { - glMatrixMode(GL_MODELVIEW); - glTranslated(c->pos[0], c->pos[1], c->pos[2]); - glMultMatrixd(c->rot_mat); -} - -void init_geom(geometry *g, char *name) { - g->name = strdup(name); - if (!g->name) { - perror("init_geom: "); - exit(1); - } - g->layer = 0; - g->line_width = 1.0; - - set_vec3(g->pos, 0.0, 0.0, 0.0); - set_vec3(g->scale, 1.0, 1.0, 1.0); - set_vec3(g->axis, 0.0, 0.0, 1.0); - g->angle = 0.0; - copy_vec3(geom_default_color, g->color); - - g->vertices = NULL; - g->indexes = NULL; - g->ninds = 0; - - g->quadric = NULL; - g->radius = -1.0; - - g->text = NULL; - - g->next = NULL; -} - -void free_geom_shape(geometry *g) { - if (g->vertices) { - free(g->vertices); - free(g->indexes); - g->vertices = NULL; - g->indexes = NULL; - if (g->normals) { - free(g->normals); - g->normals = NULL; - } - } - g->ninds = -1; - if (g->quadric) { - gluDeleteQuadric(g->quadric); - g->quadric = NULL; - } - g->radius = 0.0; - if (g->text) { - free(g->text); - g->text = NULL; - } -} - -void set_geom_vertices(geometry *g, real *vertices, int nverts) { - int i, ninds, indexes[MAX_INDS]; - - free_geom_shape(g); - g->vertices = (real *) malloc(sizeof(real) * nverts); - for (i = 0; i < nverts; ++i) { - g->vertices[i] = vertices[i]; - } - if (nverts <= 9) { - ninds = nverts / 3; - for (i = 0; i < ninds; ++i) { - indexes[i] = i; - } - } else { - ninds = qhull(vertices, nverts, indexes, MAX_INDS); - } - g->indexes = (GLuint *) malloc(sizeof(GLuint) * ninds); - for (i = 0; i < ninds; ++i) { - g->indexes[i] = indexes[i]; - } - g->ninds = ninds; - - if (g->ninds >= 3) { - /* - Since each vertex in a triangle share the same normal, there are - ninds/3 normals, each of size 3, so the normals array is length - ninds - */ - g->normals = (real *) malloc(sizeof(real) * g->ninds); - if (!g->normals) { - perror("init_geom: "); - exit(1); - } - calc_normals(g); - } -} - -void set_geom_radius(geometry *g, real radius) { - free_geom_shape(g); - g->radius = radius; -} - -void set_geom_text(geometry *g, char *text) { - free_geom_shape(g); - if (!(g->text = strdup(text))) { - error("Not enough memory for text"); - } -} - -void calc_normals(geometry *g) { - int i, j; - vec3 e1, e2; - real *v1, *v2, *v3, *n; - - for (i = 0; i < g->ninds; i += 3) { - v1 = &g->vertices[g->indexes[i] * 3]; - v2 = &g->vertices[g->indexes[i+1] * 3]; - v3 = &g->vertices[g->indexes[i+2] * 3]; - n = &g->normals[i]; - - copy_vec3(v1, e1); - subtract_vec3(e1, v2); - copy_vec3(v2, e2); - subtract_vec3(e2, v3); - norm_cross_prod(e1, e2, n); - } -} - -void draw_geom(geometry *g) { - int i; - - glColor3dv(g->color); - glLineWidth(g->line_width); - glPushMatrix(); - glTranslated(g->pos[0], g->pos[1], g->pos[2]); - glRotated(g->angle * 180 / PI, g->axis[0], g->axis[1], g->axis[2]); - glScaled(g->scale[0], g->scale[1], g->scale[2]); - - if (g->ninds >= 0) { - glVertexPointer(3, GL_DOUBLE, 0, g->vertices); - if (g->ninds == 1) { - glBegin(GL_POINTS); - glArrayElement(g->indexes[0]); - glEnd(); - } else if (g->ninds == 2) { - glBegin(GL_LINES); - glArrayElement(g->indexes[0]); - glArrayElement(g->indexes[1]); - glEnd(); - } else { - for (i = 0; i < g->ninds; i += 3) { - glNormal3dv(&g->normals[i]); - glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, &g->indexes[i]); - } - } - } else if (g->radius >= 0.0) { - if (!g->quadric) { - g->quadric = gluNewQuadric(); - if (!g->quadric) { - error("Not enough memory for quadric"); - } - gluQuadricNormals(g->quadric, GLU_SMOOTH); - } - gluSphere(g->quadric, g->radius, 10, 10); - } else if (g->text) { - draw_text(g->text, 0, 0); - } else { - fprintf(stderr, "geometry %s has no shape\n", g->name); - } - glPopMatrix(); - glLineWidth(1.0); -} - -scene *find_or_add_scene(char *name) { - scene *s; - - for (s = scene_head; s && strcmp(s->name, name) != 0; s = s->next) - ; - - if (!s) { - if (!(s = (scene *) malloc(sizeof(scene)))) { - perror("find_or_add_scene: "); - exit(1); - } - init_scene(s, name); - s->next = scene_head; - scene_head = s; - if (!curr_scene) - curr_scene = s; - } - return s; -} - -int delete_scenes(char *pattern) { - int n; - scene *p, *s; - - for (n = 0, p = NULL, s = scene_head; s ; ) { - if (match(pattern, s->name)) { - if (p) { - p->next = s->next; - if (curr_scene == s) - curr_scene = p; - destroy_scene(s); - s = p->next; - } else { - scene_head = s->next; - if (curr_scene == s) - curr_scene = scene_head; - destroy_scene(s); - s = scene_head; - } - ++n; - } else { - p = s; - s = s->next; - } - } - return n; -} - -void init_scene(scene *s, char *name) { - int i; - - s->name = strdup(name); - if (!s->name) { - perror("init_scene: "); - exit(1); - } - s->geoms = NULL; - s->next = NULL; -} - -void destroy_geom(geometry *g) { - free_geom_shape(g); - free(g->name); - free(g); -} - -void destroy_scene(scene *s) { - geometry *p, *pn; - - free(s->name); - for (p = s->geoms; p; ) { - pn = p->next; - destroy_geom(p); - p = pn; - } - free(s); -} - -void setup3d() { - real aspect; - - glMatrixMode (GL_PROJECTION); - glLoadIdentity(); - aspect = scr_width / (double) scr_height; - if (cam.ortho) { - glOrtho(-cam.orthoy * aspect, cam.orthoy * aspect, -cam.orthoy, cam.orthoy, NEAR_CLIP, FAR_CLIP ); - } else { - gluPerspective(cam.fovy, aspect, NEAR_CLIP, FAR_CLIP); - } - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - apply_camera(&cam); -} - -void draw_layer(scene *s, int layer_num) { - GLint view[4]; - real modelview[16], proj[16]; - layer *l; - geometry *g; - int empty; - - if (layer_num > 0) { - for (empty = 1, g = s->geoms; g; g = g->next) { - if (g->layer == layer_num) { - empty = 0; - break; - } - } - if (empty) { - return; - } - } - - l = &layers[layer_num]; - if (l->lighting) { - glEnable(GL_LIGHTING); - } else { - glDisable(GL_LIGHTING); - } - if (l->clear_depth) { - glClear(GL_DEPTH_BUFFER_BIT); - } - - if (l->flat) { - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluOrtho2D(0.0, (GLfloat) scr_width, 0.0, (GLfloat) scr_height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - } else { - setup3d(); - } - - if (!l->wireframe) { - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - } else { - glDisable(GL_LIGHTING); - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - } - glEnableClientState(GL_VERTEX_ARRAY); - for (g = s->geoms; g; g = g->next) { - if (g->layer == layer_num) { - draw_geom(g); - } - } - glDisableClientState(GL_VERTEX_ARRAY); - - glGetDoublev(GL_PROJECTION_MATRIX, l->last_projection); - glGetDoublev(GL_MODELVIEW_MATRIX, l->last_modelview); - glGetIntegerv(GL_VIEWPORT, l->last_view); -} - -void draw_labels() { - int i; - layer *l; - geometry *g; - real wx, wy, wz; - - if (!curr_scene) { - return; - } - - for (i = 0; i < NLAYERS; ++i) { - l = &layers[i]; - if (!l->draw_names) { - continue; - } - glClear(GL_DEPTH_BUFFER_BIT); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluOrtho2D(0.0, (GLfloat) scr_width, 0.0, (GLfloat) scr_height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glColor3dv(geom_label_color); - glDisable(GL_LIGHTING); - - for (g = curr_scene->geoms; g; g = g->next) { - if (g->layer == i) { - gluProject(g->pos[0], g->pos[1], g->pos[2], l->last_modelview, l->last_projection, l->last_view, &wx, &wy, &wz); - draw_text(g->name, (int) wx, (int) wy); - } - } - } -} - -int match_scenes(char *pattern, scene *scns[], int n) { - int m; - scene *p; - - for (m = 0, p = scene_head; p && m < n; p = p->next) { - if (match(pattern, p->name)) - scns[m++] = p; - } - return m; -} - -geometry *find_or_add_geom(scene *s, char *name) { - int i; - geometry *g; - - for (g = s->geoms; g; g = g->next) { - if (strcmp(g->name, name) == 0) { - return g; - } - } - - if (!(g = (geometry *) malloc(sizeof(geometry)))) { - perror("find_or_add_geom: "); - exit(1); - } - init_geom(g, name); - g->next = s->geoms; - s->geoms = g; - return g; -} - -int match_geoms(scene *s, char *pattern, geometry **geoms, int n) { - int m; - geometry *g; - - for (m = 0, g = s->geoms; g && m < n; g = g->next) { - if (match(pattern, g->name)) - geoms[m++] = g; - } - return m; -} - -int delete_geoms(scene *s, char *pattern) { - int n; - geometry *p, *g; - - for (n = 0, p = NULL, g = s->geoms; g; ) { - if (match(pattern, g->name)) { - if (p) { - p->next = g->next; - destroy_geom(g); - g = p->next; - } else { - s->geoms = g->next; - destroy_geom(g); - g = s->geoms; - } - ++n; - } else { - p = g; - g = g->next; - } - } - return n; -} - -int scene_button_hit_test(GLuint x0, GLuint y0, GLuint x, GLuint y) { - scene *p; - GLuint yb, w; - - for (yb = y0, p = scene_head; p; yb -= FONT_HEIGHT, p = p->next) { - w = strlen(p->name) * FONT_WIDTH; - if (p != curr_scene && - (x0 <= x && x <= x0 + w) && - (yb <= y && y <= yb + FONT_HEIGHT)) - { - curr_scene = p; - return 1; - } - } - return 0; -} - -void draw_scene_buttons(GLuint x, GLuint y) { - scene *p; - - glDisable(GL_LIGHTING); - glColor3dv(scene_text_color); - for (p = scene_head; p; p = p->next, y -= FONT_HEIGHT) { - if (p == curr_scene) - glColor3dv(active_scene_text_color); - - draw_text(p->name, x, y); - glColor3dv(scene_text_color); - } -} - -void screenshot(char *path) { - FILE *out; - unsigned char *pixels; - int i, j, k; - - pixels = calloc(3 * scr_width * scr_height, sizeof(unsigned char)); - if (!pixels) { - error("out of memory"); - } - out = fopen(path, "w"); - if (!out) { - perror("screenshot"); - return; - } - fprintf(out, "P6\n%d %d\n255\n", scr_width, scr_height); - - glReadBuffer(GL_BACK); - glReadPixels(0, 0, scr_width, scr_height, GL_RGB, GL_UNSIGNED_BYTE, pixels); - - for (i = scr_height - 1; i >= 0; --i) { - for (j = 0; j < scr_width; ++j) { - k = (i * scr_width + j) * 3; - fwrite(&pixels[k], sizeof(unsigned char), 3, out); - } - } - fclose(out); - free(pixels); - fprintf(stderr, "screen shot saved to %s\n", path); -} - -void request_screenshot(char *path, int i) { - strncpy(screenshot_path[i], path, sizeof(screenshot_path[i])); -} - -void init_layers() { - int i; - for (i = 0; i < NLAYERS; ++i) { - layers[i].lighting = 0; - layers[i].flat = 0; - layers[i].clear_depth = 1; - layers[i].draw_names = 0; - layers[i].wireframe = 0; - } - layers[0].lighting = 1; - layers[0].draw_names = 1; -} - -int set_layer(int layer_num, char option, int value) { - assert(0 <= layer_num && layer_num < NLAYERS); - switch (option) { - case 'l': - layers[layer_num].lighting = value; - return 1; - case 'f': - layers[layer_num].flat = value; - return 1; - case 'd': - layers[layer_num].clear_depth = value; - return 1; - case 'n': - layers[layer_num].draw_names = value; - return 1; - case 'w': - layers[layer_num].wireframe = value; - return 1; - } - return 0; /* no such option */ -} - -int get_redraw() { - glfwLockMutex(redraw_lock); - if (redraw) { - redraw = 0; - return 1; - } - return 0; - glfwUnlockMutex(redraw_lock); -} - -void set_redraw() { - glfwLockMutex(redraw_lock); - redraw = 1; - glfwUnlockMutex(redraw_lock); -} diff --git a/Core/SVS/viewer/viewer.h b/Core/SVS/viewer/viewer.h deleted file mode 100644 index 284503c444..0000000000 --- a/Core/SVS/viewer/viewer.h +++ /dev/null @@ -1,164 +0,0 @@ -#ifndef VIEWER_H -#define VIEWER_H - -#include -#include -#include - -#define PAN_FACTOR 1.0e-1 -#define GRID_LINES 10 -#define MAX_COMMAND 4096 -#define FONT_WIDTH 6 -#define FONT_HEIGHT 12 -#define PI 3.141592654 -#define FOVY_MIN 5 -#define FOVY_MAX 175 -#define FOVY_DEF 60 -#define NEAR_CLIP 0.1 -#define FAR_CLIP 100.0 -#define NLAYERS 10 - -typedef GLdouble real; -typedef real vec3[3]; -typedef real vec4[4]; -typedef real quaternion[4]; - -typedef struct Camera { - quaternion q; - vec3 pos; - real rot_mat[16]; - real fovy; - int ortho; - real orthoy; -} camera; - -typedef struct Geometry { - char *name; - int layer; - double line_width; - - vec3 pos; - vec3 axis; - real angle; - vec3 scale; - vec3 color; - - /* for polyhedrons */ - real *vertices; - GLuint *indexes; - int ninds; - real *normals; - - /* for spheres */ - GLUquadricObj *quadric; - real radius; - - /* for text */ - char *text; - - struct Geometry *next; -} geometry; - -typedef struct Layer { - /* drawing options */ - int lighting; - int flat; - int clear_depth; - int draw_names; - int wireframe; - - /* - storage for various matrices between object drawing and label drawing - */ - GLint last_view[4]; - real last_modelview[16], last_projection[16]; -} layer; - -typedef struct Scene { - char *name; - geometry *geoms; - struct Scene *next; -} scene; - -typedef struct Semaphore { - GLFWmutex mutex; - GLFWcond cond; - int count; -} semaphore; - -extern GLFWmutex scene_lock; -extern semaphore redraw_semaphore; -extern int debug; - -/* viewer.c */ -void pan_camera(camera *c, real x, real y); -void rotate_camera(camera *c, int x, int y, int dx, int dy); -void zoom_camera(camera *c, real f); -void pull_camera(camera *c, real z); -void reset_camera(camera *c, int key); -void apply_camera(camera *c); - -void init_geom(geometry *g, char *name); -void set_geom_vertices(geometry *g, real *vertices, int nverts); -void set_geom_radius(geometry *g, real radius); -void set_geom_text(geometry *g, char *text); -void destroy_geom(geometry *g); -void draw_geom(geometry *g); - -scene *find_or_add_scene(char *name); -int delete_scenes(char *pattern); -int match_scenes(char *pattern, scene **scns, int n); -void init_scene(scene *s, char *name); -void destroy_scene(scene *s); -void request_screenshot(char *path, int i); /* 0 = from keyboard, 1 = from input */ - -geometry *find_or_add_geom(scene *s, char *name); -int delete_geoms(scene *s, char *pattern); -int match_geoms(scene *s, char *pattern, geometry **geoms, int n); - -int set_layer(int layer_num, char option, int value); - -int get_redraw(); -void set_redraw(); - -/* input.c */ -void GLFWCALL proc_input(void *unused); - -/* text.c */ -void init_font(void); -void draw_text(char *s, int x, int y); - -/* util.c */ -void error(const char *msg); -int match(char *pattern, char *s); -int split(char *s, char *fields[], int maxfields); - -void set_vec3(vec3 a, real x, real y, real z); -void set_vec4(vec3 a, real x, real y, real z, real w); -void copy_vec3(vec3 a, vec3 b); -void copy_vec4(vec4 a, vec4 b); -void scale_vec3(vec3 a, real b); -void add_vec3(vec3 a, vec3 b); -void subtract_vec3(vec3 a, vec3 b); -void normalize(vec3 a); -void cross_prod(vec3 a, vec3 b, vec3 c); -void norm_cross_prod(vec3 a, vec3 b, vec3 c); -void quat_to_axis_angle(quaternion q, vec3 axis, real *angle); -void quat_to_mat(quaternion q, real m[16]); -void rotate_vec3(quaternion q, vec3 v); -void set_quat(quaternion q, real x, real y, real z, real w); - -void init_semaphore(semaphore *s); -void semaphore_P(semaphore *s); -void semaphore_V(semaphore *s); - -int qhull(real verts[], int nverts, int indexes[], int max_indexes); - -/* platform specific */ -int init_input(int argc, char *argv[]); -int get_input(char *buf, int n); -int run_shell(const char *cmd); -char *get_temp(const char *prefix); -void delete_file(const char *path); - -#endif diff --git a/Core/shared/build_time_date.h b/Core/shared/build_time_date.h index aa3206a04a..67fa144f08 100644 --- a/Core/shared/build_time_date.h +++ b/Core/shared/build_time_date.h @@ -1,2 +1,3 @@ const char* kTimestamp = __TIME__; const char* kDatestamp = __DATE__; +//* Last build of Soar 9.6.4a1 occurred at Fri May 16 11:10:32 2025 *//