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

Merged with edheim

merge-requests/365/head
Jørgen Lien Sellæg 10 years ago
parent
c46e8ed57a 54829505e7
commit
c1d8dc89f5
21 changed files with 470 additions and 177 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
      src/api.cc
  2. 8
      src/cmake.cc
  3. 2
      src/cmake.h
  4. 1
      src/config.cc
  5. 6
      src/directories.cc
  6. 4
      src/directories.h
  7. 14
      src/files.h
  8. 6
      src/juci.cc
  9. 1
      src/juci.h
  10. 47
      src/notebook.cc
  11. 3
      src/notebook.h
  12. 5
      src/singletons.cc
  13. 4
      src/singletons.h
  14. 216
      src/source.cc
  15. 20
      src/source.h
  16. 2
      src/sourcefile.cc
  17. 2
      src/sourcefile.h
  18. 157
      src/terminal.cc
  19. 33
      src/terminal.h
  20. 111
      src/window.cc
  21. 3
      src/window.h

2
src/api.cc
Unescape View File

@ -13,7 +13,7 @@ PluginApi::PluginApi(Notebook* notebook, Menu* menu) {
this->menu = menu; this->menu = menu;
DEBUG("Initiating plugins(from plugins.py).."); DEBUG("Initiating plugins(from plugins.py)..");
#ifndef __APPLE__ #ifndef __APPLE__
InitPlugins(); //TODO: fix this //InitPlugins(); //TODO: fix this
#endif #endif
DEBUG("Plugins initiated.."); DEBUG("Plugins initiated..");
} }

8
src/cmake.cc
Unescape View File

@ -40,14 +40,14 @@ CMake::CMake(const boost::filesystem::path &path) {
} }
if(project_path!="") { if(project_path!="") {
if(boost::filesystem::exists(project_path.string()+"/CMakeLists.txt") && !boost::filesystem::exists(project_path.string()+"/compile_commands.json")) if(boost::filesystem::exists(project_path.string()+"/CMakeLists.txt") && !boost::filesystem::exists(project_path.string()+"/compile_commands.json"))
create_compile_commands(project_path.string()); create_compile_commands(project_path);
} }
} }
bool CMake::create_compile_commands(const std::string &path) { bool CMake::create_compile_commands(const boost::filesystem::path &path) {
Singleton::terminal()->print("Creating "+boost::filesystem::path(path+"/compile_commands.json").string()+"\n"); Singleton::terminal()->print("Creating "+path.string()+"/compile_commands.json\n");
//TODO: Windows... //TODO: Windows...
if(Singleton::terminal()->execute("cmake . -DCMAKE_EXPORT_COMPILE_COMMANDS=ON 2>&1", path)==EXIT_SUCCESS) if(Singleton::terminal()->execute("cmake . -DCMAKE_EXPORT_COMPILE_COMMANDS=ON", path)==EXIT_SUCCESS)
return true; return true;
return false; return false;
} }

2
src/cmake.h
Unescape View File

@ -8,7 +8,7 @@ class CMake {
public: public:
CMake(const boost::filesystem::path &path); CMake(const boost::filesystem::path &path);
std::vector<std::pair<boost::filesystem::path, std::vector<std::string> > > get_functions_parameters(const std::string &name); std::vector<std::pair<boost::filesystem::path, std::vector<std::string> > > get_functions_parameters(const std::string &name);
static bool create_compile_commands(const std::string &path); static bool create_compile_commands(const boost::filesystem::path &path);
std::vector<boost::filesystem::path> paths; std::vector<boost::filesystem::path> paths;
std::vector<std::string> files; std::vector<std::string> files;

1
src/config.cc
Unescape View File

@ -12,6 +12,7 @@ MainConfig::MainConfig() {
GenerateSource(); GenerateSource();
GenerateTheme(); GenerateTheme();
GenerateDirectoryFilter(); GenerateDirectoryFilter();
Singleton::Config::terminal()->make_command=cfg.get<std::string>("project.make_command");
} }
void MainConfig::GenerateTheme() { void MainConfig::GenerateTheme() {

6
src/directories.cc
Unescape View File

@ -72,14 +72,14 @@ void Directories::open_folder(const boost::filesystem::path& dir_path) {
current_path=new_path; current_path=new_path;
if(selected_path.size()>0) if(selected_path!="")
select_path(selected_path); select_path(selected_path);
DEBUG("Folder opened"); DEBUG("Folder opened");
} }
void Directories::select_path(const std::string &path) { void Directories::select_path(const boost::filesystem::path &path) {
tree_store->foreach_iter([this, &path](const Gtk::TreeModel::iterator& iter){ tree_store->foreach_iter([this, &path](const Gtk::TreeModel::iterator& iter){
if(iter->get_value(column_record.path)==path) { if(iter->get_value(column_record.path)==path.string()) {
auto tree_path=Gtk::TreePath(iter); auto tree_path=Gtk::TreePath(iter);
tree_view.expand_to_path(tree_path); tree_view.expand_to_path(tree_path);
tree_view.set_cursor(tree_path); tree_view.set_cursor(tree_path);

4
src/directories.h
Unescape View File

@ -29,7 +29,7 @@ public:
Directories(); Directories();
void open_folder(const boost::filesystem::path& dir_path=""); void open_folder(const boost::filesystem::path& dir_path="");
void select_path(const std::string &path); void select_path(const boost::filesystem::path &path);
std::function<void(const std::string &file)> on_row_activated; std::function<void(const std::string &file)> on_row_activated;
std::unique_ptr<CMake> cmake; std::unique_ptr<CMake> cmake;
@ -41,7 +41,7 @@ private:
Gtk::TreeView tree_view; Gtk::TreeView tree_view;
Glib::RefPtr<Gtk::TreeStore> tree_store; Glib::RefPtr<Gtk::TreeStore> tree_store;
ColumnRecord column_record; ColumnRecord column_record;
std::string selected_path; boost::filesystem::path selected_path;
}; };
#endif // JUCI_DIRECTORIES_H_ #endif // JUCI_DIRECTORIES_H_

14
src/files.h
Unescape View File

@ -53,7 +53,13 @@ const std::string configjson =
" \"source_goto_method\": \"<primary>m\",\n" " \"source_goto_method\": \"<primary>m\",\n"
" \"source_rename\": \"<primary>r\",\n" " \"source_rename\": \"<primary>r\",\n"
" \"compile_and_run\": \"<primary>Return\",\n" " \"compile_and_run\": \"<primary>Return\",\n"
" \"compile\": \"<primary><shift>Return\"\n" " \"compile\": \"<primary><shift>Return\",\n"
" \"run_command\": \"<alt>Return\",\n"
" \"kill_last_running\": \"<primary>Escape\",\n"
" \"force_kill_last_running\": \"<primary><shift>Escape\"\n"
" },\n"
" \"project\": {\n"
" \"make_command\": \"make\"\n"
" },\n" " },\n"
" \"directoryfilter\": {\n" " \"directoryfilter\": {\n"
" \"ignore\": [\n" " \"ignore\": [\n"
@ -76,6 +82,9 @@ const std::string menuxml =
" <menubar name=\"MenuBar\">\n" " <menubar name=\"MenuBar\">\n"
" <menu action=\"FileMenu\">\n" " <menu action=\"FileMenu\">\n"
" <menuitem action=\"FileNewFile\"/>\n" " <menuitem action=\"FileNewFile\"/>\n"
" <menu action=\"FileNewProject\">\n"
" <menuitem action=\"FileNewProjectCpp\"/>\n"
" </menu>\n"
" <menuitem action=\"FileOpenFile\"/>\n" " <menuitem action=\"FileOpenFile\"/>\n"
" <menuitem action=\"FileOpenFolder\"/>\n" " <menuitem action=\"FileOpenFolder\"/>\n"
" <menuitem action=\"FileSave\"/>\n" " <menuitem action=\"FileSave\"/>\n"
@ -103,6 +112,9 @@ const std::string menuxml =
" <menu action=\"ProjectMenu\">\n" " <menu action=\"ProjectMenu\">\n"
" <menuitem action=\"ProjectCompileAndRun\"/>\n" " <menuitem action=\"ProjectCompileAndRun\"/>\n"
" <menuitem action=\"ProjectCompile\"/>\n" " <menuitem action=\"ProjectCompile\"/>\n"
" <menuitem action=\"ProjectRunCommand\"/>\n"
" <menuitem action=\"ProjectKillLastRunning\"/>\n"
" <menuitem action=\"ProjectForceKillLastRunning\"/>\n"
" </menu>\n" " </menu>\n"
" <menu action=\"WindowMenu\">\n" " <menu action=\"WindowMenu\">\n"
" <menuitem action=\"WindowCloseTab\"/>\n" " <menuitem action=\"WindowCloseTab\"/>\n"

6
src/juci.cc
Unescape View File

@ -1,6 +1,7 @@
#include "juci.h" #include "juci.h"
#include "singletons.h" #include "singletons.h"
#include "config.h" #include "config.h"
#include <iostream>
void init_logging() { void init_logging() {
add_common_attributes(); add_common_attributes();
@ -19,13 +20,16 @@ int app::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd) {
ctx.parse(argc, argv); ctx.parse(argc, argv);
if(argc>=2) { if(argc>=2) {
for(int c=1;c<argc;c++) { for(int c=1;c<argc;c++) {
boost::filesystem::path p=boost::filesystem::canonical(argv[c]); boost::filesystem::path p(argv[c]);
if(boost::filesystem::exists(p)) { if(boost::filesystem::exists(p)) {
p=boost::filesystem::canonical(p);
if(boost::filesystem::is_regular_file(p)) if(boost::filesystem::is_regular_file(p))
files.emplace_back(p.string()); files.emplace_back(p.string());
else if(directory=="" && boost::filesystem::is_directory(p)) else if(directory=="" && boost::filesystem::is_directory(p))
directory=p.string(); directory=p.string();
} }
else
std::cerr << "Path " << p << " does not exist." << std::endl;
} }
} }
activate(); activate();

1
src/juci.h
Unescape View File

@ -6,7 +6,6 @@
class app : public Gtk::Application { class app : public Gtk::Application {
public: public:
app(); app();
int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd); int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd);
void on_activate(); void on_activate();

47
src/notebook.cc
Unescape View File

@ -34,51 +34,49 @@ Source::View* Notebook::get_current_view() {
return get_view(get_current_page()); return get_view(get_current_page());
} }
void Notebook::open(std::string path) { void Notebook::open(const boost::filesystem::path &file_path) {
INFO("Notebook open file"); INFO("Notebook open file");
INFO("Notebook create page"); INFO("Notebook create page");
for(int c=0;c<size();c++) { for(int c=0;c<size();c++) {
if(path==get_view(c)->file_path) { if(file_path==get_view(c)->file_path) {
set_current_page(c); set_current_page(c);
get_current_view()->grab_focus(); get_current_view()->grab_focus();
return; return;
} }
} }
std::ifstream can_read(path); std::ifstream can_read(file_path.string());
if(!can_read) { if(!can_read) {
Singleton::terminal()->print("Error: could not open "+path+"\n"); Singleton::terminal()->print("Error: could not open "+file_path.string()+"\n");
return; return;
} }
can_read.close(); can_read.close();
auto language=Source::guess_language(path); auto language=Source::guess_language(file_path);
if(language && (language->get_id()=="chdr" || language->get_id()=="c" || language->get_id()=="cpp" || language->get_id()=="objc")) { if(language && (language->get_id()=="chdr" || language->get_id()=="c" || language->get_id()=="cpp" || language->get_id()=="objc")) {
std::string project_path; boost::filesystem::path project_path;
if(directories.cmake && directories.cmake->project_path!="") if(directories.cmake && directories.cmake->project_path!="")
project_path=directories.cmake->project_path.string(); project_path=directories.cmake->project_path;
else { else {
auto parent_path=boost::filesystem::path(path).parent_path(); project_path=file_path.parent_path();
project_path=parent_path.string(); CMake cmake(project_path);
CMake cmake(parent_path);
if(cmake.project_path!="") { if(cmake.project_path!="") {
project_path=cmake.project_path.string(); project_path=cmake.project_path;
Singleton::terminal()->print("Project path for "+path+" set to "+project_path+"\n"); Singleton::terminal()->print("Project path for "+file_path.string()+" set to "+project_path.string()+"\n");
} }
else else
Singleton::terminal()->print("Error: could not find project path for "+path+"\n"); Singleton::terminal()->print("Error: could not find project path for "+file_path.string()+"\n");
} }
source_views.emplace_back(new Source::ClangView(path, project_path)); source_views.emplace_back(new Source::ClangView(file_path, project_path));
} }
else else
source_views.emplace_back(new Source::GenericView(path, language)); source_views.emplace_back(new Source::GenericView(file_path, language));
scrolled_windows.emplace_back(new Gtk::ScrolledWindow()); scrolled_windows.emplace_back(new Gtk::ScrolledWindow());
hboxes.emplace_back(new Gtk::HBox()); hboxes.emplace_back(new Gtk::HBox());
scrolled_windows.back()->add(*source_views.back()); scrolled_windows.back()->add(*source_views.back());
hboxes.back()->pack_start(*scrolled_windows.back(), true, true); hboxes.back()->pack_start(*scrolled_windows.back(), true, true);
boost::filesystem::path file_path(source_views.back()->file_path);
std::string title=file_path.filename().string(); std::string title=file_path.filename().string();
append_page(*hboxes.back(), title); append_page(*hboxes.back(), title);
show_all_children(); show_all_children();
@ -89,8 +87,7 @@ void Notebook::open(std::string path) {
//Add star on tab label when the page is not saved: //Add star on tab label when the page is not saved:
auto source_view=get_current_view(); auto source_view=get_current_view();
get_current_view()->get_buffer()->signal_modified_changed().connect([this, source_view]() { get_current_view()->get_buffer()->signal_modified_changed().connect([this, source_view]() {
boost::filesystem::path file_path(source_view->file_path); std::string title=source_view->file_path.filename().string();
std::string title=file_path.filename().string();
if(source_view->get_buffer()->get_modified()) if(source_view->get_buffer()->get_modified())
title+="*"; title+="*";
int page=-1; int page=-1;
@ -117,20 +114,20 @@ bool Notebook::save(int page) {
if (view->file_path != "" && view->get_buffer()->get_modified()) { if (view->file_path != "" && view->get_buffer()->get_modified()) {
if(juci::filesystem::write(view->file_path, view->get_buffer())) { if(juci::filesystem::write(view->file_path, view->get_buffer())) {
view->get_buffer()->set_modified(false); view->get_buffer()->set_modified(false);
Singleton::terminal()->print("File saved to: " +view->file_path+"\n"); Singleton::terminal()->print("File saved to: " +view->file_path.string()+"\n");
//If CMakeLists.txt have been modified: //If CMakeLists.txt have been modified:
//TODO: recreate cmake even without directories open? //TODO: recreate cmake even without directories open?
if(boost::filesystem::path(view->file_path).filename().string()=="CMakeLists.txt") { if(view->file_path.filename()=="CMakeLists.txt") {
if(directories.cmake && directories.cmake->project_path!="" && boost::filesystem::path(view->file_path)>=directories.cmake->project_path && CMake::create_compile_commands(directories.cmake->project_path.string())) { if(directories.cmake && directories.cmake->project_path!="" && view->file_path>=directories.cmake->project_path && CMake::create_compile_commands(directories.cmake->project_path)) {
directories.open_folder(); directories.open_folder();
for(auto source_view: source_views) { for(auto source_view: source_views) {
if(auto source_clang_view=dynamic_cast<Source::ClangView*>(source_view)) { if(auto source_clang_view=dynamic_cast<Source::ClangView*>(source_view)) {
if(directories.cmake->project_path.string()==source_clang_view->project_path) { if(directories.cmake->project_path.string()==source_clang_view->project_path) {
if(source_clang_view->restart_parse()) if(source_clang_view->restart_parse())
Singleton::terminal()->print("Reparsing "+source_clang_view->file_path+"\n"); Singleton::terminal()->async_print("Reparsing "+source_clang_view->file_path.string()+"\n");
else else
Singleton::terminal()->print("Already reparsing "+source_clang_view->file_path+". Please reopen the file manually.\n"); Singleton::terminal()->async_print("Already reparsing "+source_clang_view->file_path.string()+". Please reopen the file manually.\n");
} }
} }
} }
@ -139,7 +136,7 @@ bool Notebook::save(int page) {
return true; return true;
} }
Singleton::terminal()->print("Error: could not save file " +view->file_path+"\n"); Singleton::terminal()->print("Error: could not save file " +view->file_path.string()+"\n");
} }
return false; return false;
} }
@ -177,7 +174,7 @@ bool Notebook::close_current_page() {
bool Notebook::save_modified_dialog() { bool Notebook::save_modified_dialog() {
INFO("Notebook::save_modified_dialog"); INFO("Notebook::save_modified_dialog");
Gtk::MessageDialog dialog((Gtk::Window&)(*get_toplevel()), "Save file!", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO); Gtk::MessageDialog dialog((Gtk::Window&)(*get_toplevel()), "Save file!", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
dialog.set_secondary_text("Do you want to save: " + get_current_view()->file_path+" ?"); dialog.set_secondary_text("Do you want to save: " + get_current_view()->file_path.string()+" ?");
int result = dialog.run(); int result = dialog.run();
if(result==Gtk::RESPONSE_YES) { if(result==Gtk::RESPONSE_YES) {
save_current(); save_current();

3
src/notebook.h
Unescape View File

@ -17,12 +17,11 @@ public:
int size(); int size();
Source::View* get_current_view(); Source::View* get_current_view();
bool close_current_page(); bool close_current_page();
void open(std::string filename); void open(const boost::filesystem::path &file_path);
bool save(int page); bool save(int page);
bool save_current(); bool save_current();
private: private:
bool make_compile_commands(const std::string &path);
bool save_modified_dialog(); bool save_modified_dialog();
Directories &directories; Directories &directories;
std::vector<Source::View*> source_views; //Is NOT freed in destructor, this is intended for quick program exit. std::vector<Source::View*> source_views; //Is NOT freed in destructor, this is intended for quick program exit.

5
src/singletons.cc
Unescape View File

@ -1,11 +1,10 @@
#include "singletons.h" #include "singletons.h"
std::unique_ptr<Source::Config> Singleton::Config::source_=std::unique_ptr<Source::Config>(new Source::Config()); std::unique_ptr<Source::Config> Singleton::Config::source_=std::unique_ptr<Source::Config>(new Source::Config());
std::unique_ptr<Directories::Config> Singleton::Config::directories_=std::unique_ptr<Directories::Config>(new Directories::Config()); std::unique_ptr<Directories::Config> Singleton::Config::directories_=std::unique_ptr<Directories::Config>(new Directories::Config());std::unique_ptr<Terminal::Config> Singleton::Config::terminal_=std::unique_ptr<Terminal::Config>(new Terminal::Config());
std::unique_ptr<Terminal> Singleton::terminal_=std::unique_ptr<Terminal>();
std::unique_ptr<Theme::Config> Singleton::Config::theme_ = std::unique_ptr<Theme::Config>(new Theme::Config()); std::unique_ptr<Theme::Config> Singleton::Config::theme_ = std::unique_ptr<Theme::Config>(new Theme::Config());
std::unique_ptr<Window::Config> Singleton::Config::window_ = std::unique_ptr<Window::Config>(new Window::Config()); std::unique_ptr<Window::Config> Singleton::Config::window_ = std::unique_ptr<Window::Config>(new Window::Config());
std::unique_ptr<Terminal> Singleton::terminal_=std::unique_ptr<Terminal>();
Terminal *Singleton::terminal() { Terminal *Singleton::terminal() {
if(!terminal_) if(!terminal_)

4
src/singletons.h
Unescape View File

@ -1,3 +1,4 @@
#ifndef JUCI_SINGLETONS_H_ #ifndef JUCI_SINGLETONS_H_
#define JUCI_SINGLETONS_H_ #define JUCI_SINGLETONS_H_
@ -19,11 +20,14 @@ public:
static Directories::Config *directories() {return directories_.get();} static Directories::Config *directories() {return directories_.get();}
static Theme::Config *theme() { return theme_.get(); } static Theme::Config *theme() { return theme_.get(); }
static Window::Config *window() { return window_.get(); } static Window::Config *window() { return window_.get(); }
static Terminal::Config *terminal() {return terminal_.get();}
private: private:
static std::unique_ptr<Source::Config> source_; static std::unique_ptr<Source::Config> source_;
static std::unique_ptr<Theme::Config> theme_; static std::unique_ptr<Theme::Config> theme_;
static std::unique_ptr<Window::Config> window_; static std::unique_ptr<Window::Config> window_;
static std::unique_ptr<Directories::Config> directories_; static std::unique_ptr<Directories::Config> directories_;
static std::unique_ptr<Terminal::Config> terminal_;
}; };
static std::string config_dir() { return std::string(getenv("HOME")) + "/.juci/config/"; } static std::string config_dir() { return std::string(getenv("HOME")) + "/.juci/config/"; }
static std::string theme_dir() { return std::string(getenv("HOME")) + "/.juci/gtk-themes/"; } static std::string theme_dir() { return std::string(getenv("HOME")) + "/.juci/gtk-themes/"; }

216
src/source.cc
Unescape View File

@ -15,18 +15,17 @@ namespace sigc {
SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
} }
Glib::RefPtr<Gsv::Language> Source::guess_language(const std::string &file_path) { Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path &file_path) {
auto language_manager=Gsv::LanguageManager::get_default(); auto language_manager=Gsv::LanguageManager::get_default();
bool result_uncertain = false; bool result_uncertain = false;
auto content_type = Gio::content_type_guess(file_path, NULL, 0, result_uncertain); auto content_type = Gio::content_type_guess(file_path.string(), NULL, 0, result_uncertain);
if(result_uncertain) { if(result_uncertain) {
content_type.clear(); content_type.clear();
} }
auto language=language_manager->guess_language(file_path, content_type); auto language=language_manager->guess_language(file_path.string(), content_type);
if(!language) { if(!language) {
auto path=boost::filesystem::path(file_path); auto filename=file_path.filename().string();
auto filename=path.filename().string(); auto extension=file_path.extension();
auto extension=path.extension();
if(filename=="CMakeLists.txt") if(filename=="CMakeLists.txt")
language=language_manager->get_language("cmake"); language=language_manager->get_language("cmake");
} }
@ -36,7 +35,7 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const std::string &file_path)
////////////// //////////////
//// View //// //// View ////
////////////// //////////////
Source::View::View(const std::string& file_path): file_path(file_path) { Source::View::View(const boost::filesystem::path &file_path): file_path(file_path) {
set_smart_home_end(Gsv::SMART_HOME_END_BEFORE); set_smart_home_end(Gsv::SMART_HOME_END_BEFORE);
get_source_buffer()->begin_not_undoable_action(); get_source_buffer()->begin_not_undoable_action();
juci::filesystem::read(file_path, get_buffer()); juci::filesystem::read(file_path, get_buffer());
@ -142,6 +141,92 @@ void Source::View::replace_all(const std::string &replacement) {
gtk_source_search_context_replace_all(search_context, replacement.c_str(), replacement.size(), NULL); gtk_source_search_context_replace_all(search_context, replacement.c_str(), replacement.size(), NULL);
} }
void Source::View::paste() {
Gtk::Clipboard::get()->request_text([this](const Glib::ustring& text){
const std::regex spaces_regex(std::string("^(")+Singleton::Config::source()->tab_char+"*)(.*)$");
auto line=get_line_before_insert();
std::smatch sm;
std::string prefix_tabs;
if(std::regex_match(line, sm, spaces_regex) && sm[2].str().size()==0) {
prefix_tabs=sm[1].str();
Glib::ustring::size_type start_line=0;
Glib::ustring::size_type end_line=0;
bool paste_line=false;
bool first_paste_line=true;
size_t paste_line_tabs=-1;
bool first_paste_line_has_tabs=false;
for(Glib::ustring::size_type c=0;c<text.size();c++) {;
if(text[c]=='\n') {
end_line=c;
paste_line=true;
}
else if(c==text.size()-1) {
end_line=c+1;
paste_line=true;
}
if(paste_line) {
std::string line=text.substr(start_line, end_line-start_line);
size_t tabs=0;
for(auto chr: line) {
if(chr==Singleton::Config::source()->tab_char)
tabs++;
else
break;
}
if(first_paste_line) {
if(tabs!=0) {
first_paste_line_has_tabs=true;
paste_line_tabs=tabs;
}
first_paste_line=false;
}
else
paste_line_tabs=std::min(paste_line_tabs, tabs);
start_line=end_line+1;
paste_line=false;
}
}
if(paste_line_tabs==(size_t)-1)
paste_line_tabs=0;
start_line=0;
end_line=0;
paste_line=false;
first_paste_line=true;
get_source_buffer()->begin_user_action();
for(Glib::ustring::size_type c=0;c<text.size();c++) {
if(text[c]=='\n') {
end_line=c;
paste_line=true;
}
else if(c==text.size()-1) {
end_line=c+1;
paste_line=true;
}
if(paste_line) {
if(first_paste_line) {
if(first_paste_line_has_tabs)
get_buffer()->insert_at_cursor(text.substr(start_line+paste_line_tabs, end_line-start_line-paste_line_tabs));
else
get_buffer()->insert_at_cursor(text.substr(start_line, end_line-start_line));
first_paste_line=false;
}
else
get_buffer()->insert_at_cursor('\n'+prefix_tabs+text.substr(start_line+paste_line_tabs, end_line-start_line-paste_line_tabs));
start_line=end_line+1;
paste_line=false;
}
}
get_buffer()->place_cursor(get_buffer()->get_insert()->get_iter());
scroll_to(get_buffer()->get_insert());
get_source_buffer()->end_user_action();
}
else
get_buffer()->paste_clipboard(Gtk::Clipboard::get());
});
}
void Source::View::set_status(const std::string &status) { void Source::View::set_status(const std::string &status) {
this->status=status; this->status=status;
if(on_update_status) if(on_update_status)
@ -171,14 +256,17 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
const std::regex spaces_regex(std::string("^(")+config->tab_char+"*).*$"); const std::regex spaces_regex(std::string("^(")+config->tab_char+"*).*$");
//Indent as in next or previous line //Indent as in next or previous line
if(key->keyval==GDK_KEY_Return && key->state==0 && !get_buffer()->get_has_selection()) { if(key->keyval==GDK_KEY_Return && key->state==0 && !get_buffer()->get_has_selection()) {
int line_nr=get_source_buffer()->get_insert()->get_iter().get_line(); auto insert_it=get_buffer()->get_insert()->get_iter();
string line(get_line_before_insert()); int line_nr=insert_it.get_line();
auto line=get_line_before_insert();
std::smatch sm; std::smatch sm;
if(std::regex_match(line, sm, spaces_regex)) { if(std::regex_match(line, sm, spaces_regex)) {
if((line_nr+1)<get_source_buffer()->get_line_count()) { if((line_nr+1)<get_buffer()->get_line_count()) {
string next_line=get_line(line_nr+1); string next_line=get_line(line_nr+1);
auto line_end_iter=get_buffer()->get_iter_at_line(line_nr+1);
line_end_iter--;
std::smatch sm2; std::smatch sm2;
if(std::regex_match(next_line, sm2, spaces_regex)) { if(insert_it==line_end_iter && std::regex_match(next_line, sm2, spaces_regex)) {
if(sm2[1].str().size()>sm[1].str().size()) { if(sm2[1].str().size()>sm[1].str().size()) {
get_source_buffer()->insert_at_cursor("\n"+sm2[1].str()); get_source_buffer()->insert_at_cursor("\n"+sm2[1].str());
scroll_to(get_source_buffer()->get_insert()); scroll_to(get_source_buffer()->get_insert());
@ -213,9 +301,14 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
int line_start=selection_start.get_line(); int line_start=selection_start.get_line();
int line_end=selection_end.get_line(); int line_end=selection_end.get_line();
unsigned indent_left_steps=config->tab_size;
for(int line_nr=line_start;line_nr<=line_end;line_nr++) { for(int line_nr=line_start;line_nr<=line_end;line_nr++) {
string line=get_line(line_nr); string line=get_line(line_nr);
if(!(line.size()>=config->tab_size && line.substr(0, config->tab_size)==config->tab)) { std::smatch sm;
if(std::regex_match(line, sm, spaces_regex) && sm[1].str().size()>0) {
indent_left_steps=std::min(indent_left_steps, (unsigned)sm[1].str().size());
}
else {
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
} }
@ -225,7 +318,7 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
Gtk::TextIter line_it = get_source_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; Gtk::TextIter line_plus_it=line_it;
for(unsigned c=0;c<config->tab_size;c++) for(unsigned c=0;c<indent_left_steps;c++)
line_plus_it++; line_plus_it++;
get_source_buffer()->erase(line_it, line_plus_it); get_source_buffer()->erase(line_it, line_plus_it);
} }
@ -234,20 +327,37 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
} }
//"Smart" backspace key //"Smart" backspace key
else if(key->keyval==GDK_KEY_BackSpace && !get_buffer()->get_has_selection()) { else if(key->keyval==GDK_KEY_BackSpace && !get_buffer()->get_has_selection()) {
Gtk::TextIter insert_it=get_source_buffer()->get_insert()->get_iter(); auto insert_it=get_buffer()->get_insert()->get_iter();
int line_nr=insert_it.get_line(); int line_nr=insert_it.get_line();
if(line_nr>0) { auto line=get_line_before_insert();
string line=get_line(line_nr); std::smatch sm;
string previous_line=get_line(line_nr-1); if(std::regex_match(line, sm, spaces_regex) && sm[1].str().size()==line.size()) {
smatch sm; if((line_nr-1)>=0) {
if(std::regex_match(previous_line, sm, spaces_regex)) { string previous_line=get_line(line_nr-1);
if(line==sm[1] || line==(std::string(sm[1])+config->tab) || (line+config->tab==sm[1])) { std::smatch sm2;
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line_nr); if(std::regex_match(previous_line, sm2, spaces_regex)) {
get_source_buffer()->erase(line_it, insert_it); if(line.size()==sm2[1].str().size() || line.size()==sm2[1].str().size()+config->tab_size || line.size()==sm2[1].str().size()-config->tab_size) {
auto previous_line_end_it=insert_it;
for(unsigned c=0;c<line.size();c++)
previous_line_end_it--;
previous_line_end_it--;
get_source_buffer()->erase(previous_line_end_it, insert_it);
get_source_buffer()->end_user_action();
return true;
}
} }
} }
if(line.size()>=config->tab_size) {
auto insert_minus_tab_it=insert_it;
for(unsigned c=0;c<config->tab_size;c++)
insert_minus_tab_it--;
get_source_buffer()->erase(insert_minus_tab_it, insert_it);
get_source_buffer()->end_user_action();
return true;
}
} }
} }
bool stop=Gsv::View::on_key_press_event(key); bool stop=Gsv::View::on_key_press_event(key);
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return stop; return stop;
@ -256,10 +366,10 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
///////////////////// /////////////////////
//// GenericView //// //// GenericView ////
///////////////////// /////////////////////
Source::GenericView::GenericView(const std::string& file_path, Glib::RefPtr<Gsv::Language> language) : View(file_path) { Source::GenericView::GenericView(const boost::filesystem::path &file_path, Glib::RefPtr<Gsv::Language> language) : View(file_path) {
if(language) { if(language) {
get_source_buffer()->set_language(language); get_source_buffer()->set_language(language);
Singleton::terminal()->print("Language for file "+file_path+" set to "+language->get_name()+".\n"); Singleton::terminal()->print("Language for file "+file_path.string()+" set to "+language->get_name()+".\n");
} }
auto completion=get_completion(); auto completion=get_completion();
auto completion_words=Gsv::CompletionWords::create("", Glib::RefPtr<Gdk::Pixbuf>()); auto completion_words=Gsv::CompletionWords::create("", Glib::RefPtr<Gdk::Pixbuf>());
@ -275,9 +385,8 @@ Source::GenericView::GenericView(const std::string& file_path, Glib::RefPtr<Gsv:
//////////////////////// ////////////////////////
clang::Index Source::ClangViewParse::clang_index(0, 0); clang::Index Source::ClangViewParse::clang_index(0, 0);
Source::ClangViewParse::ClangViewParse(const std::string& file_path, const std::string& project_path) : Source::ClangViewParse::ClangViewParse(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path):
Source::View(file_path), project_path(project_path) { Source::View(file_path), project_path(project_path) {
INFO("Tagtable beeing filled");
for (auto &item : Singleton::Config::source()->tags) { for (auto &item : Singleton::Config::source()->tags) {
auto scheme = get_source_buffer()->get_style_scheme(); auto scheme = get_source_buffer()->get_style_scheme();
auto style = scheme->get_style(item.second); auto style = scheme->get_style(item.second);
@ -322,7 +431,7 @@ Source::ClangViewParse::ClangViewParse(const std::string& file_path, const std::
} }
//TODO: clear tag_class and param_spec? //TODO: clear tag_class and param_spec?
parsing_in_progress=Singleton::terminal()->print_in_progress("Parsing "+file_path); parsing_in_progress=Singleton::terminal()->print_in_progress("Parsing "+file_path.string());
//GTK-calls must happen in main thread, so the parse_thread //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: //sends signals to the main thread that it is to call the following functions:
parse_start.connect([this]{ parse_start.connect([this]{
@ -376,7 +485,7 @@ void Source::ClangViewParse::init_parse() {
int end_offset = get_source_buffer()->end().get_offset(); int end_offset = get_source_buffer()->end().get_offset();
auto buffer_map=get_buffer_map(); auto buffer_map=get_buffer_map();
//Remove includes for first parse for initial syntax highlighting //Remove includes for first parse for initial syntax highlighting
auto& str=buffer_map[file_path]; auto& str=buffer_map[file_path.string()];
std::size_t pos=0; std::size_t pos=0;
while((pos=str.find("#include", pos))!=std::string::npos) { while((pos=str.find("#include", pos))!=std::string::npos) {
auto start_pos=pos; auto start_pos=pos;
@ -424,15 +533,15 @@ init_syntax_highlighting(const std::map<std::string, std::string>
int end_offset) { int end_offset) {
std::vector<string> arguments = get_compilation_commands(); std::vector<string> arguments = get_compilation_commands();
clang_tu = std::unique_ptr<clang::TranslationUnit>(new clang::TranslationUnit(clang_index, clang_tu = std::unique_ptr<clang::TranslationUnit>(new clang::TranslationUnit(clang_index,
file_path, file_path.string(),
arguments, arguments,
buffers)); buffers));
clang_tokens=clang_tu->get_tokens(0, buffers.find(file_path)->second.size()-1); clang_tokens=clang_tu->get_tokens(0, buffers.find(file_path.string())->second.size()-1);
} }
std::map<std::string, std::string> Source::ClangViewParse::get_buffer_map() const { std::map<std::string, std::string> Source::ClangViewParse::get_buffer_map() const {
std::map<std::string, std::string> buffer_map; std::map<std::string, std::string> buffer_map;
buffer_map[file_path]=get_source_buffer()->get_text().raw(); buffer_map[file_path.string()]=get_source_buffer()->get_text().raw();
return buffer_map; return buffer_map;
} }
@ -450,13 +559,13 @@ void Source::ClangViewParse::start_reparse() {
int Source::ClangViewParse::reparse(const std::map<std::string, std::string> &buffer) { int Source::ClangViewParse::reparse(const std::map<std::string, std::string> &buffer) {
int status = clang_tu->ReparseTranslationUnit(buffer); int status = clang_tu->ReparseTranslationUnit(buffer);
clang_tokens=clang_tu->get_tokens(0, parse_thread_buffer_map.find(file_path)->second.size()-1); clang_tokens=clang_tu->get_tokens(0, parse_thread_buffer_map.find(file_path.string())->second.size()-1);
return status; return status;
} }
std::vector<std::string> Source::ClangViewParse::get_compilation_commands() { std::vector<std::string> Source::ClangViewParse::get_compilation_commands() {
clang::CompilationDatabase db(project_path); clang::CompilationDatabase db(project_path.string());
clang::CompileCommands commands(file_path, db); clang::CompileCommands commands(file_path.string(), db);
std::vector<clang::CompileCommand> cmds = commands.get_commands(); std::vector<clang::CompileCommand> cmds = commands.get_commands();
std::vector<std::string> arguments; std::vector<std::string> arguments;
for (auto &i : cmds) { for (auto &i : cmds) {
@ -465,7 +574,7 @@ std::vector<std::string> Source::ClangViewParse::get_compilation_commands() {
arguments.emplace_back(lol[a]); arguments.emplace_back(lol[a]);
} }
} }
if(boost::filesystem::path(file_path).extension()==".h") //TODO: temporary fix for .h-files (parse as c++) if(file_path.extension()==".h") //TODO: temporary fix for .h-files (parse as c++)
arguments.emplace_back("-xc++"); arguments.emplace_back("-xc++");
return arguments; return arguments;
} }
@ -513,7 +622,7 @@ void Source::ClangViewParse::update_diagnostics() {
get_buffer()->remove_tag_by_name("diagnostic_error_underline", get_buffer()->begin(), get_buffer()->end()); get_buffer()->remove_tag_by_name("diagnostic_error_underline", get_buffer()->begin(), get_buffer()->end());
auto diagnostics=clang_tu->get_diagnostics(); auto diagnostics=clang_tu->get_diagnostics();
for(auto &diagnostic: diagnostics) { for(auto &diagnostic: diagnostics) {
if(diagnostic.path==file_path) { if(diagnostic.path==file_path.string()) {
auto start=get_buffer()->get_iter_at_offset(diagnostic.offsets.first); auto start=get_buffer()->get_iter_at_offset(diagnostic.offsets.first);
auto end=get_buffer()->get_iter_at_offset(diagnostic.offsets.second); auto end=get_buffer()->get_iter_at_offset(diagnostic.offsets.second);
std::string diagnostic_tag_name; std::string diagnostic_tag_name;
@ -644,16 +753,23 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) {
return true; return true;
} }
} }
if(next_line!=sm[1].str()+"}") {
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;c<config->tab_size+sm[1].str().size();c++)
insert_it--;
scroll_to(get_source_buffer()->get_insert());
get_source_buffer()->place_cursor(insert_it);
get_source_buffer()->end_user_action();
return true;
}
else {
get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+config->tab);
scroll_to(get_source_buffer()->get_insert());
get_source_buffer()->end_user_action();
return true;
}
} }
//TODO: insert without moving mark backwards.
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;c<config->tab_size+sm[1].str().size();c++)
insert_it--;
scroll_to(get_source_buffer()->get_insert());
get_source_buffer()->place_cursor(insert_it);
get_source_buffer()->end_user_action();
return true;
} }
else if(std::regex_match(line, sm, no_bracket_statement_regex)) { else if(std::regex_match(line, sm, no_bracket_statement_regex)) {
get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+config->tab); get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+config->tab);
@ -718,7 +834,7 @@ 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 boost::filesystem::path &file_path, const boost::filesystem::path& project_path):
Source::ClangViewParse(file_path, project_path), autocomplete_cancel_starting(false) { Source::ClangViewParse(file_path, project_path), autocomplete_cancel_starting(false) {
get_buffer()->signal_changed().connect([this](){ get_buffer()->signal_changed().connect([this](){
if(completion_dialog_shown) if(completion_dialog_shown)
@ -879,7 +995,7 @@ void Source::ClangViewAutocomplete::autocomplete() {
}); });
std::shared_ptr<std::map<std::string, std::string> > buffer_map=std::make_shared<std::map<std::string, std::string> >(); std::shared_ptr<std::map<std::string, std::string> > buffer_map=std::make_shared<std::map<std::string, std::string> >();
auto& buffer=(*buffer_map)[this->file_path]; auto& buffer=(*buffer_map)[this->file_path.string()];
buffer=get_buffer()->get_text(get_buffer()->begin(), get_buffer()->get_insert()->get_iter()); buffer=get_buffer()->get_text(get_buffer()->begin(), get_buffer()->get_insert()->get_iter());
auto iter = get_source_buffer()->get_insert()->get_iter(); auto iter = get_source_buffer()->get_insert()->get_iter();
auto line_nr=iter.get_line()+1; auto line_nr=iter.get_line()+1;
@ -938,7 +1054,7 @@ get_autocomplete_suggestions(int line_number, int column, std::map<std::string,
//// ClangViewRefactor ///// //// ClangViewRefactor /////
//////////////////////////// ////////////////////////////
Source::ClangViewRefactor::ClangViewRefactor(const std::string& file_path, const std::string& project_path): Source::ClangViewRefactor::ClangViewRefactor(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path):
Source::ClangViewAutocomplete(file_path, project_path) { Source::ClangViewAutocomplete(file_path, project_path) {
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;
@ -1070,7 +1186,7 @@ Source::ClangViewAutocomplete(file_path, project_path) {
}; };
} }
Source::ClangView::ClangView(const std::string& file_path, const std::string& project_path): ClangViewRefactor(file_path, project_path) { Source::ClangView::ClangView(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path): ClangViewRefactor(file_path, project_path) {
do_delete_object.connect([this](){ do_delete_object.connect([this](){
if(delete_thread.joinable()) if(delete_thread.joinable())
delete_thread.join(); delete_thread.join();

20
src/source.h
Unescape View File

@ -16,7 +16,7 @@
#include <set> #include <set>
namespace Source { namespace Source {
Glib::RefPtr<Gsv::Language> guess_language(const std::string &file_path); Glib::RefPtr<Gsv::Language> guess_language(const boost::filesystem::path &file_path);
class Config { class Config {
public: public:
@ -45,7 +45,7 @@ namespace Source {
class View : public Gsv::View { class View : public Gsv::View {
public: public:
View(const std::string& file_path); View(const boost::filesystem::path &file_path);
~View(); ~View();
void search_highlight(const std::string &text, bool case_sensitive, bool regex); void search_highlight(const std::string &text, bool case_sensitive, bool regex);
@ -55,8 +55,10 @@ namespace Source {
void replace_forward(const std::string &replacement); void replace_forward(const std::string &replacement);
void replace_backward(const std::string &replacement); void replace_backward(const std::string &replacement);
void replace_all(const std::string &replacement); void replace_all(const std::string &replacement);
void paste();
std::string file_path; boost::filesystem::path file_path;
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; std::function<void()> goto_method;
@ -82,13 +84,13 @@ namespace Source {
class GenericView : public View { class GenericView : public View {
public: public:
GenericView(const std::string& file_path, Glib::RefPtr<Gsv::Language> language); GenericView(const boost::filesystem::path &file_path, Glib::RefPtr<Gsv::Language> language);
}; };
class ClangViewParse : public View { class ClangViewParse : public View {
public: public:
ClangViewParse(const std::string& file_path, const std::string& project_path); ClangViewParse(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path);
std::string project_path; boost::filesystem::path project_path;
protected: protected:
void init_parse(); void init_parse();
void start_reparse(); void start_reparse();
@ -135,7 +137,7 @@ namespace Source {
class ClangViewAutocomplete : public ClangViewParse { class ClangViewAutocomplete : public ClangViewParse {
public: public:
ClangViewAutocomplete(const std::string& file_path, const std::string& project_path); ClangViewAutocomplete(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path);
protected: protected:
bool on_key_press_event(GdkEventKey* key); bool on_key_press_event(GdkEventKey* key);
bool on_focus_out_event(GdkEventFocus* event); bool on_focus_out_event(GdkEventFocus* event);
@ -157,7 +159,7 @@ namespace Source {
class ClangViewRefactor : public ClangViewAutocomplete { class ClangViewRefactor : public ClangViewAutocomplete {
public: public:
ClangViewRefactor(const std::string& file_path, const std::string& project_path); ClangViewRefactor(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path);
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;
@ -167,7 +169,7 @@ namespace Source {
class ClangView : public ClangViewRefactor { class ClangView : public ClangViewRefactor {
public: public:
ClangView(const std::string& file_path, const std::string& project_path); ClangView(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path);
void async_delete(); void async_delete();
bool restart_parse(); bool restart_parse();
private: private:

2
src/sourcefile.cc
Unescape View File

@ -65,7 +65,7 @@ bool juci::filesystem::write(const std::string &path, Glib::RefPtr<Gtk::TextBuff
break; break;
} }
} }
output << buffer->get_text(start_iter, end_iter); output << buffer->get_text(start_iter, end_iter).c_str();
start_iter=end_iter; start_iter=end_iter;
} }
output.close(); output.close();

2
src/sourcefile.h
Unescape View File

@ -11,6 +11,7 @@ namespace juci {
static std::string read(const std::string &path); static std::string read(const std::string &path);
static std::string read(const boost::filesystem::path &path) { return read(path.string()); } static std::string read(const boost::filesystem::path &path) { return read(path.string()); }
static bool read(const std::string &path, Glib::RefPtr<Gtk::TextBuffer> text_buffer); static bool read(const std::string &path, Glib::RefPtr<Gtk::TextBuffer> text_buffer);
static bool read(const boost::filesystem::path &path, Glib::RefPtr<Gtk::TextBuffer> text_buffer) { return read(path.string(), text_buffer); }
static std::vector<std::string> read_lines(const std::string &path); static std::vector<std::string> read_lines(const std::string &path);
static std::vector<std::string> read_lines(const boost::filesystem::path &path) { return read_lines(path.string()); }; static std::vector<std::string> read_lines(const boost::filesystem::path &path) { return read_lines(path.string()); };
@ -20,6 +21,7 @@ namespace juci {
static bool write(const std::string &path) { return write(path, ""); }; static bool write(const std::string &path) { return write(path, ""); };
static bool write(const boost::filesystem::path &path) { return write(path, ""); }; static bool write(const boost::filesystem::path &path) { return write(path, ""); };
static bool write(const std::string &path, Glib::RefPtr<Gtk::TextBuffer> text_buffer); static bool write(const std::string &path, Glib::RefPtr<Gtk::TextBuffer> text_buffer);
static bool write(const boost::filesystem::path &path, Glib::RefPtr<Gtk::TextBuffer> text_buffer) { return write(path.string(), text_buffer); }
}; };
} // namepace juci } // namepace juci
#endif // JUCI_SOURCEFILE_H_ #endif // JUCI_SOURCEFILE_H_

157
src/terminal.cc
Unescape View File

@ -45,6 +45,8 @@ pid_t popen3(const char *command, int &stdin, int &stdout, int &stderr) {
dup2(p_stderr[1], 2); dup2(p_stderr[1], 2);
setpgid(0, 0); setpgid(0, 0);
//TODO: See here on how to emulate tty for colors: http://stackoverflow.com/questions/1401002/trick-an-application-into-thinking-its-stdin-is-interactive-not-a-pipe
//TODO: One solution is: echo "command;exit"|script -q /dev/null
execl("/bin/sh", "sh", "-c", command, NULL); execl("/bin/sh", "sh", "-c", command, NULL);
perror("execl"); perror("execl");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -63,7 +65,7 @@ pid_t popen3(const char *command, int &stdin, int &stdout, int &stderr) {
Terminal::InProgress::InProgress(const std::string& start_msg): stop(false) { Terminal::InProgress::InProgress(const std::string& start_msg): stop(false) {
waiting_print.connect([this](){ waiting_print.connect([this](){
Singleton::terminal()->print(line_nr-1, "."); Singleton::terminal()->async_print(line_nr-1, ".");
}); });
start(start_msg); start(start_msg);
} }
@ -90,30 +92,30 @@ void Terminal::InProgress::start(const std::string& msg) {
void Terminal::InProgress::done(const std::string& msg) { void Terminal::InProgress::done(const std::string& msg) {
if(!stop) { if(!stop) {
stop=true; stop=true;
Singleton::terminal()->print(line_nr-1, msg); Singleton::terminal()->async_print(line_nr-1, msg);
} }
} }
void Terminal::InProgress::cancel(const std::string& msg) { void Terminal::InProgress::cancel(const std::string& msg) {
if(!stop) { if(!stop) {
stop=true; stop=true;
Singleton::terminal()->print(line_nr-1, msg); Singleton::terminal()->async_print(line_nr-1, msg);
} }
} }
Terminal::Terminal() { Terminal::Terminal() {
text_view.set_editable(false); bold_tag=get_buffer()->create_tag();
scrolled_window.add(text_view); bold_tag->property_weight()=PANGO_WEIGHT_BOLD;
add(scrolled_window);
text_view.signal_size_allocate().connect([this](Gtk::Allocation& allocation){ signal_size_allocate().connect([this](Gtk::Allocation& allocation){
auto end=text_view.get_buffer()->create_mark(text_view.get_buffer()->end()); auto iter=get_buffer()->end();
text_view.scroll_to(end); if(iter.backward_char()) {
text_view.get_buffer()->delete_mark(end); auto mark=get_buffer()->create_mark(iter);
scroll_to(mark, 0.0, 1.0, 1.0);
get_buffer()->delete_mark(mark);
}
}); });
bold_tag=text_view.get_buffer()->create_tag();
bold_tag->property_weight()=PANGO_WEIGHT_BOLD;
async_print_dispatcher.connect([this](){ async_print_dispatcher.connect([this](){
async_print_strings_mutex.lock(); async_print_strings_mutex.lock();
if(async_print_strings.size()>0) { if(async_print_strings.size()>0) {
@ -123,16 +125,22 @@ Terminal::Terminal() {
} }
async_print_strings_mutex.unlock(); async_print_strings_mutex.unlock();
}); });
async_print_on_line_dispatcher.connect([this](){
async_print_on_line_strings_mutex.lock();
if(async_print_on_line_strings.size()>0) {
for(auto &line_string: async_print_on_line_strings)
print(line_string.first, line_string.second);
async_print_on_line_strings.clear();
}
async_print_on_line_strings_mutex.unlock();
});
} }
int Terminal::execute(const std::string &command, const std::string &path) { int Terminal::execute(const std::string &command, const boost::filesystem::path &path) {
boost::filesystem::path boost_path;
std::string cd_path_and_command; std::string cd_path_and_command;
if(path!="") { if(path!="") {
boost_path=boost::filesystem::path(path);
//TODO: Windows... //TODO: Windows...
cd_path_and_command="cd "+boost_path.string()+" && "+command; cd_path_and_command="cd "+path.string()+" && "+command;
} }
else else
cd_path_and_command=command; cd_path_and_command=command;
@ -179,24 +187,23 @@ int Terminal::execute(const std::string &command, const std::string &path) {
} }
} }
void Terminal::async_execute(const std::string &command, const std::string &path, std::function<void(int exit_code)> callback) { void Terminal::async_execute(const std::string &command, const boost::filesystem::path &path, std::function<void(int exit_code)> callback) {
std::thread async_execute_thread([this, command, path, callback](){ std::thread async_execute_thread([this, command, path, callback](){
boost::filesystem::path boost_path;
std::string cd_path_and_command; std::string cd_path_and_command;
if(path!="") { if(path!="") {
boost_path=boost::filesystem::path(path);
//TODO: Windows... //TODO: Windows...
cd_path_and_command="cd "+boost_path.string()+" && "+command; cd_path_and_command="cd "+path.string()+" && "+command;
} }
else else
cd_path_and_command=command; cd_path_and_command=command;
int stdin, stdout, stderr; int stdin, stdout, stderr;
async_execute_pids_mutex.lock(); async_executes_mutex.lock();
stdin_buffer.clear();
auto pid=popen3(cd_path_and_command.c_str(), stdin, stdout, stderr); auto pid=popen3(cd_path_and_command.c_str(), stdin, stdout, stderr);
async_execute_pids.emplace(pid); async_executes.emplace_back(pid, stdin);
async_execute_pids_mutex.unlock(); async_executes_mutex.unlock();
if (pid<=0) { if (pid<=0) {
async_print("Error: Failed to run command: " + command + "\n"); async_print("Error: Failed to run command: " + command + "\n");
@ -230,12 +237,18 @@ void Terminal::async_execute(const std::string &command, const std::string &path
int exit_code; int exit_code;
waitpid(pid, &exit_code, 0); waitpid(pid, &exit_code, 0);
async_execute_pids_mutex.lock(); async_executes_mutex.lock();
async_execute_pids.erase(pid); for(auto it=async_executes.begin();it!=async_executes.end();it++) {
async_execute_pids_mutex.unlock(); if(it->first==pid) {
async_executes.erase(it);
break;
}
}
stdin_buffer.clear();
close(stdin); close(stdin);
close(stdout); close(stdout);
close(stderr); close(stderr);
async_executes_mutex.unlock();
if(callback) if(callback)
callback(exit_code); callback(exit_code);
@ -244,32 +257,51 @@ void Terminal::async_execute(const std::string &command, const std::string &path
async_execute_thread.detach(); async_execute_thread.detach();
} }
void Terminal::kill_executing() { void Terminal::kill_last_async_execute(bool force) {
async_execute_pids_mutex.lock(); async_executes_mutex.lock();
for(auto &pid: async_execute_pids) { if(async_executes.size()>0) {
kill(-pid, SIGINT); if(force)
kill(-async_executes.back().first, SIGTERM);
else
kill(-async_executes.back().first, SIGINT);
} }
async_execute_pids_mutex.unlock(); async_executes_mutex.unlock();
}
void Terminal::kill_async_executes(bool force) {
async_executes_mutex.lock();
for(auto &async_execute: async_executes) {
if(force)
kill(-async_execute.first, SIGTERM);
else
kill(-async_execute.first, SIGINT);
}
async_executes_mutex.unlock();
} }
int Terminal::print(const std::string &message, bool bold){ int Terminal::print(const std::string &message, bool bold){
INFO("Terminal: PrintMessage"); INFO("Terminal: PrintMessage");
if(bold) if(bold)
text_view.get_buffer()->insert_with_tag(text_view.get_buffer()->end(), message, bold_tag); get_buffer()->insert_with_tag(get_buffer()->end(), message, bold_tag);
else else
text_view.get_buffer()->insert(text_view.get_buffer()->end(), message); get_buffer()->insert(get_buffer()->end(), message);
return text_view.get_buffer()->end().get_line();
auto iter=get_buffer()->end();
if(iter.backward_char()) {
auto mark=get_buffer()->create_mark(iter);
scroll_to(mark, 0.0, 1.0, 1.0);
get_buffer()->delete_mark(mark);
}
return get_buffer()->end().get_line();
} }
void Terminal::print(int line_nr, const std::string &message, bool bold){ void Terminal::print(int line_nr, const std::string &message){
INFO("Terminal: PrintMessage at line " << line_nr); INFO("Terminal: PrintMessage at line " << line_nr);
auto iter=text_view.get_buffer()->get_iter_at_line(line_nr); auto iter=get_buffer()->get_iter_at_line(line_nr);
while(!iter.ends_line()) while(!iter.ends_line())
iter++; iter++;
if(bold) get_buffer()->insert(iter, message);
text_view.get_buffer()->insert_with_tag(iter, message, bold_tag);
else
text_view.get_buffer()->insert(iter, message);
} }
std::shared_ptr<Terminal::InProgress> Terminal::print_in_progress(std::string start_msg) { std::shared_ptr<Terminal::InProgress> Terminal::print_in_progress(std::string start_msg) {
@ -287,3 +319,46 @@ void Terminal::async_print(const std::string &message, bool bold) {
if(dispatch) if(dispatch)
async_print_dispatcher(); async_print_dispatcher();
} }
void Terminal::async_print(int line_nr, const std::string &message) {
async_print_on_line_strings_mutex.lock();
bool dispatch=true;
if(async_print_on_line_strings.size()>0)
dispatch=false;
async_print_on_line_strings.emplace_back(line_nr, message);
async_print_on_line_strings_mutex.unlock();
if(dispatch)
async_print_on_line_dispatcher();
}
bool Terminal::on_key_press_event(GdkEventKey *event) {
async_executes_mutex.lock();
if(async_executes.size()>0) {
get_buffer()->place_cursor(get_buffer()->end());
auto unicode=gdk_keyval_to_unicode(event->keyval);
char chr=(char)unicode;
if(unicode>=32 && unicode<=126) {
stdin_buffer+=chr;
get_buffer()->insert_at_cursor(stdin_buffer.substr(stdin_buffer.size()-1));
scroll_to(get_buffer()->get_insert());
}
else if(event->keyval==GDK_KEY_BackSpace) {
if(stdin_buffer.size()>0 && get_buffer()->get_char_count()>0) {
auto iter=get_buffer()->end();
iter--;
stdin_buffer.pop_back();
get_buffer()->erase(iter, get_buffer()->end());
scroll_to(get_buffer()->get_insert());
}
}
else if(event->keyval==GDK_KEY_Return) {
stdin_buffer+='\n';
write(async_executes.back().second, stdin_buffer.c_str(), stdin_buffer.size());
get_buffer()->insert_at_cursor(stdin_buffer.substr(stdin_buffer.size()-1));
scroll_to(get_buffer()->get_insert());
stdin_buffer.clear();
}
}
async_executes_mutex.unlock();
return true;
}

33
src/terminal.h
Unescape View File

@ -7,10 +7,15 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <thread> #include <thread>
#include <atomic> #include <atomic>
#include <unordered_set> #include <list>
class Terminal : public Gtk::HBox { class Terminal : public Gtk::TextView {
public: public:
class Config {
public:
std::string make_command;
};
class InProgress { class InProgress {
public: public:
InProgress(const std::string& start_msg); InProgress(const std::string& start_msg);
@ -26,25 +31,31 @@ public:
}; };
Terminal(); Terminal();
int execute(const std::string &command, const std::string &path=""); int execute(const std::string &command, const boost::filesystem::path &path="");
void async_execute(const std::string &command, const std::string &path="", std::function<void(int exit_code)> callback=nullptr); void async_execute(const std::string &command, const boost::filesystem::path &path="", std::function<void(int exit_code)> callback=nullptr);
void kill_executing(); void kill_last_async_execute(bool force=false);
void kill_async_executes(bool force=false);
int print(const std::string &message, bool bold=false); int print(const std::string &message, bool bold=false);
void print(int line_nr, const std::string &message, bool bold=false); void print(int line_nr, const std::string &message);
std::shared_ptr<InProgress> print_in_progress(std::string start_msg); std::shared_ptr<InProgress> print_in_progress(std::string start_msg);
void async_print(const std::string &message, bool bold=false); void async_print(const std::string &message, bool bold=false);
void async_print(int line_nr, const std::string &message);
protected:
bool on_key_press_event(GdkEventKey *event);
private: private:
Gtk::TextView text_view;
Gtk::ScrolledWindow scrolled_window;
Glib::Dispatcher async_print_dispatcher; Glib::Dispatcher async_print_dispatcher;
Glib::Dispatcher async_print_on_line_dispatcher;
std::vector<std::pair<std::string, bool> > async_print_strings; std::vector<std::pair<std::string, bool> > async_print_strings;
std::vector<std::pair<int, std::string> > async_print_on_line_strings;
std::mutex async_print_strings_mutex; std::mutex async_print_strings_mutex;
std::mutex async_print_on_line_strings_mutex;
Glib::RefPtr<Gtk::TextTag> bold_tag; Glib::RefPtr<Gtk::TextTag> bold_tag;
std::mutex async_execute_pids_mutex; std::mutex async_executes_mutex;
std::unordered_set<pid_t> async_execute_pids; std::list<std::pair<pid_t, int> > async_executes;
std::string stdin_buffer;
}; };
#endif // JUCI_TERMINAL_H_ #endif // JUCI_TERMINAL_H_

111
src/window.cc
Unescape View File

@ -41,7 +41,8 @@ Window::Window() : box(Gtk::ORIENTATION_VERTICAL), notebook(directories), compil
vpaned.set_position(300); vpaned.set_position(300);
vpaned.pack1(directory_and_notebook_panes, true, false); vpaned.pack1(directory_and_notebook_panes, true, false);
terminal_vbox.pack_start(*Singleton::terminal()); terminal_scrolled_window.add(*Singleton::terminal());
terminal_vbox.pack_start(terminal_scrolled_window);
status_hbox.pack_end(*Singleton::status(), Gtk::PACK_SHRINK); status_hbox.pack_end(*Singleton::status(), Gtk::PACK_SHRINK);
terminal_vbox.pack_end(status_hbox, Gtk::PACK_SHRINK); terminal_vbox.pack_end(status_hbox, Gtk::PACK_SHRINK);
vpaned.pack2(terminal_vbox, true, true); vpaned.pack2(terminal_vbox, true, true);
@ -100,7 +101,7 @@ Window::Window() : box(Gtk::ORIENTATION_VERTICAL), notebook(directories), compil
compile_success.connect([this](){ compile_success.connect([this](){
directories.open_folder(); directories.open_folder();
}); });
INFO("Window created"); INFO("Window created");
} // Window constructor } // Window constructor
@ -113,6 +114,10 @@ void Window::create_menu() {
menu.action_group->add(Gtk::Action::create("FileNewFile", "New file"), Gtk::AccelKey(menu.key_map["new_file"]), [this]() { menu.action_group->add(Gtk::Action::create("FileNewFile", "New file"), Gtk::AccelKey(menu.key_map["new_file"]), [this]() {
new_file_entry(); new_file_entry();
}); });
menu.action_group->add(Gtk::Action::create("FileNewProject", "New Project"));
menu.action_group->add(Gtk::Action::create("FileNewProjectCpp", "C++"), [this]() {
new_cpp_project_dialog();
});
menu.action_group->add(Gtk::Action::create("FileOpenFile", "Open file"), Gtk::AccelKey(menu.key_map["open_file"]), [this]() { menu.action_group->add(Gtk::Action::create("FileOpenFile", "Open file"), Gtk::AccelKey(menu.key_map["open_file"]), [this]() {
open_file_dialog(); open_file_dialog();
}); });
@ -146,7 +151,7 @@ void Window::create_menu() {
if(auto entry=dynamic_cast<Gtk::Entry*>(widget)) if(auto entry=dynamic_cast<Gtk::Entry*>(widget))
entry->paste_clipboard(); entry->paste_clipboard();
else if(notebook.get_current_page()!=-1) else if(notebook.get_current_page()!=-1)
notebook.get_current_view()->get_buffer()->paste_clipboard(Gtk::Clipboard::get()); notebook.get_current_view()->paste();
}); });
menu.action_group->add(Gtk::Action::create("EditFind", "Find"), Gtk::AccelKey(menu.key_map["edit_find"]), [this]() { menu.action_group->add(Gtk::Action::create("EditFind", "Find"), Gtk::AccelKey(menu.key_map["edit_find"]), [this]() {
search_and_replace_entry(); search_and_replace_entry();
@ -213,31 +218,33 @@ void Window::create_menu() {
CMake cmake(notebook.get_current_view()->file_path); CMake cmake(notebook.get_current_view()->file_path);
directories.open_folder(); directories.open_folder();
auto executables = cmake.get_functions_parameters("add_executable"); auto executables = cmake.get_functions_parameters("add_executable");
std::string executable; boost::filesystem::path executable_path;
boost::filesystem::path path;
if(executables.size()>0 && executables[0].second.size()>0) { if(executables.size()>0 && executables[0].second.size()>0) {
executable=executables[0].second[0]; executable_path=executables[0].first.parent_path();
path=executables[0].first.parent_path(); executable_path+="/"+executables[0].second[0];
path+="/"+executables[0].second[0];
} }
if(cmake.project_path!="") { if(cmake.project_path!="") {
if(path!="") { if(executable_path!="") {
compiling=true; compiling=true;
Singleton::terminal()->print("Compiling and executing "+path.string()+"\n"); Singleton::terminal()->print("Compiling and running "+executable_path.string()+"\n");
//TODO: Windows... //TODO: Windows...
Singleton::terminal()->async_execute("make", cmake.project_path.string(), [this, path](int exit_code){ auto project_path=cmake.project_path;
Singleton::terminal()->async_execute(Singleton::Config::terminal()->make_command, cmake.project_path, [this, executable_path, project_path](int exit_code){
compiling=false; compiling=false;
if(exit_code==EXIT_SUCCESS) { if(exit_code==EXIT_SUCCESS) {
compile_success(); compile_success();
//TODO: Windows... //TODO: Windows...
Singleton::terminal()->async_execute(path.string(), path.parent_path().string(), [this, path](int exit_code){ Singleton::terminal()->async_execute(executable_path.string(), project_path, [this, executable_path](int exit_code){
Singleton::terminal()->async_print(path.string()+" returned: "+std::to_string(exit_code)+'\n'); Singleton::terminal()->async_print(executable_path.string()+" returned: "+std::to_string(exit_code)+'\n');
}); });
} }
}); });
} }
else else {
Singleton::terminal()->print("Could not find an executable, please use add_executable in CMakeLists.txt\n"); Singleton::terminal()->print("Could not find add_executable in the following paths:\n");
for(auto &path: cmake.paths)
Singleton::terminal()->print(" "+path.string()+"\n");
}
} }
}); });
menu.action_group->add(Gtk::Action::create("ProjectCompile", "Compile"), Gtk::AccelKey(menu.key_map["compile"]), [this]() { menu.action_group->add(Gtk::Action::create("ProjectCompile", "Compile"), Gtk::AccelKey(menu.key_map["compile"]), [this]() {
@ -249,13 +256,37 @@ void Window::create_menu() {
compiling=true; compiling=true;
Singleton::terminal()->print("Compiling project "+cmake.project_path.string()+"\n"); Singleton::terminal()->print("Compiling project "+cmake.project_path.string()+"\n");
//TODO: Windows... //TODO: Windows...
Singleton::terminal()->async_execute("make 2>&1", cmake.project_path.string(), [this](int exit_code){ Singleton::terminal()->async_execute(Singleton::Config::terminal()->make_command, cmake.project_path, [this](int exit_code){
compiling=false; compiling=false;
if(exit_code==EXIT_SUCCESS) if(exit_code==EXIT_SUCCESS)
compile_success(); compile_success();
}); });
} }
}); });
menu.action_group->add(Gtk::Action::create("ProjectRunCommand", "Run Command"), Gtk::AccelKey(menu.key_map["run_command"]), [this]() {
entry_box.clear();
entry_box.entries.emplace_back(last_run_command, [this](const std::string& content){
if(content!="") {
last_run_command=content;
Singleton::terminal()->async_print("Running: "+content+'\n');
Singleton::terminal()->async_execute(content, directories.current_path, [this, content](int exit_code){
Singleton::terminal()->async_print(content+" returned: "+std::to_string(exit_code)+'\n');
});
}
entry_box.hide();
});
auto entry_it=entry_box.entries.begin();
entry_box.buttons.emplace_back("Run command", [this, entry_it](){
entry_it->activate();
});
entry_box.show();
});
menu.action_group->add(Gtk::Action::create("ProjectKillLastRunning", "Kill Last Process"), Gtk::AccelKey(menu.key_map["kill_last_running"]), [this]() {
Singleton::terminal()->kill_last_async_execute();
});
menu.action_group->add(Gtk::Action::create("ProjectForceKillLastRunning", "Force Kill Last Process"), Gtk::AccelKey(menu.key_map["force_kill_last_running"]), [this]() {
Singleton::terminal()->kill_last_async_execute(true);
});
menu.action_group->add(Gtk::Action::create("WindowCloseTab", "Close tab"), Gtk::AccelKey(menu.key_map["close_tab"]), [this]() { menu.action_group->add(Gtk::Action::create("WindowCloseTab", "Close tab"), Gtk::AccelKey(menu.key_map["close_tab"]), [this]() {
notebook.close_current_page(); notebook.close_current_page();
@ -267,8 +298,6 @@ void Window::create_menu() {
bool Window::on_key_press_event(GdkEventKey *event) { bool Window::on_key_press_event(GdkEventKey *event) {
if(event->keyval==GDK_KEY_Escape) { if(event->keyval==GDK_KEY_Escape) {
if(entry_box.entries.size()==0)
Singleton::terminal()->kill_executing();
entry_box.hide(); entry_box.hide();
} }
#ifdef __APPLE__ //For Apple's Command-left, right, up, down keys #ifdef __APPLE__ //For Apple's Command-left, right, up, down keys
@ -312,7 +341,7 @@ void Window::hide() {
if(!notebook.close_current_page()) if(!notebook.close_current_page())
return; return;
} }
Singleton::terminal()->kill_executing(); Singleton::terminal()->kill_async_executes();
Gtk::Window::hide(); Gtk::Window::hide();
} }
@ -347,6 +376,46 @@ void Window::new_file_entry() {
entry_box.show(); entry_box.show();
} }
void Window::new_cpp_project_dialog() {
Gtk::FileChooserDialog dialog("Please create and/or choose a folder", Gtk::FILE_CHOOSER_ACTION_CREATE_FOLDER);
if(directories.current_path!="")
gtk_file_chooser_set_current_folder((GtkFileChooser*)dialog.gobj(), directories.current_path.string().c_str());
else
gtk_file_chooser_set_current_folder((GtkFileChooser*)dialog.gobj(), boost::filesystem::current_path().string().c_str());
dialog.set_transient_for(*this);
dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
dialog.add_button("Select", Gtk::RESPONSE_OK);
int result = dialog.run();
if(result==Gtk::RESPONSE_OK) {
boost::filesystem::path project_path=dialog.get_filename();
auto project_name=project_path.filename().string();
auto cmakelists_path=project_path;
cmakelists_path+="/CMakeLists.txt";
auto cpp_main_path=project_path;
cpp_main_path+="/main.cpp";
if(boost::filesystem::exists(cmakelists_path)) {
Singleton::terminal()->print("Error: "+cmakelists_path.string()+" already exists.\n");
return;
}
if(boost::filesystem::exists(cpp_main_path)) {
Singleton::terminal()->print("Error: "+cpp_main_path.string()+" already exists.\n");
return;
}
std::string cmakelists="cmake_minimum_required(VERSION 2.8)\n\nproject("+project_name+")\n\nset(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -std=c++1y\")\n\nadd_executable("+project_name+" main.cpp)\n";
std::string cpp_main="#include <iostream>\n\nusing namespace std;\n\nint main() {\n cout << \"Hello World!\" << endl;\n\n return 0;\n}\n";
if(juci::filesystem::write(cmakelists_path, cmakelists) && juci::filesystem::write(cpp_main_path, cpp_main)) {
directories.open_folder(project_path);
notebook.open(cpp_main_path);
Singleton::terminal()->print("C++ project "+project_name+" created.\n");
}
else
Singleton::terminal()->print("Error: Could not create project "+project_path.string()+"\n");
}
}
void Window::open_folder_dialog() { void Window::open_folder_dialog() {
Gtk::FileChooserDialog dialog("Please choose a folder", Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); Gtk::FileChooserDialog dialog("Please choose a folder", Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
if(directories.current_path!="") if(directories.current_path!="")
@ -426,7 +495,7 @@ void Window::save_file_dialog() {
if(directories.current_path!="") if(directories.current_path!="")
directories.open_folder(); directories.open_folder();
notebook.open(path); notebook.open(path);
Singleton::terminal()->print("File saved to: " + notebook.get_current_view()->file_path+"\n"); Singleton::terminal()->print("File saved to: " + notebook.get_current_view()->file_path.string()+"\n");
} }
else else
Singleton::terminal()->print("Error saving file\n"); Singleton::terminal()->print("Error saving file\n");
@ -573,7 +642,7 @@ void Window::rename_token_entry() {
if(notebook.get_view(c)->rename_similar_tokens) { if(notebook.get_view(c)->rename_similar_tokens) {
auto number=notebook.get_view(c)->rename_similar_tokens(*token, content); auto number=notebook.get_view(c)->rename_similar_tokens(*token, content);
if(number>0) { if(number>0) {
Singleton::terminal()->print("Replaced "+std::to_string(number)+" occurrences in file "+notebook.get_view(c)->file_path+"\n"); Singleton::terminal()->print("Replaced "+std::to_string(number)+" occurrences in file "+notebook.get_view(c)->file_path.string()+"\n");
notebook.save(c); notebook.save(c);
} }
} }

3
src/window.h
Unescape View File

@ -29,6 +29,7 @@ private:
Gtk::Paned directory_and_notebook_panes; Gtk::Paned directory_and_notebook_panes;
Gtk::VBox notebook_vbox; Gtk::VBox notebook_vbox;
Gtk::VBox terminal_vbox; Gtk::VBox terminal_vbox;
Gtk::ScrolledWindow terminal_scrolled_window;
Gtk::HBox status_hbox; Gtk::HBox status_hbox;
EntryBox entry_box; EntryBox entry_box;
Menu menu; Menu menu;
@ -38,6 +39,7 @@ private:
void create_menu(); void create_menu();
void hide(); void hide();
void new_file_entry(); void new_file_entry();
void new_cpp_project_dialog();
void open_folder_dialog(); void open_folder_dialog();
void open_file_dialog(); void open_file_dialog();
void save_file_dialog(); void save_file_dialog();
@ -47,6 +49,7 @@ private:
void generate_keybindings(); void generate_keybindings();
std::string last_search; std::string last_search;
std::string last_replace; std::string last_replace;
std::string last_run_command;
bool case_sensitive_search=true; bool case_sensitive_search=true;
bool regex_search=false; bool regex_search=false;
bool search_entry_shown=false; bool search_entry_shown=false;

Write Preview
Loading…
Cancel
Save