auto adjust pos & mouse event

Author: JimZhouZZY

src/Edit/Interface/edit_complete.cpp

@@ -1,3 +1,4 @@
+
 /******************************************************************************
  * MODULE     : edit_complete.cpp
  * DESCRIPTION: Tab completion
@@ -57,6 +58,7 @@ find_completions (drd_info drd, tree t, hashset<string>& h, string prefix= "") {
 static array<string>
 find_completions (drd_info drd, tree t, string prefix= "") {
   hashset<string> h;
+  h->insert (string(""));
   find_completions (drd, t, h, prefix);
   return as_completions (h);
 }
@@ -132,34 +134,36 @@ edit_interface_rep::complete_start (string prefix, array<string> compls) {
     completion_prefix= prefix;
     completions      = close_completions (compls);
     completion_pos   = 0;
-    bool visible;
-    SERVER (get_completion_listbox_visible (visible))
-    if (!visible) {
-      // TODO: refactor this part to edit_interface_rep::show_completion_listbox
+    {
+      // TODO: ?refactor this part to edit_interface_rep::show_completion_listbox
+      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];
-        if (c == completion_prefix) continue; // skip the prefix itself
         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 << "Prefix Cursor: " << cu->ox << ", " << cu->oy << LF;
-      SI pos_x=
-          ((cu->ox - get_scroll_x () - 500) * magf + get_canvas_x ()) / 256;
-      SI pos_y= -((cu->oy - 5000 - get_scroll_y ()) * magf) / 256;
-      // TODO: 5000 is a magic number to add space between completion list box
-      // and the text.
-      //       We need to find a better way to get the position
-
-      SERVER (show_completion_listbox (full_completions, pos_x, pos_y));
+      cout << "show_completion_listbox: "
+           << "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_listbox (tp, full_completions, cu, magf, get_scroll_x(), get_scroll_y(), get_canvas_x());
     }
-
     insert_tree (completions[0]);
     complete_message ();
     beep ();
@@ -199,19 +203,20 @@ edit_interface_rep::complete_keypress (string key) {
 
   if (key == "tab" || key == "down") {
     completion_pos++;
-    SERVER (set_completion_listbox_next (true));
+    completion_listbox_next (true);
   }
   else if (key == "S-tab" || key == "up") {
     completion_pos--;
-    SERVER (set_completion_listbox_next (false));
+    completion_listbox_next (false);
   }
   if (completion_pos < 0) completion_pos= N (completions) - 1;
   if (completion_pos >= N (completions)) completion_pos= 0;
-  SERVER (set_completion_listbox_visible (true))
   string new_s= completions[completion_pos];
   remove (path_up (tp) * (end - N (old_s)), N (old_s));
   insert (path_up (tp) * (end - N (old_s)), new_s);
   complete_message ();
+  apply_changes(); // sync eb, for calculating the new cursor position
+  update_completion_listbox_position (et, eb, tp, magf, get_scroll_x(), get_scroll_y(), get_canvas_x(), completion_pos);
   return true;
 }
 
@@ -268,6 +273,7 @@ edit_interface_rep::custom_complete (tree r) {
   int           i, n= N (r);
   string        prefix;
   array<string> compls;
+  compls << string ("");
   for (i= 0; i < n; i++)
     if (is_atomic (r[i])) {
       string l= r[i]->label;

src/Edit/Interface/edit_interface.cpp

@@ -1095,3 +1095,8 @@ void
 edit_interface_rep::handle_set_zoom_factor (double zoom) {
   set_zoom_factor (zoom);
 }
+
+void
+edit_interface_rep::handle_set_input_normal () {
+  set_input_normal ();
+}

src/Edit/Interface/edit_interface.hpp

@@ -234,6 +234,7 @@ class edit_interface_rep : virtual public editor_rep {
   void handle_set_zoom_factor (double zoomf);
   void handle_clear (renderer win, SI x1, SI y1, SI x2, SI y2);
   void handle_repaint (renderer win, SI x1, SI y1, SI x2, SI y2);
+  void handle_set_input_normal();
 
   friend class interactive_command_rep;
   friend class tm_window_rep;

src/Edit/Interface/edit_mouse.cpp

@@ -563,8 +563,10 @@ edit_interface_rep::mouse_any (string type, SI x, SI y, int mods, time_t t,
   if (type == "move") mouse_message ("move", x, y);
 
   if (type == "leave") set_pointer ("XC_top_left_arrow");
-  if ((!move_like) && (type != "enter") && (type != "leave"))
+  if ((!move_like) && (type != "enter") && (type != "leave")) {
     set_input_normal ();
+    SERVER (set_completion_listbox_visible (false));
+  }
   if (!is_nil (popup_win) && (type != "leave")) {
     set_visibility (popup_win, false);
     destroy_window_widget (popup_win);

src/Graphics/Gui/message.hpp

@@ -54,6 +54,7 @@ enum slot_id {
   SLOT_COMPLETION_LISTBOX_SHOW,
   SLOT_COMPLETION_LISTBOX_VISIBLE,
   SLOT_COMPLETION_LISTBOX_NEXT,
+  SLOT_INPUT_MODE_NORMAL,
   SLOT_CANVAS,
   SLOT_SCROLLABLE,
   SLOT_CURSOR,
@@ -526,6 +527,11 @@ set_completion_listbox_next (widget w, bool next) {
   send<bool> (w, SLOT_COMPLETION_LISTBOX_NEXT, next);
 }
 
+inline void
+set_input_mode_normal (widget w) {
+  send (w, SLOT_INPUT_MODE_NORMAL);
+}
+
 inline void
 get_scroll_position (widget w, SI& x, SI& y) {
   // get scroll position in a canvas

src/Graphics/Gui/widget.cpp

@@ -50,6 +50,7 @@ slot_name (const slot s) {
                              "SLOT_COMPLETION_LISTBOX_SHOW",
                              "SLOT_COMPLETION_LISTBOX_VISIBLE",
                              "SLOT_COMPLETION_LISTBOX_NEXT",
+                             "SLOT_INPUT_MODE_NORMAL",
                              "SLOT_CANVAS",
                              "SLOT_SCROLLABLE",
                              "SLOT_CURSOR",

src/Plugins/Qt/QTMScrollView.cpp

@@ -187,6 +187,9 @@ void
 QTMScrollView::scrollContentsBy (int dx, int dy) {
   if (dx) p_origin.setX (p_origin.x () - dx);
   if (dy) p_origin.setY (p_origin.y () - dy);
+  qDebug () << "QTMScrollView::scrollContentsBy: "
+           << "dx=" << dx << ", dy=" << dy
+           << ", new origin: " << p_origin.x () << ", " << p_origin.y ();
 }
 
 bool

src/Plugins/Qt/QTMTreeModel.hpp

@@ -18,6 +18,8 @@
 #include "observer.hpp"
 #include "tree.hpp"
 
+#define DETACHED (-5)
+
 class QTMTreeModel;
 
 /*! An observer to keep a tree in sync with a QTMTreeModel (QAbstractItemModel).
@@ -100,7 +102,6 @@ class QTMTreeModel : public QAbstractItemModel {
   static const char* bad_tree_data_exception;
   static const char* no_observer_exception;
 
-  static const int DETACHED= -5;
   // NOTE: for some reason using hashmap was resulting in overwritten values.
   // The very same code with QHash works ok. ?!?!
   // typedef hashmap<tree_label, hashmap <int, int> > roles_t;

src/Plugins/Qt/QTMWidget.cpp

@@ -85,9 +85,10 @@ QTMWidget::tm_widget () const {
 
 void
 QTMWidget::scrollContentsBy (int dx, int dy) {
+  //tm_widget() -> scroll_completion_listbox_by (dx, dy);
   QTMScrollView::scrollContentsBy (dx, dy);
-
   the_gui->force_update ();
+  tm_widget ()->scroll_completion_listbox_by(dx, dy);
   // we force an update of the internal state to be in sync with the moving
   // scrollbars
 }