diff options
Diffstat (limited to 'libgui')
| -rw-r--r-- | libgui/Makefile | 3 | ||||
| -rw-r--r-- | libgui/gfx.c | 8 | ||||
| -rw-r--r-- | libgui/gui.c | 3 | ||||
| -rw-r--r-- | libgui/inc/gfx.h | 9 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 2 | ||||
| -rw-r--r-- | libgui/msg.c | 2 |
6 files changed, 15 insertions, 12 deletions
diff --git a/libgui/Makefile b/libgui/Makefile index dc254d3..b37bc3b 100644 --- a/libgui/Makefile +++ b/libgui/Makefile @@ -4,7 +4,8 @@ COBJS = psf.o \ bmp.o \ png.o \ gfx.o \ - gui.o + gui.o \ + msg.o CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld AR = ccache ../cross/opt/bin/i686-elf-ar diff --git a/libgui/gfx.c b/libgui/gfx.c index 986ecda..d3a66f2 100644 --- a/libgui/gfx.c +++ b/libgui/gfx.c @@ -7,6 +7,7 @@ #include <bmp.h> #include <gfx.h> #include <mem.h> +#include <msg.h> #include <png.h> #include <psf.h> #include <str.h> @@ -98,9 +99,10 @@ static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, struct context *gfx_new_ctx(struct context *ctx) { - //struct message msg = { 0 }; - //msg_send(2, GFX_NEW_CONTEXT, ctx); - //memcpy(ctx, msg_receive_loop(&msg)->data, sizeof(*ctx)); + struct message msg = { 0 }; + msg_send(pidof(WM_PATH), GFX_NEW_CONTEXT, ctx); + msg_receive(&msg); + memcpy(ctx, msg.data, sizeof(*ctx)); return ctx; } diff --git a/libgui/gui.c b/libgui/gui.c index 9b49c2e..052a07b 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -9,7 +9,7 @@ #include <input.h> #include <list.h> #include <mem.h> -#include <print.h> +#include <msg.h> #include <str.h> #include <sys.h> @@ -200,6 +200,7 @@ static int absolute_y_off(struct element *elem) struct context *gui_get_context(int x, int y, u32 width, u32 height) { + log("GET CONTEXT: %dx%d\n", width, height); struct context *ctx = malloc(sizeof(*ctx)); ctx->pid = getpid(); ctx->x = x; diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h index 4998d30..fd8d4ab 100644 --- a/libgui/inc/gfx.h +++ b/libgui/inc/gfx.h @@ -5,9 +5,12 @@ #define GFX_H #include <def.h> +#include <msg.h> #include <sys.h> #include <vesa.h> +#define WM_PATH "/bin/wm" + #define GET_ALPHA(color) ((color >> 24) & 0x000000FF) #define GET_RED(color) ((color >> 16) & 0x000000FF) #define GET_GREEN(color) ((color >> 8) & 0x000000FF) @@ -42,8 +45,6 @@ enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 }; -enum message_type { GFX_NEW_CONTEXT, GFX_REDRAW, GFX_REDRAW_FOCUSED, GFX_MAX }; - // Generalized font struct struct font { char *chars; @@ -85,7 +86,7 @@ int gfx_font_width(enum font_type); */ #define gfx_redraw() \ - (void)42 //(msg_send(2, GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization) -#define gfx_redraw_focused() (void)42 //(msg_send(2, GFX_REDRAW_FOCUSED, NULL)) + (msg_send(pidof(WM_PATH), GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization) +#define gfx_redraw_focused() (msg_send(pidof(WM_PATH), GFX_REDRAW_FOCUSED, NULL)) #endif diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index 8de1f51..380d02b 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -12,8 +12,6 @@ #define MAX_CHILDS 100 #define MAX_INPUT_LENGTH 100 -// TODO: Improve event types (maybe as struct header) -enum window_event_type { GUI_KILL, GUI_KEYBOARD, GUI_MOUSE, GUI_RESIZE, GUI_MAX }; enum element_type { GUI_TYPE_ROOT, GUI_TYPE_CONTAINER, diff --git a/libgui/msg.c b/libgui/msg.c index 6898121..bf3d28c 100644 --- a/libgui/msg.c +++ b/libgui/msg.c @@ -17,7 +17,7 @@ int msg_send(u32 pid, enum message_type type, void *data) int msg_receive(struct message *msg) { int ret = read("/proc/self/msg", msg, 0, sizeof(*msg)); - assert(msg->magic == MSG_MAGIC); + assert(msg->magic == MSG_MAGIC); // TODO: Remove? (Many >0 checks are needed) if (msg->magic == MSG_MAGIC && ret == sizeof(*msg)) return ret; else |