Changeset 652Tweet

Timestamp:

May 14, 2011, 4:00:48 PM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: merge JCMouse into EventHandler?.

Location:

abuse/trunk/src

Files:

• imlib/Makefile.am (modified) (1 diff)
• imlib/event.cpp (modified) (2 diffs)
• imlib/event.h (modified) (3 diffs)
• imlib/jwindow.cpp (modified) (1 diff)
• imlib/mouse.h (deleted)
• sdlport/Makefile.am (modified) (1 diff)
• sdlport/event.cpp (modified) (4 diffs)
• sdlport/mouse.cpp (deleted)

abuse/trunk/src/imlib/Makefile.am

@@ -27 +27 @@
     video.cpp video.h \
     event.cpp event.h \
-    mouse.h timing.h jdir.h visobj.h \
+    timing.h jdir.h visobj.h \
     $(NULL)
 

abuse/trunk/src/imlib/event.cpp

@@ -27 +27 @@
 #include "event.h"
 #include "video.h"
+#include "filter.h"
+
+//
+// Constructor
+//
+EventHandler::EventHandler(image *screen, palette *pal)
+{
+    CHECK(screen && pal);
+    last_keystat = get_key_flags();
+    m_pending = 0;
+
+    m_screen = screen;
+
+    // Mouse stuff
+    uint8_t mouse_sprite[]=
+    {
+        0, 2, 0, 0, 0, 0, 0, 0,
+        2, 1, 2, 0, 0, 0, 0, 0,
+        2, 1, 1, 2, 0, 0, 0, 0,
+        2, 1, 1, 1, 2, 0, 0, 0,
+        2, 1, 1, 1, 1, 2, 0, 0,
+        2, 1, 1, 1, 1, 1, 2, 0,
+        0, 2, 1, 1, 2, 2, 0, 0,
+        0, 0, 2, 1, 1, 2, 0, 0,
+        0, 0, 2, 1, 1, 2, 0, 0,
+        0, 0, 0, 2, 2, 0, 0, 0
+    };
+
+    Filter f;
+    f.Set(1, pal->brightest(1));
+    f.Set(2, pal->darkest(1));
+    image *im = new image(vec2i(8, 10), mouse_sprite);
+    f.Apply(im);
+
+    m_sprite = new sprite(screen, im, 100, 100);
+    m_pos = m_lastpos = screen->Size() / 2;
+    m_button = m_lastbutton = 0;
+    m_center = vec2i(0, 0);
+
+    // Platform-specific stuff
+    SysInit();
+}
 
 //
@@ -33 +75 @@
 EventHandler::~EventHandler()
 {
-    delete mouse;
+    ;
 }
 

abuse/trunk/src/imlib/event.h

@@ -28 +28 @@
 #include "keys.h"
 #include "sprite.h"
-#include "mouse.h"
 
 class Jwindow;
@@ -70 +69 @@
     }
 
-  JCMouse *mouse;
-  sprite *mouse_sprite() { return mouse->mouse_sprite(); }
+    void SysInit();
+    void SysWarpMouse(vec2i pos);
+
   int IsPending();
   void Get(Event &ev);
   void add_redraw(int X1, int Y1, int X2, int Y2, void *Start);
-  void mouse_status(int &x, int &y, int &button)
+  void flush_screen();
+
+  int has_mouse() { return 1; }
+  void set_mouse_shape(image *im, int centerx, int centery)
   {
-    if (mouse)
-    {
-      x = mouse->x();
-      y = mouse->y();
-      button = mouse->button();
-    } else x = y = button = 0;
+    m_sprite->change_visual(im);
+    m_center = vec2i(-centerx, -centery);
   }
-  void flush_screen();
-  int has_mouse() { return mouse->exists(); }
-  void set_mouse_shape(image *im, int centerx, int centery) { mouse->set_shape(im, -centerx, -centery); }
-  void set_mouse_position(int mx, int my) { if (mouse) mouse->set_position(mx, my); }
+  void set_mouse_position(int mx, int my)
+  {
+    m_pos = vec2i(Min(mx, m_screen->Size().x - 1),
+                  Min(my, m_screen->Size().y - 1));
+    SysWarpMouse(m_pos);
+  }
 
 private:
@@ -93 +94 @@
 
     linked_list m_events;
-    int mhere, m_pending, last_keystat, last_key;
+    int m_pending, last_keystat, last_key;
     sprite_controller sc;
+
+    image *m_screen;
+
+protected:
+    /* Mouse information */
+    sprite *m_sprite;
+    vec2i m_pos, m_lastpos, m_center;
+    int m_button, m_lastbutton;
 };
 

abuse/trunk/src/imlib/jwindow.cpp

@@ -328 +328 @@
 void WindowManager::flush_screen()
 {
-    Jwindow *p, *q;
-
     int mx = 0, my = 0;
-    image *mouse_pic = NULL, *mouse_save = NULL;
-
-    if(has_mouse())
-    {
-        mouse_pic = mouse_sprite()->visual;
-        mouse_save = mouse_sprite()->save;
-        mx = mouse->drawx();
-        my = mouse->drawy();
-
-        mouse_save->PutPart(m_surf, 0, 0, mx, my,
-                            mx + mouse_pic->Size().x - 1,
-                            my + mouse_pic->Size().y - 1);
-        m_surf->PutImage(mouse_pic, vec2i(mx, my), 1);
-    }
-
-    for(p = m_first; p; p = p->next)
-        if(!p->is_hidden())
+
+    if (has_mouse())
+    {
+        mx = (m_pos - m_center).x;
+        my = (m_pos - m_center).y;
+
+        m_sprite->save->PutPart(m_surf, 0, 0, mx, my,
+                                mx + m_sprite->visual->Size().x - 1,
+                                my + m_sprite->visual->Size().y - 1);
+        m_surf->PutImage(m_sprite->visual, vec2i(mx, my), 1);
+    }
+
+    for (Jwindow *p = m_first; p; p = p->next)
+        if (!p->is_hidden())
             m_surf->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h);
     update_dirty(m_surf);
 
-    if(has_mouse())
-        m_surf->PutImage(mouse_save, vec2i(mx, my));
-
-    for(p = m_first; p; p = p->next)
-    {
-        if(p->is_hidden())
+    if (has_mouse())
+        m_surf->PutImage(m_sprite->save, vec2i(mx, my));
+
+    for (Jwindow *p = m_first; p; p = p->next)
+    {
+        if (p->is_hidden())
             continue;
 
-        if(has_mouse())
+        if (has_mouse())
         {
-            mouse_save->PutPart(p->m_surf, 0, 0, mx - p->x, my - p->y,
-                                mx - p->x + mouse_pic->Size().x - 1,
-                                my - p->y + mouse_pic->Size().y - 1);
-            p->m_surf->PutImage(mouse_pic, vec2i(mx - p->x, my - p->y), 1);
+            m_sprite->save->PutPart(p->m_surf, 0, 0, mx - p->x, my - p->y,
+                                    mx - p->x + m_sprite->visual->Size().x - 1,
+                                    my - p->y + m_sprite->visual->Size().y - 1);
+            p->m_surf->PutImage(m_sprite->visual,
+                                vec2i(mx - p->x, my - p->y), 1);
         }
 
 //          m_surf->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h);
-        for(q = p->next; q; q = q->next)
-            if(!q->is_hidden())
+        for (Jwindow *q = p->next; q; q = q->next)
+            if (!q->is_hidden())
                 p->m_surf->delete_dirty(q->x - p->x, q->y - p->y,
-                                          q->x + q->l - p->x,
-                                          q->y + q->h - p->y);
+                                        q->x + q->l - p->x,
+                                        q->y + q->h - p->y);
         update_dirty(p->m_surf, p->x, p->y);
-        if(has_mouse())
-            p->m_surf->PutImage(mouse_save, vec2i(mx - p->x, my - p->y), 0);
+        if (has_mouse())
+            p->m_surf->PutImage(m_sprite->save, vec2i(mx - p->x, my - p->y), 0);
     }
 }

abuse/trunk/src/sdlport/Makefile.am

@@ -6 +6 @@
 libsdlport_a_SOURCES = \
     video.cpp \
-    mouse.cpp \
     event.cpp \
     sound.cpp sound.h \

abuse/trunk/src/sdlport/event.cpp

@@ -30 +30 @@
 #include "palette.h"
 #include "video.h"
-#include "mouse.h"
 #include "event.h"
 #include "timing.h"
@@ -40 +39 @@
 short mouse_buttons[5] = { 0, 0, 0, 0, 0 };
 
-//
-// Constructor
-//
-EventHandler::EventHandler(image *screen, palette *pal)
-{
-    CHECK(screen && pal);
-    mouse = new JCMouse(screen, pal);
-    mhere = mouse->exists();
-    last_keystat = get_key_flags();
-    m_pending = 0;
-
+void EventHandler::SysInit()
+{
     // Ignore activate events
     SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
+}
+
+void EventHandler::SysWarpMouse(vec2i pos)
+{
+    SDL_WarpMouse(pos.x, pos.y);
 }
 
@@ -112 +107 @@
     // NOTE : that the mouse status should be known
     // even if another event has occurred.
-    ev.mouse_move.x = mouse->x();
-    ev.mouse_move.y = mouse->y();
-    ev.mouse_button = mouse->button();
+    ev.mouse_move.x = m_pos.x;
+    ev.mouse_move.y = m_pos.y;
+    ev.mouse_button = m_button;
 
     // Gather next event
@@ -173 +168 @@
         ev.mouse_button &= (0xff - RIGHT_BUTTON);
     }
-    mouse->update(ev.mouse_move.x, ev.mouse_move.y, ev.mouse_button);
+    m_pos = vec2i(ev.mouse_move.x, ev.mouse_move.y);
+    m_button = ev.mouse_button;
 
     // Sort out other kinds of events