Skip to content

Commit c0eeec6

Browse files
daxgamesdaxgames
authored
Merge pull request #2335 from kvittokonito/custom_window_icons
Added support for setting custom icons for Cmder window
2 parents a5dcf9c + ee25dba commit c0eeec6

File tree

3 files changed

+106
-5
lines changed

3 files changed

+106
-5
lines changed

‎launcher/CmderLauncher.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Win32 = Debug|Win32
1111
Release|Win32 = Release|Win32
12+
Debug|x64 = Debug|x64
13+
Release|x64 = Release|x64
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1416
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.ActiveCfg = Debug|Win32
1517
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.Build.0 = Debug|Win32
1618
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.ActiveCfg = Release|Win32
1719
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.Build.0 = Release|Win32
20+
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|x64.ActiveCfg = Debug|x64
21+
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|x64.Build.0 = Debug|x64
22+
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|x64.ActiveCfg = Release|x64
23+
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|x64.Build.0 = Release|x64
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

‎launcher/CmderLauncher.vcxproj‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<Configuration>Release</Configuration>
1010
<Platform>Win32</Platform>
1111
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}</ProjectGuid>
@@ -30,6 +38,19 @@
3038
<CharacterSet>Unicode</CharacterSet>
3139
<PlatformToolset>v141</PlatformToolset>
3240
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>Application</ConfigurationType>
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
<PlatformToolset>v141_xp</PlatformToolset>
45+
<CharacterSet>Unicode</CharacterSet>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>Application</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<WholeProgramOptimization>true</WholeProgramOptimization>
51+
<CharacterSet>Unicode</CharacterSet>
52+
<PlatformToolset>v141</PlatformToolset>
53+
</PropertyGroup>
3354
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3455
<ImportGroup Label="ExtensionSettings">
3556
</ImportGroup>
@@ -39,6 +60,12 @@
3960
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4061
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4162
</ImportGroup>
63+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
</ImportGroup>
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
4269
<PropertyGroup Label="UserMacros" />
4370
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4471
<LinkIncremental>true</LinkIncremental>
@@ -48,6 +75,14 @@
4875
<LinkIncremental>false</LinkIncremental>
4976
<TargetName>Cmder</TargetName>
5077
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
79+
<LinkIncremental>true</LinkIncremental>
80+
<TargetName>Cmder</TargetName>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
83+
<LinkIncremental>false</LinkIncremental>
84+
<TargetName>Cmder</TargetName>
85+
</PropertyGroup>
5186
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5287
<ClCompile>
5388
<PrecompiledHeader>
@@ -94,6 +129,52 @@
94129
<Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
95130
</PostBuildEvent>
96131
</ItemDefinitionGroup>
132+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
133+
<ClCompile>
134+
<PrecompiledHeader>
135+
</PrecompiledHeader>
136+
<WarningLevel>Level3</WarningLevel>
137+
<Optimization>Disabled</Optimization>
138+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139+
<SDLCheck>true</SDLCheck>
140+
</ClCompile>
141+
<Link>
142+
<SubSystem>Windows</SubSystem>
143+
<GenerateDebugInformation>true</GenerateDebugInformation>
144+
</Link>
145+
<Manifest>
146+
<AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
147+
</Manifest>
148+
<ResourceCompile>
149+
<PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150+
</ResourceCompile>
151+
</ItemDefinitionGroup>
152+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
153+
<ClCompile>
154+
<WarningLevel>Level3</WarningLevel>
155+
<PrecompiledHeader>
156+
</PrecompiledHeader>
157+
<Optimization>MinSpace</Optimization>
158+
<FunctionLevelLinking>true</FunctionLevelLinking>
159+
<IntrinsicFunctions>false</IntrinsicFunctions>
160+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161+
<SDLCheck>true</SDLCheck>
162+
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
163+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
164+
</ClCompile>
165+
<Link>
166+
<SubSystem>Windows</SubSystem>
167+
<GenerateDebugInformation>true</GenerateDebugInformation>
168+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
169+
<OptimizeReferences>true</OptimizeReferences>
170+
</Link>
171+
<Manifest>
172+
<AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
173+
</Manifest>
174+
<PostBuildEvent>
175+
<Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
176+
</PostBuildEvent>
177+
</ItemDefinitionGroup>
97178
<ItemGroup>
98179
<ResourceCompile Include="src\Resource.rc">
99180
<FileType>RC</FileType>

‎launcher/src/CmderLauncher.cpp‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ bool FileExists(const wchar_t * filePath)
7171
return false;
7272
}
7373

74-
void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
74+
void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
7575
{
7676
#if USE_TASKBAR_API
7777
wchar_t appId[MAX_PATH] = { 0 };
@@ -111,7 +111,15 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
111111

112112
PathRemoveFileSpec(exeDir);
113113

114-
PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
114+
if (PathFileExists(iconPath.c_str()))
115+
{
116+
std::copy(iconPath.begin(), iconPath.end(), icoPath);
117+
icoPath[iconPath.length()] = 0;
118+
}
119+
else
120+
{
121+
PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
122+
}
115123

116124
PathCombine(configDirPath, exeDir, L"config");
117125

@@ -532,6 +540,7 @@ struct cmderOptions
532540
std::wstring cmderCfgRoot = L"";
533541
std::wstring cmderStart = L"";
534542
std::wstring cmderTask = L"";
543+
std::wstring cmderIcon = L"";
535544
std::wstring cmderRegScope = L"USER";
536545
std::wstring cmderConEmuArgs = L"";
537546
bool cmderSingle = false;
@@ -593,6 +602,11 @@ cmderOptions GetOption()
593602
cmderOptions.cmderTask = szArgList[i + 1];
594603
i++;
595604
}
605+
else if (_wcsicmp(L"/icon", szArgList[i]) == 0)
606+
{
607+
cmderOptions.cmderIcon = szArgList[i + 1];
608+
i++;
609+
}
596610
else if (_wcsicmp(L"/single", szArgList[i]) == 0)
597611
{
598612
cmderOptions.cmderSingle = true;
@@ -659,13 +673,13 @@ cmderOptions GetOption()
659673
}
660674
else
661675
{
662-
MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] | [Start in Path]]\n\n /single\n\n /m\n\n /x [ConEmu extra arguments]\n\nor\n\n /register [USER | ALL]\n\nor\n\n /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
676+
MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n /icon [CMDER Icon Path]\n\n [/start [Start in Path] | [Start in Path]]\n\n /single\n\n /m\n\n /x [ConEmu extra arguments]\n\nor\n\n /register [USER | ALL]\n\nor\n\n /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
663677
cmderOptions.error = true;
664678
}
665679
}
666680
else
667681
{
668-
MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] | [Start in Path]]\n\n /single\n\n /m\n\n /x [ConEmu extra arguments]\n\nor\n\n /register [USER | ALL]\n\nor\n\n /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
682+
MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n /icon [CMDER Icon Path]\n\n [/start [Start in Path] | [Start in Path]]\n\n /single\n\n /m\n\n /x [ConEmu extra arguments]\n\nor\n\n /register [USER | ALL]\n\nor\n\n /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
669683
cmderOptions.error = true;
670684
}
671685
}
@@ -707,7 +721,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
707721
}
708722
else
709723
{
710-
StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
724+
StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
711725
}
712726

713727
return 0;

0 commit comments

Comments
 (0)