zalox
/
juci-archives
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of bitbucket.org:cppit/juci

master
oyvang 11 years ago
parent
dcc31583ea 5430449133
commit
9980889d1e
8 changed files with 492 additions and 303 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. 2
      juci/CMakeLists.txt
  2. 11
      juci/config.cc
  3. 19
      juci/directories.cc
  4. 21
      juci/directories.h
  5. 295
      juci/notebook.cc
  6. 22
      juci/notebook.h
  7. 326
      juci/source.cc
  8. 99
      juci/source.h

2
juci/CMakeLists.txt
Unescape View File

@ -3,7 +3,7 @@ set(project_name juci)
set(module juci_to_python_api) set(module juci_to_python_api)
project (${project_name}) project (${project_name})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/")
INCLUDE(FindPkgConfig) INCLUDE(FindPkgConfig)

11
juci/config.cc
Unescape View File

@ -15,11 +15,14 @@ void MainConfig::GenerateSource() {
boost::property_tree::ptree source_json = cfg_.get_child("source"); boost::property_tree::ptree source_json = cfg_.get_child("source");
boost::property_tree::ptree syntax_json = source_json.get_child("syntax"); boost::property_tree::ptree syntax_json = source_json.get_child("syntax");
boost::property_tree::ptree colors_json = source_json.get_child("colors"); boost::property_tree::ptree colors_json = source_json.get_child("colors");
for ( auto &i : syntax_json ) for ( auto &i : colors_json ) {
source_cfg_.InsertTag(i.first, i.second.get_value<std::string>()); source_cfg_.InsertTag(i.first, i.second.get_value<std::string>());
std::cout << "inserting tag, key: " << i.first << " value: " << i.second.get_value<std::string>() << std::endl;
for ( auto &i : colors_json ) }
source_cfg_.InsertType(i.first, i.second.get_value<std::string>()); for ( auto &i : syntax_json ) {
source_cfg_.InsertType(i.first, i.second.get_value<std::string>());
std::cout << "inserting type, key: " << i.first << " value: " << i.second.get_value<std::string>() << std::endl;
}
} }
void MainConfig::GenerateKeybindings() { void MainConfig::GenerateKeybindings() {

19
juci/directories.cc
Unescape View File

@ -6,7 +6,7 @@ Directories::Controller::Controller(Directories::Config& cfg) :
m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
} }
bool Directories::Controller:: void Directories::Controller::
open_folder(const boost::filesystem::path& dir_path) { open_folder(const boost::filesystem::path& dir_path) {
m_refTreeModel = Gtk::TreeStore::create(view()); m_refTreeModel = Gtk::TreeStore::create(view());
m_TreeView.set_model(m_refTreeModel); m_TreeView.set_model(m_refTreeModel);
@ -95,18 +95,29 @@ get_project_name(const boost::filesystem::path& dir_path) {
size_t variabel_end = line.find("}", variabel_start); size_t variabel_end = line.find("}", variabel_start);
project_name_var = line.substr(variabel_start+1, project_name_var = line.substr(variabel_start+1,
(variabel_end)-variabel_start-1); (variabel_end)-variabel_start-1);
boost::algorithm::trim(project_name_var);
if (variabel_start == std::string::npos) { // not a variabel
variabel_start = line.find("(", 0);
variabel_end = line.find(")", variabel_start);
return line.substr(variabel_start+1,
(variabel_end)-variabel_start-1);
}
break; break;
} }
} }
std::ifstream ifs2(itr->path().string()); std::ifstream ifs2(itr->path().string());
while (std::getline(ifs2, line)) { while (std::getline(ifs2, line)) {
if (line.find("set("+project_name_var, 0) != std::string::npos) { if (line.find("set(", 0) != std::string::npos
|| line.find("set (", 0) != std::string::npos) {
if( line.find(project_name_var, 0) != std::string::npos) {
size_t variabel_start = line.find(project_name_var, 0) size_t variabel_start = line.find(project_name_var, 0)
+project_name_var.length(); +project_name_var.length();
size_t variabel_end = line.find(")", variabel_start); size_t variabel_end = line.find(")", variabel_start);
project_name = line.substr(variabel_start, project_name = line.substr(variabel_start+1,
variabel_end-variabel_start); variabel_end-variabel_start-1);
boost::algorithm::trim(project_name);
return project_name; return project_name;
}
} }
} }
break; break;

21
juci/directories.h
Unescape View File

@ -4,14 +4,14 @@
#include <gtkmm.h> #include <gtkmm.h>
#include <glib.h> #include <glib.h>
#include "boost/filesystem.hpp" #include "boost/filesystem.hpp"
#include "boost/algorithm/string.hpp"
#include <utility> #include <utility>
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
namespace Directories { namespace Directories {
class Config { class Config {
public: public:
Config(Config &original); Config(Config &original);
@ -38,9 +38,8 @@ namespace Directories {
Gtk::TreeModelColumn<Glib::ustring> m_col_path; Gtk::TreeModelColumn<Glib::ustring> m_col_path;
}; };
class Model { class Model { };
};
class Controller { class Controller {
public: public:
Controller(); Controller();
@ -49,22 +48,24 @@ namespace Directories {
Model& model() { return model_;} Model& model() { return model_;}
Directories::Config& config() { return config_;} Directories::Config& config() { return config_;}
Gtk::ScrolledWindow& widget() {return m_ScrolledWindow;} Gtk::ScrolledWindow& widget() {return m_ScrolledWindow;}
bool open_folder (const boost::filesystem::path& dir_path); void open_folder(const boost::filesystem::path& dir_path);
void list_dirs (const boost::filesystem::path& dir_path, void list_dirs(const boost::filesystem::path& dir_path,
Gtk::TreeModel::Row &row, unsigned depth); Gtk::TreeModel::Row &row, unsigned depth);
std::string get_project_name(const boost::filesystem::path& dir_path); std::string get_project_name(const boost::filesystem::path& dir_path);
int count (const std::string path); int count(const std::string path);
//Child widgets: // Child widgets:
Gtk::Box m_VBox; Gtk::Box m_VBox;
Gtk::ScrolledWindow m_ScrolledWindow; Gtk::ScrolledWindow m_ScrolledWindow;
Gtk::TreeView m_TreeView; Gtk::TreeView m_TreeView;
Glib::RefPtr<Gtk::TreeStore> m_refTreeModel; Glib::RefPtr<Gtk::TreeStore> m_refTreeModel;
bool IsIgnored(std::string path); bool IsIgnored(std::string path);
private: private:
View view_; View view_;
Model model_; Model model_;
Directories::Config config_; Directories::Config config_;
protected: protected:
void on_treeview_row_activated(const Gtk::TreeModel::Path& path, void on_treeview_row_activated(const Gtk::TreeModel::Path& path,
Gtk::TreeViewColumn* column); Gtk::TreeViewColumn* column);

295
juci/notebook.cc
Unescape View File

@ -4,179 +4,178 @@ Notebook::Model::Model() {
cc_extension_ = ".cc"; cc_extension_ = ".cc";
h_extension_ = ".h"; h_extension_ = ".h";
scrollvalue_ = 50; scrollvalue_ = 50;
}; }
Notebook::View::View(){ Notebook::View::View() {
view_.pack2(notebook_); view_.pack2(notebook_);
view_.set_position(120); view_.set_position(120);
} }
Notebook::Controller::Controller(Keybindings::Controller& keybindings, Notebook::Controller::Controller(Keybindings::Controller& keybindings,
Source::Config& source_cfg, Source::Config& source_cfg,
Directories::Config& dir_cfg) : Directories::Config& dir_cfg) :
source_config_(source_cfg), source_config_(source_cfg),
directories_(dir_cfg) { directories_(dir_cfg) {
OnNewPage("juCi++"); OnNewPage("juCi++");
refClipboard_ = Gtk::Clipboard::get(); refClipboard_ = Gtk::Clipboard::get();
view().pack1(directories_.widget(),true,true); view().pack1(directories_.widget(), true, true);
CreateKeybindings(keybindings); CreateKeybindings(keybindings);
} // Constructor
}// Constructor
void Notebook::Controller::CreateKeybindings(Keybindings::Controller void Notebook::Controller::CreateKeybindings(Keybindings::Controller
&keybindings){ &keybindings) {
directories().m_TreeView.signal_row_activated() directories().m_TreeView.signal_row_activated()
.connect(sigc::mem_fun(*this, .connect(sigc::mem_fun(*this,
&Notebook::Controller::OnDirectoryNavigation)); &Notebook::Controller::OnDirectoryNavigation));
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileMenu", add(Gtk::Action::create("FileMenu",
Gtk::Stock::FILE)); Gtk::Stock::FILE));
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewStandard", add(Gtk::Action::create("FileNewStandard",
Gtk::Stock::NEW, Gtk::Stock::NEW,
"New empty file", "New empty file",
"Create a new file"), "Create a new file"),
[this]() { [this]() {
is_new_file_ = true; is_new_file_ = true;
OnFileNewEmptyfile(); OnFileNewEmptyfile();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewCC", add(Gtk::Action::create("FileNewCC",
"New cc file"), "New cc file"),
Gtk::AccelKey(keybindings.config_ Gtk::AccelKey(keybindings.config_
.key_map()["new_cc_file"]), .key_map()["new_cc_file"]),
[this]() { [this]() {
is_new_file_ = true; is_new_file_ = true;
OnFileNewCCFile(); OnFileNewCCFile();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewH", add(Gtk::Action::create("FileNewH",
"New h file"), "New h file"),
Gtk::AccelKey(keybindings.config_ Gtk::AccelKey(keybindings.config_
.key_map()["new_h_file"]), .key_map()["new_h_file"]),
[this]() { [this]() {
is_new_file_ = true; is_new_file_ = true;
OnFileNewHeaderFile(); OnFileNewHeaderFile();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("WindowCloseTab", add(Gtk::Action::create("WindowCloseTab",
"Close tab"), "Close tab"),
Gtk::AccelKey(keybindings.config_ Gtk::AccelKey(keybindings.config_
.key_map()["close_tab"]), .key_map()["close_tab"]),
[this]() { [this]() {
OnCloseCurrentPage(); OnCloseCurrentPage();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditFind", add(Gtk::Action::create("EditFind",
Gtk::Stock::FIND), Gtk::Stock::FIND),
[this]() { [this]() {
is_new_file_ = false; is_new_file_ = false;
OnEditSearch(); OnEditSearch();
//TODO(Oyvang, Zalox, Forgi)Create function OnEditFind(); // TODO(Oyvang) Zalox, Forgi)Create function OnEditFind();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditCopy", add(Gtk::Action::create("EditCopy",
Gtk::Stock::COPY), Gtk::Stock::COPY),
[this]() { [this]() {
OnEditCopy(); OnEditCopy();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditCut", add(Gtk::Action::create("EditCut",
Gtk::Stock::CUT), Gtk::Stock::CUT),
[this]() { [this]() {
OnEditCut(); OnEditCut();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditPaste", add(Gtk::Action::create("EditPaste",
Gtk::Stock::PASTE), Gtk::Stock::PASTE),
[this]() { [this]() {
OnEditPaste(); OnEditPaste();
}); });
keybindings.action_group_hidden()-> keybindings.action_group_hidden()->
add(Gtk::Action::create("EditPaste", add(Gtk::Action::create("EditPaste",
Gtk::Stock::PASTE), Gtk::Stock::PASTE),
[this]() { [this]() {
OnEditPaste(); OnEditPaste();
}); });
entry_.view_.entry().signal_activate(). entry_.view_.entry().signal_activate().
connect( connect(
[this]() { [this]() {
if(is_new_file_){ if (is_new_file_) {
OnNewPage(entry_.text()); OnNewPage(entry_.text());
entry_.OnHideEntries(is_new_file_); entry_.OnHideEntries(is_new_file_);
}else{ } else {
Search(true); Search(true);
} }
}); });
entry_.button_apply().signal_clicked(). entry_.button_apply().signal_clicked().
connect( connect(
[this]() { [this]() {
OnNewPage(entry_.text()); OnNewPage(entry_.text());
entry_.OnHideEntries(is_new_file_); entry_.OnHideEntries(is_new_file_);
}); });
entry_.button_close().signal_clicked(). entry_.button_close().signal_clicked().
connect( connect(
[this]() { [this]() {
entry_.OnHideEntries(is_new_file_); entry_.OnHideEntries(is_new_file_);
}); });
entry_.button_next().signal_clicked(). entry_.button_next().signal_clicked().
connect( connect(
[this]() { [this]() {
Search(true); Search(true);
}); });
entry_.button_prev().signal_clicked(). entry_.button_prev().signal_clicked().
connect( connect(
[this]() { [this]() {
Search(false); Search(false);
}); });
} }
void Notebook::Controller::GeneratePopup(std::vector<string> items){ void Notebook::Controller::GeneratePopup(std::vector<string> items) {
Gtk::ScrolledWindow popup_scroll_; Gtk::ScrolledWindow popup_scroll_;
Gtk::ListViewText listview_(1,false,Gtk::SelectionMode::SELECTION_SINGLE); Gtk::ListViewText listview_(1, false, Gtk::SelectionMode::SELECTION_SINGLE);
Gtk::Dialog popup_("",true); Gtk::Dialog popup_("", true);
listview_.set_enable_search(false); listview_.set_enable_search(false);
listview_.set_hscroll_policy(Gtk::ScrollablePolicy::SCROLL_NATURAL); listview_.set_hscroll_policy(Gtk::ScrollablePolicy::SCROLL_NATURAL);
listview_.set_activate_on_single_click(true); listview_.set_activate_on_single_click(true);
listview_.signal_row_activated(). listview_.signal_row_activated().
connect([this, &listview_, &popup_](const Gtk::TreeModel::Path& path, connect([this, &listview_, &popup_](const Gtk::TreeModel::Path& path,
Gtk::TreeViewColumn*) { Gtk::TreeViewColumn*) {
std::string t = listview_.get_text(listview_.get_selected()[0]); std::string t = listview_.get_text(listview_.get_selected()[0]);
CurrentTextView().get_buffer()->insert_at_cursor(t); CurrentTextView().get_buffer()->insert_at_cursor(t);
popup_.response(Gtk::RESPONSE_DELETE_EVENT); popup_.response(Gtk::RESPONSE_DELETE_EVENT);
}); });
for (auto &i : items) listview_.append(i); for (auto &i : items) listview_.append(i);
listview_.set_headers_visible(false); listview_.set_headers_visible(false);
popup_scroll_.add(listview_); popup_scroll_.add(listview_);
popup_.get_vbox()->pack_start(popup_scroll_); popup_.get_vbox()->pack_start(popup_scroll_);
popup_.set_size_request(80,80); popup_.set_size_request(80, 80);
popup_.show_all(); popup_.show_all();
Gdk::Rectangle temp1, temp2; Gdk::Rectangle temp1, temp2;
CurrentTextView(). CurrentTextView().
get_cursor_locations( get_cursor_locations(
CurrentTextView(). CurrentTextView().
get_buffer()->get_insert()-> get_buffer()->get_insert()->
get_iter(), temp1, temp2); get_iter(), temp1, temp2);
int x = temp1.get_x(); int x = temp1.get_x();
int y = temp1.get_y(); int y = temp1.get_y();
text_vec_.at(CurrentPage())-> text_vec_.at(CurrentPage())->
view().buffer_to_window_coords( view().buffer_to_window_coords(
Gtk::TextWindowType::TEXT_WINDOW_WIDGET, Gtk::TextWindowType::TEXT_WINDOW_WIDGET,
temp2.get_x(), temp2.get_x(),
temp2.get_y(), temp2.get_y(),
x, y); x, y);
int widht = Notebook().get_width()-88; int widht = Notebook().get_width()-88;
int height = Notebook().get_height()-180; int height = Notebook().get_height()-180;
if(x>widht){ if (x > widht) {
x = widht; } x = widht; }
if(y>height){ if (y > height) {
y =height; y = height;
} }
popup_.move(x, y+88); popup_.move(x, y+88);
popup_.run(); popup_.run();
@ -191,7 +190,7 @@ bool Notebook::Controller::ScrollEventCallback(GdkEventScroll* scroll_event) {
scrolledtext_vec_.at(page)-> scrolledtext_vec_.at(page)->
get_vscrollbar()->get_adjustment(); get_vscrollbar()->get_adjustment();
if ( direction_y != 0 ) { if ( direction_y != 0 ) {
int dir_val = direction_y==-1?-model_.scrollvalue_:+model_.scrollvalue_; int dir_val = direction_y == -1 ? -model_.scrollvalue_:+model_.scrollvalue_;
adj->set_value(adj->get_value()+dir_val); adj->set_value(adj->get_value()+dir_val);
text_vec_.at(page)->view().set_vadjustment(adj); text_vec_.at(page)->view().set_vadjustment(adj);
linenumbers_vec_.at(page)->view().set_vadjustment(adj); linenumbers_vec_.at(page)->view().set_vadjustment(adj);
@ -219,7 +218,7 @@ void Notebook::Controller::OnNewPage(std::string name) {
Notebook().append_page(*editor_vec_.back(), name); Notebook().append_page(*editor_vec_.back(), name);
Notebook().show_all_children(); Notebook().show_all_children();
Notebook().set_current_page(Pages()-1); Notebook().set_current_page(Pages()-1);
Notebook().set_focus_child(text_vec_.at(Pages()-1)->view()); Notebook().set_focus_child(text_vec_.at(Pages()-1)->view());
} }
void Notebook::Controller::OnOpenFile(std::string path) { void Notebook::Controller::OnOpenFile(std::string path) {
@ -235,7 +234,7 @@ void Notebook::Controller::OnOpenFile(std::string path) {
OnBufferChange(); OnBufferChange();
} }
void Notebook::Controller::OnCreatePage(){ void Notebook::Controller::OnCreatePage() {
text_vec_.push_back(new Source::Controller(source_config())); text_vec_.push_back(new Source::Controller(source_config()));
linenumbers_vec_.push_back(new Source::Controller(source_config())); linenumbers_vec_.push_back(new Source::Controller(source_config()));
scrolledline_vec_.push_back(new Gtk::ScrolledWindow()); scrolledline_vec_.push_back(new Gtk::ScrolledWindow());
@ -250,14 +249,15 @@ void Notebook::Controller::OnCreatePage(){
scrolledline_vec_.back()->get_vscrollbar()->hide(); scrolledline_vec_.back()->get_vscrollbar()->hide();
linenumbers_vec_.back()->view().set_editable(false); linenumbers_vec_.back()->view().set_editable(false);
linenumbers_vec_.back()->view().set_sensitive(false); linenumbers_vec_.back()->view().set_sensitive(false);
editor_vec_.back()->pack_start(*scrolledline_vec_.back(),false,false); editor_vec_.back()->pack_start(*scrolledline_vec_.back(), false, false);
editor_vec_.back()->pack_start(*scrolledtext_vec_.back(), true, true); editor_vec_.back()->pack_start(*scrolledtext_vec_.back(), true, true);
BufferChangeHandler(text_vec_.back()->view().get_buffer()); BufferChangeHandler(text_vec_.back()->view().get_buffer());
} }
void Notebook::Controller::OnCloseCurrentPage() { void Notebook::Controller::OnCloseCurrentPage() {
//TODO (oyvang, zalox, forgi) Save a temp file, in case you close one you dont want to close? // TODO(oyvang) zalox, forgi)
if(Pages()!=0){ // Save a temp file, in case you close one you dont want to close?
if (Pages() != 0) {
int page = CurrentPage(); int page = CurrentPage();
Notebook().remove_page(page); Notebook().remove_page(page);
delete text_vec_.at(page); delete text_vec_.at(page);
@ -297,24 +297,24 @@ void Notebook::Controller::OnEditCut() {
} }
} }
std::string Notebook::Controller::GetCursorWord(){ std::string Notebook::Controller::GetCursorWord() {
int page = CurrentPage(); int page = CurrentPage();
std::string word; std::string word;
Gtk::TextIter start,end; Gtk::TextIter start, end;
start = Buffer(text_vec_.at(page))->get_insert()->get_iter(); start = Buffer(text_vec_.at(page))->get_insert()->get_iter();
end = Buffer(text_vec_.at(page))->get_insert()->get_iter(); end = Buffer(text_vec_.at(page))->get_insert()->get_iter();
if(!end.ends_line()) { if (!end.ends_line()) {
while(!end.ends_word()){ while (!end.ends_word()) {
end.forward_char(); end.forward_char();
} }
} }
if(!start.starts_line()) { if (!start.starts_line()) {
while(!start.starts_word()){ while (!start.starts_word()) {
start.backward_char(); start.backward_char();
} }
} }
word = Buffer(text_vec_.at(page))->get_text(start,end); word = Buffer(text_vec_.at(page))->get_text(start, end);
//TODO(Oyvang)fix selected text // TODO(Oyvang) fix selected text
return word; return word;
} }
@ -324,7 +324,7 @@ void Notebook::Controller::OnEditSearch() {
entry_.OnShowSearch(GetCursorWord()); entry_.OnShowSearch(GetCursorWord());
} }
void Notebook::Controller::Search(bool forward){ void Notebook::Controller::Search(bool forward) {
int page = CurrentPage(); int page = CurrentPage();
std::string search_word; std::string search_word;
search_word = entry_.text(); search_word = entry_.text();
@ -332,25 +332,25 @@ void Notebook::Controller::Search(bool forward){
if ( !forward ) { if ( !forward ) {
if ( search_match_start_ == 0 || if ( search_match_start_ == 0 ||
search_match_start_.get_line_offset() == 0) { search_match_start_.get_line_offset() == 0) {
search_match_start_= Buffer(text_vec_.at(CurrentPage()))->end(); search_match_start_ = Buffer(text_vec_.at(CurrentPage()))->end();
} }
search_match_start_. search_match_start_.
backward_search(search_word, backward_search(search_word,
Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY | Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY |
Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY, Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY,
search_match_start_, search_match_start_,
search_match_end_); search_match_end_);
} else { } else {
if ( search_match_end_ == 0 ) { if ( search_match_end_ == 0 ) {
search_match_end_= Buffer(text_vec_.at(CurrentPage()))->begin(); search_match_end_ = Buffer(text_vec_.at(CurrentPage()))->begin();
} }
search_match_end_. search_match_end_.
forward_search(search_word, forward_search(search_word,
Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY | Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY |
Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY, Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY,
search_match_start_, search_match_start_,
search_match_end_); search_match_end_);
} }
} }
@ -358,38 +358,38 @@ void Notebook::Controller::OnBufferChange() {
int page = CurrentPage(); int page = CurrentPage();
int text_nr = Buffer(text_vec_.at(page))->get_line_count(); int text_nr = Buffer(text_vec_.at(page))->get_line_count();
int line_nr = Buffer(linenumbers_vec_.at(page))->get_line_count(); int line_nr = Buffer(linenumbers_vec_.at(page))->get_line_count();
while (line_nr < text_nr ){ while (line_nr < text_nr) {
line_nr++; line_nr++;
Buffer(linenumbers_vec_.at(page))-> Buffer(linenumbers_vec_.at(page))->
insert(Buffer(linenumbers_vec_.at(page))->end(), insert(Buffer(linenumbers_vec_.at(page))->end(),
"\n"+std::to_string(line_nr)+" "); "\n"+std::to_string(line_nr)+" ");
} }
while (line_nr > text_nr ){ while (line_nr > text_nr) {
Gtk::TextIter iter = Buffer(linenumbers_vec_.at(page))->get_iter_at_line(line_nr); Gtk::TextIter iter =
Buffer(linenumbers_vec_.at(page))->get_iter_at_line(line_nr);
iter.backward_char(); iter.backward_char();
line_nr--; line_nr--;
Buffer(linenumbers_vec_.at(page))-> Buffer(linenumbers_vec_.at(page))->
erase(iter, erase(iter,
Buffer(linenumbers_vec_.at(page))->end()); Buffer(linenumbers_vec_.at(page))->end());
} }
if(Buffer(text_vec_.at(page))->get_insert()->get_iter().starts_line() && if (Buffer(text_vec_.at(page))->get_insert()->get_iter().starts_line() &&
Buffer(text_vec_.at(page))->get_insert()->get_iter().get_line() == Buffer(text_vec_.at(page))->get_insert()->get_iter().get_line() ==
Buffer(text_vec_.at(page))->end().get_line()) { Buffer(text_vec_.at(page))->end().get_line()) {
GdkEventScroll* scroll = new GdkEventScroll; GdkEventScroll* scroll = new GdkEventScroll;
scroll->delta_y = 1.0; scroll->delta_y = 1.0;
scroll->delta_x = 0.0; scroll->delta_x = 0.0;
ScrollEventCallback(scroll); ScrollEventCallback(scroll);
delete scroll; delete scroll;
} }
Gtk::TextIter start,end; Gtk::TextIter start, end;
std::string word; std::string word;
start = Buffer(text_vec_.at(page))->get_insert()->get_iter(); start = Buffer(text_vec_.at(page))->get_insert()->get_iter();
end = Buffer(text_vec_.at(page))->get_insert()->get_iter(); end = Buffer(text_vec_.at(page))->get_insert()->get_iter();
start.backward_char(); start.backward_char();
word = Buffer(text_vec_.at(page))->get_text(start,end); word = Buffer(text_vec_.at(page))->get_text(start, end);
if( word == "."){ if (word == ".") {
//TODO(Oyvang,Zalox,Forgie) Remove TEST // TODO(Forgie) Zalox,Forgie) Remove TEST
std::vector<std::string> TEST; std::vector<std::string> TEST;
TEST.push_back("toString()"); TEST.push_back("toString()");
TEST.push_back("toLower()"); TEST.push_back("toLower()");
@ -401,11 +401,12 @@ void Notebook::Controller::OnBufferChange() {
} }
void Notebook::Controller void Notebook::Controller
::OnDirectoryNavigation(const Gtk::TreeModel::Path& path, ::OnDirectoryNavigation(const Gtk::TreeModel::Path& path,
Gtk::TreeViewColumn* column) { Gtk::TreeViewColumn* column) {
Gtk::TreeModel::iterator iter = directories().m_refTreeModel->get_iter(path); Gtk::TreeModel::iterator iter = directories().m_refTreeModel->get_iter(path);
if(iter) { if (iter) {
Gtk::TreeModel::Row row = *iter; Gtk::TreeModel::Row row = *iter;
boost::filesystem::path fs_path(Glib::ustring(row[directories().view().m_col_path])); std::string upath = Glib::ustring(row[directories().view().m_col_path]);
boost::filesystem::path fs_path(upath);
if (boost::filesystem::is_directory(fs_path)) { if (boost::filesystem::is_directory(fs_path)) {
directories().m_TreeView.row_expanded(path) ? directories().m_TreeView.row_expanded(path) ?
directories().m_TreeView.collapse_row(path) : directories().m_TreeView.collapse_row(path) :
@ -428,7 +429,7 @@ int Notebook::Controller::CurrentPage() {
} }
Glib::RefPtr<Gtk::TextBuffer> Glib::RefPtr<Gtk::TextBuffer>
Notebook::Controller::Buffer( Source::Controller *source ) { Notebook::Controller::Buffer(Source::Controller *source) {
return source->view().get_buffer(); return source->view().get_buffer();
} }
@ -440,10 +441,10 @@ Gtk::Notebook& Notebook::Controller::Notebook() {
} }
void Notebook::Controller::BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer> void Notebook::Controller::BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer>
buffer) { buffer) {
buffer->signal_changed().connect( buffer->signal_changed().connect(
[this]() { [this]() {
OnBufferChange(); OnBufferChange();
}); });
} }

22
juci/notebook.h
Unescape View File

@ -5,14 +5,10 @@
#include "gtkmm.h" #include "gtkmm.h"
#include "entry.h" #include "entry.h"
#include "source.h" #include "source.h"
#include "directories.h" #include "directories.h"
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/algorithm/string/case_conv.hpp> #include <type_traits>
#include <sigc++/sigc++.h>
#include <type_traits>
#include <sigc++/sigc++.h>
namespace Notebook { namespace Notebook {
class Model { class Model {
@ -33,12 +29,11 @@ namespace Notebook {
}; };
class Controller { class Controller {
public: public:
Controller(Keybindings::Controller& keybindings, Controller(Keybindings::Controller& keybindings,
Source::Config& config, Source::Config& config,
Directories::Config& dir_cfg); Directories::Config& dir_cfg);
~Controller(); ~Controller();
Glib::RefPtr<Gtk::TextBuffer> Buffer( Source::Controller *source); Glib::RefPtr<Gtk::TextBuffer> Buffer(Source::Controller *source);
Gtk::TextView& CurrentTextView(); Gtk::TextView& CurrentTextView();
int CurrentPage(); int CurrentPage();
Gtk::Box& entry_view(); Gtk::Box& entry_view();
@ -62,7 +57,7 @@ namespace Notebook {
bool ScrollEventCallback(GdkEventScroll* scroll_event); bool ScrollEventCallback(GdkEventScroll* scroll_event);
int Pages(); int Pages();
Directories::Controller& directories() { return directories_; } Directories::Controller& directories() { return directories_; }
Gtk::Paned& view(); Gtk::Paned& view();
void GeneratePopup(std::vector<string> items); void GeneratePopup(std::vector<string> items);
@ -70,9 +65,11 @@ namespace Notebook {
void Search(bool forward); void Search(bool forward);
const Source::Config& source_config() { return source_config_; } const Source::Config& source_config() { return source_config_; }
protected: protected:
void BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer> buffer); void BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer> buffer);
private:
private:
void CreateKeybindings(Keybindings::Controller& keybindings); void CreateKeybindings(Keybindings::Controller& keybindings);
Glib::RefPtr<Gtk::Builder> m_refBuilder; Glib::RefPtr<Gtk::Builder> m_refBuilder;
Glib::RefPtr<Gio::SimpleActionGroup> refActionGroup; Glib::RefPtr<Gio::SimpleActionGroup> refActionGroup;
@ -91,5 +88,4 @@ namespace Notebook {
Glib::RefPtr<Gtk::Clipboard> refClipboard_; Glib::RefPtr<Gtk::Clipboard> refClipboard_;
}; // class controller }; // class controller
} // namespace Notebook } // namespace Notebook
#endif // JUCI_NOTEBOOK_H_ #endif // JUCI_NOTEBOOK_H_

326
juci/source.cc
Unescape View File

@ -5,21 +5,33 @@
#include <fstream> #include <fstream>
#include <boost/timer/timer.hpp> #include <boost/timer/timer.hpp>
#define log( var ) \
std::cout << "source.cc (" << __LINE__ << ") " << #var << std::endl
Source::Location::
Location(int line_number, int column_offset) :
line_number_(line_number), column_offset_(column_offset) { }
Source::Location::
Location(const Source::Location &org) :
line_number_(org.line_number_), column_offset_(org.column_offset_) { }
Source::Range::
Range(const Location &start, const Location &end, int kind) :
start_(start), end_(end), kind_(kind) { }
Source::Range::
Range(const Source::Range &org) :
start_(org.start_), end_(org.end_), kind_(org.kind_) { }
////////////// //////////////
//// View //// //// View ////
////////////// //////////////
Source::View::View() { Source::View::View() {
// std::cout << "View constructor run" << std::endl;
override_font(Pango::FontDescription("Monospace")); override_font(Pango::FontDescription("Monospace"));
} }
// Source::View::UpdateLine
// returns the new line
string Source::View::UpdateLine() {
Gtk::TextIter line(get_buffer()->get_insert()->get_iter());
// std::cout << line.get_line() << std::endl;
// for each word --> check what it is --> apply appropriate tag
return "";
}
string Source::View::GetLine(const Gtk::TextIter &begin) { string Source::View::GetLine(const Gtk::TextIter &begin) {
Gtk::TextIter end(begin); Gtk::TextIter end(begin);
@ -32,47 +44,11 @@ string Source::View::GetLine(const Gtk::TextIter &begin) {
// Applies theme in textview // Applies theme in textview
void Source::View::ApplyConfig(const Source::Config &config) { void Source::View::ApplyConfig(const Source::Config &config) {
for (auto &item : config.tagtable()) { for (auto &item : config.tagtable()) {
// std::cout << "Apply: f: " << item.first << ", s: " <<
// item.second << std::endl;
get_buffer()->create_tag(item.first)->property_foreground() = item.second; get_buffer()->create_tag(item.first)->property_foreground() = item.second;
} }
} }
void Source::View::OnOpenFile(std::vector<clang::SourceLocation> &locations,
const Source::Config &config) {
/* ApplyConfig(config);
Glib::RefPtr<Gtk::TextBuffer> buffer = get_buffer();
for (auto &loc : locations) {
string type = std::to_string(loc.kind());
try {
config.typetable().at(type);
} catch (std::exception) {
continue;
}
int linum_start = loc.line_number_begin();
int linum_end = loc.line_number_end();
int begin = loc.begin();
int end = loc.end();
if (end < 0) end = 0;
if (begin < 0) begin = 0;
// std::cout << "Libc: ";
// std::cout << "type: " << type;
// std::cout << " linum_s: " << linum_start+1 << " linum_e: " << linum_end+1;
// std::cout << ", begin: " << begin << ", end: " << end << std::endl;
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);
// std::cout << get_buffer()->get_text(begin_iter, end_iter) << std::endl;
if (begin_iter.get_line() == end_iter.get_line()) {
buffer->apply_tag_by_name(config.typetable().at(type),
begin_iter, end_iter);
}
}
*/
}
// Source::View::Config::Config(Config &config) // Source::View::Config::Config(Config &config)
@ -82,7 +58,7 @@ Source::Config::Config(const Source::Config &original) {
SetTypeTable(original.typetable()); SetTypeTable(original.typetable());
} }
Source::Config::Config(){} Source::Config::Config() {}
// Source::View::Config::tagtable() // Source::View::Config::tagtable()
// returns a const refrence to the tagtable // returns a const refrence to the tagtable
@ -96,14 +72,13 @@ const std::unordered_map<string, string>& Source::Config::typetable() const {
return typetable_; return typetable_;
} }
void Source::Config::InsertTag(const string &key, const string &value) { void Source::Config::InsertTag(const string &key, const string &value) {
tagtable_[key] = value; tagtable_[key] = value;
} }
// Source::View::Config::SetTagTable() // Source::View::Config::SetTagTable()
// sets the tagtable for the view // sets the tagtable for the view
void Source::Config::SetTypeTable( void Source::Config::
const std::unordered_map<string, string> &typetable) { SetTypeTable(const std::unordered_map<string, string> &typetable) {
typetable_ = typetable; typetable_ = typetable;
} }
@ -112,8 +87,8 @@ void Source::Config::InsertType(const string &key, const string &value) {
} }
// Source::View::Config::SetTagTable() // Source::View::Config::SetTagTable()
// sets the tagtable for the view // sets the tagtable for the view
void Source::Config::SetTagTable( void Source::Config::
const std::unordered_map<string, string> &tagtable) { SetTagTable(const std::unordered_map<string, string> &tagtable) {
tagtable_ = tagtable; tagtable_ = tagtable;
} }
@ -124,22 +99,129 @@ Source::Model::Model(const Source::Config &config) :
config_(config) { config_(config) {
} }
Source::Config& Source::Model::config() { void Source::Model::
InitSyntaxHighlighting(const std::string &filepath,
const std::string &project_path,
const std::string &text,
int start_offset,
int end_offset) {
set_file_path(filepath);
set_project_path(project_path);
std::vector<const char*> arguments = get_compilation_commands();
tu_ = clang::TranslationUnit(true,
filepath,
arguments,
text);
}
// Source::View::UpdateLine
void Source::View::
OnLineEdit(const std::vector<Source::Range> &locations,
const Source::Config &config) {
OnUpdateSyntax(locations, config);
}
// Source::Model::UpdateLine
int Source::Model::
ReParse(const std::string &buffer) {
return tu_.ReparseTranslationUnit(file_path(), buffer);
}
// Source::Controller::OnLineEdit()
// fired when a line in the buffer is edited
void Source::Controller::OnLineEdit() { }
// sets the filepath for this mvc
void Source::Model::
set_file_path(const std::string &file_path) {
file_path_ = file_path;
}
// sets the project path for this mvc
void Source::Model::
set_project_path(const std::string &project_path) {
project_path_ = project_path;
}
// gets the file_path member
const std::string& Source::Model::file_path() const {
return file_path_;
}
// gets the project_path member
const std::string& Source::Model::project_path() const {
return project_path_;
}
// gets the config member
const Source::Config& Source::Model::config() const {
return config_; return config_;
} }
const string Source::Model::filepath() { std::vector<const char*> Source::Model::
return filepath_; get_compilation_commands() {
clang::CompilationDatabase db(project_path()+"/");
clang::CompileCommands commands(file_path(), &db);
std::vector<clang::CompileCommand> cmds = commands.get_commands();
std::vector<const char*> arguments;
for (auto &i : cmds) {
std::vector<std::string> lol = i.get_command_as_args();
for (int a = 1; a < lol.size()-4; a++) {
arguments.emplace_back(lol[a].c_str());
}
}
return arguments;
} }
void Source::Model::SetFilePath(const string &filepath) { std::vector<Source::Range> Source::Model::
filepath_ = filepath; ExtractTokens(int start_offset, int end_offset) {
std::vector<Source::Range> ranges;
clang::SourceLocation start(&tu_, file_path(), start_offset);
clang::SourceLocation end(&tu_, file_path(), end_offset);
clang::SourceRange range(&start, &end);
clang::Tokens tokens(&tu_, &range);
std::vector<clang::Token> tks = tokens.tokens();
for (auto &token : tks) {
switch (token.kind()) {
case 0: HighlightCursor(&token, &ranges); break; // PunctuationToken
case 1: HighlightToken(&token, &ranges, 702); break; // KeywordToken
case 2: HighlightCursor(&token, &ranges); break; // IdentifierToken
case 3: HighlightToken(&token, &ranges, 109); break; // LiteralToken
case 4: HighlightToken(&token, &ranges, 705); break; // CommentToken
}
}
return ranges;
} }
void Source::Model:: void Source::Model::
SetSourceLocations(const std::vector<clang::SourceLocation> &locations) { HighlightCursor(clang::Token *token,
locations_ = locations; std::vector<Source::Range> *source_ranges) {
clang::SourceLocation location = token->get_source_location(&tu_);
clang::Cursor cursor(&tu_, &location);
clang::SourceRange range(&cursor);
clang::SourceLocation begin(&range, true);
clang::SourceLocation end(&range, false);
unsigned begin_line_num, begin_offset, end_line_num, end_offset;
begin.get_location_info(NULL, &begin_line_num, &begin_offset, NULL);
end.get_location_info(NULL, &end_line_num, &end_offset, NULL);
source_ranges->emplace_back(Source::Location(begin_line_num,
begin_offset),
Source::Location(end_line_num,
end_offset), (int) cursor.kind());
}
void Source::Model::
HighlightToken(clang::Token *token,
std::vector<Source::Range> *source_ranges,
int token_kind) {
clang::SourceRange range = token->get_source_range(&tu_);
unsigned begin_line_num, begin_offset, end_line_num, end_offset;
clang::SourceLocation begin(&range, true);
clang::SourceLocation end(&range, false);
begin.get_location_info(NULL, &begin_line_num, &begin_offset, NULL);
end.get_location_info(NULL, &end_line_num, &end_offset, NULL);
source_ranges->emplace_back(Source::Location(begin_line_num,
begin_offset),
Source::Location(end_line_num,
end_offset), token_kind);
} }
//////////////////// ////////////////////
//// Controller //// //// Controller ////
//////////////////// ////////////////////
@ -148,9 +230,6 @@ SetSourceLocations(const std::vector<clang::SourceLocation> &locations) {
// Constructor for Controller // Constructor for Controller
Source::Controller::Controller(const Source::Config &config) : Source::Controller::Controller(const Source::Config &config) :
model_(config) { model_(config) {
view().get_buffer()->signal_changed().connect([this](){
this->OnLineEdit();
});
} }
// Source::Controller::view() // Source::Controller::view()
@ -163,57 +242,114 @@ Source::View& Source::Controller::view() {
Source::Model& Source::Controller::model() { Source::Model& Source::Controller::model() {
return model_; return model_;
} }
// Source::Controller::OnLineEdit()
// fired when a line in the buffer is edited
void Source::Controller::OnLineEdit() {
view().UpdateLine();
}
void Source::Controller::OnNewEmptyFile() { void Source::Controller::OnNewEmptyFile() {
string filename("/tmp/juci_t"); string filename("/tmp/juci_t");
sourcefile s(filename); sourcefile s(filename);
model().SetFilePath(filename); model().set_file_path(filename);
model().set_project_path(filename);
s.save(""); s.save("");
} }
string extract_file_path(const std::string &file_path) {
return file_path.substr(0, file_path.find_last_of('/'));
}
std::vector<std::string> extentions() {
return {".h", ".cc", ".cpp", ".hpp"};
}
bool check_extention(const std::string &file_path) {
std::string extention = file_path.substr(file_path.find_last_of('.'),
file_path.size());
for (auto &ex : extentions()) {
if (extention == ex) {
return true;
}
}
return false;
}
void Source::View::OnUpdateSyntax(const std::vector<Source::Range> &ranges,
const Source::Config &config) {
if (ranges.empty() || ranges.size() == 0) {
return;
}
Glib::RefPtr<Gtk::TextBuffer> buffer = get_buffer();
buffer->remove_all_tags(buffer->begin(), buffer->end());
for (auto &range : ranges) {
string type = std::to_string(range.kind());
try {
config.typetable().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.typetable().at(type),
begin_iter, end_iter);
}
}
void Source::Controller::OnOpenFile(const string &filepath) { void Source::Controller::OnOpenFile(const string &filepath) {
sourcefile s(filepath); sourcefile s(filepath);
buffer()->set_text(s.get_content()); buffer()->set_text(s.get_content());
int start_offset = buffer()->begin().get_offset(); int start_offset = buffer()->begin().get_offset();
int end_offset = buffer()->end().get_offset(); int end_offset = buffer()->end().get_offset();
std::string project_path = if (check_extention(filepath)) {
filepath.substr(0, filepath.find_last_of('/')); view().ApplyConfig(model().config());
model().InitSyntaxHighlighting(filepath,
clang::CompilationDatabase db(project_path); extract_file_path(filepath),
clang::CompileCommands commands(filepath, &db); buffer()->get_text().raw(),
std::vector<clang::CompileCommand> cmds = commands.get_commands(); start_offset,
std::vector<const char*> arguments; end_offset);
for (auto &i : cmds) { view().OnUpdateSyntax(model().ExtractTokens(start_offset, end_offset),
std::vector<std::string> lol = i.get_command_as_args(); model().config());
for (int a = 1; a < lol.size()-4; a++) {
arguments.emplace_back(lol[a].c_str());
}
} }
clang::TranslationUnit tu(true, filepath, arguments);
clang::SourceLocation start(&tu, filepath, start_offset);
clang::SourceLocation end(&tu, filepath, end_offset);
clang::SourceRange range(&start, &end);
clang::Tokens tokens(&tu, &range);
std::vector<clang::Token> tks = tokens.tokens();
for (auto &t : tks) { buffer()->signal_end_user_action().connect([this]() {
clang::SourceLocation loc = t.get_source_location(&tu); if (!go) {
unsigned line; std::thread parse([this]() {
unsigned column; if (parsing.try_lock()) {
loc.get_location_info(NULL, &line, &column, NULL); while (true) {
} const std::string raw = buffer()->get_text().raw();
if (model().ReParse(raw) == 0 &&
raw == buffer()->get_text().raw()) {
syntax.lock();
go = true;
syntax.unlock();
break;
}
}
parsing.unlock();
}
});
parse.detach();
}
});
// std::cout << t.elapsed().user << std::endl;
// model().SetSourceLocations(tu.getSourceLocations());
// view().OnOpenFile(model().getSourceLocations(), model().theme());
}
buffer()->signal_begin_user_action().connect([this]() {
if (go) {
syntax.lock();
view().
OnUpdateSyntax(model().ExtractTokens(0, buffer()->get_text().size()),
model().config());
go = false;
syntax.unlock();
}
});
}
Glib::RefPtr<Gtk::TextBuffer> Source::Controller::buffer() { Glib::RefPtr<Gtk::TextBuffer> Source::Controller::buffer() {
return view().get_buffer(); return view().get_buffer();
} }

99
juci/source.h
Unescape View File

@ -1,11 +1,13 @@
#ifndef JUCI_SOURCE_H_ #ifndef JUCI_SOURCE_H_
#define JUCI_SOURCE_H_ #define JUCI_SOURCE_H_
#include <iostream>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <string> #include <string>
#include "gtkmm.h" #include "gtkmm.h"
#include "clangmm.h" #include "clangmm.h"
#include <thread>
#include <mutex>
using std::string; using std::string;
@ -27,58 +29,93 @@ namespace Source {
std::unordered_map<string, string> typetable_; std::unordered_map<string, string> typetable_;
string background_; string background_;
}; // class Config }; // class Config
/*
class BufferLocation { class Location {
BufferLocation(const BufferLocation &location); public:
BufferLocation(int, int); Location(const Location &location);
int line_number() { return line_number_; } Location(int line_number, int column_offset);
int column_number() { return column_offset_; } int line_number() const { return line_number_; }
int column_offset() const { return column_offset_; }
private: private:
int line_number_; int line_number_;
int column_offset_; int column_offset_;
}; };
class BufferRange { class Range {
BufferRange(const BufferLocation &start, const BufferLocation &end) : public:
start_(start), end_(end) { } Range(const Location &start, const Location &end, int kind);
Range(const Range &org);
const Location& start() const { return start_; }
const Location& end() const { return end_; }
int kind() const { return kind_; }
void to_stream() const {
std::cout << "range: [" << start_.line_number()-1;
std::cout << ", " << end_.line_number()-1 << "] ";
std::cout << "<" << start_.column_offset()-1;
std::cout << ", " << end_.column_offset()-1 << ">";
std::cout << std::endl;
}
private: private:
BufferLocation start_; Location start_;
BufferLocation end_; Location end_;
};*/ int kind_;
};
class View : public Gtk::TextView { class View : public Gtk::TextView {
public: public:
View(); View();
string UpdateLine();
void ApplyConfig(const Config &config); void ApplyConfig(const Config &config);
void OnOpenFile(std::vector<clang::SourceLocation> &locations, void OnLineEdit(const std::vector<Range> &locations,
const Config &config); const Config &config);
void OnUpdateSyntax(const std::vector<Range> &locations,
const Config &config);
private: private:
string GetLine(const Gtk::TextIter &begin); string GetLine(const Gtk::TextIter &begin);
}; // class View }; // class View
class Model{ class Model{
public: public:
Model(const Source::Config &config); // constructor for Source::Model
//Model(); explicit Model(const Source::Config &config);
Config& config(); // inits the syntax highligthing on file open
const string filepath(); void InitSyntaxHighlighting(const std::string &filepath,
void SetFilePath(const string &filepath); const std::string &project_path,
void SetSourceLocations( const std::vector<clang::SourceLocation> &locations); const std::string &text,
std::vector<clang::SourceLocation>& getSourceLocations() { int start_offset,
return locations_; int end_offset);
} // sets the filepath for this mvc
void set_file_path(const string &file_path);
// sets the project path for this mvc
void set_project_path(const string &project_path);
// gets the file_path member
const string& file_path() const;
// gets the project_path member
const string& project_path() const;
// gets the config member
const Config& config() const;
~Model() { }
int ReParse(const std::string &buffer);
std::vector<Range> ExtractTokens(int, int);
private: private:
Source::Config config_; Config config_;
string filepath_; string file_path_;
std::vector<clang::SourceLocation> locations_; string project_path_;
clang::TranslationUnit tu_;
void HighlightToken(clang::Token *token,
std::vector<Range> *source_ranges,
int token_kind);
void HighlightCursor(clang::Token *token,
std::vector<Range> *source_ranges);
std::vector<const char*> get_compilation_commands();
}; };
class Controller { class Controller {
public: public:
Controller(const Source::Config &config); explicit Controller(const Source::Config &config);
Controller(); Controller();
View& view(); View& view();
Model& model(); Model& model();
@ -89,6 +126,10 @@ namespace Source {
private: private:
void OnLineEdit(); void OnLineEdit();
void OnSaveFile(); void OnSaveFile();
std::mutex syntax;
std::mutex parsing;
bool go = false;
protected: protected:
View view_; View view_;
Model model_; Model model_;

Write Preview
Loading…
Cancel
Save