From 76e39eac8cee2175ec62a191f7c91ca53857e80c Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Fri, 5 Mar 2021 18:07:48 -0500 Subject: more raleigh, including button and vbox widgets --- src/user/raleigh/runtime.cpp | 5 +++- src/user/raleigh/util.cpp | 24 +++++++++++++++---- src/user/raleigh/w/button.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++ src/user/raleigh/w/label.cpp | 29 ++++++++++++++--------- src/user/raleigh/w/padding.cpp | 30 +++++++++++------------ src/user/raleigh/w/vbox.cpp | 45 +++++++++++++++++++++++++++++++++++ src/user/raleigh/window.cpp | 51 ++++++++++++++++++++++++++++++++------- 7 files changed, 198 insertions(+), 40 deletions(-) create mode 100644 src/user/raleigh/w/button.cpp create mode 100644 src/user/raleigh/w/vbox.cpp (limited to 'src/user/raleigh') diff --git a/src/user/raleigh/runtime.cpp b/src/user/raleigh/runtime.cpp index 1152575..6dafed1 100644 --- a/src/user/raleigh/runtime.cpp +++ b/src/user/raleigh/runtime.cpp @@ -11,9 +11,12 @@ namespace raleigh { if (!open_windows.first) __pcrt_quit(); for (dllist::node *w = open_windows.first; w; w = w->next) - if (w->d.try_actions() == window::DELETE) + if (w->d.try_actions() == window::DELETE) { + _delete_window(w->d.handle); + w->d.handle = 0; if (!(w = open_windows.remove_in_place(w))) break; + } _wait_for_action(); _yield_task(); } diff --git a/src/user/raleigh/util.cpp b/src/user/raleigh/util.cpp index 958897b..db0982b 100644 --- a/src/user/raleigh/util.cpp +++ b/src/user/raleigh/util.cpp @@ -1,6 +1,22 @@ #include +#include +#include -coord::coord(uint32_t x, uint32_t y) - : x(x), y(y) {} -coord::coord() - : x(0), y(0) {} \ No newline at end of file +namespace raleigh { + coord::coord(uint32_t x, uint32_t y) + : x(x), y(y) {} + coord::coord() + : x(0), y(0) {} + + __attribute__ ((noreturn)) + void show_error_and_quitf(const char *fmt, ...) { + va_list args; + va_start(args, fmt); + + struct popup info; + info_popupf_v(&info, fmt, RGB(7f, 00, 00), RGB(bf, bf, bf), args); + make_modal(&info); + + __pcrt_quit(); + } +} \ No newline at end of file diff --git a/src/user/raleigh/w/button.cpp b/src/user/raleigh/w/button.cpp new file mode 100644 index 0000000..06d9c1d --- /dev/null +++ b/src/user/raleigh/w/button.cpp @@ -0,0 +1,54 @@ +#include + +namespace raleigh { + button::button(widget &inner, void (*on_click)(button &), + _pixel_t border_color, _pixel_t bg_color, _pixel_t pressed_color) + : inner(inner), on_click(on_click), border_color(border_color), + bg_color(bg_color), pressed_color(pressed_color), is_pressed(false) { + size = coord(inner.size.x + 2, inner.size.y + 2); + closest_opaque = this; + inner.notify_has_opaque_parent(this); + } + + void button::notify_window_change() { + inner.window_offset = coord(window_offset.x + 1, window_offset.y + 1); + inner.w = w; + inner.notify_window_change(); + } + + void button::paint(_pixel_t *pixbuf, uint32_t pitch) { + for (uint32_t y = window_offset.y + 1; y < window_offset.y + size.y - 1; ++y) + for (uint32_t x = window_offset.x + 1; x < window_offset.x + size.x - 1; ++x) + pixbuf[y * pitch + x] = is_pressed ? pressed_color : bg_color; + inner.paint(pixbuf, pitch); + for (uint32_t x = window_offset.x; x < window_offset.x + size.x; ++x) { + pixbuf[window_offset.y * pitch + x] = border_color; + pixbuf[(window_offset.y + size.y - 1) * pitch + x] = border_color; + } + for (uint32_t y = window_offset.y + 1; y < window_offset.y + size.y - 1; ++y) { + pixbuf[y * pitch + window_offset.x] = border_color; + pixbuf[y * pitch + window_offset.x + size.x - 1] = border_color; + } + } + + bool button::try_handle_click(coord window_coords, enum mouse_packet::mouse_button click_type, bool up) { + if (click_type != mouse_packet::LEFT) + return false; + if (up) { + is_pressed = false; + inner.window_offset = coord(window_offset.x + 1, window_offset.y + 1); + inner.notify_window_change(); + w->notify_needs_paint(*this); + on_click(*this); + } + else { + is_pressed = true; + inner.window_offset = coord(window_offset.x + 2, window_offset.y + 2); + inner.notify_window_change(); + w->notify_needs_paint(*this); + } + return true; + } + + void button::notify_has_opaque_parent(widget *parent) {} +} \ No newline at end of file diff --git a/src/user/raleigh/w/label.cpp b/src/user/raleigh/w/label.cpp index 047126d..5b74175 100644 --- a/src/user/raleigh/w/label.cpp +++ b/src/user/raleigh/w/label.cpp @@ -3,25 +3,32 @@ #include namespace raleigh { - label::label(const char *value, const char *font, _pixel_t bg, _pixel_t fg) - : value(value), fi(get_font(font)), bg(bg), fg(fg) { - size = coord( - fi->space_width * (strlen(value) - 1) + fi->char_width, - fi->char_height - ); + label::label(const char *value, const char *font, bool bg_transparent, _pixel_t fg, _pixel_t bg) + : value(value), fi(get_font(font)), bg_transparent(bg_transparent), fg(fg), bg(bg) { + size = coord(fi->space_width * (strlen(value) - 1) + fi->char_width, fi->char_height); + closest_opaque = 0; } void label::notify_window_change() {} void label::paint(_pixel_t *pixbuf, uint32_t pitch) { - for (uint32_t y = window_offset.y; y < window_offset.y + size.y; ++y) - for (uint32_t x = window_offset.x; x < window_offset.x + size.x; ++x) - pixbuf[y * pitch + x] = bg; - + if (!bg_transparent) + for (uint32_t y = window_offset.y; y < window_offset.y + size.y; ++y) + for (uint32_t x = window_offset.x; x < window_offset.x + size.x; ++x) + pixbuf[y * pitch + x] = bg; _pixel_t *ptr = pixbuf + window_offset.y * pitch + window_offset.x; for (const char *c = value; *c; ++c) { - put_char(fi, *c, ptr, pitch, bg, fg); + put_char_no_bg(fi, *c, ptr, pitch, fg); ptr += fi->space_width; } } + + __attribute__ ((const)) + bool label::try_handle_click(coord window_coords, enum mouse_packet::mouse_button click_type, bool up) { + return false; + } + + void label::notify_has_opaque_parent(widget *parent) { + closest_opaque = parent; + } } \ No newline at end of file diff --git a/src/user/raleigh/w/padding.cpp b/src/user/raleigh/w/padding.cpp index 6833c5d..3dd027b 100644 --- a/src/user/raleigh/w/padding.cpp +++ b/src/user/raleigh/w/padding.cpp @@ -1,9 +1,10 @@ #include namespace raleigh { - padding::padding(uint32_t pad_by, _pixel_t color, widget &inner) - : pad_by(pad_by), color(color), inner(inner) { + padding::padding(widget &inner, uint32_t pad_by) + : inner(inner), pad_by(pad_by) { size = coord(inner.size.x + pad_by * 2, inner.size.y + pad_by * 2); + closest_opaque = 0; } void padding::notify_window_change() { @@ -13,19 +14,18 @@ namespace raleigh { } void padding::paint(_pixel_t *pixbuf, uint32_t pitch) { - for (uint32_t y = window_offset.y; y < window_offset.y + pad_by; ++y) - for (uint32_t x = window_offset.x; x < window_offset.x + size.x; ++x) - pixbuf[y * pitch + x] = color; - for (uint32_t y = window_offset.y + size.y - pad_by; y < window_offset.y + size.y; ++y) - for (uint32_t x = window_offset.x; x < window_offset.x + size.x; ++x) - pixbuf[y * pitch + x] = color; - for (uint32_t y = window_offset.y + pad_by; y < window_offset.y + size.y - pad_by; ++y) { - for (uint32_t x = window_offset.x; x < window_offset.x + pad_by; ++x) - pixbuf[y * pitch + x] = color; - for (uint32_t x = window_offset.x + size.x - pad_by; x < window_offset.x + size.x; ++x) - pixbuf[y * pitch + x] = color; - } - inner.paint(pixbuf, pitch); } + + bool padding::try_handle_click(coord window_coords, enum mouse_packet::mouse_button click_type, bool up) { + return (window_coords.x >= inner.window_offset.x) && + (window_coords.y >= inner.window_offset.y) && + (window_coords.x < inner.window_offset.x + inner.size.x) && + (window_coords.y < inner.window_offset.y + inner.size.y) && + inner.try_handle_click(window_coords, click_type, up); + } + + void padding::notify_has_opaque_parent(widget *parent) { + closest_opaque = parent; + } } \ No newline at end of file diff --git a/src/user/raleigh/w/vbox.cpp b/src/user/raleigh/w/vbox.cpp new file mode 100644 index 0000000..30b0902 --- /dev/null +++ b/src/user/raleigh/w/vbox.cpp @@ -0,0 +1,45 @@ +#include + +namespace raleigh { + vbox::vbox(dllist widgets) : widgets(widgets) { + uint32_t w = 0, h = 0; + for (dllist::node *n = widgets.first; n; n = n->next) { + h += n->d.size.y; + if (n->d.size.x > w) + w = n->d.size.x; + } + size = coord(w, h); + closest_opaque = 0; + } + + void vbox::notify_window_change() { + uint32_t h = window_offset.y; + for (dllist::node *n = widgets.first; n; n = n->next) { + n->d.w = w; + n->d.window_offset = coord(window_offset.x + size.x / 2 - n->d.size.x / 2, h); + n->d.notify_window_change(); + h += n->d.size.y; + } + } + + void vbox::paint(_pixel_t *pixbuf, uint32_t pitch) { + for (dllist::node *n = widgets.first; n; n = n->next) + n->d.paint(pixbuf, pitch); + } + + bool vbox::try_handle_click(coord window_coords, enum mouse_packet::mouse_button click_type, bool up) { + uint32_t h = window_offset.y; + dllist::node *n = widgets.first; + while (h + n->d.size.y <= window_coords.y) { + h += n->d.size.y; + n = n->next; + } + return (window_coords.x >= n->d.window_offset.x) && + (window_coords.x < n->d.window_offset.x + n->d.size.x) && + n->d.try_handle_click(window_coords, click_type, up); + } + + void vbox::notify_has_opaque_parent(widget *parent) { + closest_opaque = parent; + } +} \ No newline at end of file diff --git a/src/user/raleigh/window.cpp b/src/user/raleigh/window.cpp index 4373b06..41eb9ce 100644 --- a/src/user/raleigh/window.cpp +++ b/src/user/raleigh/window.cpp @@ -1,20 +1,21 @@ #include #include +#include #include namespace raleigh { - window::window(widget &root) - : size(root.size), root(root) { + window::window(widget &root, _pixel_t bg_color, bool (*on_close)(window &)) + : handle(0), size(root.size), root(root), bg_color(bg_color), + needs_repaint(false), on_close(on_close) { root.w = this; root.window_offset = coord(0, 0); root.notify_window_change(); pixbuf = (_pixel_t *)get_block(size.x * size.y * sizeof(_pixel_t)); + if (!pixbuf) + show_error_and_quitf("Failed to create %d byte pixel buffer\nfor requested %dx%d pixel window.", size.x * size.y * sizeof(_pixel_t), size.x, size.y); - root.paint(pixbuf, size.x); - handle = _new_window(size.x, size.y, pixbuf); - - open_windows.add_front(*this); + paint_full(); } window::try_actions_return_t window::try_actions() { @@ -22,14 +23,46 @@ namespace raleigh { window::try_actions_return_t got = NONE; while (1) { _get_win_action(handle, &wa); - if (!wa.action_type) + if (!wa.action_type) { + if (needs_repaint) { + needs_repaint = false; + _paint_window(handle); + } return got; + } if ((wa.action_type == wa.KEY_DOWN) && (wa.as_key.modifiers & wa.as_key.ALTS) && (wa.as_key.key_id == wa.as_key.KEY_F4)) - return DELETE; + if (!on_close || on_close(*this)) + return DELETE; got = GOOD; - //TODO + if (wa.action_type == wa.MOUSE_DOWN) + root.try_handle_click(coord(wa.as_mouse.x, wa.as_mouse.y), wa.as_mouse.which, false); + if (wa.action_type == wa.MOUSE_UP) + root.try_handle_click(coord(wa.as_mouse.x, wa.as_mouse.y), wa.as_mouse.which, true); } } + + void window::notify_needs_paint(widget &head) { + if (head.closest_opaque) + head.closest_opaque->paint(pixbuf, size.x); + else + paint_full(); + needs_repaint = true; + } + + void window::paint_full() { + for (uint32_t i = 0; i < size.x * size.y; ++i) + pixbuf[i] = bg_color; + root.paint(pixbuf, size.x); + } + + void window::show() { + if (handle) + return; + handle = _new_window(size.x, size.y, pixbuf); + if (!handle) + show_error_and_quitf("Failed to get window handle for requested window."); + open_windows.add_front(*this); + } } \ No newline at end of file -- cgit v1.2.3