--- gigedit/trunk/src/gigedit/dimregionchooser.h	2014/05/16 23:19:23	2556
+++ gigedit/trunk/src/gigedit/dimregionchooser.h	2017/05/04 11:47:45	3148
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006-2014 Andreas Persson
+ * Copyright (C) 2006-2017 Andreas Persson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -27,14 +27,21 @@
 
 #include "compat.h"
 
-#include <gig.h>
+#ifdef LIBGIG_HEADER_FILE
+# include LIBGIG_HEADER_FILE(gig.h)
+#else
+# include <gig.h>
+#endif
 
 #include <set>
+#include <map>
+
+#include "global.h"
 
 class DimRegionChooser : public Gtk::DrawingArea
 {
 public:
-    DimRegionChooser();
+    DimRegionChooser(Gtk::Window& window);
     virtual ~DimRegionChooser();
 
     void set_region(gig::Region* region);
@@ -42,9 +49,20 @@
     sigc::signal<void>& signal_dimregion_selected();
     sigc::signal<void>& signal_region_changed();
 
-    gig::DimensionRegion* get_dimregion() const { return dimreg; }
+    gig::DimensionRegion* get_main_dimregion() const;
     void get_dimregions(const gig::Region* region, bool stereo,
                         std::set<gig::DimensionRegion*>& dimregs) const;
+    bool select_dimregion(gig::DimensionRegion* dimrgn);
+    void select_next_dimzone(bool add = false);
+    void select_prev_dimzone(bool add = false);
+    void select_next_dimension();
+    void select_prev_dimension();
+
+    // those 3 are ATM only relevant when resizing custom dimension region zones
+    // and for painting those auto selected zones with gray hatched pattern
+    void setModifyBothChannels(bool b);
+    void setModifyAllDimensionRegions(bool b);
+    void setModifyAllRegions(bool b);
 
 protected:
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
@@ -56,28 +74,45 @@
     virtual bool on_button_release_event(GdkEventButton* event);
     virtual bool on_motion_notify_event(GdkEventMotion* event);
     virtual bool on_focus(Gtk::DirectionType direction);
+    bool onKeyPressed(GdkEventKey* key);
+    bool onKeyReleased(GdkEventKey* key);
     void refresh_all();
     void split_dimension_zone();
     void delete_dimension_zone();
+    void resetSelectedZones();
+    void select_dimzone_by_dir(int dir, bool add = false);
 
-    Gdk::RGBA red, black, white;
+    Gdk::RGBA red, blue, black, white;
+    Glib::RefPtr<Gdk::Pixbuf> blueHatchedPatternARGB;
+    Cairo::RefPtr<Cairo::SurfacePattern> blueHatchedSurfacePattern;
+    Glib::RefPtr<Gdk::Pixbuf> grayBlueHatchedPatternARGB;
+    Cairo::RefPtr<Cairo::SurfacePattern> grayBlueHatchedSurfacePattern;
 
     gig::Instrument* instrument;
     gig::Region* region;
-    int dimregno;
 
     sigc::signal<void> dimregion_selected;
     sigc::signal<void> region_changed;
 
-    gig::DimensionRegion* dimreg;
+    // those 3 are ATM only relevant when resizing custom dimension region zones
+    // and for painting those auto selected zones with gray hatched pattern
+    bool modifybothchannels;
+    bool modifyalldimregs;
+    bool modifyallregions;
+
     int focus_line;
-    int dimvalue[256];
+    std::map<gig::dimension_t, std::set<int> > dimzones; ///< Reflects which zone(s) of the individual dimension are currently selected.
     int label_width;
     bool labels_changed;
     int nbDimensions;
 
-    int dimtype;
-    int dimzone;
+    // the "main" dimension region is the one that is used to i.e. evaluate the
+    // precise custom velocity splits (could also be interpreted for focus stuff,
+    // i.e. keyboard arrow key navigation)
+    // NOTE: these may *not* necessarily currently be selected !
+    gig::dimension_t maindimtype;
+    DimensionCase maindimcase;
+    int maindimregno;
 
     // information needed during a resize
     struct {
@@ -91,9 +126,14 @@
         int min;
         int max;
         int dimension;
-        int offset;
+        gig::dimension_def_t dimensionDef;
+        int zone;
     } resize;
 
+    bool multiSelectKeyDown;
+    bool primaryKeyDown; // on Mac: Cmd key, on all other OSs: Ctrl key
+    bool shiftKeyDown;
+
     bool cursor_is_resize;
     bool is_in_resize_zone(double x, double y);
     void update_after_resize();
@@ -104,6 +144,10 @@
     Glib::RefPtr<Gtk::UIManager> uiManager;
     Gtk::Menu* popup_menu_inside_dimregion;
     Gtk::Menu* popup_menu_outside_dimregion;
+
+private:
+    Glib::RefPtr<Gtk::Action> actionDeleteDimZone;
+    Glib::RefPtr<Gtk::Action> actionSplitDimZone;
 };
 
 #endif