RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:58:11 +00:00
Code Issues Activity Actions

LibDraw: Introduce (formerly known as SharedGraphics.)

Browse source 
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. :^)
This commit is contained in:
Andreas Kling 2019-07-18 10:15:00 +02:00
parent 2167f60235
commit 1c0669f010
120 changed files with 201 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/IRCClient/IRCLogBuffer.h
View file

@ -4,7 +4,7 @@
#include <AK/CircularQueue.h> #include <AK/CircularQueue.h>
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <SharedGraphics/Color.h> #include <LibDraw/Color.h>
class IRCLogBufferModel; class IRCLogBufferModel;

2
Applications/IRCClient/IRCLogBufferModel.cpp
View file

@ -1,6 +1,6 @@
#include "IRCLogBufferModel.h" #include "IRCLogBufferModel.h"
#include "IRCLogBuffer.h" #include "IRCLogBuffer.h"
#include <SharedGraphics/Font.h> #include <LibDraw/Font.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>

2
Applications/Launcher/main.cpp
View file

@ -5,7 +5,7 @@
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>

2
Applications/Makefile.common
View file

@ -3,7 +3,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -laudio -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Applications/PaintBrush/BucketTool.cpp
View file

@ -3,7 +3,7 @@
#include <AK/Queue.h> #include <AK/Queue.h>
#include <AK/SinglyLinkedList.h> #include <AK/SinglyLinkedList.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <stdio.h> #include <stdio.h>
BucketTool::BucketTool() BucketTool::BucketTool()

2
Applications/PaintBrush/EraseTool.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Tool.h" #include "Tool.h"
#include <SharedGraphics/Point.h> #include <LibDraw/Point.h>
class GMenu; class GMenu;

2
Applications/PaintBrush/PaintableWidget.cpp
View file

@ -1,7 +1,7 @@
#include "PaintableWidget.h" #include "PaintableWidget.h"
#include "Tool.h" #include "Tool.h"
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
static PaintableWidget* s_the; static PaintableWidget* s_the;

2
Applications/PaintBrush/PenTool.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Tool.h" #include "Tool.h"
#include <SharedGraphics/Point.h> #include <LibDraw/Point.h>
class GMenu; class GMenu;

2
Applications/PaintBrush/PickerTool.cpp
View file

@ -1,5 +1,5 @@
#include "PickerTool.h" #include "PickerTool.h"
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
PickerTool::PickerTool() PickerTool::PickerTool()
{ {

2
Applications/PaintBrush/SprayTool.cpp
View file

@ -5,7 +5,7 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GAction.h> #include <LibGUI/GAction.h>
#include <LibGUI/GMenu.h> #include <LibGUI/GMenu.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <stdio.h> #include <stdio.h>
#include <LibM/math.h> #include <LibM/math.h>

2
Applications/PaintBrush/ToolboxWidget.cpp
View file

@ -7,7 +7,7 @@
#include "EraseTool.h" #include "EraseTool.h"
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
class ToolButton final : public GButton { class ToolButton final : public GButton {
public: public:

2
Applications/PaintBrush/main.cpp
View file

@ -9,7 +9,7 @@
#include <LibGUI/GMenuBar.h> #include <LibGUI/GMenuBar.h>
#include <LibGUI/GMessageBox.h> #include <LibGUI/GMessageBox.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {

16
Applications/Piano/Makefile
View file

@ -6,18 +6,4 @@ OBJS = \
APP = Piano APP = Piano
DEFINES += -DUSERLAND include ../Makefile.common
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

2
Applications/Piano/PianoWidget.cpp
View file

@ -1,7 +1,7 @@
#include "PianoWidget.h" #include "PianoWidget.h"
#include <AK/Queue.h> #include <AK/Queue.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <math.h> #include <math.h>
PianoWidget::PianoWidget() PianoWidget::PianoWidget()

2
Applications/ProcessManager/MemoryStatsWidget.cpp
View file

@ -4,7 +4,7 @@
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GLabel.h> #include <LibGUI/GLabel.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
Applications/QuickShow/QSWidget.cpp
View file

@ -1,6 +1,6 @@
#include "QSWidget.h" #include "QSWidget.h"
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
QSWidget::QSWidget(GWidget* parent) QSWidget::QSWidget(GWidget* parent)
: GFrame(parent) : GFrame(parent)

2
Applications/QuickShow/main.cpp
View file

@ -6,7 +6,7 @@
#include <LibGUI/GMenu.h> #include <LibGUI/GMenu.h>
#include <LibGUI/GMenuBar.h> #include <LibGUI/GMenuBar.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
#include <stdio.h> #include <stdio.h>
int main(int argc, char** argv) int main(int argc, char** argv)

2
Applications/Taskbar/WindowList.h
View file

@ -4,7 +4,7 @@
#include <AK/AKString.h> #include <AK/AKString.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class Window { class Window {
public: public:

2
Applications/Terminal/Terminal.cpp
View file

@ -8,7 +8,7 @@
#include <LibGUI/GClipboard.h> #include <LibGUI/GClipboard.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/Font.h> #include <LibDraw/Font.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
Applications/Terminal/Terminal.h
View file

@ -7,8 +7,8 @@
#include <LibCore/CNotifier.h> #include <LibCore/CNotifier.h>
#include <LibCore/CTimer.h> #include <LibCore/CTimer.h>
#include <LibGUI/GFrame.h> #include <LibGUI/GFrame.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class Font; class Font;

2
Demos/Fire/Fire.cpp
View file

@ -21,7 +21,7 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>

2
Demos/Fire/Makefile
View file

@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Demos/HelloWorld/Makefile
View file

@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Demos/HelloWorld2/Makefile
View file

@ -15,7 +15,7 @@ UI_HelloWorld2.h: HelloWorld2.frm
../../DevTools/FormCompiler/FormCompiler $< > $@ ../../DevTools/FormCompiler/FormCompiler $< > $@
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Demos/PaintTest/Makefile
View file

@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Demos/PaintTest/main.cpp
View file

@ -2,7 +2,7 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
class TestWidget final : public GWidget { class TestWidget final : public GWidget {
public: public:

2
Demos/WidgetGallery/Makefile
View file

@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
DevTools/VisualBuilder/Makefile
View file

@ -16,7 +16,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
DevTools/VisualBuilder/VBWidget.h
View file

@ -6,7 +6,7 @@
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/NonnullRefPtr.h> #include <AK/NonnullRefPtr.h>
#include <AK/Weakable.h> #include <AK/Weakable.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class GPainter; class GPainter;
class GVariant; class GVariant;

2
DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
View file

@ -1,7 +1,7 @@
#include "VBWidgetPropertyModel.h" #include "VBWidgetPropertyModel.h"
#include "VBProperty.h" #include "VBProperty.h"
#include "VBWidget.h" #include "VBWidget.h"
#include <SharedGraphics/Font.h> #include <LibDraw/Font.h>
VBWidgetPropertyModel::VBWidgetPropertyModel(VBWidget& widget) VBWidgetPropertyModel::VBWidgetPropertyModel(VBWidget& widget)
: m_widget(widget) : m_widget(widget)

2
Games/Minesweeper/Makefile
View file

@ -11,7 +11,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Games/Snake/Makefile
View file

@ -11,7 +11,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Games/Snake/SnakeGame.cpp
View file

@ -1,7 +1,7 @@
#include "SnakeGame.h" #include "SnakeGame.h"
#include <LibGUI/GFontDatabase.h> #include <LibGUI/GFontDatabase.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>

2
Kernel/Devices/BXVGADevice.h
View file

@ -4,7 +4,7 @@
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <Kernel/VM/PhysicalAddress.h> #include <Kernel/VM/PhysicalAddress.h>
#include <SharedGraphics/Size.h> #include <LibDraw/Size.h>
class BXVGADevice final : public BlockDevice { class BXVGADevice final : public BlockDevice {
AK_MAKE_ETERNAL AK_MAKE_ETERNAL

2
Kernel/makeall.sh
View file

@ -18,6 +18,7 @@ build_targets="$build_targets ../DevTools/FormCompiler"
build_targets="$build_targets ../Libraries/LibC" build_targets="$build_targets ../Libraries/LibC"
build_targets="$build_targets ../Libraries/LibM" build_targets="$build_targets ../Libraries/LibM"
build_targets="$build_targets ../Libraries/LibCore" build_targets="$build_targets ../Libraries/LibCore"
build_targets="$build_targets ../Libraries/LibDraw"
build_targets="$build_targets ../Libraries/LibAudio" build_targets="$build_targets ../Libraries/LibAudio"
build_targets="$build_targets ../Servers/SystemServer" build_targets="$build_targets ../Servers/SystemServer"
build_targets="$build_targets ../Servers/LookupServer" build_targets="$build_targets ../Servers/LookupServer"
@ -64,7 +65,6 @@ for targ in $build_targets; do
done done
# has no need to build separately, but install headers. # has no need to build separately, but install headers.
(cd ../SharedGraphics && ./install.sh)
(cd ../AK && ./install.sh) (cd ../AK && ./install.sh)
sudo -E ./build-image-qemu.sh sudo -E ./build-image-qemu.sh

2
Libraries/LibCore/CConfigFile.h
View file

@ -5,7 +5,7 @@
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <SharedGraphics/Color.h> #include <LibDraw/Color.h>
class CConfigFile : public RefCounted<CConfigFile> { class CConfigFile : public RefCounted<CConfigFile> {
public: public:

0
SharedGraphics/CharacterBitmap.cpp → Libraries/LibDraw/CharacterBitmap.cpp
View file

0
SharedGraphics/CharacterBitmap.h → Libraries/LibDraw/CharacterBitmap.h
View file

0
SharedGraphics/Color.cpp → Libraries/LibDraw/Color.cpp
View file

0
SharedGraphics/Color.h → Libraries/LibDraw/Color.h
View file

2
SharedGraphics/DisjointRectSet.cpp → Libraries/LibDraw/DisjointRectSet.cpp
View file

@ -1,4 +1,4 @@
#include <SharedGraphics/DisjointRectSet.h> #include <LibDraw/DisjointRectSet.h>
void DisjointRectSet::add(const Rect& new_rect) void DisjointRectSet::add(const Rect& new_rect)
{ {

2
SharedGraphics/DisjointRectSet.h → Libraries/LibDraw/DisjointRectSet.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <AK/Vector.h> #include <AK/Vector.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class DisjointRectSet { class DisjointRectSet {
public: public:

0
SharedGraphics/Font.cpp → Libraries/LibDraw/Font.cpp
View file

2
SharedGraphics/Font.h → Libraries/LibDraw/Font.h
View file

@ -5,7 +5,7 @@
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
// FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead? // FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead?
class GlyphBitmap { class GlyphBitmap {

4
SharedGraphics/GraphicsBitmap.cpp → Libraries/LibDraw/GraphicsBitmap.cpp
View file

@ -1,6 +1,6 @@
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>

0
SharedGraphics/GraphicsBitmap.h → Libraries/LibDraw/GraphicsBitmap.h
View file

35
Libraries/LibDraw/Makefile Normal file
View file

@ -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

4
SharedGraphics/PNGLoader.cpp → Libraries/LibDraw/PNGLoader.cpp
View file

@ -1,8 +1,8 @@
#include <AK/FileSystemPath.h> #include <AK/FileSystemPath.h>
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <AK/NetworkOrdered.h> #include <AK/NetworkOrdered.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
#include <SharedGraphics/puff.c> #include <LibDraw/puff.c>
#include <fcntl.h> #include <fcntl.h>
#include <serenity.h> #include <serenity.h>
#include <stdio.h> #include <stdio.h>

2
SharedGraphics/PNGLoader.h → Libraries/LibDraw/PNGLoader.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
RefPtr<GraphicsBitmap> load_png(const StringView& path); RefPtr<GraphicsBitmap> load_png(const StringView& path);

2
SharedGraphics/Painter.cpp → Libraries/LibDraw/Painter.cpp
View file

@ -4,7 +4,7 @@
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/StdLibExtras.h> #include <AK/StdLibExtras.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <SharedGraphics/CharacterBitmap.h> #include <LibDraw/CharacterBitmap.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>

4
SharedGraphics/Painter.h → Libraries/LibDraw/Painter.h
View file

@ -5,8 +5,8 @@
#include "Rect.h" #include "Rect.h"
#include "Size.h" #include "Size.h"
#include <AK/AKString.h> #include <AK/AKString.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
#include <SharedGraphics/TextElision.h> #include <LibDraw/TextElision.h>
class CharacterBitmap; class CharacterBitmap;
class GlyphBitmap; class GlyphBitmap;

0
SharedGraphics/Point.h → Libraries/LibDraw/Point.h
View file

0
SharedGraphics/Rect.cpp → Libraries/LibDraw/Rect.cpp
View file

6
SharedGraphics/Rect.h → Libraries/LibDraw/Rect.h
View file

@ -2,9 +2,9 @@
#include <AK/AKString.h> #include <AK/AKString.h>
#include <AK/LogStream.h> #include <AK/LogStream.h>
#include <SharedGraphics/Point.h> #include <LibDraw/Point.h>
#include <SharedGraphics/Size.h> #include <LibDraw/Size.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
struct WSAPI_Rect; struct WSAPI_Rect;

0
SharedGraphics/Size.h → Libraries/LibDraw/Size.h
View file

4
SharedGraphics/StylePainter.cpp → Libraries/LibDraw/StylePainter.cpp
View file

@ -1,5 +1,5 @@
#include <LibGUI/GPainter.h> #include <LibDraw/Painter.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, bool active, bool hovered, bool enabled) void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, bool active, bool hovered, bool enabled)
{ {

0
SharedGraphics/StylePainter.h → Libraries/LibDraw/StylePainter.h
View file

0
SharedGraphics/TextAlignment.h → Libraries/LibDraw/TextAlignment.h
View file

0
SharedGraphics/TextElision.h → Libraries/LibDraw/TextElision.h
View file

4
Libraries/LibDraw/install.sh Executable file
View file

@ -0,0 +1,4 @@
#!/bin/bash
mkdir -p ../Root/usr/include/LibGfx/
cp *.h ../Root/usr/include/LibGfx/

0
SharedGraphics/puff.c → Libraries/LibDraw/puff.c
View file

0
SharedGraphics/puff.h → Libraries/LibDraw/puff.h
View file

2
Libraries/LibGUI/GAbstractButton.h
View file

@ -2,7 +2,7 @@
#include <LibCore/CTimer.h> #include <LibCore/CTimer.h>
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
class GPainter; class GPainter;

2
Libraries/LibGUI/GAction.h
View file

@ -9,7 +9,7 @@
#include <AK/WeakPtr.h> #include <AK/WeakPtr.h>
#include <AK/Weakable.h> #include <AK/Weakable.h>
#include <LibGUI/GShortcut.h> #include <LibGUI/GShortcut.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
class GActionGroup; class GActionGroup;
class GButton; class GButton;

2
Libraries/LibGUI/GButton.cpp
View file

@ -4,7 +4,7 @@
#include <LibGUI/GActionGroup.h> #include <LibGUI/GActionGroup.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
GButton::GButton(GWidget* parent) GButton::GButton(GWidget* parent)
: GAbstractButton(parent) : GAbstractButton(parent)

6
Libraries/LibGUI/GButton.h
View file

@ -3,9 +3,9 @@
#include <AK/AKString.h> #include <AK/AKString.h>
#include <AK/Function.h> #include <AK/Function.h>
#include <LibGUI/GAbstractButton.h> #include <LibGUI/GAbstractButton.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
class GAction; class GAction;

4
Libraries/LibGUI/GCheckBox.cpp
View file

@ -1,8 +1,8 @@
#include <Kernel/KeyCode.h> #include <Kernel/KeyCode.h>
#include <LibGUI/GCheckBox.h> #include <LibGUI/GCheckBox.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/CharacterBitmap.h> #include <LibDraw/CharacterBitmap.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
static const char* s_checked_bitmap_data = { static const char* s_checked_bitmap_data = {
" " " "

2
Libraries/LibGUI/GDesktop.h
View file

@ -3,7 +3,7 @@
#include <AK/AKString.h> #include <AK/AKString.h>
#include <AK/Badge.h> #include <AK/Badge.h>
#include <AK/Function.h> #include <AK/Function.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class GWindowServerConnection; class GWindowServerConnection;

2
Libraries/LibGUI/GDirectoryModel.cpp
View file

@ -4,7 +4,7 @@
#include <LibCore/CDirIterator.h> #include <LibCore/CDirIterator.h>
#include <LibCore/CLock.h> #include <LibCore/CLock.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <dirent.h> #include <dirent.h>
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>

4
Libraries/LibGUI/GEvent.h
View file

@ -3,8 +3,8 @@
#include <Kernel/KeyCode.h> #include <Kernel/KeyCode.h>
#include <LibCore/CEvent.h> #include <LibCore/CEvent.h>
#include <LibGUI/GWindowType.h> #include <LibGUI/GWindowType.h>
#include <SharedGraphics/Point.h> #include <LibDraw/Point.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class CObject; class CObject;

2
Libraries/LibGUI/GFilePicker.cpp
View file

@ -11,7 +11,7 @@
#include <LibGUI/GSortingProxyModel.h> #include <LibGUI/GSortingProxyModel.h>
#include <LibGUI/GTextBox.h> #include <LibGUI/GTextBox.h>
#include <LibGUI/GToolBar.h> #include <LibGUI/GToolBar.h>
#include <SharedGraphics/PNGLoader.h> #include <LibDraw/PNGLoader.h>
Optional<String> GFilePicker::get_open_filepath() Optional<String> GFilePicker::get_open_filepath()
{ {

2
Libraries/LibGUI/GFontDatabase.cpp
View file

@ -1,6 +1,6 @@
#include <LibCore/CDirIterator.h> #include <LibCore/CDirIterator.h>
#include <LibGUI/GFontDatabase.h> #include <LibGUI/GFontDatabase.h>
#include <SharedGraphics/Font.h> #include <LibDraw/Font.h>
#include <dirent.h> #include <dirent.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
Libraries/LibGUI/GFrame.cpp
View file

@ -1,6 +1,6 @@
#include <LibGUI/GFrame.h> #include <LibGUI/GFrame.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
GFrame::GFrame(GWidget* parent) GFrame::GFrame(GWidget* parent)
: GWidget(parent) : GWidget(parent)

2
Libraries/LibGUI/GFrame.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
class GFrame : public GWidget { class GFrame : public GWidget {
public: public:

2
Libraries/LibGUI/GGroupBox.cpp
View file

@ -1,6 +1,6 @@
#include <LibGUI/GGroupBox.h> #include <LibGUI/GGroupBox.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
GGroupBox::GGroupBox(GWidget* parent) GGroupBox::GGroupBox(GWidget* parent)
: GGroupBox({}, parent) : GGroupBox({}, parent)

2
Libraries/LibGUI/GIcon.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
class GIconImpl : public RefCounted<GIconImpl> { class GIconImpl : public RefCounted<GIconImpl> {
public: public:

2
Libraries/LibGUI/GLabel.cpp
View file

@ -1,6 +1,6 @@
#include "GLabel.h" #include "GLabel.h"
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
GLabel::GLabel(GWidget* parent) GLabel::GLabel(GWidget* parent)
: GFrame(parent) : GFrame(parent)

2
Libraries/LibGUI/GLabel.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <LibGUI/GFrame.h> #include <LibGUI/GFrame.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
class GraphicsBitmap; class GraphicsBitmap;

2
Libraries/LibGUI/GModel.h
View file

@ -7,7 +7,7 @@
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <LibGUI/GModelIndex.h> #include <LibGUI/GModelIndex.h>
#include <LibGUI/GVariant.h> #include <LibGUI/GVariant.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
class Font; class Font;
class GAbstractView; class GAbstractView;

2
Libraries/LibGUI/GPainter.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <SharedGraphics/Painter.h> #include <LibDraw/Painter.h>
class GWidget; class GWidget;
class GraphicsBitmap; class GraphicsBitmap;

2
Libraries/LibGUI/GRadioButton.cpp
View file

@ -1,6 +1,6 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GRadioButton.h> #include <LibGUI/GRadioButton.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
static RefPtr<GraphicsBitmap> s_unfilled_circle_bitmap; static RefPtr<GraphicsBitmap> s_unfilled_circle_bitmap;
static RefPtr<GraphicsBitmap> s_filled_circle_bitmap; static RefPtr<GraphicsBitmap> s_filled_circle_bitmap;

2
Libraries/LibGUI/GResizeCorner.cpp
View file

@ -1,7 +1,7 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GResizeCorner.h> #include <LibGUI/GResizeCorner.h>
#include <LibGUI/GWindow.h> #include <LibGUI/GWindow.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <WindowServer/WSAPITypes.h> #include <WindowServer/WSAPITypes.h>
GResizeCorner::GResizeCorner(GWidget* parent) GResizeCorner::GResizeCorner(GWidget* parent)

6
Libraries/LibGUI/GScrollBar.cpp
View file

@ -1,8 +1,8 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GScrollBar.h> #include <LibGUI/GScrollBar.h>
#include <SharedGraphics/CharacterBitmap.h> #include <LibDraw/CharacterBitmap.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
static const char* s_up_arrow_bitmap_data = { static const char* s_up_arrow_bitmap_data = {
" " " "

2
Libraries/LibGUI/GSlider.cpp
View file

@ -1,6 +1,6 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GSlider.h> #include <LibGUI/GSlider.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
GSlider::GSlider(GWidget* parent) GSlider::GSlider(GWidget* parent)
: GWidget(parent) : GWidget(parent)

2
Libraries/LibGUI/GStatusBar.cpp
View file

@ -3,7 +3,7 @@
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GResizeCorner.h> #include <LibGUI/GResizeCorner.h>
#include <LibGUI/GStatusBar.h> #include <LibGUI/GStatusBar.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
GStatusBar::GStatusBar(GWidget* parent) GStatusBar::GStatusBar(GWidget* parent)
: GWidget(parent) : GWidget(parent)

2
Libraries/LibGUI/GTabWidget.cpp
View file

@ -1,7 +1,7 @@
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GTabWidget.h> #include <LibGUI/GTabWidget.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
GTabWidget::GTabWidget(GWidget* parent) GTabWidget::GTabWidget(GWidget* parent)
: GWidget(parent) : GWidget(parent)

2
Libraries/LibGUI/GTextEditor.h
View file

@ -3,7 +3,7 @@
#include <AK/Function.h> #include <AK/Function.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <LibGUI/GScrollableWidget.h> #include <LibGUI/GScrollableWidget.h>
#include <SharedGraphics/TextAlignment.h> #include <LibDraw/TextAlignment.h>
class GAction; class GAction;
class GMenu; class GMenu;

2
Libraries/LibGUI/GVariant.h
View file

@ -2,7 +2,7 @@
#include <AK/AKString.h> #include <AK/AKString.h>
#include <LibGUI/GIcon.h> #include <LibGUI/GIcon.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
namespace AK { namespace AK {
class JsonValue; class JsonValue;

2
Libraries/LibGUI/GWidget.cpp
View file

@ -8,7 +8,7 @@
#include <LibGUI/GLayout.h> #include <LibGUI/GLayout.h>
#include <LibGUI/GMenu.h> #include <LibGUI/GMenu.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <unistd.h> #include <unistd.h>
GWidget::GWidget(GWidget* parent) GWidget::GWidget(GWidget* parent)

6
Libraries/LibGUI/GWidget.h
View file

@ -7,9 +7,9 @@
#include <LibCore/CObject.h> #include <LibCore/CObject.h>
#include <LibGUI/GEvent.h> #include <LibGUI/GEvent.h>
#include <LibGUI/GShortcut.h> #include <LibGUI/GShortcut.h>
#include <SharedGraphics/Color.h> #include <LibDraw/Color.h>
#include <SharedGraphics/Font.h> #include <LibDraw/Font.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class GraphicsBitmap; class GraphicsBitmap;
class GAction; class GAction;

2
Libraries/LibGUI/GWindow.cpp
View file

@ -8,7 +8,7 @@
#include <LibC/stdlib.h> #include <LibC/stdlib.h>
#include <LibC/unistd.h> #include <LibC/unistd.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
//#define UPDATE_COALESCING_DEBUG //#define UPDATE_COALESCING_DEBUG

4
Libraries/LibGUI/GWindow.h
View file

@ -5,8 +5,8 @@
#include <AK/WeakPtr.h> #include <AK/WeakPtr.h>
#include <LibCore/CObject.h> #include <LibCore/CObject.h>
#include <LibGUI/GWindowType.h> #include <LibGUI/GWindowType.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class GWidget; class GWidget;
class GWMEvent; class GWMEvent;

14
Libraries/LibGUI/Makefile
View file

@ -1,16 +1,6 @@
include ../../Makefile.common include ../../Makefile.common
SHAREDGRAPHICS_OBJS = \ 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 = \
GPainter.o \ GPainter.o \
GButton.o \ GButton.o \
GCheckBox.o \ GCheckBox.o \
@ -64,8 +54,6 @@ LIBGUI_OBJS = \
GComboBox.o \ GComboBox.o \
GWindow.o GWindow.o
OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS)
LIBRARY = libgui.a LIBRARY = libgui.a
DEFINES += -DUSERLAND DEFINES += -DUSERLAND

2
Libraries/LibHTML/Frame.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <LibHTML/DOM/Document.h> #include <LibHTML/DOM/Document.h>
#include <SharedGraphics/Size.h> #include <LibDraw/Size.h>
class Frame { class Frame {
public: public:

4
Libraries/LibHTML/Layout/ComputedStyle.h
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <LibHTML/CSS/LengthBox.h> #include <LibHTML/CSS/LengthBox.h>
#include <SharedGraphics/Color.h> #include <LibDraw/Color.h>
#include <SharedGraphics/Size.h> #include <LibDraw/Size.h>
enum FontStyle { enum FontStyle {
Normal, Normal,

2
Libraries/LibHTML/Layout/LayoutNode.h
View file

@ -4,7 +4,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibHTML/Layout/ComputedStyle.h> #include <LibHTML/Layout/ComputedStyle.h>
#include <LibHTML/TreeNode.h> #include <LibHTML/TreeNode.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
class Node; class Node;
class LayoutBlock; class LayoutBlock;

18
Makefile.common
View file

@ -7,8 +7,22 @@ OPTIMIZATION_FLAGS = -Os
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
SERENITY_BASE_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH))) 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 INCLUDE_FLAGS = \
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 -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 CLANG_FLAGS = -Wconsumed -m32 -ffreestanding -march=i686
#SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn #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) CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(SUGGEST_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)

16
Servers/WindowServer/Makefile
View file

@ -1,17 +1,6 @@
include ../../Makefile.common include ../../Makefile.common
SHAREDGRAPHICS_OBJS = \ 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 = \
WSEventLoop.o \ WSEventLoop.o \
WSWindow.o \ WSWindow.o \
WSWindowManager.o \ WSWindowManager.o \
@ -31,14 +20,13 @@ WINDOWSERVER_OBJS = \
main.o main.o
APP = WindowServer APP = WindowServer
OBJS = $(SHAREDGRAPHICS_OBJS) $(WINDOWSERVER_OBJS)
DEFINES += -DUSERLAND DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -ldraw
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

4
Servers/WindowServer/WSAPITypes.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <SharedGraphics/Color.h> #include <LibDraw/Color.h>
#include <SharedGraphics/Rect.h> #include <LibDraw/Rect.h>
typedef unsigned WSAPI_Color; typedef unsigned WSAPI_Color;

6
Servers/WindowServer/WSButton.cpp
View file

@ -1,6 +1,6 @@
#include <SharedGraphics/CharacterBitmap.h> #include <LibDraw/CharacterBitmap.h>
#include <SharedGraphics/Painter.h> #include <LibDraw/Painter.h>
#include <SharedGraphics/StylePainter.h> #include <LibDraw/StylePainter.h>
#include <WindowServer/WSButton.h> #include <WindowServer/WSButton.h>
#include <WindowServer/WSEvent.h> #include <WindowServer/WSEvent.h>
#include <WindowServer/WSWindowManager.h> #include <WindowServer/WSWindowManager.h>

Some files were not shown because too many files have changed in this diff Show more