Skip to content

Commit

Permalink
Merge pull request #11 from idietmoran/dev-win32
Browse files Browse the repository at this point in the history
Dev win32
  • Loading branch information
Stateford authored Apr 9, 2018
2 parents 08af2eb + f55d3fa commit 94a6890
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 8 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
/x64/
*.vcxproj.*
.vs/
*.sln
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog
All notable changes to this project will be documented in this file.
## [1.1.0]
### Added
- Added meta tags for windows

### Fixed
- Fixed issue when the program closed before unlocking the cursor
- Fixed issue where the program would not shut down properly
31 changes: 31 additions & 0 deletions Display Lock.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Display Lock", "Display Lock.vcxproj", "{98475F5E-089A-40A5-B228-925B46B8EC37}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{98475F5E-089A-40A5-B228-925B46B8EC37}.Debug|x64.ActiveCfg = Debug|x64
{98475F5E-089A-40A5-B228-925B46B8EC37}.Debug|x64.Build.0 = Debug|x64
{98475F5E-089A-40A5-B228-925B46B8EC37}.Debug|x86.ActiveCfg = Debug|Win32
{98475F5E-089A-40A5-B228-925B46B8EC37}.Debug|x86.Build.0 = Debug|Win32
{98475F5E-089A-40A5-B228-925B46B8EC37}.Release|x64.ActiveCfg = Release|x64
{98475F5E-089A-40A5-B228-925B46B8EC37}.Release|x64.Build.0 = Release|x64
{98475F5E-089A-40A5-B228-925B46B8EC37}.Release|x86.ActiveCfg = Release|Win32
{98475F5E-089A-40A5-B228-925B46B8EC37}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C455D98E-E499-4F3E-B58C-5B95ACA5D11F}
EndGlobalSection
EndGlobal
34 changes: 28 additions & 6 deletions Display Lock.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -138,11 +141,21 @@
<ClCompile Include="src\displayLock-win32.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\bin\menu.h" />
<ClInclude Include="src\bin\win.h" />
<ClInclude Include="src\displayLock-win32.h" />
<ClInclude Include="src\header.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\bin\menu.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClInclude Include="src\bin\win.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClInclude Include="src\displayLock-win32.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClInclude Include="src\header.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClInclude Include="src\resource.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClInclude Include="src\targetver.h" />
</ItemGroup>
<ItemGroup>
Expand All @@ -152,7 +165,16 @@
<None Include="src\displayLock-win32.aps" />
</ItemGroup>
<ItemGroup>
<Manifest Include="src\displayLock-win32.manifest" />
<Manifest Include="src\displayLock-win32.manifest">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
</Manifest>
</ItemGroup>
<ItemGroup>
<Image Include="src\displayLock-win32.ico" />
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# Display Lock
---------------------
Lightweight program that locks cursor in selected window, or any focused window with a hotkey toggle.
Lightweight program that locks cursor in selected window, designed with performance in mind.

#### USES
-----------------
- Keeps cursor in a windowed game to prevent clicking outside
- Will stay active while the window is focused
- Keeps cursor in a fullscreen game while using a multi-monitor setup

### EXAMPLE
---------------
![](/res/example.gif)

![](/res/displayLock-preview.png)

Expand Down
Binary file added res/example.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/displayLock-win32.aps
Binary file not shown.
Binary file modified src/displayLock-win32.rc
Binary file not shown.

0 comments on commit 94a6890

Please sign in to comment.