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

reformatted code

merge-requests/365/head
tedjk 11 years ago
parent
2362a4a01c
commit
d99ae48cbf
5 changed files with 106 additions and 144 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. 103
      juci/api.cc
  2. 87
      juci/api.h
  3. 38
      juci/config.h
  4. 2
      juci/source.h
  5. 8
      juci/window.cc

103
juci/api.cc
Unescape View File

@ -1,15 +1,11 @@
#include "api.h" #include "api.h"
Menu::Controller* PluginApi::menu_; Menu::Controller* PluginApi::menu_;
Notebook::Controller* PluginApi::notebook_; Notebook::Controller* PluginApi::notebook_;
///////////////////////////// /////////////////////////////
//// API ServiceProvider //// //// API ServiceProvider ////
///////////////////////////// /////////////////////////////
std::string PluginApi::ProjectPath() {
std::string PluginApi::ProjectPath()
{
int MAXPATHLEN = 50; int MAXPATHLEN = 50;
char temp[MAXPATHLEN]; char temp[MAXPATHLEN];
return ( getcwd(temp, MAXPATHLEN) ? std::string( temp ) : std::string("") ); return ( getcwd(temp, MAXPATHLEN) ? std::string( temp ) : std::string("") );
@ -19,10 +15,9 @@ void PluginApi::ReplaceWord(std::string word) {
Glib::RefPtr<Gtk::TextBuffer> buffer = libjuci::BufferFromNotebook(); Glib::RefPtr<Gtk::TextBuffer> buffer = libjuci::BufferFromNotebook();
Gtk::TextIter word_start = libjuci::IterFromNotebook(); Gtk::TextIter word_start = libjuci::IterFromNotebook();
Gtk::TextIter word_end = libjuci::IterFromNotebook(); Gtk::TextIter word_end = libjuci::IterFromNotebook();
libjuci::IterToWordStart(word_start); libjuci::IterToWordStart(word_start);
libjuci::IterToWordEnd(word_end); libjuci::IterToWordEnd(word_end);
if(word_start != word_end) { if (word_start != word_end) {
buffer->erase(word_start, word_end); buffer->erase(word_start, word_end);
Gtk::TextIter current = libjuci::IterFromNotebook(); Gtk::TextIter current = libjuci::IterFromNotebook();
buffer->insert(current, word); buffer->insert(current, word);
@ -34,7 +29,6 @@ void PluginApi::ReplaceLine(std::string line) {
} }
std::string PluginApi::GetWord() { std::string PluginApi::GetWord() {
// TODO forgie: use notebook's functions
Glib::RefPtr<Gtk::TextBuffer> buffer = libjuci::BufferFromNotebook(); Glib::RefPtr<Gtk::TextBuffer> buffer = libjuci::BufferFromNotebook();
Gtk::TextIter word_start = libjuci::IterFromNotebook(); Gtk::TextIter word_start = libjuci::IterFromNotebook();
Gtk::TextIter word_end = libjuci::IterFromNotebook(); Gtk::TextIter word_end = libjuci::IterFromNotebook();
@ -42,54 +36,46 @@ std::string PluginApi::GetWord() {
libjuci::IterToWordStart(word_start); libjuci::IterToWordStart(word_start);
libjuci::IterToWordEnd(word_end); libjuci::IterToWordEnd(word_end);
if(word_start < word_end) { if (word_start < word_end) {
std::string word = buffer->get_text(word_start, word_end); std::string word = buffer->get_text(word_start, word_end);
return word; return word;
} }
return ""; return "";
} }
//runs the pythonscript that initiates every plugin within plugins/
void PluginApi::InitPlugins() { void PluginApi::InitPlugins() {
//libjuci::LoadPlugin(g_project_root+"plugins.py");
libjuci::LoadPlugin(ProjectPath()+"/plugins.py"); libjuci::LoadPlugin(ProjectPath()+"/plugins.py");
} }
void PluginApi::AddMenuElement(std::string plugin_name){ void PluginApi::AddMenuElement(std::string plugin_name) {
AddMenuXml(plugin_name, "PluginMenu"); AddMenuXml(plugin_name, "PluginMenu");
std::string plugin_action_name = plugin_name+"Menu"; std::string plugin_action_name = plugin_name+"Menu";
menu_->keybindings_.action_group_menu() menu_->keybindings_.action_group_menu()
->add(Gtk::Action::create(plugin_action_name, plugin_name)); ->add(Gtk::Action::create(plugin_action_name, plugin_name));
} }
void PluginApi::AddSubMenuElement(std::string parent_menu, void PluginApi::AddSubMenuElement(std::string parent_menu,
std::string menu_name, std::string menu_name,
std::string menu_func_name, std::string menu_func_name,
std::string plugin_path, std::string plugin_path,
std::string menu_keybinding) { std::string menu_keybinding) {
AddSubMenuXml(menu_func_name, parent_menu); AddSubMenuXml(menu_func_name, parent_menu);
menu_->keybindings_.action_group_menu() menu_->keybindings_.action_group_menu()
->add(Gtk::Action::create(menu_func_name, ->add(Gtk::Action::create(menu_func_name,
menu_name), menu_name),
Gtk::AccelKey(menu_keybinding), Gtk::AccelKey(menu_keybinding),
[=]() { [=]() {
libjuci::LoadPluginFunction(menu_func_name, plugin_path); libjuci::LoadPluginFunction(menu_func_name, plugin_path);
}); });
} }
void PluginApi::AddMenuXml(std::string plugin_name, std::string parent_menu) { void PluginApi::AddMenuXml(std::string plugin_name, std::string parent_menu) {
std::string temp_menu = menu_->keybindings_.model_.menu_ui_string(); std::string temp_menu = menu_->keybindings_.model_.menu_ui_string();
std::size_t plugin_menu_pos = temp_menu.find(parent_menu); std::size_t plugin_menu_pos = temp_menu.find(parent_menu);
// +2 gets you outside of the tag:<'menu_name'> ref: keybindings.cc // +2 gets you outside of the tag:<'menu_name'> ref: keybindings.cc
plugin_menu_pos+=parent_menu.size() +2; plugin_menu_pos+=parent_menu.size() +2;
std::string menu_prefix = temp_menu.substr(0, plugin_menu_pos); std::string menu_prefix = temp_menu.substr(0, plugin_menu_pos);
std::string menu_suffix = temp_menu.substr(plugin_menu_pos); std::string menu_suffix = temp_menu.substr(plugin_menu_pos);
std::string menu_input = std::string menu_input =
" <menu action='"+plugin_name+"Menu'> " " <menu action='"+plugin_name+"Menu'> "
" </menu> "; " </menu> ";
@ -98,7 +84,8 @@ void PluginApi::AddMenuXml(std::string plugin_name, std::string parent_menu) {
menu_prefix + menu_input + menu_suffix; menu_prefix + menu_input + menu_suffix;
} }
void PluginApi::AddSubMenuXml(std::string plugin_name, std::string parent_menu){ void PluginApi::AddSubMenuXml(std::string plugin_name,
std::string parent_menu) {
std::string temp_menu = menu_->keybindings_.model_.menu_ui_string(); std::string temp_menu = menu_->keybindings_.model_.menu_ui_string();
std::size_t parent_menu_pos = temp_menu.find(parent_menu); std::size_t parent_menu_pos = temp_menu.find(parent_menu);
@ -108,7 +95,6 @@ void PluginApi::AddSubMenuXml(std::string plugin_name, std::string parent_menu){
std::string menu_suffix = temp_menu.substr(parent_menu_pos); std::string menu_suffix = temp_menu.substr(parent_menu_pos);
std::string menu_input ="<menuitem action='"+plugin_name+"'/>"; std::string menu_input ="<menuitem action='"+plugin_name+"'/>";
menu_->keybindings_.model_.menu_ui_string_ = menu_->keybindings_.model_.menu_ui_string_ =
menu_prefix + menu_input + menu_suffix; menu_prefix + menu_input + menu_suffix;
} }
@ -122,27 +108,26 @@ void libjuci::ReplaceWord(const std::string word) {
void libjuci::ReplaceLine(const std::string line) { void libjuci::ReplaceLine(const std::string line) {
std::cout << "unimplemented function: 'libjuci::ReplaceLine()' called" std::cout << "unimplemented function: 'libjuci::ReplaceLine()' called"
<< std::endl; << std::endl;
} }
std::string libjuci::GetWord() { std::string libjuci::GetWord() {
return PluginApi::GetWord(); return PluginApi::GetWord();
} }
void libjuci::AddMenuElement(std::string plugin_name){ void libjuci::AddMenuElement(std::string plugin_name) {
PluginApi::AddMenuElement(plugin_name); PluginApi::AddMenuElement(plugin_name);
} }
void libjuci::AddSubMenuElement(std::string parent_menu, void libjuci::AddSubMenuElement(std::string parent_menu,
std::string menu_name, std::string menu_name,
std::string menu_func_name, std::string menu_func_name,
std::string plugin_path, std::string plugin_path,
std::string menu_keybinding) { std::string menu_keybinding) {
PluginApi::AddSubMenuElement(parent_menu, PluginApi::AddSubMenuElement(parent_menu,
menu_name, menu_name,
menu_func_name, menu_func_name,
plugin_path, plugin_path,
menu_keybinding); menu_keybinding);
} }
////////////////////////////// //////////////////////////////
@ -151,49 +136,47 @@ void libjuci::AddSubMenuElement(std::string parent_menu,
namespace bp = boost::python; namespace bp = boost::python;
bp::api::object libjuci::OpenPythonScript(const std::string path, bp::api::object libjuci::OpenPythonScript(const std::string path,
bp::api::object python_name_space) { bp::api::object python_name_space) {
bp::str str_path(path); bp::str str_path(path);
return bp::exec_file(str_path, python_name_space); return bp::exec_file(str_path, python_name_space);
} }
void libjuci::LoadPlugin(const std::string& plugin_name) { void libjuci::LoadPlugin(const std::string& plugin_name) {
try{ try {
Py_Initialize(); Py_Initialize();
bp::api::object main_module = bp::import("__main__"); bp::api::object main_module = bp::import("__main__");
bp::api::object main_namespace = bp::api::object main_namespace =
main_module.attr("__dict__"); main_module.attr("__dict__");
bp::api::object ignored2 = bp::api::object ignored2 =
OpenPythonScript(plugin_name, main_namespace); OpenPythonScript(plugin_name, main_namespace);
}catch (bp::error_already_set const&) {
}catch(bp::error_already_set const&) {
PyErr_Print(); PyErr_Print();
} }
} }
void libjuci::LoadPluginFunction(const std::string &function_name, void libjuci::LoadPluginFunction(const std::string &function_name,
const std::string &plugin_path){ const std::string &plugin_path) {
try{ try {
Py_Initialize(); Py_Initialize();
bp::api::object main_module = bp::import("__main__"); bp::api::object main_module = bp::import("__main__");
bp::api::object main_namespace = main_module.attr("__dict__"); bp::api::object main_namespace = main_module.attr("__dict__");
bp::api::object ignored2 = OpenPythonScript(plugin_path, main_namespace); bp::api::object ignored2 = OpenPythonScript(plugin_path, main_namespace);
bp::str func_name(function_name); bp::str func_name(function_name);
bp::api::object returnValue = bp::eval(func_name, main_namespace); bp::api::object returnValue = bp::eval(func_name, main_namespace);
}catch(bp::error_already_set const&) { }catch (bp::error_already_set const&) {
PyErr_Print(); PyErr_Print();
} }
} }
void libjuci::InitPlugin(const std::string& plugin_path) { void libjuci::InitPlugin(const std::string& plugin_path) {
try{ try {
Py_Initialize(); Py_Initialize();
bp::api::object main_module = bp::import("__main__"); bp::api::object main_module = bp::import("__main__");
bp::api::object main_namespace = main_module.attr("__dict__"); bp::api::object main_namespace = main_module.attr("__dict__");
bp::api::object ignored2 = OpenPythonScript(plugin_path, main_namespace); bp::api::object ignored2 = OpenPythonScript(plugin_path, main_namespace);
bp::object returnValue = bp::eval("initPlugin()", main_namespace); bp::object returnValue = bp::eval("initPlugin()", main_namespace);
//std::string return_value = bp::extract<std::string>(pySnippet); // do something with return_value
//do something with return_value }catch (bp::error_already_set const&) {
}catch(bp::error_already_set const&) {
PyErr_Print(); PyErr_Print();
} }
} }
@ -202,30 +185,30 @@ void libjuci::InitPlugin(const std::string& plugin_path) {
//// Glib wrappers //// //// Glib wrappers ////
/////////////////////// ///////////////////////
void libjuci::IterToWordStart(Gtk::TextIter &iter) { void libjuci::IterToWordStart(Gtk::TextIter &iter) {
if(!iter.starts_line()) { if (!iter.starts_line()) {
while(!iter.starts_word()) { while (!iter.starts_word()) {
iter.backward_char(); iter.backward_char();
} }
} }
} }
void libjuci::IterToWordEnd(Gtk::TextIter &iter) { void libjuci::IterToWordEnd(Gtk::TextIter &iter) {
if(!iter.ends_line()) { if (!iter.ends_line()) {
while(!iter.ends_word()) { while (!iter.ends_word()) {
iter.forward_char(); iter.forward_char();
} }
} }
} }
Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() { Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() {
//finding focused view // 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++;
} }
return Glib::RefPtr<Gtk::TextBuffer>(PluginApi::notebook_ return Glib::RefPtr<Gtk::TextBuffer>(PluginApi::notebook_
->source_vec_.at(i) ->source_vec_.at(i)
->view().get_buffer()); ->view().get_buffer());
} }
Gtk::TextIter libjuci::IterFromNotebook() { Gtk::TextIter libjuci::IterFromNotebook() {

87
juci/api.h
Unescape View File

@ -7,46 +7,39 @@
#include "notebook.h" #include "notebook.h"
#include "menu.h" #include "menu.h"
//////////////////// ////////////////////
//// Plugin Api //// //// Plugin Api ////
//////////////////// ////////////////////
class PluginApi { class PluginApi {
public: public:
static Menu::Controller* menu_; static Menu::Controller* menu_;
static Notebook::Controller* notebook_; static Notebook::Controller* notebook_;
static void InitPlugins();
static void InitPlugins(); static std::string ProjectPath();
static std::string ProjectPath(); // for Python module:
static std::string GetWord();
//for Python module: // menu management
static std::string GetWord(); static void AddMenuElement(const std::string plugin_name);
//menu management static void AddSubMenuElement(const std::string parent_menu,
static void AddMenuElement(const std::string plugin_name); const std::string menu_name,
static void AddSubMenuElement(const std::string parent_menu, const std::string menu_func_name,
const std::string menu_name, const std::string plugin_path,
const std::string menu_func_name, const std::string menu_keybinding);
const std::string plugin_path, // text-buffer functions
const std::string menu_keybinding); static void ReplaceWord(const std::string word);
//text-buffer functions static void ReplaceLine(const std::string line);
static void ReplaceWord(const std::string word); protected:
static void ReplaceLine(const std::string line); static void AddMenuXml(std::string plugin_name, std::string parent_menu);
static void AddSubMenuXml(std::string plugin_name, std::string parent_menu);
protected: }; // PluginApi
static void AddMenuXml(std::string plugin_name, std::string parent_menu);
static void AddSubMenuXml(std::string plugin_name, std::string parent_menu);
};
namespace libjuci { namespace libjuci {
/////////////////////// ///////////////////////
//// Glib wrappers //// //// Glib wrappers ////
/////////////////////// ///////////////////////
void IterToWordStart(Gtk::TextIter &iter); void IterToWordStart(Gtk::TextIter &iter);
void IterToWordEnd(Gtk::TextIter &iter); void IterToWordEnd(Gtk::TextIter &iter);
Gtk::TextIter IterFromNotebook(); Gtk::TextIter IterFromNotebook();
//TODO forgie: make sure it does not get the buffer to the last created textview.
Glib::RefPtr<Gtk::TextBuffer> BufferFromNotebook(); Glib::RefPtr<Gtk::TextBuffer> BufferFromNotebook();
/////////////////////// ///////////////////////
//// Api to python //// //// Api to python ////
/////////////////////// ///////////////////////
@ -57,27 +50,25 @@ namespace libjuci {
void AddMenuElement(const std::string plugin_name); void AddMenuElement(const std::string plugin_name);
void AddSubMenuElement(const std::string parent_menu, void AddSubMenuElement(const std::string parent_menu,
const std::string menu_name, const std::string menu_name,
const std::string menu_func_name, const std::string menu_func_name,
const std::string plugin_path, const std::string plugin_path,
const std::string menu_keybinding); const std::string menu_keybinding);
void AddMenuXml(const std::string plugin_name, void AddMenuXml(const std::string plugin_name,
const string parent_menu); const string parent_menu);
void AddSubMenuXml(const std::string plugin_name, void AddSubMenuXml(const std::string plugin_name,
const string parent_menu); const string parent_menu);
//TODO forgie: Make more functions targeting the python module
////////////////////////////// //////////////////////////////
//// Boost.Python methods //// //// Boost.Python methods ////
////////////////////////////// //////////////////////////////
boost::python::api::object OpenPythonScript(const std::string path, namespace bp = boost::python;
boost::python::api::object python_name_space); bp::api::object OpenPythonScript(const std::string path,
void LoadPlugin(const std::string& plugin_name); bp::api::object python_name_space);
void LoadPluginFunction(const std::string &function_name, const std::string &plugin_path); void LoadPlugin(const std::string& plugin_name);
void LoadPluginFunction(const std::string &function_name,
const std::string &plugin_path);
void InitPlugin(const std::string& plugin_path); void InitPlugin(const std::string& plugin_path);
} // libjuci
}//libjuci #endif // JUCI_API_H_
#endif // JUCI_API_H

38
juci/config.h
Unescape View File

@ -5,27 +5,17 @@
#include "keybindings.h" #include "keybindings.h"
#include "source.h" #include "source.h"
class MainConfig { class MainConfig {
public: public:
MainConfig(); MainConfig();
const Source::Config& source_cfg(); const Source::Config& source_cfg();
Keybindings::Config& keybindings_cfg(); Keybindings::Config& keybindings_cfg();
void PrintMenu();
void PrintMenu(); void GenerateSource();
//boost::property_tree::ptree& source_cfg(); void GenerateKeybindings();
//boost::property_tree::ptree& keybindings_cfg(); private:
//boost::property_tree::ptree& notebookk_cfg(); boost::property_tree::ptree cfg_;
//boost::property_tree::ptree& menu_cfg(); boost::property_tree::ptree key_tree_;
Source::Config source_cfg_;
boost::property_tree::ptree cfg_; Keybindings::Config keybindings_cfg_;
// boost::property_tree::ptree sourcecfg_; };
boost::property_tree::ptree key_tree_;
// boost::property_tree::ptree notebook_cfg_;
// boost::property_tree::ptree menu_cfg_;
Source::Config source_cfg_;
Keybindings::Config keybindings_cfg_;
void GenerateSource();
void GenerateKeybindings();
};

2
juci/source.h
Unescape View File

@ -46,7 +46,7 @@ namespace Source {
const string filepath(); const string filepath();
void SetFilePath(const string &filepath); void SetFilePath(const string &filepath);
void SetSourceLocations( void SetSourceLocations(
const std::vector<Clang::SourceLocation> &locations); const std::vector<Clang::SourceLocation> &locations);
std::vector<Clang::SourceLocation>& getSourceLocations() { std::vector<Clang::SourceLocation>& getSourceLocations() {
return locations_; return locations_;
} }

8
juci/window.cc
Unescape View File

@ -4,8 +4,8 @@ Window::Window() :
window_box_(Gtk::ORIENTATION_VERTICAL), window_box_(Gtk::ORIENTATION_VERTICAL),
main_config_(), main_config_(),
keybindings_(main_config_.keybindings_cfg()), keybindings_(main_config_.keybindings_cfg()),
notebook_( keybindings(), main_config_.source_cfg()), notebook_(keybindings(), main_config_.source_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_);
@ -26,8 +26,6 @@ Window::Window() :
add_accel_group(keybindings_.ui_manager_menu()->get_accel_group()); add_accel_group(keybindings_.ui_manager_menu()->get_accel_group());
add_accel_group(keybindings_.ui_manager_hidden()->get_accel_group()); add_accel_group(keybindings_.ui_manager_hidden()->get_accel_group());
//moved here from menu.cc by forgie
keybindings_.BuildMenu(); keybindings_.BuildMenu();
window_box_.pack_start(menu_.view(), Gtk::PACK_SHRINK); window_box_.pack_start(menu_.view(), Gtk::PACK_SHRINK);
@ -36,7 +34,7 @@ Window::Window() :
show_all_children(); show_all_children();
} // Window constructor } // Window constructor
void Window::OnWindowHide(){ void Window::OnWindowHide() {
hide(); hide();
} }

Write Preview
Loading…
Cancel
Save