Changeset f70a7a3

Timestamp:

Jun 3, 2010, 2:37:58 AM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

571fab7

Parents:

cc36f27

git-author:

David Benjamin <davidben@mit.edu> (06/03/10 02:32:28)

git-committer:

David Benjamin <davidben@mit.edu> (06/03/10 02:37:58)

Message:

Add a default cursor and fallback finally on the screen

Also get rid of useless prototype.

Files:

• window.c (modified) (3 diffs)
• window.h (modified) (2 diffs)

window.c

@@ -43 +43 @@
 
 static owl_window *cursor_owner;
+static owl_window *default_cursor;
 
 G_DEFINE_TYPE (OwlWindow, owl_window, G_TYPE_OBJECT)
@@ -334 +335 @@
     g_object_remove_weak_pointer(G_OBJECT(cursor_owner), (gpointer*) &cursor_owner);
   cursor_owner = w;
-  g_object_add_weak_pointer(G_OBJECT(w), (gpointer*) &cursor_owner);
+  if (w)
+    g_object_add_weak_pointer(G_OBJECT(w), (gpointer*) &cursor_owner);
   owl_global_set_needrefresh(&g);
+}
+
+void owl_window_set_default_cursor(owl_window *w)
+{
+  if (default_cursor)
+    g_object_remove_weak_pointer(G_OBJECT(default_cursor), (gpointer*) &default_cursor);
+  default_cursor = w;
+  if (w)
+    g_object_add_weak_pointer(G_OBJECT(w), (gpointer*) &default_cursor);
+  owl_global_set_needrefresh(&g);
+}
+
+static owl_window *_get_cursor(void)
+{
+  if (cursor_owner && owl_window_is_realized(cursor_owner))
+    return cursor_owner;
+  if (default_cursor && owl_window_is_realized(default_cursor))
+    return default_cursor;
+  return owl_window_get_screen();
 }
 
@@ -389 +410 @@
 void owl_window_redraw_scheduled(void)
 {
+  owl_window *cursor;
+
   _owl_window_redraw_subtree(owl_window_get_screen());
   update_panels();
-  if (cursor_owner && cursor_owner->win) {
+  cursor = _get_cursor();
+  if (cursor && cursor->win) {
     /* untouch it to avoid drawing; window should be clean now, but we must
      * clean up in case there was junk left over on a subwin (cleaning up after
      * subwin drawing isn't sufficient because a wsyncup messes up subwin
      * ancestors */
-    untouchwin(cursor_owner->win);
-    wnoutrefresh(cursor_owner->win);
+    untouchwin(cursor->win);
+    wnoutrefresh(cursor->win);
   }
 }

window.h

@@ -44 +44 @@
 
 void owl_window_set_cursor(owl_window *w);
+void owl_window_set_default_cursor(owl_window *w);
 
 void owl_window_dirty(owl_window *w);
@@ -53 +54 @@
 void owl_window_move(owl_window *w, int begin_y, int begin_x);
 void owl_window_resize(owl_window *w, int nlines, int ncols);
-void owl_window_recompute_position(owl_window *w);
 
 void owl_window_top(owl_window *w);