smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

get SYSLIBS=1 kind of working, use stock HAND2 cursor

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@159 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge 2005-12-02 09:20:03 +00:00
parent 4cc6d157ec
commit 7aee3d6fbf
3 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

27
SConstruct
View file

@ -422,30 +422,39 @@ if env['SYSLIBS']:
libraries['sigc2'] = LibraryInfo() libraries['sigc2'] = LibraryInfo()
libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0')
libraries['glibmm2'] = LibraryInfo()
libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4')
libraries['gdkmm2'] = LibraryInfo()
libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4')
libraries['gtkmm2'] = LibraryInfo() libraries['gtkmm2'] = LibraryInfo()
libraries['gtkmm2'].ParseConfig ('pkg-config --cflags --libs gtkmm-2.0') libraries['gtkmm2'].ParseConfig ('pkg-config --cflags --libs gtkmm-2.4')
libraries['atkmm'] = LibraryInfo()
libraries['atkmm'].ParseConfig ('pkg-config --cflags --libs atkmm-1.6')
libraries['pangomm'] = LibraryInfo()
libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
libraries['libgnomecanvasmm'] = LibraryInfo()
libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
libraries['libglademm'] = LibraryInfo() libraries['libglademm'] = LibraryInfo()
libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
libraries['soundtouch'] = LibraryInfo(LIBS='SoundTouch')
libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
LIBPATH='#libs/soundtouch',
CPPPATH=['#libs', '#libs/soundtouch'])
coredirs = [ coredirs = [
'templates' 'templates'
] ]
subdirs = [ subdirs = [
# 'libs/cassowary',
'libs/pbd3', 'libs/pbd3',
'libs/midi++2', 'libs/midi++2',
'libs/ardour', 'libs/ardour'
'templates'
] ]
gtk_subdirs = [ gtk_subdirs = [
'libs/flowcanvas',
'libs/gtkmm2ext', 'libs/gtkmm2ext',
'gtk2_ardour', 'gtk2_ardour'
] ]
else: else:

23
gtk2_ardour/editor.cc
View file

@ -1403,16 +1403,6 @@ void
Editor::build_cursors () Editor::build_cursors ()
{ {
using namespace Gdk; using namespace Gdk;
Gdk::Color fg ("#ff0000"); /* Red. */
Gdk::Color bg ("#0000ff"); /* Blue. */
{
RefPtr<Bitmap> source, mask;
source = Bitmap::create (hand_bits, hand_width, hand_height);
mask = Bitmap::create (handmask_bits, handmask_width, handmask_height);
grabber_cursor = new Gdk::Cursor (source, mask, fg, bg, hand_x_hot, hand_y_hot);
}
Gdk::Color mbg ("#000000" ); /* Black */ Gdk::Color mbg ("#000000" ); /* Black */
Gdk::Color mfg ("#0000ff" ); /* Blue. */ Gdk::Color mfg ("#0000ff" ); /* Blue. */
@ -1442,12 +1432,13 @@ Editor::build_cursors ()
speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot); speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
} }
cross_hair_cursor = new Gdk::Cursor (Gdk::CROSSHAIR); grabber_cursor = new Gdk::Cursor (HAND2);
trimmer_cursor = new Gdk::Cursor (Gdk::SB_H_DOUBLE_ARROW); cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
selector_cursor = new Gdk::Cursor (Gdk::XTERM); trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW);
time_fx_cursor = new Gdk::Cursor (Gdk::SIZING); selector_cursor = new Gdk::Cursor (XTERM);
wait_cursor = new Gdk::Cursor (Gdk::WATCH); time_fx_cursor = new Gdk::Cursor (SIZING);
timebar_cursor = new Gdk::Cursor(Gdk::LEFT_PTR); wait_cursor = new Gdk::Cursor (WATCH);
timebar_cursor = new Gdk::Cursor(LEFT_PTR);
} }
void void

17
gtk2_ardour/editor_xpms
View file

@ -1,21 +1,4 @@
/* Created with The GIMP */ /* Created with The GIMP */
#define hand_width 16
#define hand_height 16
#define hand_x_hot 3
#define hand_y_hot 0
static const gchar hand_bits[] = {
0x18, 0x00, 0x24, 0x00, 0x24, 0x00, 0x24, 0x00, 0xe4, 0x36, 0x24, 0x49,
0x27, 0x49, 0x25, 0x49, 0x25, 0x49, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40,
0x02, 0x40, 0x04, 0x60, 0xfc, 0x3f, 0xfc, 0x3f };
/* Created with The GIMP */
#define handmask_width 16
#define handmask_height 16
static const gchar handmask_bits[] = {
0x18, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x36, 0xfc, 0x7f,
0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f,
0xfe, 0x7f, 0xfc, 0x7f, 0xfc, 0x3f, 0xfc, 0x3f };
#define mag_width 16 #define mag_width 16
#define mag_height 16 #define mag_height 16
#define mag_x_hot 9 #define mag_x_hot 9