--- gigedit/trunk/src/gigedit/scripteditor.cpp 2016/07/11 17:58:33 2939 +++ gigedit/trunk/src/gigedit/scripteditor.cpp 2017/07/15 12:02:21 3310 @@ -1,5 +1,5 @@ /* - Copyright (c) 2014-2016 Christian Schoenebeck + Copyright (c) 2014-2017 Christian Schoenebeck This file is part of "gigedit" and released under the terms of the GNU General Public License version 2. @@ -7,12 +7,13 @@ #include "scripteditor.h" #include "global.h" +#include // for gtk_widget_modify_*() #if !USE_LS_SCRIPTVM static const std::string _keywords[] = { "on", "end", "declare", "while", "if", "or", "and", "not", "else", "case", - "select", "to", "const", "polyphonic", "mod" + "select", "to", "const", "polyphonic", "mod", "synchronized" }; static int _keywordsSz = sizeof(_keywords) / sizeof(std::string); @@ -60,14 +61,19 @@ ScriptEditor::ScriptEditor() : m_statusLabel("", Gtk::ALIGN_START), - m_applyButton(_("_Apply"), true), - m_cancelButton(_("_Cancel"), true) + m_applyButton(Gtk::Stock::APPLY), + m_cancelButton(Gtk::Stock::CANCEL) { m_script = NULL; #if USE_LS_SCRIPTVM m_vm = NULL; #endif + if (!Settings::singleton()->autoRestoreWindowDimension) { + set_default_size(800, 700); + set_position(Gtk::WIN_POS_MOUSE); + } + // depending on GTK version and installed themes, there may be different // icons, and different names for them, so for each type of icon we use, // we provide a list of possible icon names, the first one found to be @@ -127,10 +133,17 @@ m_commentTag->property_foreground() = "#9c9c9c"; // gray m_tagTable->add(m_commentTag); + #define PREPROC_TOKEN_COLOR "#2f8a33" // green + m_preprocTag = Gtk::TextBuffer::Tag::create(); - m_preprocTag->property_foreground() = "#2f8a33"; // green + m_preprocTag->property_foreground() = PREPROC_TOKEN_COLOR; m_tagTable->add(m_preprocTag); + m_preprocCommentTag = Gtk::TextBuffer::Tag::create(); + m_preprocCommentTag->property_strikethrough() = true; + m_preprocCommentTag->property_background() = "#e5e5e5"; + m_tagTable->add(m_preprocCommentTag); + m_errorTag = Gtk::TextBuffer::Tag::create(); m_errorTag->property_background() = "#ff9393"; // red m_tagTable->add(m_errorTag); @@ -139,6 +152,10 @@ m_warningTag->property_background() = "#fffd7c"; // yellow m_tagTable->add(m_warningTag); + m_lineNrTag = Gtk::TextBuffer::Tag::create(); + m_lineNrTag->property_foreground() = "#CCCCCC"; + m_tagTable->add(m_lineNrTag); + // create menu m_actionGroup = Gtk::ActionGroup::create(); m_actionGroup->add(Gtk::Action::create("MenuScript", _("_Script"))); @@ -148,6 +165,9 @@ m_actionGroup->add(Gtk::Action::create("Close", _("_Close")), Gtk::AccelKey("q"), sigc::mem_fun(*this, &ScriptEditor::onButtonCancel)); + m_actionGroup->add(Gtk::Action::create("MenuEditor", _("_Editor"))); + m_actionGroup->add(Gtk::Action::create("ChangeFont", _("_Font Size ...")), + sigc::mem_fun(*this, &ScriptEditor::onMenuChangeFontSize)); m_uiManager = Gtk::UIManager::create(); m_uiManager->insert_action_group(m_actionGroup); add_accel_group(m_uiManager->get_accel_group()); @@ -159,27 +179,40 @@ " " " " " " + " " + " " + " " " " "" ); - m_textBuffer = Gtk::TextBuffer::create(m_tagTable); - m_textView.set_buffer(m_textBuffer); + m_lineNrBuffer = Gtk::TextBuffer::create(m_tagTable); + m_lineNrView.set_buffer(m_lineNrBuffer); + m_lineNrView.set_left_margin(3); + m_lineNrView.set_right_margin(3); + m_lineNrTextViewSpacer.set_size_request(5); { - Pango::FontDescription fdesc; - fdesc.set_family("monospace"); -#if defined(__APPLE__) - fdesc.set_size(14 * PANGO_SCALE); -#else - fdesc.set_size(10 * PANGO_SCALE); -#endif -#if GTKMM_MAJOR_VERSION < 3 - m_textView.modify_font(fdesc); -#else - m_textView.override_font(fdesc); -#endif + Gdk::Color color; + color.set("#F5F5F5"); + GtkWidget* widget = (GtkWidget*) m_lineNrView.gobj(); + gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj()); + gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj()); } - m_scrolledWindow.add(m_textView); + { + Gdk::Color color; + color.set("#EEEEEE"); + GtkWidget* widget = (GtkWidget*) m_lineNrTextViewSpacer.gobj(); + gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj()); + gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj()); + } + m_textBuffer = Gtk::TextBuffer::create(m_tagTable); + m_textView.set_buffer(m_textBuffer); + m_textView.set_left_margin(5); + setFontSize(currentFontSize(), false); + m_textViewHBox.pack_start(m_lineNrView, Gtk::PACK_SHRINK); + m_textViewHBox.pack_start(m_lineNrTextViewSpacer, Gtk::PACK_SHRINK); + m_textViewHBox.add(m_textView); + m_scrolledWindow.add(m_textViewHBox); m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar"); @@ -247,6 +280,32 @@ #endif } +int ScriptEditor::currentFontSize() const { +#if defined(__APPLE__) + const int defaultFontSize = 13; +#else + const int defaultFontSize = 10; +#endif + const int settingFontSize = Settings::singleton()->scriptEditorFontSize; + const int fontSize = (settingFontSize > 0) ? settingFontSize : defaultFontSize; + return fontSize; +} + +void ScriptEditor::setFontSize(int size, bool save) { + //printf("setFontSize(%d,%d)\n", size, save); + Pango::FontDescription fdesc; + fdesc.set_family("monospace"); + fdesc.set_size(size * PANGO_SCALE); +#if GTKMM_MAJOR_VERSION < 3 + m_lineNrView.modify_font(fdesc); + m_textView.modify_font(fdesc); +#else + m_lineNrView.override_font(fdesc); + m_textView.override_font(fdesc); +#endif + if (save) Settings::singleton()->scriptEditorFontSize = size; +} + void ScriptEditor::setScript(gig::Script* script) { m_script = script; if (!script) { @@ -262,6 +321,20 @@ m_textBuffer->set_modified(false); } +void ScriptEditor::updateLineNumbers() { + const int n = m_textBuffer->get_line_count(); + const int old = m_lineNrBuffer->get_line_count(); + if (n == old) return; + Glib::ustring s; + for (int i = 0; i < n; ++i) { + if (i) s += "\n"; + s += ToString(i+1); + } + m_lineNrBuffer->remove_all_tags(m_lineNrBuffer->begin(), m_lineNrBuffer->end()); + m_lineNrBuffer->set_text(s); + m_lineNrBuffer->apply_tag(m_lineNrTag, m_lineNrBuffer->begin(), m_lineNrBuffer->end()); +} + void ScriptEditor::onTextInserted(const Gtk::TextBuffer::iterator& itEnd, const Glib::ustring& txt, int length) { //printf("onTextInserted()\n"); #if USE_LS_SCRIPTVM @@ -312,6 +385,7 @@ ; #endif // USE_LS_SCRIPTVM + updateLineNumbers(); } #if USE_LS_SCRIPTVM @@ -321,8 +395,16 @@ return m_vm; } -static void getIteratorsForIssue(Glib::RefPtr& txtbuf, const LinuxSampler::ParserIssue& issue, Gtk::TextBuffer::iterator& start, Gtk::TextBuffer::iterator& end) { - start = txtbuf->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1); +template +static void getIteratorsForIssue(Glib::RefPtr& txtbuf, const T& issue, Gtk::TextBuffer::iterator& start, Gtk::TextBuffer::iterator& end) { + Gtk::TextBuffer::iterator itLine = + txtbuf->get_iter_at_line_index(issue.firstLine - 1, 0); + const int charsInLine = itLine.get_bytes_in_line(); + start = txtbuf->get_iter_at_line_index( + issue.firstLine - 1, + // check we are not getting past the end of the line here, otherwise Gtk crashes + issue.firstColumn - 1 < charsInLine ? issue.firstColumn - 1 : charsInLine - 1 + ); end = start; end.forward_lines(issue.lastLine - issue.firstLine); end.forward_chars( @@ -333,8 +415,14 @@ } static void applyCodeTag(Glib::RefPtr& txtbuf, const LinuxSampler::VMSourceToken& token, Glib::RefPtr& tag) { - Gtk::TextBuffer::iterator itStart = - txtbuf->get_iter_at_line_index(token.firstLine(), token.firstColumn()); + Gtk::TextBuffer::iterator itLine = + txtbuf->get_iter_at_line_index(token.firstLine(), 0); + const int charsInLine = itLine.get_bytes_in_line(); + Gtk::TextBuffer::iterator itStart = txtbuf->get_iter_at_line_index( + token.firstLine(), + // check we are not getting past the end of the line here, otherwise Gtk crashes + token.firstColumn() < charsInLine ? token.firstColumn() : charsInLine - 1 + ); Gtk::TextBuffer::iterator itEnd = itStart; const int length = token.text().length(); itEnd.forward_chars(length); @@ -347,9 +435,16 @@ txtbuf->apply_tag(tag, itStart, itEnd); } +static void applyPreprocessorComment(Glib::RefPtr& txtbuf, const LinuxSampler::CodeBlock& block, Glib::RefPtr& tag) { + Gtk::TextBuffer::iterator itStart, itEnd; + getIteratorsForIssue(txtbuf, block, itStart, itEnd); + txtbuf->apply_tag(tag, itStart, itEnd); +} + void ScriptEditor::updateSyntaxHighlightingByVM() { GetScriptVM(); const std::string s = m_textBuffer->get_text(); + if (s.empty()) return; std::vector tokens = m_vm->syntaxHighlighting(s); for (int i = 0; i < tokens.size(); ++i) { @@ -385,17 +480,25 @@ m_issues = parserContext->issues(); m_errors = parserContext->errors(); m_warnings = parserContext->warnings(); + m_preprocComments = parserContext->preprocessorComments(); - for (int i = 0; i < m_issues.size(); ++i) { - const LinuxSampler::ParserIssue& issue = m_issues[i]; - - if (issue.isErr()) { - applyCodeTag(m_textBuffer, issue, m_errorTag); - } else if (issue.isWrn()) { - applyCodeTag(m_textBuffer, issue, m_warningTag); + if (!s.empty()) { + for (int i = 0; i < m_issues.size(); ++i) { + const LinuxSampler::ParserIssue& issue = m_issues[i]; + + if (issue.isErr()) { + applyCodeTag(m_textBuffer, issue, m_errorTag); + } else if (issue.isWrn()) { + applyCodeTag(m_textBuffer, issue, m_warningTag); + } } } + for (int i = 0; i < m_preprocComments.size(); ++i) { + applyPreprocessorComment(m_textBuffer, m_preprocComments[i], + m_preprocCommentTag); + } + delete parserContext; } @@ -429,6 +532,23 @@ } } + for (int i = 0; i < m_preprocComments.size(); ++i) { + const LinuxSampler::CodeBlock& block = m_preprocComments[i]; + const int firstLine = block.firstLine - 1; + const int firstColumn = block.firstColumn - 1; + const int lastLine = block.lastLine - 1; + const int lastColumn = block.lastColumn - 1; + if (firstLine <= line && line <= lastLine && + (firstLine != line || firstColumn <= column) && + (lastLine != line || lastColumn >= column)) + { + m_textView.set_tooltip_markup( + "Code block filtered out by preceding preprocessor statement." + ); + return; + } + } + m_textView.set_tooltip_markup(""); } @@ -491,6 +611,7 @@ m_textBuffer->remove_all_tags(itStart2, itEnd2); #endif // USE_LS_SCRIPTVM + updateLineNumbers(); } bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) { @@ -501,6 +622,34 @@ return ManagedWindow::on_motion_notify_event(e); } +void ScriptEditor::onMenuChangeFontSize() { + //TODO: for GTKMM >= 3.2 class Gtk::FontChooser could be used instead + Gtk::Dialog dialog(_("Font Size"), true /*modal*/); + Gtk::HBox hbox; + hbox.set_spacing(6); + + Gtk::Label label(_("Editor's Font Size:"), Gtk::ALIGN_START); + hbox.pack_start(label, Gtk::PACK_SHRINK); + + Gtk::SpinButton spinButton; + spinButton.set_range(4, 80); + spinButton.set_increments(1, 10); + spinButton.set_value(currentFontSize()); + hbox.pack_start(spinButton); + + dialog.get_vbox()->pack_start(hbox); + dialog.add_button(_("_OK"), 0); + dialog.add_button(_("_Cancel"), 1); + + dialog.show_all_children(); + + if (!dialog.run()) { // OK selected ... + const int newFontSize = spinButton.get_value_as_int(); + if (newFontSize >= 4) + setFontSize(newFontSize, true); + } +} + bool ScriptEditor::onWindowDelete(GdkEventAny* e) { //printf("onWindowDelete\n");