Browse Source

something wrong with clang::*

master
oyvang 11 years ago
parent
commit
373d51b706
  1. 2
      juci/juci.cc
  2. 80
      juci/notebook.cc
  3. 1
      juci/notebook.h

2
juci/juci.cc

@ -1,11 +1,11 @@
#include "window.h" #include "window.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
Glib::RefPtr<Gtk::Application> app = Gtk::Application::create( Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(
argc, argc,
argv, argv,
"no.sout.juci"); "no.sout.juci");
Window window; Window window;
//api::LoadPlugin("juci_api_test"); //api::LoadPlugin("juci_api_test");

80
juci/notebook.cc

@ -1,11 +1,14 @@
#include <thread>
#include "notebook.h" #include "notebook.h"
Notebook::Model::Model() { Notebook::Model::Model() {
cc_extension_ = ".cc"; cc_extension_ = ".cc";
h_extension_ = ".h"; h_extension_ = ".h";
scrollvalue_ = 20; scrollvalue_ = 50;
} };
Notebook::View::View(){ Notebook::View::View(){
view_.pack_start(notebook_); view_.pack_start(notebook_);
} }
@ -99,13 +102,6 @@ source_config_(source_cfg) {
Search(false); Search(false);
}); });
text_vec_.back()->view().
signal_scroll_event().connect(sigc::mem_fun(
this,
&Notebook::Controller::
scroll_event_callback));
}//Constructor }//Constructor
@ -120,19 +116,14 @@ bool Notebook::Controller::scroll_event_callback(GdkEventScroll* scroll_event) {
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);
} }
if ( direction_x != 0 ) {
int dir_val = direction_x==-1?-model_.scrollvalue_:+model_.scrollvalue_;
adj->set_value(adj->get_value()+dir_val);
text_vec_.at(page)->view().set_hadjustment(adj);
}
return true; return true;
} }
Notebook::Controller::~Controller() { Notebook::Controller::~Controller() {
for (auto &i : text_vec_) delete i; for (auto &i : text_vec_) delete i;
for (auto &i : linenumbers_vec_) delete i; for (auto &i : linenumbers_vec_) delete i;
@ -148,9 +139,9 @@ Gtk::Box& Notebook::Controller::entry_view() {
return entry_.view(); return entry_.view();
} }
void Notebook::Controller::OnNewPage(std::string name) { void Notebook::Controller::OnNewPage(std::string name) {
OnCreatePage(); OnCreatePage();
std::cout << "oppretta pages" << std::endl; std::cout << "oppretta pages" << std::endl;
text_vec_.back()->OnNewEmptyFile(); text_vec_.back()->OnNewEmptyFile();
Notebook().append_page(*editor_vec_.back(), name); Notebook().append_page(*editor_vec_.back(), name);
@ -178,7 +169,7 @@ void Notebook::Controller::OnCreatePage(){
editor_vec_.push_back(new Gtk::HBox()); editor_vec_.push_back(new Gtk::HBox());
scrolledtext_vec_.back()->add(text_vec_.back()->view()); scrolledtext_vec_.back()->add(text_vec_.back()->view());
scrolledline_vec_.back()->add(linenumbers_vec_.back()->view()); scrolledline_vec_.back()->add(linenumbers_vec_.back()->view());
linenumbers_vec_.back()->view().get_buffer()->set_text("1 \n"); linenumbers_vec_.back()->view().get_buffer()->set_text("1 ");
linenumbers_vec_.back()->view().override_color(Gdk::RGBA("Black")); linenumbers_vec_.back()->view().override_color(Gdk::RGBA("Black"));
linenumbers_vec_.back()-> linenumbers_vec_.back()->
view().set_justification(Gtk::Justification::JUSTIFY_RIGHT); view().set_justification(Gtk::Justification::JUSTIFY_RIGHT);
@ -187,6 +178,7 @@ void Notebook::Controller::OnCreatePage(){
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());
} }
@ -289,41 +281,34 @@ void Notebook::Controller::Search(bool forward){
search_match_end_); search_match_end_);
} }
} }
void Notebook::Controller::OnBufferChange() { void Notebook::Controller::OnBufferChange() {
int page = CurrentPage(); int page = CurrentPage();
int line_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();
Glib::RefPtr while (line_nr < text_nr ){
<Gtk::TextBuffer::Mark> mark = Gtk::TextBuffer::Mark::create(); line_nr++;
Glib::RefPtr Buffer(linenumbers_vec_.at(page))->
<Gtk::TextBuffer::Mark> mark_lines = Gtk::TextBuffer::Mark::create(); insert(Buffer(linenumbers_vec_.at(page))->end(),
"\n"+std::to_string(line_nr)+" ");
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))->end().get_line()) {
std::string lines ="1 ";
for ( int it = 2; it <= line_nr; ++it ) {
lines.append("\n"+ std::to_string(it)+" ");
} }
Buffer(linenumbers_vec_.at(page))->set_text(lines); while (line_nr > text_nr ){
Gtk::TextIter iter = Buffer(linenumbers_vec_.at(page))->get_iter_at_line(line_nr);
Buffer(text_vec_.at(page))-> iter.backward_char();
add_mark( line_nr--;
mark,
Buffer(text_vec_.at(page))->end());
Buffer(linenumbers_vec_.at(page))-> Buffer(linenumbers_vec_.at(page))->
add_mark( erase(iter,
mark_lines,
Buffer(linenumbers_vec_.at(page))->end()); Buffer(linenumbers_vec_.at(page))->end());
}
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))->end().get_line()) {
text_vec_.at(page)->view().scroll_to(mark); GdkEventScroll* scroll = new GdkEventScroll;
linenumbers_vec_.at(page)->view().scroll_to(mark_lines); scroll->delta_y = 1.0;
}else{ scroll->delta_x = 0.0;
Buffer(text_vec_.at(page))-> scroll_event_callback(scroll);
add_mark( delete scroll;
mark,
Buffer(text_vec_.at(page))->
get_insert()->get_iter());
} }
} }
@ -355,3 +340,4 @@ void Notebook::Controller::BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer>
OnBufferChange(); OnBufferChange();
}); });
} }

1
juci/notebook.h

@ -69,4 +69,5 @@ 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_

Loading…
Cancel
Save