diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-07-18 10:15:00 +0200 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-07-18 10:18:16 +0200 |
| commit | 1c0669f010b6859721b5a4594b1e38d4098e43f4 (patch) | |
| tree | 4acdff111c4f491b62b1eb293117cd3605520bd2 | |
| parent | 2167f6023509078fe4ab1961c684a239bd18e588 (diff) | |
| download | serenity-1c0669f010b6859721b5a4594b1e38d4098e43f4.zip | |
LibDraw: Introduce (formerly known as SharedGraphics.)
Instead of LibGUI and WindowServer building their own copies of the drawing
and graphics code, let's it in a separate LibDraw library.
This avoids building the code twice, and will encourage better separation
of concerns. :^)
120 files changed, 201 insertions, 190 deletions
diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h index 7eecec4c86..fef853d6b7 100644 --- a/Applications/IRCClient/IRCLogBuffer.h +++ b/Applications/IRCClient/IRCLogBuffer.h @@ -4,7 +4,7 @@ #include <AK/CircularQueue.h> #include <AK/RefPtr.h> #include <AK/RefCounted.h> -#include <SharedGraphics/Color.h> +#include <LibDraw/Color.h> class IRCLogBufferModel; diff --git a/Applications/IRCClient/IRCLogBufferModel.cpp b/Applications/IRCClient/IRCLogBufferModel.cpp index 8805b10918..db14ba49cd 100644 --- a/Applications/IRCClient/IRCLogBufferModel.cpp +++ b/Applications/IRCClient/IRCLogBufferModel.cpp @@ -1,6 +1,6 @@ #include "IRCLogBufferModel.h" #include "IRCLogBuffer.h" -#include <SharedGraphics/Font.h> +#include <LibDraw/Font.h> #include <stdio.h> #include <time.h> diff --git a/Applications/Launcher/main.cpp b/Applications/Launcher/main.cpp index 464763a79b..e9b1f97f04 100644 --- a/Applications/Launcher/main.cpp +++ b/Applications/Launcher/main.cpp @@ -5,7 +5,7 @@ #include <LibGUI/GButton.h> #include <LibGUI/GWidget.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <errno.h> #include <signal.h> #include <stdio.h> diff --git a/Applications/Makefile.common b/Applications/Makefile.common index 6e36e0b8c5..845caa1727 100755 --- a/Applications/Makefile.common +++ b/Applications/Makefile.common @@ -3,7 +3,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -laudio -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp index 5f0173ab4e..67c629c392 100644 --- a/Applications/PaintBrush/BucketTool.cpp +++ b/Applications/PaintBrush/BucketTool.cpp @@ -3,7 +3,7 @@ #include <AK/Queue.h> #include <AK/SinglyLinkedList.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <stdio.h> BucketTool::BucketTool() diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h index 3616edf324..d2b031e0ec 100644 --- a/Applications/PaintBrush/EraseTool.h +++ b/Applications/PaintBrush/EraseTool.h @@ -1,7 +1,7 @@ #pragma once #include "Tool.h" -#include <SharedGraphics/Point.h> +#include <LibDraw/Point.h> class GMenu; diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp index fee2171fcb..613167beb2 100644 --- a/Applications/PaintBrush/PaintableWidget.cpp +++ b/Applications/PaintBrush/PaintableWidget.cpp @@ -1,7 +1,7 @@ #include "PaintableWidget.h" #include "Tool.h" #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> static PaintableWidget* s_the; diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h index 2ef8f7c7aa..3020285e09 100644 --- a/Applications/PaintBrush/PenTool.h +++ b/Applications/PaintBrush/PenTool.h @@ -1,7 +1,7 @@ #pragma once #include "Tool.h" -#include <SharedGraphics/Point.h> +#include <LibDraw/Point.h> class GMenu; diff --git a/Applications/PaintBrush/PickerTool.cpp b/Applications/PaintBrush/PickerTool.cpp index 4e2433a374..9077f54f56 100644 --- a/Applications/PaintBrush/PickerTool.cpp +++ b/Applications/PaintBrush/PickerTool.cpp @@ -1,5 +1,5 @@ #include "PickerTool.h" -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> PickerTool::PickerTool() { diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp index e574515354..0ec2cd6bc3 100644 --- a/Applications/PaintBrush/SprayTool.cpp +++ b/Applications/PaintBrush/SprayTool.cpp @@ -5,7 +5,7 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GAction.h> #include <LibGUI/GMenu.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <stdio.h> #include <LibM/math.h> diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp index b4a97187e4..07475cd504 100644 --- a/Applications/PaintBrush/ToolboxWidget.cpp +++ b/Applications/PaintBrush/ToolboxWidget.cpp @@ -7,7 +7,7 @@ #include "EraseTool.h" #include <LibGUI/GBoxLayout.h> #include <LibGUI/GButton.h> -#include <SharedGraphics/PNGLoader.h> +#include <LibDraw/PNGLoader.h> class ToolButton final : public GButton { public: diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp index c5637da19f..19026e7f32 100644 --- a/Applications/PaintBrush/main.cpp +++ b/Applications/PaintBrush/main.cpp @@ -9,7 +9,7 @@ #include <LibGUI/GMenuBar.h> #include <LibGUI/GMessageBox.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/PNGLoader.h> +#include <LibDraw/PNGLoader.h> int main(int argc, char** argv) { diff --git a/Applications/Piano/Makefile b/Applications/Piano/Makefile index 1e362554df..1e194d9b4a 100644 --- a/Applications/Piano/Makefile +++ b/Applications/Piano/Makefile @@ -6,18 +6,4 @@ OBJS = \ APP = Piano -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc -laudio - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/Piano/PianoWidget.cpp b/Applications/Piano/PianoWidget.cpp index 294e0e58ce..ddeed872a0 100644 --- a/Applications/Piano/PianoWidget.cpp +++ b/Applications/Piano/PianoWidget.cpp @@ -1,7 +1,7 @@ #include "PianoWidget.h" #include <AK/Queue.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <math.h> PianoWidget::PianoWidget() diff --git a/Applications/ProcessManager/MemoryStatsWidget.cpp b/Applications/ProcessManager/MemoryStatsWidget.cpp index 433b0b7c9b..a31b0746a9 100644 --- a/Applications/ProcessManager/MemoryStatsWidget.cpp +++ b/Applications/ProcessManager/MemoryStatsWidget.cpp @@ -4,7 +4,7 @@ #include <LibGUI/GBoxLayout.h> #include <LibGUI/GLabel.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> #include <stdio.h> #include <stdlib.h> diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp index 74bc2ef457..cd0b2382cc 100644 --- a/Applications/QuickShow/QSWidget.cpp +++ b/Applications/QuickShow/QSWidget.cpp @@ -1,6 +1,6 @@ #include "QSWidget.h" #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> QSWidget::QSWidget(GWidget* parent) : GFrame(parent) diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp index adb34b8469..47040ff21a 100644 --- a/Applications/QuickShow/main.cpp +++ b/Applications/QuickShow/main.cpp @@ -6,7 +6,7 @@ #include <LibGUI/GMenu.h> #include <LibGUI/GMenuBar.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/PNGLoader.h> +#include <LibDraw/PNGLoader.h> #include <stdio.h> int main(int argc, char** argv) diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h index 406ec52e87..d706d27eb4 100644 --- a/Applications/Taskbar/WindowList.h +++ b/Applications/Taskbar/WindowList.h @@ -4,7 +4,7 @@ #include <AK/AKString.h> #include <AK/HashMap.h> #include <LibGUI/GButton.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class Window { public: diff --git a/Applications/Terminal/Terminal.cpp b/Applications/Terminal/Terminal.cpp index 6ead0cb05c..41019778fb 100644 --- a/Applications/Terminal/Terminal.cpp +++ b/Applications/Terminal/Terminal.cpp @@ -8,7 +8,7 @@ #include <LibGUI/GClipboard.h> #include <LibGUI/GPainter.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/Font.h> +#include <LibDraw/Font.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> diff --git a/Applications/Terminal/Terminal.h b/Applications/Terminal/Terminal.h index 48b574ba63..69e94a3c1c 100644 --- a/Applications/Terminal/Terminal.h +++ b/Applications/Terminal/Terminal.h @@ -7,8 +7,8 @@ #include <LibCore/CNotifier.h> #include <LibCore/CTimer.h> #include <LibGUI/GFrame.h> -#include <SharedGraphics/GraphicsBitmap.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/GraphicsBitmap.h> +#include <LibDraw/Rect.h> class Font; diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp index 9dc80f300b..de223b2b26 100644 --- a/Demos/Fire/Fire.cpp +++ b/Demos/Fire/Fire.cpp @@ -21,7 +21,7 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GWidget.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <stdio.h> #include <stdlib.h> #include <time.h> diff --git a/Demos/Fire/Makefile b/Demos/Fire/Makefile index 2bfd381499..0d5740cfb7 100644 --- a/Demos/Fire/Makefile +++ b/Demos/Fire/Makefile @@ -10,7 +10,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Demos/HelloWorld/Makefile b/Demos/HelloWorld/Makefile index 1c2055b8fd..80eaa7a4f4 100644 --- a/Demos/HelloWorld/Makefile +++ b/Demos/HelloWorld/Makefile @@ -10,7 +10,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Demos/HelloWorld2/Makefile b/Demos/HelloWorld2/Makefile index e80c421368..f056a27a1d 100644 --- a/Demos/HelloWorld2/Makefile +++ b/Demos/HelloWorld2/Makefile @@ -15,7 +15,7 @@ UI_HelloWorld2.h: HelloWorld2.frm ../../DevTools/FormCompiler/FormCompiler $< > $@ $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Demos/PaintTest/Makefile b/Demos/PaintTest/Makefile index 33edbaa7e5..eacfb875ce 100644 --- a/Demos/PaintTest/Makefile +++ b/Demos/PaintTest/Makefile @@ -10,7 +10,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Demos/PaintTest/main.cpp b/Demos/PaintTest/main.cpp index a48395cdd0..971ae2ed60 100644 --- a/Demos/PaintTest/main.cpp +++ b/Demos/PaintTest/main.cpp @@ -2,7 +2,7 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GWidget.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/PNGLoader.h> +#include <LibDraw/PNGLoader.h> class TestWidget final : public GWidget { public: diff --git a/Demos/WidgetGallery/Makefile b/Demos/WidgetGallery/Makefile index f7f87cbc57..3dea837d1e 100644 --- a/Demos/WidgetGallery/Makefile +++ b/Demos/WidgetGallery/Makefile @@ -10,7 +10,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/DevTools/VisualBuilder/Makefile b/DevTools/VisualBuilder/Makefile index e2c88426f8..45a7b94c11 100644 --- a/DevTools/VisualBuilder/Makefile +++ b/DevTools/VisualBuilder/Makefile @@ -16,7 +16,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h index c2520bab88..d341dbd033 100644 --- a/DevTools/VisualBuilder/VBWidget.h +++ b/DevTools/VisualBuilder/VBWidget.h @@ -6,7 +6,7 @@ #include <AK/RefCounted.h> #include <AK/NonnullRefPtr.h> #include <AK/Weakable.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class GPainter; class GVariant; diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp index eaed1184e3..608f7f8502 100644 --- a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp +++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp @@ -1,7 +1,7 @@ #include "VBWidgetPropertyModel.h" #include "VBProperty.h" #include "VBWidget.h" -#include <SharedGraphics/Font.h> +#include <LibDraw/Font.h> VBWidgetPropertyModel::VBWidgetPropertyModel(VBWidget& widget) : m_widget(widget) diff --git a/Games/Minesweeper/Makefile b/Games/Minesweeper/Makefile index 81e3948df0..360d9a8bc3 100644 --- a/Games/Minesweeper/Makefile +++ b/Games/Minesweeper/Makefile @@ -11,7 +11,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Games/Snake/Makefile b/Games/Snake/Makefile index f0af9d7cef..3c3e15e437 100644 --- a/Games/Snake/Makefile +++ b/Games/Snake/Makefile @@ -11,7 +11,7 @@ DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp index 7229895159..ed388926ee 100644 --- a/Games/Snake/SnakeGame.cpp +++ b/Games/Snake/SnakeGame.cpp @@ -1,7 +1,7 @@ #include "SnakeGame.h" #include <LibGUI/GFontDatabase.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <stdlib.h> #include <time.h> diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h index 3e93e94d32..18d35f6fbf 100644 --- a/Kernel/Devices/BXVGADevice.h +++ b/Kernel/Devices/BXVGADevice.h @@ -4,7 +4,7 @@ #include <AK/Types.h> #include <Kernel/Devices/BlockDevice.h> #include <Kernel/VM/PhysicalAddress.h> -#include <SharedGraphics/Size.h> +#include <LibDraw/Size.h> class BXVGADevice final : public BlockDevice { AK_MAKE_ETERNAL diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index 26be17f250..a4e88a02c6 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -18,6 +18,7 @@ build_targets="$build_targets ../DevTools/FormCompiler" build_targets="$build_targets ../Libraries/LibC" build_targets="$build_targets ../Libraries/LibM" build_targets="$build_targets ../Libraries/LibCore" +build_targets="$build_targets ../Libraries/LibDraw" build_targets="$build_targets ../Libraries/LibAudio" build_targets="$build_targets ../Servers/SystemServer" build_targets="$build_targets ../Servers/LookupServer" @@ -64,7 +65,6 @@ for targ in $build_targets; do done # has no need to build separately, but install headers. -(cd ../SharedGraphics && ./install.sh) (cd ../AK && ./install.sh) sudo -E ./build-image-qemu.sh diff --git a/Libraries/LibCore/CConfigFile.h b/Libraries/LibCore/CConfigFile.h index 1816ba53c9..7452d3d1d9 100644 --- a/Libraries/LibCore/CConfigFile.h +++ b/Libraries/LibCore/CConfigFile.h @@ -5,7 +5,7 @@ #include <AK/RefPtr.h> #include <AK/RefCounted.h> #include <AK/Vector.h> -#include <SharedGraphics/Color.h> +#include <LibDraw/Color.h> class CConfigFile : public RefCounted<CConfigFile> { public: diff --git a/SharedGraphics/CharacterBitmap.cpp b/Libraries/LibDraw/CharacterBitmap.cpp index 3a3805f3ac..3a3805f3ac 100644 --- a/SharedGraphics/CharacterBitmap.cpp +++ b/Libraries/LibDraw/CharacterBitmap.cpp diff --git a/SharedGraphics/CharacterBitmap.h b/Libraries/LibDraw/CharacterBitmap.h index 536725c510..536725c510 100644 --- a/SharedGraphics/CharacterBitmap.h +++ b/Libraries/LibDraw/CharacterBitmap.h diff --git a/SharedGraphics/Color.cpp b/Libraries/LibDraw/Color.cpp index 00a312b7bb..00a312b7bb 100644 --- a/SharedGraphics/Color.cpp +++ b/Libraries/LibDraw/Color.cpp diff --git a/SharedGraphics/Color.h b/Libraries/LibDraw/Color.h index ff2090ff04..ff2090ff04 100644 --- a/SharedGraphics/Color.h +++ b/Libraries/LibDraw/Color.h diff --git a/SharedGraphics/DisjointRectSet.cpp b/Libraries/LibDraw/DisjointRectSet.cpp index c3eacf275a..435fe155ab 100644 --- a/SharedGraphics/DisjointRectSet.cpp +++ b/Libraries/LibDraw/DisjointRectSet.cpp @@ -1,4 +1,4 @@ -#include <SharedGraphics/DisjointRectSet.h> +#include <LibDraw/DisjointRectSet.h> void DisjointRectSet::add(const Rect& new_rect) { diff --git a/SharedGraphics/DisjointRectSet.h b/Libraries/LibDraw/DisjointRectSet.h index 197cb4c81b..44aabcfb2c 100644 --- a/SharedGraphics/DisjointRectSet.h +++ b/Libraries/LibDraw/DisjointRectSet.h @@ -1,7 +1,7 @@ #pragma once #include <AK/Vector.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class DisjointRectSet { public: diff --git a/SharedGraphics/Font.cpp b/Libraries/LibDraw/Font.cpp index b46495ad3b..b46495ad3b 100644 --- a/SharedGraphics/Font.cpp +++ b/Libraries/LibDraw/Font.cpp diff --git a/SharedGraphics/Font.h b/Libraries/LibDraw/Font.h index 83ae396dcb..3bda812159 100644 --- a/SharedGraphics/Font.h +++ b/Libraries/LibDraw/Font.h @@ -5,7 +5,7 @@ #include <AK/RefPtr.h> #include <AK/RefCounted.h> #include <AK/Types.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> // FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead? class GlyphBitmap { diff --git a/SharedGraphics/GraphicsBitmap.cpp b/Libraries/LibDraw/GraphicsBitmap.cpp index 46fdf5777e..354c94eb66 100644 --- a/SharedGraphics/GraphicsBitmap.cpp +++ b/Libraries/LibDraw/GraphicsBitmap.cpp @@ -1,6 +1,6 @@ #include <AK/MappedFile.h> -#include <SharedGraphics/GraphicsBitmap.h> -#include <SharedGraphics/PNGLoader.h> +#include <LibDraw/GraphicsBitmap.h> +#include <LibDraw/PNGLoader.h> #include <errno.h> #include <fcntl.h> #include <stdio.h> diff --git a/SharedGraphics/GraphicsBitmap.h b/Libraries/LibDraw/GraphicsBitmap.h index cfd056390a..cfd056390a 100644 --- a/SharedGraphics/GraphicsBitmap.h +++ b/Libraries/LibDraw/GraphicsBitmap.h diff --git a/Libraries/LibDraw/Makefile b/Libraries/LibDraw/Makefile new file mode 100644 index 0000000000..ff2839f0b8 --- /dev/null +++ b/Libraries/LibDraw/Makefile @@ -0,0 +1,35 @@ +include ../../Makefile.common + +OBJS = \ + CharacterBitmap.o \ + Color.o \ + DisjointRectSet.o \ + Font.o \ + GraphicsBitmap.o \ + Painter.o \ + PNGLoader.o \ + Rect.o \ + StylePainter.o + +LIBRARY = libdraw.a +DEFINES += -DUSERLAND + +all: $(LIBRARY) + +$(LIBRARY): $(OBJS) + @echo "LIB $@"; $(AR) rcs $@ $(OBJS) $(LIBS) + +.cpp.o: + @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< + +-include $(OBJS:%.o=%.d) + +clean: + @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d + +install: $(LIBRARY) + mkdir -p ../../Root/usr/include/LibGfx + # Copy headers + rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibGfx + # Install the library + cp $(LIBRARY) ../../Root/usr/lib diff --git a/SharedGraphics/PNGLoader.cpp b/Libraries/LibDraw/PNGLoader.cpp index b6fecfb890..6f863a4c9c 100644 --- a/SharedGraphics/PNGLoader.cpp +++ b/Libraries/LibDraw/PNGLoader.cpp @@ -1,8 +1,8 @@ #include <AK/FileSystemPath.h> #include <AK/MappedFile.h> #include <AK/NetworkOrdered.h> -#include <SharedGraphics/PNGLoader.h> -#include <SharedGraphics/puff.c> +#include <LibDraw/PNGLoader.h> +#include <LibDraw/puff.c> #include <fcntl.h> #include <serenity.h> #include <stdio.h> diff --git a/SharedGraphics/PNGLoader.h b/Libraries/LibDraw/PNGLoader.h index 3fa06bd927..aff9eac8dd 100644 --- a/SharedGraphics/PNGLoader.h +++ b/Libraries/LibDraw/PNGLoader.h @@ -1,5 +1,5 @@ #pragma once -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> RefPtr<GraphicsBitmap> load_png(const StringView& path); diff --git a/SharedGraphics/Painter.cpp b/Libraries/LibDraw/Painter.cpp index 0676d47da3..de0ea14f9c 100644 --- a/SharedGraphics/Painter.cpp +++ b/Libraries/LibDraw/Painter.cpp @@ -4,7 +4,7 @@ #include <AK/Assertions.h> #include <AK/StdLibExtras.h> #include <AK/StringBuilder.h> -#include <SharedGraphics/CharacterBitmap.h> +#include <LibDraw/CharacterBitmap.h> #include <math.h> #include <stdio.h> #include <unistd.h> diff --git a/SharedGraphics/Painter.h b/Libraries/LibDraw/Painter.h index df3d714e76..3d16905b20 100644 --- a/SharedGraphics/Painter.h +++ b/Libraries/LibDraw/Painter.h @@ -5,8 +5,8 @@ #include "Rect.h" #include "Size.h" #include <AK/AKString.h> -#include <SharedGraphics/TextAlignment.h> -#include <SharedGraphics/TextElision.h> +#include <LibDraw/TextAlignment.h> +#include <LibDraw/TextElision.h> class CharacterBitmap; class GlyphBitmap; diff --git a/SharedGraphics/Point.h b/Libraries/LibDraw/Point.h index 0f3f65beb8..0f3f65beb8 100644 --- a/SharedGraphics/Point.h +++ b/Libraries/LibDraw/Point.h diff --git a/SharedGraphics/Rect.cpp b/Libraries/LibDraw/Rect.cpp index 213d18ead9..213d18ead9 100644 --- a/SharedGraphics/Rect.cpp +++ b/Libraries/LibDraw/Rect.cpp diff --git a/SharedGraphics/Rect.h b/Libraries/LibDraw/Rect.h index c9a7ededf3..c3ae82de1c 100644 --- a/SharedGraphics/Rect.h +++ b/Libraries/LibDraw/Rect.h @@ -2,9 +2,9 @@ #include <AK/AKString.h> #include <AK/LogStream.h> -#include <SharedGraphics/Point.h> -#include <SharedGraphics/Size.h> -#include <SharedGraphics/TextAlignment.h> +#include <LibDraw/Point.h> +#include <LibDraw/Size.h> +#include <LibDraw/TextAlignment.h> struct WSAPI_Rect; diff --git a/SharedGraphics/Size.h b/Libraries/LibDraw/Size.h index a499dbc2fd..a499dbc2fd 100644 --- a/SharedGraphics/Size.h +++ b/Libraries/LibDraw/Size.h diff --git a/SharedGraphics/StylePainter.cpp b/Libraries/LibDraw/StylePainter.cpp index 019167dcfd..aa68e5bea3 100644 --- a/SharedGraphics/StylePainter.cpp +++ b/Libraries/LibDraw/StylePainter.cpp @@ -1,5 +1,5 @@ -#include <LibGUI/GPainter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/Painter.h> +#include <LibDraw/StylePainter.h> void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, bool active, bool hovered, bool enabled) { diff --git a/SharedGraphics/StylePainter.h b/Libraries/LibDraw/StylePainter.h index 996c63c62f..996c63c62f 100644 --- a/SharedGraphics/StylePainter.h +++ b/Libraries/LibDraw/StylePainter.h diff --git a/SharedGraphics/TextAlignment.h b/Libraries/LibDraw/TextAlignment.h index bd9d61ac73..bd9d61ac73 100644 --- a/SharedGraphics/TextAlignment.h +++ b/Libraries/LibDraw/TextAlignment.h diff --git a/SharedGraphics/TextElision.h b/Libraries/LibDraw/TextElision.h index c5c8032b02..c5c8032b02 100644 --- a/SharedGraphics/TextElision.h +++ b/Libraries/LibDraw/TextElision.h diff --git a/Libraries/LibDraw/install.sh b/Libraries/LibDraw/install.sh new file mode 100755 index 0000000000..33f40e6870 --- /dev/null +++ b/Libraries/LibDraw/install.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +mkdir -p ../Root/usr/include/LibGfx/ +cp *.h ../Root/usr/include/LibGfx/ diff --git a/SharedGraphics/puff.c b/Libraries/LibDraw/puff.c index c6c90d7142..c6c90d7142 100644 --- a/SharedGraphics/puff.c +++ b/Libraries/LibDraw/puff.c diff --git a/SharedGraphics/puff.h b/Libraries/LibDraw/puff.h index 50beef92a1..50beef92a1 100644 --- a/SharedGraphics/puff.h +++ b/Libraries/LibDraw/puff.h diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/GAbstractButton.h index 386bfc4960..6e5f77e19a 100644 --- a/Libraries/LibGUI/GAbstractButton.h +++ b/Libraries/LibGUI/GAbstractButton.h @@ -2,7 +2,7 @@ #include <LibCore/CTimer.h> #include <LibGUI/GWidget.h> -#include <SharedGraphics/TextAlignment.h> +#include <LibDraw/TextAlignment.h> class GPainter; diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h index 867c41e213..eedb597d61 100644 --- a/Libraries/LibGUI/GAction.h +++ b/Libraries/LibGUI/GAction.h @@ -9,7 +9,7 @@ #include <AK/WeakPtr.h> #include <AK/Weakable.h> #include <LibGUI/GShortcut.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> class GActionGroup; class GButton; diff --git a/Libraries/LibGUI/GButton.cpp b/Libraries/LibGUI/GButton.cpp index 3274d4992f..d94fe81e74 100644 --- a/Libraries/LibGUI/GButton.cpp +++ b/Libraries/LibGUI/GButton.cpp @@ -4,7 +4,7 @@ #include <LibGUI/GActionGroup.h> #include <LibGUI/GButton.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> GButton::GButton(GWidget* parent) : GAbstractButton(parent) diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h index acd7d7298c..c5724c0f01 100644 --- a/Libraries/LibGUI/GButton.h +++ b/Libraries/LibGUI/GButton.h @@ -3,9 +3,9 @@ #include <AK/AKString.h> #include <AK/Function.h> #include <LibGUI/GAbstractButton.h> -#include <SharedGraphics/GraphicsBitmap.h> -#include <SharedGraphics/StylePainter.h> -#include <SharedGraphics/TextAlignment.h> +#include <LibDraw/GraphicsBitmap.h> +#include <LibDraw/StylePainter.h> +#include <LibDraw/TextAlignment.h> class GAction; diff --git a/Libraries/LibGUI/GCheckBox.cpp b/Libraries/LibGUI/GCheckBox.cpp index 2bd5067bc9..bca4cd8a97 100644 --- a/Libraries/LibGUI/GCheckBox.cpp +++ b/Libraries/LibGUI/GCheckBox.cpp @@ -1,8 +1,8 @@ #include <Kernel/KeyCode.h> #include <LibGUI/GCheckBox.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/CharacterBitmap.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/CharacterBitmap.h> +#include <LibDraw/StylePainter.h> static const char* s_checked_bitmap_data = { " " diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/GDesktop.h index a76142fe0f..01b03debac 100644 --- a/Libraries/LibGUI/GDesktop.h +++ b/Libraries/LibGUI/GDesktop.h @@ -3,7 +3,7 @@ #include <AK/AKString.h> #include <AK/Badge.h> #include <AK/Function.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class GWindowServerConnection; diff --git a/Libraries/LibGUI/GDirectoryModel.cpp b/Libraries/LibGUI/GDirectoryModel.cpp index c8ad8f40d0..b682f9bf7e 100644 --- a/Libraries/LibGUI/GDirectoryModel.cpp +++ b/Libraries/LibGUI/GDirectoryModel.cpp @@ -4,7 +4,7 @@ #include <LibCore/CDirIterator.h> #include <LibCore/CLock.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <dirent.h> #include <grp.h> #include <pwd.h> diff --git a/Libraries/LibGUI/GEvent.h b/Libraries/LibGUI/GEvent.h index 9d98188836..980fb54296 100644 --- a/Libraries/LibGUI/GEvent.h +++ b/Libraries/LibGUI/GEvent.h @@ -3,8 +3,8 @@ #include <Kernel/KeyCode.h> #include <LibCore/CEvent.h> #include <LibGUI/GWindowType.h> -#include <SharedGraphics/Point.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Point.h> +#include <LibDraw/Rect.h> class CObject; diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/GFilePicker.cpp index 9fe7c4db1a..fb4b3c819c 100644 --- a/Libraries/LibGUI/GFilePicker.cpp +++ b/Libraries/LibGUI/GFilePicker.cpp @@ -11,7 +11,7 @@ #include <LibGUI/GSortingProxyModel.h> #include <LibGUI/GTextBox.h> #include <LibGUI/GToolBar.h> -#include <SharedGraphics/PNGLoader.h> +#include <LibDraw/PNGLoader.h> Optional<String> GFilePicker::get_open_filepath() { diff --git a/Libraries/LibGUI/GFontDatabase.cpp b/Libraries/LibGUI/GFontDatabase.cpp index 6bd3887707..a8fee8844c 100644 --- a/Libraries/LibGUI/GFontDatabase.cpp +++ b/Libraries/LibGUI/GFontDatabase.cpp @@ -1,6 +1,6 @@ #include <LibCore/CDirIterator.h> #include <LibGUI/GFontDatabase.h> -#include <SharedGraphics/Font.h> +#include <LibDraw/Font.h> #include <dirent.h> #include <stdio.h> #include <stdlib.h> diff --git a/Libraries/LibGUI/GFrame.cpp b/Libraries/LibGUI/GFrame.cpp index 418fe40492..8854bb5e03 100644 --- a/Libraries/LibGUI/GFrame.cpp +++ b/Libraries/LibGUI/GFrame.cpp @@ -1,6 +1,6 @@ #include <LibGUI/GFrame.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> GFrame::GFrame(GWidget* parent) : GWidget(parent) diff --git a/Libraries/LibGUI/GFrame.h b/Libraries/LibGUI/GFrame.h index b6757e4d8d..84b07413f6 100644 --- a/Libraries/LibGUI/GFrame.h +++ b/Libraries/LibGUI/GFrame.h @@ -1,7 +1,7 @@ #pragma once #include <LibGUI/GWidget.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> class GFrame : public GWidget { public: diff --git a/Libraries/LibGUI/GGroupBox.cpp b/Libraries/LibGUI/GGroupBox.cpp index 5242c33240..3ce063f248 100644 --- a/Libraries/LibGUI/GGroupBox.cpp +++ b/Libraries/LibGUI/GGroupBox.cpp @@ -1,6 +1,6 @@ #include <LibGUI/GGroupBox.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> GGroupBox::GGroupBox(GWidget* parent) : GGroupBox({}, parent) diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/GIcon.h index 2aecd7f2ed..d849929a50 100644 --- a/Libraries/LibGUI/GIcon.h +++ b/Libraries/LibGUI/GIcon.h @@ -1,7 +1,7 @@ #pragma once #include <AK/HashMap.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> class GIconImpl : public RefCounted<GIconImpl> { public: diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/GLabel.cpp index 5a6fdc6580..bba9e4897e 100644 --- a/Libraries/LibGUI/GLabel.cpp +++ b/Libraries/LibGUI/GLabel.cpp @@ -1,6 +1,6 @@ #include "GLabel.h" #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> GLabel::GLabel(GWidget* parent) : GFrame(parent) diff --git a/Libraries/LibGUI/GLabel.h b/Libraries/LibGUI/GLabel.h index e3ad6a568e..4ee427d2bd 100644 --- a/Libraries/LibGUI/GLabel.h +++ b/Libraries/LibGUI/GLabel.h @@ -1,7 +1,7 @@ #pragma once #include <LibGUI/GFrame.h> -#include <SharedGraphics/TextAlignment.h> +#include <LibDraw/TextAlignment.h> class GraphicsBitmap; diff --git a/Libraries/LibGUI/GModel.h b/Libraries/LibGUI/GModel.h index dbb94524da..fb634930e6 100644 --- a/Libraries/LibGUI/GModel.h +++ b/Libraries/LibGUI/GModel.h @@ -7,7 +7,7 @@ #include <AK/RefCounted.h> #include <LibGUI/GModelIndex.h> #include <LibGUI/GVariant.h> -#include <SharedGraphics/TextAlignment.h> +#include <LibDraw/TextAlignment.h> class Font; class GAbstractView; diff --git a/Libraries/LibGUI/GPainter.h b/Libraries/LibGUI/GPainter.h index 1ad436e343..93e4b46882 100644 --- a/Libraries/LibGUI/GPainter.h +++ b/Libraries/LibGUI/GPainter.h @@ -1,6 +1,6 @@ #pragma once -#include <SharedGraphics/Painter.h> +#include <LibDraw/Painter.h> class GWidget; class GraphicsBitmap; diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/GRadioButton.cpp index 377b3000ae..9c488f6ffa 100644 --- a/Libraries/LibGUI/GRadioButton.cpp +++ b/Libraries/LibGUI/GRadioButton.cpp @@ -1,6 +1,6 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GRadioButton.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> static RefPtr<GraphicsBitmap> s_unfilled_circle_bitmap; static RefPtr<GraphicsBitmap> s_filled_circle_bitmap; diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/GResizeCorner.cpp index 1dfba8b786..5aa050ec45 100644 --- a/Libraries/LibGUI/GResizeCorner.cpp +++ b/Libraries/LibGUI/GResizeCorner.cpp @@ -1,7 +1,7 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GResizeCorner.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <WindowServer/WSAPITypes.h> GResizeCorner::GResizeCorner(GWidget* parent) diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/GScrollBar.cpp index f1ce391309..037b5aca40 100644 --- a/Libraries/LibGUI/GScrollBar.cpp +++ b/Libraries/LibGUI/GScrollBar.cpp @@ -1,8 +1,8 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GScrollBar.h> -#include <SharedGraphics/CharacterBitmap.h> -#include <SharedGraphics/GraphicsBitmap.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/CharacterBitmap.h> +#include <LibDraw/GraphicsBitmap.h> +#include <LibDraw/StylePainter.h> static const char* s_up_arrow_bitmap_data = { " " diff --git a/Libraries/LibGUI/GSlider.cpp b/Libraries/LibGUI/GSlider.cpp index ff166e90ef..3a821e9d41 100755 --- a/Libraries/LibGUI/GSlider.cpp +++ b/Libraries/LibGUI/GSlider.cpp @@ -1,6 +1,6 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GSlider.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> GSlider::GSlider(GWidget* parent) : GWidget(parent) diff --git a/Libraries/LibGUI/GStatusBar.cpp b/Libraries/LibGUI/GStatusBar.cpp index e219035e32..12ff8da2f7 100644 --- a/Libraries/LibGUI/GStatusBar.cpp +++ b/Libraries/LibGUI/GStatusBar.cpp @@ -3,7 +3,7 @@ #include <LibGUI/GPainter.h> #include <LibGUI/GResizeCorner.h> #include <LibGUI/GStatusBar.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> GStatusBar::GStatusBar(GWidget* parent) : GWidget(parent) diff --git a/Libraries/LibGUI/GTabWidget.cpp b/Libraries/LibGUI/GTabWidget.cpp index 73b1552d1f..374390fd3f 100644 --- a/Libraries/LibGUI/GTabWidget.cpp +++ b/Libraries/LibGUI/GTabWidget.cpp @@ -1,7 +1,7 @@ #include <LibGUI/GBoxLayout.h> #include <LibGUI/GPainter.h> #include <LibGUI/GTabWidget.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/StylePainter.h> GTabWidget::GTabWidget(GWidget* parent) : GWidget(parent) diff --git a/Libraries/LibGUI/GTextEditor.h b/Libraries/LibGUI/GTextEditor.h index 1bfbfa5b70..751b6a5428 100644 --- a/Libraries/LibGUI/GTextEditor.h +++ b/Libraries/LibGUI/GTextEditor.h @@ -3,7 +3,7 @@ #include <AK/Function.h> #include <AK/HashMap.h> #include <LibGUI/GScrollableWidget.h> -#include <SharedGraphics/TextAlignment.h> +#include <LibDraw/TextAlignment.h> class GAction; class GMenu; diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h index c7dc60d2de..7725412f20 100644 --- a/Libraries/LibGUI/GVariant.h +++ b/Libraries/LibGUI/GVariant.h @@ -2,7 +2,7 @@ #include <AK/AKString.h> #include <LibGUI/GIcon.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> namespace AK { class JsonValue; diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp index 41e5b5854c..eb963b0314 100644 --- a/Libraries/LibGUI/GWidget.cpp +++ b/Libraries/LibGUI/GWidget.cpp @@ -8,7 +8,7 @@ #include <LibGUI/GLayout.h> #include <LibGUI/GMenu.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <unistd.h> GWidget::GWidget(GWidget* parent) diff --git a/Libraries/LibGUI/GWidget.h b/Libraries/LibGUI/GWidget.h index da0ae762ea..410bbe3653 100644 --- a/Libraries/LibGUI/GWidget.h +++ b/Libraries/LibGUI/GWidget.h @@ -7,9 +7,9 @@ #include <LibCore/CObject.h> #include <LibGUI/GEvent.h> #include <LibGUI/GShortcut.h> -#include <SharedGraphics/Color.h> -#include <SharedGraphics/Font.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Color.h> +#include <LibDraw/Font.h> +#include <LibDraw/Rect.h> class GraphicsBitmap; class GAction; diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp index 74c582cb52..1e20137269 100644 --- a/Libraries/LibGUI/GWindow.cpp +++ b/Libraries/LibGUI/GWindow.cpp @@ -8,7 +8,7 @@ #include <LibC/stdlib.h> #include <LibC/unistd.h> #include <LibGUI/GPainter.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> //#define UPDATE_COALESCING_DEBUG diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h index 392f078ce6..5101a2430c 100644 --- a/Libraries/LibGUI/GWindow.h +++ b/Libraries/LibGUI/GWindow.h @@ -5,8 +5,8 @@ #include <AK/WeakPtr.h> #include <LibCore/CObject.h> #include <LibGUI/GWindowType.h> -#include <SharedGraphics/GraphicsBitmap.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/GraphicsBitmap.h> +#include <LibDraw/Rect.h> class GWidget; class GWMEvent; diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile index 7589e77b91..1b2c461115 100644 --- a/Libraries/LibGUI/Makefile +++ b/Libraries/LibGUI/Makefile @@ -1,16 +1,6 @@ include ../../Makefile.common -SHAREDGRAPHICS_OBJS = \ - ../../SharedGraphics/Painter.o \ - ../../SharedGraphics/StylePainter.o \ - ../../SharedGraphics/Font.o \ - ../../SharedGraphics/Rect.o \ - ../../SharedGraphics/GraphicsBitmap.o \ - ../../SharedGraphics/CharacterBitmap.o \ - ../../SharedGraphics/Color.o \ - ../../SharedGraphics/PNGLoader.o - -LIBGUI_OBJS = \ +OBJS = \ GPainter.o \ GButton.o \ GCheckBox.o \ @@ -64,8 +54,6 @@ LIBGUI_OBJS = \ GComboBox.o \ GWindow.o -OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS) - LIBRARY = libgui.a DEFINES += -DUSERLAND diff --git a/Libraries/LibHTML/Frame.h b/Libraries/LibHTML/Frame.h index 1ceef02564..b58021fa5c 100644 --- a/Libraries/LibHTML/Frame.h +++ b/Libraries/LibHTML/Frame.h @@ -1,7 +1,7 @@ #pragma once #include <LibHTML/DOM/Document.h> -#include <SharedGraphics/Size.h> +#include <LibDraw/Size.h> class Frame { public: diff --git a/Libraries/LibHTML/Layout/ComputedStyle.h b/Libraries/LibHTML/Layout/ComputedStyle.h index af339fecd6..856118a790 100644 --- a/Libraries/LibHTML/Layout/ComputedStyle.h +++ b/Libraries/LibHTML/Layout/ComputedStyle.h @@ -1,8 +1,8 @@ #pragma once #include <LibHTML/CSS/LengthBox.h> -#include <SharedGraphics/Color.h> -#include <SharedGraphics/Size.h> +#include <LibDraw/Color.h> +#include <LibDraw/Size.h> enum FontStyle { Normal, diff --git a/Libraries/LibHTML/Layout/LayoutNode.h b/Libraries/LibHTML/Layout/LayoutNode.h index 9604636b11..a48e11d422 100644 --- a/Libraries/LibHTML/Layout/LayoutNode.h +++ b/Libraries/LibHTML/Layout/LayoutNode.h @@ -4,7 +4,7 @@ #include <AK/Vector.h> #include <LibHTML/Layout/ComputedStyle.h> #include <LibHTML/TreeNode.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class Node; class LayoutBlock; diff --git a/Makefile.common b/Makefile.common index cbe8e38365..cc49b2646c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -7,8 +7,22 @@ OPTIMIZATION_FLAGS = -Os MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) SERENITY_BASE_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH))) -INCLUDE_FLAGS = -I$(SERENITY_BASE_DIR) -I$(SERENITY_BASE_DIR)/Libraries -I. -I$(SERENITY_BASE_DIR)/Libraries/LibC -I$(SERENITY_BASE_DIR)/Servers -I$(SERENITY_BASE_DIR)/Libraries/LibM -LDFLAGS = -L$(SERENITY_BASE_DIR)/Libraries/LibC -L$(SERENITY_BASE_DIR)/Libraries/LibCore -L$(SERENITY_BASE_DIR)/Libraries/LibM -L$(SERENITY_BASE_DIR)/Libraries/LibGUI -L$(SERENITY_BASE_DIR)/Libraries/LibAudio +INCLUDE_FLAGS = \ + -I. \ + -I$(SERENITY_BASE_DIR) \ + -I$(SERENITY_BASE_DIR)/Libraries \ + -I$(SERENITY_BASE_DIR)/Libraries/LibC \ + -I$(SERENITY_BASE_DIR)/Servers \ + -I$(SERENITY_BASE_DIR)/Libraries/LibM + +LDFLAGS = \ + -L$(SERENITY_BASE_DIR)/Libraries/LibC \ + -L$(SERENITY_BASE_DIR)/Libraries/LibCore \ + -L$(SERENITY_BASE_DIR)/Libraries/LibM \ + -L$(SERENITY_BASE_DIR)/Libraries/LibDraw \ + -L$(SERENITY_BASE_DIR)/Libraries/LibGUI \ + -L$(SERENITY_BASE_DIR)/Libraries/LibAudio + CLANG_FLAGS = -Wconsumed -m32 -ffreestanding -march=i686 #SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(SUGGEST_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile index a51fd588c8..01e2de476e 100644 --- a/Servers/WindowServer/Makefile +++ b/Servers/WindowServer/Makefile @@ -1,17 +1,6 @@ include ../../Makefile.common -SHAREDGRAPHICS_OBJS = \ - ../../SharedGraphics/Painter.o \ - ../../SharedGraphics/StylePainter.o \ - ../../SharedGraphics/Font.o \ - ../../SharedGraphics/Rect.o \ - ../../SharedGraphics/GraphicsBitmap.o \ - ../../SharedGraphics/CharacterBitmap.o \ - ../../SharedGraphics/DisjointRectSet.o \ - ../../SharedGraphics/Color.o \ - ../../SharedGraphics/PNGLoader.o - -WINDOWSERVER_OBJS = \ +OBJS = \ WSEventLoop.o \ WSWindow.o \ WSWindowManager.o \ @@ -31,14 +20,13 @@ WINDOWSERVER_OBJS = \ main.o APP = WindowServer -OBJS = $(SHAREDGRAPHICS_OBJS) $(WINDOWSERVER_OBJS) DEFINES += -DUSERLAND all: $(APP) $(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -ldraw .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< diff --git a/Servers/WindowServer/WSAPITypes.h b/Servers/WindowServer/WSAPITypes.h index 62c22a2b9e..28fe734d6e 100644 --- a/Servers/WindowServer/WSAPITypes.h +++ b/Servers/WindowServer/WSAPITypes.h @@ -1,7 +1,7 @@ #pragma once -#include <SharedGraphics/Color.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Color.h> +#include <LibDraw/Rect.h> typedef unsigned WSAPI_Color; diff --git a/Servers/WindowServer/WSButton.cpp b/Servers/WindowServer/WSButton.cpp index 10b635fb68..7e0a7de879 100644 --- a/Servers/WindowServer/WSButton.cpp +++ b/Servers/WindowServer/WSButton.cpp @@ -1,6 +1,6 @@ -#include <SharedGraphics/CharacterBitmap.h> -#include <SharedGraphics/Painter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/CharacterBitmap.h> +#include <LibDraw/Painter.h> +#include <LibDraw/StylePainter.h> #include <WindowServer/WSButton.h> #include <WindowServer/WSEvent.h> #include <WindowServer/WSWindowManager.h> diff --git a/Servers/WindowServer/WSButton.h b/Servers/WindowServer/WSButton.h index b9c51ea10a..dc2b09ad10 100644 --- a/Servers/WindowServer/WSButton.h +++ b/Servers/WindowServer/WSButton.h @@ -3,7 +3,7 @@ #include <AK/Function.h> #include <AK/NonnullRefPtr.h> #include <AK/Weakable.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class CharacterBitmap; class Painter; diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h index 4c621fe422..2a5d2e4749 100644 --- a/Servers/WindowServer/WSClientConnection.h +++ b/Servers/WindowServer/WSClientConnection.h @@ -6,7 +6,7 @@ #include <AK/WeakPtr.h> #include <LibCore/CObject.h> #include <LibCore/CoreIPCServer.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <WindowServer/WSEvent.h> class WSWindow; diff --git a/Servers/WindowServer/WSCompositor.cpp b/Servers/WindowServer/WSCompositor.cpp index 115b5cea44..dae11e64ac 100644 --- a/Servers/WindowServer/WSCompositor.cpp +++ b/Servers/WindowServer/WSCompositor.cpp @@ -4,9 +4,9 @@ #include "WSScreen.h" #include "WSWindow.h" #include "WSWindowManager.h" -#include <SharedGraphics/Font.h> -#include <SharedGraphics/PNGLoader.h> -#include <SharedGraphics/Painter.h> +#include <LibDraw/Font.h> +#include <LibDraw/PNGLoader.h> +#include <LibDraw/Painter.h> // #define COMPOSITOR_DEBUG diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h index 27635d04ca..e11da2b21f 100644 --- a/Servers/WindowServer/WSCompositor.h +++ b/Servers/WindowServer/WSCompositor.h @@ -4,8 +4,8 @@ #include <AK/RefPtr.h> #include <LibCore/CObject.h> #include <LibCore/CTimer.h> -#include <SharedGraphics/DisjointRectSet.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/DisjointRectSet.h> +#include <LibDraw/GraphicsBitmap.h> class Painter; class WSCursor; diff --git a/Servers/WindowServer/WSCursor.h b/Servers/WindowServer/WSCursor.h index 76640da4a7..5b46f64674 100644 --- a/Servers/WindowServer/WSCursor.h +++ b/Servers/WindowServer/WSCursor.h @@ -1,6 +1,6 @@ #pragma once -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> enum class WSStandardCursor { None = 0, diff --git a/Servers/WindowServer/WSEvent.h b/Servers/WindowServer/WSEvent.h index 2527c88fca..4339be917b 100644 --- a/Servers/WindowServer/WSEvent.h +++ b/Servers/WindowServer/WSEvent.h @@ -4,8 +4,8 @@ #include <AK/Types.h> #include <Kernel/KeyCode.h> #include <LibCore/CEvent.h> -#include <SharedGraphics/Point.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Point.h> +#include <LibDraw/Rect.h> #include <WindowServer/WSCursor.h> #include <WindowServer/WSWindowType.h> diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp index d820a9425a..7b6b1dcc5a 100644 --- a/Servers/WindowServer/WSMenu.cpp +++ b/Servers/WindowServer/WSMenu.cpp @@ -5,10 +5,10 @@ #include "WSScreen.h" #include "WSWindow.h" #include "WSWindowManager.h" -#include <SharedGraphics/CharacterBitmap.h> -#include <SharedGraphics/Font.h> -#include <SharedGraphics/Painter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/CharacterBitmap.h> +#include <LibDraw/Font.h> +#include <LibDraw/Painter.h> +#include <LibDraw/StylePainter.h> #include <WindowServer/WSAPITypes.h> #include <WindowServer/WSClientConnection.h> diff --git a/Servers/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h index 25d27179e3..a50d505349 100644 --- a/Servers/WindowServer/WSMenu.h +++ b/Servers/WindowServer/WSMenu.h @@ -4,7 +4,7 @@ #include <AK/Vector.h> #include <AK/WeakPtr.h> #include <LibCore/CObject.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> #include <WindowServer/WSMenuItem.h> class WSClientConnection; diff --git a/Servers/WindowServer/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h index 0b29d361ba..4489e332d2 100644 --- a/Servers/WindowServer/WSMenuItem.h +++ b/Servers/WindowServer/WSMenuItem.h @@ -2,7 +2,7 @@ #include <AK/AKString.h> #include <AK/Function.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class WSMenu; diff --git a/Servers/WindowServer/WSMenuManager.cpp b/Servers/WindowServer/WSMenuManager.cpp index 50a88f274c..90cf29189b 100644 --- a/Servers/WindowServer/WSMenuManager.cpp +++ b/Servers/WindowServer/WSMenuManager.cpp @@ -1,6 +1,6 @@ #include <LibCore/CTimer.h> -#include <SharedGraphics/Font.h> -#include <SharedGraphics/Painter.h> +#include <LibDraw/Font.h> +#include <LibDraw/Painter.h> #include <WindowServer/WSMenuBarKeeper.h> #include <WindowServer/WSWindowManager.h> #include <time.h> diff --git a/Servers/WindowServer/WSScreen.h b/Servers/WindowServer/WSScreen.h index 6a9d492821..59ef14456c 100644 --- a/Servers/WindowServer/WSScreen.h +++ b/Servers/WindowServer/WSScreen.h @@ -1,9 +1,9 @@ #pragma once #include <Kernel/KeyCode.h> -#include <SharedGraphics/Color.h> -#include <SharedGraphics/Rect.h> -#include <SharedGraphics/Size.h> +#include <LibDraw/Color.h> +#include <LibDraw/Rect.h> +#include <LibDraw/Size.h> class WSScreen { public: diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h index c3db207f60..07a022244d 100644 --- a/Servers/WindowServer/WSWindow.h +++ b/Servers/WindowServer/WSWindow.h @@ -3,9 +3,9 @@ #include <AK/AKString.h> #include <AK/InlineLinkedList.h> #include <LibCore/CObject.h> -#include <SharedGraphics/DisjointRectSet.h> -#include <SharedGraphics/GraphicsBitmap.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/DisjointRectSet.h> +#include <LibDraw/GraphicsBitmap.h> +#include <LibDraw/Rect.h> #include <WindowServer/WSWindowFrame.h> #include <WindowServer/WSWindowType.h> diff --git a/Servers/WindowServer/WSWindowFrame.cpp b/Servers/WindowServer/WSWindowFrame.cpp index 09b2cecc7b..340ebebd32 100644 --- a/Servers/WindowServer/WSWindowFrame.cpp +++ b/Servers/WindowServer/WSWindowFrame.cpp @@ -1,7 +1,7 @@ -#include <SharedGraphics/CharacterBitmap.h> -#include <SharedGraphics/Font.h> -#include <SharedGraphics/Painter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/CharacterBitmap.h> +#include <LibDraw/Font.h> +#include <LibDraw/Painter.h> +#include <LibDraw/StylePainter.h> #include <WindowServer/WSButton.h> #include <WindowServer/WSCompositor.h> #include <WindowServer/WSEvent.h> diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp index cb5522186e..eaa6608883 100644 --- a/Servers/WindowServer/WSWindowManager.cpp +++ b/Servers/WindowServer/WSWindowManager.cpp @@ -10,11 +10,11 @@ #include <AK/StdLibExtras.h> #include <AK/Vector.h> #include <LibCore/CTimer.h> -#include <SharedGraphics/CharacterBitmap.h> -#include <SharedGraphics/Font.h> -#include <SharedGraphics/PNGLoader.h> -#include <SharedGraphics/Painter.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/CharacterBitmap.h> +#include <LibDraw/Font.h> +#include <LibDraw/PNGLoader.h> +#include <LibDraw/Painter.h> +#include <LibDraw/StylePainter.h> #include <WindowServer/WSAPITypes.h> #include <WindowServer/WSButton.h> #include <WindowServer/WSClientConnection.h> diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h index eaadf75d57..da48011de8 100644 --- a/Servers/WindowServer/WSWindowManager.h +++ b/Servers/WindowServer/WSWindowManager.h @@ -6,10 +6,10 @@ #include <AK/WeakPtr.h> #include <LibCore/CConfigFile.h> #include <LibCore/CElapsedTimer.h> -#include <SharedGraphics/Color.h> -#include <SharedGraphics/DisjointRectSet.h> -#include <SharedGraphics/Painter.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Color.h> +#include <LibDraw/DisjointRectSet.h> +#include <LibDraw/Painter.h> +#include <LibDraw/Rect.h> #include <WindowServer/WSCursor.h> #include <WindowServer/WSEvent.h> #include <WindowServer/WSMenuBar.h> diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp index 6e91f58bef..8123027f9b 100644 --- a/Servers/WindowServer/WSWindowSwitcher.cpp +++ b/Servers/WindowServer/WSWindowSwitcher.cpp @@ -1,5 +1,5 @@ -#include <SharedGraphics/Font.h> -#include <SharedGraphics/StylePainter.h> +#include <LibDraw/Font.h> +#include <LibDraw/StylePainter.h> #include <WindowServer/WSEvent.h> #include <WindowServer/WSScreen.h> #include <WindowServer/WSWindowManager.h> diff --git a/Servers/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h index 1feed2625c..4c9764f668 100644 --- a/Servers/WindowServer/WSWindowSwitcher.h +++ b/Servers/WindowServer/WSWindowSwitcher.h @@ -3,7 +3,7 @@ #include <AK/Vector.h> #include <AK/WeakPtr.h> #include <LibCore/CObject.h> -#include <SharedGraphics/Rect.h> +#include <LibDraw/Rect.h> class Painter; class WSKeyEvent; diff --git a/SharedGraphics/install.sh b/SharedGraphics/install.sh deleted file mode 100755 index 5b19415f9d..0000000000 --- a/SharedGraphics/install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -mkdir -p ../Root/usr/include/SharedGraphics/ -cp *.h ../Root/usr/include/SharedGraphics/ diff --git a/Userland/Makefile b/Userland/Makefile index e56242e7e2..7a52b5c449 100644 --- a/Userland/Makefile +++ b/Userland/Makefile @@ -19,7 +19,7 @@ clean: $(APPS) : % : %.o $(OBJS) @echo "LD $@" - @$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -laudio -lcore + @$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -ldraw -laudio -lcore %.o: %.cpp @echo "CXX $<" diff --git a/Userland/guitest2.cpp b/Userland/guitest2.cpp index 21ce0fd2a5..dc3f1e5063 100644 --- a/Userland/guitest2.cpp +++ b/Userland/guitest2.cpp @@ -9,7 +9,7 @@ #include <LibGUI/GTextBox.h> #include <LibGUI/GWidget.h> #include <LibGUI/GWindow.h> -#include <SharedGraphics/GraphicsBitmap.h> +#include <LibDraw/GraphicsBitmap.h> #include <assert.h> #include <errno.h> #include <fcntl.h> |