Changeset 670 for abuse/trunk/src/imlib/jwindow.cppTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

imlib: started refactoring the dirty rectangle system.

File:

• abuse/trunk/src/imlib/jwindow.cpp (modified) (10 diffs)

abuse/trunk/src/imlib/jwindow.cpp

@@ -72 +72 @@
         {
             p->hide();
-            m_surf->AddDirty(p->m_pos.x, p->m_pos.y, p->m_pos.x + p->l, p->m_pos.y + p->h);
+            m_surf->AddDirty(p->m_pos, p->m_pos + vec2i(p->l, p->h));
         }
     }
@@ -93 +93 @@
         Jwindow *k;
         for (k = m_first; k->next != j; k = k->next)
-            k->m_surf->AddDirty(j->m_pos.x - k->m_pos.x, j->m_pos.y - k->m_pos.y,
-                                  j->m_pos.x + j->l - k->m_pos.x, j->m_pos.y + j->h - k->m_pos.y);
-        k->m_surf->AddDirty(j->m_pos.x - k->m_pos.x, j->m_pos.y - k->m_pos.y,
-                              j->m_pos.x + j->l - k->m_pos.x, j->m_pos.y + j->h - k->m_pos.y);
+            k->m_surf->AddDirty(j->m_pos - k->m_pos,
+                                j->m_pos + vec2i(j->l, j->h) - k->m_pos);
+        k->m_surf->AddDirty(j->m_pos - k->m_pos,
+                            j->m_pos + vec2i(j->l, j->h) - k->m_pos);
         k->next = j->next;
     }
-    m_surf->AddDirty(j->m_pos.x, j->m_pos.y, j->m_pos.x + j->l, j->m_pos.y + j->h);
+    m_surf->AddDirty(j->m_pos, j->m_pos + vec2i(j->l, j->h));
     j->hide();
 }
@@ -108 +108 @@
     {
         j->show();
-        j->m_surf->AddDirty(0, 0, j->l, j->h);
+        j->m_surf->AddDirty(vec2i(0), vec2i(j->l, j->h));
     }
 }
@@ -183 +183 @@
       for (p=m_first; p!=j; p=p->next)
         p->m_surf->AddDirty(j->x-p->x,j->y-p->y,j->x+j->l-p->x,j->y+j->h-p->y); */
-      j->m_surf->AddDirty(0, 0, j->l, j->h);
+      j->m_surf->AddDirty(vec2i(0), vec2i(j->l, j->h));
       flush_screen();
     }
@@ -214 +214 @@
   {
     for (Jwindow *j = m_first; j; j = j->next)
-       j->m_surf->AddDirty(ev.redraw.x1 - j->m_pos.x, ev.redraw.y1 - j->m_pos.y,
-                             ev.redraw.x2 + 1 - j->m_pos.x, ev.redraw.y2 + 1 - j->m_pos.y);
-    m_surf->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1);
+       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.
@@ -231 +232 @@
 {
   Jwindow *p;
-  m_surf->AddDirty(j->m_pos.x, j->m_pos.y, j->m_pos.x + j->l, j->m_pos.y + j->h);
+  m_surf->AddDirty(j->m_pos, j->m_pos + vec2i(j->l, j->h));
   for (p=m_first; p!=j; p=p->next)
-    p->m_surf->AddDirty(j->m_pos.x - p->m_pos.x, j->m_pos.y - p->m_pos.y, j->m_pos.x + j->l - p->m_pos.x, j->m_pos.y + j->h - p->m_pos.y);
+    p->m_surf->AddDirty(j->m_pos - p->m_pos,
+                        j->m_pos - p->m_pos + vec2i(j->l, j->h));
   j->resize(l,h);
   if (!frame_suppress)
@@ -241 +243 @@
 void WindowManager::move_window(Jwindow *j, int x, int y)
 {
-    m_surf->AddDirty(j->m_pos.x, j->m_pos.y, j->m_pos.x + j->l, j->m_pos.y + j->h);
+    m_surf->AddDirty(j->m_pos, j->m_pos + vec2i(j->l, j->h));
     for(Jwindow *p = m_first; p != j; p = p->next)
-        p->m_surf->AddDirty(j->m_pos.x - p->m_pos.x, j->m_pos.y - p->m_pos.y,
-                              j->m_pos.x + j->l - p->m_pos.x, j->m_pos.y + j->h - p->m_pos.y);
+        p->m_surf->AddDirty(j->m_pos - p->m_pos,
+                            j->m_pos - p->m_pos + vec2i(j->l, j->h));
     j->m_pos.x = x;
     j->m_pos.y = y;
-    j->m_surf->AddDirty(0, 0, j->l, j->h);
+    j->m_surf->AddDirty(vec2i(0), vec2i(j->l, j->h));
 }
 
@@ -299 +301 @@
         Jwindow * search;
         for(search = m_first; search->next != win; search = search->next)
-            search->m_surf->AddDirty(win->m_pos.x - search->m_pos.x,
-                                     win->m_pos.y - search->m_pos.y,
-                                     win->m_pos.x + win->l - search->m_pos.x,
-                                     win->m_pos.y + win->h - search->m_pos.y);
-        search->m_surf->AddDirty(win->m_pos.x - search->m_pos.x,
-                                 win->m_pos.y - search->m_pos.y,
-                                 win->m_pos.x + win->l - search->m_pos.x,
-                                 win->m_pos.y + win->h - search->m_pos.y);
+            search->m_surf->AddDirty(win->m_pos - search->m_pos,
+                                     win->m_pos - search->m_pos
+                                                + vec2i(win->l, win->h));
+        search->m_surf->AddDirty(win->m_pos - search->m_pos,
+                                 win->m_pos - search->m_pos
+                                            + vec2i(win->l, win->h));
         search->next = win->next;
     }
 
-    m_surf->AddDirty(win->m_pos.x, win->m_pos.y, win->m_pos.x + win->l, win->m_pos.y + win->h);
+    m_surf->AddDirty(win->m_pos, win->m_pos + vec2i(win->l, win->h));
 }
 
@@ -342 +342 @@
     for (Jwindow *p = m_first; p; p = p->next)
         if (!p->is_hidden())
-            m_surf->delete_dirty(p->m_pos.x, p->m_pos.y, p->m_pos.x + p->l, p->m_pos.y + p->h);
+            m_surf->DeleteDirty(p->m_pos, p->m_pos + vec2i(p->l, p->h));
     update_dirty(m_surf);
 
@@ -360 +360 @@
         }
 
-//          m_surf->delete_dirty(p->m_pos.x, p->m_pos.y, p->m_pos.x+p->l, p->m_pos.y+p->h);
+//      m_surf->DeleteDirty(p->m_pos, p->m_pos + vec2i(p->l, p->h));
         for (Jwindow *q = p->next; q; q = q->next)
             if (!q->is_hidden())
-                p->m_surf->delete_dirty(q->m_pos.x - p->m_pos.x, q->m_pos.y - p->m_pos.y,
-                                        q->m_pos.x + q->l - p->m_pos.x,
-                                        q->m_pos.y + q->h - p->m_pos.y);
+                p->m_surf->DeleteDirty(q->m_pos - p->m_pos,
+                                       q->m_pos - p->m_pos + vec2i(q->l, q->h));
         update_dirty(p->m_surf, p->m_pos.x, p->m_pos.y);
         if (has_mouse())