Launcher: Remove the Launcher app, and all hacks in support of it

The Launcher's functionality has been replaced by the app shortcuts in the system menu. There were various window management hacks to ensure that the launcher stayed below all other windows while also being movable, etc.
luteresa · Nov 11, 2019 · dd2900e · dd2900e
1 parent 26f41c7
commit dd2900e
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 164 deletions.
diff --git a/Applications/Launcher/Makefile b/Applications/Launcher/Makefile
diff --git a/Applications/Launcher/main.cpp b/Applications/Launcher/main.cpp
diff --git a/Base/home/anon/Launcher.ini b/Base/home/anon/Launcher.ini
diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh
@@ -76,7 +76,6 @@ cp ../Applications/Downloader/Downloader mnt/bin/Downloader
 cp ../Applications/FileManager/FileManager mnt/bin/FileManager
 cp ../Applications/FontEditor/FontEditor mnt/bin/FontEditor
 cp ../Applications/IRCClient/IRCClient mnt/bin/IRCClient
-cp ../Applications/Launcher/Launcher mnt/bin/Launcher
 cp ../Applications/SystemMonitor/SystemMonitor mnt/bin/SystemMonitor
 cp ../Applications/Taskbar/Taskbar mnt/bin/Taskbar
 cp ../Applications/Terminal/Terminal mnt/bin/Terminal

diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh
@@ -48,7 +48,6 @@ build_targets="$build_targets ../Applications/Downloader"
 build_targets="$build_targets ../Applications/FileManager"
 build_targets="$build_targets ../Applications/FontEditor"
 build_targets="$build_targets ../Applications/IRCClient"
-build_targets="$build_targets ../Applications/Launcher"
 build_targets="$build_targets ../Applications/PaintBrush"
 build_targets="$build_targets ../Applications/Piano"
 build_targets="$build_targets ../Applications/QuickShow"

diff --git a/Libraries/LibGUI/GWindowType.h b/Libraries/LibGUI/GWindowType.h
@@ -9,5 +9,4 @@ enum class GWindowType {
  Taskbar,
  Tooltip,
  Menubar,
- Launcher,
 };
diff --git a/Servers/WindowServer/WSAPITypes.h b/Servers/WindowServer/WSAPITypes.h
@@ -28,7 +28,6 @@ enum WSAPI_WindowType {
  Taskbar,
  Tooltip,
  Menubar,
- Launcher,
 };
 
 struct WSAPI_WindowBackingStoreInfo {

diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
@@ -215,9 +215,6 @@ bool WSClientConnection::handle_message(const WSAPI_ClientMessage& message, cons
  case WSAPI_WindowType::Menubar:
  ws_window_type = WSWindowType::Menubar;
  break;
- case WSAPI_WindowType::Launcher:
- ws_window_type = WSWindowType::Launcher;
- break;
  case WSAPI_WindowType::Invalid:
  default:
  dbgprintf("Unknown WSAPI_WindowType: %d\n", message.window.type);

diff --git a/Servers/WindowServer/WSWindow.cpp b/Servers/WindowServer/WSWindow.cpp
@@ -140,8 +140,6 @@ static WSAPI_WindowType to_api(WSWindowType ws_type)
  return WSAPI_WindowType::Tooltip;
  case WSWindowType::Menubar:
  return WSAPI_WindowType::Menubar;
- case WSWindowType::Launcher:
- return WSAPI_WindowType::Launcher;
  default:
  ASSERT_NOT_REACHED();
  }

diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
@@ -45,7 +45,7 @@ class WSWindow final : public CObject
 
  bool is_movable() const
  {
- return m_type == WSWindowType::Normal || m_type == WSWindowType::Launcher;
+ return m_type == WSWindowType::Normal;
  }
 
  WSWindowFrame& frame() { return m_frame; }

diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
@@ -299,8 +299,6 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_back_to_
 template<typename Callback>
 IterationDecision WSWindowManager::for_each_visible_window_from_back_to_front(Callback callback)
 {
- if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Launcher, callback) == IterationDecision::Break)
- return IterationDecision::Break;
  if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Normal, callback) == IterationDecision::Break)
  return IterationDecision::Break;
  if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Taskbar, callback) == IterationDecision::Break)
@@ -350,9 +348,7 @@ IterationDecision WSWindowManager::for_each_visible_window_from_front_to_back(Ca
  return IterationDecision::Break;
  if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Tooltip, callback) == IterationDecision::Break)
  return IterationDecision::Break;
- if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, callback) == IterationDecision::Break)
- return IterationDecision::Break;
- return for_each_visible_window_of_type_from_front_to_back(WSWindowType::Launcher, callback);
+ return for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, callback);
 }
 
 template<typename Callback>

diff --git a/Servers/WindowServer/WSWindowType.h b/Servers/WindowServer/WSWindowType.h
@@ -9,5 +9,4 @@ enum class WSWindowType {
  Taskbar,
  Tooltip,
  Menubar,
- Launcher,
 };