zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Divided SelectionDialog into SelectionDialog and CompleteDialog. SelectionDialog will be used to choose class method to go to.

merge-requests/365/head
eidheim 11 years ago
parent
7149d416b8
commit
57ffd22aa3
7 changed files with 274 additions and 136 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      juci/config.json
  2. 1
      juci/menu.xml
  3. 13
      juci/notebook.cc
  4. 277
      juci/selectiondialog.cc
  5. 48
      juci/selectiondialog.h
  6. 60
      juci/source.cc
  7. 4
      juci/source.h

1
juci/config.json
Unescape View File

@ -59,6 +59,7 @@
"edit_redo": "<control>y", "edit_redo": "<control>y",
"edit_find": "<control>f", "edit_find": "<control>f",
"goto_declaration": "<control>d", "goto_declaration": "<control>d",
"goto_method": "<control>m",
"compile_and_run": "<control><alt>r", "compile_and_run": "<control><alt>r",
"compile": "<control>r" "compile": "<control>r"
}, },

1
juci/menu.xml
Unescape View File

@ -20,6 +20,7 @@
</menu> </menu>
<menu action='SourceMenu'> <menu action='SourceMenu'>
<menuitem action='SourceGotoDeclaration'/> <menuitem action='SourceGotoDeclaration'/>
<menuitem action='SourceGotoMethod'/>
</menu> </menu>
<menu action='ProjectMenu'> <menu action='ProjectMenu'>
<menuitem action='ProjectCompileAndRun'/> <menuitem action='ProjectCompileAndRun'/>

13
juci/notebook.cc
Unescape View File

@ -82,16 +82,19 @@ void Notebook::Controller::CreateKeybindings() {
open_file(location.first); open_file(location.first);
CurrentSourceView()->get_buffer()->place_cursor(CurrentSourceView()->get_buffer()->get_iter_at_offset(location.second)); CurrentSourceView()->get_buffer()->place_cursor(CurrentSourceView()->get_buffer()->get_iter_at_offset(location.second));
CurrentSourceView()->scroll_to(CurrentSourceView()->get_buffer()->get_insert(), 0.0, 1.0, 0.5); CurrentSourceView()->scroll_to(CurrentSourceView()->get_buffer()->get_insert(), 0.0, 1.0, 0.5);
/*CurrentSourceView()->signal_size_allocate().connect([this](Gtk::Allocation& allocation){
auto adj=scrolled_windows.at(CurrentPage())->get_vadjustment();
cout << adj->get_upper() << ", " << adj->get_page_size() << endl;
});*/
} }
} }
} }
}); });
menu->action_group->add(Gtk::Action::create("SourceGotoMethod", "Go to method"), Gtk::AccelKey(menu->key_map["goto_method"]), [this]() {
if(CurrentPage()!=-1) {
if(CurrentSourceView()->goto_method) {
CurrentSourceView()->goto_method();
}
}
});
entry.button_apply_set_filename.signal_clicked().connect([this]() { entry.button_apply_set_filename.signal_clicked().connect([this]() {
std::string filename=entry(); std::string filename=entry();
if(filename!="") { if(filename!="") {

277
juci/selectiondialog.cc
Unescape View File

@ -1,14 +1,23 @@
#include "selectiondialog.h" #include "selectiondialog.h"
SelectionDialog::SelectionDialog(Gtk::TextView& text_view): text_view(text_view) {} namespace sigc {
SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
}
void SelectionDialog::show() { SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, bool popup): text_view(text_view), popup(popup) {}
void SelectionDialogBase::show() {
if(rows.size()==0) if(rows.size()==0)
return; return;
if(popup)
window=std::unique_ptr<Gtk::Window>(new Gtk::Window(Gtk::WindowType::WINDOW_POPUP)); window=std::unique_ptr<Gtk::Window>(new Gtk::Window(Gtk::WindowType::WINDOW_POPUP));
else
window=std::unique_ptr<Gtk::Dialog>(new Gtk::Dialog());
scrolled_window=std::unique_ptr<Gtk::ScrolledWindow>(new Gtk::ScrolledWindow()); scrolled_window=std::unique_ptr<Gtk::ScrolledWindow>(new Gtk::ScrolledWindow());
list_view_text=std::unique_ptr<Gtk::ListViewText>(new Gtk::ListViewText(1, false, Gtk::SelectionMode::SELECTION_BROWSE)); list_view_text=std::unique_ptr<Gtk::ListViewText>(new Gtk::ListViewText(1, false, Gtk::SelectionMode::SELECTION_BROWSE));
search_entry=std::unique_ptr<Gtk::Entry>(new Gtk::Entry());
list_view_text->set_search_entry(*search_entry);
window->set_default_size(0, 0); window->set_default_size(0, 0);
window->property_decorated()=false; window->property_decorated()=false;
@ -24,43 +33,38 @@ void SelectionDialog::show() {
last_selected=-1; last_selected=-1;
list_view_text->signal_row_activated().connect([this](const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*) {
if(shown) {
select();
}
});
list_view_text->signal_cursor_changed().connect(sigc::mem_fun(*this, &SelectionDialog::cursor_changed), true); list_view_text->signal_cursor_changed().connect(sigc::mem_fun(*this, &SelectionDialog::cursor_changed), true);
list_view_text->signal_realize().connect([this](){ list_view_text->signal_realize().connect([this](){
resize(); resize();
}); });
show_offset=text_view.get_buffer()->get_insert()->get_iter().get_offset();
list_view_text->clear_items(); list_view_text->clear_items();
for (auto &i : rows) { for (auto &i : rows) {
list_view_text->append(i.first); list_view_text->append(i.first);
} }
scrolled_window->add(*list_view_text); scrolled_window->add(*list_view_text);
if(popup)
window->add(*scrolled_window); window->add(*scrolled_window);
else {
auto dialog=(Gtk::Dialog*)window.get();
dialog->get_vbox()->pack_start(*search_entry, false, false);
dialog->get_vbox()->pack_start(*scrolled_window, true, true);
dialog->set_transient_for((Gtk::Window&)(*text_view.get_toplevel()));
}
if(rows.size()>0) { if(rows.size()>0) {
list_view_text->get_selection()->select(*list_view_text->get_model()->children().begin()); list_view_text->get_selection()->select(*list_view_text->get_model()->children().begin());
list_view_text->scroll_to_row(list_view_text->get_selection()->get_selected_rows()[0]); list_view_text->scroll_to_row(list_view_text->get_selection()->get_selected_rows()[0]);
} }
move(); move();
window->show_all(); window->show_all();
search_entry->show();
shown=true; shown=true;
row_in_entry=false; row_in_entry=false;
auto text=text_view.get_buffer()->get_text(start_mark->get_iter(), text_view.get_buffer()->get_insert()->get_iter());
if(text.size()>0) {
search_entry.set_text(text);
list_view_text->set_search_entry(search_entry);
}
} }
void SelectionDialog::hide() { void SelectionDialogBase::hide() {
shown=false; shown=false;
window->hide(); window->hide();
if(tooltips) if(tooltips)
@ -69,7 +73,167 @@ void SelectionDialog::hide() {
on_hide(); on_hide();
} }
void SelectionDialog::select(bool hide_window) { void SelectionDialogBase::cursor_changed() {
auto selected=list_view_text->get_selected();
if(selected.size()>0) {
if(selected[0]!=last_selected || last_selected==-1) {
if(tooltips)
tooltips->hide();
auto row = rows.at(list_view_text->get_text(selected[0]));
if(row.second.size()>0) {
tooltips=std::unique_ptr<Tooltips>(new Tooltips());
auto tooltip_text=row.second;
auto get_tooltip_buffer=[this, tooltip_text]() {
auto tooltip_buffer=Gtk::TextBuffer::create(text_view.get_buffer()->get_tag_table());
//TODO: Insert newlines to tooltip_text (use 80 chars, then newline?)
tooltip_buffer->insert_at_cursor(tooltip_text);
return tooltip_buffer;
};
tooltips->emplace_back(get_tooltip_buffer, text_view, text_view.get_buffer()->create_mark(start_mark->get_iter()), text_view.get_buffer()->create_mark(text_view.get_buffer()->get_insert()->get_iter()));
tooltips->show(true);
}
}
}
else if(tooltips)
tooltips->hide();
if(selected.size()>0)
last_selected=selected[0];
else
last_selected=-1;
}
void SelectionDialogBase::move() {
INFO("SelectionDialog set position");
Gdk::Rectangle rectangle;
text_view.get_iter_location(start_mark->get_iter(), rectangle);
int buffer_x=rectangle.get_x();
int buffer_y=rectangle.get_y()+rectangle.get_height();
int window_x, window_y;
text_view.buffer_to_window_coords(Gtk::TextWindowType::TEXT_WINDOW_TEXT, buffer_x, buffer_y, window_x, window_y);
int root_x, root_y;
text_view.get_window(Gtk::TextWindowType::TEXT_WINDOW_TEXT)->get_root_coords(window_x, window_y, root_x, root_y);
window->move(root_x, root_y+1); //TODO: replace 1 with some margin
}
void SelectionDialogBase::resize() {
INFO("SelectionDialog set size");
if(list_view_text->get_realized()) {
int row_width=0, row_height;
Gdk::Rectangle rect;
list_view_text->get_cell_area(list_view_text->get_model()->get_path(list_view_text->get_model()->children().begin()), *(list_view_text->get_column(0)), rect);
row_width=rect.get_width();
row_height=rect.get_height();
row_width+=rect.get_x()*2; //TODO: Add correct margin x and y
row_height+=rect.get_y()*2;
if(row_width>text_view.get_width()/2)
row_width=text_view.get_width()/2;
else
scrolled_window->set_policy(Gtk::PolicyType::POLICY_NEVER, Gtk::PolicyType::POLICY_AUTOMATIC);
int window_height=std::min(row_height*(int)rows.size(), row_height*10);
if(!popup)
window_height+=search_entry->get_height();
window->resize(row_width, window_height);
}
}
SelectionDialog::SelectionDialog(Gtk::TextView& text_view) : SelectionDialogBase(text_view, false) {}
void SelectionDialog::show() {
SelectionDialogBase::show();
std::shared_ptr<std::string> search_key(new std::string());
auto filter_model=Gtk::TreeModelFilter::create(list_view_text->get_model());
filter_model->set_visible_func([this, search_key](const Gtk::TreeModel::const_iterator& iter){
std::string row;
iter->get_value(0, row);
if(row.find(*search_key)!=std::string::npos)
return true;
return false;
});
list_view_text->set_model(filter_model);
list_view_text->set_search_equal_func([this](const Glib::RefPtr<Gtk::TreeModel>& model, int column, const Glib::ustring& key, const Gtk::TreeModel::iterator& iter) {
return false;
});
search_entry->signal_changed().connect([this, search_key, filter_model](){
*search_key=search_entry->get_text();
filter_model->refilter();
list_view_text->set_search_entry(*search_entry); //TODO:Report the need of this to GTK's git (bug)
});
search_entry->signal_event().connect([this, search_key, filter_model](GdkEvent* event) {
if(event->type==GDK_KEY_PRESS) {
auto key=(GdkEventKey*)event;
if(key->keyval==GDK_KEY_Down) {
auto it=list_view_text->get_selection()->get_selected();
if(it) {
it++;
if(it) {
list_view_text->set_cursor(list_view_text->get_model()->get_path(it));
}
}
else
list_view_text->set_cursor(list_view_text->get_model()->get_path(list_view_text->get_model()->children().begin()));
return true;
}
if(key->keyval==GDK_KEY_Up) {
auto it=list_view_text->get_selection()->get_selected();
if(it) {
it--;
if(it) {
list_view_text->set_cursor(list_view_text->get_model()->get_path(it));
}
}
return true;
}
}
return false;
});
auto activate=[this](){
if(on_select && list_view_text->get_selected().size()>0) {
auto it=list_view_text->get_selection()->get_selected();
std::string row;
it->get_value(0, row);
std::string selected = rows.at(row).first;
on_select(selected);
}
window->hide();
};
search_entry->signal_activate().connect([this, activate](){
activate();
});
list_view_text->signal_row_activated().connect([this, activate](const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*) {
activate();
});
window->signal_focus_out_event().connect([this](GdkEventFocus*){
window->hide();
return true;
});
list_view_text->set_cursor(list_view_text->get_model()->get_path(list_view_text->get_model()->children().begin()));
}
CompleteDialog::CompleteDialog(Gtk::TextView& text_view) : SelectionDialogBase(text_view, true) {}
void CompleteDialog::show() {
SelectionDialogBase::show();
show_offset=text_view.get_buffer()->get_insert()->get_iter().get_offset();
list_view_text->signal_row_activated().connect([this](const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*) {
if(shown) {
select();
}
});
auto text=text_view.get_buffer()->get_text(start_mark->get_iter(), text_view.get_buffer()->get_insert()->get_iter());
if(text.size()>0) {
search_entry->set_text(text);
list_view_text->set_search_entry(*search_entry);
}
}
void CompleteDialog::select(bool hide_window) {
row_in_entry=true; row_in_entry=true;
auto selected=list_view_text->get_selected(); auto selected=list_view_text->get_selected();
std::pair<std::string, std::string> select; std::pair<std::string, std::string> select;
@ -97,7 +261,7 @@ void SelectionDialog::select(bool hide_window) {
} }
} }
bool SelectionDialog::on_key_release(GdkEventKey* key) { bool CompleteDialog::on_key_release(GdkEventKey* key) {
if(key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_Up) if(key->keyval==GDK_KEY_Down || key->keyval==GDK_KEY_Up)
return false; return false;
@ -107,15 +271,15 @@ bool SelectionDialog::on_key_release(GdkEventKey* key) {
else { else {
auto text=text_view.get_buffer()->get_text(start_mark->get_iter(), text_view.get_buffer()->get_insert()->get_iter()); auto text=text_view.get_buffer()->get_text(start_mark->get_iter(), text_view.get_buffer()->get_insert()->get_iter());
if(text.size()>0) { if(text.size()>0) {
search_entry.set_text(text); search_entry->set_text(text);
list_view_text->set_search_entry(search_entry); list_view_text->set_search_entry(*search_entry);
} }
cursor_changed(); cursor_changed();
} }
return false; return false;
} }
bool SelectionDialog::on_key_press(GdkEventKey* key) { bool CompleteDialog::on_key_press(GdkEventKey* key) {
if((key->keyval>=GDK_KEY_0 && key->keyval<=GDK_KEY_9) || if((key->keyval>=GDK_KEY_0 && key->keyval<=GDK_KEY_9) ||
(key->keyval>=GDK_KEY_A && key->keyval<=GDK_KEY_Z) || (key->keyval>=GDK_KEY_A && key->keyval<=GDK_KEY_Z) ||
(key->keyval>=GDK_KEY_a && key->keyval<=GDK_KEY_z) || (key->keyval>=GDK_KEY_a && key->keyval<=GDK_KEY_z) ||
@ -136,8 +300,7 @@ bool SelectionDialog::on_key_press(GdkEventKey* key) {
if(it) { if(it) {
it++; it++;
if(it) { if(it) {
list_view_text->get_selection()->select(it); list_view_text->set_cursor(list_view_text->get_model()->get_path(it));
list_view_text->scroll_to_row(list_view_text->get_selection()->get_selected_rows()[0]);
} }
} }
select(false); select(false);
@ -149,8 +312,7 @@ bool SelectionDialog::on_key_press(GdkEventKey* key) {
if(it) { if(it) {
it--; it--;
if(it) { if(it) {
list_view_text->get_selection()->select(it); list_view_text->set_cursor(list_view_text->get_model()->get_path(it));
list_view_text->scroll_to_row(list_view_text->get_selection()->get_selected_rows()[0]);
} }
} }
select(false); select(false);
@ -164,68 +326,3 @@ bool SelectionDialog::on_key_press(GdkEventKey* key) {
hide(); hide();
return false; return false;
} }
void SelectionDialog::cursor_changed() {
auto selected=list_view_text->get_selected();
if(selected.size()>0) {
if(selected[0]!=last_selected || last_selected==-1) {
if(tooltips)
tooltips->hide();
auto row = rows.at(list_view_text->get_text(selected[0]));
if(row.second.size()>0) {
tooltips=std::unique_ptr<Tooltips>(new Tooltips());
auto tooltip_text=row.second;
auto get_tooltip_buffer=[this, tooltip_text]() {
auto tooltip_buffer=Gtk::TextBuffer::create(text_view.get_buffer()->get_tag_table());
//TODO: Insert newlines to tooltip_text (use 80 chars, then newline?)
tooltip_buffer->insert_at_cursor(tooltip_text);
return tooltip_buffer;
};
tooltips->emplace_back(get_tooltip_buffer, text_view, text_view.get_buffer()->create_mark(start_mark->get_iter()), text_view.get_buffer()->create_mark(text_view.get_buffer()->get_insert()->get_iter()));
tooltips->show(true);
}
}
}
else if(tooltips)
tooltips->hide();
if(selected.size()>0)
last_selected=selected[0];
else
last_selected=-1;
}
void SelectionDialog::move() {
INFO("SelectionDialog set position");
Gdk::Rectangle rectangle;
text_view.get_iter_location(start_mark->get_iter(), rectangle);
int buffer_x=rectangle.get_x();
int buffer_y=rectangle.get_y()+rectangle.get_height();
int window_x, window_y;
text_view.buffer_to_window_coords(Gtk::TextWindowType::TEXT_WINDOW_TEXT, buffer_x, buffer_y, window_x, window_y);
int root_x, root_y;
text_view.get_window(Gtk::TextWindowType::TEXT_WINDOW_TEXT)->get_root_coords(window_x, window_y, root_x, root_y);
window->move(root_x, root_y+1); //TODO: replace 1 with some margin
}
void SelectionDialog::resize() {
INFO("SelectionDialog set size");
if(list_view_text->get_realized()) {
int row_width=0, row_height;
Gdk::Rectangle rect;
list_view_text->get_cell_area(list_view_text->get_model()->get_path(list_view_text->get_model()->children().begin()), *(list_view_text->get_column(0)), rect);
row_width=rect.get_width();
row_height=rect.get_height();
row_width+=rect.get_x()*2; //TODO: Add correct margin x and y
row_height+=rect.get_y()*2;
if(row_width>text_view.get_width()/2)
row_width=text_view.get_width()/2;
else
scrolled_window->set_policy(Gtk::PolicyType::POLICY_NEVER, Gtk::PolicyType::POLICY_AUTOMATIC);
int window_height=std::min(row_height*(int)rows.size(), row_height*10);
window->resize(row_width, window_height);
}
}

48
juci/selectiondialog.h
Unescape View File

@ -5,35 +5,53 @@
#include "logging.h" #include "logging.h"
#include "tooltips.h" #include "tooltips.h"
class SelectionDialog { class SelectionDialogBase {
public: public:
SelectionDialog(Gtk::TextView& text_view); SelectionDialogBase(Gtk::TextView& text_view, bool popup);
void show(); virtual void show();
void hide(); virtual void hide();
bool close(GdkEventFocus*); virtual void move();
void move();
bool on_key_release(GdkEventKey* key);
bool on_key_press(GdkEventKey* key);
std::function<void()> on_hide;
std::map<std::string, std::pair<std::string, std::string> > rows; std::map<std::string, std::pair<std::string, std::string> > rows;
std::function<void()> on_hide;
bool shown=false; bool shown=false;
Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark; Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark;
private: protected:
void resize(); virtual void resize();
void select(bool hide_window=true); virtual void cursor_changed();
void cursor_changed();
Gtk::Entry search_entry;
int show_offset;
bool row_in_entry; bool row_in_entry;
Gtk::TextView& text_view; Gtk::TextView& text_view;
std::unique_ptr<Gtk::Window> window; std::unique_ptr<Gtk::Window> window;
std::unique_ptr<Gtk::ScrolledWindow> scrolled_window; std::unique_ptr<Gtk::ScrolledWindow> scrolled_window;
std::unique_ptr<Gtk::ListViewText> list_view_text; std::unique_ptr<Gtk::ListViewText> list_view_text;
std::unique_ptr<Gtk::Entry> search_entry;
std::unique_ptr<Tooltips> tooltips; std::unique_ptr<Tooltips> tooltips;
int last_selected; int last_selected;
private:
bool popup;
};
class SelectionDialog : public SelectionDialogBase {
public:
SelectionDialog(Gtk::TextView& text_view);
void show();
std::function<void(std::string selected)> on_select;
};
class CompleteDialog : public SelectionDialogBase {
public:
CompleteDialog(Gtk::TextView& text_view);
void show();
bool on_key_release(GdkEventKey* key);
bool on_key_press(GdkEventKey* key);
private:
void select(bool hide_window=true);
int show_offset;
bool row_in_entry;
}; };
#endif // JUCI_SELECTIONDIALOG_H_ #endif // JUCI_SELECTIONDIALOG_H_

60
juci/source.cc
Unescape View File

@ -547,32 +547,32 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) {
//// ClangViewAutocomplete /// //// ClangViewAutocomplete ///
////////////////////////////// //////////////////////////////
Source::ClangViewAutocomplete::ClangViewAutocomplete(const std::string& file_path, const std::string& project_path): Source::ClangViewAutocomplete::ClangViewAutocomplete(const std::string& file_path, const std::string& project_path):
Source::ClangViewParse(file_path, project_path), selection_dialog(*this), autocomplete_cancel_starting(false) { Source::ClangViewParse(file_path, project_path), complete_dialog(*this), autocomplete_cancel_starting(false) {
selection_dialog.on_hide=[this](){ complete_dialog.on_hide=[this](){
start_reparse(); start_reparse();
}; };
get_buffer()->signal_changed().connect([this](){ get_buffer()->signal_changed().connect([this](){
if(selection_dialog.shown) if(complete_dialog.shown)
delayed_reparse_connection.disconnect(); delayed_reparse_connection.disconnect();
start_autocomplete(); start_autocomplete();
}); });
get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark){ get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark){
if(mark->get_name()=="insert") { if(mark->get_name()=="insert") {
autocomplete_cancel_starting=true; autocomplete_cancel_starting=true;
if(selection_dialog.shown) { if(complete_dialog.shown) {
selection_dialog.hide(); complete_dialog.hide();
} }
} }
}); });
signal_scroll_event().connect([this](GdkEventScroll* event){ signal_scroll_event().connect([this](GdkEventScroll* event){
if(selection_dialog.shown) if(complete_dialog.shown)
selection_dialog.hide(); complete_dialog.hide();
return false; return false;
}, false); }, false);
signal_key_release_event().connect([this](GdkEventKey* key){ signal_key_release_event().connect([this](GdkEventKey* key){
if(selection_dialog.shown) { if(complete_dialog.shown) {
if(selection_dialog.on_key_release(key)) if(complete_dialog.on_key_release(key))
return true; return true;
} }
@ -582,16 +582,16 @@ Source::ClangViewParse(file_path, project_path), selection_dialog(*this), autoco
bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) { bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) {
last_keyval=key->keyval; last_keyval=key->keyval;
if(selection_dialog.shown) { if(complete_dialog.shown) {
if(selection_dialog.on_key_press(key)) if(complete_dialog.on_key_press(key))
return true; return true;
} }
return ClangViewParse::on_key_press_event(key); return ClangViewParse::on_key_press_event(key);
} }
bool Source::ClangViewAutocomplete::on_focus_out_event(GdkEventFocus* event) { bool Source::ClangViewAutocomplete::on_focus_out_event(GdkEventFocus* event) {
if(selection_dialog.shown) { if(complete_dialog.shown) {
selection_dialog.hide(); complete_dialog.hide();
} }
return Source::ClangViewParse::on_focus_out_event(event); return Source::ClangViewParse::on_focus_out_event(event);
@ -613,7 +613,7 @@ void Source::ClangViewAutocomplete::start_autocomplete() {
prefix_mutex.lock(); prefix_mutex.lock();
prefix=sm[3].str(); prefix=sm[3].str();
prefix_mutex.unlock(); prefix_mutex.unlock();
if((prefix.size()==0 || prefix[0]<'0' || prefix[0]>'9') && !autocomplete_starting && !selection_dialog.shown) { if((prefix.size()==0 || prefix[0]<'0' || prefix[0]>'9') && !autocomplete_starting && !complete_dialog.shown) {
autocomplete(); autocomplete();
} }
else if(last_keyval=='.' && autocomplete_starting) else if(last_keyval=='.' && autocomplete_starting)
@ -623,13 +623,13 @@ void Source::ClangViewAutocomplete::start_autocomplete() {
prefix_mutex.lock(); prefix_mutex.lock();
prefix=sm[3].str(); prefix=sm[3].str();
prefix_mutex.unlock(); prefix_mutex.unlock();
if((prefix.size()==0 || prefix[0]<'0' || prefix[0]>'9') && !autocomplete_starting && !selection_dialog.shown) { if((prefix.size()==0 || prefix[0]<'0' || prefix[0]>'9') && !autocomplete_starting && !complete_dialog.shown) {
autocomplete(); autocomplete();
} }
} }
else else
autocomplete_cancel_starting=true; autocomplete_cancel_starting=true;
if(autocomplete_starting || selection_dialog.shown) if(autocomplete_starting || complete_dialog.shown)
delayed_reparse_connection.disconnect(); delayed_reparse_connection.disconnect();
} }
} }
@ -644,12 +644,12 @@ void Source::ClangViewAutocomplete::autocomplete() {
autocomplete_done_connection=autocomplete_done.connect([this, ac_data](){ autocomplete_done_connection=autocomplete_done.connect([this, ac_data](){
autocomplete_starting=false; autocomplete_starting=false;
if(!autocomplete_cancel_starting) { if(!autocomplete_cancel_starting) {
if(selection_dialog.start_mark) if(complete_dialog.start_mark)
get_buffer()->delete_mark(selection_dialog.start_mark); get_buffer()->delete_mark(complete_dialog.start_mark);
auto start_iter=get_buffer()->get_insert()->get_iter(); auto start_iter=get_buffer()->get_insert()->get_iter();
for(size_t c=0;c<prefix.size();c++) for(size_t c=0;c<prefix.size();c++)
start_iter--; start_iter--;
selection_dialog.start_mark=get_buffer()->create_mark(start_iter); complete_dialog.start_mark=get_buffer()->create_mark(start_iter);
std::map<std::string, std::pair<std::string, std::string> > rows; std::map<std::string, std::pair<std::string, std::string> > rows;
for (auto &data : *ac_data) { for (auto &data : *ac_data) {
@ -673,8 +673,8 @@ void Source::ClangViewAutocomplete::autocomplete() {
if (rows.empty()) { if (rows.empty()) {
rows["No suggestions found..."] = std::pair<std::string, std::string>(); rows["No suggestions found..."] = std::pair<std::string, std::string>();
} }
selection_dialog.rows=std::move(rows); complete_dialog.rows=std::move(rows);
selection_dialog.show(); complete_dialog.show();
} }
else else
start_autocomplete(); start_autocomplete();
@ -740,7 +740,7 @@ get_autocomplete_suggestions(int line_number, int column, std::map<std::string,
//////////////////////////// ////////////////////////////
Source::ClangViewRefactor::ClangViewRefactor(const std::string& file_path, const std::string& project_path): Source::ClangViewRefactor::ClangViewRefactor(const std::string& file_path, const std::string& project_path):
Source::ClangViewAutocomplete(file_path, project_path) { Source::ClangViewAutocomplete(file_path, project_path), selection_dialog(*this) {
similar_tokens_tag=get_buffer()->create_tag(); similar_tokens_tag=get_buffer()->create_tag();
similar_tokens_tag->property_weight()=Pango::WEIGHT_BOLD; similar_tokens_tag->property_weight()=Pango::WEIGHT_BOLD;
@ -803,6 +803,22 @@ Source::ClangViewAutocomplete(file_path, project_path) {
} }
return location; return location;
}; };
goto_method=[this](){
if(selection_dialog.start_mark)
get_buffer()->delete_mark(selection_dialog.start_mark);
selection_dialog.start_mark=get_buffer()->create_mark(get_buffer()->get_insert()->get_iter());
std::map<std::string, std::pair<std::string, std::string> > rows;
rows["Not implemented yet"]=std::pair<std::string, std::string>("1", "");
rows["but you can try the selection search"]=std::pair<std::string, std::string>("2", "");
rows["search for instance for 'try'"]=std::pair<std::string, std::string>("3", "");
selection_dialog.rows=std::move(rows);
selection_dialog.on_select=[this](std::string selected) {
cout << selected << endl;
};
selection_dialog.show();
};
} }
//////////////// ////////////////

4
juci/source.h
Unescape View File

@ -54,6 +54,7 @@ public:
Gtk::TextIter search_start, search_end; Gtk::TextIter search_start, search_end;
std::function<std::pair<std::string, unsigned>()> get_declaration_location; std::function<std::pair<std::string, unsigned>()> get_declaration_location;
std::function<void()> goto_method;
bool after_user_input=false; bool after_user_input=false;
protected: protected:
bool on_key_press_event(GdkEventKey* key); bool on_key_press_event(GdkEventKey* key);
@ -119,7 +120,7 @@ public:
private: private:
void start_autocomplete(); void start_autocomplete();
void autocomplete(); void autocomplete();
SelectionDialog selection_dialog; CompleteDialog complete_dialog;
std::vector<Source::AutoCompleteData> get_autocomplete_suggestions(int line_number, int column, std::map<std::string, std::string>& buffer_map); std::vector<Source::AutoCompleteData> get_autocomplete_suggestions(int line_number, int column, std::map<std::string, std::string>& buffer_map);
Glib::Dispatcher autocomplete_done; Glib::Dispatcher autocomplete_done;
sigc::connection autocomplete_done_connection; sigc::connection autocomplete_done_connection;
@ -136,6 +137,7 @@ public:
private: private:
Glib::RefPtr<Gtk::TextTag> similar_tokens_tag; Glib::RefPtr<Gtk::TextTag> similar_tokens_tag;
std::string last_similar_tokens_tagged; std::string last_similar_tokens_tagged;
SelectionDialog selection_dialog;
}; };
class ClangView : public ClangViewRefactor { class ClangView : public ClangViewRefactor {

Write Preview
Loading…
Cancel
Save