Remove deprecated routines

Author: JimZhouZZY

src/Data/History/archiver.cpp

@@ -14,7 +14,6 @@
 #include "observers.hpp"
 #include "tm_debug.hpp"
 #include "tree.hpp"
-#include "tree_helper.hpp"
 #include "tree_observer.hpp"
 #include "tree_patch.hpp"
 
@@ -330,7 +329,7 @@ archiver_rep::confirm () {
       if (depth <= last_save) last_save= -1;
       if (depth <= last_autosave) last_autosave= -1;
       normalize ();
-      show_all ();
+      // show_all ();
     }
   }
 }
@@ -419,10 +418,7 @@ archiver_rep::redo_possibilities () {
 
 path
 archiver_rep::undo_one (int i) {
-  if (active ()) {
-    cout << "  Cannot undo while modifications are active\n";
-    return path ();
-  }
+  if (active ()) return path ();
   cout << "  undo_possibilities(): " << undo_possibilities () << "\n";
   if (undo_possibilities () != 0) {
     ASSERT (i == 0, "index out of range");
@@ -438,8 +434,7 @@ archiver_rep::undo_one (int i) {
     archive  = make_history (un, re);
     depth--;
     // show_all ();
-    path cursor_pos= cursor_hint (q, the_et);
-    return cursor_pos;
+    return cursor_hint (q, the_et);
   }
   return path ();
 }

src/Data/History/archiver.hpp

@@ -73,7 +73,6 @@ class archiver_rep : public concrete_struct {
 
   void         reconstruct_from_state (path p_old, tree t_old, tree t_new);
   modification compute_tree_mod (path p_old, tree t_old, tree t_new);
-  bool         is_content_modification (patch p);
 
   inline void set_versioning (bool v) { versioning= v; }
 

src/Edit/Interface/edit_complete.cpp

@@ -88,7 +88,6 @@ edit_interface_rep::complete_try () {
   else {
     if ((end == 0) || (!is_iso_alpha (s[end - 1])) ||
         ((end != N (s)) && is_iso_alpha (s[end]))) {
-      complete_str= string ("");
       set_input_normal ();
       SERVER (set_completion_popup_visible (false));
       return false;
@@ -100,7 +99,6 @@ edit_interface_rep::complete_try () {
     a = find_completions (drd, et, ss);
   }
   if (N (a) <= 1) {
-    complete_str= string ("");
     set_input_normal ();
     SERVER (set_completion_popup_visible (false));
     return false;
@@ -136,46 +134,26 @@ edit_interface_rep::complete_start (string prefix, array<string> compls) {
     completion_prefix= prefix;
     completions      = close_completions (compls);
     completion_pos   = 0;
-    {
-      // TODO: ?refactor this part to
-      // edit_interface_rep::show_completion_popup
-      cout << "complete_start: "
-           //     << "completions=" << completions
-           << ", prefix="
-           << completion_prefix
-           //     << ", tp=" << tp
-           //     << ", et=" << et
-           //     << ", eb=" << eb
-           << LF;
-      array<string> full_completions;
-      for (int i= 0; i < N (completions); ++i) {
-        // cout << "complete_start: completions[" << i << "]=" << completions[i]
-        //      << LF;
-        string c= completions[i];
-        full_completions << (completion_prefix * c);
-      }
-      path tp1= tp;
-      for (int i= 0; i < N (prefix); ++i) {
-        tp1= previous_valid (et, tp1);
-      }
-      cursor cu= eb->find_check_cursor (tp1);
-      cout << "show_completion_popup: "
-           // << "completions=" << full_completions << ", cu->ox=" << cu->ox
-           << ", cu->oy=" << cu->oy << ", magf=" << magf
-           << ", scroll_x=" << get_scroll_x ()
-           << ", scroll_y=" << get_scroll_y ()
-           << ", canvas_x=" << get_canvas_x () << LF;
-      show_completion_popup (tp, full_completions, cu, magf, get_scroll_x (),
-                             get_scroll_y (), get_canvas_x ());
+    
+    array<string> full_completions;
+    for (int i= 0; i < N (completions); ++i) {
+      string c= completions[i];
+      full_completions << (completion_prefix * c);
+    }
+    path tp1= tp;
+    for (int i= 0; i < N (prefix); ++i) {
+      tp1= previous_valid (et, tp1);
     }
+    cursor cu= eb->find_check_cursor (tp1);
+    show_completion_popup (tp, full_completions, cu, magf, get_scroll_x (),
+                            get_scroll_y (), get_canvas_x ());
 
     set_arch_versioning (true);
     insert_tree (completions[0]);
 
     if (get_input_mode () != INPUT_COMPLETE) {
       complete_et = copy (subtree (et, path_up (tp, 1)));
       complete_tp = copy (tp);
-      complete_str= completions[0];
     }
     complete_message ();
     // beep ();
@@ -206,12 +184,6 @@ edit_interface_rep::complete_keypress (string key) {
     SERVER (set_completion_popup_visible (false));
     return false;
   }
-  // else if (key == "backspace" && N(full_s) == 1) {
-  //   complete_str = string("");
-  //   set_input_normal ();
-  //   SERVER (set_completion_popup_visible (false));
-  //   return true;
-  // }
   else if ((key != "tab") && (key != "S-tab") && (key != "up") &&
            (key != "down")) {
     cout << key << LF;
@@ -243,7 +215,6 @@ edit_interface_rep::complete_keypress (string key) {
   }
   if (completion_pos < 0) completion_pos= N (completions) - 1;
   if (completion_pos >= N (completions)) completion_pos= 0;
-  complete_str= completions[completion_pos];
   new_s       = completions[completion_pos];
 
   remove (path_up (tp) * (end - N (old_s)), N (old_s));
@@ -321,7 +292,6 @@ edit_interface_rep::custom_complete (tree r) {
   // cout << prefix << ", " << compls << LF;
 
   if ((prefix == "") || (N (compls) <= 1)) {
-    complete_str= string ("");
     set_input_normal ();
     SERVER (set_completion_popup_visible (false));
     return;

src/Edit/Interface/edit_interface.cpp

@@ -87,6 +87,7 @@ edit_interface_rep::operator tree () {
 void
 edit_interface_rep::suspend () {
   // cout << "Suspend " << buf->buf->name << LF;
+  set_input_normal();
   if (got_focus) {
     interrupt_shortcut ();
     set_message ("", "", false);

src/Edit/Interface/edit_interface.hpp

@@ -37,7 +37,6 @@ class edit_interface_rep : virtual public editor_rep {
 protected:
   tree       complete_et;
   path       complete_tp;
-  string     complete_str;  // string to complete
   int        env_change;    // which things have been changed ?
   time_t     last_change;   // time of last processed change
   time_t     last_update;   // time of last update of menu, icons and footer

src/Edit/Interface/edit_keyboard.cpp

@@ -70,8 +70,10 @@ edit_interface_rep::set_input_mode (int mode) {
 void
 edit_interface_rep::set_input_normal () {
   cout << "set_input_normal\n";
-  if (input_mode == INPUT_COMPLETE)
+  if (input_mode == INPUT_COMPLETE){
+    hide_completion_popup ();
     arch_reconstruct (complete_tp, complete_et, subtree (et, path_up (tp, 1)));
+  }
   set_arch_versioning (false);
   set_input_mode (INPUT_NORMAL);
 }
@@ -231,7 +233,6 @@ edit_interface_rep::is_combo_shortcuts (string key) {
 
 void
 edit_interface_rep::key_press (string gkey) {
-  cout << "Key press: " << gkey << "\n";
   string zero= "a";
   zero[0]    = '\0';
   string key = replace (gkey, "<#0>", zero);
@@ -312,7 +313,6 @@ edit_interface_rep::key_press (string gkey) {
       if (!inside_active_graphics ()) {
         archive_state ();
         call ("kbd-insert", rew);
-        cout << "Inserted single character1: " << rew << "\n";
         if (get_input_mode () == INPUT_COMPLETE) {
           cout << "Exec delayed complete-try\n";
           // exec_delayed (scheme_cmd("(if (complete-try?) (noop))"));
@@ -324,7 +324,6 @@ edit_interface_rep::key_press (string gkey) {
   else if (contains_unicode_char (rew)) {
     archive_state ();
     call ("kbd-insert", key);
-    cout << "Inserted single character2: " << rew << "\n";
     interrupt_shortcut ();
   }
 #ifdef Q_OS_MAC
@@ -339,13 +338,11 @@ edit_interface_rep::key_press (string gkey) {
            !inside_active_graphics ()) {
     archive_state ();
     call ("kbd-insert", "<" * key * ">");
-    cout << "Inserted single character3: " << rew << "\n";
     interrupt_shortcut ();
   }
   else if (N (key) > 1 && !is_combo_shortcuts (key) && key != "escape") {
     archive_state ();
     call ("insert", key);
-    cout << "Inserted single character4: " << rew << "\n";
     interrupt_shortcut ();
   }
   else {

src/Graphics/Gui/message.hpp

@@ -509,17 +509,6 @@ set_scroll_position (widget w, SI x, SI y) {
   send<SI, SI> (w, SLOT_SCROLL_POSITION, x, y);
 }
 
-inline void
-show_completion_popup (widget w, array<string>& completions, SI x, SI y) {
-  send<array<string>, SI, SI> (w, SLOT_COMPLETION_LISTBOX_SHOW, completions, x,
-                               y);
-}
-
-inline void
-get_completion_popup_visible (widget w, bool& visible) {
-  query<bool> (w, SLOT_COMPLETION_LISTBOX_VISIBLE);
-}
-
 inline void
 set_completion_popup_visible (widget w, bool visible) {
   send<bool> (w, SLOT_COMPLETION_LISTBOX_VISIBLE, visible);

src/Plugins/Qt/QTMCompletionPopup.cpp

@@ -118,10 +118,7 @@ QTMCompletionPopup::getCachedPosition (SI& x, SI& y) {
 
 void
 QTMCompletionPopup::showComponent () {
-  activateWindow ();
   // Ensure the listbox is visible
-  // Force the widget to be on top
-  setWindowFlags (windowFlags () | Qt::WindowStaysOnTopHint);
   raise ();
   show ();
 }
@@ -140,16 +137,17 @@ QTMCompletionPopup::focusOutEvent (QFocusEvent* event) {
 void
 QTMCompletionPopup::onItemClicked (QListWidgetItem* item) {
   if (item) {
-    emit   completionSelected (item->text ());
     SI     end  = last_item (cached_tp);
     string new_s= getSelectedText ();
     cout << "QTMCompletionPopup::onItemClicked: "
          << "selected text: " << new_s << ", cached_tp: " << cached_tp
          << ", end: " << end << ", lastSelectedText: " << lastSelectedText
          << LF;
-    remove (path_up (cached_tp) * (end - N (lastSelectedText)),
-            N (lastSelectedText));
-    insert (path_up (cached_tp) * (end - N (lastSelectedText)), new_s);
+    //if (new_s != currentSelectedText) {
+      remove (path_up (cached_tp) * (end - N (lastSelectedText)),
+              N (lastSelectedText));
+      insert (path_up (cached_tp) * (end - N (lastSelectedText)), new_s);
+    //}
     widget w= widget (owner_widget);
     set_input_mode_normal (w);
     hide ();
@@ -234,7 +232,9 @@ QTMCompletionPopup::getText (SI idx) {
 void
 QTMCompletionPopup::onCurrentItemChanged (QListWidgetItem* current,
                                           QListWidgetItem* previous) {
-  if (previous) {
+  cout << "onCurrentItemChanged" << LF;
+  if (previous) 
     lastSelectedText= from_qstring (previous->text ());
-  }
+  if (current)
+    currentSelectedText= from_qstring (current->text ());
 }

src/Plugins/Qt/QTMCompletionPopup.hpp

@@ -28,6 +28,7 @@ class QTMCompletionPopup : public QListWidget {
 private:
   qt_simple_widget_rep* owner_widget; // for emiting messages
   string                lastSelectedText;
+  string                currentSelectedText;
   path                  cached_tp;
 
 protected:
@@ -71,9 +72,6 @@ class QTMCompletionPopup : public QListWidget {
                       SI scroll_y, SI canvas_x, SI index);
   string getSelectedText ();
 
-signals:
-  void completionSelected (const QString& text);
-
 protected:
   void keyPressEvent (QKeyEvent* event) override;
   void focusOutEvent (QFocusEvent* event) override;

src/Plugins/Qt/qt_simple_widget.hpp

@@ -90,7 +90,7 @@ class qt_simple_widget_rep : public qt_widget_rep {
   QTMWidget*     canvas () { return qobject_cast<QTMWidget*> (qwid); }
   QTMScrollView* scrollarea () { return qobject_cast<QTMScrollView*> (qwid); }
 
-  ////////////////////// Completion listbox support
+  ////////////////////// Completion popup support
   // TODO: determine when to use slot and to use this routine
   void show_completion_popup (array<string>& completions, SI x, SI y);
   void show_completion_popup (path tp, array<string>& completions,