瀏覽代碼

Rename WindowComposer -> WindowServer.

I keep referring to it as the windowing server anyway.
Andreas Kling 6 年之前
父節點
當前提交
e42f090ed3
共有 4 個文件被更改,包括 4 次插入18 次删除
  1. 0 6
      Kernel/Makefile
  2. 2 3
      Kernel/WindowComposer.cpp
  3. 0 7
      Kernel/WindowComposer.h
  4. 2 2
      Kernel/init.cpp

+ 0 - 6
Kernel/Makefile

@@ -58,12 +58,6 @@ WIDGETS_OBJS = \
     ../Widgets/Color.o \
     ../Widgets/CharacterBitmap.o \
     ../Widgets/EventLoop.o \
-    ../Widgets/Label.o \
-    ../Widgets/Button.o \
-    ../Widgets/MsgBox.o \
-    ../Widgets/ListBox.o \
-    ../Widgets/CheckBox.o \
-    ../Widgets/TextBox.o \
     ../Widgets/AbstractScreen.o \
     ../Widgets/GUIEventDevice.o \
 

+ 2 - 3
Kernel/WindowComposer.cpp

@@ -1,4 +1,3 @@
-#include "WindowComposer.h"
 #include "Process.h"
 #include <Widgets/Font.h>
 #include <Widgets/FrameBuffer.h>
@@ -6,7 +5,7 @@
 #include <Widgets/EventLoop.h>
 #include <Widgets/Window.h>
 
-void WindowComposer_main()
+void WindowServer_main()
 {
     auto info = current->get_display_info();
 
@@ -16,7 +15,7 @@ void WindowComposer_main()
 
     WindowManager::the();
 
-    dbgprintf("Entering WindowComposer main loop.\n");
+    dbgprintf("Entering WindowServer main loop.\n");
     EventLoop::main().exec();
 
     ASSERT_NOT_REACHED();

+ 0 - 7
Kernel/WindowComposer.h

@@ -1,7 +0,0 @@
-#pragma once
-
-class WindowComposer {
-public:
-    
-};
-

+ 2 - 2
Kernel/init.cpp

@@ -137,8 +137,8 @@ static void init_stage2()
     Process::create_kernel_process("spawn_stress", spawn_stress);
 #endif
 
-    extern void WindowComposer_main();
-    Process::create_kernel_process("WindowComposer", WindowComposer_main);
+    extern void WindowServer_main();
+    Process::create_kernel_process("WindowServer", WindowServer_main);
 
     current->sys$exit(0);
     ASSERT_NOT_REACHED();