diff options
| -rw-r--r-- | apps/window.c | 21 | ||||
| -rw-r--r-- | apps/wm.c | 38 | ||||
| -rw-r--r-- | kernel/features/event.c | 6 | ||||
| -rw-r--r-- | kernel/features/proc.c | 5 | ||||
| -rw-r--r-- | kernel/features/syscall.c | 5 | ||||
| -rw-r--r-- | kernel/inc/event.h | 8 | ||||
| -rw-r--r-- | kernel/inc/proc.h | 2 | ||||
| -rw-r--r-- | libc/inc/sys.h | 9 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 13 | ||||
| -rw-r--r-- | libtxt/keymap.c | 53 | ||||
| -rw-r--r-- | res/keymaps/en.keymap | 6 |
11 files changed, 108 insertions, 58 deletions
diff --git a/apps/window.c b/apps/window.c index 9461f93..a38d121 100644 --- a/apps/window.c +++ b/apps/window.c @@ -24,7 +24,6 @@ int main() gui_init("/font/spleen-12x24.psfu"); char *hello = "Hello, world!"; gui_write(&win, win.width / 2 - (strlen(hello) * 12) / 2, 5, COLOR_GREEN, hello); - event_register(EVENT_KEYBOARD); struct message *msg; int char_x = 0; @@ -34,25 +33,13 @@ int main() yield(); continue; } - switch (msg->type) { - case EVENT_KEYBOARD: { - struct event_keyboard *event = msg->data; - - if (event->magic != KEYBOARD_MAGIC) - break; + switch (msg->type) { + case WM_KEYBOARD: { + struct msg_keyboard *event = msg->data; if (!event->press) break; - - int key = event->scancode; - if (key == KEY_ENTER) { - char_x = 0; - char_y++; - } else if (KEY_ALPHABETIC(key)) { - gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, COLOR_CYAN, - 'a'); - } - + gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, COLOR_CYAN, event->ch); break; } default: @@ -29,8 +29,10 @@ static struct keymap *keymap; static int mouse_x = 0; static int mouse_y = 0; -static struct window *new_window(struct window *win, int x, int y, u16 width, u16 height, int flags) +static struct window *new_window(struct window *win, u32 pid, int x, int y, u16 width, u16 height, + int flags) { + win->pid = pid; win->x = x; win->y = y; win->width = width; @@ -82,6 +84,7 @@ static void redraw_all() memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height); } +// TODO: Send relative mouse position event to focused window static int mouse_skip = 0; static int mouse_pressed[3] = { 0 }; static void handle_mouse(struct event_mouse *event) @@ -152,10 +155,22 @@ static void handle_mouse(struct event_mouse *event) mouse_skip++; } +static void handle_keyboard(struct event_keyboard *event) +{ + if (event->magic != KEYBOARD_MAGIC || !focused) + return; + struct msg_keyboard *msg = malloc(sizeof(*msg)); + msg->ch = keymap->map[event->scancode]; + msg->press = event->press; + msg->scancode = event->scancode; + msg_send(focused->pid, WM_KEYBOARD, msg); +} + // TODO: Clean this god-function int main(int argc, char **argv) { (void)argc; + int pid = getpid(); vbe = *(struct vbe *)argv[1]; printf("VBE: %dx%d\n", vbe.width, vbe.height); @@ -163,9 +178,11 @@ int main(int argc, char **argv) gui_init("/font/spleen-16x32.psfu"); windows = list_new(); - new_window(&root, 0, 0, vbe.width, vbe.height, WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE); - new_window(&exchange, 0, 0, vbe.width, vbe.height, WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE); - new_window(&cursor, 0, 0, 32, 32, WF_NO_FOCUS | WF_NO_RESIZE); + new_window(&root, pid, 0, 0, vbe.width, vbe.height, + WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE); + new_window(&exchange, pid, 0, 0, vbe.width, vbe.height, + WF_NO_FOCUS | WF_NO_DRAG | WF_NO_RESIZE); + new_window(&cursor, pid, 0, 0, 32, 32, WF_NO_FOCUS | WF_NO_RESIZE); memcpy(&direct, &root, sizeof(direct)); direct.fb = vbe.fb; list_add(windows, &root); @@ -181,6 +198,7 @@ int main(int argc, char **argv) redraw_all(); event_register(EVENT_MOUSE); + event_register(EVENT_KEYBOARD); struct message *msg; while (1) { @@ -190,25 +208,29 @@ int main(int argc, char **argv) } switch (msg->type) { - case MSG_NEW_WINDOW: + case WM_NEW_WINDOW: printf("New window for pid %d\n", msg->src); struct window *win = msg->data; int width = win->width ? win->width : 1000; int height = win->height ? win->height : 800; int x = win->x ? win->x : vbe.width / 2 - (width / 2); int y = win->y ? win->y : vbe.height / 2 - (height / 2); - new_window(win, x, y, width, height, win->flags); - msg_send(msg->src, MSG_NEW_WINDOW, win); + win->pid = msg->src; + new_window(win, msg->src, x, y, width, height, win->flags); + msg_send(msg->src, WM_NEW_WINDOW, win); list_add(windows, win); focused = win; redraw_all(); break; - case MSG_REDRAW: + case WM_REDRAW: redraw_all(); break; case EVENT_MOUSE: handle_mouse(msg->data); break; + case EVENT_KEYBOARD: + handle_keyboard(msg->data); + break; default: break; } diff --git a/kernel/features/event.c b/kernel/features/event.c index 1aa0cd0..633f633 100644 --- a/kernel/features/event.c +++ b/kernel/features/event.c @@ -10,7 +10,7 @@ struct list *event_table[] = { [EVENT_KEYBOARD] = NULL, [EVENT_MOUSE] = NULL }; -u32 event_register(enum message_type id, struct proc *proc) +u32 event_register(u32 id, struct proc *proc) { assert(id < sizeof(event_table) / sizeof(*event_table)); @@ -25,7 +25,7 @@ u32 event_register(enum message_type id, struct proc *proc) return 0; } -void event_unregister(enum message_type id, struct proc *proc) +void event_unregister(u32 id, struct proc *proc) { assert(id < sizeof(event_table) / sizeof(*event_table)); @@ -42,7 +42,7 @@ void event_unregister(enum message_type id, struct proc *proc) } } -u32 event_trigger(enum message_type id, void *data) +u32 event_trigger(u32 id, void *data) { assert(id < sizeof(event_table) / sizeof(*event_table)); diff --git a/kernel/features/proc.c b/kernel/features/proc.c index 3f8dcf1..7544b68 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -83,10 +83,11 @@ struct proc *proc_current() return current && current->data ? current->data : NULL; } -void proc_send(struct proc *src, struct proc *dest, enum message_type type, void *data) +void proc_send(struct proc *src, struct proc *dest, u32 type, void *data) { // TODO: Use unique key instead of pid for IPC messaging - assert(src && dest); + if (!src || !dest) + return; struct proc_message *msg = malloc(sizeof(*msg)); msg->src = src; msg->dest = dest; diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index 25770a4..f6e3f15 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -100,6 +100,11 @@ void syscall_handler(struct regs *r) r->eax = (u32)(msg ? msg->msg : NULL); break; } + case SYS_GETPID: { + printf("getpid\n"); + r->eax = proc_current()->pid; + break; + } default: { printf("unknown\n"); loop(); diff --git a/kernel/inc/event.h b/kernel/inc/event.h index 89c3e56..59a0df1 100644 --- a/kernel/inc/event.h +++ b/kernel/inc/event.h @@ -8,12 +8,12 @@ #include <sys.h> struct event_descriptor { - enum message_type id; + u32 id; struct proc *proc; }; -u32 event_register(enum message_type id, struct proc *proc); -void event_unregister(enum message_type id, struct proc *proc); -u32 event_trigger(enum message_type id, void *data); +u32 event_register(u32 id, struct proc *proc); +void event_unregister(u32 id, struct proc *proc); +u32 event_trigger(u32 id, void *data); #endif diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h index 7b47ed6..97ee69a 100644 --- a/kernel/inc/proc.h +++ b/kernel/inc/proc.h @@ -41,7 +41,7 @@ void scheduler_disable(); void proc_init(); void proc_print(); struct proc *proc_current(); -void proc_send(struct proc *src, struct proc *dest, enum message_type type, void *data); +void proc_send(struct proc *src, struct proc *dest, u32 type, void *data); struct proc_message *proc_receive(struct proc *proc); struct proc *proc_from_pid(u32 pid); void proc_exit(struct proc *proc, int status); diff --git a/libc/inc/sys.h b/libc/inc/sys.h index 839d6be..86f530b 100644 --- a/libc/inc/sys.h +++ b/libc/inc/sys.h @@ -20,13 +20,15 @@ enum sys { SYS_REGISTER, // Register for event SYS_UNREGISTER, // Unregister event SYS_SEND, // Send message to process - SYS_RECEIVE // Receive message (non-blocking/sync) + SYS_RECEIVE, // Receive message (non-blocking/sync) + SYS_GETPID // Get the process ID }; -enum message_type { MSG_NEW_WINDOW, MSG_REDRAW, EVENT_KEYBOARD, EVENT_MOUSE }; + +enum event_type { EVENT_KEYBOARD, EVENT_MOUSE, EVENT_MAX }; struct message { int src; - enum message_type type; + int type; void *data; }; @@ -78,6 +80,7 @@ int sysv(enum sys num, ...); #define msg_send(pid, type, msg) sys3(SYS_SEND, (int)(pid), (int)(type), (int)(msg)) #define msg_receive() (struct message *)sys0(SYS_RECEIVE) +#define getpid() (int)sys0(SYS_GETPID) static inline struct message *msg_receive_loop() { struct message *msg; diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index 5087fbf..da548fc 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -37,6 +37,8 @@ #define WF_NO_DRAG (1 << 1) #define WF_NO_RESIZE (1 << 2) +enum message_type { WM_NEW_WINDOW = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD }; + // Generalized font struct struct font { char *chars; @@ -46,6 +48,7 @@ struct font { }; struct window { + u32 pid; int x; int y; u32 width; @@ -56,6 +59,12 @@ struct window { int flags; }; +struct msg_keyboard { + char ch; + int press; + int scancode; +}; + void gui_write_char(struct window *win, int x, int y, u32 c, char ch); void gui_write(struct window *win, int x, int y, u32 c, char *text); void gui_load_image(struct window *win, char *path, int x, int y); @@ -72,6 +81,6 @@ void gui_init(char *font_path); */ #define gui_new_window(flags) \ - (msg_send(2, MSG_NEW_WINDOW, flags), (struct window *)msg_receive_loop()->data) -#define gui_redraw() (msg_send(2, MSG_REDRAW, NULL)) // TODO: Partial redraw (optimization) + (msg_send(2, WM_NEW_WINDOW, flags), (struct window *)msg_receive_loop()->data) +#define gui_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization) #endif diff --git a/libtxt/keymap.c b/libtxt/keymap.c index 1da4537..e05ef1d 100644 --- a/libtxt/keymap.c +++ b/libtxt/keymap.c @@ -23,6 +23,7 @@ void map(struct keymap *keymap, int line, char ch, int index) } } +// Very ugly code but it should work for now struct keymap *keymap_parse(const char *path) { char *keymap_src = read(path); @@ -32,30 +33,52 @@ struct keymap *keymap_parse(const char *path) struct keymap *keymap = malloc(sizeof(*keymap)); int index = 0; + int ch_index = 0; char ch; - int is_start = 0; + int escaped = 0; int line = 0; - while ((ch = keymap_src[index]) != '\0') { - if (ch == '"') { - if (keymap_src[index + 1] == '"') - map(keymap, line, '\0', index); - is_start ^= 1; + int skip = 0; + while ((ch = keymap_src[index]) != '\0' || escaped) { + if (ch == ' ' && !skip) { + skip = 1; index++; continue; - } else if ((ch == ' ' || ch == ',') && !is_start) { - index += 2; + } else if (ch == '\n') { + ch_index = 0; + index++; + line++; + continue; + } else if (ch == '\\' && !escaped) { + escaped = 1; + index++; continue; } - printf("\"%c\"\n", ch); + skip = 0; - if (ch == '\\') { - map(keymap, line, ch, index + 1); - } else if (ch == '\n') { - line++; + ch_index++; + if (escaped) { + switch (ch) { + case 'b': + ch = '\b'; + break; + case 't': + ch = '\t'; + break; + case 'n': + ch = '\n'; + break; + case '\\': + ch = '\\'; + break; + default: + print("Unknown escape!\n"); + } + escaped = 0; } + + map(keymap, line, ch, ch_index); index++; } - loop(); - return NULL; + return keymap; } diff --git a/res/keymaps/en.keymap b/res/keymaps/en.keymap index 8399258..fa31c30 100644 --- a/res/keymaps/en.keymap +++ b/res/keymaps/en.keymap @@ -1,3 +1,3 @@ -"", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "\b", "\t", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\n", "", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "`", "", "\\", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "", "*", "", " ", "", "", "", "", "", "", "", "", "", "", "", "", "", "7", "8", "9", "-", "4", "5", "6", "+", "1", "2", "3", "0", ".", "", "", "\\", "", "", "" -"", "", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "\b", "\t", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{", "}", "\n", "", "A", "S", "D", "F", "G", "H", "J", "K", "L", ":", "\"", "~", "", "|", "Z", "X", "C", "V", "B", "N", "M", "<", ">", "?", "", "*", "", " ", "", "", "", "", "", "", "", "", "", "", "", "", "", "7", "8", "9", "-", "4", "5", "6", "+", "1", "2", "3", "0", ".", "", "", "|", "", "", "" -"", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "\b", "\t", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\n", "", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "`", "", "\\", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "", "*", "", " ", "", "", "", "", "", "", "", "", "", "", "", "", "", "7", "8", "9", "-", "4", "5", "6", "+", "1", "2", "3", "0", ".", "", "", "\\", "", "", "" + 1 2 3 4 5 6 7 8 9 0 - = \b \t q w e r t y u i o p [ ] \n a s d f g h j k l ; ' ` \\ z x c v b n m , . / * 7 8 9 - 4 5 6 + 1 2 3 0 . \\ + ! @ # $ % ^ & * ( ) _ + \b \t Q W E R T Y U I O P { } \n A S D F G H J K L : " ~ | Z X C V B N M < > ? * 7 8 9 - 4 5 6 + 1 2 3 0 . | + 1 2 3 4 5 6 7 8 9 0 - = \b \t q w e r t y u i o p [ ] \n a s d f g h j k l ; ' ` \\ z x c v b n m , . / * 7 8 9 - 4 5 6 + 1 2 3 0 . \\ |