--- gigedit/trunk/src/gigedit/regionchooser.h	2007/06/10 10:56:11	1225
+++ gigedit/trunk/src/gigedit/regionchooser.h	2008/02/02 08:52:48	1658
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006, 2007 Andreas Persson
+ * Copyright (C) 2006-2008 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
@@ -20,6 +20,8 @@
 #ifndef GIGEDIT_REGIONCHOOSER_H
 #define GIGEDIT_REGIONCHOOSER_H
 
+#include <vector>
+
 #include <gtkmm/drawingarea.h>
 #include <gdkmm/colormap.h>
 #include <gtkmm/uimanager.h>
@@ -30,6 +32,20 @@
 
 #include <gig.h>
 
+class SortedRegions {
+private:
+    std::vector<gig::Region*> regions;
+    std::vector<gig::Region*>::iterator region_iterator;
+
+public:
+    void update(gig::Instrument* instrument);
+    gig::Region* first();
+    gig::Region* next();
+    bool operator() (gig::Region* x, gig::Region* y) {
+        return x->KeyRange.low < y->KeyRange.low;
+    }
+};
+
 class RegionChooser : public Gtk::DrawingArea
 {
 public:
@@ -38,10 +54,20 @@
 
     void set_instrument(gig::Instrument* instrument);
 
-    sigc::signal<void> signal_sel_changed();
+    sigc::signal<void>& signal_region_selected();
+    sigc::signal<void>& signal_instrument_changed();
+
+    sigc::signal<void, gig::Instrument*>& signal_instrument_struct_to_be_changed();
+    sigc::signal<void, gig::Instrument*>& signal_instrument_struct_changed();
+
+    sigc::signal<void, gig::Region*>& signal_region_to_be_changed();
+    sigc::signal<void, gig::Region*>& signal_region_changed_signal();
 
     gig::Region* get_region() { return region; }
 
+    void on_note_on_event(int key, int velocity);
+    void on_note_off_event(int key, int velocity);
+
 protected:
     virtual void on_realize();
     virtual bool on_expose_event(GdkEventExpose* e);
@@ -53,14 +79,26 @@
     gig::Region* get_region(int key);
 
     Glib::RefPtr<Gdk::GC> gc;
-    Gdk::Color blue, red, black, white, green, grey1;
+    Gdk::Color activeKeyColor, red, grey1, white, black;
 
-    void draw_region(int from, int to, const Gdk::Color& color);
+    sigc::signal<void> region_selected;
+    sigc::signal<void> instrument_changed;
 
-    sigc::signal<void> sel_changed_signal;
+    sigc::signal<void, gig::Instrument*> instrument_struct_to_be_changed_signal;
+    sigc::signal<void, gig::Instrument*> instrument_struct_changed_signal;
+
+    sigc::signal<void, gig::Region*> region_to_be_changed_signal;
+    sigc::signal<void, gig::Region*> region_changed_signal;
 
     gig::Instrument* instrument;
     gig::Region* region;
+    SortedRegions regions;
+
+    bool is_black_key(int key);
+    void draw_region(int from, int to, const Gdk::Color& color);
+    void draw_digit(int key);
+    void motion_resize_region(int x, int y);
+    void motion_move_region(int x, int y);
 
     // information needed during a resize
     struct {
@@ -77,11 +115,19 @@
         gig::Region* prev_region;
     } resize;
 
+    // information needed during a region move
+    struct {
+        bool active;
+        double from_x;
+        int pos;
+        bool touch_left;
+        bool touch_right;
+    } move;
+
     bool cursor_is_resize;
     bool is_in_resize_zone(double x, double y);
 
     int h1;
-    int width;
 
     Gtk::Menu* popup_menu_inside_region;
     Gtk::Menu* popup_menu_outside_region;