diff -rNu melys-0.1.2/ChangeLog melys-0.1.3/ChangeLog --- melys-0.1.2/ChangeLog Sat Nov 13 13:18:17 1999 +++ melys-0.1.3/ChangeLog Mon Nov 15 23:56:56 1999 @@ -1,3 +1,91 @@ +1999-11-15 Steve Ratcliffe + + * widgets/melyspiano.m: Implement the drop_elem method. We can + now receive a set of notes or a whole track/part. + + * midi/record.m: An arg type has changed. + + * md/mdadd.m: Made ensure_part_filled an external routine + md_ensure_parts() + + * widgets/melystrackdisplay.m: When dragging a set of notes over + the part pane we want to squeeze them down so that the range + 0-127 is as heigh as a single track. + + * mlib/PROJECT/mgtk.py: Add some comments to the templates. + + * md/mdutil.m: Routines for clearing and building a list of + selected items based on type. + + * widgets/melyspiano.m, widgets/melysrule.m, + widgets/melystrackdisplay.m, widgets/melysview.m: + Implemented all of drag and drop as common code + in melysview. There are only a few class specific routines + needed. Later melystrackdisplay will be re-worked to use + melys view, at present it is just duplicating code. + MelysTempo will also use MelysView. + +1999-11-14 Steve Ratcliffe + + * md/elements.m, md/mdadd.m, md/mdtools.m: + All elements now have a back reference to their containers. + This is set to NULL on removal, and must be NULL on add. + +1999-11-13 Steve Ratcliffe + + * version: Version 0.1.2 + + * gui/menus.m: Remove the mdi destroy which is not needed. + + * widgets/melyspiano.m: + An initial working piano roll widget. There is no editing, it is read + only. But you can have several open at the same time, even on + the same track. When part of a track is deleted the notes are also + removed from the piano views. + + * mlib/PROJECT/mgtk.py: + Removed confusing and unneeded set signals directive + + * widgets/melystrackinfo.m: + Deal with menu ref/unref differently so that it + goes away properly when the parent widget is destroyed. + + * widgets/viewcontrol.m: + Account for iter-item spacing when setting the min spacing and + don't allow item height to go zero or negative. + + * widgets/melysview.m: + There is now a scale_changed signal from the view. This is + used to re-calculate all dimentions when zooming. + + * widgets/melysrule.m: + Re-drawing fix needed because of changes elsewhere + + * widgets/melystrackinfo.m: + Moved all context menu stuff into here. This allows us to + know what track was clicked and so act more appropriately in some + cases. Eg. it is essential for opening up new views. + + * widgets/melystrackdisplay.m: + Split the canvas item arguments between ones that are set on creation + that never change, and those that are set on re-draws. Profile data + seems to suggest that setting the args here is slow (well we are just + doing a lot of it) + Also clear display datasets when a part is deleted (more to do here) + this makes the displayed items go away when the part is deleted. + + * song/song.m: Adding a view now keeps a list of the views that were + added. So, when you redraw all views can be redrawn. There + will later be a routine to remove a view of course. + + * md/mdutil.m: Add md_clear_data() to clear off all g_dataset data. + + * gui/main.m: + Moved out the track context menu from here. (Its now in melysdisplayinfo + where it belongs.) Simplified setting of the posadj now that it + belongs to the song. This reduces the nasty coupling between main and + the widgets. + 1999-11-13 Steve Ratcliffe * gui/menus.m: Remove the mdi destroy which is not needed. diff -rNu melys-0.1.2/README melys-0.1.3/README --- melys-0.1.2/README Mon Oct 25 20:37:39 1999 +++ melys-0.1.3/README Mon Nov 15 23:49:44 1999 @@ -21,14 +21,15 @@ time and also onto a different track. Parts can also be dragged to another window in the same application. +There is now half a piano roll view. (There is no keyboard part +just yet) You can move notes around in it and copy them. No +deletion or changing the length yet. + At present you can: - Read in files in either midi format or the Melys native format MDML. There can be several files open at once. -- Edit tracks by cutting them up and rearranging by dragging. - Parts can be dragged between different tracks and songs as well - as adjusting their time position in the track. - Play a file, stop it in the middle and resume it, mute tracks, solo tracks. @@ -40,6 +41,13 @@ channel number. - Save the file. + +- Edit tracks by cutting them up and rearranging by dragging. + Parts can be dragged between different tracks and songs as well + as adjusting their time position in the track. + +- Open up a piano roll view of a track. Select, drag, move or + copy sets of notes within a part or to another part. - Files can be opened by dragging from a file manager. diff -rNu melys-0.1.2/include/elements.h melys-0.1.3/include/elements.h --- melys-0.1.2/include/elements.h Sat Nov 13 13:27:42 1999 +++ melys-0.1.3/include/elements.h Mon Nov 15 23:57:37 1999 @@ -26,6 +26,7 @@ #define MD_CONTAINER_BEGIN 50 /* Begining of container types */ struct element { + struct containerElement *con; /* Containing element */ guint32 element_time; /* Time for this element */ short device_channel; /* Device/channel for this element */ char type; /* Element type */ @@ -56,6 +57,7 @@ struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of tracks */ short trackid; /* Ever increasing number for default names */ + /*XXX*/GSList *sel_list; /* Selected elements list */ }; #define MD_ROOT(e) \ ((struct rootElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ROOT)) diff -rNu melys-0.1.2/include/md.h melys-0.1.3/include/md.h --- melys-0.1.2/include/md.h Sat Nov 13 13:27:42 1999 +++ melys-0.1.3/include/md.h Mon Nov 15 23:57:37 1999 @@ -36,8 +36,11 @@ void md_free(struct element *el); void md_wfree(struct element *el); void md_track_renum(struct rootElement *root); -void md_merge_in(struct trackElement *track, struct containerElement *list, +void md_merge_in(struct containerElement *ctrk, struct containerElement *list, enum merge_mode mode); +void merge_in_elem(struct containerElement *ctrk, struct element *el); +void md_ensure_parts(struct containerElement *ctrk, unsigned long begin, + unsigned long end); int md_get_nfree(void); struct element *md_copy(struct element *e); @@ -207,6 +210,8 @@ void md_change_time(struct element *el, unsigned long t); void md_clear_all_mod(struct element *base); void md_clear_data(struct element *base); +void md_clear_all_sel_by_type(struct element *base, int type); +GSList *md_build_sel(GSList *list, struct element *base, int type); void md_shrink(struct rootElement *root); void md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, struct mbt *mbtp); diff -rNu melys-0.1.2/include/meldnd.h melys-0.1.3/include/meldnd.h --- melys-0.1.2/include/meldnd.h Sat Nov 13 13:27:44 1999 +++ melys-0.1.3/include/meldnd.h Mon Nov 15 23:57:40 1999 @@ -11,9 +11,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * This is the part display section of the track view. - * It will later be reworked to be based off the MelysView widget. - * + * This is a base class for widgets that provide a graphical view of a + * song with the time along the x axis and something else on the y axis. + * The methods here take care of scrolling, zooming and song position + * pointer display. * */ @@ -37,10 +38,16 @@ gint32 len; /* Number of elements if this is the first */ gint32 data_size; /* size of this structure */ gint32 tick_offset; /* time offset of click into part */ - gint32 track_offset; /* track 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 outline_data { + struct _GnomeCanvasGroup *group; + int xoffset; + int yoffset; }; diff -rNu melys-0.1.2/include/melyspiano.h melys-0.1.3/include/melyspiano.h --- melys-0.1.2/include/melyspiano.h Sat Nov 13 13:27:44 1999 +++ melys-0.1.3/include/melyspiano.h Mon Nov 15 23:57:39 1999 @@ -33,7 +33,6 @@ struct _MelysPiano { MelysView melys_view; - char *infostr; }; struct _MelysPianoClass { diff -rNu melys-0.1.2/include/melysrule.h melys-0.1.3/include/melysrule.h --- melys-0.1.2/include/melysrule.h Sat Nov 13 13:27:44 1999 +++ melys-0.1.3/include/melysrule.h Mon Nov 15 23:57:39 1999 @@ -24,6 +24,8 @@ typedef struct _MelysRuleClass MelysRuleClass; +#include "gtk/gtkdrawingarea.h" + struct _MelysRule { GtkDrawingArea drawing_area; diff -rNu melys-0.1.2/include/melystransport.h melys-0.1.3/include/melystransport.h --- melys-0.1.2/include/melystransport.h Sat Nov 13 13:27:44 1999 +++ melys-0.1.3/include/melystransport.h Mon Nov 15 23:57:40 1999 @@ -22,11 +22,19 @@ typedef struct _MelysTransportClass MelysTransportClass; +/* + * The MelysTransport structure. Each instance of the class is + * allocated one of these structures. + */ struct _MelysTransport { GtkDrawingArea drawing_area; // XXX object definition here }; +/* + * The MelysTransportClass structure. There is only one of these + * allocated for the class. + */ struct _MelysTransportClass { GtkDrawingAreaClass parent_class; // XXX class definition here diff -rNu melys-0.1.2/include/melysview.h melys-0.1.3/include/melysview.h --- melys-0.1.2/include/melysview.h Sat Nov 13 13:27:45 1999 +++ melys-0.1.3/include/melysview.h Mon Nov 15 23:57:40 1999 @@ -16,12 +16,6 @@ * The methods here take care of scrolling, zooming and song position * pointer display. * - * - * - * - * - * - * */ #define MELYS_VIEW(obj) GTK_CHECK_CAST(obj, melys_view_get_type(), MelysView) @@ -67,7 +61,7 @@ /* From aligning to a grid */ enum snap_type snap; - struct containerElement *elem; + struct containerElement *viewcon; struct song *song; struct tempomapElement *tempomap; @@ -75,16 +69,56 @@ GtkWidget *canvas; /* The canvas that the subclass will place items on */ GtkWidget *ruler; /* A ruler that can be used */ GtkWidget *posline; /* Song position pointer */ - + //GtkWidget *menu; /* The item context menu */ + /* For the posline */ void *points; + + /* A string to identify our display data */ + char *infostr; + + /* Button click state */ + int click_state; + struct element *click_elem; /* Element clicked on */ + unsigned long click_tick; /* Time at point of click */ + + /* The 'thing' is not necessarily the immediate parent of click_elem */ + /* although it usually will be and it will be an ancestor */ + int click_nthing; /* The y position */ + struct containerElement *click_base; /* Thing at y position */ }; +/* + * The class structure. There is only one of these allocated for + * the class. + */ struct _MelysViewClass { GtkVBoxClass parent_class; void (*scale_changed)(MelysView *); + + /* Method to get the base containing element */ + struct containerElement *(*get_base_from_pos)(MelysView *, int thing); + + /* Method to get the container to drop into */ + //struct containerElement *(*get_drop_con_from_pos)(MelysView *, int thing); + + /* Drop element */ + gboolean (*drop_elem)(MelysView *, struct element *, int thing); + + /* Method to get the 'thing' number from the element */ + int (*get_nthing)(MelysView *, struct element *); }; +/* + * A structure to keep track of displayed elements. + */ +struct display_info { + GtkObject *item; /* The associated display item */ + struct containerElement *con; /* Container for elem */ + struct element *elem; /* The element being displayed */ +}; + + guint melys_view_get_type(void); void melys_view_set_song(MelysView *mview, struct song *song); -void melys_view_set_mdroot(MelysView *mview, struct rootElement *root); +int melys_view_item_event(GtkObject *item, GdkEvent *event, gpointer data); diff -rNu melys-0.1.2/md/elements.c melys-0.1.3/md/elements.c --- melys-0.1.2/md/elements.c Sat Nov 13 13:27:56 1999 +++ melys-0.1.3/md/elements.c Mon Nov 15 23:57:52 1999 @@ -116,6 +116,7 @@ e->refcount = 1; e->floating = 1; e->modified = 1; + e->con = NULL; Nelements++; } @@ -133,6 +134,7 @@ { Nelements++; + new->con = NULL; new->refcount = 1; new->floating = 1; new->modified = 1; @@ -224,6 +226,7 @@ md_container_init(MD_CONTAINER(e)); e->head = NULL; + e->sel_list = NULL; } /* @@ -241,6 +244,9 @@ new->head = NULL; new->tracks = 0; + /* The selection list must be re-built after copying */ + new->sel_list = NULL; + g_warning("A root copied check selection code"); md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); } diff -rNu melys-0.1.2/md/elements.m melys-0.1.3/md/elements.m --- melys-0.1.2/md/elements.m Fri Oct 22 11:03:30 1999 +++ melys-0.1.3/md/elements.m Sun Nov 14 19:29:36 1999 @@ -40,6 +40,7 @@ * This should be kept as small as possible. */ >>elementdef element + struct containerElement *con; /* Containing element */ guint32 element_time; /* Time for this element */ short device_channel; /* Device/channel for this element */ char type; /* Element type */ @@ -54,9 +55,11 @@ e->refcount = 1; e->floating = 1; e->modified = 1; + e->con = NULL; Nelements++; copy Nelements++; + new->con = NULL; new->refcount = 1; new->floating = 1; new->modified = 1; @@ -96,11 +99,17 @@ struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of tracks */ short trackid; /* Ever increasing number for default names */ + /*XXX*/GSList *sel_list; /* Selected elements list */ init e->head = NULL; + e->sel_list = NULL; copy new->head = NULL; new->tracks = 0; + + /* The selection list must be re-built after copying */ + new->sel_list = NULL; + g_warning("A root copied check selection code"); /* * A holder for all kinds of information about the file. diff -rNu melys-0.1.2/md/mdadd.c melys-0.1.3/md/mdadd.c --- melys-0.1.2/md/mdadd.c Sat Nov 13 13:27:56 1999 +++ melys-0.1.3/md/mdadd.c Mon Nov 15 23:57:52 1999 @@ -35,11 +35,8 @@ #define CPTR struct containerElement * /* Static functions */ -static void merge_events(struct trackElement *track, +static void merge_events(struct containerElement *ctrk, struct containerElement *list); -static void merge_in_elem(struct containerElement *ctrk, struct element *el); -static void ensure_part_filled(struct containerElement *ctrk, - unsigned long begin, unsigned long end); /* @@ -53,6 +50,7 @@ unsigned long max_time; unsigned long t; + g_assert(el->con == NULL); if (el->floating) el->floating = 0; else @@ -119,6 +117,7 @@ md_track_renum(MD_ROOT(c)); MD_SET_MODIFIED(c, TRUE); + el->con = c; } /* @@ -133,6 +132,9 @@ { gboolean res; + g_assert(el->con == c); + el->con = NULL; + switch (el->type) { case MD_TYPE_TRACK: g_assert(((struct rootElement *)c)->tracks > 0); @@ -225,9 +227,6 @@ g_free(el); Nelements--; } - else - /* This is not yet allowed */ - dprintf(0, "wref for type %d was %d", el->type, el->wref); } /* @@ -286,18 +285,18 @@ * existing track in one of several ways. * * Arguments: - * track - Track to add events to + * ctrk - Track to add events to * list - list of elements to be merged in * mode - Merge mode */ void -md_merge_in(struct trackElement *track, struct containerElement *list, +md_merge_in(struct containerElement *ctrk, struct containerElement *list, enum merge_mode mode) { switch (mode) { case MD_ADD_MERGE: - merge_events(track, list); + merge_events(ctrk, list); break; case MD_ADD_LAST: break; @@ -312,22 +311,19 @@ * existing track in one of several ways. * * Arguments: - * track - Track etc. to merge events into + * ctrk - Track etc. to merge events into * list - list of elements to be merged in */ static void -merge_events(struct trackElement *track, struct containerElement *list) +merge_events(struct containerElement *ctrk, struct containerElement *list) { - struct containerElement *ctrk; struct element *el; int n; - ctrk = MD_CONTAINER(track); - - md_undo_begin_set(MD_UNDO(track)); + md_undo_begin_set(MD_UNDO(ctrk)); /* Make sure that part elements cover all the duration of the list */ - ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); + md_ensure_parts(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); for (n = 0; n < md_list_size(list); n++) { el = md_list_nth_elem(list, n); @@ -335,7 +331,7 @@ } list->elements->len = 0; - md_undo_end_set(MD_UNDO(track)); + md_undo_end_set(MD_UNDO(ctrk)); } /* @@ -354,7 +350,7 @@ * this just involves recursing down until the bottom is * reached. There can also be references to other parts. */ -static void +void merge_in_elem(struct containerElement *ctrk, struct element *el) { struct element *first; @@ -390,8 +386,8 @@ * begin - Begin time * end - End time */ -static void -ensure_part_filled(struct containerElement *ctrk, unsigned long begin, +void +md_ensure_parts(struct containerElement *ctrk, unsigned long begin, unsigned long end) { struct containerElement *con; @@ -410,7 +406,7 @@ con = (struct containerElement *)md_list_find_by_time(ctrk, begin); if (con) { end2 = MIN(end, MD_ENDTIME(con)); - ensure_part_filled(con, begin, end2); + md_ensure_parts(con, begin, end2); } else { /* diff -rNu melys-0.1.2/md/mdadd.m melys-0.1.3/md/mdadd.m --- melys-0.1.2/md/mdadd.m Fri Nov 12 18:23:36 1999 +++ melys-0.1.3/md/mdadd.m Mon Nov 15 23:36:29 1999 @@ -55,6 +55,7 @@ unsigned long max_time; unsigned long t; + g_assert(el->con == NULL); if (el->floating) el->floating = 0; else @@ -121,6 +122,7 @@ md_track_renum(MD_ROOT(c)); MD_SET_MODIFIED(c, TRUE); + el->con = c; >>function md_remove void @@ -137,6 +139,9 @@ >>code gboolean res; + g_assert(el->con == c); + el->con = NULL; + switch (el->type) { case MD_TYPE_TRACK: g_assert(((struct rootElement *)c)->tracks > 0); @@ -229,10 +234,6 @@ g_free(el); Nelements--; } - else - /* This is not yet allowed */ - dprintf(0, "wref for type %d was %d", el->type, el->wref); - >>function md_wfree @@ -291,7 +292,7 @@ >>function md_merge_in void -struct trackElement *track; Track to add events to +struct containerElement *ctrk; Track to add events to struct containerElement *list; list of elements to be merged in enum merge_mode mode; Merge mode @@ -307,7 +308,7 @@ switch (mode) { case MD_ADD_MERGE: - merge_events(track, list); + merge_events(ctrk, list); break; case MD_ADD_LAST: break; @@ -318,7 +319,7 @@ >>function merge_events static void -struct trackElement *track; Track etc. to merge events into +struct containerElement *ctrk; Track etc. to merge events into struct containerElement *list; list of elements to be merged in >>description @@ -330,16 +331,13 @@ ways. >>code - struct containerElement *ctrk; struct element *el; int n; - ctrk = MD_CONTAINER(track); - - md_undo_begin_set(MD_UNDO(track)); + md_undo_begin_set(MD_UNDO(ctrk)); /* Make sure that part elements cover all the duration of the list */ - ensure_part_filled(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); + md_ensure_parts(ctrk, MD_TIME(list), MD_ENDTIME(list)+1); for (n = 0; n < md_list_size(list); n++) { el = md_list_nth_elem(list, n); @@ -347,10 +345,11 @@ } list->elements->len = 0; - md_undo_end_set(MD_UNDO(track)); + md_undo_end_set(MD_UNDO(ctrk)); + >>function merge_in_elem -static void +void struct containerElement *ctrk; struct element *el; @@ -402,8 +401,8 @@ merge_in_elem(con, el); ->>function ensure_part_filled -static void +>>function md_ensure_parts +void struct containerElement *ctrk; unsigned long begin; Begin time unsigned long end; End time @@ -431,7 +430,7 @@ con = (struct containerElement *)md_list_find_by_time(ctrk, begin); if (con) { end2 = MIN(end, MD_ENDTIME(con)); - ensure_part_filled(con, begin, end2); + md_ensure_parts(con, begin, end2); } else { /* diff -rNu melys-0.1.2/md/mdtools.c melys-0.1.3/md/mdtools.c --- melys-0.1.2/md/mdtools.c Sat Nov 13 13:27:57 1999 +++ melys-0.1.3/md/mdtools.c Mon Nov 15 23:57:53 1999 @@ -43,7 +43,6 @@ struct partElement *newpart; struct element *el; int i; - int cutoff = -1; newpart = md_part_new(); if (origpart->name) @@ -59,23 +58,20 @@ for (i = 0; i < MD_CONTAINER_LEN(origpart); i++) { el = MD_GET_INDEX(origpart, i); if (MD_TIME(el) >= t) { - if (cutoff < 0) - cutoff = i; + + MD_REF(el); + + /* After we remove the elem must decrease i to match */ + md_remove(MD_CONTAINER(origpart), el); + i--; + md_add(MD_CONTAINER(newpart), el); + MD_UNREF(el); } } - /* No events so empty part will be created */ - if (cutoff < 0) - cutoff = i; - - /* Remove elements from the original part */ - while (cutoff < MD_CONTAINER_LEN(origpart)) { - el = MD_GET_INDEX(origpart, cutoff); - md_remove(MD_CONTAINER(origpart), el); - } - MD_SET_DURATION(origpart, t - MD_TIME(origpart)); + MD_CONTAINER(newpart)->max_duration = MD_DURATION(newpart); md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, MD_ELEMENT(origpart), t); @@ -116,8 +112,11 @@ return; for (i = 0; i < MD_CONTAINER_LEN(part2); i++) { - el = MD_GET_INDEX(part2, i); + el = MD_GET_INDEX(part2, 0); + MD_REF(el); + md_remove(MD_CONTAINER(part2), el); md_add(MD_CONTAINER(part1), el); + MD_UNREF(el); } endtime = MD_ENDTIME(part2) - MD_TIME(part1); diff -rNu melys-0.1.2/md/mdtools.m melys-0.1.3/md/mdtools.m --- melys-0.1.2/md/mdtools.m Sun Oct 24 21:28:04 1999 +++ melys-0.1.3/md/mdtools.m Sun Nov 14 19:29:36 1999 @@ -38,7 +38,6 @@ struct partElement *newpart; struct element *el; int i; - int cutoff = -1; newpart = md_part_new(); if (origpart->name) @@ -54,23 +53,20 @@ for (i = 0; i < MD_CONTAINER_LEN(origpart); i++) { el = MD_GET_INDEX(origpart, i); if (MD_TIME(el) >= t) { - if (cutoff < 0) - cutoff = i; + + MD_REF(el); + + /* After we remove the elem must decrease i to match */ + md_remove(MD_CONTAINER(origpart), el); + i--; + md_add(MD_CONTAINER(newpart), el); + MD_UNREF(el); } } - /* No events so empty part will be created */ - if (cutoff < 0) - cutoff = i; - - /* Remove elements from the original part */ - while (cutoff < MD_CONTAINER_LEN(origpart)) { - el = MD_GET_INDEX(origpart, cutoff); - md_remove(MD_CONTAINER(origpart), el); - } - MD_SET_DURATION(origpart, t - MD_TIME(origpart)); + MD_CONTAINER(newpart)->max_duration = MD_DURATION(newpart); md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, MD_ELEMENT(origpart), t); @@ -112,8 +108,11 @@ return; for (i = 0; i < MD_CONTAINER_LEN(part2); i++) { - el = MD_GET_INDEX(part2, i); + el = MD_GET_INDEX(part2, 0); + MD_REF(el); + md_remove(MD_CONTAINER(part2), el); md_add(MD_CONTAINER(part1), el); + MD_UNREF(el); } endtime = MD_ENDTIME(part2) - MD_TIME(part1); diff -rNu melys-0.1.2/md/mdutil.c melys-0.1.3/md/mdutil.c --- melys-0.1.2/md/mdutil.c Sat Nov 13 13:27:58 1999 +++ melys-0.1.3/md/mdutil.c Mon Nov 15 23:57:53 1999 @@ -298,6 +298,9 @@ MD_SET_TIME(base, MD_TIME(base) + tdiff); + if (!iscontainer(base)) + return; + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { el = MD_GET_INDEX(base, i); MD_SET_TIME(el, MD_TIME(el) + tdiff); @@ -353,6 +356,49 @@ g_dataset_destroy(el); } } +} + +void +md_clear_all_sel_by_type(struct element *base, int type) +{ + int n; + struct element *el; + + if (MD_TYPE(base) == type && MD_SELECTED(base)) { + MD_SET_SELECTED(base, FALSE); + g_dataset_destroy(base); + } + + if (iscontainer(base)) { + for (n = 0; n < MD_CONTAINER_LEN(base); n++) { + el = MD_GET_INDEX(base, n); + md_clear_all_sel_by_type(el, type); + } + } +} + +/* + * Build up a list of all the elements below base that match the + * given type . + */ +GSList * +md_build_sel(GSList *list, struct element *base, int type) +{ + + if (base->type == type && MD_SELECTED(base)) + list = g_slist_prepend(list, base); + + if (iscontainer(base)) { + int n; + struct element *el; + + for (n = 0; n < MD_CONTAINER_LEN(base); n++) { + el = MD_GET_INDEX(base, n); + list = md_build_sel(list, el, type); + } + } + + return list; } /* diff -rNu melys-0.1.2/md/mdutil.m melys-0.1.3/md/mdutil.m --- melys-0.1.2/md/mdutil.m Sat Nov 13 09:09:47 1999 +++ melys-0.1.3/md/mdutil.m Mon Nov 15 14:52:52 1999 @@ -395,6 +395,9 @@ MD_SET_TIME(base, MD_TIME(base) + tdiff); + if (!iscontainer(base)) + return; + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { el = MD_GET_INDEX(base, i); MD_SET_TIME(el, MD_TIME(el) + tdiff); @@ -455,6 +458,57 @@ g_dataset_destroy(el); } } + + +>>function md_clear_all_sel_by_type +void +struct element *base; +int type; + +>>code + int n; + struct element *el; + + if (MD_TYPE(base) == type && MD_SELECTED(base)) { + MD_SET_SELECTED(base, FALSE); + g_dataset_destroy(base); + } + + if (iscontainer(base)) { + for (n = 0; n < MD_CONTAINER_LEN(base); n++) { + el = MD_GET_INDEX(base, n); + md_clear_all_sel_by_type(el, type); + } + } + + +>>function md_build_sel +GSList * +GSList *list; +struct element *base; +int type; + +>>description +Build up a list of all the elements below base +that match the given +.A type . + +>>code + + if (base->type == type && MD_SELECTED(base)) + list = g_slist_prepend(list, base); + + if (iscontainer(base)) { + int n; + struct element *el; + + for (n = 0; n < MD_CONTAINER_LEN(base); n++) { + el = MD_GET_INDEX(base, n); + list = md_build_sel(list, el, type); + } + } + + return list; >>function md_shrink diff -rNu melys-0.1.2/midi/record.c melys-0.1.3/midi/record.c --- melys-0.1.2/midi/record.c Sat Nov 13 13:28:05 1999 +++ melys-0.1.3/midi/record.c Mon Nov 15 23:58:01 1999 @@ -232,7 +232,7 @@ duration = endtime - MD_TIME(track->newpart); track->newpart->duration = duration; - md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); + md_merge_in(MD_CONTAINER(track), track->newpart, MD_ADD_MERGE); md_free(MD_ELEMENT(track->newpart)); track->newpart = NULL; g_ptr_array_free(track->notes, 1); diff -rNu melys-0.1.2/midi/record.m melys-0.1.3/midi/record.m --- melys-0.1.2/midi/record.m Thu Nov 11 23:54:45 1999 +++ melys-0.1.3/midi/record.m Mon Nov 15 23:36:52 1999 @@ -210,7 +210,7 @@ duration = endtime - MD_TIME(track->newpart); track->newpart->duration = duration; - md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); + md_merge_in(MD_CONTAINER(track), track->newpart, MD_ADD_MERGE); md_free(MD_ELEMENT(track->newpart)); track->newpart = NULL; g_ptr_array_free(track->notes, 1); diff -rNu melys-0.1.2/mlib/PROJECT/mgtk.py melys-0.1.3/mlib/PROJECT/mgtk.py --- melys-0.1.2/mlib/PROJECT/mgtk.py Sat Nov 13 12:28:22 1999 +++ melys-0.1.3/mlib/PROJECT/mgtk.py Mon Nov 15 14:54:02 1999 @@ -95,11 +95,19 @@ code_template = """ >>headerdef @header +/* + * The %(objname)s structure. Each instance of the class is + * allocated one of these structures. + */ struct _%(objname)s { %(parentname)s %(parentshortprefix)s; // XXX object definition here }; +/* + * The %(objname)sClass structure. There is only one of these + * allocated for the class. + */ struct _%(objname)sClass { %(parentname)sClass parent_class; // XXX class definition here diff -rNu melys-0.1.2/version melys-0.1.3/version --- melys-0.1.2/version Sat Nov 13 13:18:25 1999 +++ melys-0.1.3/version Mon Nov 15 23:50:01 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.2" +#define MELYS_VERSION_STRING "0.1.3" diff -rNu melys-0.1.2/widgets/Makefile melys-0.1.3/widgets/Makefile --- melys-0.1.2/widgets/Makefile Sat Nov 13 13:27:51 1999 +++ melys-0.1.3/widgets/Makefile Mon Nov 15 23:57:47 1999 @@ -34,10 +34,10 @@ ../include/melysrule.h \ ../include/melystrack.h \ ../include/melystrackdisplay.h \ - ../include/meldnd.h \ ../include/melystrackinfo.h \ ../include/melystransport.h \ ../include/melysview.h \ + ../include/meldnd.h \ ../include/melwidgets.h \ ../include/melreg.h \ ../include/viewcontrol.h @@ -82,6 +82,7 @@ melysview.o: ../include/melwidgets.h melysview.o: ../include/song.h melysview.o: ../include/melysview.h +melysview.o: ../include/meldnd.h melyspiano.o: ../include/elements.h melyspiano.o: ../include/md.h melyspiano.o: ../include/viewcontrol.h @@ -99,11 +100,11 @@ melystrackdisplay.o: ../include/melysrule.h melystrackdisplay.o: ../include/melgui.h melystrackdisplay.o: ../include/melmsg.h +melystrackdisplay.o: ../include/meldnd.h melystrackdisplay.o: ../include/elements.h melystrackdisplay.o: ../include/song.h melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/melystrackdisplay.h -melystrackdisplay.o: ../include/meldnd.h misc.o: ../include/pixmaps.h misc.o: ../include/melgui.h misc.o: ../include/melwidgets.h diff -rNu melys-0.1.2/widgets/melyspiano.c melys-0.1.3/widgets/melyspiano.c --- melys-0.1.2/widgets/melyspiano.c Sat Nov 13 13:28:01 1999 +++ melys-0.1.3/widgets/melyspiano.c Mon Nov 15 23:57:57 1999 @@ -26,6 +26,7 @@ #include "glib.h" #include "except.h" #include "util.h" +#include "gtk/gtksignal.h" #include "gtk/gtkwidget.h" #include "gtk/gtkvbox.h" #include "gtk/gtktable.h" @@ -43,14 +44,6 @@ -/* Display information */ -struct display_info { - GnomeCanvasItem *item; - struct noteElement *note; - struct containerElement *cpart; -}; - - #define tick_to_x(mp, t) view_control_tick_to_x( \ MELYS_VIEW(mp)->vcp, t) @@ -60,15 +53,9 @@ #define note_to_y(mp, n) view_control_thing_to_y( \ MELYS_VIEW(mp)->vcp, (127 - (n))) - -/* This is used so that we can have different views of the same - * set of notes. Display information is saved with different ids - * for each view - */ -static int PianoID; - /* Static functions */ static void melys_piano_init(MelysPiano *mpiano); +static int canvas_event(GtkWidget *w, GdkEvent *event, gpointer data); static void melys_piano_class_init(MelysPianoClass *klass); static void piano_scale_changed(MelysView *mview); static void piano_destroy(GtkObject *obj); @@ -79,6 +66,8 @@ struct noteElement *note, int force); static void piano_realize(GtkWidget *w); static void display_info_free(gpointer _dinfo); +static int get_nthing(MelysView *mview, struct element *el); +static gboolean drop_elem(MelysView *mview, struct element *elem, int nthing); static MelysViewClass *parent_class = NULL; @@ -120,7 +109,7 @@ GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_piano_get_type())); MelysView *mview = MELYS_VIEW(w); - mview->elem = con; + mview->viewcon = con; MD_REF(con); return w; @@ -141,6 +130,7 @@ GtkBox *vbox1; view_control_set_vertical(mview->vcp, 8); + view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); tab = (GtkTable *)gtk_table_new(3, 3, 0); @@ -187,7 +177,16 @@ mview->vthings = 127; /* There are 127 midi notes */ - mpiano->infostr = g_strdup_printf("piano-%d-info", PianoID++); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", + GTK_SIGNAL_FUNC(canvas_event), NULL); +} + +static int +canvas_event(GtkWidget *w, GdkEvent *event, gpointer data) +{ + //printf("canvas event %d\n", event->type); + //mel_debug_print_type("event:", w); + return FALSE; } /* @@ -214,6 +213,8 @@ widget_class->realize = piano_realize; melys_view_class->scale_changed = piano_scale_changed; + melys_view_class->get_nthing = get_nthing; + melys_view_class->drop_elem = drop_elem; } /* @@ -225,21 +226,18 @@ piano_scale_changed(MelysView *mview) { - g_return_if_fail(mview->elem); + g_return_if_fail(mview->viewcon); if (MELYS_VIEW_CLASS(parent_class)->scale_changed) MELYS_VIEW_CLASS(parent_class)->scale_changed(mview); - piano_con_draw(MELYS_PIANO(mview), mview->elem, TRUE); + piano_con_draw(MELYS_PIANO(mview), mview->viewcon, TRUE); } static void piano_destroy(GtkObject *obj) { - MelysPiano *mpiano = MELYS_PIANO(obj); - - /* XXX should destroy datasets first */ - g_free(mpiano->infostr); + //MelysPiano *mpiano = MELYS_PIANO(obj); GTK_OBJECT_CLASS(parent_class)->destroy(obj); } @@ -249,7 +247,7 @@ { MelysPiano *mpiano = MELYS_PIANO(w); - piano_con_draw(mpiano, MELYS_VIEW(mpiano)->elem, FALSE); + piano_con_draw(mpiano, MELYS_VIEW(mpiano)->viewcon, FALSE); GTK_WIDGET_CLASS(parent_class)->draw(w, area); } @@ -318,6 +316,7 @@ update_note(MelysPiano *mpiano, struct containerElement *con, struct noteElement *note, int force) { + MelysView *mview; GnomeCanvasItem *item; struct display_info *dinfo; int state; @@ -335,17 +334,19 @@ if (GTK_OBJECT_DESTROYED(mpiano)) return; + mview = MELYS_VIEW(mpiano); + /* See if this note is selected or not */ if (MD_SELECTED(note)) state = GTK_STATE_SELECTED; else state = GTK_STATE_NORMAL; - dinfo = g_dataset_get_data(note, mpiano->infostr); + dinfo = g_dataset_get_data(note, mview->infostr); if (dinfo == NULL) { GnomeCanvasGroup *rgroup; - rgroup = gnome_canvas_root((GnomeCanvas*)MELYS_VIEW(mpiano)->canvas); + rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); item = gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_RECT, @@ -357,27 +358,31 @@ dinfo = g_new(struct display_info, 1); gtk_object_ref((GtkObject *) item); - dinfo->item = item; + dinfo->item = (GtkObject *)item; MD_WREF(note); - dinfo->note = note; + dinfo->elem = MD_ELEMENT(note); MD_WREF(con); - dinfo->cpart = con; + dinfo->con = con; - g_dataset_set_data_full(note, mpiano->infostr, + g_dataset_set_data_full(note, mview->infostr, dinfo, display_info_free); + gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); + + gtk_signal_connect(GTK_OBJECT(item), "event", + GTK_SIGNAL_FUNC(melys_view_item_event), mpiano); } g_assert(dinfo != NULL); - item = dinfo->item; + item = GNOME_CANVAS_ITEM(dinfo->item); canvas_item_move_abs(item, tick_to_x(mpiano, MD_TIME(note)), note_to_y(mpiano, note->note)); gnome_canvas_item_set(item, "x2", (double) tick_to_x(mpiano, note->length), - "y2", (double) MELYS_VIEW(mpiano)->vcp->vheight, + "y2", (double) mview->vcp->vheight, "fill_color_gdk", >K_WIDGET(mpiano)->style->light[state], NULL); } @@ -400,8 +405,48 @@ gtk_object_destroy((GtkObject *) dinfo->item); gtk_object_unref((GtkObject *) dinfo->item); - MD_WUNREF(dinfo->cpart); - MD_WUNREF(dinfo->note); + MD_WUNREF(dinfo->con); + MD_WUNREF(dinfo->elem); g_free(_dinfo); +} + +static int +get_nthing(MelysView *mview, struct element *el) +{ + return 127 - MD_NOTE(el)->note; +} + +/* + * Deal with dropping an element on to us. We only allow notes to + * be dropped, if we get some container element then we try to + * find the notes in it. + */ +static gboolean +drop_elem(MelysView *mview, struct element *elem, int nthing) +{ + int n; + struct element *el; + + if (iscontainer(elem)) { + md_ensure_parts(mview->viewcon, MD_TIME(elem), MD_ENDTIME(elem)+1); + for (n = 0; n < MD_CONTAINER_LEN(elem); n++) { + el = MD_GET_INDEX(elem, n); + MD_REF(el); + md_remove(el->con, el); + if (MD_TYPE(el) == MD_TYPE_NOTE) + drop_elem(mview, el, 127 - MD_NOTE(el)->note); + MD_UNREF(el); + } + } else if (elem->type == MD_TYPE_NOTE) { + + /* Make sure that parts exist. This leads to bitty parts XXX */ + md_ensure_parts(mview->viewcon, + MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); + + MD_NOTE(elem)->note = 127 - nthing; + MELYS_VIEW_CLASS(parent_class)->drop_elem(mview, elem, nthing); + } + + return TRUE; } diff -rNu melys-0.1.2/widgets/melyspiano.m melys-0.1.3/widgets/melyspiano.m --- melys-0.1.2/widgets/melyspiano.m Sat Nov 13 12:30:10 1999 +++ melys-0.1.3/widgets/melyspiano.m Mon Nov 15 23:39:10 1999 @@ -15,6 +15,7 @@ is mainly a container for other widgets that combine to make the piano roll. +>>header gtk/gtksignal.h >>header gtk/gtkwidget.h >>header gtk/gtkvbox.h >>header gtk/gtktable.h @@ -39,7 +40,6 @@ struct _MelysPiano { MelysView melys_view; - char *infostr; }; struct _MelysPianoClass { @@ -49,14 +49,6 @@ >>extern -/* Display information */ -struct display_info { - GnomeCanvasItem *item; - struct noteElement *note; - struct containerElement *cpart; -}; - - #define tick_to_x(mp, t) view_control_tick_to_x( \ MELYS_VIEW(mp)->vcp, t) @@ -67,12 +59,6 @@ MELYS_VIEW(mp)->vcp, (127 - (n))) -/* This is used so that we can have different views of the same - * set of notes. Display information is saved with different ids - * for each view - */ -static int PianoID; - >>function melys_piano_new GtkWidget * @@ -89,7 +75,7 @@ GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_piano_get_type())); MelysView *mview = MELYS_VIEW(w); - mview->elem = con; + mview->viewcon = con; MD_REF(con); return w; @@ -107,6 +93,7 @@ GtkBox *vbox1; view_control_set_vertical(mview->vcp, 8); + view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); tab = (GtkTable *)gtk_table_new(3, 3, 0); @@ -153,8 +140,19 @@ mview->vthings = 127; /* There are 127 midi notes */ - mpiano->infostr = g_strdup_printf("piano-%d-info", PianoID++); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", + GTK_SIGNAL_FUNC(canvas_event), NULL); + +>>function canvas_event +static int +GtkWidget *w; +GdkEvent *event; +gpointer data; +>>code + //printf("canvas event %d\n", event->type); + //mel_debug_print_type("event:", w); + return FALSE; >>function melys_piano_class_init static void @@ -179,6 +177,8 @@ widget_class->realize = piano_realize; melys_view_class->scale_changed = piano_scale_changed; + melys_view_class->get_nthing = get_nthing; + melys_view_class->drop_elem = drop_elem; >>function piano_scale_changed @@ -192,12 +192,12 @@ >>code - g_return_if_fail(mview->elem); + g_return_if_fail(mview->viewcon); if (MELYS_VIEW_CLASS(parent_class)->scale_changed) MELYS_VIEW_CLASS(parent_class)->scale_changed(mview); - piano_con_draw(MELYS_PIANO(mview), mview->elem, TRUE); + piano_con_draw(MELYS_PIANO(mview), mview->viewcon, TRUE); >>function piano_destroy @@ -205,10 +205,7 @@ GtkObject *obj; >>code - MelysPiano *mpiano = MELYS_PIANO(obj); - - /* XXX should destroy datasets first */ - g_free(mpiano->infostr); + //MelysPiano *mpiano = MELYS_PIANO(obj); GTK_OBJECT_CLASS(parent_class)->destroy(obj); @@ -220,7 +217,7 @@ >>code MelysPiano *mpiano = MELYS_PIANO(w); - piano_con_draw(mpiano, MELYS_VIEW(mpiano)->elem, FALSE); + piano_con_draw(mpiano, MELYS_VIEW(mpiano)->viewcon, FALSE); GTK_WIDGET_CLASS(parent_class)->draw(w, area); @@ -299,6 +296,7 @@ Update the dimensions of the item representing the note. >>code + MelysView *mview; GnomeCanvasItem *item; struct display_info *dinfo; int state; @@ -316,17 +314,19 @@ if (GTK_OBJECT_DESTROYED(mpiano)) return; + mview = MELYS_VIEW(mpiano); + /* See if this note is selected or not */ if (MD_SELECTED(note)) state = GTK_STATE_SELECTED; else state = GTK_STATE_NORMAL; - dinfo = g_dataset_get_data(note, mpiano->infostr); + dinfo = g_dataset_get_data(note, mview->infostr); if (dinfo == NULL) { GnomeCanvasGroup *rgroup; - rgroup = gnome_canvas_root((GnomeCanvas*)MELYS_VIEW(mpiano)->canvas); + rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); item = gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_RECT, @@ -338,27 +338,31 @@ dinfo = g_new(struct display_info, 1); gtk_object_ref((GtkObject *) item); - dinfo->item = item; + dinfo->item = (GtkObject *)item; MD_WREF(note); - dinfo->note = note; + dinfo->elem = MD_ELEMENT(note); MD_WREF(con); - dinfo->cpart = con; + dinfo->con = con; - g_dataset_set_data_full(note, mpiano->infostr, + g_dataset_set_data_full(note, mview->infostr, dinfo, display_info_free); + gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); + + gtk_signal_connect(GTK_OBJECT(item), "event", + GTK_SIGNAL_FUNC(melys_view_item_event), mpiano); } g_assert(dinfo != NULL); - item = dinfo->item; + item = GNOME_CANVAS_ITEM(dinfo->item); canvas_item_move_abs(item, tick_to_x(mpiano, MD_TIME(note)), note_to_y(mpiano, note->note)); gnome_canvas_item_set(item, "x2", (double) tick_to_x(mpiano, note->length), - "y2", (double) MELYS_VIEW(mpiano)->vcp->vheight, + "y2", (double) mview->vcp->vheight, "fill_color_gdk", >K_WIDGET(mpiano)->style->light[state], NULL); @@ -384,7 +388,53 @@ gtk_object_destroy((GtkObject *) dinfo->item); gtk_object_unref((GtkObject *) dinfo->item); - MD_WUNREF(dinfo->cpart); - MD_WUNREF(dinfo->note); + MD_WUNREF(dinfo->con); + MD_WUNREF(dinfo->elem); g_free(_dinfo); + +>>function get_nthing +static int +MelysView *mview; +struct element *el; + +>>code + return 127 - MD_NOTE(el)->note; + + +>>function drop_elem +static gboolean +MelysView *mview; +struct element *elem; +int nthing; + +>>description +Deal with dropping an element on to us. +We only allow notes to be dropped, if we get some container +element then we try to find the notes in it. + +>>code + int n; + struct element *el; + + if (iscontainer(elem)) { + md_ensure_parts(mview->viewcon, MD_TIME(elem), MD_ENDTIME(elem)+1); + for (n = 0; n < MD_CONTAINER_LEN(elem); n++) { + el = MD_GET_INDEX(elem, n); + MD_REF(el); + md_remove(el->con, el); + if (MD_TYPE(el) == MD_TYPE_NOTE) + drop_elem(mview, el, 127 - MD_NOTE(el)->note); + MD_UNREF(el); + } + } else if (elem->type == MD_TYPE_NOTE) { + + /* Make sure that parts exist. This leads to bitty parts XXX */ + md_ensure_parts(mview->viewcon, + MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); + + MD_NOTE(elem)->note = 127 - nthing; + MELYS_VIEW_CLASS(parent_class)->drop_elem(mview, elem, nthing); + } + + return TRUE; diff -rNu melys-0.1.2/widgets/melysrule.c melys-0.1.3/widgets/melysrule.c --- melys-0.1.2/widgets/melysrule.c Sat Nov 13 13:28:01 1999 +++ melys-0.1.3/widgets/melysrule.c Mon Nov 15 23:57:57 1999 @@ -22,7 +22,6 @@ #include "util.h" #include "gtk/gtkwidget.h" #include "gtk/gtkvbox.h" -#include "gtk/gtkdrawingarea.h" #include "gtk/gtksignal.h" #include "elements.h" #include "viewcontrol.h" diff -rNu melys-0.1.2/widgets/melysrule.m melys-0.1.3/widgets/melysrule.m --- melys-0.1.2/widgets/melysrule.m Sat Nov 13 09:19:09 1999 +++ melys-0.1.3/widgets/melysrule.m Mon Nov 15 14:50:54 1999 @@ -13,7 +13,6 @@ >>header gtk/gtkwidget.h >>header gtk/gtkvbox.h ->>header gtk/gtkdrawingarea.h >>header gtk/gtksignal.h >>header elements.h @@ -24,6 +23,8 @@ >>gtkobject melys_rule gtk_drawing_area >>headerdef @header + +#include "gtk/gtkdrawingarea.h" struct _MelysRule { GtkDrawingArea drawing_area; diff -rNu melys-0.1.2/widgets/melystrackdisplay.c melys-0.1.3/widgets/melystrackdisplay.c --- melys-0.1.2/widgets/melystrackdisplay.c Sat Nov 13 13:28:02 1999 +++ melys-0.1.3/widgets/melystrackdisplay.c Mon Nov 15 23:57:58 1999 @@ -43,11 +43,11 @@ #include "melysrule.h" #include "melgui.h" #include "melmsg.h" +#include "meldnd.h" #include "elements.h" #include "song.h" #include "md.h" #include "melystrackdisplay.h" -#include "meldnd.h" #include "intl.h" @@ -83,14 +83,9 @@ struct containerElement *con; }; -struct outline_data { - GnomeCanvasGroup *group; - int xoffset; - int yoffset; -}; /* Drag and drop types */ -const GtkTargetEntry targets[] = { +static const GtkTargetEntry targets[] = { {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, }; @@ -959,7 +954,7 @@ dragdata[i].element = MD_ELEMENT(sinfo->part); dragdata[i].con = sinfo->con; dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick; - dragdata[i].track_offset = ntrack - mdisp->click_ntrack; + dragdata[i].thing_offset = ntrack - mdisp->click_ntrack; dragdata[i].tick_len = MD_DURATION(sinfo->part); } dragdata[0].len = len; @@ -1084,18 +1079,17 @@ /* Remove from list */ mdisp->sel_list = g_list_remove(mdisp->sel_list, info); - /* Now update the display */ if (!MD_IS_DESTROYED(part)) { dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); - - update_part_item(mdisp, dinfo->track, dinfo->part); + + if (dinfo) + update_part_item(mdisp, dinfo->track, dinfo->part); } MD_UNREF(info->part); MD_UNREF(info->con); - g_free(info); } /* @@ -1303,7 +1297,6 @@ part = mdisp->click_part; track = mdisp->click_track; - /* have to unselect as this hold a reference to the on-screen part */ if (MD_SELECTED(part)) { GList *list; @@ -1311,9 +1304,14 @@ struct sel_info *info; info = list->data; + + /* have to unselect as this holds a reference + * to the on-screen item */ + sel_clear_part(mdisp, info->part); + md_clear_data(MD_ELEMENT(info->part)); md_remove(info->con, (struct element *)info->part); - sel_clear_part(mdisp, info->part); + } } else { md_clear_data(MD_ELEMENT(part)); @@ -1437,7 +1435,7 @@ for (i = 0; i < len; i++) { dp = dragdata + i; - track_offset = MIN(track_offset, dp->track_offset); + track_offset = MIN(track_offset, dp->thing_offset); tick_offset = MIN(tick_offset, dp->tick_offset); } @@ -1457,22 +1455,33 @@ oldata->xoffset = tick_to_x(mdisp, tick_offset); oldata->yoffset = track_to_y(mdisp, track_offset); + /* If this is say a note, then we need to squash down */ + if (!iscontainer(dragdata[0].element)) + oldata->yoffset /= 127; + /* * Create the individual outlines for each part that is being * moved. */ for (i = 0; i < len; i++) { int x1, y1; + int squeeze; dp = dragdata + i; + + if (iscontainer(dp->element)) + squeeze = 1; + else + squeeze = 127; + x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset); - y1 = track_to_y(mdisp, dp->track_offset - track_offset); + y1 = track_to_y(mdisp, dp->thing_offset - track_offset); gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, "x1", (double) x1, - "y1", (double) y1, + "y1", (double) y1/squeeze, "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), - "y2", (double) y1 + mdisp->vcp->vheight, + "y2", (double) (y1 + mdisp->vcp->vheight) / squeeze, "width_pixels", 1, "outline_color", "yellow", NULL); @@ -1599,8 +1608,8 @@ goto error; /* Check and adjust for droping before the beginning */ - if (dp->track_offset + drop_track < 0) - track_start = MIN(track_start, dp->track_offset + drop_track); + if (dp->thing_offset + drop_track < 0) + track_start = MIN(track_start, dp->thing_offset + drop_track); /* Check and adjust for droping before the beginning */ if (dp->tick_offset + drop_tick < 0) @@ -1640,7 +1649,7 @@ g_assert_not_reached(); } - tn = drop_track + dp->track_offset - track_start; + tn = drop_track + dp->thing_offset - track_start; /* Make sure that the track exists and create it if not */ md_ensure_track(mdisp->mdroot, tn); @@ -1660,7 +1669,7 @@ MD_UNREF(newpart); - g_dataset_remove_data(newpart, "display-info"); + md_clear_data(MD_ELEMENT(newpart)); update_part_item(mdisp, track, newpart); } diff -rNu melys-0.1.2/widgets/melystrackdisplay.m melys-0.1.3/widgets/melystrackdisplay.m --- melys-0.1.2/widgets/melystrackdisplay.m Sat Nov 13 09:16:36 1999 +++ melys-0.1.3/widgets/melystrackdisplay.m Mon Nov 15 23:38:19 1999 @@ -41,6 +41,7 @@ >>header melysrule.h >>header melgui.h >>header melmsg.h +>>header meldnd.h >>header elements.h >>header song.h @@ -113,36 +114,6 @@ GtkVBoxClass parent_class; }; ->># This should be moved somewhere else. ->>headerdef meldnd.h - -/* - * The drag and drop types that belong to this application. - */ -extern GdkAtom MelysElemAtom; -#define MELYS_ELEM_ATOM_NAME "application/x-melys-element" -#define MELYS_ELEM_ATOM_ID 1 - -/* - * Data for same-app transfers. - * If we ever do inter-app transfers then we will have to convert - * to ascii such as mdml or use a corba interface. - * - * This structure is to be used in many contexts, could be - * a part within a track, notes within a part or even a - * part within a part. - */ -struct drag_element_data { - gint32 len; /* Number of elements if this is the first */ - gint32 data_size; /* size of this structure */ - gint32 tick_offset; /* time offset of click into part */ - gint32 track_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 */ -}; - >>extern /* Signals that this widget creates */ @@ -171,14 +142,9 @@ struct containerElement *con; }; -struct outline_data { - GnomeCanvasGroup *group; - int xoffset; - int yoffset; -}; /* Drag and drop types */ -const GtkTargetEntry targets[] = { +static const GtkTargetEntry targets[] = { {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, }; @@ -984,7 +950,7 @@ dragdata[i].element = MD_ELEMENT(sinfo->part); dragdata[i].con = sinfo->con; dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick; - dragdata[i].track_offset = ntrack - mdisp->click_ntrack; + dragdata[i].thing_offset = ntrack - mdisp->click_ntrack; dragdata[i].tick_len = MD_DURATION(sinfo->part); } dragdata[0].len = len; @@ -1023,6 +989,7 @@ build_sel1(mdisp, MD_CONTAINER(mdisp->mdroot), el); } + >>function build_sel1 static void MelysTrackDisplay *mdisp; @@ -1122,18 +1089,17 @@ /* Remove from list */ mdisp->sel_list = g_list_remove(mdisp->sel_list, info); - /* Now update the display */ if (!MD_IS_DESTROYED(part)) { dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); - - update_part_item(mdisp, dinfo->track, dinfo->part); + + if (dinfo) + update_part_item(mdisp, dinfo->track, dinfo->part); } MD_UNREF(info->part); MD_UNREF(info->con); - g_free(info); >>function disp_size_allocate @@ -1358,7 +1324,6 @@ part = mdisp->click_part; track = mdisp->click_track; - /* have to unselect as this hold a reference to the on-screen part */ if (MD_SELECTED(part)) { GList *list; @@ -1366,9 +1331,14 @@ struct sel_info *info; info = list->data; + + /* have to unselect as this holds a reference + * to the on-screen item */ + sel_clear_part(mdisp, info->part); + md_clear_data(MD_ELEMENT(info->part)); md_remove(info->con, (struct element *)info->part); - sel_clear_part(mdisp, info->part); + } } else { md_clear_data(MD_ELEMENT(part)); @@ -1503,7 +1473,7 @@ for (i = 0; i < len; i++) { dp = dragdata + i; - track_offset = MIN(track_offset, dp->track_offset); + track_offset = MIN(track_offset, dp->thing_offset); tick_offset = MIN(tick_offset, dp->tick_offset); } @@ -1523,22 +1493,33 @@ oldata->xoffset = tick_to_x(mdisp, tick_offset); oldata->yoffset = track_to_y(mdisp, track_offset); + /* If this is say a note, then we need to squash down */ + if (!iscontainer(dragdata[0].element)) + oldata->yoffset /= 127; + /* * Create the individual outlines for each part that is being * moved. */ for (i = 0; i < len; i++) { int x1, y1; + int squeeze; dp = dragdata + i; + + if (iscontainer(dp->element)) + squeeze = 1; + else + squeeze = 127; + x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset); - y1 = track_to_y(mdisp, dp->track_offset - track_offset); + y1 = track_to_y(mdisp, dp->thing_offset - track_offset); gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, "x1", (double) x1, - "y1", (double) y1, + "y1", (double) y1/squeeze, "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), - "y2", (double) y1 + mdisp->vcp->vheight, + "y2", (double) (y1 + mdisp->vcp->vheight) / squeeze, "width_pixels", 1, "outline_color", "yellow", NULL); @@ -1672,8 +1653,8 @@ goto error; /* Check and adjust for droping before the beginning */ - if (dp->track_offset + drop_track < 0) - track_start = MIN(track_start, dp->track_offset + drop_track); + if (dp->thing_offset + drop_track < 0) + track_start = MIN(track_start, dp->thing_offset + drop_track); /* Check and adjust for droping before the beginning */ if (dp->tick_offset + drop_tick < 0) @@ -1713,7 +1694,7 @@ g_assert_not_reached(); } - tn = drop_track + dp->track_offset - track_start; + tn = drop_track + dp->thing_offset - track_start; /* Make sure that the track exists and create it if not */ md_ensure_track(mdisp->mdroot, tn); @@ -1733,7 +1714,7 @@ MD_UNREF(newpart); - g_dataset_remove_data(newpart, "display-info"); + md_clear_data(MD_ELEMENT(newpart)); update_part_item(mdisp, track, newpart); } diff -rNu melys-0.1.2/widgets/melystrackinfo.c melys-0.1.3/widgets/melystrackinfo.c --- melys-0.1.2/widgets/melystrackinfo.c Sat Nov 13 13:28:03 1999 +++ melys-0.1.3/widgets/melystrackinfo.c Mon Nov 15 23:57:59 1999 @@ -171,12 +171,13 @@ /* The popup menu */ static GnomeUIInfo tracksmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Add"), N_("Add a track below this one"), + {GNOME_APP_UI_ITEM, N_("_Add track"), N_("Add a track below this one"), add_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("_Delete"), N_("Delete all selected or this track"), + {GNOME_APP_UI_ITEM, N_("_Delete track"), + N_("Delete all selected or this track"), delete_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ diff -rNu melys-0.1.2/widgets/melystrackinfo.m melys-0.1.3/widgets/melystrackinfo.m --- melys-0.1.2/widgets/melystrackinfo.m Sat Nov 13 12:41:08 1999 +++ melys-0.1.3/widgets/melystrackinfo.m Mon Nov 15 23:37:42 1999 @@ -164,12 +164,13 @@ >>extern -a /* The popup menu */ static GnomeUIInfo tracksmenu[] = { - {GNOME_APP_UI_ITEM, N_("_Add"), N_("Add a track below this one"), + {GNOME_APP_UI_ITEM, N_("_Add track"), N_("Add a track below this one"), add_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, - {GNOME_APP_UI_ITEM, N_("_Delete"), N_("Delete all selected or this track"), + {GNOME_APP_UI_ITEM, N_("_Delete track"), + N_("Delete all selected or this track"), delete_track_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ diff -rNu melys-0.1.2/widgets/melysview.c melys-0.1.3/widgets/melysview.c --- melys-0.1.2/widgets/melysview.c Sat Nov 13 13:28:03 1999 +++ melys-0.1.3/widgets/melysview.c Mon Nov 15 23:57:59 1999 @@ -16,12 +16,6 @@ * The methods here take care of scrolling, zooming and song position * pointer display. * - * - * - * - * - * - * */ @@ -30,11 +24,12 @@ #include "util.h" #include "gdk_imlib.h" #include "gtk/gtkvbox.h" -#include "gtk/gtkdrawingarea.h" #include "gtk/gtkadjustment.h" +#include "gtk/gtkdnd.h" #include "libgnomeui/gnome-canvas.h" #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-line.h" +#include "libgnomeui/gnome-canvas-rect-ellipse.h" #include "libgnomeui/gnome-popup-menu.h" #include "elements.h" #include "md.h" @@ -43,29 +38,72 @@ #include "melwidgets.h" #include "song.h" #include "melysview.h" +#include "meldnd.h" #include "intl.h" + + + + + +#define VIEW_CLASS(mv) MELYS_VIEW_CLASS(GTK_OBJECT(mv)->klass) + /* The list of signal id's that are being added for MelysView. */ enum { SCALE_CHANGED, LAST_SIGNAL }; -/* Argument numbers */ -enum { - ARG_0, -}; - +/* + * This is used so that we can have different views of the same + * set of notes. Display information is saved with different ids + * for each view + */ +static int ViewID; #define x_to_tick(v, x) view_control_x_to_tick(MELYS_VIEW(v)->vcp, (x)) #define tick_to_x(v, t) view_control_tick_to_x(MELYS_VIEW(v)->vcp, (t)) +#define y_to_thing(v, y) view_control_y_to_thing(MELYS_VIEW(v)->vcp, (y)) +#define thing_to_y(v, thing) view_control_thing_to_y(MELYS_VIEW(v)->vcp, (thing)) + +/* Drag and drop types */ +static const GtkTargetEntry targets[] = { + {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, +}; + +/* All the buttons that we deal with */ +#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) + +/* Mouse click state */ +enum click_state { + CLICK_INACTIVE, + CLICK_BUTTON1_DOWN, + CLICK_BUTTON2_DOWN, + CLICK_BUTTON3_DOWN, + CLICK_DRAGGING, + CLICK_GESTURE, + + CLICK_ERROR +}; + +/* Structure to keep selection info */ +struct sel_info { + struct element *elem; + struct containerElement *con; +}; /* Static functions */ static void melys_view_init(MelysView *mview); static void melys_view_class_init(MelysViewClass *klass); static void view_destroy(GtkObject *obj); static void view_scroll(GtkAdjustment *adj, gpointer data); +static void button_press(MelysView *mview, struct element *elem, + GdkEventButton *event); +static void button_release(MelysView *mview, struct element *elem, + GdkEventButton *event); +static void button_motion(MelysView *mview, struct element *elem, + GdkEventMotion *event); static void set_hscroll(MelysView *mview); static void set_vscroll(MelysView *mview); static void song_pos_cb(GtkAdjustment *adj, gpointer data); @@ -73,6 +111,27 @@ static void set_scroll_region(MelysView *mview); static void vcp_changed(GtkObject *vobj, gpointer data); static void view_scale_changed(MelysView *mview); +static void drag_setup(MelysView *mview, GdkEventMotion *event); +static gboolean drag_motion(GtkWidget *widget, GdkDragContext *context, + gint x, gint y, guint time, gpointer user_data); +static struct outline_data *drag_enter(MelysView *mview, + GdkDragContext *context); +static void drag_leave(GtkWidget *widget, GdkDragContext *context, guint time, + gpointer user_data); +static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, + gint y, guint time, gpointer user_data); +static void drag_data_send(GtkWidget *widget, GdkDragContext *context, + 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, + gpointer user_data); +static void outline_data_free(gpointer data); +static void drag_end(GtkWidget *widget, GdkDragContext *drag_context, + gpointer user_data); +static struct containerElement *view_def_get_base(MelysView *mview, int thing); +static gboolean view_def_drop(MelysView *mview, struct element *el, int thing); +static int nthing_unimplemented(MelysView *mview, struct element *el); static GtkVBoxClass *parent_class = NULL; @@ -122,19 +181,17 @@ mview->poffset = 0; mview->vthings = 0; - mview->elem = NULL; + mview->viewcon = NULL; mview->song = NULL; mview->points = gnome_canvas_points_new(2); -#if 0 mview->click_elem = NULL; - mview->click_con = NULL; + mview->click_tick = 0; + mview->click_nthing = 0; + mview->click_base = NULL; mview->click_state = CLICK_INACTIVE; - mview->sel_list = NULL; -#endif - mview->ruler = (GtkWidget *)melys_rule_new(mview->vcp); gtk_widget_ref(mview->ruler); @@ -161,6 +218,8 @@ GNOME_TYPE_CANVAS_LINE, NULL); + mview->infostr = g_strdup_printf("%d-info", ViewID++); + gtk_signal_connect((GtkObject *)mview->vcp, "scale-changed", (GtkSignalFunc)vcp_changed, mview); gtk_signal_connect((GtkObject *)mview->vcp->hadj, "value-changed", @@ -168,11 +227,10 @@ gtk_signal_connect((GtkObject *)mview->vcp->vadj, "value-changed", (GtkSignalFunc)view_scroll, mview); -#if 0 /* Set up a drop site for this widget */ - gtk_drag_dest_set(GTK_WIDGET(mview->canvas), GTK_DEST_DEFAULT_MOTION, + gtk_drag_dest_set(GTK_WIDGET(mview->canvas), + GTK_DEST_DEFAULT_MOTION, targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-drop", GTK_SIGNAL_FUNC(drag_drop), mview); gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-data-get", @@ -185,8 +243,6 @@ GTK_SIGNAL_FUNC(drag_leave), mview); gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", GTK_SIGNAL_FUNC(drag_end), mview); - -#endif } /* @@ -208,8 +264,6 @@ parent_class = gtk_type_class(gtk_vbox_get_type()); - // XXX Add args - melys_view_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", GTK_RUN_FIRST, object_class->type, @@ -225,6 +279,9 @@ widget_class->draw = view_draw; klass->scale_changed = view_scale_changed; + klass->get_base_from_pos = view_def_get_base; + klass->drop_elem = view_def_drop; + klass->get_nthing = nthing_unimplemented; } static void @@ -234,8 +291,6 @@ g_return_if_fail(IS_MELYS_VIEW(obj)); - //clear_all_part_sel(mview, FALSE); - gnome_canvas_points_unref(mview->points); if (mview->posline) @@ -258,19 +313,27 @@ mview->canvas = NULL; } - if (mview->elem) { - md_free(MD_ELEMENT(mview->elem)); - mview->elem = NULL; + if (mview->viewcon) { + md_free(MD_ELEMENT(mview->viewcon)); + mview->viewcon = NULL; } if (mview->tempomap) { md_free(MD_ELEMENT(mview->tempomap)); mview->tempomap = NULL; } + if (mview->infostr) { + g_free(mview->infostr); + mview->infostr = NULL; + } if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); } +/* + * Scroll the canvas to the correct position. Called when a + * scrollbar changes and when resizing etc. + */ static void view_scroll(GtkAdjustment *adj, gpointer data) { @@ -303,10 +366,18 @@ mview->voffset * mview->vcp->vscale); } - } +/* + * Set the song that this view is representing. Useful + * information such as the song position pointer and the + * tempomap are extracted. + * + * Arguments: + * mview - The view + * song - The song to set + */ void melys_view_set_song(MelysView *mview, struct song *song) { @@ -331,35 +402,169 @@ } /* - * Set the music description root. If there was an existing one - * it is freed first. Everything is reset to display the new - * song. + * The implementation connects "event" of all its relavent + * canvas items to this function which implements the + * standard behaviour for button clicks etc. * * Arguments: - * mview - The view + * item - This is the canvas item that is receiving the event + * event - The event + * data - The MelysView (sub-class) object */ -void -melys_view_set_mdroot(MelysView *mview, struct rootElement *root) +int +melys_view_item_event(GtkObject *item, GdkEvent *event, gpointer data) { + MelysView *mview = data; + struct element *elem; + struct display_info *dinfo; -#if 0 - g_return_if_fail(root != NULL); + /* Get the display data from the group */ + dinfo = gtk_object_get_data(item, mview->infostr); + g_assert(dinfo); + + elem = dinfo->elem; + dprintf(3, "event %d for elem %d", event->type, elem->type); + + switch (event->type) { + case GDK_BUTTON_PRESS: + /* Save the original location */ + mview->click_elem = elem; + mview->click_tick = x_to_tick(mview, event->button.x); + mview->click_nthing = y_to_thing(mview, event->button.y); + + mview->click_base = VIEW_CLASS(mview)->get_base_from_pos( + mview, mview->click_nthing); + + button_press(mview, elem, &event->button); + break; + + case GDK_2BUTTON_PRESS: + //part_prop_box(part, mview->song, 0); + break; + + case GDK_BUTTON_RELEASE: + button_release(mview, elem, &event->button); + break; + + case GDK_MOTION_NOTIFY: + if (event->motion.state & ALL_BUTTON_MASK) + button_motion(mview, elem, &event->motion); + break; + default: + break; + } - if (mview->mdroot) - md_free((struct element *)mview->mdroot); - mview->mdroot = md_root_inc_ref(root); + return TRUE; +} - mview->vcp->hadj->value = 0.0; - set_hscroll(mview); - set_vscroll(mview); +/* + * Action to take when button 1 is pressed. + */ +static void +button_press(MelysView *mview, struct element *elem, GdkEventButton *event) +{ + if (mview->click_state != CLICK_INACTIVE) { + mview->click_state = CLICK_ERROR; + return; + } - if (mview->ruler) { - melys_rule_set_tempomap( - (MelysRule *)mview->ruler, md_get_tempomap(root)); + switch (event->button) { + case 1: + mview->click_state = CLICK_BUTTON1_DOWN; + break; + + case 2: + mview->click_state = CLICK_BUTTON2_DOWN; + break; + + case 3: + /* + * We checked that we were in the correct state, but + * do not change state as the popup menu takes + * control and we never see a button release. + */ + //gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); + break; + } +} + +/* + * Button 1 has been pressed on a part item. This selects the + * item. + */ +static void +button_release(MelysView *mview, struct element *elem, GdkEventButton *event) +{ + int mask; + struct display_info *dinfo; + + dinfo = g_dataset_get_data(elem, mview->infostr); + + if (mview->click_state == CLICK_ERROR) { + + mask = event->state & ALL_BUTTON_MASK; + + switch (event->button) { + case 1: mask &= ~GDK_BUTTON1_MASK; break; + case 2: mask &= ~GDK_BUTTON2_MASK; break; + case 3: mask &= ~GDK_BUTTON3_MASK; break; + } + + /* + * We had an error, now if this is the last button + * to be released then we can clear back to inactive state. + */ + if (mask == 0) + mview->click_state = CLICK_INACTIVE; + return; } - //build_sel_list(mview); /* There may be some parts already selected */ + switch (event->button) { + case 1: + + dprintf2("Button at %f,%f\n", event->x, event->y); + if (!(event->state & GDK_CONTROL_MASK)) + md_clear_all_sel_by_type(MD_ELEMENT(mview->viewcon), MD_TYPE(elem)); + + MD_SET_SELECTED(elem, !MD_SELECTED(elem)); + + /* Is there a more efficient way */ + song_view_update(mview->song); + + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) + mview->click_state = CLICK_INACTIVE; + break; + +#if 0 + case 2: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mview->click_state = CLICK_INACTIVE; + break; + + case 3: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mview->click_state = CLICK_INACTIVE; + break; #endif + } +} + +/* + * Motion when a button is pressed down. Drag and drop on button + * 1, gesture based editing on button 2. + */ +static void +button_motion(MelysView *mview, struct element *elem, GdkEventMotion *event) +{ + + switch (mview->click_state) { + case CLICK_BUTTON1_DOWN: + drag_setup(mview, event); + mview->click_state = CLICK_INACTIVE; + break; + default: + break; + } } /* @@ -381,7 +586,7 @@ adj = mview->vcp->hadj; pageticks = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); - ticklen = MD_ENDTIME(mview->elem) + pageticks; + ticklen = MD_ENDTIME(mview->viewcon) + pageticks; adj->lower = 0.0; adj->upper = (double) ticklen; @@ -456,9 +661,9 @@ * avoid too many repeated calls -- it can be shrunk again * later. */ - if (t > MD_ENDTIME(mview->elem)) { - MD_SET_DURATION(mview->elem, t + hadj->page_size); - mview->posadj->upper = MD_ENDTIME(mview->elem); + if (t > MD_ENDTIME(mview->viewcon)) { + MD_SET_DURATION(mview->viewcon, t + hadj->page_size); + mview->posadj->upper = MD_ENDTIME(mview->viewcon); set_scroll_region(mview); } @@ -499,41 +704,9 @@ view_draw(GtkWidget *widget, GdkRectangle *area) { MelysView *mview = (MelysView *)widget; -#if 0 - int n; - int p; - struct trackElement *track; - struct partElement *part; /* note that this could be part or partref */ -#endif set_scroll_region(mview); -#if 0 - for (n = 0; n < mview->elem->tracks; n++) { - track = md_track_nth(mview->elem, n); - - for (p = 0; p < MD_CONTAINER_LEN(track); p++) { - part = (struct partElement *) MD_GET_INDEX(track, p); - - if (MD_IS_DESTROYED(part)) { - /* This should not be happening */ - dprintf(0, "view_draw: part is destroyed!\n"); - continue; - } - - switch (MD_TYPE(part)) { - case MD_TYPE_PART: - case MD_TYPE_PARTREF: - update_part_item(mview, track, part); - break; - default: - dprintf(0, "Unexpexted type %d in view_draw", MD_TYPE(part)); - break; - } - } - } -#endif - if (mview->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); @@ -607,10 +780,485 @@ gtk_signal_emit(mviewobj, melys_view_signals[SCALE_CHANGED]); } +/* + * Default implementation of our scale_changed signal. Sets + * the scroll region to suit the new configuration. + */ static void view_scale_changed(MelysView *mview) { mview->voffset = -1; set_scroll_region(mview); +} + +/* + */ +static void +drag_setup(MelysView *mview, GdkEventMotion *event) +{ + GtkTargetList *tlist; + struct element *clickelem; + struct drag_element_data *dragdata; + GSList *list; + int len; + int i; + + tlist = gtk_target_list_new(targets, NELEM(targets)); + + clickelem = mview->click_elem; + + /* + * If the part that was click was selected, then we move all + * selected parts. If it wasn't then we just move the part that + * was clicked. + */ + if (MD_SELECTED(clickelem)) { + list = md_build_sel(NULL, MD_ELEMENT(mview->click_base), + MD_TYPE(clickelem)); + len = g_slist_length(list); + } else { + /* + * Not moving the selected parts. Just create a + * temporary list of the single part. + */ + len = 1; + list = g_slist_append(NULL, clickelem); + } + + dragdata = g_new0(struct drag_element_data, len); + + for (i = 0; i < len; i++) { + int nthing; + //struct sel_info *sinfo; + struct element *elem; + + elem = g_slist_nth_data(list, i); + //ntrack = MD_TRACK_NUMBER(sinfo->con); + + 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_DURATION(elem); + } + dragdata[0].len = len; + dragdata[0].data_size = sizeof(*dragdata); + + 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, + 1 /* The button number */, (GdkEvent*)event); + + gtk_target_list_unref(tlist); +} + +/* + * Move around the drag outline group so that the user can tell + * where the drag will land. + */ +static gboolean +drag_motion(GtkWidget *widget, GdkDragContext *context, gint x, gint y, + guint time, gpointer user_data) +{ + MelysView *mview = user_data; + struct outline_data *oldata; + double wx, wy; + + gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), + (double)x, (double)y, &wx, &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; + + canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); + + return TRUE; +} + +/* + * When a drag enters this widget, we construct a set of + * outlines that represent the position of the drag. The + * following drag motion events will be used to move these + * outlines around. + * Keep in mind that the source of the drag could be a different + * type of widget. It could also be from a different + * application and even from a different machine, although + * this isn't supported yet. + */ +static struct outline_data * +drag_enter(MelysView *mview, GdkDragContext *context) +{ + GtkWidget *srcw; + GnomeCanvasGroup *group; + struct outline_data *oldata; + struct drag_element_data *dragdata; + struct drag_element_data *dp; + long tick_offset; + int thing_offset; + int i; + int len; + + srcw = gtk_drag_get_source_widget(context); + if (srcw == NULL) { + /* Another app probably which we don't yet deal with */ + return NULL; + } + + 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); + } + + /* + * All the outlines are placed into this group so that they + * can be moved as a unit to follow the cursor. + */ + group = (GnomeCanvasGroup *) gnome_canvas_item_new( + gnome_canvas_root((GnomeCanvas*)mview->canvas), + GNOME_TYPE_CANVAS_GROUP, + "x", 0.0, + "y", 0.0, + NULL); + + /* 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); + + /* + * Create the individual outlines for each part that is being + * moved. + */ + for (i = 0; i < len; i++) { + int x1, y1; + + dp = dragdata + i; + x1 = tick_to_x(mview, dp->tick_offset - tick_offset); + y1 = thing_to_y(mview, dp->thing_offset - thing_offset); + + gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, + "x1", (double) x1, + "y1", (double) y1, + "x2", (double) x1 + tick_to_x(mview, dp->tick_len), + "y2", (double) y1 + mview->vcp->vheight, + "width_pixels", 1, + "outline_color", "yellow", + NULL); + } + + /* Save for later use */ + gtk_object_set_data_full(GTK_OBJECT(mview), "outline-data", oldata, + (GtkDestroyNotify)outline_data_free); + + return oldata; +} + +/* + * This gets called when the drag leaves our window and also at + * the end of the drag. So its a good place to tidy up in. + */ +static void +drag_leave(GtkWidget *widget, GdkDragContext *context, guint time, + gpointer user_data) +{ + MelysView *mview = user_data; + + gtk_object_remove_data(GTK_OBJECT(mview), "outline-data"); +} + +/* + * A callback that is called when a drop is made. We study the + * context and decide which format to request. Then we request + * the data. + * + * Arguments: + * widget - The destination canvas widget + */ +static gboolean +drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y, + guint time, gpointer user_data) +{ + + dprintf1("drag drop on %s 0x%x at %d,%d\n", + gtk_type_name(GTK_OBJECT_TYPE(widget)), widget, x, y); + + /* We want the internal element format */ + gtk_drag_get_data(widget, context, MelysElemAtom, time); + + return TRUE; +} + +/* + * This is a callback that is executed when the drag_data_get + * signal is received. This means that we are being asked to + * send the data to the destination. It sends the element that + * is being dragged to the receiving end. + * + * Arguments: + * widget - The source widget + * context - The drag context + * selection_data - The data is set into here + * info - Identification of transfer type + * time - The associated time + * data - The mview widget + */ +static void +drag_data_send(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, guint time, + gpointer data) +{ + MelysView *mview = data; + struct element *elem; + struct drag_element_data *dragdata; + int len; + + if (info != MELYS_ELEM_ATOM_ID) { + g_warning("unexpected drag type received"); + return; + } + + elem = mview->click_elem; + + 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")); + + gtk_selection_data_set(selection_data, + selection_data->target, 8, + (guchar *)dragdata, len * sizeof(*dragdata)); +} + +/* + * This routine is called when a signal arrives on the + * destination widget to say that data has actually been + * received. + * + * Arguments: + * widget - The destination widget + * context - The drag context + * wx - The drop point in window coords (I think) + * wy - 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) +{ + MelysView *mview; + struct drag_element_data *dragdata; + struct drag_element_data *dp; + struct element *newelem; + unsigned long 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; + int len; + int res; + int i; + + mview = MELYS_VIEW(user_data); + newelem = NULL; + + /* We are given window coordinate, so convert to world coords */ + gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), + wx, wy, &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); + + + len = data->length / sizeof(struct drag_element_data); + dragdata = (struct drag_element_data *)data->data; + + /* + * 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. + */ + for (i = 0; i < len; i++) { + dp = dragdata+i; +#if 0 + if (dp->element->type != MD_TYPE_PART) + goto error; +#endif + + /* Check and adjust for droping before the beginning */ + if (dp->thing_offset + drop_thing < 0) + thing_start = MIN(thing_start, dp->thing_offset + drop_thing); + + /* 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); + + md_undo_begin_set(MD_UNDO(mview->mdroot)); + + for (i = 0; i < len; i++) { + int tn; + + dp = dragdata + i; + + switch (context->action) { + case GDK_ACTION_MOVE: + + /* Moving so new is same as old */ + newelem = dp->element; + + MD_REF(newelem); + md_remove(newelem->con, newelem); + + needrm = TRUE; + break; + + case GDK_ACTION_COPY: + newelem = md_copy(dp->element); + MD_REF(newelem); + break; + + default: + g_assert_not_reached(); + } + + tn = drop_thing + dp->thing_offset - thing_start; + + t = snapadj + drop_tick + dp->tick_offset; + g_assert(t >= 0); + + /* + * We set the time, then hand to the class specific + * routine to do the real work of adding to the new track. + */ + md_change_time(newelem, t); + res = VIEW_CLASS(mview)->drop_elem(mview, newelem, tn); + if (res == FALSE) + goto error; /* Realy too late, half done */ + + MD_UNREF(newelem); + + md_clear_data(newelem); + } + + gtk_drag_finish(context, TRUE, needrm, time); + md_undo_end_set(MD_UNDO(mview->mdroot)); + + if (mview->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); + + md_shrink(mview->song->mdroot); + song_view_update(mview->song); + return; + + error: + gtk_drag_finish(context, FALSE, FALSE, time); +} + +static void +outline_data_free(gpointer data) +{ + struct outline_data *od = data; + + gtk_object_destroy(GTK_OBJECT(od->group)); + g_free(od); +} + +static void +drag_end(GtkWidget *widget, GdkDragContext *drag_context, gpointer user_data) +{ + MelysView *mview = user_data; + + dprintf2("drag_end\n"); + gtk_object_remove_data(GTK_OBJECT(mview), "drag-element-data"); +} + +/* + * The default implementation of this method returns the same + * container that the view is based on. This is correct for the + * piano roll and tempo views. It will need overriding for the + * part display view. + */ +static struct containerElement * +view_def_get_base(MelysView *mview, int thing) +{ + + return mview->viewcon; +} + +/* + * The default implementation of this method returns the + * topmost container above the one that the view is based on + * ignoring the specified thing position. Will probably + * always have to be overridden, so maybe not useful. + */ +static gboolean +view_def_drop(MelysView *mview, struct element *el, int thing) +{ + + dprintf1("merging in at %d\n", MD_TIME(el)); + md_set_devchan(el, MD_DEVCHAN(mview->viewcon)); + merge_in_elem(mview->viewcon, el); + + return TRUE; + +} + +static int +nthing_unimplemented(MelysView *mview, struct element *el) +{ + g_warning("The get_nthing method is not implemented"); + return 0; } diff -rNu melys-0.1.2/widgets/melysview.m melys-0.1.3/widgets/melysview.m --- melys-0.1.2/widgets/melysview.m Sat Nov 13 09:20:14 1999 +++ melys-0.1.3/widgets/melysview.m Mon Nov 15 23:37:16 1999 @@ -15,16 +15,17 @@ song with the time along the x axis and something else on the y axis. The methods here take care of scrolling, zooming and song position pointer display. - +>>extern >>header gdk_imlib.h >>header gtk/gtkvbox.h ->>header gtk/gtkdrawingarea.h >>header gtk/gtkadjustment.h +>>header gtk/gtkdnd.h >>header libgnomeui/gnome-canvas.h >>header libgnomeui/gnome-canvas-util.h >>header libgnomeui/gnome-canvas-line.h +>>header libgnomeui/gnome-canvas-rect-ellipse.h >>header libgnomeui/gnome-popup-menu.h >>header elements.h @@ -74,7 +75,7 @@ /* From aligning to a grid */ enum snap_type snap; - struct containerElement *elem; + struct containerElement *viewcon; struct song *song; struct tempomapElement *tempomap; @@ -82,18 +83,95 @@ GtkWidget *canvas; /* The canvas that the subclass will place items on */ GtkWidget *ruler; /* A ruler that can be used */ GtkWidget *posline; /* Song position pointer */ - + //GtkWidget *menu; /* The item context menu */ + /* For the posline */ void *points; + + /* A string to identify our display data */ + char *infostr; + + /* Button click state */ + int click_state; + struct element *click_elem; /* Element clicked on */ + unsigned long click_tick; /* Time at point of click */ + + /* The 'thing' is not necessarily the immediate parent of click_elem */ + /* although it usually will be and it will be an ancestor */ + int click_nthing; /* The y position */ + struct containerElement *click_base; /* Thing at y position */ }; +/* + * The class structure. There is only one of these allocated for + * the class. + */ struct _MelysViewClass { GtkVBoxClass parent_class; void (*scale_changed)(MelysView *); + + /* Method to get the base containing element */ + struct containerElement *(*get_base_from_pos)(MelysView *, int thing); + + /* Method to get the container to drop into */ + //struct containerElement *(*get_drop_con_from_pos)(MelysView *, int thing); + + /* Drop element */ + gboolean (*drop_elem)(MelysView *, struct element *, int thing); + + /* Method to get the 'thing' number from the element */ + int (*get_nthing)(MelysView *, struct element *); +}; + +/* + * A structure to keep track of displayed elements. + */ +struct display_info { + GtkObject *item; /* The associated display item */ + struct containerElement *con; /* Container for elem */ + struct element *elem; /* The element being displayed */ +}; + + +>>headerdef meldnd.h + +/* + * The drag and drop types that belong to this application. + */ +extern GdkAtom MelysElemAtom; +#define MELYS_ELEM_ATOM_NAME "application/x-melys-element" +#define MELYS_ELEM_ATOM_ID 1 + +/* + * Data for same-app transfers. + * If we ever do inter-app transfers then we will have to convert + * to ascii such as mdml or use a corba interface. + * + * This structure is to be used in many contexts, could be + * a part within a track, notes within a part or even a + * part within a part. + */ +struct drag_element_data { + gint32 len; /* Number of elements if this is the first */ + 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 outline_data { + struct _GnomeCanvasGroup *group; + int xoffset; + int yoffset; }; >>extern +#define VIEW_CLASS(mv) MELYS_VIEW_CLASS(GTK_OBJECT(mv)->klass) + /* The list of signal id's that are being added for MelysView. */ >>set signals enum { @@ -101,14 +179,43 @@ LAST_SIGNAL }; -/* Argument numbers */ -enum { - ARG_0, -}; - +/* + * This is used so that we can have different views of the same + * set of notes. Display information is saved with different ids + * for each view + */ +static int ViewID; #define x_to_tick(v, x) view_control_x_to_tick(MELYS_VIEW(v)->vcp, (x)) #define tick_to_x(v, t) view_control_tick_to_x(MELYS_VIEW(v)->vcp, (t)) +#define y_to_thing(v, y) view_control_y_to_thing(MELYS_VIEW(v)->vcp, (y)) +#define thing_to_y(v, thing) view_control_thing_to_y(MELYS_VIEW(v)->vcp, (thing)) + +/* Drag and drop types */ +static const GtkTargetEntry targets[] = { + {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, +}; + +/* All the buttons that we deal with */ +#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) + +/* Mouse click state */ +enum click_state { + CLICK_INACTIVE, + CLICK_BUTTON1_DOWN, + CLICK_BUTTON2_DOWN, + CLICK_BUTTON3_DOWN, + CLICK_DRAGGING, + CLICK_GESTURE, + + CLICK_ERROR +}; + +/* Structure to keep selection info */ +struct sel_info { + struct element *elem; + struct containerElement *con; +}; >>function melys_view_init static void @@ -124,19 +231,17 @@ mview->poffset = 0; mview->vthings = 0; - mview->elem = NULL; + mview->viewcon = NULL; mview->song = NULL; mview->points = gnome_canvas_points_new(2); -#if 0 mview->click_elem = NULL; - mview->click_con = NULL; + mview->click_tick = 0; + mview->click_nthing = 0; + mview->click_base = NULL; mview->click_state = CLICK_INACTIVE; - mview->sel_list = NULL; -#endif - mview->ruler = (GtkWidget *)melys_rule_new(mview->vcp); gtk_widget_ref(mview->ruler); @@ -163,6 +268,8 @@ GNOME_TYPE_CANVAS_LINE, NULL); + mview->infostr = g_strdup_printf("%d-info", ViewID++); + gtk_signal_connect((GtkObject *)mview->vcp, "scale-changed", (GtkSignalFunc)vcp_changed, mview); gtk_signal_connect((GtkObject *)mview->vcp->hadj, "value-changed", @@ -170,11 +277,10 @@ gtk_signal_connect((GtkObject *)mview->vcp->vadj, "value-changed", (GtkSignalFunc)view_scroll, mview); -#if 0 /* Set up a drop site for this widget */ - gtk_drag_dest_set(GTK_WIDGET(mview->canvas), GTK_DEST_DEFAULT_MOTION, + gtk_drag_dest_set(GTK_WIDGET(mview->canvas), + GTK_DEST_DEFAULT_MOTION, targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); - gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-drop", GTK_SIGNAL_FUNC(drag_drop), mview); gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-data-get", @@ -188,7 +294,6 @@ gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", GTK_SIGNAL_FUNC(drag_end), mview); -#endif >>function melys_view_class_init @@ -209,8 +314,6 @@ parent_class = gtk_type_class(gtk_vbox_get_type()); - // XXX Add args - melys_view_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", GTK_RUN_FIRST, object_class->type, @@ -226,6 +329,9 @@ widget_class->draw = view_draw; klass->scale_changed = view_scale_changed; + klass->get_base_from_pos = view_def_get_base; + klass->drop_elem = view_def_drop; + klass->get_nthing = nthing_unimplemented; >>function view_destroy @@ -237,8 +343,6 @@ g_return_if_fail(IS_MELYS_VIEW(obj)); - //clear_all_part_sel(mview, FALSE); - gnome_canvas_points_unref(mview->points); if (mview->posline) @@ -261,22 +365,32 @@ mview->canvas = NULL; } - if (mview->elem) { - md_free(MD_ELEMENT(mview->elem)); - mview->elem = NULL; + if (mview->viewcon) { + md_free(MD_ELEMENT(mview->viewcon)); + mview->viewcon = NULL; } if (mview->tempomap) { md_free(MD_ELEMENT(mview->tempomap)); mview->tempomap = NULL; } + if (mview->infostr) { + g_free(mview->infostr); + mview->infostr = NULL; + } if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); + >>function view_scroll static void GtkAdjustment *adj; gpointer data; + +>>description +Scroll the canvas to the correct position. +Called when a scrollbar changes and when resizing etc. + >>code MelysView *mview = data; GnomeCanvas *canvas; @@ -307,13 +421,17 @@ mview->voffset * mview->vcp->vscale); } - >>function melys_view_set_song void MelysView *mview; The view struct song *song; The song to set +>>description +Set the song that this view is representing. +Useful information such as the song position pointer +and the tempomap are extracted. + >>code g_return_if_fail(mview->song == NULL); @@ -335,36 +453,182 @@ gtk_signal_emit(GTK_OBJECT(mview), melys_view_signals[SCALE_CHANGED]); ->>function melys_view_set_mdroot -void -MelysView *mview; The view -struct rootElement *root; +>>function melys_view_item_event +int +GtkObject *item; This is the canvas item that is receiving the event +GdkEvent *event; The event +gpointer data; The MelysView (sub-class) object >>description -Set the music description root. -If there was an existing one it is freed first. -Everything is reset to display the new song. +The implementation connects "event" of all its relavent canvas +items to this function which implements the standard behaviour +for button clicks etc. >>code + MelysView *mview = data; + struct element *elem; + struct display_info *dinfo; -#if 0 - g_return_if_fail(root != NULL); + /* Get the display data from the group */ + dinfo = gtk_object_get_data(item, mview->infostr); + g_assert(dinfo); + + elem = dinfo->elem; + dprintf(3, "event %d for elem %d", event->type, elem->type); + + switch (event->type) { + case GDK_BUTTON_PRESS: + /* Save the original location */ + mview->click_elem = elem; + mview->click_tick = x_to_tick(mview, event->button.x); + mview->click_nthing = y_to_thing(mview, event->button.y); + + mview->click_base = VIEW_CLASS(mview)->get_base_from_pos( + mview, mview->click_nthing); + + button_press(mview, elem, &event->button); + break; + + case GDK_2BUTTON_PRESS: + //part_prop_box(part, mview->song, 0); + break; + + case GDK_BUTTON_RELEASE: + button_release(mview, elem, &event->button); + break; + + case GDK_MOTION_NOTIFY: + if (event->motion.state & ALL_BUTTON_MASK) + button_motion(mview, elem, &event->motion); + break; + default: + break; + } - if (mview->mdroot) - md_free((struct element *)mview->mdroot); - mview->mdroot = md_root_inc_ref(root); + return TRUE; - mview->vcp->hadj->value = 0.0; - set_hscroll(mview); - set_vscroll(mview); - if (mview->ruler) { - melys_rule_set_tempomap( - (MelysRule *)mview->ruler, md_get_tempomap(root)); +>>function button_press +static void +MelysView *mview; +struct element *elem; +GdkEventButton *event; + +>>description +Action to take when button 1 is pressed. + +>>code + if (mview->click_state != CLICK_INACTIVE) { + mview->click_state = CLICK_ERROR; + return; } - //build_sel_list(mview); /* There may be some parts already selected */ + switch (event->button) { + case 1: + mview->click_state = CLICK_BUTTON1_DOWN; + break; + + case 2: + mview->click_state = CLICK_BUTTON2_DOWN; + break; + + case 3: + /* + * We checked that we were in the correct state, but + * do not change state as the popup menu takes + * control and we never see a button release. + */ + //gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); + break; + } + + +>>function button_release +static void +MelysView *mview; +struct element *elem; +GdkEventButton *event; + +>>description +Button 1 has been pressed on a part item. +This selects the item. + +>>code + int mask; + struct display_info *dinfo; + + dinfo = g_dataset_get_data(elem, mview->infostr); + + if (mview->click_state == CLICK_ERROR) { + + mask = event->state & ALL_BUTTON_MASK; + + switch (event->button) { + case 1: mask &= ~GDK_BUTTON1_MASK; break; + case 2: mask &= ~GDK_BUTTON2_MASK; break; + case 3: mask &= ~GDK_BUTTON3_MASK; break; + } + + /* + * We had an error, now if this is the last button + * to be released then we can clear back to inactive state. + */ + if (mask == 0) + mview->click_state = CLICK_INACTIVE; + return; + } + + switch (event->button) { + case 1: + + dprintf2("Button at %f,%f\n", event->x, event->y); + if (!(event->state & GDK_CONTROL_MASK)) + md_clear_all_sel_by_type(MD_ELEMENT(mview->viewcon), MD_TYPE(elem)); + + MD_SET_SELECTED(elem, !MD_SELECTED(elem)); + + /* Is there a more efficient way */ + song_view_update(mview->song); + + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) + mview->click_state = CLICK_INACTIVE; + break; + +#if 0 + case 2: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mview->click_state = CLICK_INACTIVE; + break; + + case 3: + if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) + mview->click_state = CLICK_INACTIVE; + break; #endif + } + + +>>function button_motion +static void +MelysView *mview; +struct element *elem; +GdkEventMotion *event; + +>>description +Motion when a button is pressed down. +Drag and drop on button 1, gesture based editing on button 2. + +>>code + + switch (mview->click_state) { + case CLICK_BUTTON1_DOWN: + drag_setup(mview, event); + mview->click_state = CLICK_INACTIVE; + break; + default: + break; + } + >>function set_hscroll static void @@ -387,7 +651,7 @@ adj = mview->vcp->hadj; pageticks = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); - ticklen = MD_ENDTIME(mview->elem) + pageticks; + ticklen = MD_ENDTIME(mview->viewcon) + pageticks; adj->lower = 0.0; adj->upper = (double) ticklen; @@ -432,6 +696,7 @@ static void GtkAdjustment *adj; The song adjusment gpointer data; This is our mview pointer + >>description This gets called when the song position pointer is updated. This could be because the user changed it in a different @@ -463,9 +728,9 @@ * avoid too many repeated calls -- it can be shrunk again * later. */ - if (t > MD_ENDTIME(mview->elem)) { - MD_SET_DURATION(mview->elem, t + hadj->page_size); - mview->posadj->upper = MD_ENDTIME(mview->elem); + if (t > MD_ENDTIME(mview->viewcon)) { + MD_SET_DURATION(mview->viewcon, t + hadj->page_size); + mview->posadj->upper = MD_ENDTIME(mview->viewcon); set_scroll_region(mview); } @@ -509,41 +774,9 @@ >>code MelysView *mview = (MelysView *)widget; -#if 0 - int n; - int p; - struct trackElement *track; - struct partElement *part; /* note that this could be part or partref */ -#endif set_scroll_region(mview); -#if 0 - for (n = 0; n < mview->elem->tracks; n++) { - track = md_track_nth(mview->elem, n); - - for (p = 0; p < MD_CONTAINER_LEN(track); p++) { - part = (struct partElement *) MD_GET_INDEX(track, p); - - if (MD_IS_DESTROYED(part)) { - /* This should not be happening */ - dprintf(0, "@func_name: part is destroyed!\n"); - continue; - } - - switch (MD_TYPE(part)) { - case MD_TYPE_PART: - case MD_TYPE_PARTREF: - update_part_item(mview, track, part); - break; - default: - dprintf(0, "Unexpexted type %d in @func_name", MD_TYPE(part)); - break; - } - } - } -#endif - if (mview->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); @@ -627,7 +860,513 @@ static void MelysView *mview; +>>description +Default implementation of our scale_changed signal. +Sets the scroll region to suit the new configuration. + >>code mview->voffset = -1; set_scroll_region(mview); + + +>>function drag_setup +static void +MelysView *mview; +GdkEventMotion *event; + +>>description +>>code + GtkTargetList *tlist; + struct element *clickelem; + struct drag_element_data *dragdata; + GSList *list; + int len; + int i; + + tlist = gtk_target_list_new(targets, NELEM(targets)); + + clickelem = mview->click_elem; + + /* + * If the part that was click was selected, then we move all + * selected parts. If it wasn't then we just move the part that + * was clicked. + */ + if (MD_SELECTED(clickelem)) { + list = md_build_sel(NULL, MD_ELEMENT(mview->click_base), + MD_TYPE(clickelem)); + len = g_slist_length(list); + } else { + /* + * Not moving the selected parts. Just create a + * temporary list of the single part. + */ + len = 1; + list = g_slist_append(NULL, clickelem); + } + + dragdata = g_new0(struct drag_element_data, len); + + for (i = 0; i < len; i++) { + int nthing; + //struct sel_info *sinfo; + struct element *elem; + + elem = g_slist_nth_data(list, i); + //ntrack = MD_TRACK_NUMBER(sinfo->con); + + 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_DURATION(elem); + } + dragdata[0].len = len; + dragdata[0].data_size = sizeof(*dragdata); + + 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, + 1 /* The button number */, (GdkEvent*)event); + + gtk_target_list_unref(tlist); + + +>>function drag_motion +static gboolean +GtkWidget *widget; +GdkDragContext *context; +gint x; +gint y; +guint time; +gpointer user_data; + +>>description +Move around the drag outline group so that the user +can tell where the drag will land. + +>>code + MelysView *mview = user_data; + struct outline_data *oldata; + double wx, wy; + + gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), + (double)x, (double)y, &wx, &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; + + canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); + + return TRUE; + + +>>function drag_enter +static struct outline_data * +MelysView *mview; +GdkDragContext *context; + +>>description +When a drag enters this widget, we construct a set of outlines +that represent the position of the drag. +The following drag motion events will be used to move these +outlines around. + +Keep in mind that the source of the drag could be a different type of +widget. +It could also be from a different application and even from a +different machine, although this isn't supported yet. + +>>code + GtkWidget *srcw; + GnomeCanvasGroup *group; + struct outline_data *oldata; + struct drag_element_data *dragdata; + struct drag_element_data *dp; + long tick_offset; + int thing_offset; + int i; + int len; + + srcw = gtk_drag_get_source_widget(context); + if (srcw == NULL) { + /* Another app probably which we don't yet deal with */ + return NULL; + } + + 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); + } + + /* + * All the outlines are placed into this group so that they + * can be moved as a unit to follow the cursor. + */ + group = (GnomeCanvasGroup *) gnome_canvas_item_new( + gnome_canvas_root((GnomeCanvas*)mview->canvas), + GNOME_TYPE_CANVAS_GROUP, + "x", 0.0, + "y", 0.0, + NULL); + + /* 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); + + /* + * Create the individual outlines for each part that is being + * moved. + */ + for (i = 0; i < len; i++) { + int x1, y1; + + dp = dragdata + i; + x1 = tick_to_x(mview, dp->tick_offset - tick_offset); + y1 = thing_to_y(mview, dp->thing_offset - thing_offset); + + gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, + "x1", (double) x1, + "y1", (double) y1, + "x2", (double) x1 + tick_to_x(mview, dp->tick_len), + "y2", (double) y1 + mview->vcp->vheight, + "width_pixels", 1, + "outline_color", "yellow", + NULL); + } + + /* Save for later use */ + gtk_object_set_data_full(GTK_OBJECT(mview), "outline-data", oldata, + (GtkDestroyNotify)outline_data_free); + + return oldata; + + +>>function drag_leave +static void +GtkWidget *widget; +GdkDragContext *context; +guint time; +gpointer user_data; + +>>description +This gets called when the drag leaves our window and also +at the end of the drag. +So its a good place to tidy up in. + +>>code + MelysView *mview = user_data; + + gtk_object_remove_data(GTK_OBJECT(mview), "outline-data"); + + +>>function drag_drop +static gboolean +GtkWidget *widget; The destination canvas widget +GdkDragContext *context; +gint x; +gint y; +guint time; +gpointer user_data; + +>>description +A callback that is called when a drop is made. +We study the context and decide which format to request. +Then we request the data. + +>>code + + dprintf1("drag drop on %s 0x%x at %d,%d\n", + gtk_type_name(GTK_OBJECT_TYPE(widget)), widget, x, y); + + /* We want the internal element format */ + gtk_drag_get_data(widget, context, MelysElemAtom, time); + + return TRUE; + + +>>function drag_data_send +static void +GtkWidget *widget; The source widget +GdkDragContext *context; The drag context +GtkSelectionData *selection_data; The data is set into here +guint info; Identification of transfer type +guint time; The associated time +gpointer data; The mview widget + +>>description +This is a callback that is executed when the drag_data_get signal is +received. +This means that we are being asked to send the data to +the destination. +It sends the element that is being dragged to the receiving +end. + +>>code + MelysView *mview = data; + struct element *elem; + struct drag_element_data *dragdata; + int len; + + if (info != MELYS_ELEM_ATOM_ID) { + g_warning("unexpected drag type received"); + return; + } + + elem = mview->click_elem; + + 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")); + + gtk_selection_data_set(selection_data, + selection_data->target, 8, + (guchar *)dragdata, len * sizeof(*dragdata)); + + +>>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 +GtkSelectionData *data; Data from the other side +guint info; The type of drag +guint time; Time of event +gpointer user_data; User data, probably not used + +>>description +This routine is called when a signal arrives on the destination +widget to say that data has actually been received. + +>>code + MelysView *mview; + struct drag_element_data *dragdata; + struct drag_element_data *dp; + struct element *newelem; + unsigned long 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; + int len; + int res; + int i; + + mview = MELYS_VIEW(user_data); + newelem = NULL; + + /* We are given window coordinate, so convert to world coords */ + gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), + wx, wy, &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); + + + len = data->length / sizeof(struct drag_element_data); + dragdata = (struct drag_element_data *)data->data; + + /* + * 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. + */ + for (i = 0; i < len; i++) { + dp = dragdata+i; +#if 0 + if (dp->element->type != MD_TYPE_PART) + goto error; +#endif + + /* Check and adjust for droping before the beginning */ + if (dp->thing_offset + drop_thing < 0) + thing_start = MIN(thing_start, dp->thing_offset + drop_thing); + + /* 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); + + md_undo_begin_set(MD_UNDO(mview->mdroot)); + + for (i = 0; i < len; i++) { + int tn; + + dp = dragdata + i; + + switch (context->action) { + case GDK_ACTION_MOVE: + + /* Moving so new is same as old */ + newelem = dp->element; + + MD_REF(newelem); + md_remove(newelem->con, newelem); + + needrm = TRUE; + break; + + case GDK_ACTION_COPY: + newelem = md_copy(dp->element); + MD_REF(newelem); + break; + + default: + g_assert_not_reached(); + } + + tn = drop_thing + dp->thing_offset - thing_start; + + t = snapadj + drop_tick + dp->tick_offset; + g_assert(t >= 0); + + /* + * We set the time, then hand to the class specific + * routine to do the real work of adding to the new track. + */ + md_change_time(newelem, t); + res = VIEW_CLASS(mview)->drop_elem(mview, newelem, tn); + if (res == FALSE) + goto error; /* Realy too late, half done */ + + MD_UNREF(newelem); + + md_clear_data(newelem); + } + + gtk_drag_finish(context, TRUE, needrm, time); + md_undo_end_set(MD_UNDO(mview->mdroot)); + + if (mview->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); + + md_shrink(mview->song->mdroot); + song_view_update(mview->song); + return; + + error: + gtk_drag_finish(context, FALSE, FALSE, time); + + +>>function outline_data_free +static void +gpointer data; + +>>code + struct outline_data *od = data; + + gtk_object_destroy(GTK_OBJECT(od->group)); + g_free(od); + + +>>function drag_end +static void +GtkWidget *widget; +GdkDragContext *drag_context; +gpointer user_data; + +>>code + MelysView *mview = user_data; + + dprintf2("@func_name\n"); + gtk_object_remove_data(GTK_OBJECT(mview), "drag-element-data"); + + +>>function view_def_get_base +static struct containerElement * +MelysView *mview; +int thing; + +>>description +The default implementation of this method returns the +same container that the view is based on. +This is correct for the piano roll and tempo views. +It will need overriding for the part display view. + +>>code + + return mview->viewcon; + + +>>function view_def_drop +static gboolean +MelysView *mview; +struct element *el; +int thing; + +>>description +The default implementation of this method returns the +topmost container above the one that the view is based on +ignoring the specified thing position. +Will probably always have to be overridden, so maybe not +useful. + +>>code + + dprintf1("merging in at %d\n", MD_TIME(el)); + md_set_devchan(el, MD_DEVCHAN(mview->viewcon)); + merge_in_elem(mview->viewcon, el); + + return TRUE; + + +>>function nthing_unimplemented +static int +MelysView *mview; +struct element *el; + +>>code + g_warning("The get_nthing method is not implemented"); + return 0;