X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Fmouse.cc;h=b3f329b2dee4acfce96289edf9dd738d5afd2042;hp=47a4c331cc62ebe190c7287d542e847245d8672e;hb=a43297a61d69ca5fa5bb7ae8407757da978b4dd4;hpb=ffd2c0a0f8b898cb4199a0c63aff255a85cc0f11

diff --git a/src/mouse.cc b/src/mouse.cc
index 47a4c33..b3f329b 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>
@@ -8,27 +9,39 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "mouse.h"
 #include "geom.h"
+#include "gfx.h"
+#include "mouse.h"
+#include "window.h"
+#include "wm.h"
+
+#define BN_LEFT		1
+#define BN_RIGHT	2
+#define BN_MIDDLE	4
+
 
 static int dev_fd = -1;	// file descriptor for /dev/psaux
 static Rect bounds;
 static int pointer_x, pointer_y;
+static int bnstate;
 
 bool init_mouse()
 {
-	if((dev_fd = open("/dev/psaux", O_NONBLOCK)) == -1) {
+	if((dev_fd = open("/dev/psaux", O_RDONLY | O_NONBLOCK)) == -1) {
 		fprintf(stderr, "Cannot open /dev/psaux : %s\n", strerror(errno));
 		return false;
 	}
 
+	set_mouse_bounds(get_screen_size());
 	return true;
 }
 
 void destroy_mouse()
 {
-	close(dev_fd);
-	dev_fd = -1;
+	if(dev_fd != -1) {
+		close(dev_fd);
+		dev_fd = -1;
+	}
 }
 
 void set_mouse_bounds(const Rect &rect)
@@ -46,10 +59,51 @@ void process_mouse_event()
 	/* TODO:
 	 * - read all pending events from mouse fd (use O_NONBLOCK so that
 	 *   read will return -1 when there are no more events instead of blocking).
-	 * - process each event and update the pointer and button state
-	 * - send each pointer move and button press/release to the tompost window
+	 */
+
+	int prev_state = bnstate;
+	int prev_x = pointer_x;
+	int prev_y = pointer_y;
+
+	if(read_mouse() == -1) {
+		return;
+	}
+
+	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);
+			}
+		}
+	}
 }
 
 void get_pointer_pos(int *x, int *y)
@@ -60,6 +114,47 @@ void get_pointer_pos(int *x, int *y)
 
 int get_button_state(int bn)
 {
-	// TODO
+	return bnstate;
+}
+
+int get_button(int bn)
+{
+	if(bn < 0 || bn >= 3) {
+		return 0;
+	}
+	return (bnstate & (1 << bn)) != 0;
+}
+
+
+int read_mouse()
+{
+	int rd;
+	signed char state[3] = {0, 0, 0};
+
+	if((rd = read(dev_fd, state, 3)) == -1) {
+		fprintf(stderr, "Unable to get mouse state : %s\n", strerror(errno));
+		return -1;
+	}
+
+	bnstate = state[0] & 7;
+	pointer_x += state[1];
+	pointer_y -= state[2];
+
+	if(pointer_x < bounds.x) {
+		pointer_x = bounds.x;
+	}
+
+	if(pointer_y < bounds.y) {
+		pointer_y = bounds.y;
+	}
+
+	if(pointer_x > bounds.x + bounds.width - 1) {
+		pointer_x = bounds.x + bounds.width - 1;
+	}
+
+	if(pointer_y > bounds.y + bounds.height - 1) {
+		pointer_y = bounds.y + bounds.height - 1;
+	}
+
 	return 0;
 }