Merge branch 'more-editor-actions' into 'master'

Added some Emacs-style actions

See merge request cppit/jucipp!409

src/source.cpp

@@ -223,7 +223,7 @@ Source::View::View(const boost::filesystem::path &file_path, const Glib::RefPtr<
   else {
     if(is_language({"cmake", "makefile", "python", "python3", "sh", "perl", "ruby", "r", "asm", "automake", "yaml", "docker", "julia"}))
       comment_characters = "#";
-    else if(is_language({"latex", "matlab", "octave", "bibtex", "prolog"}))
+    else if(is_language({"latex", "matlab", "octave", "bibtex"}))
       comment_characters = "%";
     else if(language_id == "fortran")
       comment_characters = "!";

src/source_base.cpp

@@ -10,12 +10,6 @@
 #include <gtksourceview/gtksource.h>
 #include <regex>
 
-#ifdef __APPLE__
-GdkModifierType Source::CommonView::primary_modifier_mask = GDK_MOD2_MASK;
-#else
-GdkModifierType Source::CommonView::primary_modifier_mask = GDK_CONTROL_MASK;
-#endif
-
 Source::CommonView::CommonView(const Glib::RefPtr<Gsv::Language> &language) : Gsv::View() {
   set_tab_width(4); // Visual size of a \t hardcoded to be equal to visual size of 4 spaces
 
@@ -375,6 +369,13 @@ Source::BaseView::BaseView(const boost::filesystem::path &file_path, const Glib:
   }
   set_tab_char_and_size(tab_char, tab_size);
 
+#ifdef __APPLE__
+  primary_modifier_mask = GDK_MOD2_MASK;
+#else
+  primary_modifier_mask = GDK_CONTROL_MASK;
+#endif
+
+
   set_snippets();
 
   snippet_parameter_tag = get_buffer()->create_tag();

src/source_base.hpp

@@ -50,9 +50,6 @@ namespace Source {
 
     bool keep_clipboard = false;
 
-    /// Apple key for MacOS, and control key otherwise
-    static GdkModifierType primary_modifier_mask;
-
     bool on_key_press_event(GdkEventKey *event) override;
     bool on_motion_notify_event(GdkEventMotion *motion_event) override;
 
@@ -149,6 +146,9 @@ namespace Source {
     std::string tab;
     std::pair<char, unsigned> find_tab_char_and_size();
 
+    /// Apple key for MacOS, and control key otherwise
+    GdkModifierType primary_modifier_mask;
+
     /// Move iter to line start. Depending on iter position, before or after indentation.
     /// Works with wrapped lines.
     Gtk::TextIter get_smart_home_iter(const Gtk::TextIter &iter);

src/terminal.cpp

@@ -624,8 +624,7 @@ bool Terminal::on_key_press_event(GdkEventKey *event) {
   if(event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_End ||
      event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down ||
      event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down ||
-     event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_Right ||
+     event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_Right)
-     ((event->state & primary_modifier_mask) && event->keyval == GDK_KEY_a))
     return Source::CommonView::on_key_press_event(event);
 
   LockGuard lock(processes_mutex);