Look for keymapper.conf in an optional keymapper subdirectory

README.md

@@ -39,9 +39,11 @@ Y >> Z
 Control{Q} >> Alt{F4}
 ```
 
-Unless overridden using the command line argument `-c`, the configuration is read from `keymapper.conf`, which is looked for in the common places and in the working directory:
- * on Linux and MacOS in `$HOME/.config/` and `/etc/`.
- * on Windows in the user's profile, `AppData\Local` and `AppData\Roaming` folders.
+Unless overridden using the command line argument `-c`, the configuration is read from `keymapper.conf`, which is looked for in the common places:
+ * on Linux and MacOS in `$HOME/.config/` and `/etc/`
+ * on Windows in the user's profile, `AppData\Local` and `AppData\Roaming` folders
+
+each with an optional `keymapper` subdirectory and finally in the working directory.
 
 The command line argument `-u` causes the configuration to be automatically reloaded whenever the configuration file changes.
 
@@ -414,7 +416,7 @@ sudo keymapper-launchd add
 An installer and a portable build can be downloaded from the [latest release](https://github.com/houmain/keymapper/releases/latest) page.
 
 Most conveniently but possibly not always the very latest version can be installed using a package manager:
-```
+```bash
 # install using winget
 winget install keymapper
 

src/client/unix/main.cpp

@@ -152,6 +152,10 @@ namespace {
  auto path = base / filename;
  if (std::filesystem::exists(path, error))
  return path;
+
+ path = base / "keymapper" / filename;
+ if (std::filesystem::exists(path, error))
+ return path;
  }
  // create in profile path when opening for editing
  if (!std::filesystem::exists(filename, error))

src/client/windows/main.cpp

@@ -266,7 +266,12 @@ namespace {
  FOLDERID_LocalAppData, 
  FOLDERID_RoamingAppData 
  }) {
- auto path = get_known_folder_path(folder_id) / filename;
+ const auto base = get_known_folder_path(folder_id);
+ auto path = base / filename;
+ if (std::filesystem::exists(path, error))
+ return path;
+
+ path = base / "keymapper" / filename;
  if (std::filesystem::exists(path, error))
  return path;
  }