From a10a0dc3c078417ad3f3062687af86ad29fe9b2c Mon Sep 17 00:00:00 2001 From: eidheim Date: Sun, 21 Jun 2015 16:08:24 +0200 Subject: [PATCH 1/3] Fixed marking of changed tabs that are not saved. --- juci/notebook.cc | 7 +++---- juci/source.cc | 22 +++++++++++++--------- juci/source.h | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/juci/notebook.cc b/juci/notebook.cc index 2d4166f..0f55682 100644 --- a/juci/notebook.cc +++ b/juci/notebook.cc @@ -301,18 +301,16 @@ Gtk::Box& Notebook::Controller::entry_view() { void Notebook::Controller::OnNewPage(std::string name) { INFO("Notebook Generate new page"); OnCreatePage(); - text_vec_.back()->on_new_empty_file(); Notebook().append_page(*editor_vec_.back(), name); Notebook().show_all_children(); Notebook().set_current_page(Pages()-1); Notebook().set_focus_child(text_vec_.at(Pages()-1)->view); - + text_vec_.back()->on_new_empty_file(); } void Notebook::Controller::OnOpenFile(std::string path) { INFO("Notebook open file"); OnCreatePage(); - text_vec_.back()->on_open_file(path); size_t pos = path.find_last_of("/\\"); std::string filename=path; if(pos!=std::string::npos) @@ -321,6 +319,7 @@ void Notebook::Controller::OnOpenFile(std::string path) { Notebook().show_all_children(); Notebook().set_current_page(Pages()-1); Notebook().set_focus_child(text_vec_.back()->view); + text_vec_.back()->on_open_file(path); } void Notebook::Controller::OnCreatePage() { @@ -339,7 +338,7 @@ void Notebook::Controller::OnCreatePage() { std::string filename=path; if(pos!=std::string::npos) filename=path.substr(pos+1); - Notebook().set_tab_label_text(*Notebook().get_nth_page(CurrentPage()), filename+"*"); + Notebook().set_tab_label_text(*(Notebook().get_nth_page(CurrentPage())), filename+"*"); } }; } diff --git a/juci/source.cc b/juci/source.cc index cd9eab4..d8442e7 100644 --- a/juci/source.cc +++ b/juci/source.cc @@ -183,7 +183,7 @@ highlight_token(clang::Token *token, // Constructor for Controller Source::Controller::Controller(const Source::Config &config, const std::vector > &controllers) : - config(config), parser(controllers), parse_thread_go(false), parse_thread_mapped(false), parse_thread_stop(false) { + config(config), parser(controllers), parse_thread_go(true), parse_thread_mapped(false), parse_thread_stop(false) { INFO("Source Controller with childs constructed"); view.signal_key_press_event().connect(sigc::mem_fun(*this, &Source::Controller::on_key_press), false); view.set_smart_home_end(Gsv::SMART_HOME_END_BEFORE); @@ -194,13 +194,6 @@ Source::Controller::Controller(const Source::Config &config, for (auto &item : config.tags) { buffer()->create_tag(item.first)->property_foreground() = item.second; } - buffer()->signal_changed().connect([this]() { - if(signal_buffer_changed) - signal_buffer_changed(is_saved); - is_saved=false; - parse_thread_mapped=false; - parse_thread_go=true; - }); } Source::Controller::~Controller() { @@ -238,12 +231,23 @@ void Source::Controller::update_syntax(const std::vector &ranges) } } +void Source::Controller::set_handlers() { + buffer()->signal_changed().connect([this]() { + if(signal_buffer_changed) + signal_buffer_changed(is_saved); + is_saved=false; + parse_thread_mapped=false; + parse_thread_go=true; + }); +} + void Source::Controller::on_new_empty_file() { string filename("/tmp/untitled"); sourcefile s(filename); parser.file_path=filename; parser.project_path=filename; s.save(""); + set_handlers(); } void Source::Controller::on_open_file(const string &filepath) { @@ -253,8 +257,8 @@ void Source::Controller::on_open_file(const string &filepath) { buffer_map[filepath] = s.get_content(); buffer()->get_undo_manager()->begin_not_undoable_action(); buffer()->set_text(s.get_content()); - is_saved=true; buffer()->get_undo_manager()->end_not_undoable_action(); + set_handlers(); int start_offset = buffer()->begin().get_offset(); int end_offset = buffer()->end().get_offset(); if (config.legal_extension(filepath.substr(filepath.find_last_of(".") + 1))) { diff --git a/juci/source.h b/juci/source.h index 99ede6b..6469915 100644 --- a/juci/source.h +++ b/juci/source.h @@ -107,6 +107,7 @@ namespace Source { const std::vector > &controllers); ~Controller(); void update_syntax(const std::vector &locations); + void set_handlers(); void on_new_empty_file(); void on_open_file(const std::string &filename); Glib::RefPtr buffer(); From 26bae99661e6d1fea9a0998a7b60a3e4cb0723bf Mon Sep 17 00:00:00 2001 From: eidheim Date: Sun, 21 Jun 2015 16:52:24 +0200 Subject: [PATCH 2/3] Fixed save changed file dialog activation, and removed Source::Controller::signal_buffer_changed. --- juci/notebook.cc | 35 +++++++++++++++++++---------------- juci/notebook.h | 2 +- juci/source.cc | 3 --- juci/source.h | 2 -- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/juci/notebook.cc b/juci/notebook.cc index 0f55682..d00c298 100644 --- a/juci/notebook.cc +++ b/juci/notebook.cc @@ -306,6 +306,7 @@ void Notebook::Controller::OnNewPage(std::string name) { Notebook().set_current_page(Pages()-1); Notebook().set_focus_child(text_vec_.at(Pages()-1)->view); text_vec_.back()->on_new_empty_file(); + set_source_handlers(*text_vec_.back()); } void Notebook::Controller::OnOpenFile(std::string path) { @@ -320,6 +321,7 @@ void Notebook::Controller::OnOpenFile(std::string path) { Notebook().set_current_page(Pages()-1); Notebook().set_focus_child(text_vec_.back()->view); text_vec_.back()->on_open_file(path); + set_source_handlers(*text_vec_.back()); } void Notebook::Controller::OnCreatePage() { @@ -329,24 +331,12 @@ void Notebook::Controller::OnCreatePage() { editor_vec_.push_back(new Gtk::HBox()); scrolledtext_vec_.back()->add(text_vec_.back()->view); editor_vec_.back()->pack_start(*scrolledtext_vec_.back(), true, true); - TextViewHandlers(text_vec_.back()->view); - //Add star on tab label when the page is not saved: - text_vec_.back()->signal_buffer_changed=[this](bool was_saved) { - if(was_saved) { - std::string path=text_vec_.at(CurrentPage())->parser.file_path; - size_t pos = path.find_last_of("/\\"); - std::string filename=path; - if(pos!=std::string::npos) - filename=path.substr(pos+1); - Notebook().set_tab_label_text(*(Notebook().get_nth_page(CurrentPage())), filename+"*"); - } - }; } void Notebook::Controller::OnCloseCurrentPage() { INFO("Notebook close page"); if (Pages() != 0) { - if(!text_vec_.back()->is_saved){ + if(!text_vec_.at(CurrentPage())->is_saved){ AskToSaveDialog(); } int page = CurrentPage(); @@ -493,12 +483,25 @@ void Notebook::Controller::BufferChangeHandler(Glib::RefPtr }); } -void Notebook::Controller::TextViewHandlers(Gtk::TextView& textview) { - textview.signal_button_release_event(). +void Notebook::Controller::set_source_handlers(Source::Controller& controller) { + controller.view.signal_button_release_event(). connect(sigc::mem_fun(*this, &Notebook::Controller::OnMouseRelease), false); - textview.signal_key_release_event(). + controller.view.signal_key_release_event(). connect(sigc::mem_fun(*this, &Notebook::Controller::OnKeyRelease), false); + + //Add star on tab label when the page is not saved: + controller.buffer()->signal_changed().connect([this]() { + if(text_vec_.at(CurrentPage())->is_saved) { + std::string path=text_vec_.at(CurrentPage())->parser.file_path; + size_t pos = path.find_last_of("/\\"); + std::string filename=path; + if(pos!=std::string::npos) + filename=path.substr(pos+1); + Notebook().set_tab_label_text(*(Notebook().get_nth_page(CurrentPage())), filename+"*"); + } + text_vec_.at(CurrentPage())->is_saved=false; + }); } void Notebook::Controller::PopupSelectHandler(Gtk::Dialog &popup, diff --git a/juci/notebook.h b/juci/notebook.h index 8361dd8..e9305b2 100644 --- a/juci/notebook.h +++ b/juci/notebook.h @@ -74,7 +74,7 @@ namespace Notebook { bool LegalExtension(std::string extension); protected: - void TextViewHandlers(Gtk::TextView& textview); + void set_source_handlers(Source::Controller& controller); void PopupSelectHandler(Gtk::Dialog &popup, Gtk::ListViewText &listview, std::map diff --git a/juci/source.cc b/juci/source.cc index d8442e7..44b0e7b 100644 --- a/juci/source.cc +++ b/juci/source.cc @@ -233,9 +233,6 @@ void Source::Controller::update_syntax(const std::vector &ranges) void Source::Controller::set_handlers() { buffer()->signal_changed().connect([this]() { - if(signal_buffer_changed) - signal_buffer_changed(is_saved); - is_saved=false; parse_thread_mapped=false; parse_thread_go=true; }); diff --git a/juci/source.h b/juci/source.h index 6469915..927af94 100644 --- a/juci/source.h +++ b/juci/source.h @@ -118,8 +118,6 @@ namespace Source { Parser parser; View view; - std::function signal_buffer_changed; - private: Glib::Dispatcher parse_done; Glib::Dispatcher parse_start; From 714d87a089137848b7b2f9cc9c4017d99435b028 Mon Sep 17 00:00:00 2001 From: eidheim Date: Sun, 21 Jun 2015 21:13:15 +0200 Subject: [PATCH 3/3] Initial restructure of source.h/cc. If its decided to restructure further, this will form an ok starting point for this work. Source::ClangView is now used for cpp-files, and Source::GenericView is used for other files. Source::View is inherited in both cases. See TODO-comment regarding new files. --- juci/notebook.cc | 57 +++---- juci/notebook.h | 4 +- juci/source.cc | 401 +++++++++++++++++++++++------------------------ juci/source.h | 75 +++++---- juci/window.cc | 4 +- 5 files changed, 253 insertions(+), 288 deletions(-) diff --git a/juci/notebook.cc b/juci/notebook.cc index d00c298..177f104 100644 --- a/juci/notebook.cc +++ b/juci/notebook.cc @@ -21,7 +21,6 @@ Notebook::Controller::Controller(Gtk::Window* window, source_config_(source_cfg) { INFO("Create notebook"); window_ = window; - OnNewPage("untitled"); refClipboard_ = Gtk::Clipboard::get(); ispopup = false; view().pack1(directories_.widget(), true, true); @@ -147,7 +146,7 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller connect( [this]() { if (is_new_file_) { - OnNewPage(entry_.text()); + //OnNewPage(entry_.text()); //TODO: rewrite new file (the file needs to be created before opened with Source::Controller in order to choose the correct view implementation) entry_.OnHideEntries(is_new_file_); } else { Search(true); @@ -156,7 +155,7 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller entry_.button_apply().signal_clicked(). connect( [this]() { - OnNewPage(entry_.text()); + //OnNewPage(entry_.text()); //TODO: rewrite new file (the file needs to be created before opened with Source::Controller in order to choose the correct view implementation) entry_.OnHideEntries(is_new_file_); }); entry_.button_close().signal_clicked(). @@ -191,7 +190,7 @@ bool Notebook::Controller::OnKeyRelease(GdkEventKey* key) { bool Notebook::Controller::GeneratePopup(int key_id) { INFO("Notebook genereate popup, getting iters"); - std::string path = text_vec_.at(CurrentPage())->parser.file_path; + std::string path = text_vec_.at(CurrentPage())->view->file_path; if (!source_config().legal_extension(path.substr(path.find_last_of(".") + 1))) return false; // Get function to fill popup with suggests item vector under is for testing Gtk::TextIter beg = CurrentTextView().get_buffer()->get_insert()->get_iter(); @@ -229,7 +228,7 @@ bool Notebook::Controller::GeneratePopup(int key_id) { return false; } INFO("Notebook genereate popup, getting autocompletions"); - std::vector acdata=text_vec_.at(CurrentPage())->parser. + std::vector acdata=text_vec_.at(CurrentPage())->view-> get_autocomplete_suggestions(beg.get_line()+1, beg.get_line_offset()+2); std::map items; @@ -298,20 +297,14 @@ Gtk::Box& Notebook::Controller::entry_view() { return entry_.view(); } -void Notebook::Controller::OnNewPage(std::string name) { - INFO("Notebook Generate new page"); - OnCreatePage(); - Notebook().append_page(*editor_vec_.back(), name); - Notebook().show_all_children(); - Notebook().set_current_page(Pages()-1); - Notebook().set_focus_child(text_vec_.at(Pages()-1)->view); - text_vec_.back()->on_new_empty_file(); - set_source_handlers(*text_vec_.back()); -} - void Notebook::Controller::OnOpenFile(std::string path) { INFO("Notebook open file"); - OnCreatePage(); + INFO("Notebook create page"); + text_vec_.emplace_back(new Source::Controller(source_config(), path, project_path)); + scrolledtext_vec_.push_back(new Gtk::ScrolledWindow()); + editor_vec_.push_back(new Gtk::HBox()); + scrolledtext_vec_.back()->add(*text_vec_.back()->view); + editor_vec_.back()->pack_start(*scrolledtext_vec_.back(), true, true); size_t pos = path.find_last_of("/\\"); std::string filename=path; if(pos!=std::string::npos) @@ -319,20 +312,10 @@ void Notebook::Controller::OnOpenFile(std::string path) { Notebook().append_page(*editor_vec_.back(), filename); Notebook().show_all_children(); Notebook().set_current_page(Pages()-1); - Notebook().set_focus_child(text_vec_.back()->view); - text_vec_.back()->on_open_file(path); + Notebook().set_focus_child(*text_vec_.back()->view); set_source_handlers(*text_vec_.back()); } -void Notebook::Controller::OnCreatePage() { - INFO("Notebook create page"); - text_vec_.emplace_back(new Source::Controller(source_config(), text_vec_)); - scrolledtext_vec_.push_back(new Gtk::ScrolledWindow()); - editor_vec_.push_back(new Gtk::HBox()); - scrolledtext_vec_.back()->add(text_vec_.back()->view); - editor_vec_.back()->pack_start(*scrolledtext_vec_.back(), true, true); -} - void Notebook::Controller::OnCloseCurrentPage() { INFO("Notebook close page"); if (Pages() != 0) { @@ -456,7 +439,7 @@ void Notebook::Controller Source::View& Notebook::Controller::CurrentTextView() { INFO("Getting sourceview"); - return text_vec_.at(CurrentPage())->view; + return *text_vec_.at(CurrentPage())->view; } int Notebook::Controller::CurrentPage() { @@ -465,7 +448,7 @@ int Notebook::Controller::CurrentPage() { Glib::RefPtr Notebook::Controller::Buffer(Source::Controller &source) { - return source.view.get_buffer(); + return source.view->get_buffer(); } int Notebook::Controller::Pages() { @@ -484,16 +467,16 @@ void Notebook::Controller::BufferChangeHandler(Glib::RefPtr } void Notebook::Controller::set_source_handlers(Source::Controller& controller) { - controller.view.signal_button_release_event(). + controller.view->signal_button_release_event(). connect(sigc::mem_fun(*this, &Notebook::Controller::OnMouseRelease), false); - controller.view.signal_key_release_event(). + controller.view->signal_key_release_event(). connect(sigc::mem_fun(*this, &Notebook::Controller::OnKeyRelease), false); //Add star on tab label when the page is not saved: controller.buffer()->signal_changed().connect([this]() { if(text_vec_.at(CurrentPage())->is_saved) { - std::string path=text_vec_.at(CurrentPage())->parser.file_path; + std::string path=text_vec_.at(CurrentPage())->view->file_path; size_t pos = path.find_last_of("/\\"); std::string filename=path; if(pos!=std::string::npos) @@ -547,7 +530,7 @@ void Notebook::Controller::PopupSetSize(Gtk::ScrolledWindow &scroll, } std::string Notebook::Controller::CurrentPagePath(){ - return text_vec_.at(CurrentPage())->parser.file_path; + return text_vec_.at(CurrentPage())->view->file_path; } void Notebook::Controller::FindPopupPosition(Gtk::TextView& textview, @@ -585,7 +568,7 @@ void Notebook::Controller::FindPopupPosition(Gtk::TextView& textview, } bool Notebook::Controller:: OnSaveFile() { - std::string path=text_vec_.at(CurrentPage())->parser.file_path; + std::string path=text_vec_.at(CurrentPage())->view->file_path; return OnSaveFile(path); } bool Notebook::Controller:: OnSaveFile(std::string path) { @@ -595,7 +578,7 @@ bool Notebook::Controller:: OnSaveFile(std::string path) { file.open (path); file << CurrentTextView().get_buffer()->get_text(); file.close(); - text_vec_.at(CurrentPage())->parser.file_path=path; + text_vec_.at(CurrentPage())->view->file_path=path; size_t pos = path.find_last_of("/\\"); std::string filename=path; if(pos!=std::string::npos) @@ -646,7 +629,7 @@ void Notebook::Controller::AskToSaveDialog() { false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO); dialog.set_secondary_text( "Do you want to save: " + - text_vec_.at(CurrentPage())->parser.file_path+" ?"); + text_vec_.at(CurrentPage())->view->file_path+" ?"); DEBUG("AskToSaveDialog: run dialog"); int result = dialog.run(); diff --git a/juci/notebook.h b/juci/notebook.h index e9305b2..0ffff31 100644 --- a/juci/notebook.h +++ b/juci/notebook.h @@ -58,9 +58,7 @@ namespace Notebook { bool OnSaveFile(std::string path); void OnDirectoryNavigation(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column); - void OnNewPage(std::string name); void OnOpenFile(std::string filename); - void OnCreatePage(); bool ScrollEventCallback(GdkEventScroll* scroll_event); int Pages(); Directories::Controller& directories() { return directories_; } @@ -72,7 +70,7 @@ namespace Notebook { bool OnKeyRelease(GdkEventKey* key); std::string OnSaveFileAs(); bool LegalExtension(std::string extension); - + std::string project_path; protected: void set_source_handlers(Source::Controller& controller); void PopupSelectHandler(Gtk::Dialog &popup, diff --git a/juci/source.cc b/juci/source.cc index 44b0e7b..4b0b423 100644 --- a/juci/source.cc +++ b/juci/source.cc @@ -20,8 +20,17 @@ bool Source::Config::legal_extension(std::string e) const { ////////////// //// View //// ////////////// -Source::View::View() { +Source::View::View(const Config& config, const std::string& file_path, const std::string& project_path): +config(config), file_path(file_path), project_path(project_path) { Gsv::init(); + set_smart_home_end(Gsv::SMART_HOME_END_BEFORE); + set_show_line_numbers(config.show_line_numbers); + set_highlight_current_line(config.highlight_current_line); + + sourcefile s(file_path); + get_source_buffer()->get_undo_manager()->begin_not_undoable_action(); + get_source_buffer()->set_text(s.get_content()); + get_source_buffer()->get_undo_manager()->end_not_undoable_action(); } string Source::View::get_line(size_t line_number) { @@ -40,51 +49,113 @@ string Source::View::get_line_before_insert() { return line; } -/////////////// -//// Parser /// -/////////////// -clang::Index Source::Parser::clang_index(0, 1); +////////////////// +//// ClangView /// +////////////////// +clang::Index Source::ClangView::clang_index(0, 1); -Source::Parser::~Parser() { +Source::ClangView::ClangView(const Config& config, const std::string& file_path, const std::string& project_path): +Source::View::View(config, file_path, project_path), +parse_thread_go(true), parse_thread_mapped(false), parse_thread_stop(false) { + override_font(Pango::FontDescription(config.font)); + override_background_color(Gdk::RGBA(config.background)); + for (auto &item : config.tags) { + get_source_buffer()->create_tag(item.first)->property_foreground() = item.second; + } + + int start_offset = get_source_buffer()->begin().get_offset(); + int end_offset = get_source_buffer()->end().get_offset(); + init_syntax_highlighting(get_buffer_map(), + start_offset, + end_offset, + &ClangView::clang_index); + update_syntax(extract_tokens(start_offset, end_offset)); + + //GTK-calls must happen in main thread, so the parse_thread + //sends signals to the main thread that it is to call the following functions: + parse_start.connect([this]{ + if(parse_thread_buffer_map_mutex.try_lock()) { + parse_thread_buffer_map=get_buffer_map(); + parse_thread_mapped=true; + parse_thread_buffer_map_mutex.unlock(); + } + parse_thread_go=true; + }); + + parse_done.connect([this](){ + if(parse_thread_mapped) { + INFO("Updating syntax"); + update_syntax(extract_tokens(0, get_source_buffer()->get_text().size())); + INFO("Syntax updated"); + } + else { + parse_thread_go=true; + } + }); + + parse_thread=std::thread([this]() { + while(true) { + while(!parse_thread_go && !parse_thread_stop) + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + if(parse_thread_stop) + break; + if(!parse_thread_mapped) { + parse_thread_go=false; + parse_start(); + } + else if (parse_thread_mapped && parsing_mutex.try_lock() && parse_thread_buffer_map_mutex.try_lock()) { + reparse(parse_thread_buffer_map); + parse_thread_go=false; + parsing_mutex.unlock(); + parse_thread_buffer_map_mutex.unlock(); + parse_done(); + } + } + }); + + get_source_buffer()->signal_changed().connect([this]() { + parse_thread_mapped=false; + parse_thread_go=true; + }); + + signal_key_press_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_press), false); +} + +Source::ClangView::~ClangView() { + parse_thread_stop=true; + if(parse_thread.joinable()) + parse_thread.join(); parsing_mutex.lock(); //Be sure not to destroy while still parsing with libclang parsing_mutex.unlock(); } -void Source::Parser:: -init_syntax_highlighting(const std::string &filepath, - const std::string &project_path, - const std::map - &buffers, - int start_offset, - int end_offset, - clang::Index *index) { - this->project_path=project_path; +void Source::ClangView:: +init_syntax_highlighting(const std::map + &buffers, + int start_offset, + int end_offset, + clang::Index *index) { std::vector arguments = get_compilation_commands(); tu_ = std::unique_ptr(new clang::TranslationUnit(index, - filepath, - arguments, - buffers)); + file_path, + arguments, + buffers)); } -std::map Source::Parser:: +std::map Source::ClangView:: get_buffer_map() const { std::map buffer_map; - for (auto &controller : controllers) { - buffer_map.operator[](controller->parser.file_path) = - controller->buffer()->get_text().raw(); - } + buffer_map[file_path]=get_source_buffer()->get_text().raw(); return buffer_map; } -// Source::Model::UpdateLine -int Source::Parser:: +int Source::ClangView:: reparse(const std::map &buffer) { return tu_->ReparseTranslationUnit(file_path, buffer); } -std::vector Source::Parser:: -get_autocomplete_suggestions(int line_number, - int column) { +std::vector Source::ClangView:: +get_autocomplete_suggestions(int line_number, int column) { INFO("Getting auto complete suggestions"); std::vector suggestions; auto buffer_map=get_buffer_map(); @@ -108,7 +179,7 @@ get_autocomplete_suggestions(int line_number, return suggestions; } -std::vector Source::Parser:: +std::vector Source::ClangView:: get_compilation_commands() { clang::CompilationDatabase db(project_path+"/"); clang::CompileCommands commands(file_path, &db); @@ -123,7 +194,7 @@ get_compilation_commands() { return arguments; } -std::vector Source::Parser:: +std::vector Source::ClangView:: extract_tokens(int start_offset, int end_offset) { std::vector ranges; clang::SourceLocation start(tu_.get(), file_path, start_offset); @@ -143,7 +214,36 @@ extract_tokens(int start_offset, int end_offset) { return ranges; } -void Source::Parser:: +void Source::ClangView::update_syntax(const std::vector &ranges) { + if (ranges.empty() || ranges.size() == 0) { + return; + } + auto buffer = get_source_buffer(); + buffer->remove_all_tags(buffer->begin(), buffer->end()); + for (auto &range : ranges) { + std::string type = std::to_string(range.kind); + try { + config.types.at(type); + } catch (std::exception) { + continue; + } + int linum_start = range.start.line_number-1; + int linum_end = range.end.line_number-1; + int begin = range.start.column_offset-1; + int end = range.end.column_offset-1; + + if (end < 0) end = 0; + if (begin < 0) begin = 0; + Gtk::TextIter begin_iter = + buffer->get_iter_at_line_offset(linum_start, begin); + Gtk::TextIter end_iter = + buffer->get_iter_at_line_offset(linum_end, end); + buffer->apply_tag_by_name(config.types.at(type), + begin_iter, end_iter); + } +} + +void Source::ClangView:: highlight_cursor(clang::Token *token, std::vector *source_ranges) { clang::SourceLocation location = token->get_source_location(tu_.get()); @@ -159,7 +259,7 @@ highlight_cursor(clang::Token *token, Source::Location(end_line_num, end_offset), (int) cursor.kind()); } -void Source::Parser:: +void Source::ClangView:: highlight_token(clang::Token *token, std::vector *source_ranges, int token_kind) { @@ -175,265 +275,150 @@ highlight_token(clang::Token *token, end_offset), token_kind); } -//////////////////// -//// Controller //// -//////////////////// - -// Source::Controller::Controller() -// Constructor for Controller -Source::Controller::Controller(const Source::Config &config, - const std::vector > &controllers) : - config(config), parser(controllers), parse_thread_go(true), parse_thread_mapped(false), parse_thread_stop(false) { - INFO("Source Controller with childs constructed"); - view.signal_key_press_event().connect(sigc::mem_fun(*this, &Source::Controller::on_key_press), false); - view.set_smart_home_end(Gsv::SMART_HOME_END_BEFORE); - view.override_font(Pango::FontDescription(config.font)); - view.set_show_line_numbers(config.show_line_numbers); - view.set_highlight_current_line(config.highlight_current_line); - view.override_background_color(Gdk::RGBA(config.background)); - for (auto &item : config.tags) { - buffer()->create_tag(item.first)->property_foreground() = item.second; - } -} - -Source::Controller::~Controller() { - parse_thread_stop=true; - if(parse_thread.joinable()) - parse_thread.join(); -} - -void Source::Controller::update_syntax(const std::vector &ranges) { - if (ranges.empty() || ranges.size() == 0) { - return; - } - auto buffer = view.get_buffer(); - buffer->remove_all_tags(buffer->begin(), buffer->end()); - for (auto &range : ranges) { - std::string type = std::to_string(range.kind); - try { - config.types.at(type); - } catch (std::exception) { - continue; - } - int linum_start = range.start.line_number-1; - int linum_end = range.end.line_number-1; - int begin = range.start.column_offset-1; - int end = range.end.column_offset-1; - - if (end < 0) end = 0; - if (begin < 0) begin = 0; - Gtk::TextIter begin_iter = - buffer->get_iter_at_line_offset(linum_start, begin); - Gtk::TextIter end_iter = - buffer->get_iter_at_line_offset(linum_end, end); - buffer->apply_tag_by_name(config.types.at(type), - begin_iter, end_iter); - } -} - -void Source::Controller::set_handlers() { - buffer()->signal_changed().connect([this]() { - parse_thread_mapped=false; - parse_thread_go=true; - }); -} - -void Source::Controller::on_new_empty_file() { - string filename("/tmp/untitled"); - sourcefile s(filename); - parser.file_path=filename; - parser.project_path=filename; - s.save(""); - set_handlers(); -} - -void Source::Controller::on_open_file(const string &filepath) { - parser.file_path=filepath; - sourcefile s(filepath); - auto buffer_map=parser.get_buffer_map(); - buffer_map[filepath] = s.get_content(); - buffer()->get_undo_manager()->begin_not_undoable_action(); - buffer()->set_text(s.get_content()); - buffer()->get_undo_manager()->end_not_undoable_action(); - set_handlers(); - int start_offset = buffer()->begin().get_offset(); - int end_offset = buffer()->end().get_offset(); - if (config.legal_extension(filepath.substr(filepath.find_last_of(".") + 1))) { - parser.init_syntax_highlighting(filepath, - parser.file_path.substr(0, parser.file_path.find_last_of('/')), - buffer_map, - start_offset, - end_offset, - &Parser::clang_index); - update_syntax(parser.extract_tokens(start_offset, end_offset)); - - //GTK-calls must happen in main thread, so the parse_thread - //sends signals to the main thread that it is to call the following functions: - parse_start.connect([this]{ - if(parse_thread_buffer_map_mutex.try_lock()) { - this->parse_thread_buffer_map=parser.get_buffer_map(); - parse_thread_mapped=true; - parse_thread_buffer_map_mutex.unlock(); - } - parse_thread_go=true; - }); - - parse_done.connect([this](){ - if(parse_thread_mapped) { - INFO("Updating syntax"); - update_syntax(parser.extract_tokens(0, buffer()->get_text().size())); - INFO("Syntax updated"); - } - else { - parse_thread_go=true; - } - }); - - parse_thread=std::thread([this]() { - while(true) { - while(!parse_thread_go && !parse_thread_stop) - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - if(parse_thread_stop) - break; - if(!parse_thread_mapped) { - parse_thread_go=false; - parse_start(); - } - else if (parse_thread_mapped && parser.parsing_mutex.try_lock() && parse_thread_buffer_map_mutex.try_lock()) { - parser.reparse(this->parse_thread_buffer_map); - parse_thread_go=false; - parser.parsing_mutex.unlock(); - parse_thread_buffer_map_mutex.unlock(); - parse_done(); - } - } - }); - } -} - -Glib::RefPtr Source::Controller::buffer() { - return view.get_source_buffer(); -} - -//TODO: move indentation to Parser, replace indentation methods with a better implementation or +//TODO: replace indentation methods with a better implementation or //maybe use libclang -bool Source::Controller::on_key_press(GdkEventKey* key) { +bool Source::ClangView::on_key_press(GdkEventKey* key) { const std::regex bracket_regex("^( *).*\\{ *$"); const std::regex no_bracket_statement_regex("^( *)(if|for|else if|catch|while) *\\(.*[^;}] *$"); const std::regex no_bracket_no_para_statement_regex("^( *)(else|try|do) *$"); const std::regex spaces_regex("^( *).*$"); - + //Indent as in previous line, and indent right after if/else/etc if(key->keyval==GDK_KEY_Return && key->state==0) { - string line(view.get_line_before_insert()); + string line(get_line_before_insert()); std::smatch sm; if(std::regex_match(line, sm, bracket_regex)) { - buffer()->insert_at_cursor("\n"+sm[1].str()+config.tab+"\n"+sm[1].str()+"}"); - auto insert_it = buffer()->get_insert()->get_iter(); + get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+config.tab+"\n"+sm[1].str()+"}"); + auto insert_it = get_source_buffer()->get_insert()->get_iter(); for(size_t c=0;cget_insert()); - buffer()->place_cursor(insert_it); + scroll_to(get_source_buffer()->get_insert()); + get_source_buffer()->place_cursor(insert_it); } else if(std::regex_match(line, sm, no_bracket_statement_regex)) { - buffer()->insert_at_cursor("\n"+sm[1].str()+config.tab); - view.scroll_to(buffer()->get_insert()); + get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+config.tab); + scroll_to(get_source_buffer()->get_insert()); } else if(std::regex_match(line, sm, no_bracket_no_para_statement_regex)) { - buffer()->insert_at_cursor("\n"+sm[1].str()+config.tab); - view.scroll_to(buffer()->get_insert()); + get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+config.tab); + scroll_to(get_source_buffer()->get_insert()); } else if(std::regex_match(line, sm, spaces_regex)) { std::smatch sm2; - size_t line_nr=buffer()->get_insert()->get_iter().get_line(); + size_t line_nr=get_source_buffer()->get_insert()->get_iter().get_line(); if(line_nr>0 && sm[1].str().size()>=config.tab_size) { - string previous_line=view.get_line(line_nr-1); + string previous_line=get_line(line_nr-1); if(!std::regex_match(previous_line, sm2, bracket_regex)) { if(std::regex_match(previous_line, sm2, no_bracket_statement_regex)) { - buffer()->insert_at_cursor("\n"+sm2[1].str()); - view.scroll_to(buffer()->get_insert()); + get_source_buffer()->insert_at_cursor("\n"+sm2[1].str()); + scroll_to(get_source_buffer()->get_insert()); return true; } else if(std::regex_match(previous_line, sm2, no_bracket_no_para_statement_regex)) { - buffer()->insert_at_cursor("\n"+sm2[1].str()); - view.scroll_to(buffer()->get_insert()); + get_source_buffer()->insert_at_cursor("\n"+sm2[1].str()); + scroll_to(get_source_buffer()->get_insert()); return true; } } } - buffer()->insert_at_cursor("\n"+sm[1].str()); - view.scroll_to(buffer()->get_insert()); + get_source_buffer()->insert_at_cursor("\n"+sm[1].str()); + scroll_to(get_source_buffer()->get_insert()); } return true; } //Indent right when clicking tab, no matter where in the line the cursor is. Also works on selected text. if(key->keyval==GDK_KEY_Tab && key->state==0) { Gtk::TextIter selection_start, selection_end; - buffer()->get_selection_bounds(selection_start, selection_end); + get_source_buffer()->get_selection_bounds(selection_start, selection_end); int line_start=selection_start.get_line(); int line_end=selection_end.get_line(); for(int line=line_start;line<=line_end;line++) { - Gtk::TextIter line_it = buffer()->get_iter_at_line(line); - buffer()->insert(line_it, config.tab); + Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line); + get_source_buffer()->insert(line_it, config.tab); } return true; } //Indent left when clicking shift-tab, no matter where in the line the cursor is. Also works on selected text. else if((key->keyval==GDK_KEY_ISO_Left_Tab || key->keyval==GDK_KEY_Tab) && key->state==GDK_SHIFT_MASK) { Gtk::TextIter selection_start, selection_end; - buffer()->get_selection_bounds(selection_start, selection_end); + get_source_buffer()->get_selection_bounds(selection_start, selection_end); int line_start=selection_start.get_line(); int line_end=selection_end.get_line(); for(int line_nr=line_start;line_nr<=line_end;line_nr++) { - string line=view.get_line(line_nr); + string line=get_line(line_nr); if(!(line.size()>=config.tab_size && line.substr(0, config.tab_size)==config.tab)) return true; } for(int line_nr=line_start;line_nr<=line_end;line_nr++) { - Gtk::TextIter line_it = buffer()->get_iter_at_line(line_nr); + Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line_nr); Gtk::TextIter line_plus_it=line_it; for(unsigned c=0;cerase(line_it, line_plus_it); + get_source_buffer()->erase(line_it, line_plus_it); } return true; } //Indent left when writing } on a new line else if(key->keyval==GDK_KEY_braceright) { - string line=view.get_line_before_insert(); + string line=get_line_before_insert(); if(line.size()>=config.tab_size) { for(auto c: line) { if(c!=' ') return false; } - Gtk::TextIter insert_it = buffer()->get_insert()->get_iter(); - Gtk::TextIter line_it = buffer()->get_iter_at_line(insert_it.get_line()); + Gtk::TextIter insert_it = get_source_buffer()->get_insert()->get_iter(); + Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(insert_it.get_line()); Gtk::TextIter line_plus_it=line_it; for(unsigned c=0;cerase(line_it, line_plus_it); + get_source_buffer()->erase(line_it, line_plus_it); } return false; } //"Smart" backspace key else if(key->keyval==GDK_KEY_BackSpace) { - Gtk::TextIter insert_it=buffer()->get_insert()->get_iter(); + Gtk::TextIter insert_it=get_source_buffer()->get_insert()->get_iter(); int line_nr=insert_it.get_line(); if(line_nr>0) { - string line=view.get_line(line_nr); - string previous_line=view.get_line(line_nr-1); + string line=get_line(line_nr); + string previous_line=get_line(line_nr-1); smatch sm; if(std::regex_match(previous_line, sm, spaces_regex)) { if(line==sm[1]) { - Gtk::TextIter line_it = buffer()->get_iter_at_line(line_nr); - buffer()->erase(line_it, insert_it); + Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line_nr); + get_source_buffer()->erase(line_it, insert_it); } } } } return false; } + +//////////////////// +//// Controller //// +//////////////////// + +// Source::Controller::Controller() +// Constructor for Controller +Source::Controller::Controller(const Source::Config &config, + const std::string& file_path, std::string project_path) : + config(config) { + if(project_path=="") { + size_t last_of=file_path.find_last_of("\\/"); + if(last_of!=std::string::npos) + project_path=file_path.substr(0, last_of); + } + if (config.legal_extension(file_path.substr(file_path.find_last_of(".") + 1))) + view=std::unique_ptr(new ClangView(config, file_path, project_path)); + else + view=std::unique_ptr(new GenericView(config, file_path, project_path)); + INFO("Source Controller with childs constructed"); +} + +Glib::RefPtr Source::Controller::buffer() { + return view->get_source_buffer(); +} \ No newline at end of file diff --git a/juci/source.h b/juci/source.h index 927af94..1deba5c 100644 --- a/juci/source.h +++ b/juci/source.h @@ -43,13 +43,6 @@ namespace Source { int kind; }; - class View : public Gsv::View { - public: - View(); - std::string get_line(size_t line_number); - std::string get_line_before_insert(); - }; // class View - class AutoCompleteChunk { public: explicit AutoCompleteChunk(const clang::CompletionChunk &clang_chunk) : @@ -64,18 +57,31 @@ namespace Source { chunks(chunks) { } std::vector chunks; }; - - class Controller; - class Parser{ + class View : public Gsv::View { public: - Parser(const std::vector > &controllers): - controllers(controllers) {} - ~Parser(); + View(const Config& config, const std::string& file_path, const std::string& project_path); + std::string get_line(size_t line_number); + std::string get_line_before_insert(); + virtual std::vector get_autocomplete_suggestions(int line_number, int column) {return std::vector();} + std::string file_path; + std::string project_path; + protected: + const Config& config; + }; // class View + + class GenericView : public View { + public: + GenericView(const Config& config, const std::string& file_path, const std::string& project_path): + View(config, file_path, project_path) {} + }; + + class ClangView : public View { + public: + ClangView(const Config& config, const std::string& file_path, const std::string& project_path); + ~ClangView(); // inits the syntax highligthing on file open - void init_syntax_highlighting(const std::string &filepath, - const std::string &project_path, - const std::map + void init_syntax_highlighting(const std::map &buffers, int start_offset, int end_offset, @@ -83,9 +89,8 @@ namespace Source { std::vector get_autocomplete_suggestions(int line_number, int column); int reparse(const std::map &buffers); std::vector extract_tokens(int, int); - - std::string file_path; - std::string project_path; + void update_syntax(const std::vector &locations); + static clang::Index clang_index; std::map get_buffer_map() const; std::mutex parsing_mutex; @@ -97,28 +102,8 @@ namespace Source { void highlight_cursor(clang::Token *token, std::vector *source_ranges); std::vector get_compilation_commands(); - //controllers is needed here, no way around that I think - const std::vector > &controllers; - }; - - class Controller { - public: - Controller(const Source::Config &config, - const std::vector > &controllers); - ~Controller(); - void update_syntax(const std::vector &locations); - void set_handlers(); - void on_new_empty_file(); - void on_open_file(const std::string &filename); - Glib::RefPtr buffer(); bool on_key_press(GdkEventKey* key); - bool is_saved = true; - - Parser parser; - View view; - - private: Glib::Dispatcher parse_done; Glib::Dispatcher parse_start; std::thread parse_thread; @@ -127,7 +112,19 @@ namespace Source { std::atomic parse_thread_go; std::atomic parse_thread_mapped; std::atomic parse_thread_stop; + }; + + class Controller { + public: + Controller(const Source::Config &config, + const std::string& file_path, std::string project_path); + Glib::RefPtr buffer(); + + bool is_saved = true; + std::unique_ptr view; + + private: const Config& config; }; // class Controller } // namespace Source diff --git a/juci/window.cc b/juci/window.cc index 8758903..e139437 100644 --- a/juci/window.cc +++ b/juci/window.cc @@ -142,7 +142,9 @@ void Window::OnFileOpenFolder() { { case(Gtk::RESPONSE_OK): { - notebook_.directories().open_folder(dialog.get_filename()); + std::string project_path=dialog.get_filename(); + notebook_.project_path=project_path; + notebook_.directories().open_folder(project_path); break; } case(Gtk::RESPONSE_CANCEL):