/[svn]/gigedit/trunk/src/gigedit/scripteditor.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/scripteditor.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3158 by schoenebeck, Mon May 8 18:05:35 2017 UTC revision 3368 by schoenebeck, Thu Nov 16 19:18:42 2017 UTC
# Line 1  Line 1 
1  /*  /*
2      Copyright (c) 2014-2016 Christian Schoenebeck      Copyright (c) 2014-2017 Christian Schoenebeck
3            
4      This file is part of "gigedit" and released under the terms of the      This file is part of "gigedit" and released under the terms of the
5      GNU General Public License version 2.      GNU General Public License version 2.
# Line 7  Line 7 
7    
8  #include "scripteditor.h"  #include "scripteditor.h"
9  #include "global.h"  #include "global.h"
10    #include "compat.h"
11    #include <gtk/gtkwidget.h> // for gtk_widget_modify_*()
12    #if defined(__APPLE__)
13    # include "MacHelper.h"
14    #endif
15    #include <math.h> // for log10()
16    
17  #if !USE_LS_SCRIPTVM  #if !USE_LS_SCRIPTVM
18    
19  static const std::string _keywords[] = {  static const std::string _keywords[] = {
20      "on", "end", "declare", "while", "if", "or", "and", "not", "else", "case",      "on", "end", "declare", "while", "if", "or", "and", "not", "else", "case",
21      "select", "to", "const", "polyphonic", "mod"      "select", "to", "const", "polyphonic", "mod", "synchronized"
22  };  };
23  static int _keywordsSz = sizeof(_keywords) / sizeof(std::string);  static int _keywordsSz = sizeof(_keywords) / sizeof(std::string);
24    
# Line 60  static Glib::RefPtr<Gdk::Pixbuf> createI Line 66  static Glib::RefPtr<Gdk::Pixbuf> createI
66    
67  ScriptEditor::ScriptEditor() :  ScriptEditor::ScriptEditor() :
68      m_statusLabel("",  Gtk::ALIGN_START),      m_statusLabel("",  Gtk::ALIGN_START),
69    #if HAS_GTKMM_STOCK
70      m_applyButton(Gtk::Stock::APPLY),      m_applyButton(Gtk::Stock::APPLY),
71      m_cancelButton(Gtk::Stock::CANCEL)      m_cancelButton(Gtk::Stock::CANCEL)
72    #else
73        m_applyButton(_("_Apply"), true),
74        m_cancelButton(_("_Cancel"), true)
75    #endif
76  {  {
77      m_script = NULL;      m_script = NULL;
78  #if USE_LS_SCRIPTVM  #if USE_LS_SCRIPTVM
79      m_vm = NULL;      m_vm = NULL;
80  #endif  #endif
81    
82        if (!Settings::singleton()->autoRestoreWindowDimension) {
83            set_default_size(800, 700);
84            set_position(Gtk::WIN_POS_MOUSE);
85        }
86    
87      // depending on GTK version and installed themes, there may be different      // depending on GTK version and installed themes, there may be different
88      // icons, and different names for them, so for each type of icon we use,      // icons, and different names for them, so for each type of icon we use,
89      // we provide a list of possible icon names, the first one found to be      // we provide a list of possible icon names, the first one found to be
# Line 127  ScriptEditor::ScriptEditor() : Line 143  ScriptEditor::ScriptEditor() :
143      m_commentTag->property_foreground() = "#9c9c9c"; // gray      m_commentTag->property_foreground() = "#9c9c9c"; // gray
144      m_tagTable->add(m_commentTag);      m_tagTable->add(m_commentTag);
145    
146        #define PREPROC_TOKEN_COLOR  "#2f8a33" // green
147    
148      m_preprocTag = Gtk::TextBuffer::Tag::create();      m_preprocTag = Gtk::TextBuffer::Tag::create();
149      m_preprocTag->property_foreground() = "#2f8a33"; // green      m_preprocTag->property_foreground() = PREPROC_TOKEN_COLOR;
150      m_tagTable->add(m_preprocTag);      m_tagTable->add(m_preprocTag);
151    
152        m_preprocCommentTag = Gtk::TextBuffer::Tag::create();
153        m_preprocCommentTag->property_strikethrough() = true;
154        m_preprocCommentTag->property_background() = "#e5e5e5";
155        m_tagTable->add(m_preprocCommentTag);
156    
157      m_errorTag = Gtk::TextBuffer::Tag::create();      m_errorTag = Gtk::TextBuffer::Tag::create();
158      m_errorTag->property_background() = "#ff9393"; // red      m_errorTag->property_background() = "#ff9393"; // red
159      m_tagTable->add(m_errorTag);      m_tagTable->add(m_errorTag);
# Line 139  ScriptEditor::ScriptEditor() : Line 162  ScriptEditor::ScriptEditor() :
162      m_warningTag->property_background() = "#fffd7c"; // yellow      m_warningTag->property_background() = "#fffd7c"; // yellow
163      m_tagTable->add(m_warningTag);      m_tagTable->add(m_warningTag);
164    
165        m_lineNrTag = Gtk::TextBuffer::Tag::create();
166        m_lineNrTag->property_foreground() = "#CCCCCC";
167        m_tagTable->add(m_lineNrTag);
168    
169      // create menu      // create menu
170    #if USE_GTKMM_BUILDER
171        m_actionGroup = Gio::SimpleActionGroup::create();
172        m_actionGroup->add_action(
173            "Apply", sigc::mem_fun(*this, &ScriptEditor::onButtonApply)
174        );
175        m_actionGroup->add_action(
176            "Close", sigc::mem_fun(*this, &ScriptEditor::onButtonCancel)
177        );
178        m_actionGroup->add_action(
179            "ChangeFont", sigc::mem_fun(*this, &ScriptEditor::onMenuChangeFontSize)
180        );
181        insert_action_group("ScriptEditor", m_actionGroup);
182    
183        m_uiManager = Gtk::Builder::create();
184        Glib::ustring ui_info =
185            "<interface>"
186            "  <menubar id='MenuBar'>"
187            "    <menu id='MenuScript'>"
188            "      <section>"
189            "        <item id='Apply'>"
190            "          <attribute name='label' translatable='yes'>_Apply</attribute>"
191            "          <attribute name='action'>ScriptEditor.Apply</attribute>"
192            "          <attribute name='accel'>&lt;Primary&gt;s</attribute>"
193            "        </item>"
194            "      </section>"
195            "      <section>"
196            "        <item id='Close'>"
197            "          <attribute name='label' translatable='yes'>_Close</attribute>"
198            "          <attribute name='action'>ScriptEditor.Close</attribute>"
199            "          <attribute name='accel'>&lt;Primary&gt;q</attribute>"
200            "        </item>"
201            "      </section>"
202            "    </menu>"
203            "    <menu id='MenuEditor'>"
204            "      <section>"
205            "        <item id='ChangeFont'>"
206            "          <attribute name='label' translatable='yes'>_Font Size ...</attribute>"
207            "          <attribute name='action'>ScriptEditor.ChangeFont</attribute>"
208            "        </item>"
209            "      </section>"
210            "    </menu>"
211            "  </menubar>"
212            "</interface>";
213        m_uiManager->add_from_string(ui_info);
214        /*{
215            auto object = uiManager->get_object("MenuBar");
216            auto gmenu = Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
217            set_menubar(gmenu);
218        }*/
219    #else
220      m_actionGroup = Gtk::ActionGroup::create();      m_actionGroup = Gtk::ActionGroup::create();
221      m_actionGroup->add(Gtk::Action::create("MenuScript", _("_Script")));      m_actionGroup->add(Gtk::Action::create("MenuScript", _("_Script")));
222      m_actionGroup->add(Gtk::Action::create("Apply", _("_Apply")),      m_actionGroup->add(Gtk::Action::create("Apply", _("_Apply")),
# Line 168  ScriptEditor::ScriptEditor() : Line 245  ScriptEditor::ScriptEditor() :
245          "  </menubar>"          "  </menubar>"
246          "</ui>"          "</ui>"
247      );      );
248    #endif
249    
250        m_lineNrBuffer = Gtk::TextBuffer::create(m_tagTable);
251        m_lineNrView.set_buffer(m_lineNrBuffer);
252        m_lineNrView.set_left_margin(3);
253        m_lineNrView.set_right_margin(3);
254        m_lineNrTextViewSpacer.set_size_request(5);
255        {
256    #if 1 //(GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
257            Gdk::Color color;
258    #else
259            Gdk::RGBA color;
260    #endif
261            color.set("#F5F5F5");
262            GtkWidget* widget = (GtkWidget*) m_lineNrView.gobj();
263    #if GTK_MAJOR_VERSION < 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION <= 22)
264            gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj());
265            gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj());
266    #endif
267        }
268        {
269    #if 1 //(GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
270            Gdk::Color color;
271    #else
272            Gdk::RGBA color;
273    #endif
274            color.set("#EEEEEE");
275            GtkWidget* widget = (GtkWidget*) m_lineNrTextViewSpacer.gobj();
276    #if GTK_MAJOR_VERSION < 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION <= 22)
277            gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj());
278            gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj());
279    #endif
280        }
281      m_textBuffer = Gtk::TextBuffer::create(m_tagTable);      m_textBuffer = Gtk::TextBuffer::create(m_tagTable);
282      m_textView.set_buffer(m_textBuffer);      m_textView.set_buffer(m_textBuffer);
283        m_textView.set_left_margin(5);
284      setFontSize(currentFontSize(), false);      setFontSize(currentFontSize(), false);
285      m_scrolledWindow.add(m_textView);      m_textViewHBox.pack_start(m_lineNrView, Gtk::PACK_SHRINK);
286        m_textViewHBox.pack_start(m_lineNrTextViewSpacer, Gtk::PACK_SHRINK);
287        m_textViewHBox.add(m_textView);
288        m_scrolledWindow.add(m_textViewHBox);
289      m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);      m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
290    
291    #if USE_GTKMM_BUILDER
292        Gtk::Widget* menuBar = new Gtk::MenuBar(
293            Glib::RefPtr<Gio::Menu>::cast_dynamic(
294                m_uiManager->get_object("MenuBar")
295            )
296        );
297    #else
298      Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar");      Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar");
299    #endif
300    
301      m_vbox.pack_start(*menuBar, Gtk::PACK_SHRINK);      m_vbox.pack_start(*menuBar, Gtk::PACK_SHRINK);
302      m_vbox.pack_start(m_scrolledWindow);      m_vbox.pack_start(m_scrolledWindow);
303    
# Line 186  ScriptEditor::ScriptEditor() : Line 308  ScriptEditor::ScriptEditor() :
308      m_applyButton.set_sensitive(false);      m_applyButton.set_sensitive(false);
309      m_applyButton.grab_focus();      m_applyButton.grab_focus();
310    
311  #if GTKMM_MAJOR_VERSION >= 3  #if GTKMM_MAJOR_VERSION < 3
312        m_statusHBox.set_spacing(6);
313    #elif GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 12
314      m_statusImage.set_margin_left(6);      m_statusImage.set_margin_left(6);
315      m_statusImage.set_margin_right(6);      m_statusImage.set_margin_right(6);
316  #else  #else
317      m_statusHBox.set_spacing(6);      m_statusImage.set_margin_start(6);
318        m_statusImage.set_margin_end(6);
319  #endif  #endif
320    
321      m_statusHBox.pack_start(m_statusImage, Gtk::PACK_SHRINK);      m_statusHBox.pack_start(m_statusImage, Gtk::PACK_SHRINK);
322      m_statusHBox.pack_start(m_statusLabel);      m_statusHBox.pack_start(m_statusLabel);
323    #if HAS_GTKMM_SHOW_ALL_CHILDREN
324      m_statusHBox.show_all_children();      m_statusHBox.show_all_children();
325    #endif
326    
327      m_footerHBox.pack_start(m_statusHBox);      m_footerHBox.pack_start(m_statusHBox);
328      m_footerHBox.pack_start(m_buttonBox, Gtk::PACK_SHRINK);      m_footerHBox.pack_start(m_buttonBox, Gtk::PACK_SHRINK);
# Line 227  ScriptEditor::ScriptEditor() : Line 354  ScriptEditor::ScriptEditor() :
354      );      );
355    
356      signal_delete_event().connect(      signal_delete_event().connect(
357    #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
358          sigc::mem_fun(*this, &ScriptEditor::onWindowDelete)          sigc::mem_fun(*this, &ScriptEditor::onWindowDelete)
359    #else
360            sigc::mem_fun(*this, &ScriptEditor::onWindowDeleteP)
361    #endif
362      );      );
363    
364    #if HAS_GTKMM_SHOW_ALL_CHILDREN
365      show_all_children();      show_all_children();
366    #endif
367  }  }
368    
369  ScriptEditor::~ScriptEditor() {  ScriptEditor::~ScriptEditor() {
# Line 242  ScriptEditor::~ScriptEditor() { Line 375  ScriptEditor::~ScriptEditor() {
375    
376  int ScriptEditor::currentFontSize() const {  int ScriptEditor::currentFontSize() const {
377  #if defined(__APPLE__)  #if defined(__APPLE__)
378      const int defaultFontSize = 13;      const int defaultFontSize = 11;
379  #else  #else
380      const int defaultFontSize = 10;      const int defaultFontSize = 10;
381  #endif  #endif
# Line 251  int ScriptEditor::currentFontSize() cons Line 384  int ScriptEditor::currentFontSize() cons
384      return fontSize;      return fontSize;
385  }  }
386    
387  void ScriptEditor::setFontSize(int size, bool save) {  void ScriptEditor::setFontSize(int sizePt, bool save) {
388      //printf("setFontSize(%d,%d)\n", size, save);      //printf("setFontSize(%d,%d)\n", size, save);
389    
390        // make sure the real size on the screen for the editor's font is consistent
391        // on all screens (which otherwise may vary between models and DPI settings)
392        const double referenceDPI = 96;
393        double dpi = Gdk::Screen::get_default()->get_resolution();
394        double sizePx = sizePt * dpi / referenceDPI;
395    
396    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 20)
397      Pango::FontDescription fdesc;      Pango::FontDescription fdesc;
398      fdesc.set_family("monospace");      fdesc.set_family("monospace");
399      fdesc.set_size(size * PANGO_SCALE);  # if defined(__APPLE__)
400  #if GTKMM_MAJOR_VERSION < 3      // fixes poor readability of default monospace font on Macs
401        if (macIsMinMac10_6())
402            fdesc.set_family("Menlo");
403    # endif
404        fdesc.set_size(sizePx * PANGO_SCALE);
405    # if GTKMM_MAJOR_VERSION < 3
406        m_lineNrView.modify_font(fdesc);
407      m_textView.modify_font(fdesc);      m_textView.modify_font(fdesc);
408  #else  # else
409        m_lineNrView.override_font(fdesc);
410      m_textView.override_font(fdesc);      m_textView.override_font(fdesc);
411    # endif
412    #else
413        Glib::ustring family = "monospace";
414    # if defined(__APPLE__)
415        // fixes poor readability of default monospace font on Macs
416        if (macIsMinMac10_6())
417            family = "Menlo";
418    # endif
419        if (!m_css) {
420            m_css = Gtk::CssProvider::create();
421            m_lineNrView.get_style_context()->add_provider(m_css, GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
422            m_textView.get_style_context()->add_provider(m_css, GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
423        }
424        m_css->load_from_data(
425            "* {"
426            "  font: " + ToString(sizePt) + "pt " + family + ";"
427            "}"
428        );
429  #endif  #endif
430      if (save) Settings::singleton()->scriptEditorFontSize = size;      if (save) Settings::singleton()->scriptEditorFontSize = sizePt;
431  }  }
432    
433  void ScriptEditor::setScript(gig::Script* script) {  void ScriptEditor::setScript(gig::Script* script) {
# Line 279  void ScriptEditor::setScript(gig::Script Line 445  void ScriptEditor::setScript(gig::Script
445      m_textBuffer->set_modified(false);      m_textBuffer->set_modified(false);
446  }  }
447    
448    void ScriptEditor::updateLineNumbers() {
449        const int n = m_textBuffer->get_line_count();
450        const int old = m_lineNrBuffer->get_line_count();
451        if (n == old) return;
452        const int digits = log10(n) + 1;
453        const int bufSz = digits + 2;
454        char* buf = new char[bufSz];
455        std::string sFmt1 =   "%" + ToString(digits) + "d";
456        std::string sFmt2 = "\n%" + ToString(digits) + "d";
457        Glib::ustring s;
458        for (int i = 0; i < n; ++i) {
459            snprintf(buf, bufSz, i ? sFmt2.c_str() : sFmt1.c_str(), i+1);
460            s += buf;
461        }
462        m_lineNrBuffer->remove_all_tags(m_lineNrBuffer->begin(), m_lineNrBuffer->end());
463        m_lineNrBuffer->set_text(s);
464        m_lineNrBuffer->apply_tag(m_lineNrTag, m_lineNrBuffer->begin(), m_lineNrBuffer->end());
465        if (buf) delete[] buf;
466    }
467    
468  void ScriptEditor::onTextInserted(const Gtk::TextBuffer::iterator& itEnd, const Glib::ustring& txt, int length) {  void ScriptEditor::onTextInserted(const Gtk::TextBuffer::iterator& itEnd, const Glib::ustring& txt, int length) {
469      //printf("onTextInserted()\n");      //printf("onTextInserted()\n");
470  #if USE_LS_SCRIPTVM  #if USE_LS_SCRIPTVM
# Line 329  void ScriptEditor::onTextInserted(const Line 515  void ScriptEditor::onTextInserted(const
515      ;      ;
516            
517  #endif // USE_LS_SCRIPTVM  #endif // USE_LS_SCRIPTVM
518        updateLineNumbers();
519  }  }
520    
521  #if USE_LS_SCRIPTVM  #if USE_LS_SCRIPTVM
# Line 338  LinuxSampler::ScriptVM* ScriptEditor::Ge Line 525  LinuxSampler::ScriptVM* ScriptEditor::Ge
525      return m_vm;      return m_vm;
526  }  }
527    
528  static void getIteratorsForIssue(Glib::RefPtr<Gtk::TextBuffer>& txtbuf, const LinuxSampler::ParserIssue& issue, Gtk::TextBuffer::iterator& start, Gtk::TextBuffer::iterator& end) {  template<class T>
529      start = txtbuf->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1);  static void getIteratorsForIssue(Glib::RefPtr<Gtk::TextBuffer>& txtbuf, const T& issue, Gtk::TextBuffer::iterator& start, Gtk::TextBuffer::iterator& end) {
530        Gtk::TextBuffer::iterator itLine =
531            txtbuf->get_iter_at_line_index(issue.firstLine - 1, 0);
532        const int charsInLine = itLine.get_bytes_in_line();
533        start = txtbuf->get_iter_at_line_index(
534            issue.firstLine - 1,
535            // check we are not getting past the end of the line here, otherwise Gtk crashes
536            issue.firstColumn - 1 < charsInLine ? issue.firstColumn - 1 : charsInLine - 1
537        );
538      end = start;      end = start;
539      end.forward_lines(issue.lastLine - issue.firstLine);      end.forward_lines(issue.lastLine - issue.firstLine);
540      end.forward_chars(      end.forward_chars(
# Line 350  static void getIteratorsForIssue(Glib::R Line 545  static void getIteratorsForIssue(Glib::R
545  }  }
546    
547  static void applyCodeTag(Glib::RefPtr<Gtk::TextBuffer>& txtbuf, const LinuxSampler::VMSourceToken& token, Glib::RefPtr<Gtk::TextBuffer::Tag>& tag) {  static void applyCodeTag(Glib::RefPtr<Gtk::TextBuffer>& txtbuf, const LinuxSampler::VMSourceToken& token, Glib::RefPtr<Gtk::TextBuffer::Tag>& tag) {
548      Gtk::TextBuffer::iterator itStart =      Gtk::TextBuffer::iterator itLine =
549          txtbuf->get_iter_at_line_index(token.firstLine(), token.firstColumn());          txtbuf->get_iter_at_line_index(token.firstLine(), 0);
550        const int charsInLine = itLine.get_bytes_in_line();
551        Gtk::TextBuffer::iterator itStart = txtbuf->get_iter_at_line_index(
552            token.firstLine(),
553            // check we are not getting past the end of the line here, otherwise Gtk crashes
554            token.firstColumn() < charsInLine ? token.firstColumn() : charsInLine - 1
555        );
556      Gtk::TextBuffer::iterator itEnd = itStart;      Gtk::TextBuffer::iterator itEnd = itStart;
557      const int length = token.text().length();      const int length = token.text().length();
558      itEnd.forward_chars(length);      itEnd.forward_chars(length);
# Line 364  static void applyCodeTag(Glib::RefPtr<Gt Line 565  static void applyCodeTag(Glib::RefPtr<Gt
565      txtbuf->apply_tag(tag, itStart, itEnd);      txtbuf->apply_tag(tag, itStart, itEnd);
566  }  }
567    
568    static void applyPreprocessorComment(Glib::RefPtr<Gtk::TextBuffer>& txtbuf, const LinuxSampler::CodeBlock& block, Glib::RefPtr<Gtk::TextBuffer::Tag>& tag) {
569        Gtk::TextBuffer::iterator itStart, itEnd;
570        getIteratorsForIssue(txtbuf, block, itStart, itEnd);
571        txtbuf->apply_tag(tag, itStart, itEnd);
572    }
573    
574  void ScriptEditor::updateSyntaxHighlightingByVM() {  void ScriptEditor::updateSyntaxHighlightingByVM() {
575      GetScriptVM();      GetScriptVM();
576      const std::string s = m_textBuffer->get_text();      const std::string s = m_textBuffer->get_text();
# Line 403  void ScriptEditor::updateParserIssuesByV Line 610  void ScriptEditor::updateParserIssuesByV
610      m_issues = parserContext->issues();      m_issues = parserContext->issues();
611      m_errors = parserContext->errors();      m_errors = parserContext->errors();
612      m_warnings = parserContext->warnings();      m_warnings = parserContext->warnings();
613        m_preprocComments = parserContext->preprocessorComments();
614    
615      if (!s.empty()) {      if (!s.empty()) {
616          for (int i = 0; i < m_issues.size(); ++i) {          for (int i = 0; i < m_issues.size(); ++i) {
# Line 416  void ScriptEditor::updateParserIssuesByV Line 624  void ScriptEditor::updateParserIssuesByV
624          }          }
625      }      }
626    
627        for (int i = 0; i < m_preprocComments.size(); ++i) {
628            applyPreprocessorComment(m_textBuffer, m_preprocComments[i],
629                                     m_preprocCommentTag);
630        }
631    
632      delete parserContext;      delete parserContext;
633  }  }
634    
# Line 449  void ScriptEditor::updateIssueTooltip(Gd Line 662  void ScriptEditor::updateIssueTooltip(Gd
662          }          }
663      }      }
664    
665        for (int i = 0; i < m_preprocComments.size(); ++i) {
666            const LinuxSampler::CodeBlock& block = m_preprocComments[i];
667            const int firstLine   = block.firstLine - 1;
668            const int firstColumn = block.firstColumn - 1;
669            const int lastLine    = block.lastLine - 1;
670            const int lastColumn  = block.lastColumn - 1;
671            if (firstLine  <= line && line <= lastLine &&
672                (firstLine != line || firstColumn <= column) &&
673                (lastLine  != line || lastColumn  >= column))
674            {
675                m_textView.set_tooltip_markup(
676                    "Code block filtered out by preceding <span foreground=\"" PREPROC_TOKEN_COLOR "\">preprocessor</span> statement."
677                );
678                return;
679            }
680        }
681    
682      m_textView.set_tooltip_markup("");      m_textView.set_tooltip_markup("");
683  }  }
684    
# Line 511  void ScriptEditor::onTextErased(const Gt Line 741  void ScriptEditor::onTextErased(const Gt
741    
742      m_textBuffer->remove_all_tags(itStart2, itEnd2);      m_textBuffer->remove_all_tags(itStart2, itEnd2);
743  #endif // USE_LS_SCRIPTVM  #endif // USE_LS_SCRIPTVM
744        updateLineNumbers();
745  }  }
746    
747  bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) {  bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) {
# Line 518  bool ScriptEditor::on_motion_notify_even Line 749  bool ScriptEditor::on_motion_notify_even
749      //TODO: event throttling would be a good idea here      //TODO: event throttling would be a good idea here
750      updateIssueTooltip(e);      updateIssueTooltip(e);
751  #endif  #endif
752    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 22)
753      return ManagedWindow::on_motion_notify_event(e);      return ManagedWindow::on_motion_notify_event(e);
754    #else
755        Gdk::EventMotion em = Glib::wrap(e, true);
756        return ManagedWindow::on_motion_notify_event(em);
757    #endif
758  }  }
759    
760  void ScriptEditor::onMenuChangeFontSize() {  void ScriptEditor::onMenuChangeFontSize() {
761      //TODO: for GTKMM >= 3.2 class Gtk::FontChooser could be used instead      //TODO: for GTKMM >= 3.2 class Gtk::FontChooser could be used instead
762      Gtk::Dialog dialog(_("Font Size"), true /*modal*/);      Gtk::Dialog dialog(_("Font Size"), true /*modal*/);
763      Gtk::HBox hbox;      HBox hbox;
764      hbox.set_spacing(6);      hbox.set_spacing(6);
765    
766      Gtk::Label label(_("Editor's Font Size:"), Gtk::ALIGN_START);      Gtk::Label label(_("Editor's Font Size:"), Gtk::ALIGN_START);
# Line 536  void ScriptEditor::onMenuChangeFontSize( Line 772  void ScriptEditor::onMenuChangeFontSize(
772      spinButton.set_value(currentFontSize());      spinButton.set_value(currentFontSize());
773      hbox.pack_start(spinButton);      hbox.pack_start(spinButton);
774    
775    #if USE_GTKMM_BOX
776        dialog.get_content_area()->pack_start(hbox);
777    #else
778      dialog.get_vbox()->pack_start(hbox);      dialog.get_vbox()->pack_start(hbox);
779    #endif
780      dialog.add_button(_("_OK"), 0);      dialog.add_button(_("_OK"), 0);
781      dialog.add_button(_("_Cancel"), 1);      dialog.add_button(_("_Cancel"), 1);
782    
783    #if HAS_GTKMM_SHOW_ALL_CHILDREN
784      dialog.show_all_children();      dialog.show_all_children();
785    #endif
786    
787      if (!dialog.run()) { // OK selected ...      if (!dialog.run()) { // OK selected ...
788          const int newFontSize = spinButton.get_value_as_int();          const int newFontSize = spinButton.get_value_as_int();
# Line 549  void ScriptEditor::onMenuChangeFontSize( Line 791  void ScriptEditor::onMenuChangeFontSize(
791      }      }
792  }  }
793    
794  bool ScriptEditor::onWindowDelete(GdkEventAny* e) {  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
795    bool ScriptEditor::onWindowDelete(Gdk::Event& e) {
796        return onWindowDeleteP(NULL);
797    }
798    #endif
799    
800    bool ScriptEditor::onWindowDeleteP(GdkEventAny* /*e*/) {
801      //printf("onWindowDelete\n");      //printf("onWindowDelete\n");
802    
803      if (!isModified()) return false; // propagate event further (which will close this window)      if (!isModified()) return false; // propagate event further (which will close this window)
# Line 598  void ScriptEditor::onModifiedChanged() { Line 846  void ScriptEditor::onModifiedChanged() {
846  }  }
847    
848  void ScriptEditor::onButtonCancel() {  void ScriptEditor::onButtonCancel() {
849      bool dropEvent = onWindowDelete(NULL);      bool dropEvent = onWindowDeleteP(NULL);
850      if (dropEvent) return;      if (dropEvent) return;
851      hide();      hide();
852  }  }
Legend:
Removed from v.3158  
changed lines
  Added in v.3368
  ViewVC Help
Powered by ViewVC