beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
ladybird/Libraries/LibGfx/Painter.h

168 lines
8.5 KiB
C
Raw Normal View History

Meta: Add license header to source files As suggested by Joshua, this commit adds the 2-clause BSD license as a comment block to the top of every source file. For the first pass, I've just added myself for simplicity. I encourage everyone to add themselves as copyright holders of any file they've added or modified in some significant way. If I've added myself in error somewhere, feel free to replace it with the appropriate copyright holder instead. Going forward, all new source files should include a license header.
2020-01-18 08:38:21 +00:00
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
Intense hacking on Widgets.
2018-10-10 14:49:36 +00:00
#pragma once
LibGfx: More work on header dependency reduction
2020-02-14 22:28:42 +00:00
#include <AK/Forward.h>
LibGfx: Move a bunch of LogStream::operator<< to cpp files
2020-02-14 23:58:14 +00:00
#include <AK/NonnullRefPtr.h>
AK: Add a forward declaration header You can now #include <AK/Forward.h> to get most of the AK types as forward declarations. Header dependency explosion is one of the main contributors to compile times at the moment, so this is a step towards smaller include graphs.
2020-02-14 20:41:10 +00:00
#include <AK/Vector.h>
#include <LibGfx/Color.h>
LibGfx: More work on header dependency reduction
2020-02-14 22:28:42 +00:00
#include <LibGfx/Forward.h>
AK: Add a forward declaration header You can now #include <AK/Forward.h> to get most of the AK types as forward declarations. Header dependency explosion is one of the main contributors to compile times at the moment, so this is a step towards smaller include graphs.
2020-02-14 20:41:10 +00:00
#include <LibGfx/Point.h>
#include <LibGfx/Rect.h>
#include <LibGfx/Size.h>
LibGfx: Rename from LibDraw :^)
2020-02-06 11:04:00 +00:00
#include <LibGfx/TextAlignment.h>
#include <LibGfx/TextElision.h>
Intense hacking on Widgets.
2018-10-10 14:49:36 +00:00
LibDraw: Put all classes in the Gfx namespace I started adding things to a Draw namespace, but it somehow felt really wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename the library to LibGfx. :^)
2020-02-06 10:56:38 +00:00
namespace Gfx {
Intense hacking on Widgets.
2018-10-10 14:49:36 +00:00
class Painter {
public:
LibDraw: Put all classes in the Gfx namespace I started adding things to a Draw namespace, but it somehow felt really wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename the library to LibGfx. :^)
2020-02-06 10:56:38 +00:00
explicit Painter(Gfx::Bitmap&);
Intense hacking on Widgets.
2018-10-10 14:49:36 +00:00
~Painter();
LibGfx: Replace 'bool dotted' with a LineStyle::{Solid,Dotted} enum Just a bool is insufficient as we'll have to support dashed lines as well.
2020-05-10 10:58:33 +00:00
enum class LineStyle {
Solid,
Dotted,
LibGfx: Add support for dashed lines Non-configurable for now.
2020-05-10 15:17:26 +00:00
Dashed,
LibGfx: Replace 'bool dotted' with a LineStyle::{Solid,Dotted} enum Just a bool is insufficient as we'll have to support dashed lines as well.
2020-05-10 10:58:33 +00:00
};
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void clear_rect(const IntRect&, Color);
void fill_rect(const IntRect&, Color);
void fill_rect_with_dither_pattern(const IntRect&, Color, Color);
void fill_rect_with_checkerboard(const IntRect&, const IntSize&, Color color_dark, Color color_light);
void fill_rect_with_gradient(Orientation, const IntRect&, Color gradient_start, Color gradient_end);
void fill_rect_with_gradient(const IntRect&, Color gradient_start, Color gradient_end);
void fill_ellipse(const IntRect&, Color);
void draw_rect(const IntRect&, Color, bool rough = false);
LibGUI+LibGfx: Improve focus rect appearance Draw a dotted focus rect to make it stand out more. Also make it much larger on regular text-only GUI::Buttons.
2020-10-26 19:43:59 +00:00
void draw_focus_rect(const IntRect&, Color);
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void draw_bitmap(const IntPoint&, const CharacterBitmap&, Color = Color());
void draw_bitmap(const IntPoint&, const GlyphBitmap&, Color = Color());
LibGfx: Add elliptical curves to Path
2020-07-22 06:46:15 +00:00
void draw_scaled_bitmap(const IntRect& dst_rect, const Gfx::Bitmap&, const IntRect& src_rect, float opacity = 1.0f);
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void draw_triangle(const IntPoint&, const IntPoint&, const IntPoint&, Color);
void draw_ellipse_intersecting(const IntRect&, Color, int thickness = 1);
void set_pixel(const IntPoint&, Color);
LibGUI+LibGfx: Implement upside-down appearance for bottom-side tabs GUI::TabWidget has long has a TabPosition::Bottom option, but we still rendered the tab buttons the same as TabPosition::Top. This patch implements a custom look for bottom-side tabs. I've done my best to match the look of the top-side ones, but there might be some improvements we can make here. :^)
2020-08-23 21:39:27 +00:00
void set_pixel(int x, int y, Color color) { set_pixel({ x, y }, color); }
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void draw_line(const IntPoint&, const IntPoint&, Color, int thickness = 1, LineStyle style = LineStyle::Solid);
void draw_quadratic_bezier_curve(const IntPoint& control_point, const IntPoint&, const IntPoint&, Color, int thickness = 1, LineStyle style = LineStyle::Solid);
LibGfx: Add elliptical curves to Path
2020-07-22 06:46:15 +00:00
void draw_elliptical_arc(const IntPoint& p1, const IntPoint& p2, const IntPoint& center, const FloatPoint& radii, float x_axis_rotation, float theta_1, float theta_delta, Color, int thickness = 1, LineStyle style = LineStyle::Solid);
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void blit(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect, float opacity = 1.0f);
void blit_dimmed(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect);
void blit_brightened(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect);
void blit_filtered(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect, Function<Color(Color)>);
void draw_tiled_bitmap(const IntRect& dst_rect, const Gfx::Bitmap&);
void blit_offset(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect, const IntPoint&);
void blit_scaled(const IntRect&, const Gfx::Bitmap&, const IntRect&, float, float);
LibGUI+LibGfx+WindowServer: Auto-generate disabled action icons :^) This patch adds a simple filter that makes button and menu item icons have that "'90s disabled" look when disabled. It's pretty awesome.
2020-10-27 20:17:50 +00:00
void blit_disabled(const IntPoint&, const Gfx::Bitmap&, const IntRect&, const Palette&);
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void draw_text(const IntRect&, const StringView&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);
void draw_text(const IntRect&, const StringView&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);
void draw_text(const IntRect&, const Utf32View&, const Font&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);
void draw_text(const IntRect&, const Utf32View&, TextAlignment = TextAlignment::TopLeft, Color = Color::Black, TextElision = TextElision::None);
LibGfx: Reduce code duplication in Painter::draw_text Use the same logic for all variants for Painter::draw_text. Also, add an overload that allows taking a callback function for custom gylph drawing. This allows drawing some glyphs differently in the correct location when drawing more complex strings (e.g. multi-line, elisions, etc).
2020-10-20 15:51:04 +00:00
void draw_text(Function<void(const IntRect&, u32)>, const IntRect&, const StringView&, const Font&, TextAlignment = TextAlignment::TopLeft, TextElision = TextElision::None);
void draw_text(Function<void(const IntRect&, u32)>, const IntRect&, const Utf8View&, const Font&, TextAlignment = TextAlignment::TopLeft, TextElision = TextElision::None);
void draw_text(Function<void(const IntRect&, u32)>, const IntRect&, const Utf32View&, const Font&, TextAlignment = TextAlignment::TopLeft, TextElision = TextElision::None);
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void draw_glyph(const IntPoint&, u32, Color);
void draw_glyph(const IntPoint&, u32, const Font&, Color);
void draw_emoji(const IntPoint&, const Gfx::Bitmap&, const Font&);
Unicode: Try s/codepoint/code_point/g again This time, without trailing 's'. Ran: git grep -l 'codepoint' | xargs sed -ie 's/codepoint/code_point/g
2020-08-05 20:31:20 +00:00
void draw_glyph_or_emoji(const IntPoint&, u32 code_point, const Font&, Color);
Update Painter class to the new coding style.
2019-01-12 16:02:54 +00:00
LibGfx: Implement filling paths There are some imperfections with intersecting edges (because the main algorithm used is scanline, and that is not geared towards drawing complex shapes), however, it behaves mostly fine for normal use :^)
2020-05-06 07:25:12 +00:00
static void for_each_line_segment_on_bezier_curve(const FloatPoint& control_point, const FloatPoint& p1, const FloatPoint& p2, Function<void(const FloatPoint&, const FloatPoint&)>&);
static void for_each_line_segment_on_bezier_curve(const FloatPoint& control_point, const FloatPoint& p1, const FloatPoint& p2, Function<void(const FloatPoint&, const FloatPoint&)>&&);
LibGfx: Add elliptical curves to Path
2020-07-22 06:46:15 +00:00
static void for_each_line_segment_on_elliptical_arc(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& center, const FloatPoint radii, float x_axis_rotation, float theta_1, float theta_delta, Function<void(const FloatPoint&, const FloatPoint&)>&);
static void for_each_line_segment_on_elliptical_arc(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& center, const FloatPoint radii, float x_axis_rotation, float theta_1, float theta_delta, Function<void(const FloatPoint&, const FloatPoint&)>&&);
LibGfx: Add Gfx::Path, a basic 2D path with <canvas> semantics This will be used to implement painting of 2D paths. This first patch adds support for line_to(), move_to() and close(). It will try to have the same semantics as the HTML <canvas> element. To stroke a Path, simply pass it to Painter::stroke_path().
2020-04-16 19:03:17 +00:00
void stroke_path(const Path&, Color, int thickness);
LibGfx: Implement filling paths There are some imperfections with intersecting edges (because the main algorithm used is scanline, and that is not geared towards drawing complex shapes), however, it behaves mostly fine for normal use :^)
2020-05-06 07:25:12 +00:00
enum class WindingRule {
Nonzero,
EvenOdd,
};
void fill_path(Path&, Color, WindingRule rule = WindingRule::Nonzero);
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
const Font& font() const { return *state().font; }
void set_font(const Font& font) { state().font = &font; }
Add a simple Font class.
2018-10-11 21:45:57 +00:00
Meta: Tweak .clang-format to not wrap braces after enums.
2019-06-07 15:13:23 +00:00
enum class DrawOp {
WindowServer: Clang-Format
2019-06-05 16:22:11 +00:00
Copy,
LibGfx: Add ability to draw inverted rectangles
2020-09-08 04:25:30 +00:00
Xor,
Invert
WindowServer: Clang-Format
2019-06-05 16:22:11 +00:00
};
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
void set_draw_op(DrawOp op) { state().draw_op = op; }
DrawOp draw_op() const { return state().draw_op; }
Hook up the PS2MouseDevice to the AbstractScreen+WindowManager. Render the mouse cursor by xor'ing the pixels. I don't know anything about hardware cursors yet and this way we don't need to recompose the window hierarchy every time you move the mouse. :^)
2019-01-11 02:52:09 +00:00
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void add_clip_rect(const IntRect& rect);
Let userland retain the window backing store while drawing into it. To start painting, call: gui$get_window_backing_store() Then finish up with: gui$release_window_backing_store() Process will retain the underlying GraphicsBitmap behind the scenes. This fixes racing between the WindowServer and GUI clients. This patch also adds a WSWindowLocker that is exactly what it sounds like.
2019-01-24 22:40:12 +00:00
void clear_clip_rect();
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
IntRect clip_rect() const { return state().clip_rect; }
WindowServer: Only blit dirty rect of windows to back buffer. Previously we'd blit every pixel in every window that intersected any dirty rect to the back buffer. With this patch, we limit ourselves to blitting the pixels inside the actual dirty rects. There's still a lot of optimizations to make in this code.
2019-01-20 22:42:36 +00:00
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
void translate(int dx, int dy) { state().translation.move_by(dx, dy); }
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void translate(const IntPoint& delta) { state().translation.move_by(delta); }
FontEditor: Minor UI improvements. - Implement focus for custom widgets. - Add two live demo labels with an English pangram in upper/lower case.
2019-02-04 14:37:23 +00:00
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
IntPoint translation() const { return state().translation; }
GTextEditor: Improvements to cursor rendering. The view now scrolls along with you as you move the cursor around.
2019-03-07 12:13:25 +00:00
LibDraw: Put all classes in the Gfx namespace I started adding things to a Draw namespace, but it somehow felt really wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename the library to LibGfx. :^)
2020-02-06 10:56:38 +00:00
Gfx::Bitmap* target() { return m_target.ptr(); }
Port Terminal to LibGUI. To facilitate listening for action on arbitrary file descriptors, I've added a GNotifier class. It's quite simple but very useful: GNotifier notifier(fd, GNotifier::Read); notifier.on_ready_to_read = [this] (GNotifier& fd) { // read from fd or whatever else you like :^) }; The callback will get invoked by GEventLoop when select() says we have something to read on the fd.
2019-02-10 13:28:39 +00:00
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
void save() { m_state_stack.append(m_state_stack.last()); }
WindowServer: Clang-Format
2019-06-05 16:22:11 +00:00
void restore()
{
ASSERT(m_state_stack.size() > 1);
m_state_stack.take_last();
}
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
LibGUI: Add a GPainter class that inherits from Painter. This gets rid of the last little piece of LibGUI knowledge in Painter.
2019-03-28 16:19:56 +00:00
protected:
AK: Rename the common integer typedefs to make it obvious what they are. These types can be picked up by including <AK/Types.h>: * u8, u16, u32, u64 (unsigned) * i8, i16, i32, i64 (signed)
2019-07-03 19:17:35 +00:00
void set_pixel_with_draw_op(u32& pixel, const Color&);
LibGfx: Add ability to draw inverted rectangles
2020-09-08 04:25:30 +00:00
void fill_scanline_with_draw_op(int y, int x, int width, const Color& color);
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
void fill_rect_with_draw_op(const IntRect&, Color);
void blit_with_alpha(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect);
void blit_with_opacity(const IntPoint&, const Gfx::Bitmap&, const IntRect& src_rect, float opacity);
void draw_pixel(const IntPoint&, Color, int thickness = 1);
Hook up the PS2MouseDevice to the AbstractScreen+WindowManager. Render the mouse cursor by xor'ing the pixels. I don't know anything about hardware cursors yet and this way we don't need to recompose the window hierarchy every time you move the mouse. :^)
2019-01-11 02:52:09 +00:00
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
struct State {
const Font* font;
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
IntPoint translation;
IntRect clip_rect;
SharedGraphics: Give painter a state stack and save()/restore() operations. This will make some painting code a lot less confusing since there's no need to manually undo translations, clips, etc.
2019-03-09 15:48:02 +00:00
DrawOp draw_op;
};
State& state() { return m_state_stack.last(); }
const State& state() const { return m_state_stack.last(); }
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 08:57:59 +00:00
IntRect m_clip_origin;
LibDraw: Put all classes in the Gfx namespace I started adding things to a Draw namespace, but it somehow felt really wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename the library to LibGfx. :^)
2020-02-06 10:56:38 +00:00
NonnullRefPtr<Gfx::Bitmap> m_target;
Sprinkle use of AK::Vector in various places. Some of these are less helpful than others. Avoiding a bunch of mallocs in the event loop wakeup code is definitely nice.
2019-04-20 12:02:19 +00:00
Vector<State, 4> m_state_stack;
Intense hacking on Widgets.
2018-10-10 14:49:36 +00:00
};
SharedGraphics: Add PainterStateSaver RAII helper and Point::operator-(). Two little things to help tidy up a bit in WSWindowManager.
2019-03-09 15:54:41 +00:00
class PainterStateSaver {
public:
SharedGraphics: Move PainterStateSaver out of line.
2019-04-15 23:01:03 +00:00
explicit PainterStateSaver(Painter&);
~PainterStateSaver();
SharedGraphics: Add PainterStateSaver RAII helper and Point::operator-(). Two little things to help tidy up a bit in WSWindowManager.
2019-03-09 15:54:41 +00:00
private:
Painter& m_painter;
};
LibDraw: Put all classes in the Gfx namespace I started adding things to a Draw namespace, but it somehow felt really wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename the library to LibGfx. :^)
2020-02-06 10:56:38 +00:00
}
Reference in a new issue Copy permalink