Merge pull request #1068 from keyboardio/hostos/macos

examples/Features/AppSwitcher/AppSwitcher.cpp

@@ -40,7 +40,7 @@ EventHandlerResult AppSwitcher::onKeyEvent(KeyEvent &event) {
 
     // If AppSwitcher was not already active, hold its modifier first.
     if (!active_addr_.isValid()) {
-      if (::HostOS.os() == hostos::OSX) {
+      if (::HostOS.os() == hostos::MACOS) {
         event.key = Key_LeftGui;
       } else {
         event.key = Key_LeftAlt;

plugins/Kaleidoscope-HostOS/README.md

@@ -25,8 +25,8 @@ void someFunction(void) {
   if (HostOS.os() == kaleidoscope::hostos::LINUX) {
     // do something linux-y
   }
-  if (HostOS.os() == kaleidoscope::hostos::OSX) {
+  if (HostOS.os() == kaleidoscope::hostos::MACOS) {
-    // do something OSX-y
+    // do something macOS-y
   }
 }
 
@@ -55,10 +55,13 @@ The extension provides the following methods on the `HostOS` singleton:
 The OS type (i.e. the return type of `.os()` and the arguments to `.os(type)`) will be one of the following:
 
    - `kaleidoscope::hostos::LINUX`
-   - `kaleidoscope::hostos::OSX`
+   - `kaleidoscope::hostos::MACOS`
    - `kaleidoscope::hostos::WINDOWS`
    - `kaleidoscope::hostos::OTHER`
 
+For compability reasons, `kaleidoscope::hostos::OSX` is an alias to
+`kaleidoscope::hostos::MACOS`.
+
 ## Focus commands
 
 The plugin provides the `FocusHostOSCommand` object, which, when enabled,

plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h

@@ -1,6 +1,6 @@
 /* -*- mode: c++ -*-
  * Kaleidoscope-HostOS -- Host OS detection and tracking for Kaleidoscope
- * Copyright (C) 2016, 2017, 2018  Keyboard.io, Inc
+ * Copyright (C) 2016-2021  Keyboard.io, Inc
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -25,7 +25,8 @@ namespace hostos {
 
 typedef enum {
   LINUX,
-  OSX,
+  MACOS,
+  OSX = MACOS,
   WINDOWS,
   OTHER,
 

plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.cpp

@@ -43,7 +43,7 @@ void Unicode::start(void) {
     kaleidoscope::Runtime.hid().keyboard().releaseRawKey(Key_KeypadAdd);
     kaleidoscope::Runtime.hid().keyboard().sendReport();
     break;
-  case hostos::OSX:
+  case hostos::MACOS:
     kaleidoscope::Runtime.hid().keyboard().pressRawKey(Key_LeftAlt);
     break;
   default:
@@ -57,7 +57,7 @@ void Unicode::input(void) {
   case hostos::LINUX:
     break;
   case hostos::WINDOWS:
-  case hostos::OSX:
+  case hostos::MACOS:
     kaleidoscope::Runtime.hid().keyboard().pressRawKey(Key_LeftAlt);
     break;
   default:
@@ -76,7 +76,7 @@ void Unicode::end(void) {
     kaleidoscope::Runtime.hid().keyboard().sendReport();
     break;
   case hostos::WINDOWS:
-  case hostos::OSX:
+  case hostos::MACOS:
     kaleidoscope::Runtime.hid().keyboard().releaseRawKey(Key_LeftAlt);
     kaleidoscope::Runtime.hid().keyboard().sendReport();
     break;