diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:47:11 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:47:11 +0000 |
commit | a66860c3391c0320c15ce5860991d33f52455366 (patch) | |
tree | 389e151901ae9d0d271cc0f589c196fee481579e /libs/gtkmm2ext | |
parent | c43c219c2ed300cbbff099445dedcce1c54db791 (diff) |
API and implementation changes to CairoCell and friends before the audio clock commit
git-svn-id: svn://localhost/ardour2/branches/3.0@9670 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r-- | libs/gtkmm2ext/cairocell.cc | 311 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/cairocell.h | 312 |
2 files changed, 277 insertions, 346 deletions
diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc index e2a5983245..91ed08922e 100644 --- a/libs/gtkmm2ext/cairocell.cc +++ b/libs/gtkmm2ext/cairocell.cc @@ -19,12 +19,15 @@ #include <algorithm> #include <cmath> +#include <iostream> #include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" using std::string; using std::map; +using std::cerr; +using std::endl; using namespace Gtkmm2ext; CairoCell::CairoCell () @@ -37,12 +40,36 @@ CairoCell::CairoCell () bbox.height = 0; } -CairoTextCell::CairoTextCell (uint32_t wc) +void +CairoColonCell::render (Cairo::RefPtr<Cairo::Context>& context) +{ + /* two very small circles */ + context->arc (bbox.x, bbox.y + (bbox.height/3.0), bbox.width/2.0, 0.0, M_PI*2.0); + context->fill (); + context->arc (bbox.x, bbox.y + (2.0 * bbox.height/3.0), bbox.width/2.0, 0.0, M_PI*2.0); + context->fill (); +} + +void +CairoColonCell::set_size (Glib::RefPtr<Pango::Context>& context, const Pango::FontDescription& font) +{ + Pango::FontMetrics metrics = context->get_metrics (font); + bbox.width = std::max (3.0, (0.25 * metrics.get_approximate_char_width() / PANGO_SCALE)); + bbox.height = (metrics.get_ascent() + metrics.get_descent()) / PANGO_SCALE; +} + +CairoTextCell::CairoTextCell (double wc) : _width_chars (wc) { } void +CairoTextCell::set_text (const std::string& txt) +{ + layout->set_text (txt); +} + +void CairoTextCell::render (Cairo::RefPtr<Cairo::Context>& context) { if (!_visible || _width_chars == 0) { @@ -57,8 +84,11 @@ CairoTextCell::render (Cairo::RefPtr<Cairo::Context>& context) void CairoTextCell::set_size (Glib::RefPtr<Pango::Context>& context, const Pango::FontDescription& font) { - layout = Pango::Layout::create (context); - layout->set_font_description (font); + if (!layout) { + layout = Pango::Layout::create (context); + } + + layout->set_font_description (font); Pango::FontMetrics metrics = context->get_metrics (font); @@ -77,20 +107,40 @@ CairoEditableText::get_cell (uint32_t id) } CairoEditableText::CairoEditableText () - : editing_id (0) - , editing_pos (0) - , width (0) - , max_cell_height (0) - , height (0) - , corner_radius (24) - , xpad (10) - , ypad (5) + : editing_id (0) + , width (0) + , max_cell_height (0) + , height (0) + , corner_radius (18) + , xpad (10) + , ypad (5) { - add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK | - Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK); - set_flags (Gtk::CAN_FOCUS); - set_can_default (true); - set_receives_default (true); + add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK | + Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK); + set_flags (Gtk::CAN_FOCUS); + + set_can_default (true); + set_receives_default (true); +} + +CairoEditableText::~CairoEditableText () +{ + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { + delete i->second; + } +} + +bool +CairoEditableText::on_scroll_event (GdkEventScroll* ev) +{ + uint32_t id; + CairoCell* cell = find_cell (ev->x, ev->y, id); + + if (cell) { + return scroll (ev, id); + } + + return false; } bool @@ -102,13 +152,11 @@ CairoEditableText::on_focus_in_event (GdkEventFocus* ev) bool CairoEditableText::on_focus_out_event (GdkEventFocus* ev) { - if (editing_id) { - CairoCell* cell = get_cell (editing_id); - queue_draw_cell (cell); - editing_id = 0; - editing_pos = 0; - } - + if (editing_id) { + CairoCell* cell = get_cell (editing_id); + queue_draw_cell (cell); + editing_id = 0; + } return false; } @@ -134,10 +182,10 @@ CairoEditableText::set_text (uint32_t id, const string& text) CairoTextCell* textcell = dynamic_cast<CairoTextCell*> (i->second); - if (textcell) { - set_text (textcell, text); - } -} + if (textcell) { + set_text (textcell, text); + } +} void CairoEditableText::set_text (CairoTextCell* cell, const string& text) @@ -150,7 +198,7 @@ bool CairoEditableText::on_expose_event (GdkEventExpose* ev) { Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context(); - + if (cells.empty()) { return true; } @@ -161,27 +209,27 @@ CairoEditableText::on_expose_event (GdkEventExpose* ev) context->set_source_rgba (bg_r, bg_g, bg_b, bg_a); rounded_rectangle (context, 0, 0, width, height, corner_radius); context->fill (); - + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { - + uint32_t id = i->first; CairoCell* cell = i->second; - + /* is cell inside the expose area? */ - if (cell->intersects (ev->area)) { - + if (cell->intersects (ev->area)) { if (id == editing_id) { context->set_source_rgba (edit_r, edit_b, edit_g, edit_a); } else { context->set_source_rgba (r, g, b, a); } - + cell->render (context); } } - return true; + + return true; } void @@ -220,179 +268,55 @@ CairoEditableText::find_cell (uint32_t x, uint32_t y, uint32_t& id) bool CairoEditableText::on_button_press_event (GdkEventButton* ev) { - uint32_t id; - CairoCell* cell; - - if (editing_id) { - cell = get_cell (editing_id); - /* redraw the old cell */ - queue_draw_cell (cell); - } - - cell = find_cell (ev->x, ev->y, id); - + uint32_t id; + CairoCell* cell = find_cell (ev->x, ev->y, id); + if (!cell) { - editing_id = 0; return false; } - - grab_focus (); - editing_id = id; - editing_pos = 0; - - /* redraw the new cell (maybe the same as the old - no real cost) */ - queue_draw_cell (cell); - - return true; + + return button_press (ev, id); } bool CairoEditableText::on_button_release_event (GdkEventButton* ev) { - return true; -} - -bool -CairoEditableText::on_key_press_event (GdkEventKey* ev) -{ - if (!editing_id) { - return true; - } - - bool commit_change = false; - - CairoCell* cell = get_cell (editing_id); - + uint32_t id; + CairoCell* cell = find_cell (ev->x, ev->y, id); + if (!cell) { - return true; + return false; } + + return button_release (ev, id); +} - CairoTextCell* text_cell = dynamic_cast<CairoTextCell*> (cell); - - if (!text_cell) { - return true; - } +void +CairoEditableText::start_editing (uint32_t id) +{ + CairoCell* cell = get_cell (id); - string txt = text_cell->get_text (); + stop_editing (); - switch (ev->keyval) { - case GDK_Tab: + if (cell) { + editing_id = id; queue_draw_cell (cell); - edit_next_cell (); - break; - - case GDK_0: - case GDK_KP_0: - txt[editing_pos] = '0'; - commit_change = true; - break; - case GDK_1: - case GDK_KP_1: - txt[editing_pos] = '1'; - commit_change = true; - break; - case GDK_2: - case GDK_KP_2: - txt[editing_pos] = '2'; - commit_change = true; - break; - case GDK_3: - case GDK_KP_3: - txt[editing_pos] = '3'; - commit_change = true; - break; - case GDK_4: - case GDK_KP_4: - txt[editing_pos] = '4'; - commit_change = true; - break; - case GDK_5: - case GDK_KP_5: - txt[editing_pos] = '5'; - commit_change = true; - break; - case GDK_6: - case GDK_KP_6: - txt[editing_pos] = '6'; - commit_change = true; - break; - case GDK_7: - case GDK_KP_7: - txt[editing_pos] = '7'; - commit_change = true; - break; - case GDK_8: - case GDK_KP_8: - txt[editing_pos] = '8'; - commit_change = true; - break; - case GDK_9: - case GDK_KP_9: - txt[editing_pos] = '9'; - commit_change = true; - break; - - case GDK_Right: - if (editing_pos < text_cell->width_chars() - 1) { - editing_pos++; - } - break; - - case GDK_Left: - if (editing_pos > 0) { - editing_pos--; - } - break; - - default: - break; + grab_focus (); } - - if (commit_change) { - set_text (text_cell, txt); - - if (++editing_pos >= text_cell->width_chars()) { - edit_next_cell (); - } - } - - - return true; } void -CairoEditableText::edit_next_cell () +CairoEditableText::stop_editing () { - CairoCell* next; - CairoTextCell* next_text; - uint32_t next_id = editing_id + 1; - - while (true) { - next = get_cell (next_id); - - if (!next || !next->visible() || (next_text = dynamic_cast<CairoTextCell*> (next)) != 0) { - break; + if (editing_id) { + CairoCell* cell; + if ((cell = get_cell (editing_id))) { + queue_draw_cell (cell); } - - next_id += 1; - } - - if (next) { - editing_id = next_id; - editing_pos = 0; - queue_draw_cell (next_text); - } else { editing_id = 0; - editing_pos = 0; } } -bool -CairoEditableText::on_key_release_event (GdkEventKey* ev) -{ - return true; -} - void CairoEditableText::on_size_request (GtkRequisition* req) { @@ -427,3 +351,22 @@ CairoEditableText::on_size_allocate (Gtk::Allocation& alloc) width = alloc.get_width(); height = alloc.get_height(); } + +void +CairoEditableText::set_font (const std::string& str) +{ + set_font (Pango::FontDescription (str)); +} + +void +CairoEditableText::set_font (const Pango::FontDescription& fd) +{ + Glib::RefPtr<Pango::Context> context = get_pango_context (); + + for (CellMap::iterator i = cells.begin(); i != cells.end(); ++i) { + i->second->set_size (context, fd); + } + + queue_resize (); + queue_draw (); +} diff --git a/libs/gtkmm2ext/gtkmm2ext/cairocell.h b/libs/gtkmm2ext/gtkmm2ext/cairocell.h index c3c879fa26..998f6f99d0 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairocell.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairocell.h @@ -28,187 +28,175 @@ class CairoCell { -public: - CairoCell(); - virtual ~CairoCell() {} - - virtual void render (Cairo::RefPtr<Cairo::Context>&) = 0; - - double x() const { return bbox.x; } - double y() const { return bbox.y; } - double width() const { return bbox.width; } - double height() const { return bbox.height; } - - void set_position (double x, double y) { - bbox.x = x; - bbox.y = y; - } - - bool intersects (GdkRectangle& r) const { - return gdk_rectangle_intersect (&r, &bbox, 0); - } - - bool covers (double x, double y) const { - return bbox.x <= x && bbox.x + bbox.width > x && - bbox.y <= y && bbox.y + bbox.height > y; - } - - double xpad() const { return _xpad; } - void set_xpad (double x) { _xpad = x; } - - void set_visible (bool yn) { _visible = yn; } - bool visible() const { return _visible; } - virtual void set_size (Glib::RefPtr<Pango::Context>&, const Pango::FontDescription&) {} - -protected: - GdkRectangle bbox; - bool _visible; - uint32_t _xpad; + public: + CairoCell(); + virtual ~CairoCell() {} + + virtual void render (Cairo::RefPtr<Cairo::Context>&) = 0; + + double x() const { return bbox.x; } + double y() const { return bbox.y; } + double width() const { return bbox.width; } + double height() const { return bbox.height; } + + void set_position (double x, double y) { + bbox.x = x; + bbox.y = y; + } + + bool intersects (GdkRectangle& r) const { + return gdk_rectangle_intersect (&r, &bbox, 0); + } + + bool covers (double x, double y) const { + return bbox.x <= x && bbox.x + bbox.width > x && + bbox.y <= y && bbox.y + bbox.height > y; + } + + double xpad() const { return _xpad; } + void set_xpad (double x) { _xpad = x; } + + void set_visible (bool yn) { _visible = yn; } + bool visible() const { return _visible; } + virtual void set_size (Glib::RefPtr<Pango::Context>&, const Pango::FontDescription&) {} + + protected: + GdkRectangle bbox; + bool _visible; + uint32_t _xpad; }; class CairoBarCell : public CairoCell { -public: - CairoBarCell() {}; - - void render (Cairo::RefPtr<Cairo::Context>& context) { - context->move_to (bbox.x, bbox.y); - context->set_line_width (bbox.width); - context->rel_line_to (0, bbox.height); - context->stroke (); - } - - void set_size (Glib::RefPtr<Pango::Context>& context, const Pango::FontDescription& font) { - Pango::FontMetrics metrics = context->get_metrics (font); - bbox.width = 2; - bbox.height = (metrics.get_ascent() + metrics.get_descent()) / PANGO_SCALE; - } - -private: + public: + CairoBarCell() {}; + + void render (Cairo::RefPtr<Cairo::Context>& context) { + context->move_to (bbox.x, bbox.y); + context->set_line_width (bbox.width); + context->rel_line_to (0, bbox.height); + context->stroke (); + } + + void set_size (Glib::RefPtr<Pango::Context>& context, const Pango::FontDescription& font) { + Pango::FontMetrics metrics = context->get_metrics (font); + bbox.width = 2; + bbox.height = (metrics.get_ascent() + metrics.get_descent()) / PANGO_SCALE; + } + + private: }; class CairoColonCell : public CairoCell { -public: - CairoColonCell() {}; - - void render (Cairo::RefPtr<Cairo::Context>& context) { - /* two very small circles, at 1/3 and 2/3 of the height */ - context->arc (bbox.x, bbox.y + (bbox.height/3.0), 1.5, 0.0, M_PI*2.0); - context->fill (); - context->arc (bbox.x, bbox.y + (2.0 * bbox.height/3.0), 1.5, 0.0, M_PI*2.0); - context->fill (); - } - - void set_size (Glib::RefPtr<Pango::Context>& context, const Pango::FontDescription& font) { - Pango::FontMetrics metrics = context->get_metrics (font); - bbox.width = 3.0; - bbox.height = (metrics.get_ascent() + metrics.get_descent()) / PANGO_SCALE; - } - -private: + public: + CairoColonCell() {}; + + void render (Cairo::RefPtr<Cairo::Context>& context); + void set_size (Glib::RefPtr<Pango::Context>& context, const Pango::FontDescription& font); }; class CairoTextCell : public CairoCell { -public: - CairoTextCell (uint32_t width_chars); + public: + CairoTextCell (double width_chars); + void set_size (Glib::RefPtr<Pango::Context>&, const Pango::FontDescription&); - void set_size (Glib::RefPtr<Pango::Context>&, const Pango::FontDescription&); + void set_text (const std::string& txt); - void set_text (const std::string& txt) { - layout->set_text (txt); - } - std::string get_text() const { - return layout->get_text (); - } - uint32_t width_chars() const { return _width_chars; } + std::string get_text() const { + return layout->get_text (); + } + double width_chars() const { return _width_chars; } + void render (Cairo::RefPtr<Cairo::Context>&); - void render (Cairo::RefPtr<Cairo::Context>&); - -protected: - uint32_t _width_chars; - Glib::RefPtr<Pango::Layout> layout; + protected: + double _width_chars; + Glib::RefPtr<Pango::Layout> layout; }; class CairoEditableText : public Gtk::Misc { -public: - CairoEditableText (); - - void add_cell (uint32_t id, CairoCell*); - CairoCell* get_cell (uint32_t id); - - void set_text (uint32_t id, const std::string& text); - - void set_colors (double cr, double cg, double cb, double ca) { - r = cr; - g = cg; - b = cb; - a = ca; - queue_draw (); - } - - void set_edit_colors (double cr, double cg, double cb, double ca) { - edit_r = cr; - edit_g = cg; - edit_b = cb; - edit_a = ca; - queue_draw (); - } - - void set_bg (double r, double g, double b, double a) { - bg_r = r; - bg_g = g; - bg_b = b; - bg_a = a; - } - - bool on_expose_event (GdkEventExpose*); - bool on_key_press_event (GdkEventKey*); - bool on_key_release_event (GdkEventKey*); - bool on_button_press_event (GdkEventButton*); - bool on_button_release_event (GdkEventButton*); - void on_size_request (GtkRequisition*); - void on_size_allocate (Gtk::Allocation&); - bool on_focus_in_event (GdkEventFocus*); - bool on_focus_out_event (GdkEventFocus*); - - void set_font (const std::string& str) { - font = Pango::FontDescription (str); - } - -private: - typedef std::map<uint32_t,CairoCell*> CellMap; - - CellMap cells; - Pango::FontDescription font; - uint32_t editing_id; - uint32_t editing_pos; - double width; - double max_cell_height; - double height; - double corner_radius; - double xpad; - double ypad; - double r; - double g; - double b; - double a; - double edit_r; - double edit_g; - double edit_b; - double edit_a; - double bg_r; - double bg_g; - double bg_b; - double bg_a; - - - CairoCell* find_cell (uint32_t x, uint32_t y, uint32_t& cell_id); - void edit_next_cell (); - void queue_draw_cell (CairoCell* target); - void set_text (CairoTextCell* cell, const std::string&); + public: + CairoEditableText (); + ~CairoEditableText (); + + void add_cell (uint32_t id, CairoCell*); + CairoCell* get_cell (uint32_t id); + + void start_editing (uint32_t id); + void stop_editing (); + + void set_text (uint32_t id, const std::string& text); + void set_text (CairoTextCell* cell, const std::string&); + + void set_colors (double cr, double cg, double cb, double ca) { + r = cr; + g = cg; + b = cb; + a = ca; + queue_draw (); + } + + void set_edit_colors (double cr, double cg, double cb, double ca) { + edit_r = cr; + edit_g = cg; + edit_b = cb; + edit_a = ca; + queue_draw (); + } + + void set_bg (double r, double g, double b, double a) { + bg_r = r; + bg_g = g; + bg_b = b; + bg_a = a; + } + + void set_font (const std::string& str); + void set_font (const Pango::FontDescription&); + + sigc::signal<bool,GdkEventScroll*,uint32_t> scroll; + sigc::signal<bool,GdkEventButton*,uint32_t> button_press; + sigc::signal<bool,GdkEventButton*,uint32_t> button_release; + + protected: + bool on_expose_event (GdkEventExpose*); + bool on_button_press_event (GdkEventButton*); + bool on_button_release_event (GdkEventButton*); + void on_size_request (GtkRequisition*); + void on_size_allocate (Gtk::Allocation&); + bool on_focus_in_event (GdkEventFocus*); + bool on_focus_out_event (GdkEventFocus*); + bool on_scroll_event (GdkEventScroll*); + + private: + typedef std::map<uint32_t,CairoCell*> CellMap; + + CellMap cells; + Pango::FontDescription font; + uint32_t editing_id; + double width; + double max_cell_height; + double height; + double corner_radius; + double xpad; + double ypad; + double r; + double g; + double b; + double a; + double edit_r; + double edit_g; + double edit_b; + double edit_a; + double bg_r; + double bg_g; + double bg_b; + double bg_a; + + CairoCell* find_cell (uint32_t x, uint32_t y, uint32_t& cell_id); + void queue_draw_cell (CairoCell* target); }; #endif /* __libgtmm2ext_cairocell_h__ */ |