Changeset 493Tweet

Timestamp:

Jun 25, 2005, 1:27:31 PM (17 years ago)

Author:

Jean-Yves Lamoureux

Message:

• OpenGL driver mouse support

Location:

libcaca/trunk/src

Files:

• event.c (modified) (3 diffs)
• graphics.c (modified) (3 diffs)

libcaca/trunk/src/event.c

@@ -65 +65 @@
 extern int gl_new_width;
 extern int gl_new_height;
-
+extern unsigned char gl_mouse_changed, gl_mouse_clicked;
+extern unsigned int gl_mouse_x, gl_mouse_y;
+extern unsigned int gl_mouse_button, gl_mouse_state;
 #endif
 #include "caca.h"
@@ -747 +749 @@
               if(!_caca_resize)
                 {
-
-
                   _caca_resize = 1;
                   gl_resized=0;
@@ -754 +754 @@
                 }
             }
-
+          if(gl_mouse_changed)
+            {
+              if(gl_mouse_clicked)
+                {
+                  event|= CACA_EVENT_MOUSE_PRESS | gl_mouse_button;
+                  gl_mouse_clicked=0;
+                }
+              mouse_x = gl_mouse_x;
+              mouse_y = gl_mouse_y;
+              event |= CACA_EVENT_MOUSE_MOTION | (mouse_x << 12) | mouse_y;
+              gl_mouse_changed = 0;
+            }
           if(gl_key!=0)
             {

libcaca/trunk/src/graphics.c

@@ -266 +266 @@
 int id[94];
 unsigned char gl_resized=0, gl_bit=0;
+unsigned char gl_mouse_changed=0, gl_mouse_clicked=0;
+unsigned int gl_mouse_x, gl_mouse_y;
+unsigned int gl_mouse_button=0, gl_mouse_state=0;
 #endif
 
@@ -325 +328 @@
   else
     gl_bit=1;
-
-}
+}
+static void gl_handle_mouse(int button, int state, int x, int y) 
+{
+  gl_mouse_clicked = 1;
+  gl_mouse_button = button;
+  gl_mouse_state = state;
+  gl_mouse_x = x/gl_font_width;
+  gl_mouse_y = y/gl_font_height;
+  gl_mouse_changed = 1;
+}
+static void gl_handle_mouse_motion(int x, int y) 
+{
+  gl_mouse_x = x/gl_font_width;
+  gl_mouse_y = y/gl_font_height;
+  gl_mouse_changed = 1;
+}
+
 #endif
 
@@ -1009 +1027 @@
           glutReshapeFunc(gl_handle_reshape);
 
+          glutMouseFunc(gl_handle_mouse);
+          glutMotionFunc(gl_handle_mouse_motion);
+          glutPassiveMotionFunc(gl_handle_mouse_motion);
+
+
           glLoadIdentity();