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

Trying to find where juci crashes about once a day on OS X. Also fixed tooltip-newlines.

merge-requests/365/head
eidheim 10 years ago
parent
77401c5bfe
commit
32a27c91b1
8 changed files with 75 additions and 66 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. 10
      src/directories.cc
  2. 18
      src/notebook.cc
  3. 9
      src/selectiondialog.cc
  4. 62
      src/source.cc
  5. 4
      src/sourcefile.cc
  6. 9
      src/terminal.cc
  7. 23
      src/tooltips.cc
  8. 6
      src/window.cc

10
src/directories.cc
Unescape View File

@ -68,6 +68,7 @@ Directories::Directories() : stop_update_thread(false) {
}); });
update_dispatcher.connect([this](){ update_dispatcher.connect([this](){
DEBUG("start");
update_mutex.lock(); update_mutex.lock();
for(auto &path: update_paths) { for(auto &path: update_paths) {
if(last_write_times.count(path)>0) if(last_write_times.count(path)>0)
@ -75,11 +76,13 @@ Directories::Directories() : stop_update_thread(false) {
} }
update_paths.clear(); update_paths.clear();
update_mutex.unlock(); update_mutex.unlock();
DEBUG("end");
}); });
update_thread=std::thread([this](){ update_thread=std::thread([this](){
while(!stop_update_thread) { while(!stop_update_thread) {
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
DEBUG("start");
update_mutex.lock(); update_mutex.lock();
if(update_paths.size()==0) { if(update_paths.size()==0) {
for(auto it=last_write_times.begin();it!=last_write_times.end();) { for(auto it=last_write_times.begin();it!=last_write_times.end();) {
@ -101,6 +104,7 @@ Directories::Directories() : stop_update_thread(false) {
update_dispatcher(); update_dispatcher();
} }
update_mutex.unlock(); update_mutex.unlock();
DEBUG("end");
} }
}); });
} }
@ -138,14 +142,17 @@ void Directories::open(const boost::filesystem::path& dir_path) {
} }
void Directories::update() { void Directories::update() {
DEBUG("start");
update_mutex.lock(); update_mutex.lock();
for(auto &last_write_time: last_write_times) { for(auto &last_write_time: last_write_times) {
add_path(last_write_time.first, last_write_time.second.first); add_path(last_write_time.first, last_write_time.second.first);
} }
update_mutex.unlock(); update_mutex.unlock();
DEBUG("end");
} }
void Directories::select(const boost::filesystem::path &path) { void Directories::select(const boost::filesystem::path &path) {
DEBUG("start");
if(current_path=="") if(current_path=="")
return; return;
@ -185,6 +192,7 @@ void Directories::select(const boost::filesystem::path &path) {
} }
return false; return false;
}); });
DEBUG("end");
} }
bool Directories::ignored(std::string path) { bool Directories::ignored(std::string path) {
@ -204,6 +212,7 @@ bool Directories::ignored(std::string path) {
} }
void Directories::add_path(const boost::filesystem::path& dir_path, const Gtk::TreeModel::Row &parent) { void Directories::add_path(const boost::filesystem::path& dir_path, const Gtk::TreeModel::Row &parent) {
DEBUG("start");
last_write_times[dir_path.string()]={parent, boost::filesystem::last_write_time(dir_path)}; last_write_times[dir_path.string()]={parent, boost::filesystem::last_write_time(dir_path)};
std::unique_ptr<Gtk::TreeNodeChildren> children; //Gtk::TreeNodeChildren is missing default constructor... std::unique_ptr<Gtk::TreeNodeChildren> children; //Gtk::TreeNodeChildren is missing default constructor...
if(parent) if(parent)
@ -257,4 +266,5 @@ void Directories::add_path(const boost::filesystem::path& dir_path, const Gtk::T
auto child=tree_store->append(*children); auto child=tree_store->append(*children);
child->set_value(column_record.name, std::string("(empty)")); child->set_value(column_record.name, std::string("(empty)"));
} }
DEBUG("end");
} }

18
src/notebook.cc
Unescape View File

@ -28,15 +28,11 @@ int Notebook::size() {
} }
Source::View* Notebook::get_view(int page) { Source::View* Notebook::get_view(int page) {
if(page>=size())
return nullptr;
return source_views.at(page); return source_views.at(page);
} }
Source::View* Notebook::get_current_view() { Source::View* Notebook::get_current_view() {
INFO("Getting sourceview"); INFO("Getting sourceview");
if(get_current_page()==-1)
return nullptr;
return get_view(get_current_page()); return get_view(get_current_page());
} }
@ -163,25 +159,29 @@ bool Notebook::save_current() {
} }
bool Notebook::close_current_page() { bool Notebook::close_current_page() {
DEBUG("start");
INFO("Notebook close page"); INFO("Notebook close page");
if (size() != 0) { if (get_current_page()!=-1) {
if(get_current_view()->get_buffer()->get_modified()){ if(get_current_view()->get_buffer()->get_modified()){
if(!save_modified_dialog()) if(!save_modified_dialog()) {
DEBUG("end false");
return false; return false;
}
} }
int page = get_current_page(); int page = get_current_page();
remove_page(page); remove_page(page);
if(get_current_page()==-1) if(get_current_page()==-1)
Singleton::status()->set_text(""); Singleton::status()->set_text("");
auto source_view=source_views.at(page); auto source_view=source_views.at(page);
source_views.erase(source_views.begin()+ page);
scrolled_windows.erase(scrolled_windows.begin()+page);
hboxes.erase(hboxes.begin()+page);
if(auto source_clang_view=dynamic_cast<Source::ClangView*>(source_view)) if(auto source_clang_view=dynamic_cast<Source::ClangView*>(source_view))
source_clang_view->async_delete(); source_clang_view->async_delete();
else else
delete source_view; delete source_view;
source_views.erase(source_views.begin()+ page);
scrolled_windows.erase(scrolled_windows.begin()+page);
hboxes.erase(hboxes.begin()+page);
} }
DEBUG("end true");
return true; return true;
} }

9
src/selectiondialog.cc
Unescape View File

@ -210,7 +210,8 @@ void SelectionDialog::show() {
else { else {
auto last_it=list_view_text.get_model()->children().end(); auto last_it=list_view_text.get_model()->children().end();
last_it--; last_it--;
list_view_text.set_cursor(list_view_text.get_model()->get_path(last_it)); if(last_it)
list_view_text.set_cursor(list_view_text.get_model()->get_path(last_it));
} }
return true; return true;
} }
@ -269,7 +270,8 @@ bool SelectionDialog::on_key_press(GdkEventKey* key) {
else { else {
auto last_it=list_view_text.get_model()->children().end(); auto last_it=list_view_text.get_model()->children().end();
last_it--; last_it--;
list_view_text.set_cursor(list_view_text.get_model()->get_path(last_it)); if(last_it)
list_view_text.set_cursor(list_view_text.get_model()->get_path(last_it));
} }
return true; return true;
} }
@ -418,7 +420,8 @@ bool CompletionDialog::on_key_press(GdkEventKey* key) {
else { else {
auto last_it=list_view_text.get_model()->children().end(); auto last_it=list_view_text.get_model()->children().end();
last_it--; last_it--;
list_view_text.set_cursor(list_view_text.get_model()->get_path(last_it)); if(last_it)
list_view_text.set_cursor(list_view_text.get_model()->get_path(last_it));
} }
select(false); select(false);
update_tooltips(); update_tooltips();

62
src/source.cc
Unescape View File

@ -485,8 +485,7 @@ void Source::View::set_status(const std::string &status) {
string Source::View::get_line(size_t line_number) { string Source::View::get_line(size_t line_number) {
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line_number); Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(line_number);
Gtk::TextIter line_end_it = line_it; Gtk::TextIter line_end_it = line_it;
while(!line_end_it.ends_line()) while(!line_end_it.ends_line() && line_end_it.forward_char()) {}
line_end_it++;
std::string line(get_source_buffer()->get_text(line_it, line_end_it)); std::string line(get_source_buffer()->get_text(line_it, line_end_it));
return line; return line;
} }
@ -516,14 +515,15 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
if((line_nr+1)<get_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); auto line_end_iter=get_buffer()->get_iter_at_line(line_nr+1);
line_end_iter--; if(line_end_iter.backward_char()) {
std::smatch sm2; std::smatch sm2;
if(insert_it==line_end_iter && std::regex_match(next_line, sm2, tabs_regex)) { if(insert_it==line_end_iter && std::regex_match(next_line, sm2, tabs_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());
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
}
} }
} }
} }
@ -570,9 +570,8 @@ 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<indent_left_steps;c++) if(indent_left_steps==0 || line_plus_it.forward_chars(indent_left_steps))
line_plus_it++; get_source_buffer()->erase(line_it, line_plus_it);
get_source_buffer()->erase(line_it, line_plus_it);
} }
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
@ -590,10 +589,8 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
if(std::regex_match(previous_line, sm2, tabs_regex)) { if(std::regex_match(previous_line, sm2, tabs_regex)) {
if(line.size()==sm2[1].str().size() || line.size()==sm2[1].str().size()+tab_size || line.size()==sm2[1].str().size()-tab_size) { if(line.size()==sm2[1].str().size() || line.size()==sm2[1].str().size()+tab_size || line.size()==sm2[1].str().size()-tab_size) {
auto previous_line_end_it=insert_it; auto previous_line_end_it=insert_it;
for(unsigned c=0;c<line.size();c++) if(previous_line_end_it.backward_chars(line.size()+1))
previous_line_end_it--; get_source_buffer()->erase(previous_line_end_it, insert_it);
previous_line_end_it--;
get_source_buffer()->erase(previous_line_end_it, insert_it);
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
} }
@ -601,9 +598,8 @@ bool Source::View::on_key_press_event(GdkEventKey* key) {
} }
if(line.size()>=tab_size) { if(line.size()>=tab_size) {
auto insert_minus_tab_it=insert_it; auto insert_minus_tab_it=insert_it;
for(unsigned c=0;c<tab_size;c++) if(tab_size==0 || insert_minus_tab_it.backward_chars(tab_size))
insert_minus_tab_it--; get_source_buffer()->erase(insert_minus_tab_it, insert_it);
get_source_buffer()->erase(insert_minus_tab_it, insert_it);
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
} }
@ -1097,20 +1093,20 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) {
if(next_char!='}' && next_line.substr(0, next_line_with_end_bracket.size())!=next_line_with_end_bracket) { if(next_char!='}' && next_line.substr(0, next_line_with_end_bracket.size())!=next_line_with_end_bracket) {
get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+tab+"\n"+sm[1].str()+"}"); get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+tab+"\n"+sm[1].str()+"}");
auto insert_it = get_source_buffer()->get_insert()->get_iter(); auto insert_it = get_source_buffer()->get_insert()->get_iter();
for(size_t c=0;c<sm[1].str().size()+2;c++) if(insert_it.backward_chars(sm[1].str().size()+2)) {
insert_it--; scroll_to(get_source_buffer()->get_insert());
scroll_to(get_source_buffer()->get_insert()); get_source_buffer()->place_cursor(insert_it);
get_source_buffer()->place_cursor(insert_it); }
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
} }
else if(next_char=='}') { else if(next_char=='}') {
get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+tab+"\n"+sm[1].str()); get_source_buffer()->insert_at_cursor("\n"+sm[1].str()+tab+"\n"+sm[1].str());
auto insert_it = get_source_buffer()->get_insert()->get_iter(); auto insert_it = get_source_buffer()->get_insert()->get_iter();
for(size_t c=0;c<sm[1].str().size()+1;c++) if(insert_it.backward_chars(sm[1].str().size()+1)) {
insert_it--; scroll_to(get_source_buffer()->get_insert());
scroll_to(get_source_buffer()->get_insert()); get_source_buffer()->place_cursor(insert_it);
get_source_buffer()->place_cursor(insert_it); }
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
return true; return true;
} }
@ -1170,10 +1166,8 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) {
Gtk::TextIter insert_it = get_source_buffer()->get_insert()->get_iter(); Gtk::TextIter insert_it = get_source_buffer()->get_insert()->get_iter();
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(insert_it.get_line()); Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(insert_it.get_line());
Gtk::TextIter line_plus_it=line_it; Gtk::TextIter line_plus_it=line_it;
for(unsigned c=0;c<tab_size;c++) if(tab_size==0 || line_plus_it.forward_chars(tab_size))
line_plus_it++; get_source_buffer()->erase(line_it, line_plus_it);
get_source_buffer()->erase(line_it, line_plus_it);
} }
get_source_buffer()->insert_at_cursor("}"); get_source_buffer()->insert_at_cursor("}");
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
@ -1285,8 +1279,8 @@ void Source::ClangViewAutocomplete::autocomplete() {
autocomplete_starting=false; autocomplete_starting=false;
if(!autocomplete_cancel_starting) { if(!autocomplete_cancel_starting) {
auto start_iter=get_buffer()->get_insert()->get_iter(); auto start_iter=get_buffer()->get_insert()->get_iter();
for(size_t c=0;c<prefix.size();c++) if(prefix.size()>0 && !start_iter.backward_chars(prefix.size()))
start_iter--; return;
completion_dialog=std::unique_ptr<CompletionDialog>(new CompletionDialog(*this, get_buffer()->create_mark(start_iter))); completion_dialog=std::unique_ptr<CompletionDialog>(new CompletionDialog(*this, get_buffer()->create_mark(start_iter)));
auto rows=std::make_shared<std::unordered_map<std::string, std::string> >(); auto rows=std::make_shared<std::unordered_map<std::string, std::string> >();
completion_dialog->on_hide=[this](){ completion_dialog->on_hide=[this](){

4
src/sourcefile.cc
Unescape View File

@ -70,9 +70,7 @@ bool juci::filesystem::write(const std::string &path, Glib::RefPtr<Gtk::TextBuff
bool end_reached=false; bool end_reached=false;
while(!end_reached) { while(!end_reached) {
for(size_t c=0;c<buffer_size;c++) { for(size_t c=0;c<buffer_size;c++) {
if(end_iter) if(!end_iter.forward_char()) {
end_iter++;
else {
end_reached=true; end_reached=true;
break; break;
} }

9
src/terminal.cc
Unescape View File

@ -280,7 +280,7 @@ void Terminal::kill_async_executes(bool force) {
} }
int Terminal::print(const std::string &message, bool bold){ int Terminal::print(const std::string &message, bool bold){
INFO("Terminal: PrintMessage"); DEBUG("start");
if(bold) if(bold)
get_buffer()->insert_with_tag(get_buffer()->end(), message, bold_tag); get_buffer()->insert_with_tag(get_buffer()->end(), message, bold_tag);
else else
@ -293,15 +293,16 @@ int Terminal::print(const std::string &message, bool bold){
get_buffer()->delete_mark(mark); get_buffer()->delete_mark(mark);
} }
DEBUG("end");
return get_buffer()->end().get_line(); return get_buffer()->end().get_line();
} }
void Terminal::print(int line_nr, const std::string &message){ void Terminal::print(int line_nr, const std::string &message){
INFO("Terminal: PrintMessage at line " << line_nr); DEBUG("start");
auto iter=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.forward_char()) {}
iter++;
get_buffer()->insert(iter, message); get_buffer()->insert(iter, message);
DEBUG("end");
} }
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) {

23
src/tooltips.cc
Unescape View File

@ -1,6 +1,9 @@
#include "tooltips.h" #include "tooltips.h"
#include "singletons.h" #include "singletons.h"
#include <iostream>
using namespace std;
namespace sigc { namespace sigc {
template <typename Functor> template <typename Functor>
struct functor_trait<Functor, false> { struct functor_trait<Functor, false> {
@ -28,12 +31,10 @@ void Tooltip::update() {
auto end_iter=end_mark->get_iter(); auto end_iter=end_mark->get_iter();
text_view.get_iter_location(iter, activation_rectangle); text_view.get_iter_location(iter, activation_rectangle);
if(iter.get_offset()<end_iter.get_offset()) { if(iter.get_offset()<end_iter.get_offset()) {
iter++; while(iter!=end_iter && iter.forward_char()) {
while(iter!=end_iter) {
Gdk::Rectangle rectangle; Gdk::Rectangle rectangle;
text_view.get_iter_location(iter, rectangle); text_view.get_iter_location(iter, rectangle);
activation_rectangle.join(rectangle); activation_rectangle.join(rectangle);
iter++;
} }
} }
int location_window_x, location_window_y; int location_window_x, location_window_y;
@ -107,28 +108,28 @@ void Tooltip::wrap_lines(Glib::RefPtr<Gtk::TextBuffer> text_buffer) {
last_space=iter; last_space=iter;
if(*iter=='\n') { if(*iter=='\n') {
end=true; end=true;
iter++; iter.forward_char();
break; break;
} }
iter++; iter.forward_char();
} }
if(!end) { if(!end) {
while(!last_space && iter) { //If no space (word longer than 80) while(!last_space && iter) { //If no space (word longer than 80)
iter++; iter.forward_char();
if(iter && *iter==' ') if(iter && *iter==' ')
last_space=iter; last_space=iter;
} }
if(iter && last_space) { if(iter && last_space) {
auto mark=text_buffer->create_mark(last_space); auto mark=text_buffer->create_mark(last_space);
auto iter_mark=text_buffer->create_mark(iter); auto last_space_p=last_space;
auto last_space_p=last_space++; last_space.forward_char();
text_buffer->erase(last_space, last_space_p); text_buffer->erase(last_space_p, last_space);
text_buffer->insert(mark->get_iter(), "\n"); text_buffer->insert(mark->get_iter(), "\n");
iter=iter_mark->get_iter(); iter=mark->get_iter();
iter.forward_char();
text_buffer->delete_mark(mark); text_buffer->delete_mark(mark);
text_buffer->delete_mark(iter_mark);
} }
} }
} }

6
src/window.cc
Unescape View File

@ -214,7 +214,8 @@ void Window::create_menu() {
if(notebook.get_current_page()!=-1) { if(notebook.get_current_page()!=-1) {
while(gtk_events_pending()) while(gtk_events_pending())
gtk_main_iteration(); gtk_main_iteration();
notebook.get_current_view()->scroll_to(notebook.get_current_view()->get_buffer()->get_insert(), 0.0, 1.0, 0.5); if(notebook.get_current_page()!=-1)
notebook.get_current_view()->scroll_to(notebook.get_current_view()->get_buffer()->get_insert(), 0.0, 1.0, 0.5);
} }
}); });
menu.action_group->add(Gtk::Action::create("SourceGotoDeclaration", "Go to Declaration"), Gtk::AccelKey(menu.key_map["source_goto_declaration"]), [this]() { menu.action_group->add(Gtk::Action::create("SourceGotoDeclaration", "Go to Declaration"), Gtk::AccelKey(menu.key_map["source_goto_declaration"]), [this]() {
@ -226,7 +227,8 @@ void Window::create_menu() {
notebook.get_current_view()->get_buffer()->place_cursor(notebook.get_current_view()->get_buffer()->get_iter_at_line_index(location.second.line-1, location.second.index-1)); notebook.get_current_view()->get_buffer()->place_cursor(notebook.get_current_view()->get_buffer()->get_iter_at_line_index(location.second.line-1, location.second.index-1));
while(gtk_events_pending()) while(gtk_events_pending())
gtk_main_iteration(); gtk_main_iteration();
notebook.get_current_view()->scroll_to(notebook.get_current_view()->get_buffer()->get_insert(), 0.0, 1.0, 0.5); if(notebook.get_current_page()!=-1)
notebook.get_current_view()->scroll_to(notebook.get_current_view()->get_buffer()->get_insert(), 0.0, 1.0, 0.5);
} }
} }
} }

Write Preview
Loading…
Cancel
Save