RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:57:44 +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

16
Servers/WindowServer/Makefile
View file

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

4
Servers/WindowServer/WSAPITypes.h
View file

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

6
Servers/WindowServer/WSButton.cpp
View file

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

2
Servers/WindowServer/WSButton.h
View file

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

2
Servers/WindowServer/WSClientConnection.h
View file

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

6
Servers/WindowServer/WSCompositor.cpp
View file

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

4
Servers/WindowServer/WSCompositor.h
View file

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

2
Servers/WindowServer/WSCursor.h
View file

@ -1,6 +1,6 @@
#pragma once
#include <SharedGraphics/GraphicsBitmap.h>
#include <LibDraw/GraphicsBitmap.h>
enum class WSStandardCursor {
None = 0,

4
Servers/WindowServer/WSEvent.h
View file

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

8
Servers/WindowServer/WSMenu.cpp
View file

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

2
Servers/WindowServer/WSMenu.h
View file

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

2
Servers/WindowServer/WSMenuItem.h
View file

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

4
Servers/WindowServer/WSMenuManager.cpp
View file

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

6
Servers/WindowServer/WSScreen.h
View file

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

6
Servers/WindowServer/WSWindow.h
View file

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

8
Servers/WindowServer/WSWindowFrame.cpp
View file

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

10
Servers/WindowServer/WSWindowManager.cpp
View file

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

8
Servers/WindowServer/WSWindowManager.h
View file

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

4
Servers/WindowServer/WSWindowSwitcher.cpp
View file

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

2
Servers/WindowServer/WSWindowSwitcher.h
View file

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