Lemond: Now loads and starts services from /system/lemon/lemond. Capi…

…talise headers for readability
Weiww-Xu · Mar 5, 2021 · 07df2b9 · 07df2b9
1 parent 2ee0cc0
commit 07df2b9
Show file tree

Hide file tree

Showing 257 changed files with 986 additions and 982 deletions.
diff --git a/Applications/DeviceManager/main.cpp b/Applications/DeviceManager/main.cpp
@@ -1,7 +1,7 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/model.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Model.h>
 
-#include <lemon/system/device.h>
+#include <Lemon/System/Device.h>
 
 Lemon::GUI::Window* window;
 

diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
@@ -1,9 +1,9 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/system/filesystem.h>
-#include <lemon/system/spawn.h>
-#include <lemon/system/util.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Messagebox.h>
+#include <Lemon/System/Filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Util.h>
 
 #include <stdlib.h>
 #include <fcntl.h>

diff --git a/Applications/GUITest/main.cpp b/Applications/GUITest/main.cpp
@@ -1,6 +1,6 @@
-#include <lemon/gfx/graphics.h>
-#include <lemon/gfx/surface.h>
-#include <lemon/gui/window.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/GUI/Window.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/Applications/ImgView/main.cpp b/Applications/ImgView/main.cpp
@@ -1,7 +1,7 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/gui/filedialog.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Messagebox.h>
+#include <Lemon/GUI/FileDialog.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/Applications/JSONDump/main.cpp b/Applications/JSONDump/main.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/json.h>
+#include <Lemon/Core/JSON.h>
 
 #include <iostream>
 #include <sstream>

diff --git a/Applications/LSh/main.cpp b/Applications/LSh/main.cpp
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <list>
-#include <lemon/system/spawn.h>
-#include <lemon/system/filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Filesystem.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <limits.h>

diff --git a/Applications/LemonMonitor/main.cpp b/Applications/LemonMonitor/main.cpp
@@ -1,8 +1,8 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/model.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Model.h>
 
-#include <lemon/system/util.h>
-#include <lemon/system/info.h>
+#include <Lemon/System/Util.h>
+#include <Lemon/System/Info.h>
 
 #include <vector>
 #include <map>

diff --git a/Applications/Minesweeper/main.cpp b/Applications/Minesweeper/main.cpp
@@ -1,5 +1,5 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Messagebox.h>
 
 #include <map>
 #include <functional>

diff --git a/Applications/Run/main.cpp b/Applications/Run/main.cpp
@@ -1,7 +1,7 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Messagebox.h>
 
-#include <lemon/system/spawn.h>
+#include <Lemon/System/Spawn.h>
 
 #include <vector>
 #include <cstring>

diff --git a/Applications/Shell/main.cpp b/Applications/Shell/main.cpp
@@ -1,18 +1,18 @@
 #include <stdint.h>
 
 #include <lemon/syscall.h>
-#include <lemon/system/filesystem.h>
-#include <lemon/system/spawn.h>
-#include <lemon/system/info.h>
-#include <lemon/system/util.h>
-#include <lemon/system/fb.h>
-#include <lemon/system/ipc.h>
-#include <lemon/system/waitable.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/sharedmem.h>
-#include <lemon/core/shell.h>
-#include <lemon/core/keyboard.h>
-#include <lemon/gfx/graphics.h>
+#include <Lemon/System/Filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Info.h>
+#include <Lemon/System/Util.h>
+#include <Lemon/System/Framebuffer.h>
+#include <Lemon/System/IPC.h>
+#include <Lemon/System/Waitable.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/SharedMemory.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/Core/Keyboard.h>
+#include <Lemon/Graphics/Graphics.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>

diff --git a/Applications/Shell/menu.cpp b/Applications/Shell/menu.cpp
@@ -1,10 +1,11 @@
-#include <lemon/system/fb.h>
+#include <Lemon/System/Framebuffer.h>
+#include <Lemon/System/Spawn.h>
+
 #include <lemon/syscall.h>
-#include <lemon/system/spawn.h>
 
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/cfgparser.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/CFGParser.h>
 
 #include <fcntl.h>
 #include <unistd.h>

diff --git a/Applications/Shell/shell.cpp b/Applications/Shell/shell.cpp
@@ -1,5 +1,5 @@
-#include <lemon/core/shell.h>
-#include <lemon/ipc/interface.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/IPC/Interface.h>
 #include <string.h>
 #include <stdexcept>
 

diff --git a/Applications/Shell/shell.h b/Applications/Shell/shell.h
@@ -1,6 +1,6 @@
-#include <lemon/core/shell.h>
-#include <lemon/gui/window.h>
-#include <lemon/ipc/interface.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/IPC/Interface.h>
 
 #include <map>
 

diff --git a/Applications/Snake/main.cpp b/Applications/Snake/main.cpp
@@ -1,8 +1,8 @@
 #include <lemon/syscall.h>
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/keyboard.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/Keyboard.h>
 #include <stdlib.h>
 #include <list>
 #include <unistd.h>

diff --git a/Applications/Steal/main.cpp b/Applications/Steal/main.cpp
@@ -3,7 +3,7 @@
 #include <fstream>
 #include <map>
 
-#include <lemon/core/url.h>
+#include <Lemon/Core/URL.h>
 
 #include <sys/socket.h>
 #include <arpa/inet.h>

diff --git a/Applications/SysInfo/main.cpp b/Applications/SysInfo/main.cpp
@@ -1,8 +1,8 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/gui/filedialog.h>
-#include <lemon/system/info.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Messagebox.h>
+#include <Lemon/GUI/FileDialog.h>
+#include <Lemon/System/Info.h>
 #include <lemon/syscall.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
@@ -1,12 +1,12 @@
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/keyboard.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/Keyboard.h>
 
 #include <lemon/syscall.h>
-#include <lemon/system/filesystem.h>
-#include <lemon/system/spawn.h>
-#include <lemon/system/util.h>
+#include <Lemon/System/Filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Util.h>
 
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/Applications/TextEdit/exttextbox.h b/Applications/TextEdit/exttextbox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/gui/widgets.h>
+#include <Lemon/GUI/Widgets.h>
 
 class ExtendedTextBox : public Lemon::GUI::TextBox {
     rect_t textBoxBounds;

diff --git a/Applications/TextEdit/main.cpp b/Applications/TextEdit/main.cpp
@@ -1,9 +1,9 @@
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/filedialog.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/FileDialog.h>
+#include <Lemon/GUI/Messagebox.h>
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/Base/lemon/lemond/lemonwm.lemond.json b/Base/lemon/lemond/lemonwm.lemond.json
@@ -0,0 +1,4 @@
+{
+	"name" : "lemonwm",
+	"target" : "/system/lemon/lemonwm.lef"
+}
diff --git a/Base/lemon/lemond/networkgovernor.lemond.json b/Base/lemon/lemond/networkgovernor.lemond.json
@@ -0,0 +1,5 @@
+{
+	"name" : "networkgovernor",
+	"target" : "/system/lemon/netgov.lef"
+}
+
diff --git a/Base/lemon/lemond/shell.lemond.json b/Base/lemon/lemond/shell.lemond.json
@@ -0,0 +1,5 @@
+{
+	"name" : "shell",
+	"target" : "/system/bin/shell.lef",
+	"after" : "lemonwm"
+} 
diff --git a/Kernel/include/ABI b/Kernel/include/ABI
@@ -0,0 +1 @@
+../../LibLemon/include/Lemon/System/ABI
diff --git a/Kernel/include/arch/x86_64/abi.h → Kernel/include/Arch/x86_64/ABI.h b/Kernel/include/arch/x86_64/abi.h → Kernel/include/Arch/x86_64/ABI.h
diff --git a/Kernel/include/arch/x86_64/acpi.h → Kernel/include/Arch/x86_64/ACPI.h b/Kernel/include/arch/x86_64/acpi.h → Kernel/include/Arch/x86_64/ACPI.h
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <acpispec/tables.h>
 #include <lai/helpers/pci.h>
-#include <list.h>
+#include <List.h>
 
 typedef struct MADT{
   acpi_header_t header;

diff --git a/Kernel/include/arch/x86_64/apic.h → Kernel/include/Arch/x86_64/APIC.h b/Kernel/include/arch/x86_64/apic.h → Kernel/include/Arch/x86_64/APIC.h
diff --git a/Kernel/include/arch/x86_64/cpu.h → Kernel/include/Arch/x86_64/CPU.h b/Kernel/include/arch/x86_64/cpu.h → Kernel/include/Arch/x86_64/CPU.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
-#include <tss.h>
-#include <thread.h>
-#include <system.h>
+#include <TSS.h>
+#include <Thread.h>
+#include <System.h>
 
 struct process;
 template<typename T>

diff --git a/Kernel/include/arch/x86_64/debug.h → Kernel/include/Arch/x86_64/Debug.h b/Kernel/include/arch/x86_64/debug.h → Kernel/include/Arch/x86_64/Debug.h
diff --git a/Kernel/include/arch/x86_64/elf.h → Kernel/include/Arch/x86_64/ELF.h b/Kernel/include/arch/x86_64/elf.h → Kernel/include/Arch/x86_64/ELF.h
diff --git a/Kernel/include/arch/x86_64/hal.h → Kernel/include/Arch/x86_64/HAL.h b/Kernel/include/arch/x86_64/hal.h → Kernel/include/Arch/x86_64/HAL.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <mischdr.h>
+#include <MiscHdr.h>
 
 namespace HAL{
     extern memory_info_t mem_info;

diff --git a/Kernel/include/arch/x86_64/idt.h → Kernel/include/Arch/x86_64/IDT.h b/Kernel/include/arch/x86_64/idt.h → Kernel/include/Arch/x86_64/IDT.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <system.h>
+#include <System.h>
 
 #define IRQ0 32
 

diff --git a/Kernel/include/arch/x86_64/keyboard.h → Kernel/include/Arch/x86_64/Keyboard.h b/Kernel/include/arch/x86_64/keyboard.h → Kernel/include/Arch/x86_64/Keyboard.h
diff --git a/Kernel/include/arch/x86_64/memory.h → Kernel/include/Arch/x86_64/Memory.h b/Kernel/include/arch/x86_64/memory.h → Kernel/include/Arch/x86_64/Memory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <physicalallocator.h>
-#include <paging.h>
-#include <liballoc.h>
+#include <PhysicalAllocator.h>
+#include <Paging.h>
+#include <Liballoc.h>
 
 typedef struct {
     uint64_t base;

diff --git a/Kernel/include/arch/x86_64/mouse.h → Kernel/include/Arch/x86_64/Mouse.h b/Kernel/include/arch/x86_64/mouse.h → Kernel/include/Arch/x86_64/Mouse.h
diff --git a/Kernel/include/arch/x86_64/pci.h → Kernel/include/Arch/x86_64/PCI.h b/Kernel/include/arch/x86_64/pci.h → Kernel/include/Arch/x86_64/PCI.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
-#include <assert.h>
-#include <vector.h>
-#include <list.h>
+#include <Assert.h>
+#include <Vector.h>
+#include <List.h>
 
 #define PCI_BIST_CAPABLE (1 << 7)
 #define PCI_BIST_START (1 << 6)

diff --git a/Kernel/include/arch/x86_64/paging.h → Kernel/include/Arch/x86_64/Paging.h b/Kernel/include/arch/x86_64/paging.h → Kernel/include/Arch/x86_64/Paging.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <system.h>
+#include <System.h>
 
 #define KERNEL_VIRTUAL_BASE 0xFFFFFFFF80000000ULL
 #define IO_VIRTUAL_BASE (KERNEL_VIRTUAL_BASE - 0x100000000ULL) // KERNEL_VIRTUAL_BASE - 4GB

diff --git a/...l/include/arch/x86_64/physicalallocator.h → ...l/include/Arch/x86_64/PhysicalAllocator.h b/...l/include/arch/x86_64/physicalallocator.h → ...l/include/Arch/x86_64/PhysicalAllocator.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <paging.h>
-#include <serial.h>
-#include <string.h>
-#include <mischdr.h>
+#include <Paging.h>
+#include <Serial.h>
+#include <String.h>
+#include <MiscHdr.h>
 
 // The size of a block in phyiscal memory
 #define PHYSALLOC_BLOCK_SIZE 4096

diff --git a/Kernel/include/arch/x86_64/smp.h → Kernel/include/Arch/x86_64/SMP.h b/Kernel/include/arch/x86_64/smp.h → Kernel/include/Arch/x86_64/SMP.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include <cpu.h>
+#include <CPU.h>
 
 namespace SMP{
     extern CPU* cpus[];

diff --git a/Kernel/include/arch/x86_64/scheduler.h → Kernel/include/Arch/x86_64/Scheduler.h b/Kernel/include/arch/x86_64/scheduler.h → Kernel/include/Arch/x86_64/Scheduler.h
@@ -1,20 +1,20 @@
 #pragma once
 
 #include <stdint.h>
-#include <paging.h>
-#include <system.h>
-#include <memory.h>
-#include <list.h>
-#include <vector.h>
-#include <fs/filesystem.h>
-#include <lock.h>
-#include <timer.h>
-#include <hash.h>
-#include <cpu.h>
-
-#include <objects/handle.h>
-
-#include <thread.h>
+#include <Paging.h>
+#include <System.h>
+#include <Memory.h>
+#include <List.h>
+#include <Vector.h>
+#include <Fs/Filesystem.h>
+#include <Lock.h>
+#include <Timer.h>
+#include <Hash.h>
+#include <CPU.h>
+
+#include <Objects/Handle.h>
+
+#include <Thread.h>
 
 #define KERNEL_CS 0x08
 #define KERNEL_SS 0x10

diff --git a/Kernel/include/arch/x86_64/serial.h → Kernel/include/Arch/x86_64/Serial.h b/Kernel/include/arch/x86_64/serial.h → Kernel/include/Arch/x86_64/Serial.h