start of a c++ widget toolkit, c++ runtime

makefile

@@ -1,8 +1,10 @@
 kgccargs = -Wall -Wsuggest-attribute=pure -Wsuggest-attribute=const -m32 -mno-sse -Og -ggdb -ffreestanding -fno-asynchronous-unwind-tables -fno-pic -Isrc/shared/include -Isrc/lib
 ugccargs = ${kgccargs} -Isrc/user/include
-ugppargs = ${ugccargs} -fno-rtti -Isrc/user/include/c++
+ugppargs = ${ugccargs} -fno-rtti -Isrc/user/include/cxx
 nasmargs = -f elf32
 partlink = -r -m elf_i386
+clink = -T src/user/runtimes/c/elf.ld
+cxxlink = ${clink} src/user/runtimes/cxx/extra.ld
 
 out/disk.vdi: out/disk.img
 	rm out/disk.vdi || true
@@ -38,7 +40,7 @@ out/fs/bin/%: obj/%.elf
 out/fs: out/fs/bin/init     out/fs/bin/highway out/fs/bin/meminfo \
         out/fs/bin/terminal out/fs/bin/hello   out/fs/bin/mkpopup \
         out/fs/bin/dirlist  out/fs/bin/ttt     out/fs/bin/time    \
-        out/fs/bin/filetest out/fs/bin/mdemo
+        out/fs/bin/filetest out/fs/bin/mdemo   out/fs/bin/rhello
 	touch out/fs
 	cp -r fs-skel/* out/fs/
 
@@ -80,8 +82,9 @@ obj/%.po: src/user/%.cpp
 obj/c.rto: obj/runtimes/c/pcrt.ao
 	ld ${partlink} $^ -o $@
 
-obj/cpp.rto:
+obj/cxx.rto: obj/c.rto \
-	#TODO
+             obj/runtimes/cxx/extra.ao
+	ld ${partlink} $^ -o $@
 
 obj/knob.so: obj/knob/file.o  obj/knob/format.o obj/knob/rand.o  \
              obj/knob/heap.o  obj/knob/ipc.o    obj/knob/task.o  \
@@ -99,45 +102,54 @@ obj/libfont.so: obj/libfont/bdf.o obj/libfont/pbf.o obj/libfont/fonts.o \
 obj/popups.so: obj/popups/info.o obj/popups/popup.o
 	ld ${partlink} $^ -o $@
 
+obj/raleigh.so: obj/raleigh/runtime.po obj/raleigh/window.po \
+                obj/raleigh/w/label.po obj/raleigh/util.po   \
+                obj/raleigh/w/padding.po
+	ld ${partlink} $^ -o $@
+
 obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/highway.elf: obj/highway/main.o obj/highway/cmds.o obj/highway/line.o \
                  obj/highway/vars.o obj/knob.so        obj/libterm.so     \
                  obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/meminfo.elf: obj/meminfo/meminfo.o obj/popups.so obj/libfont.so \
                  obj/knob.so           obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/terminal.elf: obj/terminal/main.o obj/libfont.so obj/knob.so \
                   obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/hello.elf: obj/hello/hello.ao
-	ld -T src/user/runtimes/asm/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/mkpopup.elf: obj/mkpopup/main.o obj/popups.so obj/libfont.so \
                  obj/knob.so        obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/dirlist.elf: obj/dirlist/main.o obj/libterm.so obj/knob.so \
                  obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/ttt.elf: obj/ttt/main.o obj/popups.so obj/libfont.so \
              obj/knob.so obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/time.elf: obj/time/time.o obj/libterm.so obj/knob.so \
               obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/filetest.elf: obj/filetest/filetest.o obj/libterm.so obj/knob.so \
                   obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
 
 obj/mdemo.elf: obj/mdemo/main.o obj/popups.so obj/libfont.so \
                obj/knob.so      obj/c.rto
-	ld -T src/user/runtimes/c/elf.ld $^ -o $@
+	ld ${clink} $^ -o $@
+
+obj/rhello.elf: obj/rhello/main.po obj/raleigh.so obj/libfont.so \
+                obj/knob.so obj/cxx.rto
+	ld ${cxxlink} $^ -o $@

src/shared/include/winact.h

@@ -3,6 +3,12 @@
 
 #include <keypack.h>
 
+struct mouse_packet {
+  uint16_t y;
+  uint16_t x;
+  enum mouse_button {LEFT, RIGHT, MIDDLE} which;
+};
+
 struct window_action {
   enum {
     NOT_READY,
@@ -15,14 +21,7 @@ struct window_action {
   } action_type;
   union {
     struct key_packet as_key;
-    struct {
+    struct mouse_packet as_mouse;
-      //0, 0 is upper-left-most pixel not counting border
-      //packets are also sent for the border pixels,
-      //  so this may be a negative value in those cases
-      int16_t y;
-      int16_t x;
-      enum mouse_button {LEFT, RIGHT, MIDDLE} which;
-    } as_mouse;
   };
 } __attribute__ ((__packed__));
 

src/user/include/cxx/raleigh/runtime.h

@@ -0,0 +1,12 @@
+#ifndef RALEIGH_RUNTIME_H
+#define RALEIGH_RUNTIME_H
+
+#include <raleigh/window.h>
+#include <structs/dllist.h>
+
+namespace raleigh {
+  void start_runtime() __attribute__ ((noreturn));
+  extern dllist<window &> open_windows;
+}
+
+#endif

src/user/include/cxx/raleigh/util.h

@@ -0,0 +1,15 @@
+#ifndef RALEIGH_UTIL_H
+#define RALEIGH_UTIL_H
+
+#include <stdint.h>
+
+#define RGB(R, G, B) ((_pixel_t){.r = 0x##R, .g = 0x##G, .b = 0x##B})
+
+struct coord {
+  uint32_t x;
+  uint32_t y;
+  coord(uint32_t x, uint32_t y);
+  coord();
+};
+
+#endif

src/user/include/cxx/raleigh/w/label.h

@@ -0,0 +1,24 @@
+#ifndef RALEIGH_W_LABEL_H
+#define RALEIGH_W_LABEL_H
+
+#include <raleigh/widget.h>
+#include <libfont/fonts.h>
+
+namespace raleigh {
+  class label : public widget {
+  public:
+    //this pointer is used directly, and the contents of the string should not be changed afterward
+    label(const char *value, const char *font="fixed-10",
+      _pixel_t bg=RGB(bf, bf, bf), _pixel_t fg=RGB(00, 00, 00));
+
+    void notify_window_change() override;
+    void paint(_pixel_t *pixbuf, uint32_t pitch) override;
+  private:
+    const char *const value;
+    const struct font_info *const fi;
+    const _pixel_t bg;
+    const _pixel_t fg;
+  };
+}
+
+#endif

src/user/include/cxx/raleigh/w/padding.h

@@ -0,0 +1,20 @@
+#ifndef RALEIGH_W_PADDING_H
+#define RALEIGH_W_PADDING_H
+
+#include <raleigh/widget.h>
+
+namespace raleigh {
+  class padding : public widget {
+  public:
+    padding(uint32_t pad_by, _pixel_t color, widget &inner);
+
+    void notify_window_change() override;
+    void paint(_pixel_t *pixbuf, uint32_t pitch) override;
+  private:
+    uint32_t pad_by;
+    _pixel_t color;
+    widget &inner;
+  };
+}
+
+#endif

src/user/include/cxx/raleigh/widget.h

@@ -0,0 +1,27 @@
+#ifndef RALEIGH_WIDGET_H
+#define RALEIGH_WIDGET_H
+
+namespace raleigh {
+  class widget;
+}
+
+#include <raleigh/window.h>
+#include <pland/syscall.h>
+#include <raleigh/util.h>
+
+namespace raleigh {
+  class widget {
+  public:
+    coord size;
+
+    //set by window class (or parent widget)
+    window *w;
+    coord window_offset;
+
+    //called by window class (or parent widget)
+    virtual void notify_window_change() = 0;
+    virtual void paint(_pixel_t *pixbuf, uint32_t pitch) = 0;
+  };
+}
+
+#endif

src/user/include/cxx/raleigh/window.h

@@ -0,0 +1,27 @@
+#ifndef RALEIGH_WINDOW_H
+#define RALEIGH_WINDOW_H
+
+namespace raleigh {
+  class window;
+}
+
+#include <raleigh/widget.h>
+#include <pland/syscall.h>
+#include <raleigh/util.h>
+
+namespace raleigh {
+  class window {
+  public:
+    window(widget &root);
+    void notify_needs_paint(widget &from);
+    enum try_actions_return_t {NONE, GOOD, DELETE};
+    try_actions_return_t try_actions();
+  private:
+    _window_handle_t handle;
+    _pixel_t *pixbuf;
+    coord size;
+    widget &root;
+  };
+}
+
+#endif

src/user/include/cxx/structs/dllist.h

@@ -0,0 +1,39 @@
+#ifndef STRUCTS_DLLIST_H
+#define STRUCTS_DLLIST_H
+
+template<class data>
+class dllist {
+public:
+  class node {
+  public:
+    node *next;
+    node *prev;
+    data d;
+    node(node *next, node *prev, data d)
+      : next(next), prev(prev), d(d) {}
+  };
+  node *first;
+
+  dllist() : first(0) {}
+
+  void add_front(data d) {
+    node *const n = new node(first, 0, d);
+    if (first)
+      first->prev = n;
+    first = n;
+  }
+
+  //return previous, or zero if this is the first
+  node *remove_in_place(node *n) {
+    if (n == first)
+      first = n->next;
+    if (n->next)
+      n->next->prev = n->prev;
+    if (n->prev)
+      n->prev->next = n->next;
+    delete n;
+    return n->prev;
+  }
+};
+
+#endif

src/user/include/knob/block.h

@@ -1,6 +1,10 @@
 #ifndef KNOB_BLOCK_H
 #define KNOB_BLOCK_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -24,4 +28,8 @@ bool strequ(const char *a, const char *b) __attribute__ ((pure));
 //this replacement happens in place, with no memory allocation
 void str_trunc_fill(char *str, uint32_t len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/user/include/knob/heap.h

@@ -1,9 +1,17 @@
 #ifndef KNOB_HEAP_H
 #define KNOB_HEAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
 void *get_block(uint32_t bytes) __attribute__ ((malloc));
 void free_block(void *block);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/user/include/libfont/fonts.h

@@ -1,6 +1,10 @@
 #ifndef LIBFONT_FONTS_H
 #define LIBFONT_FONTS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <pland/syscall.h>
 
 #include <stdbool.h>
@@ -21,4 +25,8 @@ struct font_info *get_font(const char *name);
 //pitch is in pixels
 void put_char(const struct font_info *font, char ch, _pixel_t *pb_ptr, uint32_t pb_pitch, _pixel_t bg, _pixel_t fg);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/user/include/pland/pcrt.h

@@ -1,6 +1,10 @@
 #ifndef PLAND_PCRT_H
 #define PLAND_PCRT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <pland/syscall.h>
 
 #define BEFORE_MAIN(f) \
@@ -19,4 +23,8 @@ extern _task_handle_t calling_task;
 extern _task_handle_t stdio_task;
 extern _task_handle_t this_task;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/user/include/pland/syscall.h

@@ -1,6 +1,10 @@
 #ifndef PLAND_SYSCALL_H
 #define PLAND_SYSCALL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -250,4 +254,8 @@ static inline void _set_file_size(_file_handle_t handle, uint32_t new_size) {
   _sc2(_SCN_SET_FILE_SIZE, handle, new_size);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/user/raleigh/runtime.cpp

@@ -0,0 +1,21 @@
+#include <raleigh/runtime.h>
+#include <raleigh/window.h>
+#include <pland/pcrt.h>
+
+namespace raleigh {
+  dllist<window &> open_windows;
+
+  __attribute__ ((noreturn))
+  void start_runtime() {
+    while (1) {
+      if (!open_windows.first)
+        __pcrt_quit();
+      for (dllist<window &>::node *w = open_windows.first; w; w = w->next)
+        if (w->d.try_actions() == window::DELETE)
+          if (!(w = open_windows.remove_in_place(w)))
+            break;
+      _wait_for_action();
+      _yield_task();
+    }
+  }
+}

src/user/raleigh/util.cpp

@@ -0,0 +1,6 @@
+#include <raleigh/util.h>
+
+coord::coord(uint32_t x, uint32_t y)
+  : x(x), y(y) {}
+coord::coord()
+  : x(0), y(0) {}

src/user/raleigh/w/label.cpp

@@ -0,0 +1,27 @@
+#include <raleigh/w/label.h>
+#include <libfont/fonts.h>
+#include <knob/block.h>
+
+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
+    );
+  }
+
+  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;
+
+    _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);
+      ptr += fi->space_width;
+    }
+  }
+}

src/user/raleigh/w/padding.cpp

@@ -0,0 +1,31 @@
+#include <raleigh/w/padding.h>
+
+namespace raleigh {
+  padding::padding(uint32_t pad_by, _pixel_t color, widget &inner)
+    : pad_by(pad_by), color(color), inner(inner) {
+    size = coord(inner.size.x + pad_by * 2, inner.size.y + pad_by * 2);
+  }
+
+  void padding::notify_window_change() {
+    inner.w = w;
+    inner.window_offset = coord(window_offset.x + pad_by, window_offset.y + pad_by);
+    inner.notify_window_change();
+  }
+
+  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);
+  }
+}

src/user/raleigh/window.cpp

@@ -0,0 +1,35 @@
+#include <raleigh/runtime.h>
+#include <raleigh/window.h>
+#include <knob/heap.h>
+
+namespace raleigh {
+  window::window(widget &root)
+    : size(root.size), root(root) {
+    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));
+
+    root.paint(pixbuf, size.x);
+    handle = _new_window(size.x, size.y, pixbuf);
+
+    open_windows.add_front(*this);
+  }
+
+  window::try_actions_return_t window::try_actions() {
+    struct window_action wa;
+    window::try_actions_return_t got = NONE;
+    while (1) {
+      _get_win_action(handle, &wa);
+      if (!wa.action_type)
+        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;
+      got = GOOD;
+      //TODO
+    }
+  }
+}

src/user/rhello/main.cpp

@@ -0,0 +1,13 @@
+#include <raleigh/w/padding.h>
+#include <raleigh/w/label.h>
+#include <raleigh/runtime.h>
+#include <raleigh/window.h>
+
+using namespace raleigh;
+
+void main() {
+  label l("Hello, world! Close me with Alt+F4.");
+  padding p(4, RGB(bf, bf, bf), l);
+  window w(p);
+  start_runtime();
+}

src/user/runtimes/cxx/extra.asm

@@ -0,0 +1,7 @@
+bits 32
+
+global __cxa_pure_virtual
+
+section .text
+__cxa_pure_virtual:
+  ret

src/user/runtimes/cxx/extra.ld

@@ -0,0 +1,5 @@
+/* void *operator new(size_t) */
+_Znwj = get_block;
+
+/* void operator delete(void *, size_t) */
+_ZdlPvj = free_block;