Changeset 5cc7e5e

Timestamp:

Jun 20, 2010, 4:47:23 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

0be3efd

Parents:

1f4ea57

git-author:

David Benjamin <davidben@mit.edu> (06/20/10 16:41:26)

git-committer:

David Benjamin <davidben@mit.edu> (06/20/10 16:47:23)

Message:

Kill owl_global_needrefresh

Not necessary now. Internal state for owl_window.

Files:

• global.c (modified) (3 diffs)
• keys.c (modified) (1 diff)
• mainwin.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• window.c (modified) (5 diffs)

global.c

@@ -31 +31 @@
   }
 
+  g->lines=LINES;
+  g->cols=COLS;
+  /* We shouldn't need this if we initialize lines and cols before the first
+   * owl_window_get_screen, but to be safe, we synchronize. */
+  owl_window_resize(owl_window_get_screen(), g->lines, g->cols);
+
   g->context_stack = NULL;
   owl_global_push_context(g, OWL_CTX_STARTUP, NULL, NULL, NULL);
@@ -37 +43 @@
   g->topmsg=0;
   g->markedmsgid=-1;
-  g->needrefresh=1;
   g->startupargs=NULL;
 
   owl_variable_dict_setup(&(g->vars));
-
-  g->lines=LINES;
-  g->cols=COLS;
 
   g->rightshift=0;
@@ -306 +308 @@
 }
 
-/* refresh */
-
-int owl_global_is_needrefresh(const owl_global *g) {
-  if (g->needrefresh==1) return(1);
-  return(0);
-}
-
-void owl_global_set_needrefresh(owl_global *g) {
-  g->needrefresh=1;
-}
-
-void owl_global_set_noneedrefresh(owl_global *g) {
-  g->needrefresh=0;
-}
-
 /* variable dictionary */
 

keys.c

@@ -338 +338 @@
     owl_editwin_post_process_char(e, j);
   }
-  owl_global_set_needrefresh(&g);
 }
 

mainwin.c

@@ -73 +73 @@
     mw->curtruncated=0;
     mw->lastdisplayed=-1;
-    owl_global_set_needrefresh(&g);
     return;
   }

owl.c

@@ -459 +459 @@
   /* if a resize has been scheduled, deal with it */
   owl_global_check_resize(&g);
-
   /* update the terminal if we need to */
-  if (owl_global_is_needrefresh(&g)) {
-    /* Redraw the screen */
-    owl_window_redraw_scheduled();
-    doupdate();
-    owl_global_set_noneedrefresh(&g);
-  }
+  owl_window_redraw_scheduled();
   return 0;
 }

owl.h

@@ -588 +588 @@
   owl_mainpanel mainpanel;
   gulong typwin_erase_id;
-  int needrefresh;
   int rightshift;
   volatile sig_atomic_t resizepending;

window.c

@@ -360 +360 @@
   if (w)
     g_object_add_weak_pointer(G_OBJECT(w), (gpointer*) &cursor_owner);
-  owl_global_set_needrefresh(&g);
+  owl_window_dirty(owl_window_get_screen());
 }
 
@@ -370 +370 @@
   if (w)
     g_object_add_weak_pointer(G_OBJECT(w), (gpointer*) &default_cursor);
-  owl_global_set_needrefresh(&g);
+  owl_window_dirty(owl_window_get_screen());
 }
 
@@ -392 +392 @@
       w = w->parent;
     }
-    owl_global_set_needrefresh(&g);
   }
 }
@@ -432 +431 @@
 {
   owl_window *cursor;
-
-  _owl_window_redraw_subtree(owl_window_get_screen());
+  owl_window *screen = owl_window_get_screen();
+
+  if (!screen->dirty_subtree)
+    return;
+  _owl_window_redraw_subtree(screen);
   update_panels();
   cursor = _get_cursor();
@@ -444 +446 @@
     wnoutrefresh(cursor->win);
   }
+  doupdate();
 }