From b73087b9c4e30e034bb1690c492f4c9798e0d09b Mon Sep 17 00:00:00 2001
From: Eleni Maria Stea <elene.mst@gmail.com>
Date: Mon, 18 Feb 2013 01:38:25 +0200
Subject: [PATCH] *in progress* added mouse events (don't work :p)

---
 src/event.cc  |    4 ++--
 src/main.cc   |    7 ++++++-
 src/mouse.cc  |   45 +++++++++++++++++++++++++++++++++++++++++++--
 src/winnie.cc |    5 +++++
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/event.cc b/src/event.cc
index 45eed6e..1586c95 100644
--- a/src/event.cc
+++ b/src/event.cc
@@ -31,8 +31,8 @@ void process_events()
 			printf("WINNIE TODO PROCESS KEYB\n");
 			process_keyboard_event();
 		}
-/*		if(FD_ISSET(mouse_fd, &read_set)) {
+		if(FD_ISSET(mouse_fd, &read_set)) {
 			process_mouse_event();
-		}*/
+		}
 	}
 }
diff --git a/src/main.cc b/src/main.cc
index da43b53..6697506 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -28,7 +28,12 @@ int main()
 
 static void display(Window *win)
 {
-	fill_rect(win->get_rect(), 106, 106, 250);
+	if(wm->get_focused_window() != win) {
+		fill_rect(win->get_rect(), 106, 106, 250);
+	}
+	else {
+		fill_rect(win->get_rect(), 0, 0, 255);
+	}
 }
 
 static void keyboard(Window *win, int key, bool pressed)
diff --git a/src/mouse.cc b/src/mouse.cc
index db87be7..f29841c 100644
--- a/src/mouse.cc
+++ b/src/mouse.cc
@@ -1,4 +1,5 @@
 #include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,6 +12,8 @@
 #include "geom.h"
 #include "gfx.h"
 #include "mouse.h"
+#include "window.h"
+#include "wm.h"
 
 #define BN_LEFT		1
 #define BN_RIGHT	2
@@ -66,10 +69,48 @@ void process_mouse_event()
 		return;
 	}
 
-	/* - process each event and update the pointer and button state
-	 * - send each pointer move and button press/release to the topmost window
+	Window *top = wm->get_window_at_pos(pointer_x, pointer_y);
+	if(top) {
+		wm->set_focused_window(top);
+	}
+	else {
+		wm->set_focused_window(0);
+		return;
+	}
+
+	 /* - send each pointer move and button press/release to the topmost window
 	 *   with the pointer on it.
 	 */
+
+	int dx = pointer_x - prev_x;
+	int dy = pointer_y - prev_y;
+
+	if(dx || dy) {
+		MouseMotionFuncType motion_callback = top->get_mouse_motion_callback();
+		if(motion_callback) {
+			Rect rect = top->get_rect();
+			motion_callback(top, pointer_x - rect.x, pointer_y - rect.y);
+		}
+	}
+	
+	MouseButtonFuncType button_callback = top->get_mouse_button_callback();
+	if(button_callback && (bnstate != prev_state)) {
+		int num_bits = sizeof bnstate * CHAR_BIT;
+		for(int i=0; i<num_bits; i++) {
+			int s = (bnstate >> i) & 1;
+			int prev_s = (prev_state >> i) & 1;
+			if(s != prev_s) {
+				button_callback(top, i, s);
+			}
+		}
+	}
+
+	unsigned char *fb = get_framebuffer();
+	Rect scr = get_screen_size();
+	fb += (scr.width * pointer_y + pointer_x) * 4;
+	fb[0] = 0;
+	fb[1] = 0;
+	fb[2] = 0;
 }
 
 void get_pointer_pos(int *x, int *y)
diff --git a/src/winnie.cc b/src/winnie.cc
index 37b6222..fe81799 100644
--- a/src/winnie.cc
+++ b/src/winnie.cc
@@ -1,5 +1,6 @@
 #include "winnie.h"
 #include "keyboard.h"
+#include "mouse.h"
 
 bool winnie_init()
 {
@@ -11,6 +12,10 @@ bool winnie_init()
 		return false;
 	}
 
+	if(!init_mouse()) {
+		return false;
+	}
+
 	wm->invalidate_region(get_screen_size());
 	return true;
 }
-- 
1.7.10.4