X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmouse_cursors.cc;h=68ad19ebb7243f5f72a203bb20f502e7a79db13f;hb=aa349d3f8c112b407d19bf09fb50a20940331295;hp=4ba5c66688c86ee92e172dad1f821ff56adaba67;hpb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;p=ardour.git diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc index 4ba5c66688..68ad19ebb7 100644 --- a/gtk2_ardour/mouse_cursors.cc +++ b/gtk2_ardour/mouse_cursors.cc @@ -18,14 +18,20 @@ */ #include + +#include "gtkmm2ext/cursors.h" + #include "utils.h" #include "mouse_cursors.h" #include "editor_xpms" using namespace ARDOUR_UI_UTILS; +Gdk::Cursor* MouseCursors::_invalid = 0; + MouseCursors::MouseCursors () : cross_hair (0) + , scissors (0) , trimmer (0) , right_side_trim (0) , anchored_right_side_trim (0) @@ -70,6 +76,7 @@ void MouseCursors::drop_all () { delete cross_hair; cross_hair = 0; + delete scissors; scissors = 0; delete trimmer; trimmer = 0; delete right_side_trim; right_side_trim = 0; delete anchored_right_side_trim; anchored_right_side_trim = 0; @@ -109,27 +116,73 @@ MouseCursors::drop_all () delete expand_up_down; expand_up_down = 0; } +Gdk::Cursor* +MouseCursors::make_cursor (const char* name, int hotspot_x, int hotspot_y) +{ + Gtkmm2ext::CursorInfo* info = Gtkmm2ext::CursorInfo::lookup_cursor_info (name); + + if (info) { + hotspot_x = info->x; + hotspot_y = info->y; + } + + Glib::RefPtr p (::get_icon (name, _cursor_set)); + return new Gdk::Cursor (Gdk::Display::get_default(), p, hotspot_x, hotspot_y); +} + void MouseCursors::set_cursor_set (const std::string& name) { using namespace Glib; using namespace Gdk; - + drop_all (); + Gtkmm2ext::CursorInfo::drop_cursor_info(); _cursor_set = name; - { - RefPtr p (::get_icon ("zoom_in_cursor", _cursor_set)); - zoom_in = new Cursor (Display::get_default(), p, 10, 5); - } - - { - RefPtr p (::get_icon ("zoom_out_cursor", _cursor_set)); - zoom_out = new Cursor (Display::get_default(), p, 5, 5); - } - - Color fbg ("#ffffff"); - Color ffg ("#000000"); + std::string hotspot_info_path = get_icon_path ("hotspots", _cursor_set, false); + + if (!hotspot_info_path.empty()) { + Gtkmm2ext::CursorInfo::load_cursor_info (hotspot_info_path); + } + + /* these will throw exceptions if their images cannot be found. + + the default hotspot coordinates will be overridden by any + data found by Gtkmm2ext::Cursors::load_cursor_info(). the values + here from the set of cursors used by Ardour; new cursor/icon + sets should come with a hotspot info file. + */ + + zoom_in = make_cursor ("zoom_in_cursor", 10, 5); + zoom_out = make_cursor ("zoom_out_cursor", 5, 5); + scissors = make_cursor ("scissors", 5, 0); + grabber = make_cursor ("grabber", 5, 0); + grabber_note = make_cursor ("grabber_note", 5, 10); + grabber_edit_point = make_cursor ("grabber_edit_point", 5, 17); + left_side_trim = make_cursor ("trim_left_cursor", 5, 11); + anchored_left_side_trim = make_cursor ("anchored_trim_left_cursor", 5, 11); + right_side_trim = make_cursor ("trim_right_cursor", 23, 11); + anchored_right_side_trim = make_cursor ("anchored_trim_right_cursor", 23, 11); + left_side_trim_right_only = make_cursor ("trim_left_cursor_right_only", 5, 11); + right_side_trim_left_only = make_cursor ("trim_right_cursor_left_only", 23, 11); + fade_in = make_cursor ("fade_in_cursor", 0, 0); + fade_out = make_cursor ("fade_out_cursor", 29, 0); + resize_left = make_cursor ("resize_left_cursor", 3, 10); + resize_top_left = make_cursor ("resize_top_left_cursor", 3, 3); + resize_top = make_cursor ("resize_top_cursor", 10, 3); + resize_top_right = make_cursor ("resize_top_right_cursor", 18, 3); + resize_right = make_cursor ("resize_right_cursor", 24, 10); + resize_bottom_right = make_cursor ("resize_bottom_right_cursor", 18, 18); + resize_bottom = make_cursor ("resize_bottom_cursor", 10, 24); + resize_bottom_left = make_cursor ("resize_bottom_left_cursor", 3, 18); + move = make_cursor ("move_cursor", 11, 11); + expand_left_right = make_cursor ("expand_left_right_cursor", 11, 4); + expand_up_down = make_cursor ("expand_up_down_cursor", 4, 11); + selector = make_cursor ("i_beam_cursor", 4, 11); + + Gdk::Color fbg ("#ffffff"); + Gdk::Color ffg ("#000000"); { RefPtr source = Bitmap::create ((char const *) fader_cursor_bits, fader_cursor_width, fader_cursor_height); @@ -150,131 +203,8 @@ MouseCursors::set_cursor_set (const std::string& name) transparent = new Cursor (bits, bits, c, c, 0, 0); } - { - char pix[4] = { 0, 0, 0, 0 }; - RefPtr bits = Bitmap::create (pix, 2, 2); - Color c; - transparent = new Cursor (bits, bits, c, c, 0, 0); - } - - { - RefPtr p (::get_icon ("grabber", _cursor_set)); - grabber = new Cursor (Display::get_default(), p, 5, 0); - } - - { - RefPtr p (::get_icon ("grabber_note", _cursor_set)); - grabber_note = new Cursor (Display::get_default(), p, 5, 10); - } - - { - RefPtr p (::get_icon ("grabber_edit_point", _cursor_set)); - grabber_edit_point = new Cursor (Display::get_default(), p, 5, 17); - } - cross_hair = new Cursor (CROSSHAIR); trimmer = new Cursor (SB_H_DOUBLE_ARROW); - - { - RefPtr p (::get_icon ("trim_left_cursor", _cursor_set)); - left_side_trim = new Cursor (Display::get_default(), p, 5, 11); - } - - { - RefPtr p (::get_icon ("anchored_trim_left_cursor", _cursor_set)); - anchored_left_side_trim = new Cursor (Display::get_default(), p, 5, 11); - } - - { - RefPtr p (::get_icon ("trim_right_cursor", _cursor_set)); - right_side_trim = new Cursor (Display::get_default(), p, 23, 11); - } - - { - RefPtr p (::get_icon ("anchored_trim_right_cursor", _cursor_set)); - anchored_right_side_trim = new Cursor (Display::get_default(), p, 23, 11); - } - - { - RefPtr p (::get_icon ("trim_left_cursor_right_only", _cursor_set)); - left_side_trim_right_only = new Cursor (Display::get_default(), p, 5, 11); - } - - { - RefPtr p (::get_icon ("trim_right_cursor_left_only", _cursor_set)); - right_side_trim_left_only = new Cursor (Display::get_default(), p, 23, 11); - } - - { - RefPtr p (::get_icon ("fade_in_cursor", _cursor_set)); - fade_in = new Cursor (Display::get_default(), p, 0, 0); - } - - { - RefPtr p (::get_icon ("fade_out_cursor", _cursor_set)); - fade_out = new Cursor (Display::get_default(), p, 29, 0); - } - - { - RefPtr p (::get_icon ("resize_left_cursor", _cursor_set)); - resize_left = new Cursor (Display::get_default(), p, 3, 10); - } - - { - RefPtr p (::get_icon ("resize_top_left_cursor", _cursor_set)); - resize_top_left = new Cursor (Display::get_default(), p, 3, 3); - } - - { - RefPtr p (::get_icon ("resize_top_cursor", _cursor_set)); - resize_top = new Cursor (Display::get_default(), p, 10, 3); - } - - { - RefPtr p (::get_icon ("resize_top_right_cursor", _cursor_set)); - resize_top_right = new Cursor (Display::get_default(), p, 18, 3); - } - - { - RefPtr p (::get_icon ("resize_right_cursor", _cursor_set)); - resize_right = new Cursor (Display::get_default(), p, 24, 10); - } - - { - RefPtr p (::get_icon ("resize_bottom_right_cursor", _cursor_set)); - resize_bottom_right = new Cursor (Display::get_default(), p, 18, 18); - } - - { - RefPtr p (::get_icon ("resize_bottom_cursor", _cursor_set)); - resize_bottom = new Cursor (Display::get_default(), p, 10, 24); - } - - { - RefPtr p (::get_icon ("resize_bottom_left_cursor", _cursor_set)); - resize_bottom_left = new Cursor (Display::get_default(), p, 3, 18); - } - - { - RefPtr p (::get_icon ("move_cursor", _cursor_set)); - move = new Cursor (Display::get_default(), p, 11, 11); - } - - { - RefPtr p (::get_icon ("expand_left_right_cursor", _cursor_set)); - expand_left_right = new Cursor (Display::get_default(), p, 11, 4); - } - - { - RefPtr p (::get_icon ("expand_up_down_cursor", _cursor_set)); - expand_up_down = new Cursor (Display::get_default(), p, 4, 11); - } - - { - RefPtr p (::get_icon ("i_beam_cursor", _cursor_set)); - selector = new Cursor (Display::get_default(), p, 4, 11); - } - time_fx = new Cursor (SIZING); wait = new Cursor (WATCH); timebar = new Cursor(LEFT_PTR); @@ -284,3 +214,12 @@ MouseCursors::set_cursor_set (const std::string& name) midi_erase = new Cursor (DRAPED_BOX); up_down = new Cursor (SB_V_DOUBLE_ARROW); } + +void +MouseCursors::create_invalid() +{ + char pix[4] = { 0, 0, 0, 0 }; + Glib::RefPtr bits = Gdk::Bitmap::create (pix, 2, 2); + Gdk::Color c; + _invalid = new Gdk::Cursor (bits, bits, c, c, 0, 0); +}