merged config and linenumbers

juci/api.cc

@@ -202,13 +202,16 @@ void libjuci::IterToWordEnd(Gtk::TextIter &iter) {
 
 Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() {
   // finding focused view
-  int i = 0;
+  // int i = 0;
-  while (!PluginApi::notebook_->source_vec_.at(i)->view().has_focus()) {
+  // while (!PluginApi::notebook_->source_vec_.at(i)->view().has_focus()) {
-    i++;
+  //   i++;
-  }
+  //while(!PluginApi::notebook_->CurrentTextView().has_focus()) {
+  //   i++;
+  // }
   return Glib::RefPtr<Gtk::TextBuffer>(PluginApi::notebook_
-                                       ->source_vec_.at(i)
+                                       // ->source_vec_.at(i)
-                                       ->view().get_buffer());
+                                       // ->view().get_buffer());
+				       ->CurrentTextView().get_buffer());
 }
 
 Gtk::TextIter libjuci::IterFromNotebook() {

juci/config.cc

@@ -37,6 +37,6 @@ void MainConfig::GenerateKeybindings() {
 Keybindings::Config& MainConfig::keybindings_cfg() {
   return keybindings_cfg_;
 }
-const Source::Config& MainConfig::source_cfg() {
+Source::Config& MainConfig::source_cfg() {
   return source_cfg_;
 }

juci/config.h

@@ -8,7 +8,7 @@
 class MainConfig {
 public:
   MainConfig();
-  const Source::Config& source_cfg();
+  Source::Config& source_cfg();
   Keybindings::Config& keybindings_cfg();
   void PrintMenu();
   void GenerateSource();

juci/config.json

@@ -21,7 +21,7 @@
     "keybindings": {
 	"split_window": "<control><alt>s",
 	"new_h_file": "<control><alt>h",
-	"new_cc_file": "<control><alt>c",
+	"new_cc_file": "<alt>c",
 	"close_tab": "<control>w"
     },
     "example": {

juci/notebook.cc

@@ -1,27 +1,20 @@
+
 #include "notebook.h"
 
 Notebook::Model::Model() {
-  cc_extension = ".cc";
+  cc_extension_ = ".cc";
-  h_extension  = ".h";
+  h_extension_  = ".h";
-};
+  scrollvalue_ = 20;
-Notebook::View::View() :
-  view_(Gtk::ORIENTATION_VERTICAL){
-
 }
-Gtk::Box& Notebook::View::view() {
+Notebook::View::View(){
   view_.pack_start(notebook_);  
-  return view_;
 }
 
 Notebook::Controller::Controller(Keybindings::Controller& keybindings,
-				 const Source::Config &source_cfg) { 
+				 Source::Config& source_cfg) :
-  scrolledwindow_vec_.push_back(new Gtk::ScrolledWindow());
+source_config_(source_cfg) { 
-  source_vec_.push_back(new Source::Controller(source_cfg));
+  OnNewPage("juCi++");
-  scrolledwindow_vec_.back()->add(source_vec_.back()->view());
+  refClipboard_ = Gtk::Clipboard::get();
-  source_vec_.back()->OnNewEmptyFile();
-  notebook().append_page(*scrolledwindow_vec_.back(), "juCi++");
-  notebook().set_focus_child(*scrolledwindow_vec_.back());
-  refClipboard = Gtk::Clipboard::get();
   keybindings.action_group_menu()->add(Gtk::Action::create("FileMenu",
                                                            Gtk::Stock::FILE));
   /* File->New files */
@@ -31,7 +24,7 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
                                                            "New empty file",
                                                            "Create a new file"),
                                        [this]() {
-					 is_new_file = true;
+					 is_new_file_ = true;
                                          OnFileNewEmptyfile();
                                        });
   keybindings.action_group_menu()->add(Gtk::Action::create("FileNewCC",
@@ -39,7 +32,7 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
                                        Gtk::AccelKey(keybindings.config_
 						     .key_map()["new_cc_file"]),
                                        [this]() {
-					 is_new_file = true;
+					 is_new_file_ = true;
                                          OnFileNewCCFile();
                                        });
   keybindings.action_group_menu()->add(Gtk::Action::create("FileNewH",
@@ -47,7 +40,7 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
                                        Gtk::AccelKey(keybindings.config_
 						     .key_map()["new_h_file"]),
                                        [this]() {
-					 is_new_file = true;
+					 is_new_file_ = true;
                                          OnFileNewHeaderFile();
                                        });
   keybindings.action_group_menu()->add(Gtk::Action::create("WindowCloseTab",
@@ -60,7 +53,7 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
   keybindings.action_group_menu()->add(Gtk::Action::create("EditFind",
                                                            Gtk::Stock::FIND),
                                        [this]() {
-					 is_new_file = false;
+					 is_new_file_ = false;
 					 OnEditSearch();
 		       //TODO(Oyvang, Zalox, Forgi)Create function OnEditFind();
                                        });
@@ -81,9 +74,9 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
                                        });
   entry_.view_.entry().signal_activate().connect(
                                                  [this]() {
-						   if(is_new_file){
+						   if(is_new_file_){
 						     OnNewPage(entry_.text());
-						     entry_.OnHideEntries(is_new_file);
+						     entry_.OnHideEntries(is_new_file_);
 						   }else{
 						     Search(true);
 						   }
@@ -91,11 +84,11 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
   entry_.button_apply().signal_clicked().connect(
 						 [this]() {   
 						   OnNewPage(entry_.text());
-						   entry_.OnHideEntries(is_new_file);  
+						   entry_.OnHideEntries(is_new_file_);  
 						 });
   entry_.button_close().signal_clicked().connect(
 						 [this]() {   
-						   entry_.OnHideEntries(is_new_file);  
+						   entry_.OnHideEntries(is_new_file_);  
 						 });
   entry_.button_next().signal_clicked().connect(
 						[this]() {   
@@ -106,76 +99,146 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
 						  Search(false); 
 						});
 
+  text_vec_.back()->view().
+    signal_scroll_event().connect(sigc::mem_fun(
+						this,
+						&Notebook::Controller::
+						scroll_event_callback));
+
   
   
 }//Constructor
-Gtk::Box& Notebook::Controller::view() {
+
+
+bool Notebook::Controller::scroll_event_callback(GdkEventScroll* scroll_event) {
+  int page = CurrentPage();
+  int direction_y = scroll_event->delta_y;
+  int direction_x = scroll_event->delta_x;
+
+  Glib::RefPtr<Gtk::Adjustment> adj =
+    scrolledtext_vec_.at(page)->
+    get_vscrollbar()->get_adjustment();
+  
+  if ( direction_y != 0 ) {
+    int dir_val = direction_y==-1?-model_.scrollvalue_:+model_.scrollvalue_; 
+    adj->set_value(adj->get_value()+dir_val);
+    text_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;
+}
+
+Notebook::Controller::~Controller() {
+  for (auto &i : text_vec_) delete i;
+  for (auto &i : linenumbers_vec_) delete i;
+  for (auto &i : editor_vec_) delete i;
+  for (auto &i : scrolledtext_vec_) delete i;
+  for (auto &i : scrolledline_vec_) delete i;
+}
+
+Gtk::HBox& Notebook::Controller::view() {
   return view_.view();
 }
-Gtk::Box& Notebook::Controller::entry_view(){
+Gtk::Box& Notebook::Controller::entry_view() {
   return entry_.view();
 }
+
+
 void Notebook::Controller::OnNewPage(std::string name) {
-  scrolledwindow_vec_.push_back(new Gtk::ScrolledWindow());
+  OnCreatePage();
-  source_vec_.push_back(new Source::Controller(source_config_));
+  std::cout << "oppretta pages" << std::endl;
-  scrolledwindow_vec_.back()->add(source_vec_.back()->view());
+  text_vec_.back()->OnNewEmptyFile();
-  source_vec_.back()->OnNewEmptyFile();
+  Notebook().append_page(*editor_vec_.back(), name);
-  notebook().append_page(*scrolledwindow_vec_.back(), name);
+  Notebook().show_all_children();
-  notebook().show_all_children();
+  Notebook().set_current_page(Pages()-1);
-  notebook().set_focus_child(*scrolledwindow_vec_.back());
+  Notebook().set_focus_child(text_vec_.at(Pages()-1)->view()); 
-  notebook().set_current_page(pages()-1);
+}
+
+void Notebook::Controller::OnOpenFile(std::string path) {
+  OnCreatePage();
+  text_vec_.back()->OnOpenFile(path);
+  unsigned pos = path.find_last_of("/\\");
+  Notebook().append_page(*editor_vec_.back(), path.substr(pos+1));
+  Notebook().show_all_children();
+  Notebook().set_current_page(Pages()-1);
+  Notebook().set_focus_child(text_vec_.back()->view());
+  OnBufferChange();
+}
+
+void Notebook::Controller::OnCreatePage(){
+  text_vec_.push_back(new Source::Controller(source_config())); // add arguments
+  linenumbers_vec_.push_back(new Source::Controller(source_config())); // add arguments
+  scrolledline_vec_.push_back(new Gtk::ScrolledWindow());
+  scrolledtext_vec_.push_back(new Gtk::ScrolledWindow());
+  editor_vec_.push_back(new Gtk::HBox());
+  scrolledtext_vec_.back()->add(text_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().override_color(Gdk::RGBA("Black"));
+  linenumbers_vec_.back()->
+    view().set_justification(Gtk::Justification::JUSTIFY_RIGHT);
+  scrolledline_vec_.back()->get_vscrollbar()->hide();
+  linenumbers_vec_.back()->view().set_editable(false);
+  linenumbers_vec_.back()->view().set_sensitive(false);
+  editor_vec_.back()->pack_start(*scrolledline_vec_.back(),false,false);
+  editor_vec_.back()->pack_start(*scrolledtext_vec_.back(), true, true);
+  BufferChangeHandler(text_vec_.back()->view().get_buffer());
 }
+
 void Notebook::Controller::OnCloseCurrentPage() {
   //TODO (oyvang, zalox, forgi) Save a temp file, in case you close one you dont want to close?
-  int page = currentPage();
+  if(Pages()!=0){
-  notebook().remove_page(page);
+    int page = CurrentPage();
-  delete source_vec_.at(page);
+    Notebook().remove_page(page);
-  delete scrolledwindow_vec_.at(page);
+    delete text_vec_.at(page);
-  source_vec_.erase(source_vec_.begin()+ page);
+    delete linenumbers_vec_.at(page);
-  scrolledwindow_vec_.erase(scrolledwindow_vec_.begin()+page);
+    delete scrolledtext_vec_.at(page);
+    delete scrolledline_vec_.at(page);
+    delete editor_vec_.at(page);
+    text_vec_.erase(text_vec_.begin()+ page);
+    linenumbers_vec_.erase(linenumbers_vec_.begin()+page);
+    scrolledtext_vec_.erase(scrolledtext_vec_.begin()+page);
+    scrolledline_vec_.erase(scrolledline_vec_.begin()+page);
+    editor_vec_.erase(editor_vec_.begin()+page);
+  }
+
 }
 void Notebook::Controller::OnFileNewEmptyfile() {
   entry_.OnShowSetFilenName("");
 }
 void Notebook::Controller::OnFileNewCCFile() {
-  entry_.OnShowSetFilenName(model_.cc_extension);
+  entry_.OnShowSetFilenName(model_.cc_extension_);
 }
 void Notebook::Controller::OnFileNewHeaderFile() {
-  entry_.OnShowSetFilenName(model_.h_extension);
+  entry_.OnShowSetFilenName(model_.h_extension_);
 }
 void Notebook::Controller::OnEditCopy() {
-  if (pages() != 0) {
+  if (Pages() != 0) {
-    buffer()->copy_clipboard(refClipboard);
+    Buffer(text_vec_.at(CurrentPage()))->copy_clipboard(refClipboard_);
   }
 }
 void Notebook::Controller::OnEditPaste() {
-  if (pages() != 0) {
+  if (Pages() != 0) {
-    buffer()->paste_clipboard(refClipboard);
+    Buffer(text_vec_.at(CurrentPage()))->paste_clipboard(refClipboard_);
   }
 }
 void Notebook::Controller::OnEditCut() {
-  if (pages() != 0) {
+  if (Pages() != 0) {
-    buffer()->cut_clipboard(refClipboard);
+    Buffer(text_vec_.at(CurrentPage()))->cut_clipboard(refClipboard_);
   }
 }
 
-void Notebook::Controller::OnOpenFile(std::string path) {
-  scrolledwindow_vec_.push_back(new Gtk::ScrolledWindow());
-  source_vec_.push_back(new Source::Controller(source_config_));
-  scrolledwindow_vec_.back()->add(source_vec_.back()->view());
-  source_vec_.back()->OnOpenFile(path);
-  unsigned pos = path.find_last_of("/\\");
-  notebook().append_page(*scrolledwindow_vec_.back(), path.substr(pos+1));
-  notebook().show_all_children();
-  notebook().set_focus_child(*scrolledwindow_vec_.back());
-  notebook().set_current_page(pages()-1);
-}
-
 std::string Notebook::Controller::GetCursorWord(){
+  int page = CurrentPage();
   std::string word;
   Gtk::TextIter start,end;
-  start = buffer()->get_insert()->get_iter();
+  start = Buffer(text_vec_.at(page))->get_insert()->get_iter();
-  end = buffer()->get_insert()->get_iter();
+  end = Buffer(text_vec_.at(page))->get_insert()->get_iter();
   if(!end.ends_line()) {
     while(!end.ends_word()){
       end.forward_char();
@@ -186,63 +249,109 @@ std::string Notebook::Controller::GetCursorWord(){
       start.backward_char();
     }
   }
-  word = buffer()->get_text(start,end);
+  word = Buffer(text_vec_.at(page))->get_text(start,end);
-
   //TODO(Oyvang)fix selected text
   return word;
 }
 
-void Notebook::Controller::OnEditSearch(){
+void Notebook::Controller::OnEditSearch() {
-  search_match_end_ = buffer()->get_iter_at_offset(0);
+  search_match_end_ =
+    Buffer(text_vec_.at(CurrentPage()))->get_iter_at_offset(0);
   entry_.OnShowSearch(GetCursorWord());
-   
 }
 
 void Notebook::Controller::Search(bool forward){
+  int page = CurrentPage();
   std::string search_word;
   search_word = entry_.text();
   Gtk::TextIter test;
 
-  if(!forward){
+  if ( !forward ) {
-    if(search_match_start_ == 0 || search_match_start_.get_line_offset() == 0) {
+    if ( search_match_start_ == 0 ||
-      search_match_start_= buffer()->end();
+       search_match_start_.get_line_offset() == 0) {
+      search_match_start_= Buffer(text_vec_.at(CurrentPage()))->end();
     }
-    search_match_start_.backward_search(search_word,
+    search_match_start_.
-					Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY|
+      backward_search(search_word,
-					Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY,
+		      Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY |
-					search_match_start_, search_match_end_);  
+		      Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY,
-  }else{
+		      search_match_start_,
-    if(search_match_end_ == 0) {
+		      search_match_end_);  
-      search_match_end_= buffer()->begin();
+  } else {
+    if ( search_match_end_ == 0 ) {
+      search_match_end_= Buffer(text_vec_.at(CurrentPage()))->begin();
     }
-    search_match_end_.forward_search(search_word,
+    search_match_end_.
-				     Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY |
+      forward_search(search_word,
-				     Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY,
+		     Gtk::TextSearchFlags::TEXT_SEARCH_TEXT_ONLY |
-				     search_match_start_, search_match_end_);
+		     Gtk::TextSearchFlags::TEXT_SEARCH_VISIBLE_ONLY,
+		     search_match_start_,
+		     search_match_end_);
   }
+}
+void Notebook::Controller::OnBufferChange() {
+   int page =  CurrentPage();
+   int line_nr = Buffer(text_vec_.at(page))->get_line_count();
+
+   Glib::RefPtr
+     <Gtk::TextBuffer::Mark> mark = Gtk::TextBuffer::Mark::create();
+   Glib::RefPtr
+     <Gtk::TextBuffer::Mark> mark_lines = Gtk::TextBuffer::Mark::create();
 
-  // std::cout << "matc_start - "
+   if(Buffer(text_vec_.at(page))->get_insert()->get_iter().starts_line() &&
-  //   << search_match_start_.get_line_offset()
+      Buffer(text_vec_.at(page))->get_insert()->get_iter().get_line() ==
-  //   //<< test.get_line_offset()
+      Buffer(text_vec_.at(page))->end().get_line()) {
-  // 	    << "  ||  match_end - "
+     std::string lines ="1 ";
-  // 	    << search_match_end_.get_line_offset()
+     for ( int it = 2; it <= line_nr; ++it ) {
-  // 		<< std::endl;
+       lines.append("\n"+ std::to_string(it)+" ");
+     }
+     Buffer(linenumbers_vec_.at(page))->set_text(lines);
      
+     Buffer(text_vec_.at(page))->
+       add_mark(
+		mark,
+		Buffer(text_vec_.at(page))->end());
+     Buffer(linenumbers_vec_.at(page))->
+       add_mark(
+		mark_lines,
+		Buffer(linenumbers_vec_.at(page))->end());
 
+     text_vec_.at(page)->view().scroll_to(mark); 
+     linenumbers_vec_.at(page)->view().scroll_to(mark_lines);
+   }else{
+     Buffer(text_vec_.at(page))->
+       add_mark(
+		mark,
+	        Buffer(text_vec_.at(page))->
+		get_insert()->get_iter());
+   }
 }
 
 
-int Notebook::Controller::currentPage(){
+Gtk::TextView&  Notebook::Controller::CurrentTextView() {
-  return notebook().get_current_page();
+  return text_vec_.at(CurrentPage())->view();
 }
 
-Glib::RefPtr<Gtk::TextBuffer> Notebook::Controller::buffer(){
+int Notebook::Controller::CurrentPage() {
-  return source_vec_.at(currentPage())->view().get_buffer();
+  return Notebook().get_current_page();
 }
 
-int Notebook::Controller::pages(){
+Glib::RefPtr<Gtk::TextBuffer>
-  return notebook().get_n_pages();
+Notebook::Controller::Buffer( Source::Controller *source ) {
+  return source->view().get_buffer();
 }
-Gtk::Notebook& Notebook::Controller::notebook(){
+
+int Notebook::Controller::Pages() {
+  return Notebook().get_n_pages();
+}
+Gtk::Notebook& Notebook::Controller::Notebook() {
   return view_.notebook();
 }
+
+void Notebook::Controller::BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer>
+					       buffer) {
+  buffer->signal_changed().connect(
+				   [this]() {   
+				     OnBufferChange(); 
+				   });
+}

juci/notebook.h

@@ -10,56 +10,63 @@ namespace Notebook {
   class Model {
   public:
     Model();
-    std::string cc_extension;
+    std::string cc_extension_;
-    std::string h_extension;
+    std::string h_extension_;
+    int scrollvalue_;
   };
   class View {
   public:
     View();
-    Gtk::Box& view();
+    Gtk::HBox& view() {return view_;}
-    Gtk::Notebook& notebook() { return notebook_; }
+    Gtk::Notebook& notebook() {return notebook_; }
-
   protected:
-    Gtk::Box view_;
+    Gtk::HBox view_;
     Gtk::Notebook notebook_;
   };
   class Controller {
   public:
+
     Controller(Keybindings::Controller& keybindings,
-	       const Source::Config& config);
+	       Source::Config& config);
-    Gtk::Box& view();
+    ~Controller();
+    Glib::RefPtr<Gtk::TextBuffer> Buffer( Source::Controller *source);
+    Gtk::TextView& CurrentTextView();
+    int CurrentPage();
     Gtk::Box& entry_view();
-    void OnNewPage(std::string name);
+    Gtk::Notebook& Notebook();
+    void OnBufferChange();
     void OnCloseCurrentPage();
-    void OnOpenFile(std::string filename);
-    View view_;
-    Model model_;
-    Entry::Controller entry_;
-    std::vector<Source::Controller*> source_vec_;
-    std::vector<Gtk::ScrolledWindow*> scrolledwindow_vec_;
-    Glib::RefPtr<Gtk::Clipboard> refClipboard;
-    std::list<Gtk::TargetEntry> listTargets;
     std::string GetCursorWord();
-    Glib::RefPtr<Gtk::TextBuffer> buffer();
-    Gtk::Notebook& notebook();
-    int currentPage();
-    int pages();
-    void OnFileNewEmptyfile();
-    void OnFileNewCCFile();
-    void OnFileNewHeaderFile();
     void OnEditCopy();
-    void OnEditPaste();
     void OnEditCut();
+    void OnEditPaste();
     void OnEditSearch();
+    void OnFileNewCCFile();
+    void OnFileNewEmptyfile();
+    void OnFileNewHeaderFile();
+    void OnNewPage(std::string name);
+    void OnOpenFile(std::string filename);
+    void OnCreatePage();
+    bool scroll_event_callback(GdkEventScroll* scroll_event);
+    int Pages();
+    Gtk::HBox& view();
     void Search(bool forward);
     const Source::Config& source_config() { return source_config_; }
+  protected:
+    void BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer> buffer);
   private:
     Source::Config source_config_;
-    bool is_new_file;
+    View view_;
+    Model model_;
+    bool is_new_file_;
+    Entry::Controller entry_;
+    std::vector<Source::Controller*> text_vec_, linenumbers_vec_;
+    std::vector<Gtk::ScrolledWindow*> scrolledtext_vec_, scrolledline_vec_;
+    std::vector<Gtk::HBox*> editor_vec_;
+    std::list<Gtk::TargetEntry> listTargets_;
     Gtk::TextIter search_match_end_;
     Gtk::TextIter search_match_start_;
+    Glib::RefPtr<Gtk::Clipboard> refClipboard_;
   };  // class controller
 }  // namespace Notebook
-
-
 #endif  // JUCI_NOTEBOOK_H_