zalox
/
juci-archives
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Working console for linux, missing merge with forgie

master
oyvang 11 years ago
parent
1ccca62ebe
commit
59925ea19c
8 changed files with 153 additions and 89 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. 4
      juci/config.json
  2. 2
      juci/menu.cc
  3. 4
      juci/menu.xml
  4. 67
      juci/notebook.cc
  5. 118
      juci/terminal.cc
  6. 19
      juci/terminal.h
  7. 25
      juci/window.cc
  8. 1
      juci/window.h

4
juci/config.json
Unescape View File

@ -24,7 +24,9 @@
"new_cc_file": "<alt>c", "new_cc_file": "<alt>c",
"close_tab": "<control>w", "close_tab": "<control>w",
"open_folder": "<control><alt>o", "open_folder": "<control><alt>o",
"save_as": "<control><shift>s" "save_as": "<control><shift>s",
"compile_and_run": "<control><alt>r>",
"compile": "<control>r"
}, },
"directoryfilter": { "directoryfilter": {
"ignore": [ "ignore": [

2
juci/menu.cc
Unescape View File

@ -27,6 +27,8 @@ Menu::Controller::Controller(Keybindings::Controller& keybindings) :
[this]() { [this]() {
OnWindowSplitWindow(); OnWindowSplitWindow();
}); });
keybindings_.action_group_menu()->add(Gtk::Action::create("ProjectMenu",
"P_roject"));
keybindings_.action_group_menu()->add(Gtk::Action::create("PluginMenu", keybindings_.action_group_menu()->add(Gtk::Action::create("PluginMenu",
"_Plugins")); "_Plugins"));
keybindings_.action_group_menu()->add(Gtk::Action::create("HelpMenu", keybindings_.action_group_menu()->add(Gtk::Action::create("HelpMenu",

4
juci/menu.xml
Unescape View File

@ -19,6 +19,10 @@
<separator/> <separator/>
<menuitem action='EditFind'/> <menuitem action='EditFind'/>
</menu> </menu>
<menu action='ProjectMenu'>
<menuitem action='ProjectCompileAndRun'/>
<menuitem action='ProjectCompile'/>
</menu>
<menu action='WindowMenu'> <menu action='WindowMenu'>
<menuitem action='WindowCloseTab'/> <menuitem action='WindowCloseTab'/>
<menuitem action='WindowSplitWindow'/> <menuitem action='WindowSplitWindow'/>

67
juci/notebook.cc
Unescape View File

@ -151,39 +151,42 @@ bool Notebook::Controller::GeneratePopup(){
std::vector<std::string> items; std::vector<std::string> items;
Gtk::TextIter start = CurrentTextView().get_buffer()->get_insert()->get_iter(); Gtk::TextIter start = CurrentTextView().get_buffer()->get_insert()->get_iter();
text_vec_.at(CurrentPage())->GetAutoCompleteSuggestions(start.get_line()+1, text_vec_.at(CurrentPage())->GetAutoCompleteSuggestions(start.get_line()+1,
start.get_line_offset()+2, start.get_line_offset()+2,
&items); &items);
std::cout << items.size()<< std::endl; std::cout << items.size()<< std::endl;
if(items.size()>0){
// Replace over with get suggestions from zalox! OVER IS JUST FOR TESTING
// Replace over with get suggestions from zalox! OVER IS JUST FOR TESTING
Gtk::ScrolledWindow popup_scroll_;
Gtk::ListViewText listview_(1,false,Gtk::SelectionMode::SELECTION_SINGLE); Gtk::ScrolledWindow popup_scroll_;
Gtk::ListViewText listview_(1,false,Gtk::SelectionMode::SELECTION_SINGLE);
popup_scroll_.set_policy(Gtk::PolicyType::POLICY_NEVER,
Gtk::PolicyType::POLICY_NEVER); popup_scroll_.set_policy(Gtk::PolicyType::POLICY_NEVER,
listview_.set_enable_search(false); Gtk::PolicyType::POLICY_NEVER);
listview_.set_headers_visible(false); listview_.set_enable_search(false);
listview_.set_hscroll_policy(Gtk::ScrollablePolicy::SCROLL_NATURAL); listview_.set_headers_visible(false);
listview_.set_activate_on_single_click(true); listview_.set_hscroll_policy(Gtk::ScrollablePolicy::SCROLL_NATURAL);
for (auto &i : items) listview_.append(i); listview_.set_activate_on_single_click(true);
popup_scroll_.add(listview_); for (auto &i : items) listview_.append(i);
popup_.get_vbox()->pack_start(popup_scroll_); popup_scroll_.add(listview_);
popup_.set_transient_for(*window_); popup_.get_vbox()->pack_start(popup_scroll_);
popup_.show_all(); popup_.set_transient_for(*window_);
popup_.show_all();
int popup_x = popup_.get_width();
int popup_y = items.size()*20; int popup_x = popup_.get_width();
PopupSetSize(popup_scroll_,popup_x,popup_y); int popup_y = items.size()*20;
int x,y; PopupSetSize(popup_scroll_,popup_x,popup_y);
FindPopupPosition(CurrentTextView(),popup_x,popup_y,x,y); int x,y;
popup_.move(x, y+15); FindPopupPosition(CurrentTextView(),popup_x,popup_y,x,y);
PopupSelectHandler(popup_, listview_); popup_.move(x, y+15);
ispopup = true; PopupSelectHandler(popup_, listview_);
popup_.run(); ispopup = true;
popup_.hide(); popup_.run();
ispopup = false; popup_.hide();
return true; ispopup = false;
return true;
}
return false;
} }
bool Notebook::Controller::ScrollEventCallback(GdkEventScroll* scroll_event) { bool Notebook::Controller::ScrollEventCallback(GdkEventScroll* scroll_event) {

118
juci/terminal.cc
Unescape View File

@ -1,70 +1,94 @@
#include "terminal.h" #include "terminal.h"
#include <iostream> #include <iostream>
#include <thread>
Terminal::View::View(){ Terminal::View::View(){
scrolledwindow_.add(textview_); scrolledwindow_.add(textview_);
scrolledwindow_.set_size_request(-1,150); scrolledwindow_.set_size_request(-1,150);
view_.add(scrolledwindow_); view_.add(scrolledwindow_);
textview_.set_editable(false);
//Pango::TabArray tabsize;
//tabsize.set_tab(200,Pango::TAB_LEFT, 200);
//textview_.set_tabs(tabsize);
} }
Terminal::Controller::Controller() { Terminal::Controller::Controller() {
root = ""; folder_command_ = "";
Terminal().signal_key_release_event().
connect(sigc::mem_fun(*this,&Terminal::Controller::OnButtonRealeaseEvenet),false);
} }
bool Terminal::Controller::OnButtonRealeaseEvenet(GdkEventKey *key) { void Terminal::Controller::SetFolderCommand(std::string path) {
if(key->keyval == 65421 || key->keyval == 65293){ int pos = path.find_last_of("/\\");
ExecuteCommand(); path.erase(path.begin()+pos,path.end());
} folder_command_ = "cd "+ path + "; ";
return false;
} }
void Terminal::Controller::ExecuteCommand() {
std::cout << "EXECUTE COMMAND ALGORITHM "<< std::endl;
std::string temp = getCommand();
if(temp != ""){
std::cout << "EXECUTE COMMAND: "<<temp << std::endl;
FILE* p = popen(temp.c_str(), "r");
if (p == NULL)
{
Terminal().get_buffer()->insert(Terminal().get_buffer()->end(),"Command Failed\n");
} else{
char buffer[1028];
while (fgets(buffer, 1028, p) != NULL) void Terminal::Controller::CompileAndRun(std::string project_name) {
{ if (folder_command_=="") {
Terminal().get_buffer()->insert(Terminal().get_buffer()->end(),buffer); PrintMessage("juCi++ ERROR: Can not find project's CMakeList.txt\n");
} } else {
pclose(p); if (running.try_lock()) {
std::thread execute([=]() {
Terminal().get_buffer()->set_text("");
ExecuteCommand("cmake .");
if (ExistInConsole(cmake_sucsess)){
ExecuteCommand("make");
if (ExistInConsole(make_built)){
if (FindExecutable(project_name)) {
ExecuteCommand("./"+project_name);
} else {
PrintMessage("juCi++ ERROR: Can not find Executable\n");
}
}
}
});
execute.detach();
running.unlock();
}
}
}
void Terminal::Controller::PrintMessage(std::string message){
Terminal().get_buffer()->
insert(Terminal().get_buffer()-> end(),"> "+message);
}
} bool Terminal::Controller::FindExecutable(std::string executable) {
Terminal().get_buffer()->insert(Terminal().get_buffer()->end(),"Command Executed\n"); std::string build = Terminal().get_buffer()->get_text();
}else{ double pos = build.find(make_built);
std::cout << "NO COMMAND TO RUN"<< std::endl; 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(" ");
std::cout << "FINNER NY POS" << std::endl;
build = build.substr(pos+1);
std::cout <<"BUILD TARGET = "<< build << std::endl;
std::cout << "EXECUTABLE FILE = "<< executable << std::endl;
if(build != executable) return false;
return true;
}
bool Terminal::Controller::ExistInConsole(std::string string) {
double pos = Terminal().get_buffer()->
get_text().find(string);
if (pos == std::string::npos) return false;
return true;
} }
std::string Terminal::Controller::getCommand(){ void Terminal::Controller::ExecuteCommand(std::string command) {
std::string command = ""; command = folder_command_+command;
Gtk::TextIter start,end; std::cout << "EXECUTE COMMAND: "<< command << std::endl;
int a = Terminal().get_buffer()->get_insert()->get_iter().get_line()-1; FILE* p = popen(command.c_str(), "r");
if(a==-1)a=0; if (p == NULL) {
start = Terminal().get_buffer()->get_iter_at_line(a); PrintMessage("juCi++ ERROR: Failed to run command" + command + "\n");
end =Terminal().get_buffer()->get_iter_at_line(a); }else {
while(!end.ends_line()) { char buffer[1028];
end++; while (fgets(buffer, 1028, p) != NULL) {
} PrintMessage(buffer);
while(!start.starts_line()) { }
start--; pclose(p);
} }
command = Terminal().get_buffer()->get_text(start,end);
return command;
} }

19
juci/terminal.h
Unescape View File

@ -1,6 +1,7 @@
#ifndef JUCI_TERMINAL_H_ #ifndef JUCI_TERMINAL_H_
#define JUCI_TERMINAL_H_ #define JUCI_TERMINAL_H_
#include <mutex>
#include "gtkmm.h" #include "gtkmm.h"
namespace Terminal { namespace Terminal {
@ -21,14 +22,20 @@ namespace Terminal {
Controller(); Controller();
Gtk::HBox& view() {return view_.view();} Gtk::HBox& view() {return view_.view();}
Gtk::TextView& Terminal(){return view_.textview();} Gtk::TextView& Terminal(){return view_.textview();}
void SetFolderCommand(std::string path);
void CompileAndRun(std::string project_name);
private: private:
void ExecuteCommand(); void ExecuteCommand(std::string command);
std::string getCommand(); bool OnButtonRealeaseEvent(GdkEventKey* key);
bool OnButtonRealeaseEvenet(GdkEventKey* key); bool ExistInConsole(std::string string);
bool FindExecutable(std::string executable);
void PrintMessage(std::string message);
Terminal::View view_; Terminal::View view_;
std::string root; std::string folder_command_;
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";
}; // class controller }; // class controller
} // namespace Terminal } // namespace Terminal

25
juci/window.cc
Unescape View File

@ -5,7 +5,7 @@ Window::Window() :
main_config_(), main_config_(),
keybindings_(main_config_.keybindings_cfg()), keybindings_(main_config_.keybindings_cfg()),
notebook_(*this,keybindings(), main_config_.source_cfg(), main_config_.dir_cfg()), notebook_(*this,keybindings(), main_config_.source_cfg(), main_config_.dir_cfg()),
menu_(keybindings()) { menu_(keybindings()) {
set_title("juCi++"); set_title("juCi++");
set_default_size(600, 400); set_default_size(600, 400);
add(window_box_); add(window_box_);
@ -35,6 +35,28 @@ Window::Window() :
OnSaveFileAs(); OnSaveFileAs();
}); });
keybindings_.action_group_menu()->add(Gtk::Action::create("ProjectCompileAndRun",
"Compile And Run"),
Gtk::AccelKey(keybindings_.config_
.key_map()["compile_and_run"]),
[this]() {
terminal_.
SetFolderCommand("/home/gm/ClionProjects/testi/CM.txt");
std::string p = notebook_.directories().get_project_name("/home/gm/ClionProjects/testi");
terminal_.CompileAndRun(p);
});
keybindings_.action_group_menu()->add(Gtk::Action::create("ProjectCompile",
"Compile"),
Gtk::AccelKey(keybindings_.config_
.key_map()["compile"]),
[this]() {
terminal_.
SetFolderCommand("/home/gm/ClionProjects/testi/CM.txt");
std::string p = notebook_.directories().get_project_name("/home/gm/ClionProjects/testi");
terminal_.CompileAndRun(p);
});
this->signal_button_release_event(). this->signal_button_release_event().
connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false); connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false);
terminal_.Terminal().signal_button_release_event(). terminal_.Terminal().signal_button_release_event().
@ -77,6 +99,7 @@ void Window::OnFileOpenFolder() {
std::cout << "Folder selected: " << dialog.get_filename() std::cout << "Folder selected: " << dialog.get_filename()
<< std::endl; << std::endl;
notebook_.directories().open_folder(dialog.get_filename()); notebook_.directories().open_folder(dialog.get_filename());
std::cout << dialog.get_filename()<< std::endl;
break; break;
} }
case(Gtk::RESPONSE_CANCEL): case(Gtk::RESPONSE_CANCEL):

1
juci/window.h
Unescape View File

@ -30,7 +30,6 @@ public:
void OnFileOpenFolder(); void OnFileOpenFolder();
void OnSaveFileAs(); void OnSaveFileAs();
bool OnMouseRelease(GdkEventButton* button); bool OnMouseRelease(GdkEventButton* button);
}; };
#endif // JUCI_WINDOW_H #endif // JUCI_WINDOW_H

Write Preview
Loading…
Cancel
Save