fixed terminal view and compile and run

juci/directories.cc

@@ -99,6 +99,17 @@ int Directories::Controller::count(const std::string path) {
             boost::algorithm::trim(project_name_var);
             if (variabel_start == std::string::npos) { //  not a variabel
               variabel_start = line.find("(", 0);
+	      
+	      variabel_end = line.find(' ', variabel_start);
+	      if(variabel_end != std::string::npos){
+		return line.substr(variabel_start+1,
+				   (variabel_end)-variabel_start-1);
+	      }
+	      variabel_end = line.find("#", variabel_start);
+	      if(variabel_end != std::string::npos){
+		return line.substr(variabel_start+1,
+				   (variabel_end)-variabel_start-1);
+	      }
 	      variabel_end = line.find(")", variabel_start);
               return line.substr(variabel_start+1,
                                  (variabel_end)-variabel_start-1);

juci/source.cc

@@ -356,7 +356,7 @@ void Source::Controller::OnOpenFile(const string &filepath) {
                                    notebook_->index());
     view().OnUpdateSyntax(model().ExtractTokens(start_offset, end_offset),
                           model().config());
-  }
+  
 
   buffer()->signal_end_user_action().connect([this]() {
       if (!go) {
@@ -393,6 +393,7 @@ void Source::Controller::OnOpenFile(const string &filepath) {
       }
     });
   }
+}
 Glib::RefPtr<Gtk::TextBuffer> Source::Controller::buffer() {
   return view().get_buffer();
 }

juci/terminal.cc

@@ -1,6 +1,8 @@
 #include "terminal.h"
 #include <iostream>
 #include <thread>
+// #include <pstream.h>
+// #include <string>
 
 
 Terminal::View::View(){
@@ -21,32 +23,17 @@ void Terminal::Controller::SetFolderCommand( boost::filesystem::path
   folder_command_ = "cd "+ path_ + "; ";
 }
 
-bool Terminal::Controller::Compile(){
+void Terminal::Controller::Compile(){
-  if (running.try_lock()) {
-    std::thread execute([=]() {
   Terminal().get_buffer()->set_text("");
-	ExecuteCommand("cmake .");
+  ExecuteCommand("cmake .", "r");
   if (ExistInConsole(cmake_sucsess)){
-	  ExecuteCommand("make");
+    ExecuteCommand("make", "r");
   } 
-      });
-    execute.detach();
-    running.unlock();
-    if (ExistInConsole(make_built)) return true;
-  }
-  PrintMessage("juCi++ ERROR: Failed to compile project in directory"
-	       + path_ + "\n");
-  return false;
 }
 
 void Terminal::Controller::Run(std::string executable) {
-  if (running.try_lock()) {
+  PrintMessage("juCi++ execute: " + executable + "\n");
-    std::thread execute([=]() {
+  ExecuteCommand("./"+executable, "w");
-	ExecuteCommand("./"+executable);
-      });
-    execute.detach();
-    running.unlock();
-  }
 }
 
 void Terminal::Controller::PrintMessage(std::string message){
@@ -54,22 +41,6 @@ void Terminal::Controller::PrintMessage(std::string message){
     insert(Terminal().get_buffer()-> end(),"> "+message);
 }
 
-// bool Terminal::Controller::FindExecutable(std::string executable) {
-//   std::string build = Terminal().get_buffer()->get_text();
-//   double pos = build.find(make_built);
-//   Gtk::TextIter start = Terminal().get_buffer()->get_iter_at_offset(pos);
-//   Gtk::TextIter end = Terminal().get_buffer()->get_iter_at_offset(pos);
-//   while (!end.ends_line())  {
-//     end.forward_char();
-//   }
-//   build = Terminal().get_buffer()->get_text(start, end);
-//   pos = build.find_last_of(" ");
-//   build = build.substr(pos+1);
-//   std::cout << "DEBUG: BUILD TARGET = "<< build << std::endl;
-//   std::cout << "EDEBUG: ECUTABLE FILE = "<< executable << std::endl;
-//   if(build != executable) return false;
-//   return true;
-// }
 
 bool Terminal::Controller::ExistInConsole(std::string string) {
   double pos = Terminal().get_buffer()->
@@ -78,10 +49,16 @@ bool Terminal::Controller::ExistInConsole(std::string string) {
   return true;
 }
 
-void Terminal::Controller::ExecuteCommand(std::string command) {
+void Terminal::Controller::ExecuteCommand(std::string command, std::string mode) {
-  command = folder_command_+command;
+
   std::cout << "EXECUTE COMMAND: "<< command << std::endl;
-  FILE* p = popen(command.c_str(), "r");
+  if(mode == "w"){
+    command =  path_ + " " +command + " > some_file.txt";
+    system(command.c_str());
+  }else{
+    
+    FILE* p = popen(command.c_str(), mode.c_str());
+    command = folder_command_+command;
     if (p == NULL) {
       PrintMessage("juCi++ ERROR: Failed to run command" + command + "\n");
     }else {
@@ -92,3 +69,18 @@ void Terminal::Controller::ExecuteCommand(std::string command) {
       pclose(p); 
     }
   }
+
+
+
+  // // run a process and create a streambuf that reads its stdout and stderr
+  //  redi::ipstream proc(command, redi::pstreams::pstderr);
+  //  std::string line;
+  //  // read child's stdout
+  //  while (std::getline(proc.out(), line))
+  //    PrintMessage(line+ "\n");
+
+  //  // read child's stderr
+  //  while (std::getline(proc.err(), line))
+  //    PrintMessage(line+ "\n");
+
+}

juci/terminal.h

@@ -25,17 +25,15 @@ namespace Terminal {
     Gtk::TextView& Terminal(){return view_.textview();}
     void SetFolderCommand(boost::filesystem::path CMake_path);
     void Run(std::string executable);
-    bool Compile();
+    void Compile();
   private:
-    void ExecuteCommand(std::string command);
+    void ExecuteCommand(std::string command, std::string mode);
     bool OnButtonRealeaseEvent(GdkEventKey* key);
     bool ExistInConsole(std::string string);
-    //  bool FindExecutable(std::string executable);
     void PrintMessage(std::string message);
     Terminal::View view_;
     std::string folder_command_;
     std::string path_;
-    std::mutex running;
     const std::string cmake_sucsess = "Build files have been written to:";
     const std::string make_built = "Built target";
     const std::string make_executable = "Linking CXX executable";

juci/window.cc

@@ -49,13 +49,22 @@ Window::Window() :
 	  Gtk::AccelKey(keybindings_.config_
 			.key_map()["compile_and_run"]),
 	  [this]() {
+	    if (running.try_lock()) {
+	      std::thread execute([=]() {
 		  notebook_.OnSaveFile();
 		  std::string path = notebook_.CurrentPagePath();
+		  int pos = path.find_last_of("/\\");
+		  if(pos != std::string::npos){
+		    path.erase(path.begin()+pos,path.end());
 		    terminal_.SetFolderCommand(path);
-	    if(terminal_.Compile()) {
+		  }
+		  terminal_.Compile();
 		  std::string executable = notebook_.directories().
 		    GetCmakeVarValue(path,"add_executable");
 		  terminal_.Run(executable);
+		});
+	      execute.detach();
+	      running.unlock();
 	    }
 	  });
    
@@ -66,12 +75,21 @@ Window::Window() :
 	  Gtk::AccelKey(keybindings_.config_
 			.key_map()["compile"]),
 	  [this]() {
+	    if (running.try_lock()) {
+	      std::thread execute([=]() {
 		  notebook_.OnSaveFile();
-	    std::string path =
+		  std::string path =  notebook_.CurrentPagePath();
-	      notebook_.CurrentPagePath();
+		  int pos = path.find_last_of("/\\");
+		  if(pos != std::string::npos){
+		    path.erase(path.begin()+pos,path.end());
 		    terminal_.SetFolderCommand(path);
+		  }
 		  terminal_.Compile();
 		});
+	      execute.detach();
+	      running.unlock();
+	    }
+	  });
 
     this->signal_button_release_event().
       connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false);
@@ -87,9 +105,12 @@ Window::Window() :
   keybindings_.BuildMenu();
 
   window_box_.pack_start(menu_.view(), Gtk::PACK_SHRINK);
+
   window_box_.pack_start(notebook_.entry_view(), Gtk::PACK_SHRINK);
-  window_box_.pack_start(notebook_.view());
+  paned_.set_position(300);
-  window_box_.pack_end(terminal_.view(),Gtk::PACK_SHRINK);
+  paned_.pack1(notebook_.view(), true, false);
+  paned_.pack2(terminal_.view(), true, true);
+  window_box_.pack_end(paned_);
   show_all_children();
   } // Window constructor
 

juci/window.h

@@ -25,11 +25,12 @@ public:
   
   Keybindings::Controller& keybindings() { return keybindings_; }
  private:
+  std::mutex running;
+  Gtk::VPaned paned_;
   //signal handlers
   void OnWindowHide();
   void OnOpenFile();
   void OnFileOpenFolder();
-
   bool OnMouseRelease(GdkEventButton* button);  
 };