Changeset 673Tweet

Timestamp:

May 16, 2011, 2:37:39 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: remove the unused redraw event code.

Location:

abuse/trunk

Files:

• TODO (modified) (1 diff)
• src/game.cpp (modified) (1 diff)
• src/imlib/event.cpp (modified) (1 diff)
• src/imlib/event.h (modified) (3 diffs)
• src/imlib/jwindow.cpp (modified) (1 diff)

abuse/trunk/TODO

@@ -73 +73 @@
 refactor image::Line to merge loops
 
-event::redraw::x1,y1...
 view::cx1,cx2...
 

abuse/trunk/src/game.cpp

@@ -1784 +1784 @@
                                 draw();
                             } break;
-                            case EV_REDRAW:
-                            {
-                                main_screen->AddDirty(vec2i(ev.redraw.x1, ev.redraw.y1),
-                                    vec2i(ev.redraw.x2 + 1, ev.redraw.y2 + 1));
-                            } break;
                             case EV_MESSAGE:
                             {

abuse/trunk/src/imlib/event.cpp

@@ -113 +113 @@
 }
 
-//
-// add_redraw()
-// Add a redraw rectangle.
-//
-void EventHandler::add_redraw(int X1, int Y1, int X2, int Y2, void *start)
-{
-    Event *ev;
-    ev = new Event;
-    ev->type = EV_REDRAW;
-    ev->redraw.x1 = X1;
-    ev->redraw.x2 = X2;
-    ev->redraw.y1 = Y1;
-    ev->redraw.y2 = Y2;
-    ev->redraw.start = start;
-    Push(ev);
-}
-

abuse/trunk/src/imlib/event.h

@@ -15 +15 @@
 #define EV_KEY            4
 #define EV_KEY_SPECIAL    8
-#define EV_REDRAW        16
+/* #define EV_REDRAW        16 UNUSED */
 #define EV_SPURIOUS      32
 #define EV_RESIZE        64
@@ -52 +52 @@
 
     struct { char alt, ctrl, shift; } key_special;
-    struct { int x1, y1, x2, y2; void *start; } redraw;
 
     Jwindow *window;      // NULL is root
@@ -74 +73 @@
     void SysEvent(Event &ev);
 
-  int IsPending();
-  void Get(Event &ev);
-  void add_redraw(int X1, int Y1, int X2, int Y2, void *Start);
+    int IsPending();
+    void Get(Event &ev);
   void flush_screen();
 

abuse/trunk/src/imlib/jwindow.cpp

@@ -201 +201 @@
        ev.window_position.y=ev.mouse_move.y+drag_mousey;
     }
-  }
-  if (ev.type == EV_REDRAW)
-  {
-    for (Jwindow *j = m_first; j; j = j->next)
-       j->m_surf->AddDirty(vec2i(ev.redraw.x1, ev.redraw.y1) - j->m_pos,
-                           vec2i(ev.redraw.x2 + 1, ev.redraw.y2 + 1) - j->m_pos.x);
-    m_surf->AddDirty(vec2i(ev.redraw.x1, ev.redraw.y1),
-                     vec2i(ev.redraw.x2 + 1, ev.redraw.y2 + 1));
-    flush_screen();
-    ev.type=EV_SPURIOUS;   // we took care of this one by ourselves.
   }
 }