Changeset 8346 for branches

Timestamp:

29/01/12 11:04:55 (4 months ago)

Author:

westram

Message:

• expect context in ED4_root::special_window_refresh
• provide context from ED4_cursor::delete_cursor

Location:

branches/e4fix/EDIT4

Files:

• ED4_cursor.cxx (modified) (1 diff)
• ED4_main.cxx (modified) (1 diff)
• ED4_root.cxx (modified) (1 diff)
• ed4_class.hxx (modified) (4 diffs)

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -362 +362 @@
     if (window()->get_device()->reduceClipBorders(ymin-EXPAND_SIZE, ymax+1+EXPAND_SIZE, xmin-EXPAND_SIZE, xmax+1+EXPAND_SIZE)) {
         // refresh terminal to hide cursor
+        ED4_LocalWinContext uses(window());
         bool previous = allowed_to_draw;
         allowed_to_draw = false;

branches/e4fix/EDIT4/ED4_main.cxx

@@ -648 +648 @@
     AWT_install_postcb_cb(ED4_postcbcb);
     AWT_install_cb_guards();
-    e4_assert(ED4_WinContext::dont_have_global_context()); // context shall be local
+    e4_assert(!ED4_WinContext::have_context()); // no global context shall be active
     ED4_ROOT->aw_root->main_loop(); // enter main-loop
 

branches/e4fix/EDIT4/ED4_root.cxx

@@ -127 +127 @@
 ED4_returncode ED4_root::special_window_refresh() {
     // this function should only be used for window specific updates (i.e. cursor placement)
+
+    e4_assert(ED4_WinContext::have_context());
+    
     bool redraw = true; 
     handle_update_requests(redraw); // @@@ problematic (causes refresh w/o win-context)

branches/e4fix/EDIT4/ed4_class.hxx

@@ -1425 +1425 @@
     AW_device  *device;
 
-    bool have_context() const { return ed4w; }
+    bool is_set() const { return ed4w; }
     void init(ED4_window *ew) {
         e4_assert(ew);
@@ -1433 +1433 @@
 
     void warn_missing_context() const;
-    void expect_context() const { if (!have_context()) warn_missing_context(); }
+    void expect_context() const { if (!is_set()) warn_missing_context(); }
 
 protected:
@@ -1447 +1447 @@
 
     static const ED4_WinContext& get_current_context() { return current_context; }
-    static bool dont_have_global_context() { return !current_context.have_context(); }
+    static bool have_context() { return current_context.is_set(); }
 };
 
@@ -1561 +1561 @@
 public:
     ED4_MostRecentWinContext() : most_recent(0) {
-        if (ED4_WinContext::dont_have_global_context()) {
+        if (!ED4_WinContext::have_context()) {
             most_recent = new ED4_LocalWinContext(ED4_ROOT->get_most_recently_used_window());
         }