Copying parts

The way to copy a single or several parts is very + similar to the way that parts are moved. + Instead of holding down the shift key, you should hold + down the control key. The symbol on the drag icon + will change to a plus sign to show that a copy will be + performed. + In fact the default action is to copy so no keys need to + be held down at all. + +

Caveats

Copying, linking are not implemented yet. +> Linking is not implemented yet. Do not allow parts to overlap, although nothing bad will happen the behaviour is currently difficult to predict and will be changed. diff -rNu melys-0.0.17/help/C/html/index.html melys-0.0.18/help/C/html/index.html --- melys-0.0.17/help/C/html/index.html Wed Oct 13 20:24:28 1999 +++ melys-0.0.18/help/C/html/index.html Thu Oct 14 18:18:30 1999 @@ -147,6 +147,11 @@ >

Copying parts

Part properties

For example if the two parts are selected on the same track, then when they are moved they will maintain the same time difference relative to each other at the destination. Likewise if parts are on different tracks, say three tracks apart then the parts will remain three tracks apart at their final destination. + + Copying parts + + The way to copy a single or several parts is very + similar to the way that parts are moved. + Instead of holding down the shift key, you should hold + down the control key. The symbol on the drag icon + will change to a plus sign to show that a copy will be + performed. + In fact the default action is to copy so no keys need to + be held down at all. Caveats - Copying, linking are not implemented yet. + Linking is not implemented yet. Do not allow parts to overlap, although nothing bad will happen the behaviour is currently difficult to predict and will be changed. diff -rNu melys-0.0.17/include/elements.h melys-0.0.18/include/elements.h --- melys-0.0.17/include/elements.h Wed Oct 13 20:23:58 1999 +++ melys-0.0.18/include/elements.h Thu Oct 14 18:18:02 1999 @@ -53,7 +53,7 @@ struct rootElement { struct containerElement parent; struct headElement *head; /* Pointer to the head information */ - short tracks; /* Number of music tracks */ + short tracks; /* Number of tracks */ }; #define MD_ROOT(e) \ ((struct rootElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ROOT)) @@ -302,6 +302,7 @@ struct rootElement *md_root_inc_ref(struct rootElement *root); int md_part_id(void); char *md_textname(int type); +struct element *md_copy(struct element *e); /* Defines for types */ diff -rNu melys-0.0.17/include/md.h melys-0.0.18/include/md.h --- melys-0.0.17/include/md.h Wed Oct 13 20:23:58 1999 +++ melys-0.0.18/include/md.h Thu Oct 14 18:18:02 1999 @@ -39,6 +39,7 @@ void md_merge_in(struct trackElement *track, struct containerElement *list, enum merge_mode mode); int md_get_nfree(void); +struct element *md_copy(struct element *e); void md_list_append(struct containerElement *c, struct element *el); void md_list_prepend(struct containerElement *c, struct element *el); @@ -52,6 +53,7 @@ struct element *md_list_find_by_time(struct containerElement *ctrk, unsigned long time); void md_save_elem(struct containerElement *c, struct element *el); +struct element *md_copy(struct element *e); struct sequenceState *md_seq_init(struct containerElement *con, gboolean nodes); @@ -63,10 +65,12 @@ unsigned long time); void md_elem_seek_back(struct sequenceState *seq, struct tracklikeElement *ltrack, unsigned long time); +struct element *md_copy(struct element *e); struct partElement *md_split(struct partElement *origpart, unsigned long t); void md_part_join(struct containerElement *c, struct partElement *part1); +struct element *md_copy(struct element *e); /* * The list of operation types that can be undone. This is intended @@ -90,9 +94,10 @@ void md_undo_op(struct undo_set *undo, enum undo_op op, struct containerElement *c, struct element *el); void md_undo_time_op(struct undo_set *undo, enum undo_op op, - struct containerElement *c, struct element *el, unsigned long t); + struct element *el, unsigned long t); void md_undo_back(struct undo_set *undo); void md_undo_forward(struct undo_set *undo); +struct element *md_copy(struct element *e); /* * Some macros to handle accessing some common fields in the @@ -133,10 +138,12 @@ * Also these macros are not undoable, so to summarise they should * only be used for building up higher level routines. */ -#define MD_SET_DEVCHAN(el, devchan) \ - (((struct element *)el)->device_channel = devchan) #define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) -#define MD_SET_TIME(el, t) MD_TIME(el) = (t) +#define MD_SET_DEVCHAN(el, devchan) do {\ + (((struct element *)el)->device_channel = devchan);\ + MD_SET_MODIFIED(el, TRUE); } while (0) +#define MD_SET_TIME(el, t) do {MD_TIME(el) = (t);\ + MD_SET_MODIFIED(el, TRUE); } while (0) #define MD_SET_DURATION(el, t) do { \ ((struct containerElement *)(el))->duration = (t); \ MD_SET_MODIFIED(el, TRUE); \ @@ -183,6 +190,7 @@ void md_set_devchan(struct element *base, int devchan); void md_set_program(struct trackElement *track, int program, gboolean clear); void md_change_time(struct element *el, unsigned long t); +void md_clear_all_mod(struct element *base); void md_shrink(struct rootElement *root); void md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, struct mbt *mbtp); @@ -190,3 +198,4 @@ struct mbt *inmbtp); unsigned long md_snap_tick(struct tempomapElement *tmap, int snap, unsigned long tick); +struct element *md_copy(struct element *e); diff -rNu melys-0.0.17/include/pixmaps.h melys-0.0.18/include/pixmaps.h --- melys-0.0.17/include/pixmaps.h Wed Oct 13 20:24:00 1999 +++ melys-0.0.18/include/pixmaps.h Thu Oct 14 18:18:05 1999 @@ -23,6 +23,11 @@ +extern char *plus_xpm[]; +extern char *minus_xpm[]; + + + extern char *mrec_xpm[]; extern char *mplay_xpm[]; extern char *mpause_xpm[]; diff -rNu melys-0.0.17/md/elements.c melys-0.0.18/md/elements.c --- melys-0.0.17/md/elements.c Wed Oct 13 20:24:11 1999 +++ melys-0.0.18/md/elements.c Thu Oct 14 18:18:15 1999 @@ -41,16 +41,51 @@ /* Static functions */ static void md_element_init(struct element *e); +static void md_element_copy(struct element *new, struct element *e); static void md_container_init(struct containerElement *e); +static void md_container_copy(struct containerElement *new, + struct containerElement *e); static void md_root_init(struct rootElement *e); +static void md_root_copy(struct rootElement *new, struct rootElement *e); static void md_head_init(struct headElement *e); +static void md_head_copy(struct headElement *new, struct headElement *e); +static void md_tracklike_copy(struct tracklikeElement *new, + struct tracklikeElement *e); static void md_track_init(struct trackElement *e); +static void md_track_copy(struct trackElement *new, struct trackElement *e); static void md_tempomap_init(struct tempomapElement *e); +static void md_tempomap_copy(struct tempomapElement *new, + struct tempomapElement *e); +static void md_note_copy(struct noteElement *new, struct noteElement *e); static void md_part_init(struct partElement *e); +static void md_part_copy(struct partElement *new, struct partElement *e); static void md_partref_init(struct partrefElement *e); +static void md_partref_copy(struct partrefElement *new, + struct partrefElement *e); static void md_take_init(struct takeElement *e); +static void md_take_copy(struct takeElement *new, struct takeElement *e); +static void md_control_copy(struct controlElement *new, + struct controlElement *e); +static void md_program_copy(struct programElement *new, + struct programElement *e); +static void md_keytouch_copy(struct keytouchElement *new, + struct keytouchElement *e); +static void md_pressure_copy(struct pressureElement *new, + struct pressureElement *e); +static void md_pitch_copy(struct pitchElement *new, struct pitchElement *e); +static void md_sysex_copy(struct sysexElement *new, struct sysexElement *e); static void md_meta_init(struct metaElement *e); +static void md_meta_copy(struct metaElement *new, struct metaElement *e); static void md_map_init(struct mapElement *e); +static void md_map_copy(struct mapElement *new, struct mapElement *e); +static void md_keysig_copy(struct keysigElement *new, struct keysigElement *e); +static void md_timesig_copy(struct timesigElement *new, + struct timesigElement *e); +static void md_tempo_copy(struct tempoElement *new, struct tempoElement *e); +static void md_text_copy(struct textElement *new, struct textElement *e); +static void md_smpteoffset_copy(struct smpteoffsetElement *new, + struct smpteoffsetElement *e); +static void md_noop_copy(struct noopElement *new, struct noopElement *e); /* @@ -85,6 +120,28 @@ } /* + * Copy the element element. This makes a deep copy, in other + * words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_element_copy(struct element *new, struct element *e) +{ + + Nelements++; + new->refcount = 1; + new->floating = 1; + new->modified = 1; + new->selected = 0; + new->wref = 0; + g_assert(!new->destroyed); +} + +/* * Create and initialise a container element. */ struct containerElement * @@ -114,6 +171,33 @@ } /* + * Copy the containerElement element. This makes a deep copy, + * in other words all elements are copied recursively. Copy + * all pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_container_copy(struct containerElement *new, struct containerElement *e) +{ + + new->elements = g_ptr_array_new(); + { + struct element *el; + struct element *cp; + int i; + for (i = 0; i < MD_CONTAINER_LEN(e); i++) { + el = MD_GET_INDEX(e, i); + cp = md_copy(el); + md_add(MD_CONTAINER(new), cp); + } + } + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a root element. */ struct rootElement * @@ -143,6 +227,24 @@ } /* + * Copy the rootElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_root_copy(struct rootElement *new, struct rootElement *e) +{ + + new->head = NULL; + new->tracks = 0; + md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); +} + +/* * Create and initialise a head element. */ struct headElement * @@ -175,6 +277,30 @@ } /* + * Copy the headElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_head_copy(struct headElement *new, struct headElement *e) +{ + + if (e->copyright) + new->copyright = g_strdup(e->copyright); + if (e->author) + new->author = g_strdup(e->author); + if (e->title) + new->title = g_strdup(e->title); + if (e->comment) + new->comment = g_strdup(e->comment); + md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); +} + +/* * Create and initialise a tracklike element. */ struct tracklikeElement * @@ -189,6 +315,22 @@ } /* + * Copy the tracklikeElement element. This makes a deep copy, + * in other words all elements are copied recursively. Copy + * all pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_tracklike_copy(struct tracklikeElement *new, struct tracklikeElement *e) +{ + + md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); +} + +/* * Create and initialise a track element. */ struct trackElement * @@ -216,6 +358,26 @@ md_container_init(MD_CONTAINER(e)); e->name = NULL; e->program = 0; + e->notes = NULL; +} + +/* + * Copy the trackElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_track_copy(struct trackElement *new, struct trackElement *e) +{ + + if (e->name) + new->name = g_strdup(e->name); + new->notes = NULL; + md_tracklike_copy(MD_TRACKLIKE(new), MD_TRACKLIKE(e)); } /* @@ -248,6 +410,22 @@ } /* + * Copy the tempomapElement element. This makes a deep copy, + * in other words all elements are copied recursively. Copy + * all pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_tempomap_copy(struct tempomapElement *new, struct tempomapElement *e) +{ + + md_tracklike_copy(MD_TRACKLIKE(new), MD_TRACKLIKE(e)); +} + +/* * Create and initialise a note element. */ struct noteElement * @@ -265,6 +443,22 @@ } /* + * Copy the noteElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_note_copy(struct noteElement *new, struct noteElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a part element. */ struct partElement * @@ -294,6 +488,24 @@ } /* + * Copy the partElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_part_copy(struct partElement *new, struct partElement *e) +{ + + if (e->name) + new->name = g_strdup(e->name); + md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); +} + +/* * Create and initialise a partref element. */ struct partrefElement * @@ -323,6 +535,24 @@ } /* + * Copy the partrefElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_partref_copy(struct partrefElement *new, struct partrefElement *e) +{ + + e->ref = NULL; + g_warning("md_partref_copy: needs implementing"); + md_part_copy(MD_PART(new), MD_PART(e)); +} + +/* * Create and initialise a take element. */ struct takeElement * @@ -352,6 +582,23 @@ } /* + * Copy the takeElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_take_copy(struct takeElement *new, struct takeElement *e) +{ + + new->name = g_strdup(e->name); + md_container_copy(MD_CONTAINER(new), MD_CONTAINER(e)); +} + +/* * Create and initialise a control element. */ struct controlElement * @@ -368,6 +615,22 @@ } /* + * Copy the controlElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_control_copy(struct controlElement *new, struct controlElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a program element. */ struct programElement * @@ -383,6 +646,22 @@ } /* + * Copy the programElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_program_copy(struct programElement *new, struct programElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a keytouch element. */ struct keytouchElement * @@ -399,6 +678,22 @@ } /* + * Copy the keytouchElement element. This makes a deep copy, + * in other words all elements are copied recursively. Copy + * all pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_keytouch_copy(struct keytouchElement *new, struct keytouchElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a pressure element. */ struct pressureElement * @@ -414,6 +709,22 @@ } /* + * Copy the pressureElement element. This makes a deep copy, + * in other words all elements are copied recursively. Copy + * all pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_pressure_copy(struct pressureElement *new, struct pressureElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a pitch element. */ struct pitchElement * @@ -429,6 +740,22 @@ } /* + * Copy the pitchElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_pitch_copy(struct pitchElement *new, struct pitchElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a sysex element. */ struct sysexElement * @@ -451,6 +778,23 @@ } /* + * Copy the sysexElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_sysex_copy(struct sysexElement *new, struct sysexElement *e) +{ + + new->data = g_memdup(e->data, e->length); + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a meta element. */ struct metaElement * @@ -480,6 +824,22 @@ } /* + * Copy the metaElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_meta_copy(struct metaElement *new, struct metaElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a map element. */ struct mapElement * @@ -509,6 +869,22 @@ } /* + * Copy the mapElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_map_copy(struct mapElement *new, struct mapElement *e) +{ + + md_meta_copy(MD_META(new), MD_META(e)); +} + +/* * Create and initialise a keysig element. */ struct keysigElement * @@ -525,6 +901,22 @@ } /* + * Copy the keysigElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_keysig_copy(struct keysigElement *new, struct keysigElement *e) +{ + + md_map_copy(MD_MAP(new), MD_MAP(e)); +} + +/* * Create and initialise a timesig element. */ struct timesigElement * @@ -543,6 +935,22 @@ } /* + * Copy the timesigElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_timesig_copy(struct timesigElement *new, struct timesigElement *e) +{ + + md_map_copy(MD_MAP(new), MD_MAP(e)); +} + +/* * Create and initialise a tempo element. */ struct tempoElement * @@ -558,6 +966,22 @@ } /* + * Copy the tempoElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_tempo_copy(struct tempoElement *new, struct tempoElement *e) +{ + + md_map_copy(MD_MAP(new), MD_MAP(e)); +} + +/* * Create and initialise a text element. */ struct textElement * @@ -579,6 +1003,23 @@ } /* + * Copy the textElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_text_copy(struct textElement *new, struct textElement *e) +{ + + new->text = g_strdup(e->text); + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a smpteoffset element. */ struct smpteoffsetElement * @@ -599,6 +1040,23 @@ } /* + * Copy the smpteoffsetElement element. This makes a deep + * copy, in other words all elements are copied recursively. + * Copy all pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_smpteoffset_copy(struct smpteoffsetElement *new, + struct smpteoffsetElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Create and initialise a noop element. */ struct noopElement * @@ -614,6 +1072,22 @@ } /* + * Copy the noopElement element. This makes a deep copy, in + * other words all elements are copied recursively. Copy all + * pointer content from e to new. + * + * Arguments: + * new - Pointer to copy into + * e - Pointer to copy + */ +static void +md_noop_copy(struct noopElement *new, struct noopElement *e) +{ + + md_element_copy(MD_ELEMENT(new), MD_ELEMENT(e)); +} + +/* * Check that the given element can be casted to the given type. * This is mainly for debugging as mismatches will not happen * in proper use. In particular do not use this routine to check @@ -697,4 +1171,173 @@ "cuepoint", }; return typenames[type]; +} + +/* + * Make a deep copy of the element. The element itself and all + * its contents are copied. So a whole song can be copied by + * passing in a root. + * + * Arguments: + * e - Element to copy + */ +struct element * +md_copy(struct element *e) +{ + struct element *new = NULL; + + switch (e->type) { + case MD_TYPE_ELEMENT: + new = (struct element *)g_new0(struct element, 1); + *(struct element *)new = *(struct element *)e; + md_element_copy((struct element *)new, + (struct element *)e); + break; + case MD_TYPE_CONTAINER: + new = (struct element *)g_new0(struct containerElement, 1); + *(struct containerElement *)new = *(struct containerElement *)e; + md_container_copy((struct containerElement *)new, + (struct containerElement *)e); + break; + case MD_TYPE_ROOT: + new = (struct element *)g_new0(struct rootElement, 1); + *(struct rootElement *)new = *(struct rootElement *)e; + md_root_copy((struct rootElement *)new, + (struct rootElement *)e); + break; + case MD_TYPE_HEAD: + new = (struct element *)g_new0(struct headElement, 1); + *(struct headElement *)new = *(struct headElement *)e; + md_head_copy((struct headElement *)new, + (struct headElement *)e); + break; + case MD_TYPE_TRACKLIKE: + new = (struct element *)g_new0(struct tracklikeElement, 1); + *(struct tracklikeElement *)new = *(struct tracklikeElement *)e; + md_tracklike_copy((struct tracklikeElement *)new, + (struct tracklikeElement *)e); + break; + case MD_TYPE_TRACK: + new = (struct element *)g_new0(struct trackElement, 1); + *(struct trackElement *)new = *(struct trackElement *)e; + md_track_copy((struct trackElement *)new, + (struct trackElement *)e); + break; + case MD_TYPE_TEMPOMAP: + new = (struct element *)g_new0(struct tempomapElement, 1); + *(struct tempomapElement *)new = *(struct tempomapElement *)e; + md_tempomap_copy((struct tempomapElement *)new, + (struct tempomapElement *)e); + break; + case MD_TYPE_NOTE: + new = (struct element *)g_new0(struct noteElement, 1); + *(struct noteElement *)new = *(struct noteElement *)e; + md_note_copy((struct noteElement *)new, + (struct noteElement *)e); + break; + case MD_TYPE_PART: + new = (struct element *)g_new0(struct partElement, 1); + *(struct partElement *)new = *(struct partElement *)e; + md_part_copy((struct partElement *)new, + (struct partElement *)e); + break; + case MD_TYPE_PARTREF: + new = (struct element *)g_new0(struct partrefElement, 1); + *(struct partrefElement *)new = *(struct partrefElement *)e; + md_partref_copy((struct partrefElement *)new, + (struct partrefElement *)e); + break; + case MD_TYPE_TAKE: + new = (struct element *)g_new0(struct takeElement, 1); + *(struct takeElement *)new = *(struct takeElement *)e; + md_take_copy((struct takeElement *)new, + (struct takeElement *)e); + break; + case MD_TYPE_CONTROL: + new = (struct element *)g_new0(struct controlElement, 1); + *(struct controlElement *)new = *(struct controlElement *)e; + md_control_copy((struct controlElement *)new, + (struct controlElement *)e); + break; + case MD_TYPE_PROGRAM: + new = (struct element *)g_new0(struct programElement, 1); + *(struct programElement *)new = *(struct programElement *)e; + md_program_copy((struct programElement *)new, + (struct programElement *)e); + break; + case MD_TYPE_KEYTOUCH: + new = (struct element *)g_new0(struct keytouchElement, 1); + *(struct keytouchElement *)new = *(struct keytouchElement *)e; + md_keytouch_copy((struct keytouchElement *)new, + (struct keytouchElement *)e); + break; + case MD_TYPE_PRESSURE: + new = (struct element *)g_new0(struct pressureElement, 1); + *(struct pressureElement *)new = *(struct pressureElement *)e; + md_pressure_copy((struct pressureElement *)new, + (struct pressureElement *)e); + break; + case MD_TYPE_PITCH: + new = (struct element *)g_new0(struct pitchElement, 1); + *(struct pitchElement *)new = *(struct pitchElement *)e; + md_pitch_copy((struct pitchElement *)new, + (struct pitchElement *)e); + break; + case MD_TYPE_SYSEX: + new = (struct element *)g_new0(struct sysexElement, 1); + *(struct sysexElement *)new = *(struct sysexElement *)e; + md_sysex_copy((struct sysexElement *)new, + (struct sysexElement *)e); + break; + case MD_TYPE_META: + new = (struct element *)g_new0(struct metaElement, 1); + *(struct metaElement *)new = *(struct metaElement *)e; + md_meta_copy((struct metaElement *)new, + (struct metaElement *)e); + break; + case MD_TYPE_MAP: + new = (struct element *)g_new0(struct mapElement, 1); + *(struct mapElement *)new = *(struct mapElement *)e; + md_map_copy((struct mapElement *)new, + (struct mapElement *)e); + break; + case MD_TYPE_KEYSIG: + new = (struct element *)g_new0(struct keysigElement, 1); + *(struct keysigElement *)new = *(struct keysigElement *)e; + md_keysig_copy((struct keysigElement *)new, + (struct keysigElement *)e); + break; + case MD_TYPE_TIMESIG: + new = (struct element *)g_new0(struct timesigElement, 1); + *(struct timesigElement *)new = *(struct timesigElement *)e; + md_timesig_copy((struct timesigElement *)new, + (struct timesigElement *)e); + break; + case MD_TYPE_TEMPO: + new = (struct element *)g_new0(struct tempoElement, 1); + *(struct tempoElement *)new = *(struct tempoElement *)e; + md_tempo_copy((struct tempoElement *)new, + (struct tempoElement *)e); + break; + case MD_TYPE_TEXT: + new = (struct element *)g_new0(struct textElement, 1); + *(struct textElement *)new = *(struct textElement *)e; + md_text_copy((struct textElement *)new, + (struct textElement *)e); + break; + case MD_TYPE_SMPTEOFFSET: + new = (struct element *)g_new0(struct smpteoffsetElement, 1); + *(struct smpteoffsetElement *)new = *(struct smpteoffsetElement *)e; + md_smpteoffset_copy((struct smpteoffsetElement *)new, + (struct smpteoffsetElement *)e); + break; + case MD_TYPE_NOOP: + new = (struct element *)g_new0(struct noopElement, 1); + *(struct noopElement *)new = *(struct noopElement *)e; + md_noop_copy((struct noopElement *)new, + (struct noopElement *)e); + break; + } + + return new; } diff -rNu melys-0.0.17/md/elements.m melys-0.0.18/md/elements.m --- melys-0.0.17/md/elements.m Tue Oct 12 00:25:05 1999 +++ melys-0.0.18/md/elements.m Thu Oct 14 00:03:35 1999 @@ -55,6 +55,14 @@ e->floating = 1; e->modified = 1; Nelements++; +copy + Nelements++; + new->refcount = 1; + new->floating = 1; + new->modified = 1; + new->selected = 0; + new->wref = 0; + g_assert(!new->destroyed); /* * An element that holds others. This includes tracks, parts and the @@ -66,16 +74,31 @@ init e->elements = g_ptr_array_new(); - +copy + new->elements = g_ptr_array_new(); + { + struct element *el; + struct element *cp; + int i; + + for (i = 0; i < MD_CONTAINER_LEN(e); i++) { + el = MD_GET_INDEX(e, i); + cp = md_copy(el); + md_add(MD_CONTAINER(new), cp); + } + } /* * The root element, used to hold all the other elements. */ >>elementdef root container struct headElement *head; /* Pointer to the head information */ - short tracks; /* Number of music tracks */ + short tracks; /* Number of tracks */ init e->head = NULL; +copy + new->head = NULL; + new->tracks = 0; /* * A holder for all kinds of information about the file. @@ -93,6 +116,15 @@ e->author = NULL; e->title = NULL; e->comment = NULL; +copy + if (e->copyright) + new->copyright = g_strdup(e->copyright); + if (e->author) + new->author = g_strdup(e->author); + if (e->title) + new->title = g_strdup(e->title); + if (e->comment) + new->comment = g_strdup(e->comment); >># Superclass of both track and tempomap >>elementdef tracklike container @@ -119,6 +151,11 @@ init e->name = NULL; e->program = 0; + e->notes = NULL; +copy + if (e->name) + new->name = g_strdup(e->name); + new->notes = NULL; >># For the tempomap, its a special kind of track. >>elementdef tempomap tracklike @@ -147,6 +184,9 @@ /* Private stuff */ init e->name = NULL; +copy + if (e->name) + new->name = g_strdup(e->name); >># This is not really a part as it is not even a container. >># I have considered allowing partref to have some extra events @@ -158,11 +198,16 @@ struct partElement *ref; /* The part referenced */ init e->ref = NULL; +copy + e->ref = NULL; + g_warning("@func_name: needs implementing"); >>elementdef take container char *name; init e->name = NULL; +copy + new->name = g_strdup(e->name); >># As with note should be kept as small as possible >>elementdef control element @@ -209,6 +254,8 @@ } e->status = status; e->length = len; +copy + new->data = g_memdup(e->data, e->length); free g_free(e->data); @@ -256,6 +303,8 @@ e->length = strlen(text); else e->length = 0; +copy + new->text = g_strdup(e->text); free g_free(e->text); diff -rNu melys-0.0.17/md/mdtools.c melys-0.0.18/md/mdtools.c --- melys-0.0.17/md/mdtools.c Wed Oct 13 20:24:12 1999 +++ melys-0.0.18/md/mdtools.c Thu Oct 14 18:18:16 1999 @@ -77,7 +77,7 @@ MD_SET_DURATION(origpart, t - MD_TIME(origpart)); md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, - NULL, MD_ELEMENT(origpart), t); + MD_ELEMENT(origpart), t); md_undo_end_set(MD_UNDO(origpart)); diff -rNu melys-0.0.17/md/mdtools.m melys-0.0.18/md/mdtools.m --- melys-0.0.17/md/mdtools.m Fri Oct 8 22:48:52 1999 +++ melys-0.0.18/md/mdtools.m Thu Oct 14 12:05:09 1999 @@ -72,7 +72,7 @@ MD_SET_DURATION(origpart, t - MD_TIME(origpart)); md_undo_time_op(MD_UNDO(origpart), MD_UNDO_CHANGE_DURATION, - NULL, MD_ELEMENT(origpart), t); + MD_ELEMENT(origpart), t); md_undo_end_set(MD_UNDO(origpart)); diff -rNu melys-0.0.17/md/mdundo.c melys-0.0.18/md/mdundo.c --- melys-0.0.17/md/mdundo.c Wed Oct 13 20:24:12 1999 +++ melys-0.0.18/md/mdundo.c Thu Oct 14 18:18:16 1999 @@ -88,13 +88,12 @@ * Arguments: * undo - The undo set for the element * op - Operation performed - * c - Container added/removed from * el - Element that was added/removed/changed * t - The time difference to apply */ void -md_undo_time_op(struct undo_set *undo, enum undo_op op, - struct containerElement *c, struct element *el, unsigned long t) +md_undo_time_op(struct undo_set *undo, enum undo_op op, struct element *el, + unsigned long t) { } diff -rNu melys-0.0.17/md/mdundo.m melys-0.0.18/md/mdundo.m --- melys-0.0.17/md/mdundo.m Sun Oct 10 19:09:00 1999 +++ melys-0.0.18/md/mdundo.m Thu Oct 14 12:05:09 1999 @@ -82,7 +82,6 @@ void struct undo_set *undo; The undo set for the element enum undo_op op; Operation performed -struct containerElement *c; Container added/removed from struct element *el; Element that was added/removed/changed unsigned long t; The time difference to apply diff -rNu melys-0.0.17/md/mdutil.c melys-0.0.18/md/mdutil.c --- melys-0.0.17/md/mdutil.c Wed Oct 13 20:24:12 1999 +++ melys-0.0.18/md/mdutil.c Thu Oct 14 18:18:17 1999 @@ -176,6 +176,7 @@ for (i = root->tracks - 1; i < n; i++) { track = md_track_new(); + MD_SET_DEVCHAN(track, root->tracks); md_add(MD_CONTAINER(root), MD_ELEMENT(track)); } @@ -266,7 +267,7 @@ undo = MD_UNDO(el); - md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, NULL/*XXX*/, el, t); + md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, el, t); tdiff = t - MD_TIME(el); set_diff_time(el, tdiff); @@ -287,6 +288,29 @@ MD_SET_TIME(el, MD_TIME(el) + tdiff); if (iscontainer(el)) set_diff_time(el, tdiff); + } +} + +/* + * Clear the modification flag on the specified element base + * and all descendant elements. + */ +void +md_clear_all_mod(struct element *base) +{ + int i; + struct element *el; + + base->modified = 0; + + if (iscontainer(base)) { + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + if (iscontainer(el)) + md_clear_all_mod(el); + else + el->modified = 0; + } } } diff -rNu melys-0.0.17/md/mdutil.m melys-0.0.18/md/mdutil.m --- melys-0.0.17/md/mdutil.m Wed Oct 13 13:26:35 1999 +++ melys-0.0.18/md/mdutil.m Thu Oct 14 12:05:09 1999 @@ -56,10 +56,12 @@ * Also these macros are not undoable, so to summarise they should * only be used for building up higher level routines. */ -#define MD_SET_DEVCHAN(el, devchan) \ - (((struct element *)el)->device_channel = devchan) #define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) -#define MD_SET_TIME(el, t) MD_TIME(el) = (t) +#define MD_SET_DEVCHAN(el, devchan) do {\ + (((struct element *)el)->device_channel = devchan);\ + MD_SET_MODIFIED(el, TRUE); } while (0) +#define MD_SET_TIME(el, t) do {MD_TIME(el) = (t);\ + MD_SET_MODIFIED(el, TRUE); } while (0) #define MD_SET_DURATION(el, t) do { \ ((struct containerElement *)(el))->duration = (t); \ MD_SET_MODIFIED(el, TRUE); \ @@ -252,6 +254,7 @@ for (i = root->tracks - 1; i < n; i++) { track = md_track_new(); + MD_SET_DEVCHAN(track, root->tracks); md_add(MD_CONTAINER(root), MD_ELEMENT(track)); } @@ -348,7 +351,7 @@ undo = MD_UNDO(el); - md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, NULL/*XXX*/, el, t); + md_undo_time_op(undo, MD_UNDO_CHANGE_TIME, el, t); tdiff = t - MD_TIME(el); set_diff_time(el, tdiff); @@ -371,6 +374,32 @@ MD_SET_TIME(el, MD_TIME(el) + tdiff); if (iscontainer(el)) set_diff_time(el, tdiff); + } + + +>>function md_clear_all_mod +void +struct element *base; + +>>description +Clear the modification flag on the specified element +.A base +and all descendant elements. + +>>code + int i; + struct element *el; + + base->modified = 0; + + if (iscontainer(base)) { + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + if (iscontainer(el)) + md_clear_all_mod(el); + else + el->modified = 0; + } } diff -rNu melys-0.0.17/mlib/PROJECT/base.py melys-0.0.18/mlib/PROJECT/base.py --- melys-0.0.17/mlib/PROJECT/base.py Sat Sep 25 21:52:03 1999 +++ melys-0.0.18/mlib/PROJECT/base.py Thu Oct 14 00:04:06 1999 @@ -17,6 +17,26 @@ import mcode import PROJECT.cmds +mdcopypre = """ +>>function md_copy +struct element * +struct element *e; Element to copy +>>description +Make a deep copy of the element. +The element itself and all its contents are copied. +So a whole song can be copied by passing in a root. +>>code + struct element *new = NULL; + + switch (e->type) { +""" + +mdcopypost = """ + } + + return new; +""" + class base: # A list of headers that are going to be pretty much essential # for any file within the project. @@ -25,6 +45,7 @@ def __init__(self): self.mdelemdict = {} + self.mdcopylines = [] self.containers[0][1] = self.containers[0][1] + [ "elementdef", "gtkobject"] self.containers.append( @@ -56,6 +77,7 @@ def E_elementdef(self, m): mdelem = self.mdelem name = mdelem.name + copy = self.mdcopylines lines = [] # Write out the structure definition @@ -128,6 +150,7 @@ lines.append("%s" % l) # Do the destructor + # NOT USED ?? XXX if mdelem.freefn: lines.append(">>function md_%s_free" % name) lines.append("static void") @@ -140,12 +163,45 @@ for l in mdelem.freefn: lines.append("%s" % l) + lines.append(">>function md_%s_copy" % name) + lines.append("static void") + lines.append("struct %s *new; Pointer to copy into" % sname(name)) + lines.append("struct %s *e; Pointer to copy" % sname(name)) + lines.append(">>description") + lines.append("Copy the %s element." % sname(name)) + lines.append("This makes a deep copy, in other words all") + lines.append("elements are copied recursively.") + lines.append("Copy all pointer content from e to new.") + lines.append(">>code") + lines.append("") + # Write out our specific lines + for l in mdelem.copyfn: + lines.append("%s" % l) + # Chain up to the parent + parent = mdelem.parent + if parent: + lines.append(" md_%s_copy(MD_%s(new), MD_%s(e));" % ( + mdelem.parent, string.upper(mdelem.parent), + string.upper(mdelem.parent) + )) + + # Do the code for the element copy routine + copy.append(" case MD_TYPE_%s:" % string.upper(name)) + copy.append(" new = (struct element *)g_new0(struct %s, 1);" + % sname(name)) + copy.append(" *(struct %s *)new = *(struct %s *)e;" + % (sname(name), sname(name))) + copy.append(" md_%s_copy((struct %s *)new," % (name, sname(name))) + copy.append(" (struct %s *)e);" % sname(name)) + copy.append(" break;") + lines.append("") str = string.join(lines, "\n") f = cStringIO.StringIO(str) m.process_file(f) + def B_gtkobject(self, m, args): import mgtk mgtk.begin(self, m, args) @@ -153,6 +209,12 @@ def E_gtkobject(self, m): import mgtk mgtk.end(self, m) + + def end_file(self, m, name): + if self.mdcopylines: + str = string.join(self.mdcopylines, '\n') + f = cStringIO.StringIO(mdcopypre + str + mdcopypost) + m.process_file(f) # Return true if the element name is a kind of container. diff -rNu melys-0.0.17/mlib/PROJECT/cmds.py melys-0.0.18/mlib/PROJECT/cmds.py --- melys-0.0.17/mlib/PROJECT/cmds.py Fri May 14 22:24:51 1999 +++ melys-0.0.18/mlib/PROJECT/cmds.py Thu Oct 14 00:04:06 1999 @@ -20,7 +20,8 @@ INIT, NEW, FREE, -] = xrange(4) +COPY, +] = xrange(5) # Specialised section for defining elements. This involves a structure # that is placed into a header file possibly an initialisation routine, @@ -46,6 +47,8 @@ mdelem.args = "void" elif keyword == "init": mdelem.state = INIT + elif keyword == "copy": + mdelem.state = COPY elif keyword == "free": mdelem.state = FREE return @@ -57,6 +60,8 @@ mdelem.newfn.append(line) elif mdelem.state == INIT: mdelem.initfn.append(line) + elif mdelem.state == COPY: + mdelem.copyfn.append(line) return line @@ -74,4 +79,6 @@ self.newfn = [] self.initfn = [] self.freefn = [] + self.copyfn = [] self.args = '' + self.copy = [] diff -rNu melys-0.0.17/mlib/PROJECT/header.py melys-0.0.18/mlib/PROJECT/header.py --- melys-0.0.17/mlib/PROJECT/header.py Tue May 25 14:44:39 1999 +++ melys-0.0.18/mlib/PROJECT/header.py Thu Oct 14 00:04:06 1999 @@ -24,6 +24,10 @@ c.header.header.__init__(self) + def end_file(self, m, name): + PROJECT.base.base.end_file(self, m, name) + c.header.header.end_file(self, m, name) + def end(self, m): c.header.header.end(self, m) diff -rNu melys-0.0.17/mlib/PROJECT/make.py melys-0.0.18/mlib/PROJECT/make.py --- melys-0.0.17/mlib/PROJECT/make.py Sun May 16 13:26:32 1999 +++ melys-0.0.18/mlib/PROJECT/make.py Thu Oct 14 17:38:35 1999 @@ -19,3 +19,7 @@ class make(PROJECT.base.base, c.make.make): def __init__(self): for c in self.__class__.__bases__: c.__init__(self) + + def end_file(self, m, name): + PROJECT.base.base.end_file(self, m, name) + c.make.make.end_file(self, m, name) diff -rNu melys-0.0.17/pixmaps/.cvsignore melys-0.0.18/pixmaps/.cvsignore --- melys-0.0.17/pixmaps/.cvsignore Wed Oct 13 20:24:07 1999 +++ melys-0.0.18/pixmaps/.cvsignore Thu Oct 14 18:18:11 1999 @@ -1,4 +1,5 @@ balls.c +mag.c menu_icons.c Makefile *.mdml *.mdml.gz *.mid diff -rNu melys-0.0.17/pixmaps/Makefile melys-0.0.18/pixmaps/Makefile --- melys-0.0.17/pixmaps/Makefile Wed Oct 13 20:24:07 1999 +++ melys-0.0.18/pixmaps/Makefile Thu Oct 14 18:18:11 1999 @@ -5,8 +5,10 @@ TARGETS = OBJS = balls.o \ + mag.o \ menu_icons.o GENCFILES = balls.c \ + mag.c \ menu_icons.c GENHFILES = ../include/pixmaps.h @@ -40,5 +42,6 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< +mag.o: ../include/pixmaps.h balls.o: ../include/pixmaps.h menu_icons.o: ../include/pixmaps.h diff -rNu melys-0.0.17/pixmaps/mag.c melys-0.0.18/pixmaps/mag.c --- melys-0.0.17/pixmaps/mag.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.18/pixmaps/mag.c Thu Oct 14 18:18:22 1999 @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 1999 Steve Ratcliffe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ZNY WARRANTY; without even the implied warranty of + * MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Some magnigying glass icons. Feel free to draw some better ones. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "pixmaps.h" +#include "intl.h" + + +#include "./plus.xpm" +#include "./minus.xpm" + +/* Static functions */ + + diff -rNu melys-0.0.17/pixmaps/mag.m melys-0.0.18/pixmaps/mag.m --- melys-0.0.17/pixmaps/mag.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.18/pixmaps/mag.m Thu Oct 14 17:39:39 1999 @@ -0,0 +1,25 @@ +>>name mag.m - magnifying glasses + +Copyright (C) 1999 Steve Ratcliffe + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ZNY WARRANTY; without even the implied warranty of + MERCHZNTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +Some magnigying glass icons. Feel free to draw some better ones. + +>>headerdef pixmaps.h + +extern char *plus_xpm[]; +extern char *minus_xpm[]; + + +>>extern + +#include "./plus.xpm" +#include "./minus.xpm" diff -rNu melys-0.0.17/pixmaps/minus.xpm melys-0.0.18/pixmaps/minus.xpm --- melys-0.0.17/pixmaps/minus.xpm Thu Jan 1 00:00:00 1970 +++ melys-0.0.18/pixmaps/minus.xpm Thu Oct 14 17:39:39 1999 @@ -0,0 +1,74 @@ +/* XPM */ +char * minus_xpm[] = { +"16 16 55 1", +" c None", +". c #EADCDB", +"+ c #EFE5E4", +"@ c #F3ECEB", +"# c #E5CECA", +"$ c #C49EC1", +"% c #B991C1", +"& c #BE9AC2", +"* c #C6A9CA", +"= c #E1CFD5", +"- c #F2EAE8", +"; c #8965C1", +"> c #A87EC1", +", c #A47BC1", +"' c #DDC7CE", +") c #DFC9CE", +"! c #B791C1", +"~ c #9D7BC1", +"{ c #AB81C1", +"] c #B591C1", +"^ c #CCABC1", +"/ c #E9D9D5", +"( c #EAD8CF", +"_ c #CAA8C2", +": c #E8D4CA", +"< c #E5D0CC", +"[ c #EBD9CF", +"} c #C8A4C1", +"| c #EAD6CC", +"1 c #C9A5C2", +"2 c #AC84C1", +"3 c #BD96C1", +"4 c #BF9AC2", +"5 c #D6B9C4", +"6 c #CAAAC5", +"7 c #9872C1", +"8 c #A97EC1", +"9 c #DFC5C6", +"0 c #D6BFCA", +"a c #DFCACC", +"b c #DAC3CC", +"c c #E3CCCC", +"d c #9F7AC2", +"e c #8F6FC4", +"f c #CDAFC9", +"g c #413BC4", +"h c #CCBDD9", +"i c #BD96C3", +"j c #6563CD", +"k c #D3C6DD", +"l c #CAB7D6", +"m c #827DD3", +"n c #CCB4D0", +"o c #C5B8DA", +"p c #574CC8", +" ", +" .+@ ", +" #$%&*=- ", +" %;>>>,' ", +" )!~>>{]^/ ", +" (_ :< ", +" [} |< ", +" 1>>2345 ", +" 67>>{89 ", +" 0abcde ", +" fgh ", +" ijk ", +" lmn ", +" op ", +" ", +" "}; diff -rNu melys-0.0.17/pixmaps/plus.xpm melys-0.0.18/pixmaps/plus.xpm --- melys-0.0.17/pixmaps/plus.xpm Thu Jan 1 00:00:00 1970 +++ melys-0.0.18/pixmaps/plus.xpm Thu Oct 14 17:39:39 1999 @@ -0,0 +1,110 @@ +/* XPM */ +char * plus_xpm[] = { +"16 16 91 1", +" c None", +". c #C4AEB4", +"+ c #B499A7", +"@ c #BCA0A8", +"# c #CFBCBD", +"$ c #AF97AC", +"% c #9981A2", +"& c #9B83A2", +"* c #9E839E", +"= c #9D819E", +"- c #967CA0", +"; c #9781A0", +"> c #B8A3B1", +", c #A28AA3", +"' c #6C5C99", +") c #6F5C97", +"! c #6D5A97", +"~ c #705E9B", +"{ c #9179A0", +"] c #9981A0", +"^ c #C3AFBD", +"/ c #9D84A3", +"( c #A087A2", +"_ c #564C96", +": c #1C1B93", +"< c #3B3394", +"[ c #4D4397", +"} c #A38AA3", +"| c #CABFCD", +"1 c #87729D", +"2 c #86709B", +"3 c #3C3494", +"4 c #201E93", +"5 c #3F3594", +"6 c #373194", +"7 c #836F9E", +"8 c #9983A0", +"9 c #CFBFCA", +"0 c #BFAAB1", +"a c #91799E", +"b c #9B83A0", +"c c #A38AA2", +"d c #A087A0", +"e c #C8B3BA", +"f c #C8B4BC", +"g c #937B9E", +"h c #A389A2", +"i c #9B81A0", +"j c #D1BFC4", +"k c #977FA0", +"l c #736299", +"m c #342C94", +"n c #5C4C96", +"o c #4A3F96", +"p c #816D9B", +"q c #A289A2", +"r c #E8DFE6", +"s c #A88EA3", +"t c #3B3896", +"u c #433A96", +"v c #393194", +"w c #9D83A0", +"x c #BAA0AC", +"y c #B89DA8", +"z c #AA91A5", +"A c #A58AA5", +"B c #9983A2", +"C c #997FA0", +"D c #655E9E", +"E c #6963A0", +"F c #EFE8EB", +"G c #AF96A7", +"H c #A086A3", +"I c #A28AA2", +"J c #B497A7", +"K c #C8B1B6", +"L c #625399", +"M c #12148F", +"N c #2F2994", +"O c #F9F8F8", +"P c #423894", +"Q c #0A0B8F", +"R c #332C94", +"S c #FDFBFD", +"T c #0B0B8F", +"U c #433894", +"V c #FDF9F9", +"W c #252293", +"X c #0F0F93", +"Y c #F8F4F4", +"Z c #EFE6E3", +" .+@# ", +" $%&*=-;> ", +" $;,')!~{]^ ", +" /(_: <[{} ", +"|1234 56789 ", +"0ab cde ", +"fg8 hij ", +" k]lm nopqr ", +" s8{t uvwx ", +" yz&{AB{CDEF ", +" GHcIJKLMNO ", +" PQRS ", +" SRTU ", +" VWXY ", +" VZ ", +" "}; diff -rNu melys-0.0.17/programs/Makefile melys-0.0.18/programs/Makefile --- melys-0.0.17/programs/Makefile Wed Oct 13 20:24:07 1999 +++ melys-0.0.18/programs/Makefile Thu Oct 14 18:18:11 1999 @@ -54,7 +54,7 @@ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \ ../widgets/melysrule.o \ - ../pixmaps/balls.o ../pixmaps/menu_icons.o + ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ showseq.o \ diff -rNu melys-0.0.17/programs/melys.m melys-0.0.18/programs/melys.m --- melys-0.0.17/programs/melys.m Fri Oct 8 22:16:54 1999 +++ melys-0.0.18/programs/melys.m Thu Oct 14 17:40:14 1999 @@ -29,7 +29,7 @@ >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o >>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o >>make --objects ../widgets/melysrule.o ->>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o +>>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header >>header diff -rNu melys-0.0.17/song/song.c melys-0.0.18/song/song.c --- melys-0.0.17/song/song.c Wed Oct 13 20:24:08 1999 +++ melys-0.0.18/song/song.c Thu Oct 14 18:18:12 1999 @@ -294,6 +294,8 @@ { melys_track_update(MELYS_TRACK(song->trackview)); + + md_clear_all_mod(MD_ELEMENT(song->mdroot)); } static void diff -rNu melys-0.0.17/song/song.m melys-0.0.18/song/song.m --- melys-0.0.17/song/song.m Sun Oct 10 16:56:30 1999 +++ melys-0.0.18/song/song.m Wed Oct 13 21:09:24 1999 @@ -338,6 +338,7 @@ melys_track_update(MELYS_TRACK(song->trackview)); + md_clear_all_mod(MD_ELEMENT(song->mdroot)); >>function song_mute_track static void diff -rNu melys-0.0.17/version melys-0.0.18/version --- melys-0.0.17/version Wed Oct 13 19:03:05 1999 +++ melys-0.0.18/version Thu Oct 14 18:17:42 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.17" +#define MELYS_VERSION_STRING "0.0.18" diff -rNu melys-0.0.17/widgets/melystrackdisplay.c melys-0.0.18/widgets/melystrackdisplay.c --- melys-0.0.17/widgets/melystrackdisplay.c Wed Oct 13 20:24:16 1999 +++ melys-0.0.18/widgets/melystrackdisplay.c Thu Oct 14 18:18:20 1999 @@ -308,7 +308,7 @@ /* Set up a drop site for this widget */ gtk_drag_dest_set(GTK_WIDGET(mdisp->canvas), GTK_DEST_DEFAULT_MOTION, - targets, NELEM(targets), GDK_ACTION_MOVE); + targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-drop", GTK_SIGNAL_FUNC(drag_drop), mdisp); @@ -544,6 +544,8 @@ char *pname; int state; + g_return_if_fail(part != NULL && track != NULL); + if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) return; @@ -940,7 +942,7 @@ GINT_TO_POINTER(len)); gtk_drag_begin(GTK_WIDGET(mdisp->canvas), - tlist, GDK_ACTION_MOVE|GDK_ACTION_ASK, + tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, 1 /* The button number */, (GdkEvent*)event); gtk_target_list_unref(tlist); @@ -1055,7 +1057,7 @@ if (!MD_IS_DESTROYED(part)) { dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); - + update_part_item(mdisp, dinfo->track, dinfo->part); } @@ -1479,7 +1481,7 @@ "y1", (double) y1, "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), "y2", (double) y1 + mdisp->height, - "width_pixels", 2, + "width_pixels", 1, "outline_color", "yellow", NULL); } @@ -1626,6 +1628,12 @@ needrm = TRUE; break; + + case GDK_ACTION_COPY: + newpart = MD_PART(md_copy(dp->element)); + MD_REF(newpart); + break; + default: newpart = NULL; g_assert_not_reached(); diff -rNu melys-0.0.17/widgets/melystrackdisplay.m melys-0.0.18/widgets/melystrackdisplay.m --- melys-0.0.17/widgets/melystrackdisplay.m Wed Oct 13 19:14:06 1999 +++ melys-0.0.18/widgets/melystrackdisplay.m Thu Oct 14 00:04:46 1999 @@ -319,7 +319,7 @@ /* Set up a drop site for this widget */ gtk_drag_dest_set(GTK_WIDGET(mdisp->canvas), GTK_DEST_DEFAULT_MOTION, - targets, NELEM(targets), GDK_ACTION_MOVE); + targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-drop", GTK_SIGNAL_FUNC(drag_drop), mdisp); @@ -561,6 +561,8 @@ char *pname; int state; + g_return_if_fail(part != NULL && track != NULL); + if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) return; @@ -970,7 +972,7 @@ GINT_TO_POINTER(len)); gtk_drag_begin(GTK_WIDGET(mdisp->canvas), - tlist, GDK_ACTION_MOVE|GDK_ACTION_ASK, + tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, 1 /* The button number */, (GdkEvent*)event); gtk_target_list_unref(tlist); @@ -1098,7 +1100,7 @@ if (!MD_IS_DESTROYED(part)) { dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); - + update_part_item(mdisp, dinfo->track, dinfo->part); } @@ -1560,7 +1562,7 @@ "y1", (double) y1, "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), "y2", (double) y1 + mdisp->height, - "width_pixels", 2, + "width_pixels", 1, "outline_color", "yellow", NULL); } @@ -1714,6 +1716,12 @@ needrm = TRUE; break; + + case GDK_ACTION_COPY: + newpart = MD_PART(md_copy(dp->element)); + MD_REF(newpart); + break; + default: newpart = NULL; g_assert_not_reached();