Some GUI fixes

5 files changed, 15 insertions, 17 deletions

diff --git a/apps/wm.c b/apps/wm.c
index 0a73ed7..8a6cb55 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -97,10 +97,8 @@ static void handle_mouse(struct event_mouse *event)
 	if (event->but1 && !mouse_pressed[1]) {
 		mouse_pressed[0] = 1;
 		if (focused && !(focused->flags & WF_NO_DRAG)) {
-			if (focused->x + event->diff_x >= 0)
-				focused->x += event->diff_x;
-			if (focused->y - event->diff_y >= 0)
-				focused->y -= event->diff_y;
+			focused->x = mouse_x;
+			focused->y = mouse_y;
 			if (mouse_skip % MOUSE_SKIP == 0) {
 				mouse_skip = 0;
 				redraw_all(); // TODO: Function to redraw one window
@@ -113,15 +111,15 @@ static void handle_mouse(struct event_mouse *event)
 
 	// Window size
 	if (event->but2 && !mouse_pressed[0]) {
-		if (!mouse_pressed[1]) {
+		if (focused && !mouse_pressed[1]) {
 			mouse_x = focused->x + focused->width;
 			mouse_y = focused->y + focused->height;
 		} else if (focused && !(focused->flags & WF_NO_RESIZE) &&
 			   mouse_skip % MOUSE_SKIP == 0) {
 			mouse_skip = 0;
-			if (mouse_x - focused->x >= 0)
+			if (mouse_x - focused->x > 0)
 				focused->width = mouse_x - focused->x;
-			if (mouse_y - focused->y >= 0)
+			if (mouse_y - focused->y > 0)
 				focused->height = mouse_y - focused->y;
 			redraw_all(); // TODO: Function to redraw one window
 		}
diff --git a/kernel/drivers/timer.c b/kernel/drivers/timer.c
index 8029a2a..812bde7 100644
--- a/kernel/drivers/timer.c
+++ b/kernel/drivers/timer.c
@@ -42,8 +42,8 @@ void timer_wait(u32 ticks)
 // Install timer handler into IRQ0
 void timer_install()
 {
-	hpet_install(10000); // TODO: Find optimal femtosecond period
-	if (!hpet)
-		timer_phase(1000);
+	/* hpet_install(10000); // TODO: Find optimal femtosecond period */
+	/* if (!hpet) */
+	timer_phase(1000);
 	irq_install_handler(0, timer_handler);
 }
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 09f1f4e..aab4fec 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -19,6 +19,7 @@ struct list *proc_list;
 struct node *current;
 
 // TODO: Use less memcpy and only copy relevant registers
+// TODO: 20 priority queues (https://www.kernel.org/doc/html/latest/scheduler/sched-nice-design.html)
 void scheduler(struct regs *regs)
 {
 	timer_handler();
@@ -151,7 +152,7 @@ struct proc *proc_make()
 	struct proc *proc = malloc(sizeof(*proc));
 	proc->pid = pid++;
 	proc->messages = list_new();
-	proc->state = PROC_DEFAULT;
+	proc->state = PROC_RUNNING;
 
 	if (current)
 		list_add(proc_list, proc);
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index ea78885..7b47ed6 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -9,7 +9,7 @@
 #include <list.h>
 #include <sys.h>
 
-#define PROC_QUANTUM 420 // Nanoseconds or something // TODO
+#define PROC_QUANTUM 100 // Milliseconds or something // TODO
 
 #define EFLAGS_ALWAYS 0x2 // Always one
 #define EFLAGS_INTERRUPTS 0x200 // Enable interrupts
@@ -17,7 +17,7 @@
 #define GDT_USER_CODE_OFFSET 0x1b // User code segment offset in GDT (with ring3 mask)
 #define GDT_USER_DATA_OFFSET 0x23 // User data segment offset in GDT (with ring3 mask)
 
-enum proc_state { PROC_DEFAULT };
+enum proc_state { PROC_RUNNING };
 
 struct proc {
 	u32 pid;
diff --git a/libgui/gui.c b/libgui/gui.c
index 9744f75..1ff202d 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -111,11 +111,10 @@ void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
 		return;
 	}
 
-	if (x < 0)
-		x = 0;
-	if (y < 0)
-		y = 0;
+	if (src->width > dest->width || src->height > dest->height)
+		return;
 
+	// TODO: Negative x and y
 	int bypp = dest->bpp >> 3;
 	u8 *srcfb = src->fb;
 	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];