diff -rNu melys-0.1.11/ChangeLog melys-0.1.12/ChangeLog --- melys-0.1.11/ChangeLog Tue Dec 7 14:59:09 1999 +++ melys-0.1.12/ChangeLog Tue Dec 14 18:02:29 1999 @@ -1,5 +1,60 @@ +1999-12-14 Steve Ratcliffe + + * gui/main.m, gui/menus.m, midi/play.m, po/melys.pot, po/zz.po, + widgets/melyspiano.m, widgets/melystempo.m, widgets/melystrackdisplay.m: + Some internationalisation messages had been missed + + * widgets/melyspiano.m, widgets/melystempo.m, + widgets/melystrackdisplay.m, widgets/melysview.m: + Implement mouse position tracking for all the views. + This will all be moved to the view status widget + when it is ready. + + * widgets/melysview.m: When dragging the reported position is + the start time of the earliest element in the drag. + + * widgets/melyspiano.m: Use mel_status_msg from the melmsg.h header + + * gui/main.m: Get mel_status_msg defined in the melmsg.h header + + * widgets/melyspiano.m, widgets/melysscroll.m, widgets/melysview.m: + Modify so that there is only one position change routine. + + * widgets/melyskeys.m: There needs to be an extra arg to the highligh + routine now. + + * gui/main.m: Add routine to display message in the status bar. + + * util/util.m, files/mdmlwrite.m: Routine to make a note name + from a number, transfered to util and made global. + + * widgets/melyskeys.m, widgets/melyspiano.m, widgets/melysscroll.m, + widgets/melystrackdisplay.m, widgets/melystrackinfo.m, + widgets/melysview.m: + Changes all to do with better user feedback while moving + the mouse or dragging. You now see the piano keys being + highlighted while you move over them. + The drag outlines honour the snap setting so you can see just + exactly where it is going to be dropped. + + * doc/docgen.py: Add some more files + + * md/mdutil.m: Swap the order of the type and tick args in md_snap_tick + to be more intuitive. + +1999-12-13 Steve Ratcliffe + + * widgets/melysview.m: + While dragging we don't get motion events, so synthesize one. + Feedback now occurs while you drag. + + * widgets/melysview.m: Added handler for key press events. + Can now delete all selected objects in each view. + 1999-12-07 Steve Ratcliffe + * version: Version 0.1.11 + * ChangeLog: For rel 0.1.11 * REL-0-1-11 * widgets/melystrackdisplay.m: diff -rNu melys-0.1.11/doc/docgen.py melys-0.1.12/doc/docgen.py --- melys-0.1.11/doc/docgen.py Thu Oct 14 17:40:38 1999 +++ melys-0.1.12/doc/docgen.py Tue Dec 14 15:03:40 1999 @@ -25,6 +25,17 @@ ("The display pane", "widgets/melystrackdisplay"), ("The time ruler", "widgets/melysrule"), ("The part items", "widgets/melyspartitem"), + ("The piano roll", "widgets/melyspiano"), + ("The keyboard", "widgets/melyskeys"), + ("The tempo view", "widgets/melystempo"), + ("The base for key/time signatures", "widgets/melyssig"), + ("The keysignature widget", "widgets/melyskeysig"), + ("The timesignature widget", "widgets/melystimesig"), + ("The vertical scales", "widgets/melysscale"), + ("Base view", "widgets/melysview"), + ("View control", "widgets/viewcontrol"), + ("Time position label", "widgets/melyspos"), + ("General utility routines", None), ("Stack routines", "util/gxstack"), diff -rNu melys-0.1.11/files/mdmlwrite.c melys-0.1.12/files/mdmlwrite.c --- melys-0.1.11/files/mdmlwrite.c Tue Dec 7 15:00:02 1999 +++ melys-0.1.12/files/mdmlwrite.c Tue Dec 14 18:07:28 1999 @@ -42,7 +42,6 @@ struct element *el); static void set_prop_int(xmlNodePtr node, char *name, int n); static void set_prop_and_free(xmlNodePtr node, char *name, char *cp); -static char *note_name(int note); /* @@ -420,43 +419,4 @@ xmlSetProp(node, name, cp); g_free(cp); -} - -/* - * Return a text representation of a note given the midi note - * number. There are different naming schemes around, this - * one gives C0 for note 0. This result will be of the form G4, C#3 - * etc. - * - * Arguments: - * note - Note number - */ -static char * -note_name(int note) -{ - char *note_names = "CCDDEFFGGAAB"; - char *sharps = " # # # # # "; - GString *s; - char ch; - char *octave; - char *ret; - - /* Base note */ - s = g_string_new(""); - g_string_append_c(s, note_names[note % 12]); - - /* Add a sharp sign if needed */ - ch = sharps[note % 12]; - if (ch == '#') - g_string_append_c(s, '#'); - - /* Add the octave number */ - octave = g_strdup_printf("%d", note/12); - g_string_append(s, octave); - g_free(octave); - - ret = s->str; - g_string_free(s, 0); - - return ret; } diff -rNu melys-0.1.11/files/mdmlwrite.m melys-0.1.12/files/mdmlwrite.m --- melys-0.1.11/files/mdmlwrite.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.12/files/mdmlwrite.m Tue Dec 14 16:49:02 1999 @@ -390,37 +390,3 @@ g_free(cp); ->>function note_name -static char * -int note; // Note number ->>description -Return a text representation of a note given the midi note -number. -There are different naming schemes around, this one gives C0 for note 0. -This result will be of the form G4, C#3 etc. ->>code - char *note_names = "CCDDEFFGGAAB"; - char *sharps = " # # # # # "; - GString *s; - char ch; - char *octave; - char *ret; - - /* Base note */ - s = g_string_new(""); - g_string_append_c(s, note_names[note % 12]); - - /* Add a sharp sign if needed */ - ch = sharps[note % 12]; - if (ch == '#') - g_string_append_c(s, '#'); - - /* Add the octave number */ - octave = g_strdup_printf("%d", note/12); - g_string_append(s, octave); - g_free(octave); - - ret = s->str; - g_string_free(s, 0); - - return ret; diff -rNu melys-0.1.11/gui/main.c melys-0.1.12/gui/main.c --- melys-0.1.11/gui/main.c Tue Dec 7 15:00:06 1999 +++ melys-0.1.12/gui/main.c Tue Dec 14 18:07:32 1999 @@ -24,6 +24,7 @@ #include #include "libgnome/gnome-defs.h" #include "libgnome/gnome-mime.h" +#include "libgnomeui/gnome-app-util.h" #include "libgnomeui/gnome-init.h" #include "libgnomeui/gnome-mdi.h" #include "libgnomeui/gnome-mdi-child.h" @@ -200,7 +201,7 @@ child = gnome_mdi_get_active_child(GNOME_MDI(mdi)); if (child == NULL) - ethrow(noActiveChildError, "No active child"); + ethrow(noActiveChildError, _("No active child")); sd = song_get_data(GTK_OBJECT(child)); @@ -552,6 +553,24 @@ } return TRUE; /* True, there is an error */ +} + +void +mel_status_msg(struct song *song, char *msg) +{ + GnomeApp *app; + GtkWidget *view; + GtkStatusbar *sbar; + guint ctx; + + view = gnome_mdi_get_active_view(GNOME_MDI(song->mdi)); + if (view) { + app = gnome_mdi_get_app_from_view(view); + sbar = GTK_STATUSBAR(app->statusbar); + ctx = gtk_statusbar_get_context_id(sbar, "hello"); + gtk_statusbar_pop(sbar, ctx); + gtk_statusbar_push(sbar, ctx, msg); + } } /* diff -rNu melys-0.1.11/gui/main.m melys-0.1.12/gui/main.m --- melys-0.1.11/gui/main.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.12/gui/main.m Tue Dec 14 17:49:32 1999 @@ -15,6 +15,7 @@ >>header libgnome/gnome-defs.h >>header libgnome/gnome-mime.h +>>header libgnomeui/gnome-app-util.h >>header libgnomeui/gnome-init.h >>header libgnomeui/gnome-mdi.h >>header libgnomeui/gnome-mdi-child.h @@ -72,6 +73,7 @@ int _type, char *fmt, ...); extern void mel_view_update(void); +extern void mel_status_msg(struct song *, char *); >>extern @@ -209,7 +211,7 @@ child = gnome_mdi_get_active_child(GNOME_MDI(mdi)); if (child == NULL) - ethrow(noActiveChildError, "No active child"); + ethrow(noActiveChildError, _("No active child")); sd = song_get_data(GTK_OBJECT(child)); @@ -575,6 +577,27 @@ } return TRUE; /* True, there is an error */ + + +>>function mel_status_msg +void +struct song *song; +char *msg; + +>>code + GnomeApp *app; + GtkWidget *view; + GtkStatusbar *sbar; + guint ctx; + + view = gnome_mdi_get_active_view(GNOME_MDI(song->mdi)); + if (view) { + app = gnome_mdi_get_app_from_view(view); + sbar = GTK_STATUSBAR(app->statusbar); + ctx = gtk_statusbar_get_context_id(sbar, "hello"); + gtk_statusbar_pop(sbar, ctx); + gtk_statusbar_push(sbar, ctx, msg); + } >>function mel_accept_files void diff -rNu melys-0.1.11/gui/menus.c melys-0.1.12/gui/menus.c --- melys-0.1.11/gui/menus.c Tue Dec 7 15:00:06 1999 +++ melys-0.1.12/gui/menus.c Tue Dec 14 18:07:32 1999 @@ -72,7 +72,7 @@ /* The file menu */ GnomeUIInfo filemenu[] = { GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), - "Start a new piece of music", new_cb, NULL), + N_("Start a new piece of music"), new_cb, NULL), GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), GNOMEUIINFO_MENU_SAVE_ITEM(save_cb, NULL), GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), diff -rNu melys-0.1.11/gui/menus.m melys-0.1.12/gui/menus.m --- melys-0.1.11/gui/menus.m Sat Nov 13 12:53:44 1999 +++ melys-0.1.12/gui/menus.m Tue Dec 14 17:49:32 1999 @@ -39,7 +39,7 @@ /* The file menu */ GnomeUIInfo filemenu[] = { GNOMEUIINFO_MENU_NEW_ITEM(N_("New"), - "Start a new piece of music", new_cb, NULL), + N_("Start a new piece of music"), new_cb, NULL), GNOMEUIINFO_MENU_OPEN_ITEM(open_cb, NULL), GNOMEUIINFO_MENU_SAVE_ITEM(save_cb, NULL), GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_cb, NULL), diff -rNu melys-0.1.11/help/C/html/key-bindings.html melys-0.1.12/help/C/html/key-bindings.html --- melys-0.1.11/help/C/html/key-bindings.html Tue Dec 7 15:00:25 1999 +++ melys-0.1.12/help/C/html/key-bindings.html Tue Dec 14 18:07:52 1999 @@ -66,7 +66,7 @@ >

Default keybindings

The tempo map view
Accessing a tempo view
Editing in the tempomap view
Default keybindings
Later you will be able to select notes by dragging + out an area, but this isn't implemented yet. +

Copying notes

moving notes - for more details.

Deleting notes

Notes can be deleted by first selecting them and then + hitting the Delete key.

The tempo map view

Accessing a tempo view

Editing in the tempomap view

Changing the tempo

Adding a new tempo change

Copying/moving a set of tempo changes

+ Later you will be able to select notes by dragging + out an area, but this isn't implemented yet. + Moving notes @@ -107,4 +111,9 @@ moving notes for more details. + + Deleting notes + + Notes can be deleted by first selecting them and then + hitting the Delete key. diff -rNu melys-0.1.11/include/md.h melys-0.1.12/include/md.h --- melys-0.1.11/include/md.h Tue Dec 7 14:59:47 1999 +++ melys-0.1.12/include/md.h Tue Dec 14 18:07:14 1999 @@ -248,6 +248,6 @@ struct mbt *mbtp); ticktime_t md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp); -ticktime_t md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, - enum snap_type snap); +ticktime_t md_snap_tick(struct tempomapElement *tmap, enum snap_type snap, + ticktime_t tick); struct element *md_copy(struct element *e); diff -rNu melys-0.1.11/include/meldnd.h melys-0.1.12/include/meldnd.h --- melys-0.1.11/include/meldnd.h Tue Dec 7 14:59:51 1999 +++ melys-0.1.12/include/meldnd.h Tue Dec 14 18:07:17 1999 @@ -35,19 +35,23 @@ * part within a part. */ struct drag_element_data { - gint32 len; /* Number of elements if this is the first */ + gint32 len; /* Number of elements in a */ + gint min_tick_offset; + gint min_thing_offset; gint32 data_size; /* size of this structure */ - gint32 tick_offset; /* time offset of click into part */ - gint32 thing_offset; /* track offset of click into part */ - gint32 tick_len; /* The length in ticks */ + struct drag_element_data_elements { + gint32 tick_offset; /* time offset of click into part */ + gint32 thing_offset; /* track offset of click into part */ + gint32 tick_len; /* The length in ticks */ - struct element *element; /* The element being moved */ - struct containerElement *con; /* Containing element */ + struct element *element; /* The element being moved */ + struct containerElement *con; /* Containing element */ + } a[1]; /* Realy more */ }; struct outline_data { struct _GnomeCanvasGroup *group; - int xoffset; - int yoffset; + int tickoffset; + int thingoffset; }; diff -rNu melys-0.1.11/include/melgui.h melys-0.1.12/include/melgui.h --- melys-0.1.11/include/melgui.h Tue Dec 7 14:59:48 1999 +++ melys-0.1.12/include/melgui.h Tue Dec 14 18:07:15 1999 @@ -52,6 +52,7 @@ void mel_ui_warn(struct song *sd, char *msg, GtkObject *parent); gboolean mel_file_error(struct song *song, struct File *file, GtkObject *parent); +void mel_status_msg(struct song *song, char *msg); void mel_accept_files(GtkObject *mdi, GtkWidget *w); void set_tip(GtkWidget *w, char *tip); void mel_debug_print_type(char *msg, GtkObject *o); diff -rNu melys-0.1.11/include/melmsg.h melys-0.1.12/include/melmsg.h --- melys-0.1.11/include/melmsg.h Tue Dec 7 14:59:48 1999 +++ melys-0.1.12/include/melmsg.h Tue Dec 14 18:07:14 1999 @@ -46,4 +46,5 @@ int _type, char *fmt, ...); extern void mel_view_update(void); +extern void mel_status_msg(struct song *, char *); diff -rNu melys-0.1.11/include/melyskeys.h melys-0.1.12/include/melyskeys.h --- melys-0.1.11/include/melyskeys.h Tue Dec 7 14:59:48 1999 +++ melys-0.1.12/include/melyskeys.h Tue Dec 14 18:07:15 1999 @@ -38,8 +38,6 @@ #define NLABELS ((NKEYS+12)/12) -#include "melysscroll.h" - /* * The MelysKeys structure. Each instance of the class is * allocated one of these structures. @@ -56,11 +54,12 @@ * allocated for the class. */ struct _MelysKeysClass { - GnomeCanvasClass parent_class; + MelysScrollClass parent_class; void (*key_pressed)(MelysKeys *, int); }; guint melys_keys_get_type(void); GtkWidget *melys_keys_new(ViewControl *vcp); -void melys_keys_highlight(GtkWidget *mview, int thing, gpointer _mkeys); +void melys_keys_highlight(GtkWidget *mview, int tick, int thing, + gpointer _mkeys); diff -rNu melys-0.1.11/include/melysscroll.h melys-0.1.12/include/melysscroll.h --- melys-0.1.11/include/melysscroll.h Tue Dec 7 14:59:49 1999 +++ melys-0.1.12/include/melysscroll.h Tue Dec 14 18:07:16 1999 @@ -38,6 +38,10 @@ int voffset; /* Previous veritcal offset */ int hoffset; /* Previous horizontal offset */ + /* Previous mouse positions */ + int mouse_thing; + int mouse_tick; + /* Base offset of zero point */ int hbase; @@ -53,6 +57,9 @@ /* A scale change */ void (*scale_changed)(MelysScroll *); + + /* Mouse moved */ + void (*position_change)(MelysScroll *, int, int); }; diff -rNu melys-0.1.11/include/melysview.h melys-0.1.12/include/melysview.h --- melys-0.1.11/include/melysview.h Tue Dec 7 14:59:51 1999 +++ melys-0.1.12/include/melysview.h Tue Dec 14 18:07:17 1999 @@ -86,8 +86,7 @@ void (*scale_changed)(MelysView *); /* Mouse moved */ - void (*thing_position)(MelysView *, int); - void (*tick_position)(MelysView *, int); + void (*position_change)(MelysView *, int, int); /* Action on button 1 double click */ void (*button1_double)(MelysView *, struct element *); @@ -105,4 +104,5 @@ guint melys_view_get_type(void); void melys_view_set_song(MelysView *mview, struct song *song); +void melys_view_add_scroll(MelysView *mview, MelysScroll *mscroll); int melys_view_item_event(GtkObject *item, GdkEvent *event, gpointer data); diff -rNu melys-0.1.11/include/util.h melys-0.1.12/include/util.h --- melys-0.1.11/include/util.h Tue Dec 7 14:59:47 1999 +++ melys-0.1.12/include/util.h Tue Dec 14 18:07:14 1999 @@ -127,3 +127,4 @@ void mel_debug_printf(int level, char *fmt, ...); +char *note_name(int note); diff -rNu melys-0.1.11/md/mdutil.c melys-0.1.12/md/mdutil.c --- melys-0.1.11/md/mdutil.c Tue Dec 7 15:00:05 1999 +++ melys-0.1.12/md/mdutil.c Tue Dec 14 18:07:31 1999 @@ -576,12 +576,12 @@ * * Arguments: * tmap - The tempomap - * tick - The tick value to snap * snap - The boundry to snap to + * tick - The tick value to snap */ ticktime_t -md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, - enum snap_type snap) +md_snap_tick(struct tempomapElement *tmap, enum snap_type snap, + ticktime_t tick) { struct mbt mbt; ticktime_t try1; diff -rNu melys-0.1.11/md/mdutil.m melys-0.1.12/md/mdutil.m --- melys-0.1.11/md/mdutil.m Tue Dec 7 14:11:32 1999 +++ melys-0.1.12/md/mdutil.m Tue Dec 14 15:02:25 1999 @@ -710,8 +710,8 @@ >>function md_snap_tick ticktime_t struct tempomapElement *tmap; The tempomap -ticktime_t tick; The tick value to snap enum snap_type snap; The boundry to snap to +ticktime_t tick; The tick value to snap >>description The given time is snapped to the nearest boundry diff -rNu melys-0.1.11/midi/play.c melys-0.1.12/midi/play.c --- melys-0.1.11/midi/play.c Tue Dec 7 15:00:13 1999 +++ melys-0.1.12/midi/play.c Tue Dec 14 18:07:39 1999 @@ -91,7 +91,7 @@ play->mdroot = NULL; play->pend_element = NULL; - play->ctxp = seq_context_new("Melys sequencer"); + play->ctxp = seq_context_new(_("Melys sequencer")); snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; diff -rNu melys-0.1.11/midi/play.m melys-0.1.12/midi/play.m --- melys-0.1.11/midi/play.m Sat Nov 27 11:43:22 1999 +++ melys-0.1.12/midi/play.m Tue Dec 14 17:49:32 1999 @@ -82,7 +82,7 @@ play->mdroot = NULL; play->pend_element = NULL; - play->ctxp = seq_context_new("Melys sequencer"); + play->ctxp = seq_context_new(_("Melys sequencer")); snd_seq_block_mode(seq_handle(play->ctxp), 0); play->seq = NULL; play->write_id = 0; diff -rNu melys-0.1.11/po/melys.pot melys-0.1.12/po/melys.pot --- melys-0.1.11/po/melys.pot Fri Dec 3 17:54:24 1999 +++ melys-0.1.12/po/melys.pot Tue Dec 14 17:49:32 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-03 17:52+0000\n" +"POT-Creation-Date: 1999-12-14 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,19 +102,23 @@ msgid " difference set to zero" msgstr "" -#: main.m:111 +#: main.m:113 msgid "Melys" msgstr "" -#: main.m:182 +#: main.m:184 msgid "Song position" msgstr "" -#: main.m:303 +#: main.m:214 +msgid "No active child" +msgstr "" + +#: main.m:305 msgid "Untitled" msgstr "" -#: main.m:570 +#: main.m:572 #, c-format msgid "" "There was a problem opening the file %s\n" @@ -125,6 +129,10 @@ msgid "New" msgstr "" +#: menus.m:42 +msgid "Start a new piece of music" +msgstr "" + #: menus.m:58 msgid "_Close all" msgstr "" @@ -161,11 +169,11 @@ msgid "Delete empty" msgstr "" -#: melystrackinfo.m:179 menus.m:87 +#: melystrackinfo.m:182 menus.m:87 msgid "Delete all empty tracks" msgstr "" -#: melystrackdisplay.m:160 melystrackinfo.m:201 menus.m:92 +#: melystrackdisplay.m:161 melystrackinfo.m:204 menus.m:92 msgid "Properties..." msgstr "" @@ -317,6 +325,10 @@ msgid "Freed an element %d with bad reference count %d" msgstr "" +#: play.m:85 +msgid "Melys sequencer" +msgstr "" + #: play.m:360 msgid "" "Melys was not built with the ALSA remove_events\n" @@ -441,7 +453,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "" -#: song.m:145 song.m:218 +#: song.m:147 song.m:220 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -455,112 +467,127 @@ msgid "m" msgstr "" -#: melystrackdisplay.m:131 +#: melyspiano.m:467 +#, c-format +msgid "Note: %3s Time: %3d:%02d:%03d" +msgstr "" + +#: melystempo.m:519 +#, c-format +msgid "Tempo: %3d Time: %3d:%02d:%03d" +msgstr "" + +#: melystrackdisplay.m:132 msgid "_Slice" msgstr "" -#: melystrackdisplay.m:131 +#: melystrackdisplay.m:132 msgid "Slice the part into two" msgstr "" -#: melystrackdisplay.m:137 +#: melystrackdisplay.m:138 msgid "_Join" msgstr "" -#: melystrackdisplay.m:137 +#: melystrackdisplay.m:138 msgid "Join this part and the next" msgstr "" -#: melystrackdisplay.m:143 +#: melystrackdisplay.m:144 msgid "Delete" msgstr "" -#: melystrackdisplay.m:143 +#: melystrackdisplay.m:144 msgid "Delete this part" msgstr "" -#: melystrackdisplay.m:151 +#: melystrackdisplay.m:152 msgid "Piano roll view" msgstr "" -#: melystrackdisplay.m:152 +#: melystrackdisplay.m:153 msgid "Open a piano roll view for this part" msgstr "" -#: melystrackdisplay.m:160 +#: melystrackdisplay.m:161 msgid "Part property box" msgstr "" -#: melystrackinfo.m:154 +#: melystrackdisplay.m:747 +#, c-format +msgid "Time: %3d:%02d:%03d" +msgstr "" + +#: melystrackinfo.m:157 msgid "Name" msgstr "" -#: melystrackinfo.m:155 +#: melystrackinfo.m:158 msgid "Prog" msgstr "" -#: melystrackinfo.m:156 +#: melystrackinfo.m:159 msgid "C" msgstr "" -#: melystrackinfo.m:157 +#: melystrackinfo.m:160 msgid "Mute" msgstr "" -#: melystrackinfo.m:158 +#: melystrackinfo.m:161 msgid "Solo" msgstr "" -#: melystrackinfo.m:159 +#: melystrackinfo.m:162 msgid "Rec" msgstr "" -#: melystrackinfo.m:168 +#: melystrackinfo.m:171 msgid "_Add track" msgstr "" -#: melystrackinfo.m:168 +#: melystrackinfo.m:171 msgid "Add a track below this one" msgstr "" -#: melystrackinfo.m:173 +#: melystrackinfo.m:176 msgid "_Delete track" msgstr "" -#: melystrackinfo.m:174 +#: melystrackinfo.m:177 msgid "Delete all selected or this track" msgstr "" -#: melystrackinfo.m:179 +#: melystrackinfo.m:182 msgid "Delete _empty" msgstr "" -#: melystrackinfo.m:186 +#: melystrackinfo.m:189 msgid "_Piano roll view" msgstr "" -#: melystrackinfo.m:187 +#: melystrackinfo.m:190 msgid "Open a new piano roll view for this track" msgstr "" -#: melystrackinfo.m:192 +#: melystrackinfo.m:195 msgid "_Tempomap view" msgstr "" -#: melystrackinfo.m:193 +#: melystrackinfo.m:196 msgid "Open a view of the tempo, time and key signatures for this track" msgstr "" -#: melystrackinfo.m:202 +#: melystrackinfo.m:205 msgid "Bring up the track properties dialog" msgstr "" -#: melystrackinfo.m:836 +#: melystrackinfo.m:839 #, c-format msgid "Track %d" msgstr "" -#: melystrackinfo.m:907 +#: melystrackinfo.m:910 #, c-format msgid "" "Internal error.\n" @@ -568,18 +595,18 @@ "Value was %d\n" msgstr "" -#: viewcontrol.m:271 +#: viewcontrol.m:256 msgid "Increase vertical scale" msgstr "" -#: viewcontrol.m:272 +#: viewcontrol.m:257 msgid "Decrease vertical scale" msgstr "" -#: viewcontrol.m:282 +#: viewcontrol.m:267 msgid "Increase horizontal scale" msgstr "" -#: viewcontrol.m:283 +#: viewcontrol.m:268 msgid "Decrease horizontail scale" msgstr "" diff -rNu melys-0.1.11/po/zz.po melys-0.1.12/po/zz.po --- melys-0.1.11/po/zz.po Fri Dec 3 17:54:24 1999 +++ melys-0.1.12/po/zz.po Tue Dec 14 17:49:32 1999 @@ -105,19 +105,23 @@ msgid " difference set to zero" msgstr " D.I.F.F.E.R.E.N.C.E. S.E.T. T.O. Z.E.R.O." -#: main.m:111 +#: main.m:113 msgid "Melys" msgstr "M.E.L.Y.S." -#: main.m:182 +#: main.m:184 msgid "Song position" msgstr "S.O.N.G. P.O.S.I.T.I.O.N." -#: main.m:303 +#: main.m:214 +msgid "No active child" +msgstr "N.O. A.C.T.I.V.E. C.H.I.L.D." + +#: main.m:305 msgid "Untitled" msgstr "U.N.T.I.T.L.E.D." -#: main.m:570 +#: main.m:572 #, c-format msgid "" "There was a problem opening the file %s\n" @@ -130,6 +134,10 @@ msgid "New" msgstr "N.E.W." +#: menus.m:42 +msgid "Start a new piece of music" +msgstr "S.T.A.R.T. A. N.E.W. P.I.E.C.E. O.F. M.U.S.I.C." + #: menus.m:58 msgid "_Close all" msgstr "_C.L.O.S.E. A.L.L." @@ -166,11 +174,11 @@ msgid "Delete empty" msgstr "D.E.L.E.T.E. E.M.P.T.Y." -#: melystrackinfo.m:179 menus.m:87 +#: melystrackinfo.m:182 menus.m:87 msgid "Delete all empty tracks" msgstr "D.E.L.E.T.E. A.L.L. E.M.P.T.Y. T.R.A.C.K.S." -#: melystrackdisplay.m:160 melystrackinfo.m:201 menus.m:92 +#: melystrackdisplay.m:161 melystrackinfo.m:204 menus.m:92 msgid "Properties..." msgstr "P.R.O.P.E.R.T.I.E.S...." @@ -325,6 +333,10 @@ msgid "Freed an element %d with bad reference count %d" msgstr "F.R.E.E.D. A.N. E.L.E.M.E.N.T. %d W.I.T.H. B.A.D. R.E.F.E.R.E.N.C.E. C.O.U.N.T. %d" +#: play.m:85 +msgid "Melys sequencer" +msgstr "M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." + #: play.m:360 msgid "" "Melys was not built with the ALSA remove_events\n" @@ -461,7 +473,7 @@ msgid "Error (%s) creating sequencer port\n" msgstr "E.R.R.O.R. (%s) C.R.E.A.T.I.N.G. S.E.Q.U.E.N.C.E.R. P.O.R.T.\n" -#: song.m:145 song.m:218 +#: song.m:147 song.m:220 msgid "" "Could not open ALSA sequencer\n" "Perhaps modules are not loaded\n" @@ -477,112 +489,127 @@ msgid "m" msgstr "M." -#: melystrackdisplay.m:131 +#: melyspiano.m:467 +#, c-format +msgid "Note: %3s Time: %3d:%02d:%03d" +msgstr "N.O.T.E.: %3S. T.I.M.E.: %3D.:%02D.:%03D." + +#: melystempo.m:519 +#, c-format +msgid "Tempo: %3d Time: %3d:%02d:%03d" +msgstr "T.E.M.P.O.: %3D. T.I.M.E.: %3D.:%02D.:%03D." + +#: melystrackdisplay.m:132 msgid "_Slice" msgstr "_S.L.I.C.E." -#: melystrackdisplay.m:131 +#: melystrackdisplay.m:132 msgid "Slice the part into two" msgstr "S.L.I.C.E. T.H.E. P.A.R.T. I.N.T.O. T.W.O." -#: melystrackdisplay.m:137 +#: melystrackdisplay.m:138 msgid "_Join" msgstr "_J.O.I.N." -#: melystrackdisplay.m:137 +#: melystrackdisplay.m:138 msgid "Join this part and the next" msgstr "J.O.I.N. T.H.I.S. P.A.R.T. A.N.D. T.H.E. N.E.X.T." -#: melystrackdisplay.m:143 +#: melystrackdisplay.m:144 msgid "Delete" msgstr "D.E.L.E.T.E." -#: melystrackdisplay.m:143 +#: melystrackdisplay.m:144 msgid "Delete this part" msgstr "D.E.L.E.T.E. T.H.I.S. P.A.R.T." -#: melystrackdisplay.m:151 +#: melystrackdisplay.m:152 msgid "Piano roll view" msgstr "P.I.A.N.O. R.O.L.L. V.I.E.W." -#: melystrackdisplay.m:152 +#: melystrackdisplay.m:153 msgid "Open a piano roll view for this part" msgstr "O.P.E.N. A. P.I.A.N.O. R.O.L.L. V.I.E.W. F.O.R. T.H.I.S. P.A.R.T." -#: melystrackdisplay.m:160 +#: melystrackdisplay.m:161 msgid "Part property box" msgstr "P.A.R.T. P.R.O.P.E.R.T.Y. B.O.X." -#: melystrackinfo.m:154 +#: melystrackdisplay.m:747 +#, c-format +msgid "Time: %3d:%02d:%03d" +msgstr "T.I.M.E.: %3D.:%02D.:%03D." + +#: melystrackinfo.m:157 msgid "Name" msgstr "N.A.M.E." -#: melystrackinfo.m:155 +#: melystrackinfo.m:158 msgid "Prog" msgstr "P.R.O.G." -#: melystrackinfo.m:156 +#: melystrackinfo.m:159 msgid "C" msgstr "C." -#: melystrackinfo.m:157 +#: melystrackinfo.m:160 msgid "Mute" msgstr "M.U.T.E." -#: melystrackinfo.m:158 +#: melystrackinfo.m:161 msgid "Solo" msgstr "S.O.L.O." -#: melystrackinfo.m:159 +#: melystrackinfo.m:162 msgid "Rec" msgstr "R.E.C." -#: melystrackinfo.m:168 +#: melystrackinfo.m:171 msgid "_Add track" msgstr "_A.D.D. T.R.A.C.K." -#: melystrackinfo.m:168 +#: melystrackinfo.m:171 msgid "Add a track below this one" msgstr "A.D.D. A. T.R.A.C.K. B.E.L.O.W. T.H.I.S. O.N.E." -#: melystrackinfo.m:173 +#: melystrackinfo.m:176 msgid "_Delete track" msgstr "_D.E.L.E.T.E. T.R.A.C.K." -#: melystrackinfo.m:174 +#: melystrackinfo.m:177 msgid "Delete all selected or this track" msgstr "D.E.L.E.T.E. A.L.L. S.E.L.E.C.T.E.D. O.R. T.H.I.S. T.R.A.C.K." -#: melystrackinfo.m:179 +#: melystrackinfo.m:182 msgid "Delete _empty" msgstr "D.E.L.E.T.E. _E.M.P.T.Y." -#: melystrackinfo.m:186 +#: melystrackinfo.m:189 msgid "_Piano roll view" msgstr "_P.I.A.N.O. R.O.L.L. V.I.E.W." -#: melystrackinfo.m:187 +#: melystrackinfo.m:190 msgid "Open a new piano roll view for this track" msgstr "O.P.E.N. A. N.E.W. P.I.A.N.O. R.O.L.L. V.I.E.W. F.O.R. T.H.I.S. T.R.A.C.K." -#: melystrackinfo.m:192 +#: melystrackinfo.m:195 msgid "_Tempomap view" msgstr "_T.E.M.P.O.M.A.P. V.I.E.W." -#: melystrackinfo.m:193 +#: melystrackinfo.m:196 msgid "Open a view of the tempo, time and key signatures for this track" msgstr "O.P.E.N. A. V.I.E.W. O.F. T.H.E. T.E.M.P.O., T.I.M.E. A.N.D. K.E.Y. S.I.G.N.A.T.U.R.E.S. F.O.R. T.H.I.S. T.R.A.C.K." -#: melystrackinfo.m:202 +#: melystrackinfo.m:205 msgid "Bring up the track properties dialog" msgstr "B.R.I.N.G. U.P. T.H.E. T.R.A.C.K. P.R.O.P.E.R.T.I.E.S. D.I.A.L.O.G." -#: melystrackinfo.m:836 +#: melystrackinfo.m:839 #, c-format msgid "Track %d" msgstr "T.R.A.C.K. %d" -#: melystrackinfo.m:907 +#: melystrackinfo.m:910 #, c-format msgid "" "Internal error.\n" @@ -593,19 +620,19 @@ "T.H.E.R.E. I.S. A. M.I.S.S.I.N.G. C.A.S.E. I.N. D.R.A.W._C.O.L._B.U.T.T.O.N.\n" "V.A.L.U.E. W.A.S. %d\n" -#: viewcontrol.m:271 +#: viewcontrol.m:256 msgid "Increase vertical scale" msgstr "I.N.C.R.E.A.S.E. V.E.R.T.I.C.A.L. S.C.A.L.E." -#: viewcontrol.m:272 +#: viewcontrol.m:257 msgid "Decrease vertical scale" msgstr "D.E.C.R.E.A.S.E. V.E.R.T.I.C.A.L. S.C.A.L.E." -#: viewcontrol.m:282 +#: viewcontrol.m:267 msgid "Increase horizontal scale" msgstr "I.N.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.L. S.C.A.L.E." -#: viewcontrol.m:283 +#: viewcontrol.m:268 msgid "Decrease horizontail scale" msgstr "D.E.C.R.E.A.S.E. H.O.R.I.Z.O.N.T.A.I.L. S.C.A.L.E." @@ -618,9 +645,6 @@ #~ "P.R.O.P.E.R.T.I.E.S. O.F. T.H.E. T.R.A.C.K. S.U.C.H. A.S. " #~ "I.N.S.T.R.U.M.E.N.T. A.N.D. M.I.D.I. C.H.A.N.N.E.L.. Y.O.U. C.A.N. A.L.S.O. " #~ "A.D.D. A.N.D. D.E.L.E.T.E. T.R.A.C.K.S. F.R.O.M. T.H.I.S. M.E.N.U." - -#~ msgid "The Melys sequencer" -#~ msgstr "T.H.E. M.E.L.Y.S. S.E.Q.U.E.N.C.E.R." #~ msgid "Track: %s" #~ msgstr "T.R.A.C.K.: %s" diff -rNu melys-0.1.11/util/util.c melys-0.1.12/util/util.c --- melys-0.1.11/util/util.c Tue Dec 7 15:00:05 1999 +++ melys-0.1.12/util/util.c Tue Dec 14 18:07:31 1999 @@ -58,3 +58,42 @@ fprintf(stderr, "\n"); #endif } + +/* + * Return a text representation of a note given the midi note + * number. There are different naming schemes around, this + * one gives C0 for note 0. This result will be of the form G4, C#3 + * etc. + * + * Arguments: + * note - Note number + */ +char * +note_name(int note) +{ + char *note_names = "CCDDEFFGGAAB"; + char *sharps = " # # # # # "; + GString *s; + char ch; + char *octave; + char *ret; + + /* Base note */ + s = g_string_new(""); + g_string_append_c(s, note_names[note % 12]); + + /* Add a sharp sign if needed */ + ch = sharps[note % 12]; + if (ch == '#') + g_string_append_c(s, '#'); + + /* Add the octave number */ + octave = g_strdup_printf("%d", note/12); + g_string_append(s, octave); + g_free(octave); + + ret = s->str; + g_string_free(s, 0); + + return ret; +} diff -rNu melys-0.1.11/util/util.m melys-0.1.12/util/util.m --- melys-0.1.11/util/util.m Sat Nov 27 11:43:23 1999 +++ melys-0.1.12/util/util.m Tue Dec 14 16:49:04 1999 @@ -137,3 +137,39 @@ va_end (args); fprintf(stderr, "\n"); #endif + + +>>function note_name +char * +int note; // Note number +>>description +Return a text representation of a note given the midi note +number. +There are different naming schemes around, this one gives C0 for note 0. +This result will be of the form G4, C#3 etc. +>>code + char *note_names = "CCDDEFFGGAAB"; + char *sharps = " # # # # # "; + GString *s; + char ch; + char *octave; + char *ret; + + /* Base note */ + s = g_string_new(""); + g_string_append_c(s, note_names[note % 12]); + + /* Add a sharp sign if needed */ + ch = sharps[note % 12]; + if (ch == '#') + g_string_append_c(s, '#'); + + /* Add the octave number */ + octave = g_strdup_printf("%d", note/12); + g_string_append(s, octave); + g_free(octave); + + ret = s->str; + g_string_free(s, 0); + + return ret; diff -rNu melys-0.1.11/version melys-0.1.12/version --- melys-0.1.11/version Tue Dec 7 14:59:16 1999 +++ melys-0.1.12/version Tue Dec 14 18:03:04 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.11" +#define MELYS_VERSION_STRING "0.1.12" diff -rNu melys-0.1.11/widgets/Makefile melys-0.1.12/widgets/Makefile --- melys-0.1.11/widgets/Makefile Tue Dec 7 14:59:58 1999 +++ melys-0.1.12/widgets/Makefile Tue Dec 14 18:07:24 1999 @@ -124,10 +124,12 @@ melyskeysig.o: ../include/melysscroll.h melyskeysig.o: ../include/melyssig.h melyskeysig.o: ../include/melyskeysig.h +melyspiano.o: ../include/melmsg.h melyspiano.o: ../include/elements.h melyspiano.o: ../include/md.h melyspiano.o: ../include/viewcontrol.h melyspiano.o: ../include/melwidgets.h +melyspiano.o: ../include/melysscroll.h melyspiano.o: ../include/melysview.h melyspiano.o: ../include/melyskeys.h melyspiano.o: ../include/melyspiano.h @@ -182,12 +184,14 @@ melystrackinfo.o: ../include/md.h melystrackinfo.o: ../include/song.h melystrackinfo.o: ../include/viewcontrol.h +melystrackinfo.o: ../include/melysscroll.h melystrackinfo.o: ../include/melysview.h -melystrackinfo.o: ../include/melyspiano.h melystrackinfo.o: ../include/melystempo.h +melystrackinfo.o: ../include/melyspiano.h melystrackinfo.o: ../include/melystrackinfo.h melystrackinfo.o: ../include/melystrack.h melyskeys.o: ../include/viewcontrol.h +melyskeys.o: ../include/melysscroll.h melyskeys.o: ../include/melyskeys.h melyspos.o: ../include/elements.h melyspos.o: ../include/md.h @@ -195,6 +199,7 @@ melysscale.o: ../include/viewcontrol.h melysscale.o: ../include/melysscroll.h melysscale.o: ../include/melysscale.h +melystempo.o: ../include/melmsg.h melystempo.o: ../include/elements.h melystempo.o: ../include/md.h melystempo.o: ../include/melwidgets.h diff -rNu melys-0.1.11/widgets/melyskeys.c melys-0.1.12/widgets/melyskeys.c --- melys-0.1.11/widgets/melyskeys.c Tue Dec 7 15:00:07 1999 +++ melys-0.1.12/widgets/melyskeys.c Tue Dec 14 18:07:33 1999 @@ -22,6 +22,7 @@ #include "libgnomeui/gnome-canvas-rect-ellipse.h" #include "libgnomeui/gnome-canvas-text.h" #include "viewcontrol.h" +#include "melysscroll.h" #include "melyskeys.h" #include "intl.h" @@ -276,7 +277,7 @@ * _mkeys - This will be our widget */ void -melys_keys_highlight(GtkWidget *mview, int thing, gpointer _mkeys) +melys_keys_highlight(GtkWidget *mview, int tick, int thing, gpointer _mkeys) { MelysKeys *mkeys = _mkeys; struct keystate *ksp; diff -rNu melys-0.1.11/widgets/melyskeys.m melys-0.1.12/widgets/melyskeys.m --- melys-0.1.11/widgets/melyskeys.m Sun Nov 28 14:12:55 1999 +++ melys-0.1.12/widgets/melyskeys.m Tue Dec 14 16:51:29 1999 @@ -18,6 +18,7 @@ >>header libgnomeui/gnome-canvas-text.h >>header viewcontrol.h +>>header melysscroll.h >>gtkobject melys_keys melys_scroll @@ -40,8 +41,6 @@ #define NLABELS ((NKEYS+12)/12) -#include "melysscroll.h" - /* * The MelysKeys structure. Each instance of the class is * allocated one of these structures. @@ -58,7 +57,7 @@ * allocated for the class. */ struct _MelysKeysClass { - GnomeCanvasClass parent_class; + MelysScrollClass parent_class; void (*key_pressed)(MelysKeys *, int); }; @@ -269,6 +268,7 @@ >>function melys_keys_highlight void GtkWidget *mview; +int tick; int thing; The key to highlight gpointer _mkeys; This will be our widget diff -rNu melys-0.1.11/widgets/melyspiano.c melys-0.1.12/widgets/melyspiano.c --- melys-0.1.11/widgets/melyspiano.c Tue Dec 7 15:00:08 1999 +++ melys-0.1.12/widgets/melyspiano.c Tue Dec 14 18:07:34 1999 @@ -35,10 +35,12 @@ #include "libgnomeui/gnome-canvas.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" #include "libgnomeui/gnome-canvas-util.h" +#include "melmsg.h" #include "elements.h" #include "md.h" #include "viewcontrol.h" #include "melwidgets.h" +#include "melysscroll.h" #include "melysview.h" #include "melyskeys.h" #include "melyspiano.h" @@ -69,6 +71,7 @@ static void piano_realize(GtkWidget *w); static int get_nthing(MelysView *mview, struct element *el); static gboolean drop_elem(MelysView *mview, struct element *elem, int nthing); +static void piano_pos_changed(MelysView *mview, int tick, int thing); static MelysViewClass *parent_class = NULL; @@ -183,6 +186,7 @@ /* The keyboard */ mkeys = melys_keys_new(mview->vcp); + melys_view_add_scroll(mview, MELYS_SCROLL(mkeys)); invis = gtk_label_new(""); frame2 = gtk_frame_new(NULL); @@ -212,7 +216,7 @@ mview->vthings = NKEYS; /* There are NKEYS midi notes */ - gtk_signal_connect(GTK_OBJECT(mview), "thing-position", + gtk_signal_connect(GTK_OBJECT(mview), "position-change", melys_keys_highlight, mkeys); } @@ -241,6 +245,7 @@ melys_view_class->scale_changed = piano_scale_changed; melys_view_class->get_nthing = get_nthing; melys_view_class->drop_elem = drop_elem; + melys_view_class->position_change = piano_pos_changed; } /* @@ -457,4 +462,20 @@ } return TRUE; +} + +static void +piano_pos_changed(MelysView *mview, int tick, int thing) +{ + char *msg; + struct mbt mbt; + + if (tick < 0) + return; + md_tick_to_mbt(mview->tempomap, tick, &mbt); + msg = g_strdup_printf(_("Note: %3s Time: %3d:%02d:%03d"), + note_name(thing_to_note(thing)), mbt.bars+1, mbt.beats+1, mbt.ticks); + mel_status_msg(mview->song, msg); + + g_free(msg); } diff -rNu melys-0.1.11/widgets/melyspiano.m melys-0.1.12/widgets/melyspiano.m --- melys-0.1.11/widgets/melyspiano.m Tue Dec 7 14:13:21 1999 +++ melys-0.1.12/widgets/melyspiano.m Tue Dec 14 17:49:32 1999 @@ -26,11 +26,13 @@ >>header libgnomeui/gnome-canvas-rect-ellipse.h >>header libgnomeui/gnome-canvas-util.h +>>header melmsg.h >>header elements.h >>header md.h >>header viewcontrol.h >>header melwidgets.h +>>header melysscroll.h >>header melysview.h >>header melyskeys.h @@ -149,6 +151,7 @@ /* The keyboard */ mkeys = melys_keys_new(mview->vcp); + melys_view_add_scroll(mview, MELYS_SCROLL(mkeys)); invis = gtk_label_new(""); frame2 = gtk_frame_new(NULL); @@ -178,7 +181,7 @@ mview->vthings = NKEYS; /* There are NKEYS midi notes */ - gtk_signal_connect(GTK_OBJECT(mview), "thing-position", + gtk_signal_connect(GTK_OBJECT(mview), "position-change", melys_keys_highlight, mkeys); @@ -206,6 +209,7 @@ melys_view_class->scale_changed = piano_scale_changed; melys_view_class->get_nthing = get_nthing; melys_view_class->drop_elem = drop_elem; + melys_view_class->position_change = piano_pos_changed; >>function piano_scale_changed @@ -445,3 +449,23 @@ } return TRUE; + + +>>function piano_pos_changed +static void +MelysView *mview; +int tick; +int thing; + +>>code + char *msg; + struct mbt mbt; + + if (tick < 0) + return; + md_tick_to_mbt(mview->tempomap, tick, &mbt); + msg = g_strdup_printf(_("Note: %3s Time: %3d:%02d:%03d"), + note_name(thing_to_note(thing)), mbt.bars+1, mbt.beats+1, mbt.ticks); + mel_status_msg(mview->song, msg); + + g_free(msg); diff -rNu melys-0.1.11/widgets/melysscroll.c melys-0.1.12/widgets/melysscroll.c --- melys-0.1.11/widgets/melysscroll.c Tue Dec 7 15:00:09 1999 +++ melys-0.1.12/widgets/melysscroll.c Tue Dec 14 18:07:35 1999 @@ -31,20 +31,26 @@ /* The list of signal id's that are being added for MelysScroll. */ enum { SCALE_CHANGED, + POSITION_CHANGE, LAST_SIGNAL }; +#define x_to_tick(ms, x) view_control_x_to_tick( \ + ms->vcp, x) #define tick_to_x(ms, tick) view_control_tick_to_x( \ ms->vcp, tick) +#define y_to_thing(ms, n) view_control_y_to_thing( \ + ms->vcp, n); /* Static functions */ -static void melys_scroll_init(MelysScroll *XXX); +static void melys_scroll_init(MelysScroll *mscroll); static void melys_scroll_class_init(MelysScrollClass *klass); static void scroll_destroy(GtkObject *obj); static void scroll_scroll(GtkAdjustment *adj, gpointer data); static void vcp_scale_changed(ViewControl *vcp, gpointer data); static void vcp_adj_changed(GtkAdjustment *adj, gpointer data); static void scroll_set_region(MelysScroll *mscroll); +static int canvas_event(GtkWidget *w, GdkEvent *event, gpointer data); static GnomeCanvasClass *parent_class = NULL; @@ -101,12 +107,14 @@ * Initialise the MelysScroll. * * Arguments: - * XXX - The MelysScroll to init + * mscroll - The MelysScroll to init */ static void -melys_scroll_init(MelysScroll *XXX) +melys_scroll_init(MelysScroll *mscroll) { + gtk_signal_connect(GTK_OBJECT(mscroll), "event", + GTK_SIGNAL_FUNC(canvas_event), NULL); } /* @@ -133,6 +141,15 @@ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0 ); + melys_scroll_signals[POSITION_CHANGE] = gtk_signal_new("position-change", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysScrollClass, position_change), + gtk_marshal_NONE__INT_INT, + GTK_TYPE_NONE, 2, + GTK_TYPE_INT, + GTK_TYPE_INT + ); gtk_object_class_add_signals(object_class, melys_scroll_signals, LAST_SIGNAL); @@ -140,13 +157,17 @@ object_class->destroy = scroll_destroy; klass->scale_changed = NULL; + klass->position_change = NULL; } /* * Set the controls for this view. * * Arguments: - * vcp - if (vcp) + * vcp - The view control to set + * which - Horizontal/Vertical + * width - Width if fixed + * height - Height if fixed */ void melys_scroll_set_control(MelysScroll *mscroll, ViewControl *vcp, int which, @@ -284,4 +305,63 @@ scroll_scroll(vcp->vadj, mscroll); mscroll->hoffset = -1; scroll_scroll(vcp->hadj, mscroll); +} + +/* + * An event on the canvas. Events appear to come here first, + * must return false to allow the items to see them. + * + * Arguments: + * w - The scroll + * event - The event + * data - Not used + */ +static int +canvas_event(GtkWidget *w, GdkEvent *event, gpointer data) +{ + MelysScroll *mscroll = MELYS_SCROLL(w); + ticktime_t tick; + int thing; + double dx, dy; + int x, y; + + gnome_canvas_window_to_world(GNOME_CANVAS(mscroll), + (double) event->motion.x, event->motion.y, + &dx, &dy); + + x = dx; y = dy; + + switch (event->type) { + case GDK_ENTER_NOTIFY: + if (!GTK_WIDGET_HAS_FOCUS(mscroll)) + gtk_widget_grab_focus(GTK_WIDGET(mscroll)); + break; + + case GDK_LEAVE_NOTIFY: + x = -1; y = -1; + goto sendnone; + + case GDK_MOTION_NOTIFY: + sendnone: + tick = thing = -1; + if (mscroll->which & VC_HORIZONTAL) + tick = (x<0)? -1: x_to_tick(mscroll, x); + if (mscroll->which & VC_VERTICAL) + thing = (y<0)? -1: y_to_thing(mscroll, y); + if (tick != mscroll->mouse_tick || thing != mscroll->mouse_thing) { + mscroll->mouse_tick = tick; + mscroll->mouse_thing = thing; + gtk_signal_emit(GTK_OBJECT(mscroll), + melys_scroll_signals[POSITION_CHANGE], tick, thing); + } + break; + + //case GDK_KEY_PRESS: + // return key_press(mscroll, NULL, &event->key); + + default: + break; + } + + return FALSE; } diff -rNu melys-0.1.11/widgets/melysscroll.m melys-0.1.12/widgets/melysscroll.m --- melys-0.1.11/widgets/melysscroll.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.12/widgets/melysscroll.m Tue Dec 14 16:52:18 1999 @@ -39,6 +39,10 @@ int voffset; /* Previous veritcal offset */ int hoffset; /* Previous horizontal offset */ + /* Previous mouse positions */ + int mouse_thing; + int mouse_tick; + /* Base offset of zero point */ int hbase; @@ -54,6 +58,9 @@ /* A scale change */ void (*scale_changed)(MelysScroll *); + + /* Mouse moved */ + void (*position_change)(MelysScroll *, int, int); }; @@ -62,11 +69,16 @@ /* The list of signal id's that are being added for MelysScroll. */ enum { SCALE_CHANGED, + POSITION_CHANGE, LAST_SIGNAL }; +#define x_to_tick(ms, x) view_control_x_to_tick( \ + ms->vcp, x) #define tick_to_x(ms, tick) view_control_tick_to_x( \ ms->vcp, tick) +#define y_to_thing(ms, n) view_control_y_to_thing( \ + ms->vcp, n); >>function melys_scroll_new GtkWidget * @@ -86,13 +98,17 @@ return GTK_WIDGET(mscroll); + >>function melys_scroll_init static void -MelysScroll *XXX; The MelysScroll to init +MelysScroll *mscroll; The MelysScroll to init >>description Initialise the MelysScroll. >>code + gtk_signal_connect(GTK_OBJECT(mscroll), "event", + GTK_SIGNAL_FUNC(canvas_event), NULL); + >>function melys_scroll_class_init static void @@ -117,6 +133,15 @@ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0 ); + melys_scroll_signals[POSITION_CHANGE] = gtk_signal_new("position-change", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysScrollClass, position_change), + gtk_marshal_NONE__INT_INT, + GTK_TYPE_NONE, 2, + GTK_TYPE_INT, + GTK_TYPE_INT + ); gtk_object_class_add_signals(object_class, melys_scroll_signals, LAST_SIGNAL); @@ -124,15 +149,16 @@ object_class->destroy = scroll_destroy; klass->scale_changed = NULL; + klass->position_change = NULL; >>function melys_scroll_set_control void MelysScroll *mscroll; -ViewControl *vcp; if (vcp) -int which; -int width; -int height; +ViewControl *vcp; The view control to set +int which; Horizontal/Vertical +int width; Width if fixed +int height; Height if fixed >>description Set the controls for this view. @@ -280,4 +306,62 @@ scroll_scroll(vcp->vadj, mscroll); mscroll->hoffset = -1; scroll_scroll(vcp->hadj, mscroll); + +>>function canvas_event +static int +GtkWidget *w; The scroll +GdkEvent *event; The event +gpointer data; Not used + +>>description +An event on the canvas. +Events appear to come here first, must return false to +allow the items to see them. + +>>code + MelysScroll *mscroll = MELYS_SCROLL(w); + ticktime_t tick; + int thing; + double dx, dy; + int x, y; + + gnome_canvas_window_to_world(GNOME_CANVAS(mscroll), + (double) event->motion.x, event->motion.y, + &dx, &dy); + + x = dx; y = dy; + + switch (event->type) { + case GDK_ENTER_NOTIFY: + if (!GTK_WIDGET_HAS_FOCUS(mscroll)) + gtk_widget_grab_focus(GTK_WIDGET(mscroll)); + break; + + case GDK_LEAVE_NOTIFY: + x = -1; y = -1; + goto sendnone; + + case GDK_MOTION_NOTIFY: + sendnone: + tick = thing = -1; + if (mscroll->which & VC_HORIZONTAL) + tick = (x<0)? -1: x_to_tick(mscroll, x); + if (mscroll->which & VC_VERTICAL) + thing = (y<0)? -1: y_to_thing(mscroll, y); + if (tick != mscroll->mouse_tick || thing != mscroll->mouse_thing) { + mscroll->mouse_tick = tick; + mscroll->mouse_thing = thing; + gtk_signal_emit(GTK_OBJECT(mscroll), + melys_scroll_signals[POSITION_CHANGE], tick, thing); + } + break; + + //case GDK_KEY_PRESS: + // return key_press(mscroll, NULL, &event->key); + + default: + break; + } + + return FALSE; diff -rNu melys-0.1.11/widgets/melystempo.c melys-0.1.12/widgets/melystempo.c --- melys-0.1.11/widgets/melystempo.c Tue Dec 7 15:00:10 1999 +++ melys-0.1.12/widgets/melystempo.c Tue Dec 14 18:07:36 1999 @@ -31,6 +31,7 @@ #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-line.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "melmsg.h" #include "elements.h" #include "md.h" #include "melwidgets.h" @@ -85,6 +86,7 @@ static int tempo_get_nthing(MelysView *mview, struct element *el); static gboolean tempo_drop_elem(MelysView *mview, struct element *elem, int nthing); +static void tempo_pos_change(MelysView *mview, int tick, int thing); static MelysViewClass *parent_class = NULL; @@ -260,6 +262,7 @@ melys_view_class->scale_changed = tempo_scale_changed; melys_view_class->get_nthing = tempo_get_nthing; melys_view_class->drop_elem = tempo_drop_elem; + melys_view_class->position_change = tempo_pos_change; } static void @@ -510,4 +513,20 @@ md_add_sort(mview->viewcon, elem); return TRUE; +} + +static void +tempo_pos_change(MelysView *mview, int tick, int thing) +{ + char *msg; + struct mbt mbt; + + if (tick < 0) + return; + md_tick_to_mbt(mview->tempomap, tick, &mbt); + msg = g_strdup_printf(_("Tempo: %3d Time: %3d:%02d:%03d"), + thing_to_bpm(thing), mbt.bars+1, mbt.beats+1, mbt.ticks); + mel_status_msg(mview->song, msg); + + g_free(msg); } diff -rNu melys-0.1.11/widgets/melystempo.m melys-0.1.12/widgets/melystempo.m --- melys-0.1.11/widgets/melystempo.m Thu Dec 2 17:19:52 1999 +++ melys-0.1.12/widgets/melystempo.m Tue Dec 14 17:49:32 1999 @@ -23,6 +23,7 @@ >>header libgnomeui/gnome-canvas-line.h >>header libgnomeui/gnome-canvas-rect-ellipse.h +>>header melmsg.h >>header elements.h >>header md.h >>header melwidgets.h @@ -232,6 +233,7 @@ melys_view_class->scale_changed = tempo_scale_changed; melys_view_class->get_nthing = tempo_get_nthing; melys_view_class->drop_elem = tempo_drop_elem; + melys_view_class->position_change = tempo_pos_change; >>function tempo_realize @@ -500,3 +502,22 @@ md_add_sort(mview->viewcon, elem); return TRUE; + +>>function tempo_pos_change +static void +MelysView *mview; +int tick; +int thing; + +>>code + char *msg; + struct mbt mbt; + + if (tick < 0) + return; + md_tick_to_mbt(mview->tempomap, tick, &mbt); + msg = g_strdup_printf(_("Tempo: %3d Time: %3d:%02d:%03d"), + thing_to_bpm(thing), mbt.bars+1, mbt.beats+1, mbt.ticks); + mel_status_msg(mview->song, msg); + + g_free(msg); diff -rNu melys-0.1.11/widgets/melystrackdisplay.c melys-0.1.12/widgets/melystrackdisplay.c --- melys-0.1.11/widgets/melystrackdisplay.c Tue Dec 7 15:00:10 1999 +++ melys-0.1.12/widgets/melystrackdisplay.c Tue Dec 14 18:07:37 1999 @@ -125,6 +125,7 @@ static int disp_get_nthing(MelysView *mview, struct element *elem); static gboolean disp_drop_elem(MelysView *mview, struct element *elem, int nthing); +static void disp_pos_change(MelysView *mview, int tick, int thing); static MelysViewClass *parent_class = NULL; @@ -269,6 +270,7 @@ view_class->get_nthing = disp_get_nthing; view_class->drop_elem = disp_drop_elem; view_class->get_base_from_pos = disp_get_base; + view_class->position_change = disp_pos_change; } void @@ -554,7 +556,7 @@ ticktime_t t; t = mview->click_tick; - t = md_snap_tick(mview->tempomap, t, mview->snap); + t = md_snap_tick(mview->tempomap, mview->snap, t); part = MD_PART(mview->click_elem); track = MD_TRACK(mview->click_base); @@ -717,4 +719,20 @@ return FALSE; return TRUE; +} + +static void +disp_pos_change(MelysView *mview, int tick, int thing) +{ + char *msg; + struct mbt mbt; + + if (tick < 0) + return; + md_tick_to_mbt(mview->tempomap, tick, &mbt); + msg = g_strdup_printf(_("Time: %3d:%02d:%03d"), + mbt.bars+1, mbt.beats+1, mbt.ticks); + mel_status_msg(mview->song, msg); + + g_free(msg); } diff -rNu melys-0.1.11/widgets/melystrackdisplay.m melys-0.1.12/widgets/melystrackdisplay.m --- melys-0.1.11/widgets/melystrackdisplay.m Tue Dec 7 14:16:45 1999 +++ melys-0.1.12/widgets/melystrackdisplay.m Tue Dec 14 17:49:32 1999 @@ -237,6 +237,7 @@ view_class->get_nthing = disp_get_nthing; view_class->drop_elem = disp_drop_elem; view_class->get_base_from_pos = disp_get_base; + view_class->position_change = disp_pos_change; >>function melys_track_display_set_md_root @@ -540,7 +541,7 @@ ticktime_t t; t = mview->click_tick; - t = md_snap_tick(mview->tempomap, t, mview->snap); + t = md_snap_tick(mview->tempomap, mview->snap, t); part = MD_PART(mview->click_elem); track = MD_TRACK(mview->click_base); @@ -729,3 +730,22 @@ return FALSE; return TRUE; + +>>function disp_pos_change +static void +MelysView *mview; +int tick; +int thing; + +>>code + char *msg; + struct mbt mbt; + + if (tick < 0) + return; + md_tick_to_mbt(mview->tempomap, tick, &mbt); + msg = g_strdup_printf(_("Time: %3d:%02d:%03d"), + mbt.bars+1, mbt.beats+1, mbt.ticks); + mel_status_msg(mview->song, msg); + + g_free(msg); diff -rNu melys-0.1.11/widgets/melystrackinfo.c melys-0.1.12/widgets/melystrackinfo.c --- melys-0.1.11/widgets/melystrackinfo.c Tue Dec 7 15:00:11 1999 +++ melys-0.1.12/widgets/melystrackinfo.c Tue Dec 14 18:07:37 1999 @@ -42,9 +42,11 @@ #include "md.h" #include "song.h" #include "viewcontrol.h" +#include "libgnomeui/gnome-canvas.h" +#include "melysscroll.h" #include "melysview.h" -#include "melyspiano.h" #include "melystempo.h" +#include "melyspiano.h" #include "melystrackinfo.h" #include "melystrack.h" #include "intl.h" @@ -1584,11 +1586,11 @@ void create_piano(struct song *song, struct containerElement *con) { - MelysPiano *mp; + GtkWidget *mp; - mp = (MelysPiano *)melys_piano_new(con); + mp = melys_piano_new(con); melys_view_set_song(MELYS_VIEW(mp), song); - mel_add_view(song->mdi, song->child, GTK_WIDGET(mp), 0); + mel_add_view(song->mdi, song->child, mp, 0); } static void @@ -1599,17 +1601,20 @@ create_tempo(minfo->song); } +/* + * This does not belong here. Create a tempo view. + */ static void create_tempo(struct song *song) { - MelysTempo *mtempo; + GtkWidget *mtempo; struct tempomapElement *tmap; tmap = md_get_tempomap(song->mdroot); - mtempo = (MelysTempo *)melys_tempo_new(tmap); + mtempo = melys_tempo_new(tmap); melys_view_set_song(MELYS_VIEW(mtempo), song); - mel_add_view(song->mdi, song->child, GTK_WIDGET(mtempo), 0); + mel_add_view(song->mdi, song->child, mtempo, 0); } static void diff -rNu melys-0.1.11/widgets/melystrackinfo.m melys-0.1.12/widgets/melystrackinfo.m --- melys-0.1.11/widgets/melystrackinfo.m Tue Dec 7 14:16:19 1999 +++ melys-0.1.12/widgets/melystrackinfo.m Tue Dec 14 15:07:02 1999 @@ -34,9 +34,12 @@ >>header md.h >>header song.h >>header viewcontrol.h +>># Try to remove these elsewhere +>>header libgnomeui/gnome-canvas.h +>>header melysscroll.h >>header melysview.h ->>header melyspiano.h >>header melystempo.h +>>header melyspiano.h >>gtkobject melys_track_info gtk_widget @@ -1647,11 +1650,11 @@ struct containerElement *con; >>code - MelysPiano *mp; + GtkWidget *mp; - mp = (MelysPiano *)melys_piano_new(con); + mp = melys_piano_new(con); melys_view_set_song(MELYS_VIEW(mp), song); - mel_add_view(song->mdi, song->child, GTK_WIDGET(mp), 0); + mel_add_view(song->mdi, song->child, mp, 0); >>function tempo_cb @@ -1669,15 +1672,18 @@ static void struct song *song; +>>description +This does not belong here. +Create a tempo view. >>code - MelysTempo *mtempo; + GtkWidget *mtempo; struct tempomapElement *tmap; tmap = md_get_tempomap(song->mdroot); - mtempo = (MelysTempo *)melys_tempo_new(tmap); + mtempo = melys_tempo_new(tmap); melys_view_set_song(MELYS_VIEW(mtempo), song); - mel_add_view(song->mdi, song->child, GTK_WIDGET(mtempo), 0); + mel_add_view(song->mdi, song->child, mtempo, 0); >>function props_cb diff -rNu melys-0.1.11/widgets/melysview.c melys-0.1.12/widgets/melysview.c --- melys-0.1.11/widgets/melysview.c Tue Dec 7 15:00:12 1999 +++ melys-0.1.12/widgets/melysview.c Tue Dec 14 18:07:38 1999 @@ -23,6 +23,7 @@ #include "except.h" #include "util.h" #include "gdk_imlib.h" +#include "gdk/gdkkeysyms.h" #include "gtk/gtkvbox.h" #include "gtk/gtkadjustment.h" #include "gtk/gtkdnd.h" @@ -53,8 +54,7 @@ /* The list of signal id's that are being added for MelysView. */ enum { SCALE_CHANGED, - THING_POSITION, - TICK_POSITION, + POSITION_CHANGE, LAST_SIGNAL }; @@ -101,6 +101,8 @@ static void melys_view_class_init(MelysViewClass *klass); static void view_destroy(GtkObject *obj); static void view_draw(GtkWidget *widget, GdkRectangle *area); +static void view_pos_change(MelysScroll *mscroll, int tick, int thing, + gpointer data); static int canvas_event(GtkWidget *w, GdkEvent *event, gpointer data); static void button_press(MelysView *mview, struct element *elem, GdkEventButton *event); @@ -108,6 +110,9 @@ GdkEventButton *event); static void button_motion(MelysView *mview, struct element *elem, GdkEventMotion *event); +static int key_press(MelysView *mview, struct element *el, + GdkEventKey *kevent); +static void delete_selected(MelysView *mview); static void set_hscroll(MelysView *mview); static void set_vscroll(MelysView *mview); static void song_pos_cb(GtkAdjustment *adj, gpointer data); @@ -127,7 +132,7 @@ GtkSelectionData *selection_data, guint info, guint time, gpointer data); static void drag_data_received(GtkWidget *widget, GdkDragContext *context, - gint wx, gint wy, GtkSelectionData *data, guint info, guint time, + gint x, gint y, GtkSelectionData *data, guint info, guint time, gpointer user_data); static void outline_data_free(gpointer data); static void drag_end(GtkWidget *widget, GdkDragContext *drag_context, @@ -217,6 +222,7 @@ mview->canvas = GTK_WIDGET(canvas); gtk_widget_ref(mview->canvas); + melys_view_add_scroll(mview, MELYS_SCROLL(mview->canvas)); mview->posline = (GtkWidget *)gnome_canvas_item_new( gnome_canvas_root(canvas), @@ -275,20 +281,13 @@ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0 ); - melys_view_signals[THING_POSITION] = gtk_signal_new("thing-position", - GTK_RUN_FIRST|GTK_RUN_NO_RECURSE, - object_class->type, - GTK_SIGNAL_OFFSET(MelysViewClass, thing_position), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT - ); - melys_view_signals[TICK_POSITION] = gtk_signal_new("tick-position", + melys_view_signals[POSITION_CHANGE] = gtk_signal_new("position-change", GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET(MelysViewClass, tick_position), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, + GTK_SIGNAL_OFFSET(MelysViewClass, position_change), + gtk_marshal_NONE__INT_INT, + GTK_TYPE_NONE, 2, + GTK_TYPE_INT, GTK_TYPE_INT ); @@ -403,6 +402,35 @@ } /* + * Associate the specified mscroll widget with this mview + * widget. The relevant position change signals are + * connected to our own position change signal. + * + * Arguments: + * mscroll - Scrolling widget to add + */ +void +melys_view_add_scroll(MelysView *mview, MelysScroll *mscroll) +{ + + gtk_signal_connect(GTK_OBJECT(mscroll), "position-change", + view_pos_change, mview); +} + +static void +view_pos_change(MelysScroll *mscroll, int tick, int thing, gpointer data) +{ + MelysView *mview = MELYS_VIEW(data); + + if (tick != mview->mouse_tick || thing != mview->mouse_thing) { + mview->mouse_tick = tick; + mview->mouse_thing = thing; + gtk_signal_emit(GTK_OBJECT(mview), + melys_view_signals[POSITION_CHANGE], tick, thing); + } +} + +/* * An event on the canvas. Events appear to come here first, * must return false to allow the items to see them. */ @@ -410,7 +438,6 @@ canvas_event(GtkWidget *w, GdkEvent *event, gpointer data) { MelysView *mview = MELYS_VIEW(data); - int thing; double dx, dy; int x, y; @@ -421,25 +448,10 @@ x = dx; y = dy; switch (event->type) { - case GDK_LEAVE_NOTIFY: - x = -1; y = -1; - goto sendnone; - case GDK_MOTION_NOTIFY: - sendnone: - if (x != mview->mouse_tick) { - mview->mouse_tick = x; - gtk_signal_emit(GTK_OBJECT(mview), - melys_view_signals[TICK_POSITION], x); - } + case GDK_KEY_PRESS: + return key_press(mview, NULL, &event->key); - thing = (y<0)? -1: y_to_thing(mview, y); - if (thing != mview->mouse_thing) { - mview->mouse_tick = thing; - gtk_signal_emit(GTK_OBJECT(mview), - melys_view_signals[THING_POSITION], thing); - } - break; default: break; } @@ -497,6 +509,10 @@ if (event->motion.state & ALL_BUTTON_MASK) button_motion(mview, elem, &event->motion); break; + + case GDK_KEY_PRESS: + return key_press(mview, elem, &event->key); + default: break; } @@ -615,6 +631,44 @@ } } +static int +key_press(MelysView *mview, struct element *el, GdkEventKey *kevent) +{ + + switch (kevent->keyval) { + case GDK_Delete: + delete_selected(mview); + break; + default: + return FALSE; + } + + return TRUE; +} + +static void +delete_selected(MelysView *mview) +{ + GSList *list; + GSList *li; + + list = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), mview->type); + li = list; + while (li) { + struct element *el; + + el = (struct element *)li->data; + if (el) { + md_clear_data(el); + md_remove(el->con, el); + } + + li = li->next; + } + + g_slist_free(list); +} + /* * We own the horizontal adjustment in the track display. * Therefore set the bounds and keep the value correct here. @@ -827,6 +881,9 @@ struct element *clickelem; struct drag_element_data *dragdata; GSList *list; + int mintickoff = 0; + int minthingoff = 0; + int size; int len; int i; @@ -852,7 +909,10 @@ list = g_slist_append(NULL, clickelem); } - dragdata = g_new0(struct drag_element_data, len); + size = sizeof(struct drag_element_data) + + len * sizeof(struct drag_element_data_elements); + dragdata = g_malloc(size); + dragdata->data_size = size; for (i = 0; i < len; i++) { int nthing; @@ -862,21 +922,23 @@ nthing = VIEW_CLASS(mview)->get_nthing(mview, elem); - dragdata[i].element = elem; - dragdata[i].con = elem->con; /*XXX not needed */ - dragdata[i].tick_offset = MD_TIME(elem) - mview->click_tick; - dragdata[i].thing_offset = nthing - mview->click_nthing; - dragdata[i].tick_len = md_get_duration(elem); - } - dragdata[0].len = len; - dragdata[0].data_size = sizeof(*dragdata); + dragdata->a[i].element = elem; + dragdata->a[i].con = elem->con; /*XXX not needed */ + dragdata->a[i].tick_offset = MD_TIME(elem) - mview->click_tick; + dragdata->a[i].thing_offset = nthing - mview->click_nthing; + dragdata->a[i].tick_len = md_get_duration(elem); + + mintickoff = MIN(mintickoff, dragdata->a[i].tick_offset); + minthingoff = MIN(minthingoff, dragdata->a[i].thing_offset); + } + dragdata->len = len; + dragdata->min_tick_offset = mintickoff; + dragdata->min_thing_offset = minthingoff; g_slist_free(list); gtk_object_set_data_full(GTK_OBJECT(mview->canvas), "drag-element-data", dragdata, g_free); - gtk_object_set_data(GTK_OBJECT(mview->canvas), "drag-element-data-len", - GINT_TO_POINTER(len)); gtk_drag_begin(GTK_WIDGET(mview->canvas), tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, @@ -896,24 +958,35 @@ MelysView *mview = user_data; struct outline_data *oldata; double wx, wy; + ticktime_t tick; + int thing; gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), (double)x, (double)y, &wx, &wy); + thing = y_to_thing(mview, wy); + oldata = gtk_object_get_data(GTK_OBJECT(mview), "outline-data"); if (oldata == NULL) oldata = drag_enter(mview, context); if (oldata == NULL) return FALSE; - wx += oldata->xoffset; - wy += oldata->yoffset - mview->vcp->vheight/2; - - if (wx < 0) wx = 0; - if (wy < 0) wy = 0; + tick = oldata->tickoffset + x_to_tick(mview, wx); + if (tick < 0) + tick = 0; + wy = thing_to_y(mview, oldata->thingoffset) + wy - mview->vcp->vheight/2; + if (wy < 0) + wy = 0; + tick = md_snap_tick(mview->tempomap, mview->snap, tick); + wx = tick_to_x(mview, tick); canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); + /* Synthesize motion events */ + view_pos_change(MELYS_SCROLL(mview->canvas), + x_to_tick(mview, wx), thing, mview); + return TRUE; } @@ -934,10 +1007,8 @@ GnomeCanvasGroup *group; struct outline_data *oldata; struct drag_element_data *dragdata; - struct drag_element_data *dp; + struct drag_element_data_elements *dp; double squeeze; - long tick_offset; - int thing_offset; int len; int i; @@ -949,20 +1020,7 @@ oldata = g_new(struct outline_data, 1); dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data"); - len = dragdata[0].len; - - thing_offset = tick_offset = 0; - - /* - * Calculate the offset from the click point to the top left - * hand corner of the rectangle that would enclose all the parts. - */ - for (i = 0; i < len; i++) { - dp = dragdata + i; - - thing_offset = MIN(thing_offset, dp->thing_offset); - tick_offset = MIN(tick_offset, dp->tick_offset); - } + len = dragdata->len; /* * All the outlines are placed into this group so that they @@ -977,11 +1035,11 @@ /* We now have enough information to fill the outline data */ oldata->group = group; - oldata->xoffset = tick_to_x(mview, tick_offset); - oldata->yoffset = thing_to_y(mview, thing_offset); + oldata->tickoffset = dragdata->min_tick_offset; + oldata->thingoffset = dragdata->min_thing_offset; - squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); - oldata->yoffset *= squeeze; + squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); + oldata->thingoffset *= squeeze; /* * Create the individual outlines for each part that is being @@ -990,11 +1048,11 @@ for (i = 0; i < len; i++) { int x1, y1; - dp = dragdata + i; + dp = dragdata->a + i; - x1 = tick_to_x(mview, dp->tick_offset - tick_offset); - y1 = thing_to_y(mview, dp->thing_offset - thing_offset); + x1 = tick_to_x(mview, dp->tick_offset - dragdata->min_tick_offset); + y1 = thing_to_y(mview, dp->thing_offset - dragdata->min_thing_offset); gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, "x1", (double) x1, @@ -1081,12 +1139,11 @@ dragdata = gtk_object_get_data(GTK_OBJECT(mview->canvas), "drag-element-data"); - len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mview->canvas), - "drag-element-data-len")); + len = dragdata->len; gtk_selection_data_set(selection_data, selection_data->target, 8, - (guchar *)dragdata, len * sizeof(*dragdata)); + (guchar *)dragdata, dragdata->data_size); } /* @@ -1097,31 +1154,23 @@ * Arguments: * widget - The destination widget * context - The drag context - * wx - The drop point in window coords (I think) - * wy - The drop point + * x - The drop point in window coords (I think) + * y - The drop point * data - Data from the other side * info - The type of drag * time - Time of event * user_data - User data, probably not used */ static void -drag_data_received(GtkWidget *widget, GdkDragContext *context, gint wx, - gint wy, GtkSelectionData *data, guint info, guint time, - gpointer user_data) +drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y, + GtkSelectionData *data, guint info, guint time, gpointer user_data) { MelysView *mview; struct drag_element_data *dragdata; - struct drag_element_data *dp; + struct drag_element_data_elements *dp; struct element *newelem; ticktime_t t; - int drop_thing; - int drop_tick; - int thing_start = 0; - int tick_start = 0; - int minoff = 0; - int snapadj; gboolean needrm = FALSE; - int x, y; double dx, dy; double squeeze; int len; @@ -1133,47 +1182,29 @@ /* We are given window coordinate, so convert to world coords */ gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), - wx, wy, &dx, &dy); + x, y, &dx, &dy); x = (int)dx; y = (int)dy; - dprintf(2, "data received len %d %p, at %d,%d", - data->length, *(char **)data->data,x, y); - - drop_thing = y_to_thing(mview, y); - drop_tick = x_to_tick(mview, x); + dprintf(2, "data received len %d %p, at %g,%g %d,%d", + data->length, *(char **)data->data, dx, dy, x, y); - len = data->length / sizeof(struct drag_element_data); dragdata = (struct drag_element_data *)data->data; - - squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); - if (squeeze == 0) - goto error; + len = dragdata->len; /* - * Do a first pass through the elements. We must either do - * them all or do none of them. If the user has droped a set - * of parts such that one of them would be before the start - * of the canvas then we must offset them all by the exact amount - * to keep all parts on the canvas. + * We can not drop before the begining, so adjust the drop + * point as though the user had dropped so that that the + * selected rectangle was at 0. */ - for (i = 0; i < len; i++) { - dp = dragdata+i; - - /* Check and adjust for droping before the beginning */ - if (squeeze * dp->thing_offset + drop_thing < 0) - thing_start = MIN(thing_start, squeeze*dp->thing_offset+drop_thing); + if (x + tick_to_x(mview, dragdata->min_tick_offset) < 0) + x = -tick_to_x(mview, dragdata->min_tick_offset); + if (y + thing_to_y(mview, dragdata->min_thing_offset) < 0) + y = -thing_to_y(mview, dragdata->min_thing_offset); - /* Check and adjust for droping before the beginning */ - if (dp->tick_offset + drop_tick < 0) - tick_start = MIN(tick_start, dp->tick_offset + drop_tick); - - minoff = MIN(minoff, dp->tick_offset); - } - drop_tick -= tick_start; - - snapadj = md_snap_tick(mview->tempomap, minoff + drop_tick, mview->snap) - - (minoff + drop_tick); + squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); + if (squeeze == 0) + goto error; md_undo_begin_set(MD_UNDO(mview->mdroot)); @@ -1181,7 +1212,7 @@ int tn; int toff; - dp = dragdata + i; + dp = dragdata->a + i; toff = dp->thing_offset * squeeze; switch (context->action) { @@ -1205,10 +1236,14 @@ g_assert_not_reached(); } - tn = drop_thing + toff - thing_start; - - t = snapadj + drop_tick + dp->tick_offset; - g_assert(t >= 0); + t = dp->tick_offset + x_to_tick(mview, x); + if (t < 0) + t = 0; + t = md_snap_tick(mview->tempomap, mview->snap, t); + + tn = dp->thing_offset + y_to_thing(mview, y); + if (tn < 0) + tn = 0; /* * We set the time, then hand to the class specific diff -rNu melys-0.1.11/widgets/melysview.m melys-0.1.12/widgets/melysview.m --- melys-0.1.11/widgets/melysview.m Tue Dec 7 14:15:12 1999 +++ melys-0.1.12/widgets/melysview.m Tue Dec 14 17:31:24 1999 @@ -18,6 +18,7 @@ >>extern >>header gdk_imlib.h +>>header gdk/gdkkeysyms.h >>header gtk/gtkvbox.h >>header gtk/gtkadjustment.h >>header gtk/gtkdnd.h @@ -101,8 +102,7 @@ void (*scale_changed)(MelysView *); /* Mouse moved */ - void (*thing_position)(MelysView *, int); - void (*tick_position)(MelysView *, int); + void (*position_change)(MelysView *, int, int); /* Action on button 1 double click */ void (*button1_double)(MelysView *, struct element *); @@ -137,20 +137,24 @@ * part within a part. */ struct drag_element_data { - gint32 len; /* Number of elements if this is the first */ + gint32 len; /* Number of elements in a */ + gint min_tick_offset; + gint min_thing_offset; gint32 data_size; /* size of this structure */ - gint32 tick_offset; /* time offset of click into part */ - gint32 thing_offset; /* track offset of click into part */ - gint32 tick_len; /* The length in ticks */ - - struct element *element; /* The element being moved */ - struct containerElement *con; /* Containing element */ + struct drag_element_data_elements { + gint32 tick_offset; /* time offset of click into part */ + gint32 thing_offset; /* track offset of click into part */ + gint32 tick_len; /* The length in ticks */ + + struct element *element; /* The element being moved */ + struct containerElement *con; /* Containing element */ + } a[1]; /* Realy more */ }; struct outline_data { struct _GnomeCanvasGroup *group; - int xoffset; - int yoffset; + int tickoffset; + int thingoffset; }; >>extern @@ -161,8 +165,7 @@ >>set signals enum { SCALE_CHANGED, - THING_POSITION, - TICK_POSITION, + POSITION_CHANGE, LAST_SIGNAL }; @@ -251,6 +254,7 @@ mview->canvas = GTK_WIDGET(canvas); gtk_widget_ref(mview->canvas); + melys_view_add_scroll(mview, MELYS_SCROLL(mview->canvas)); mview->posline = (GtkWidget *)gnome_canvas_item_new( gnome_canvas_root(canvas), @@ -309,20 +313,13 @@ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0 ); - melys_view_signals[THING_POSITION] = gtk_signal_new("thing-position", - GTK_RUN_FIRST|GTK_RUN_NO_RECURSE, - object_class->type, - GTK_SIGNAL_OFFSET(MelysViewClass, thing_position), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT - ); - melys_view_signals[TICK_POSITION] = gtk_signal_new("tick-position", + melys_view_signals[POSITION_CHANGE] = gtk_signal_new("position-change", GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET(MelysViewClass, tick_position), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, 1, + GTK_SIGNAL_OFFSET(MelysViewClass, position_change), + gtk_marshal_NONE__INT_INT, + GTK_TYPE_NONE, 2, + GTK_TYPE_INT, GTK_TYPE_INT ); @@ -438,6 +435,43 @@ gtk_signal_emit(GTK_OBJECT(mview), melys_view_signals[SCALE_CHANGED]); +>>function melys_view_add_scroll +void +MelysView *mview; +MelysScroll *mscroll; Scrolling widget to add + +>>description +Associate the specified +.A mscroll +widget with this +.A mview +widget. +The relevant position change signals are connected to our own +position change signal. + +>>code + + gtk_signal_connect(GTK_OBJECT(mscroll), "position-change", + view_pos_change, mview); + + +>>function view_pos_change +static void +MelysScroll *mscroll; +int tick; +int thing; +gpointer data; +>>code + MelysView *mview = MELYS_VIEW(data); + + if (tick != mview->mouse_tick || thing != mview->mouse_thing) { + mview->mouse_tick = tick; + mview->mouse_thing = thing; + gtk_signal_emit(GTK_OBJECT(mview), + melys_view_signals[POSITION_CHANGE], tick, thing); + } + + >>function canvas_event static int GtkWidget *w; @@ -451,7 +485,6 @@ >>code MelysView *mview = MELYS_VIEW(data); - int thing; double dx, dy; int x, y; @@ -462,25 +495,10 @@ x = dx; y = dy; switch (event->type) { - case GDK_LEAVE_NOTIFY: - x = -1; y = -1; - goto sendnone; - case GDK_MOTION_NOTIFY: - sendnone: - if (x != mview->mouse_tick) { - mview->mouse_tick = x; - gtk_signal_emit(GTK_OBJECT(mview), - melys_view_signals[TICK_POSITION], x); - } + case GDK_KEY_PRESS: + return key_press(mview, NULL, &event->key); - thing = (y<0)? -1: y_to_thing(mview, y); - if (thing != mview->mouse_thing) { - mview->mouse_tick = thing; - gtk_signal_emit(GTK_OBJECT(mview), - melys_view_signals[THING_POSITION], thing); - } - break; default: break; } @@ -537,6 +555,10 @@ if (event->motion.state & ALL_BUTTON_MASK) button_motion(mview, elem, &event->motion); break; + + case GDK_KEY_PRESS: + return key_press(mview, elem, &event->key); + default: break; } @@ -667,6 +689,49 @@ } +>>function key_press +static int +MelysView *mview; +struct element *el; +GdkEventKey *kevent; + +>>code + + switch (kevent->keyval) { + case GDK_Delete: + delete_selected(mview); + break; + default: + return FALSE; + } + + return TRUE; + + +>>function delete_selected +static void +MelysView *mview; +>>code + GSList *list; + GSList *li; + + list = md_build_sel(NULL, MD_ELEMENT(mview->viewcon), mview->type); + li = list; + while (li) { + struct element *el; + + el = (struct element *)li->data; + if (el) { + md_clear_data(el); + md_remove(el->con, el); + } + + li = li->next; + } + + g_slist_free(list); + + >>function set_hscroll static void MelysView *mview; @@ -894,6 +959,9 @@ struct element *clickelem; struct drag_element_data *dragdata; GSList *list; + int mintickoff = 0; + int minthingoff = 0; + int size; int len; int i; @@ -919,7 +987,10 @@ list = g_slist_append(NULL, clickelem); } - dragdata = g_new0(struct drag_element_data, len); + size = sizeof(struct drag_element_data) + + len * sizeof(struct drag_element_data_elements); + dragdata = g_malloc(size); + dragdata->data_size = size; for (i = 0; i < len; i++) { int nthing; @@ -929,21 +1000,23 @@ nthing = VIEW_CLASS(mview)->get_nthing(mview, elem); - dragdata[i].element = elem; - dragdata[i].con = elem->con; /*XXX not needed */ - dragdata[i].tick_offset = MD_TIME(elem) - mview->click_tick; - dragdata[i].thing_offset = nthing - mview->click_nthing; - dragdata[i].tick_len = md_get_duration(elem); - } - dragdata[0].len = len; - dragdata[0].data_size = sizeof(*dragdata); + dragdata->a[i].element = elem; + dragdata->a[i].con = elem->con; /*XXX not needed */ + dragdata->a[i].tick_offset = MD_TIME(elem) - mview->click_tick; + dragdata->a[i].thing_offset = nthing - mview->click_nthing; + dragdata->a[i].tick_len = md_get_duration(elem); + + mintickoff = MIN(mintickoff, dragdata->a[i].tick_offset); + minthingoff = MIN(minthingoff, dragdata->a[i].thing_offset); + } + dragdata->len = len; + dragdata->min_tick_offset = mintickoff; + dragdata->min_thing_offset = minthingoff; g_slist_free(list); gtk_object_set_data_full(GTK_OBJECT(mview->canvas), "drag-element-data", dragdata, g_free); - gtk_object_set_data(GTK_OBJECT(mview->canvas), "drag-element-data-len", - GINT_TO_POINTER(len)); gtk_drag_begin(GTK_WIDGET(mview->canvas), tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, @@ -969,24 +1042,35 @@ MelysView *mview = user_data; struct outline_data *oldata; double wx, wy; + ticktime_t tick; + int thing; gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), (double)x, (double)y, &wx, &wy); + thing = y_to_thing(mview, wy); + oldata = gtk_object_get_data(GTK_OBJECT(mview), "outline-data"); if (oldata == NULL) oldata = drag_enter(mview, context); if (oldata == NULL) return FALSE; - wx += oldata->xoffset; - wy += oldata->yoffset - mview->vcp->vheight/2; - - if (wx < 0) wx = 0; - if (wy < 0) wy = 0; + tick = oldata->tickoffset + x_to_tick(mview, wx); + if (tick < 0) + tick = 0; + wy = thing_to_y(mview, oldata->thingoffset) + wy - mview->vcp->vheight/2; + if (wy < 0) + wy = 0; + tick = md_snap_tick(mview->tempomap, mview->snap, tick); + wx = tick_to_x(mview, tick); canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); + /* Synthesize motion events */ + view_pos_change(MELYS_SCROLL(mview->canvas), + x_to_tick(mview, wx), thing, mview); + return TRUE; @@ -1011,10 +1095,8 @@ GnomeCanvasGroup *group; struct outline_data *oldata; struct drag_element_data *dragdata; - struct drag_element_data *dp; + struct drag_element_data_elements *dp; double squeeze; - long tick_offset; - int thing_offset; int len; int i; @@ -1026,20 +1108,7 @@ oldata = g_new(struct outline_data, 1); dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data"); - len = dragdata[0].len; - - thing_offset = tick_offset = 0; - - /* - * Calculate the offset from the click point to the top left - * hand corner of the rectangle that would enclose all the parts. - */ - for (i = 0; i < len; i++) { - dp = dragdata + i; - - thing_offset = MIN(thing_offset, dp->thing_offset); - tick_offset = MIN(tick_offset, dp->tick_offset); - } + len = dragdata->len; /* * All the outlines are placed into this group so that they @@ -1054,11 +1123,11 @@ /* We now have enough information to fill the outline data */ oldata->group = group; - oldata->xoffset = tick_to_x(mview, tick_offset); - oldata->yoffset = thing_to_y(mview, thing_offset); + oldata->tickoffset = dragdata->min_tick_offset; + oldata->thingoffset = dragdata->min_thing_offset; - squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); - oldata->yoffset *= squeeze; + squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); + oldata->thingoffset *= squeeze; /* * Create the individual outlines for each part that is being @@ -1067,11 +1136,11 @@ for (i = 0; i < len; i++) { int x1, y1; - dp = dragdata + i; + dp = dragdata->a + i; - x1 = tick_to_x(mview, dp->tick_offset - tick_offset); - y1 = thing_to_y(mview, dp->thing_offset - thing_offset); + x1 = tick_to_x(mview, dp->tick_offset - dragdata->min_tick_offset); + y1 = thing_to_y(mview, dp->thing_offset - dragdata->min_thing_offset); gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, "x1", (double) x1, @@ -1165,20 +1234,19 @@ dragdata = gtk_object_get_data(GTK_OBJECT(mview->canvas), "drag-element-data"); - len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mview->canvas), - "drag-element-data-len")); + len = dragdata->len; gtk_selection_data_set(selection_data, selection_data->target, 8, - (guchar *)dragdata, len * sizeof(*dragdata)); + (guchar *)dragdata, dragdata->data_size); >>function drag_data_received static void GtkWidget *widget; The destination widget GdkDragContext *context; The drag context -gint wx; The drop point in window coords (I think) -gint wy; The drop point +gint x; The drop point in window coords (I think) +gint y; The drop point GtkSelectionData *data; Data from the other side guint info; The type of drag guint time; Time of event @@ -1191,17 +1259,10 @@ >>code MelysView *mview; struct drag_element_data *dragdata; - struct drag_element_data *dp; + struct drag_element_data_elements *dp; struct element *newelem; ticktime_t t; - int drop_thing; - int drop_tick; - int thing_start = 0; - int tick_start = 0; - int minoff = 0; - int snapadj; gboolean needrm = FALSE; - int x, y; double dx, dy; double squeeze; int len; @@ -1213,47 +1274,29 @@ /* We are given window coordinate, so convert to world coords */ gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), - wx, wy, &dx, &dy); + x, y, &dx, &dy); x = (int)dx; y = (int)dy; - dprintf(2, "data received len %d %p, at %d,%d", - data->length, *(char **)data->data,x, y); - - drop_thing = y_to_thing(mview, y); - drop_tick = x_to_tick(mview, x); + dprintf(2, "data received len %d %p, at %g,%g %d,%d", + data->length, *(char **)data->data, dx, dy, x, y); - len = data->length / sizeof(struct drag_element_data); dragdata = (struct drag_element_data *)data->data; - - squeeze = get_squeeze_factor(mview->type, dragdata[0].element->type); - if (squeeze == 0) - goto error; + len = dragdata->len; /* - * Do a first pass through the elements. We must either do - * them all or do none of them. If the user has droped a set - * of parts such that one of them would be before the start - * of the canvas then we must offset them all by the exact amount - * to keep all parts on the canvas. + * We can not drop before the begining, so adjust the drop + * point as though the user had dropped so that that the + * selected rectangle was at 0. */ - for (i = 0; i < len; i++) { - dp = dragdata+i; - - /* Check and adjust for droping before the beginning */ - if (squeeze * dp->thing_offset + drop_thing < 0) - thing_start = MIN(thing_start, squeeze*dp->thing_offset+drop_thing); + if (x + tick_to_x(mview, dragdata->min_tick_offset) < 0) + x = -tick_to_x(mview, dragdata->min_tick_offset); + if (y + thing_to_y(mview, dragdata->min_thing_offset) < 0) + y = -thing_to_y(mview, dragdata->min_thing_offset); - /* Check and adjust for droping before the beginning */ - if (dp->tick_offset + drop_tick < 0) - tick_start = MIN(tick_start, dp->tick_offset + drop_tick); - - minoff = MIN(minoff, dp->tick_offset); - } - drop_tick -= tick_start; - - snapadj = md_snap_tick(mview->tempomap, minoff + drop_tick, mview->snap) - - (minoff + drop_tick); + squeeze = get_squeeze_factor(mview->type, dragdata->a[0].element->type); + if (squeeze == 0) + goto error; md_undo_begin_set(MD_UNDO(mview->mdroot)); @@ -1261,7 +1304,7 @@ int tn; int toff; - dp = dragdata + i; + dp = dragdata->a + i; toff = dp->thing_offset * squeeze; switch (context->action) { @@ -1285,10 +1328,14 @@ g_assert_not_reached(); } - tn = drop_thing + toff - thing_start; - - t = snapadj + drop_tick + dp->tick_offset; - g_assert(t >= 0); + t = dp->tick_offset + x_to_tick(mview, x); + if (t < 0) + t = 0; + t = md_snap_tick(mview->tempomap, mview->snap, t); + + tn = dp->thing_offset + y_to_thing(mview, y); + if (tn < 0) + tn = 0; /* * We set the time, then hand to the class specific