Skip to content

Added config flag to optionally start disabled #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aidy-jenkins wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added config flag to optionally start disabled #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4047ea
Updated to latest platform target
aidy-jenkins Jan 23, 2022
c8bf74b
Added config flag to allow mouse/keyboard control to be disabled when…
aidy-jenkins Jan 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Configs/config_default.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
# SET 0 FOR NO FUNCTION
# TIP: Sum the hex value for double button shortcuts eg. 0x0010(START) 0x0020(BACK) so 0x0030(START+BACK) will trigger the event only when both are pressed.

# Startup configuration (0 = false, 1 or any other value = true)

INIT_DISABLED_ON_START = 0x0 # Determines whether the gamepad controls mouse/keyboard input on starting Gopher

# Map buttons to actions

CONFIG_MOUSE_LEFT = 0x1000 # Left mouse button
CONFIG_MOUSE_RIGHT = 0x4000 # Right mouse button
Expand Down
8 changes: 7 additions & 1 deletion Windows/Gopher/ConfigFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@ void ConfigFile::ExtractKeys()
outfile << "# SET 0 FOR NO FUNCTION." << std::endl;
outfile << "# AVAILABLE VALUES AT https://msdn.microsoft.com/en-us/library/windows/desktop/microsoft.directx_sdk.reference.xinput_gamepad(v=vs.85).aspx" << std::endl;
outfile << "# TIP: Sum the hex value for double button shortcuts eg. 0x0010(START) 0x0020(BACK) so 0x0030(START+BACK) will trigger the event only when both are pressed." << std::endl;
outfile << "\n" << std::endl;
outfile << std::endl;
outfile << "# Startup configuration (0 = false, 1 or any other value = true)" << std::endl;
outfile << std::endl;
outfile << "INIT_DISABLED_ON_START = 0x0 # Determines whether the gamepad controls mouse / keyboard input on starting Gopher" << std::endl;
outfile << std::endl;
outfile << "# Map buttons to actions" << std::endl;
outfile << std::endl;
outfile << "CONFIG_MOUSE_LEFT = 0x1000 # Left mouse button" << std::endl;
outfile << "CONFIG_MOUSE_RIGHT = 0x4000 # Right mouse button" << std::endl;
outfile << "CONFIG_MOUSE_MIDDLE = 0x0040 # Middle mouse button" << std::endl;
Expand Down
8 changes: 7 additions & 1 deletion Windows/Gopher/Gopher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@ Gopher::Gopher(CXBOXController * controller)
void Gopher::loadConfigFile()
{
ConfigFile cfg("config.ini");


//--------------------------------
// Startup configuration
//--------------------------------

_disabled = strtol(cfg.getValueOfKey<std::string>("INIT_DISABLED_ON_START").c_str(), 0, 0) != 0;

//--------------------------------
// Configuration bindings
//--------------------------------
Expand Down
6 changes: 3 additions & 3 deletions Windows/Gopher/Gopher.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
<ProjectGuid>{896B8CDE-8FC8-42F3-AC14-FA6D202DBBD7}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Gopher</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down