Changeset 656 for abuse/trunkTweet

Timestamp:

May 15, 2011, 6:22:13 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: move generic code back into the platform-agnostic imlib.

Location:

abuse/trunk

Files:

• TODO (modified) (1 diff)
• src/ant.cpp (modified) (1 diff)
• src/clisp.cpp (modified) (1 diff)
• src/cop.cpp (modified) (1 diff)
• src/demo.cpp (modified) (1 diff)
• src/dev.cpp (modified) (6 diffs)
• src/endgame.cpp (modified) (6 diffs)
• src/game.cpp (modified) (2 diffs)
• src/imlib/event.cpp (modified) (3 diffs)
• src/imlib/event.h (modified) (3 diffs)
• src/menu.cpp (modified) (2 diffs)
• src/sdlport/event.cpp (modified) (2 diffs)
• src/statbar.cpp (modified) (1 diff)

abuse/trunk/TODO

@@ -59 +59 @@
 console::draw_char : pareil
 VolumeWindow::draw_vol plus grand !!
+

abuse/trunk/src/ant.cpp

@@ -448 +448 @@
   {
     fade_out(8);
-    wm->set_mouse_position(0,0);
+    wm->SetMousePos(vec2i(0, 0));
     main_screen->clear();
     image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));

abuse/trunk/src/clisp.cpp

@@ -2184 +2184 @@
       c_target=id;
       if (main_screen)
-        wm->set_mouse_shape(cache.img(c_target)->copy(),x,y);
+        wm->SetMouseShape(cache.img(c_target)->copy(), vec2i(x, y));
     } break;
     case 276 :

abuse/trunk/src/cop.cpp

@@ -1049 +1049 @@
 {
   fade_out(8);
-  wm->set_mouse_position(0,0);
+  wm->SetMousePos(vec2i(0, 0));
   main_screen->clear();
   image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));

abuse/trunk/src/demo.cpp

@@ -123 +123 @@
     int32_t mx,my;
     the_game->game_to_mouse(player_list->pointer_x,player_list->pointer_y,player_list,mx,my);
-    wm->set_mouse_position(small_render ? mx*2 : mx, small_render ? my*2 : my);
+    wm->SetMousePos((small_render ? 2 : 1) * vec2i(mx, my));
       }
       else

abuse/trunk/src/dev.cpp

@@ -278 +278 @@
         if (first->otype==type)
       find=first;
-      int loop=0;
       if (!find)
       {
@@ -286 +285 @@
         find=first;
     }
-    loop=1;
       }
       if (find)
@@ -3003 +3001 @@
 void pal_win::draw()
 {
-  int i,find=-1,d=cur_fg;
+  int i,d=cur_fg;
   if (me)
   {
@@ -3018 +3016 @@
       if (d==pat[i])
       {
-    find=i;
     me->m_surf->Rectangle(vec2i(me->x1() + (i % w) * tw,
                                 me->y1() + (i / w) * th),
@@ -3588 +3585 @@
   if (dev&EDIT_MODE)
   {
-    wm->set_mouse_shape(cache.img(c_normal)->copy(),1,1);
+    wm->SetMouseShape(cache.img(c_normal)->copy(), vec2i(1, 1));
     pal->load();
   }
@@ -3594 +3591 @@
   {
     if (dev&MAP_MODE) dev-=MAP_MODE;                        // no map mode while playing!
-    wm->set_mouse_shape(cache.img(c_target)->copy(),8,8);
+    wm->SetMouseShape(cache.img(c_target)->copy(), vec2i(8, 8));
   }
   if ((dev&EDIT_MODE) && !dev_menu)

abuse/trunk/src/endgame.cpp

@@ -182 +182 @@
 
   image blank(vec2i(2)); blank.clear();
-  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->SetMouseShape(blank.copy(), vec2i(0, 0));      // don't show mouse
 
 
@@ -414 +414 @@
   main_screen->clear();
 
-
-  wm->set_mouse_shape(cache.img(c_normal)->copy(),1,1);
+  wm->SetMouseShape(cache.img(c_normal)->copy(), vec2i(1, 1));
   the_game->set_state(MENU_STATE);
 }
@@ -425 +424 @@
   fade_out(16);
   image blank(vec2i(2, 2)); blank.clear();
-  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->SetMouseShape(blank.copy(), vec2i(0, 0)); // don't show mouse
   main_screen->clear();
 
@@ -471 +470 @@
 
   fade_out(16);
-  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->SetMouseShape(blank.copy(), vec2i(0, 0)); // don't show mouse
   show_sell(1);
   wm->Push(new Event(ID_SHOW_SELL,NULL));
@@ -481 +480 @@
   fade_out(16);
   image blank(vec2i(2, 2)); blank.clear();
-  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->SetMouseShape(blank.copy(), vec2i(0, 0));      // don't show mouse
   main_screen->clear();
 
@@ -528 +527 @@
   show_sell(1);
 
-  wm->set_mouse_shape(cache.img(c_normal)->copy(),1,1);
+  wm->SetMouseShape(cache.img(c_normal)->copy(), vec2i(1, 1));
   the_game->set_state(MENU_STATE);
 }

abuse/trunk/src/game.cpp

@@ -443 +443 @@
 
     if(playing_state(state) &&  !(dev & EDIT_MODE))
-        wm->set_mouse_shape(cache.img(c_target)->copy(), 8, 8);
+        wm->SetMouseShape(cache.img(c_target)->copy(), vec2i(8, 8));
     else
-        wm->set_mouse_shape(cache.img(c_normal)->copy(), 1, 1);
+        wm->SetMouseShape(cache.img(c_normal)->copy(), vec2i(1, 1));
 
     if(old_state == SCENE_STATE && new_state != SCENE_STATE)
@@ -1243 +1243 @@
     image *blank = new image(vec2i(2, 2));
     blank->clear();
-    wm->set_mouse_shape(blank->copy(), 0, 0); // hide mouse
+    wm->SetMouseShape(blank->copy(), vec2i(0, 0)); // hide mouse
     delete blank;
     fade_in(cache.img(cdc_logo), 32);

abuse/trunk/src/imlib/event.cpp

@@ -35 +35 @@
 {
     CHECK(screen && pal);
-    last_keystat = get_key_flags();
     m_pending = 0;
 
@@ -62 +61 @@
 
     m_sprite = new sprite(screen, im, 100, 100);
-    m_pos = m_lastpos = screen->Size() / 2;
-    m_button = m_lastbutton = 0;
+    m_pos = screen->Size() / 2;
     m_center = vec2i(0, 0);
+    m_button = 0;
 
     // Platform-specific stuff
@@ -76 +75 @@
 {
     ;
+}
+
+void EventHandler::Get(Event &ev)
+{
+    // Sleep until there are events available
+    while(!m_pending)
+    {
+        Timer tmp;
+        IsPending();
+
+        if (!m_pending)
+            tmp.WaitMs(1);
+    }
+
+    // Return first queued event if applicable
+    Event *ep = (Event *)m_events.first();
+    if(ep)
+    {
+        ev = *ep;
+        m_events.unlink(ep);
+        delete ep;
+        m_pending = m_events.first() != NULL;
+        return;
+    }
+
+    // Return an event from the platform-specific system
+    SysEvent(ev);
 }
 

abuse/trunk/src/imlib/event.h

@@ -71 +71 @@
     void SysInit();
     void SysWarpMouse(vec2i pos);
+    void SysEvent(Event &ev);
 
   int IsPending();
@@ -78 +79 @@
 
   int has_mouse() { return 1; }
-  void set_mouse_shape(image *im, int centerx, int centery)
-  {
-    m_sprite->change_visual(im, 1);
-    m_center = vec2i(centerx, centery);
-  }
-  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);
-  }
+    void SetMouseShape(image *im, vec2i center)
+    {
+        m_sprite->change_visual(im, 1);
+        m_center = center;
+    }
+    void SetMousePos(vec2i pos)
+    {
+        m_pos = vec2i(Min(Max(pos.x, 0), m_screen->Size().x - 1),
+                      Min(Max(pos.y, 0), m_screen->Size().y - 1));
+        SysWarpMouse(m_pos);
+    }
 
 private:
-    int get_key_flags();
-
     linked_list m_events;
-    int m_pending, last_keystat, last_key;
+    int m_pending, last_key;
     sprite_controller sc;
 
@@ -102 +101 @@
     /* Mouse information */
     sprite *m_sprite;
-    vec2i m_pos, m_lastpos, m_center;
-    int m_button, m_lastbutton;
+    vec2i m_pos, m_center;
+    int m_button;
 };
 

abuse/trunk/src/menu.cpp

@@ -399 +399 @@
   {
     image blank(vec2i(2, 2)); blank.clear();
-    wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+    wm->SetMouseShape(blank.copy(), vec2i(0, 0));      // don't show mouse
 
     LObject *tmp = (LObject *)ss->GetValue();
@@ -418 +418 @@
       tmp = (LObject *)CDR(tmp);
     }
-    wm->set_mouse_shape(cache.img(c_normal)->copy(),1,1);
+    wm->SetMouseShape(cache.img(c_normal)->copy(), vec2i(1, 1));
   }
 }

abuse/trunk/src/sdlport/event.cpp

@@ -51 +51 @@
 
 //
-// get_key_flags()
-// Return the flag for the key modifiers
-//
-int EventHandler::get_key_flags()
-{
-    SDLMod key_flag = SDL_GetModState();
-
-    return ((key_flag & KMOD_SHIFT) != 0) << 3 |
-           ((key_flag & KMOD_CTRL) != 0) << 2 |
-           ((key_flag & KMOD_ALT) != 0) << 1;
-}
-
-//
 // IsPending()
 // Are there any events in the queue?
@@ -76 +63 @@
 
 //
-// get_event()
 // Get and handle waiting events
 //
-void EventHandler::Get(Event &ev)
+void EventHandler::SysEvent(Event &ev)
 {
-    while(!m_pending)
-    {
-        IsPending();
-
-        if (!m_pending)
-        {
-            // Sleep for 1 millisecond if there are no events
-            Timer tmp; tmp.WaitMs(1);
-        }
-    }
-
-    Event *ep = (Event *)m_events.first();
-    if(ep)
-    {
-        ev = *ep;
-        m_events.unlink(ep);
-        delete ep;
-        m_pending = m_events.first() != NULL;
-        return;
-    }
-
     // No more events
     m_pending = 0;

abuse/trunk/src/statbar.cpp

@@ -251 +251 @@
     {
       if ((current_level->tick_counter()&4)==0)
-        wm->set_mouse_shape(cache.img(c_mouse1)->copy(),4,4);
-      else wm->set_mouse_shape(cache.img(c_mouse2)->copy(),4,4);
+        wm->SetMouseShape(cache.img(c_mouse1)->copy(), vec2i(4, 4));
+      else wm->SetMouseShape(cache.img(c_mouse2)->copy(), vec2i(4, 4));
       changed_cursor=1;
     } else if (changed_cursor)
     {
       if (!(dev&EDIT_MODE))
-        wm->set_mouse_shape(cache.img(c_target)->copy(),8,8);
+        wm->SetMouseShape(cache.img(c_target)->copy(), vec2i(8, 8));
       else
-        wm->set_mouse_shape(cache.img(c_normal)->copy(),1,1);
+        wm->SetMouseShape(cache.img(c_normal)->copy(), vec2i(1, 1));
       changed_cursor=0;
     }