Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge

  • Loading branch information
dewyatt committed Jul 6, 2010
2 parents d3e1a5b + ba3a236 commit c16c41126908b1b6a2763dd416f67b07fe2d9a11
Showing with 2,756 additions and 3 deletions.
  1. +20 −0 EXCLUDE/GLIMM/GLIMM.sln
  2. +233 −0 EXCLUDE/GLIMM/GLIMM.vcproj
  3. +37 −0 EXCLUDE/GLIMM/include/App.hpp
  4. +41 −0 EXCLUDE/GLIMM/include/IMM.hpp
  5. +30 −0 EXCLUDE/GLIMM/include/Video_Mode.hpp
  6. +63 −0 EXCLUDE/GLIMM/include/Window.hpp
  7. +23 −0 EXCLUDE/GLIMM/include/Window_Listener.hpp
  8. +113 −0 EXCLUDE/GLIMM/src/App.cpp
  9. +237 −0 EXCLUDE/GLIMM/src/IMM.cpp
  10. +24 −0 EXCLUDE/GLIMM/src/Main.cpp
  11. +100 −0 EXCLUDE/GLIMM/src/Video_Mode.cpp
  12. +317 −0 EXCLUDE/GLIMM/src/Window.cpp
  13. +20 −0 EXCLUDE/GLTSF/GLTSF.sln
  14. +231 −0 EXCLUDE/GLTSF/GLTSF.vcproj
  15. +99 −0 EXCLUDE/GLTSF/GLTSF.vcxproj
  16. +51 −0 EXCLUDE/GLTSF/GLTSF.vcxproj.filters
  17. +20 −0 EXCLUDE/GLTSF/GLTSF_vs2008.sln
  18. +36 −0 EXCLUDE/GLTSF/include/App.hpp
  19. +83 −0 EXCLUDE/GLTSF/include/TSF.hpp
  20. +30 −0 EXCLUDE/GLTSF/include/Video_Mode.hpp
  21. +59 −0 EXCLUDE/GLTSF/include/Window.hpp
  22. +14 −0 EXCLUDE/GLTSF/include/Window_Listener.hpp
  23. +105 −0 EXCLUDE/GLTSF/src/App.cpp
  24. +24 −0 EXCLUDE/GLTSF/src/Main.cpp
  25. +360 −0 EXCLUDE/GLTSF/src/TSF.cpp
  26. +100 −0 EXCLUDE/GLTSF/src/Video_Mode.cpp
  27. +281 −0 EXCLUDE/GLTSF/src/Window.cpp
  28. 0 VisualC/tests/automated/automated_VS2008.vcproj
  29. 0 VisualC/tests/checkkeys/checkkeys_VS2005.vcproj
  30. 0 VisualC/tests/graywin/graywin_VS2005.vcproj
  31. 0 VisualC/tests/loopwave/loopwave_VS2005.vcproj
  32. 0 VisualC/tests/testalpha/testalpha_VS2005.vcproj
  33. 0 VisualC/tests/testdraw2/testdraw2_VS2005.vcproj
  34. 0 VisualC/tests/testfile/testfile_VS2005.vcproj
  35. 0 VisualC/tests/testgamma/testgamma_VS2005.vcproj
  36. 0 VisualC/tests/testgl/testgl_VS2005.vcproj
  37. 0 VisualC/tests/testgl2/testgl2_VS2005.vcproj
  38. 0 VisualC/tests/testjoystick/testjoystick_VS2005.vcproj
  39. 0 VisualC/tests/testoverlay/testoverlay_VS2005.vcproj
  40. 0 VisualC/tests/testoverlay2/testoverlay2_VS2005.vcproj
  41. 0 VisualC/tests/testpalette/testpalette_VS2005.vcproj
  42. 0 VisualC/tests/testplatform/testplatform_VS2005.vcproj
  43. 0 VisualC/tests/testpower/testpower_VS2005.vcproj
  44. 0 VisualC/tests/testsprite/testsprite_VS2005.vcproj
  45. 0 VisualC/tests/testsprite2/testsprite2_VS2005.vcproj
  46. 0 VisualC/tests/testvidinfo/testvidinfo_VS2005.vcproj
  47. 0 VisualC/tests/testwin/testwin_VS2005.vcproj
  48. 0 VisualC/tests/testwm/testwm_VS2005.vcproj
  49. +1 −1 src/video/win32/SDL_win32events.c
  50. +4 −2 src/video/win32/SDL_win32window.c
@@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLIMM", "GLIMM.vcproj", "{F21B830F-20A9-4473-B67A-21D1743C6E19}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F21B830F-20A9-4473-B67A-21D1743C6E19}.Debug|Win32.ActiveCfg = Debug|Win32
{F21B830F-20A9-4473-B67A-21D1743C6E19}.Debug|Win32.Build.0 = Debug|Win32
{F21B830F-20A9-4473-B67A-21D1743C6E19}.Release|Win32.ActiveCfg = Release|Win32
{F21B830F-20A9-4473-B67A-21D1743C6E19}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -0,0 +1,233 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="GLIMM"
ProjectGUID="{F21B830F-20A9-4473-B67A-21D1743C6E19}"
RootNamespace="GLIMM"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)bin"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="imm32.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)bin"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="imm32.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\src\App.cpp"
>
</File>
<File
RelativePath=".\src\IMM.cpp"
>
</File>
<File
RelativePath=".\src\Main.cpp"
>
</File>
<File
RelativePath=".\src\Video_Mode.cpp"
>
</File>
<File
RelativePath=".\src\Window.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\include\App.hpp"
>
</File>
<File
RelativePath=".\include\IMM.hpp"
>
</File>
<File
RelativePath=".\include\Video_Mode.hpp"
>
</File>
<File
RelativePath=".\include\Window.hpp"
>
</File>
<File
RelativePath=".\include\Window_Listener.hpp"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
@@ -0,0 +1,37 @@
#ifndef APP_HPP
#define APP_HPP

#include "Window.hpp"

class App : public Window_Listener
{
public:
App();
virtual ~App();

void Initialize();
void Finalize();

void Run();

virtual void On_Close();
virtual void On_Key_Down(int Key);
virtual void On_Key_Up(int Key);
virtual void On_Char(unsigned int Char);
virtual void On_Resized(unsigned int Width, unsigned int Height);
virtual void On_Mouse_Button_Down(Mouse_Button Button);

private:
void Update();
void Draw();

static const int Width = 800;
static const int Height = 600;
static const int Bits_Per_Pixel = 32;
static const bool Fullscreen = true;

Window my_Window;
bool my_Done;
};

#endif
@@ -0,0 +1,41 @@
#ifndef IMM_HPP
#define IMM_HPP

#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <msctf.h>

class IMM
{
public:
IMM();
~IMM();

void Initialize(HWND Window);
void Finalize();

LRESULT Handle_Message(HWND Window, UINT Message, WPARAM wParam, LPARAM lParam, bool &Ate);

void Enable();
void Disable();
bool Is_Enabled();
void Toggle();

void Focus_Gained();
void Focus_Lost();

private:
void Update_Input_Locale();
void Cancel_Composition();
void Input_Language_Changed();

bool my_COM_Initialized;
ITfThreadMgr *my_Thread_Manager;
HWND my_Window;
HIMC my_Context;
HKL my_HKL;
bool my_Vertical_Candidates;
bool my_Enabled;
};

#endif
@@ -0,0 +1,30 @@
#ifndef VIDEO_MODE_HPP
#define VIDEO_MODE_HPP

#include <cstddef>

class Video_Mode
{
public:
Video_Mode();
Video_Mode(unsigned int The_Width, unsigned int The_Height, unsigned int The_Bits_Per_Pixel);

static Video_Mode Get_Desktop_Mode();

static std::size_t Get_Mode_Count();
static Video_Mode Get_Mode(std::size_t Index);

bool Is_Valid() const;

bool operator==(const Video_Mode &Mode) const;
bool operator!=(const Video_Mode &Mode) const;

unsigned int Width;
unsigned int Height;
unsigned int Bits_Per_Pixel;

private:
static void Initialize_Modes();
};

#endif

0 comments on commit c16c411

Please sign in to comment.