diff -rNu melys-0.0.18/ChangeLog melys-0.0.19/ChangeLog --- melys-0.0.18/ChangeLog Wed Oct 13 19:02:48 1999 +++ melys-0.0.19/ChangeLog Sat Oct 16 15:03:09 1999 @@ -1,5 +1,79 @@ +1999-10-16 Steve Ratcliffe + + * widgets/melystrackdisplay.m: + Snap slices and drags to the nearest beat. This will be changable + in future of course. + Also fix the text colour to be based on whether the part is + selected or not. There should now be a good contrast on any + theme (as long as the theme itself is high contrast...) + +1999-10-15 Steve Ratcliffe + + * widgets/melystrackdisplay.m: + Modify delete so that if you clicked on a selected item + then all selected items are deleted. This makes + it consistant with dragging (and is useful). + + * md/elements.m, md/mdadd.m: + Default track names and first level parts when they are added + to the MD tree. + This avoids suprising behaviour when moving parts around. + Well not exactly suprising but probably not what you want. + + * widgets/melystrackinfo.m: + The update routine should not clear any modified bits as + there will be other widgets that need to see them. + The bits are cleared at a higher level. + + * widgets/melysrule.m, widgets/melystrack.m, + widgets/melystrackdisplay.m, widgets/melystrackinfo.m: + Add zoom button at the edge of each scrollbar. + You can now zoom the scaling in each direction. If the + button is held down then scalling occurs continuously until + the button is released. + + * pixmaps/minus.xpm, pixmaps/plus.xpm: Icons I like a bit better. + +1999-10-14 Steve Ratcliffe + + * version: Version 0.0.18 + + * doc/docgen.py, help/C/track.sgml: doc updates + + * programs/melys.m: add mag glass icon file + + * pixmaps/mag.m, pixmaps/minus.xpm, pixmaps/plus.xpm: + added magnifying glass icons. These will be used for + changing the scales of the display. + + * mlib/PROJECT/make.py: + Fixed the makefile generation after it was broken by the md_copy + changes. + + * gui/partprop.m: Corrected the location of the properties help. + + * md/mdtools.m, md/mdundo.m, md/mdutil.m: + md_undo_time_op loses its container arg + 1999-10-13 Steve Ratcliffe + * widgets/melystrackdisplay.m: Added copy to the drag and drop. + + * mlib/PROJECT/base.py, mlib/PROJECT/cmds.py, mlib/PROJECT/header.py: + Code to generate md_copy and all its supporting routines. + + * md/elements.m: Add the code fragments for copying. + + * md/mdutil.m: Add a routine to clear all the modification flags. + + * song/song.m: After updating clear all modification flags. + + * widgets/melystrackdisplay.m: + Fixed a bug with attempting to drag between different + invokations of the application. + + * version: Version 0.0.17 + * widgets/melystrackdisplay.m: Implement the outlines for the dragged parts. Also fix for deleting a selected part. @@ -814,7 +888,6 @@ melys can play from a command line interface. * seq/seqlib.m: Fix for a crash when output ports were not set. - * seq/seqmidi.m: Fix a crash when no output ports are set. * INSTALL, README: Updated readmes for release a little @@ -854,7 +927,7 @@ files/mdmlread.m, files/mdmlwrite.m, files/midiread.m, files/midiwrite.m: Massive tidy up of the file error handling. It used to just exit if anything unexpected (like a file not - existing!) happend. Now not only does it carry on, but you + existing!) happened. Now not only does it carry on, but you always get a nice error message box, that sometimes even says what the problem was. @@ -927,7 +1000,7 @@ * files/mdmlread.m, gui/main.m, gui/menus.m, md/mdutil.m, programs/melys.m, song/song.m, util/util.m, widgets/melystrack.m, widgets/melystrackinfo.m, widgets/melystransport.m: First stage of - track based view complete The left pane is starting to be + track based view complete. The left pane is starting to be operational. The sliders do not do anything yet though. 1999-08-07 Steve Ratcliffe @@ -1221,8 +1294,9 @@ * programs/pmidi.m: Add smpteoffset processing (ignore it) - * Makefile, files/Makefile, md/Makefile, programs/Makefile, seq/Makefile, test/Makefile, util/Makefile: - added current makefiles + * Makefile, files/Makefile, md/Makefile, programs/Makefile, + seq/Makefile, test/Makefile, util/Makefile: + Added current makefiles * files/mdmlread.m: Most conversion issues fixed. Taged as trusted-conv-1 diff -rNu melys-0.0.18/README melys-0.0.19/README --- melys-0.0.18/README Tue Oct 12 00:37:36 1999 +++ melys-0.0.19/README Sat Oct 16 15:03:09 1999 @@ -21,9 +21,12 @@ 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. + 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. -- Slice a track part - Play a file, stop it in the middle and resume it, mute tracks, solo tracks. diff -rNu melys-0.0.18/include/elements.h melys-0.0.19/include/elements.h --- melys-0.0.18/include/elements.h Thu Oct 14 18:18:02 1999 +++ melys-0.0.19/include/elements.h Sat Oct 16 15:08:24 1999 @@ -54,6 +54,7 @@ struct containerElement parent; struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of tracks */ + short trackid; /* Ever increasing number for default names */ }; #define MD_ROOT(e) \ ((struct rootElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_ROOT)) diff -rNu melys-0.0.18/include/md.h melys-0.0.19/include/md.h --- melys-0.0.18/include/md.h Thu Oct 14 18:18:02 1999 +++ melys-0.0.19/include/md.h Sat Oct 16 15:08:24 1999 @@ -196,6 +196,6 @@ struct mbt *mbtp); unsigned long md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp); -unsigned long md_snap_tick(struct tempomapElement *tmap, int snap, - unsigned long tick); +unsigned long md_snap_tick(struct tempomapElement *tmap, unsigned long tick, + int snap); struct element *md_copy(struct element *e); diff -rNu melys-0.0.18/include/melysrule.h melys-0.0.19/include/melysrule.h --- melys-0.0.18/include/melysrule.h Thu Oct 14 18:18:03 1999 +++ melys-0.0.19/include/melysrule.h Sat Oct 16 15:08:25 1999 @@ -45,4 +45,4 @@ void melys_rule_set_adj(MelysRule *mrule, GtkAdjustment *hadj); void melys_rule_set_tempomap(MelysRule *mrule, struct tempomapElement *tempomap); -void melys_rule_scale(MelysRule *mrule, int hscale); +void melys_rule_set_hscale(MelysRule *mrule, int hscale); diff -rNu melys-0.0.18/include/melystrack.h melys-0.0.19/include/melystrack.h --- melys-0.0.18/include/melystrack.h Thu Oct 14 18:18:03 1999 +++ melys-0.0.19/include/melystrack.h Sat Oct 16 15:08:26 1999 @@ -38,6 +38,8 @@ int vtitle; /* Title height */ int vscale; /* pixels per track */ int hscale; /* ticks per x pixel */ + + int button_repeat_to; /* Button repeat timeout id */ }; diff -rNu melys-0.0.18/include/melystrackdisplay.h melys-0.0.19/include/melystrackdisplay.h --- melys-0.0.18/include/melystrackdisplay.h Thu Oct 14 18:18:04 1999 +++ melys-0.0.19/include/melystrackdisplay.h Sat Oct 16 15:08:26 1999 @@ -63,8 +63,8 @@ /* Horizontal scale. Ticks per pixel */ int hscale; - /* The offset from the top of allocated space to text baseline */ - int vtextoffset; + /* The snap to grid setting */ + int snap; /* Allocated area that track information is being displayed in */ GdkRectangle track_area; @@ -100,5 +100,8 @@ GtkAdjustment *posadj); void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root); +void melys_track_display_set_hscale(MelysTrackDisplay *mdisp, int hscale); +void melys_track_display_set_height(MelysTrackDisplay *mdisp, int height, + int htitle); void melys_track_display_update(MelysTrackDisplay *mdisp); void display_info_free(gpointer _info); diff -rNu melys-0.0.18/make.conf melys-0.0.19/make.conf --- melys-0.0.18/make.conf Sun Oct 10 16:26:53 1999 +++ melys-0.0.19/make.conf Sat Oct 16 15:02:41 1999 @@ -3,13 +3,16 @@ VERSION = 0.0.10 # Options required by the C compiler -COPTS = -g -O2 -Wall +COPTS = -O2 -Wall -# Debugging defines. Can be commented out without harm. +# Comment out for debugging defines. DEBUG_DEFINES = -DDEBUG -DDEBUG_CASTS +# Uncomment to disable all glib and gtk checking flags +#OPT_DEFINES = -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS + # Defines -DEFINES = -DENABLE_NLS $(DEBUG_DEFINES) +DEFINES = -DENABLE_NLS $(DEBUG_DEFINES) $(OPT_DEFINES) # Path to include files INCLUDES = -I ../include -I . diff -rNu melys-0.0.18/md/elements.m melys-0.0.19/md/elements.m --- melys-0.0.18/md/elements.m Thu Oct 14 00:03:35 1999 +++ melys-0.0.19/md/elements.m Fri Oct 15 12:25:42 1999 @@ -94,6 +94,7 @@ >>elementdef root container struct headElement *head; /* Pointer to the head information */ short tracks; /* Number of tracks */ + short trackid; /* Ever increasing number for default names */ init e->head = NULL; copy diff -rNu melys-0.0.18/md/mdadd.c melys-0.0.19/md/mdadd.c --- melys-0.0.18/md/mdadd.c Thu Oct 14 18:18:16 1999 +++ melys-0.0.19/md/mdadd.c Sat Oct 16 15:08:37 1999 @@ -67,9 +67,31 @@ case MD_TYPE_NOTE: endtime += ((struct noteElement *)el)->length; break; + case MD_TYPE_TRACK: MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks++; + + /* Default a name if there isn't one already */ + MD_ROOT(c)->trackid++; + if (MD_TRACK(el)->name == NULL) { + char *str; + + str = g_strdup_printf("Track %d", MD_ROOT(c)->trackid); + MD_TRACK(el)->name = str; + } break; + + case MD_TYPE_PART: + case MD_TYPE_PARTREF: + if (MD_PART(el)->name == NULL) { + /* If adding to a track default to the track name */ + if (MD_TYPE(c) == MD_TYPE_TRACK) + MD_PART(el)->name = g_strdup(MD_TRACK(c)->name); + + /* Otherwise it is unnamed unless the user names it */ + } + break; + default: break; } diff -rNu melys-0.0.18/md/mdadd.m melys-0.0.19/md/mdadd.m --- melys-0.0.18/md/mdadd.m Tue Oct 12 14:52:03 1999 +++ melys-0.0.19/md/mdadd.m Sat Oct 16 15:00:55 1999 @@ -69,9 +69,31 @@ case MD_TYPE_NOTE: endtime += ((struct noteElement *)el)->length; break; + case MD_TYPE_TRACK: MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks++; + + /* Default a name if there isn't one already */ + MD_ROOT(c)->trackid++; + if (MD_TRACK(el)->name == NULL) { + char *str; + + str = g_strdup_printf("Track %d", MD_ROOT(c)->trackid); + MD_TRACK(el)->name = str; + } break; + + case MD_TYPE_PART: + case MD_TYPE_PARTREF: + if (MD_PART(el)->name == NULL) { + /* If adding to a track default to the track name */ + if (MD_TYPE(c) == MD_TYPE_TRACK) + MD_PART(el)->name = g_strdup(MD_TRACK(c)->name); + + /* Otherwise it is unnamed unless the user names it */ + } + break; + default: break; } diff -rNu melys-0.0.18/md/mdutil.c melys-0.0.19/md/mdutil.c --- melys-0.0.18/md/mdutil.c Thu Oct 14 18:18:17 1999 +++ melys-0.0.19/md/mdutil.c Sat Oct 16 15:08:38 1999 @@ -335,7 +335,8 @@ max_dur = MAX(max_dur, dur); } - MD_SET_DURATION(root, max_dur); + if (max_dur < MD_DURATION(root)) + MD_SET_DURATION(root, max_dur); } /* @@ -454,9 +455,17 @@ } unsigned long -md_snap_tick(struct tempomapElement *tmap, int snap, unsigned long tick) +md_snap_tick(struct tempomapElement *tmap, unsigned long tick, int snap) { - /* not implemented yet */ + struct mbt mbt; + + md_tick_to_mbt(tmap, tick, &mbt); + + if (mbt.ticks > tmap->timebase/2) + mbt.beats++; + mbt.ticks = 0; + + tick = md_mbt_to_tick(tmap, &mbt); return tick; } diff -rNu melys-0.0.18/md/mdutil.m melys-0.0.19/md/mdutil.m --- melys-0.0.18/md/mdutil.m Thu Oct 14 12:05:09 1999 +++ melys-0.0.19/md/mdutil.m Sat Oct 16 15:01:40 1999 @@ -426,7 +426,8 @@ max_dur = MAX(max_dur, dur); } - MD_SET_DURATION(root, max_dur); + if (max_dur < MD_DURATION(root)) + MD_SET_DURATION(root, max_dur); >>function md_tick_to_mbt void @@ -543,11 +544,19 @@ >>function md_snap_tick unsigned long struct tempomapElement *tmap; The tempomap -int snap; The boundry to snap to unsigned long tick; The tick value to snap +int snap; The boundry to snap to >>code - /* not implemented yet */ + struct mbt mbt; + + md_tick_to_mbt(tmap, tick, &mbt); + + if (mbt.ticks > tmap->timebase/2) + mbt.beats++; + mbt.ticks = 0; + + tick = md_mbt_to_tick(tmap, &mbt); return tick; diff -rNu melys-0.0.18/pixmaps/minus.xpm melys-0.0.19/pixmaps/minus.xpm --- melys-0.0.18/pixmaps/minus.xpm Thu Oct 14 17:39:39 1999 +++ melys-0.0.19/pixmaps/minus.xpm Fri Oct 15 11:31:23 1999 @@ -1,74 +1,41 @@ /* XPM */ char * minus_xpm[] = { -"16 16 55 1", +"16 16 22 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", +". c #E8E8E8", +"+ c #808182", +"@ c #B2B2B2", +"# c #EAE8F4", +"$ c #9D9CA3", +"% c #5E6163", +"& c #5E5D60", +"* c #717373", +"= c #EDEDEF", +"- c #000000", +"; c #FFFFFF", +"> c #5A6060", +", c #ACACAF", +"' c #9F9FA0", +") c #C0D1D3", +"! c #9DA9AA", +"~ c #CECECE", +"{ c #BBBABC", +"] c #6A6F72", +"^ c #D8D8D8", +"/ c #111010", " ", -" .+@ ", -" #$%&*=- ", -" %;>>>,' ", -" )!~>>{]^/ ", -" (_ :< ", -" [} |< ", -" 1>>2345 ", -" 67>>{89 ", -" 0abcde ", -" fgh ", -" ijk ", -" lmn ", -" op ", " ", -" "}; +" .+@+. ", +" #$%&*&%$# ", +" $&&* *&*$ ", +" =-*; *>, ", +" '& )!!!) &+ ", +" @* ----- *@ ", +" ~&;)!!!) &+ ", +" =-* &-, ", +" {*** *&*- ", +" {]***]-- ", +" .@@@^-// ", +" /// ", +" /// ", +" ///"}; diff -rNu melys-0.0.18/pixmaps/plus.xpm melys-0.0.19/pixmaps/plus.xpm --- melys-0.0.18/pixmaps/plus.xpm Thu Oct 14 17:39:39 1999 +++ melys-0.0.19/pixmaps/plus.xpm Fri Oct 15 11:31:23 1999 @@ -1,110 +1,44 @@ /* XPM */ char * plus_xpm[] = { -"16 16 91 1", +"16 16 25 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 ", -" "}; +". c #E8E8E8", +"+ c #DAD2D2", +"@ c #C6C6C6", +"# c #C1C1C1", +"$ c #DDDDDD", +"% c #858889", +"& c #5E6163", +"* c #000000", +"= c #717373", +"- c #8A8484", +"; c #6C6E70", +"> c #FFFFFF", +", c #C0D1D3", +"' c #5A6060", +") c #CCCFD1", +"! c #B3B6B7", +"~ c #9DA9AA", +"{ c #889299", +"] c #6A6F72", +"^ c #585B5B", +"/ c #111010", +"( c #F2F2F4", +"_ c #E8E8EA", +": c #EAEAEA", +" ", +" .+@#@+. ", +" $%&***&%$ ", +" $%*&=-=&*%$ ", +" %*= =*% ", +" .;* >,*, '*) ", +" !*= ,~*~, =*{ ", +" #*- ***** -*# ", +" !*=>,~*~, =*{ ", +" .;* ,*, *=) ", +" %*= =*] ", +" $%*]=-=]**% ", +" $%^***^*// ", +" (_@#@: /// ", +" /// ", +" ///"}; diff -rNu melys-0.0.18/version melys-0.0.19/version --- melys-0.0.18/version Thu Oct 14 18:17:42 1999 +++ melys-0.0.19/version Sat Oct 16 15:03:22 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.18" +#define MELYS_VERSION_STRING "0.0.19" diff -rNu melys-0.0.18/widgets/Makefile melys-0.0.19/widgets/Makefile --- melys-0.0.18/widgets/Makefile Thu Oct 14 18:18:10 1999 +++ melys-0.0.19/widgets/Makefile Sat Oct 16 15:08:32 1999 @@ -90,6 +90,7 @@ melystransport.o: ../include/melystransport.h melystrack.o: ../include/song.h melystrack.o: ../include/elements.h +melystrack.o: ../include/pixmaps.h melystrack.o: ../include/md.h melystrack.o: ../include/melystrackinfo.h melystrack.o: ../include/melystrackdisplay.h diff -rNu melys-0.0.18/widgets/melysrule.c melys-0.0.19/widgets/melysrule.c --- melys-0.0.18/widgets/melysrule.c Thu Oct 14 18:18:19 1999 +++ melys-0.0.19/widgets/melysrule.c Sat Oct 16 15:08:41 1999 @@ -175,9 +175,10 @@ } void -melys_rule_scale(MelysRule *mrule, int hscale) +melys_rule_set_hscale(MelysRule *mrule, int hscale) { mrule->hscale = hscale; + gdk_window_clear(((GtkWidget *)mrule)->window); gtk_widget_queue_draw((GtkWidget *) mrule); } diff -rNu melys-0.0.18/widgets/melysrule.m melys-0.0.19/widgets/melysrule.m --- melys-0.0.18/widgets/melysrule.m Tue Oct 5 22:28:13 1999 +++ melys-0.0.19/widgets/melysrule.m Fri Oct 15 11:32:54 1999 @@ -142,12 +142,13 @@ gtk_widget_queue_draw((GtkWidget *) mrule); ->>function melys_rule_scale +>>function melys_rule_set_hscale void MelysRule *mrule; int hscale; >>code mrule->hscale = hscale; + gdk_window_clear(((GtkWidget *)mrule)->window); gtk_widget_queue_draw((GtkWidget *) mrule); diff -rNu melys-0.0.18/widgets/melystrack.c melys-0.0.19/widgets/melystrack.c --- melys-0.0.18/widgets/melystrack.c Thu Oct 14 18:18:20 1999 +++ melys-0.0.19/widgets/melystrack.c Sat Oct 16 15:08:41 1999 @@ -20,9 +20,11 @@ #include "gtk/gtk.h" #include "song.h" #include "elements.h" +#include "pixmaps.h" #include "md.h" #include "melystrackinfo.h" #include "melystrackdisplay.h" +#include "libgnomeui/gnome-pixmap.h" #include "melystrack.h" #include "intl.h" @@ -42,6 +44,14 @@ static void melys_track_init(MelysTrack *mtp); static void melys_track_class_init(MelysTrackClass *klass); static void destroy(GtkObject *object); +static GtkBox *scroll_group(MelysTrack *mtrack, GtkWidget *sb, gboolean vert); +static void horiz_shrink(GtkWidget *w, gpointer data); +static void horiz_expand(GtkWidget *w, gpointer data); +static void vert_expand(GtkWidget *w, gpointer data); +static void vert_shrink(GtkWidget *w, gpointer data); +static void set_button_repeat(MelysTrack *mtrack, GtkWidget *button); +static gboolean click_it(GtkButton *button); +static void button_release(GtkWidget *w, MelysTrack *mtrack); static gint melys_track_signals[LAST_SIGNAL]; @@ -104,6 +114,8 @@ GtkAdjustment *posadj; GtkHScrollbar *hscroll; GtkVScrollbar *vscroll; + GtkBox *hscrollgroup; + GtkBox *vscrollgroup; GtkHPaned *hpan; GtkTable *tab; MelysTrackInfo *info; @@ -152,25 +164,29 @@ gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(frame1)); gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(frame2)); + gtk_table_attach(tab, GTK_WIDGET(hpan), 0, 1, 0, 1, GTK_FILL|GTK_SHRINK|GTK_EXPAND, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, GTK_WIDGET(vscroll), 1, 2, 0, 1, + hscrollgroup = scroll_group(mtp, GTK_WIDGET(hscroll), 0); + vscrollgroup = scroll_group(mtp, GTK_WIDGET(vscroll), 1); + + gtk_table_attach(tab, GTK_WIDGET(vscrollgroup), 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, GTK_WIDGET(hscroll), 0, 1, 1, 2, + gtk_table_attach(tab, GTK_WIDGET(hscrollgroup), 0, 1, 1, 2, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 ); - gtk_widget_show(GTK_WIDGET(hscroll)); - gtk_widget_show(GTK_WIDGET(vscroll)); + gtk_widget_show_all(GTK_WIDGET(hscrollgroup)); + gtk_widget_show_all(GTK_WIDGET(vscrollgroup)); gtk_widget_show(GTK_WIDGET(hpan)); gtk_widget_show(GTK_WIDGET(tab)); @@ -282,9 +298,6 @@ melys_track_info_update(mtrack->info); melys_track_display_update(mtrack->display); - //gtk_adjustment_changed(mtrack->vadj); - //gtk_adjustment_changed(mtrack->hadj); - //gtk_adjustment_changed(mtrack->posadj); /* No signal yet */ } @@ -322,4 +335,194 @@ if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(object); +} + +/* + * Create a box and place in the scrollbar and the magnifying + * glasses. Set up the magnifying glass buttons to expand and + * shrink the main views. + * + * Arguments: + * mtrack - The mtrack widget + * sb - Scrollbar + * vert - True if the vertical case + */ +static GtkBox * +scroll_group(MelysTrack *mtrack, GtkWidget *sb, gboolean vert) +{ + GtkBox *box; + GtkWidget *plusbutton; + GtkWidget *minusbutton; + GtkWidget *plusicon; + GtkWidget *minusicon; + + if (vert) + box = (GtkBox *)gtk_vbox_new(0, 0); + else + box = (GtkBox *)gtk_hbox_new(0, 0); + + gtk_box_pack_start(box, sb, 1, 1, 0); + + plusbutton = gtk_button_new(); + minusbutton = gtk_button_new(); + + gtk_widget_set_usize(plusbutton, 18, 18); + gtk_widget_set_usize(minusbutton, 18, 18); + + plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); + minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); + + gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); + gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); + + gtk_box_pack_end(box, plusbutton, 0, 0, 0); + gtk_box_pack_end(box, minusbutton, 0, 0, 0); + + if (vert) { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + vert_expand, mtrack); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + vert_shrink, mtrack); + } else { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + horiz_expand, mtrack); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + horiz_shrink, mtrack); + } + + gtk_signal_connect(GTK_OBJECT(plusbutton), "released", + button_release, mtrack); + gtk_signal_connect(GTK_OBJECT(minusbutton), "released", + button_release, mtrack); + + return box; +} + +/* + * Reduce the horizontal size of the parts. + */ +static void +horiz_shrink(GtkWidget *w, gpointer data) +{ + MelysTrack *mtrack = data; + + if (mtrack->hscale < 8) + mtrack->hscale++; + else + mtrack->hscale *= 1.25; + melys_track_display_set_hscale(mtrack->display, mtrack->hscale); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); +} + +/* + * Increase the horizontal size of the parts. + */ +static void +horiz_expand(GtkWidget *w, gpointer data) +{ + MelysTrack *mtrack = data; + + mtrack->hscale /= 1.25; + if (mtrack->hscale < 2) + mtrack->hscale = 2; + melys_track_display_set_hscale(mtrack->display, mtrack->hscale); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); +} + +/* + * Make the vertical size of the tracks larger. + */ +static void +vert_expand(GtkWidget *w, gpointer data) +{ + MelysTrack *mtrack = data; + + mtrack->vscale += 2; + melys_track_info_set_height(mtrack->info, mtrack->vscale, + TRACK_TITLE_HEIGHT); + melys_track_display_set_height(mtrack->display, mtrack->vscale, + TRACK_TITLE_HEIGHT); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); +} + +/* + * Make the vertical size of the tracks smaller. + */ +static void +vert_shrink(GtkWidget *w, gpointer data) +{ + MelysTrack *mtrack = data; + + mtrack->vscale -= 2; + if (mtrack->vscale <= TRACK_SEPARATION) + mtrack->vscale = 1 + TRACK_SEPARATION; + melys_track_info_set_height(mtrack->info, mtrack->vscale, + TRACK_TITLE_HEIGHT); + melys_track_display_set_height(mtrack->display, mtrack->vscale, + TRACK_TITLE_HEIGHT); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); +} + +/* + * When you press a magnification button a function is set up to + * be called repeatedly to simulate pressing the button. So if + * you just hold the button down the view will zoom + * continuously. + */ +static void +set_button_repeat(MelysTrack *mtrack, GtkWidget *button) +{ + + if (mtrack->button_repeat_to == 0) { + gtk_object_set_data(GTK_OBJECT(button), "mtrack", mtrack); + mtrack->button_repeat_to = gtk_timeout_add(150, + (GtkFunction)click_it, button); + } +} + +/* + * This is part of the auto-repeat for controlling + * magnification. When you hold down a magnification button + * this routine gets called every so often and it emits a signal + * as though the button has been pressed again. + */ +static gboolean +click_it(GtkButton *button) +{ + MelysTrack *mtrack; + + mtrack = gtk_object_get_data(GTK_OBJECT(button), "mtrack"); + gtk_signal_emit_by_name(GTK_OBJECT(button), "pressed", mtrack); + + return TRUE; +} + +/* + * When a magnification button is released we remove the + * timout that is doing the auto-repeat. + * + * Arguments: + * w - The button that was released + * mtrack - The MelysTrack + */ +static void +button_release(GtkWidget *w, MelysTrack *mtrack) +{ + + if (mtrack->button_repeat_to) + gtk_timeout_remove(mtrack->button_repeat_to); + + mtrack->button_repeat_to = 0; } diff -rNu melys-0.0.18/widgets/melystrack.m melys-0.0.19/widgets/melystrack.m --- melys-0.0.18/widgets/melystrack.m Tue Oct 5 22:29:06 1999 +++ melys-0.0.19/widgets/melystrack.m Fri Oct 15 11:32:54 1999 @@ -21,9 +21,11 @@ >>header gtk/gtk.h >>header song.h >>header elements.h +>>header pixmaps.h >>header md.h >>header melystrackinfo.h >>header melystrackdisplay.h +>>header libgnomeui/gnome-pixmap.h >># Base on a vertical packing box. >># This allows stuff to be put along the top. @@ -48,6 +50,8 @@ int vtitle; /* Title height */ int vscale; /* pixels per track */ int hscale; /* ticks per x pixel */ + + int button_repeat_to; /* Button repeat timeout id */ }; @@ -95,6 +99,8 @@ GtkAdjustment *posadj; GtkHScrollbar *hscroll; GtkVScrollbar *vscroll; + GtkBox *hscrollgroup; + GtkBox *vscrollgroup; GtkHPaned *hpan; GtkTable *tab; MelysTrackInfo *info; @@ -143,25 +149,29 @@ gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(frame1)); gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(frame2)); + gtk_table_attach(tab, GTK_WIDGET(hpan), 0, 1, 0, 1, GTK_FILL|GTK_SHRINK|GTK_EXPAND, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, GTK_WIDGET(vscroll), 1, 2, 0, 1, + hscrollgroup = scroll_group(mtp, GTK_WIDGET(hscroll), 0); + vscrollgroup = scroll_group(mtp, GTK_WIDGET(vscroll), 1); + + gtk_table_attach(tab, GTK_WIDGET(vscrollgroup), 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, GTK_WIDGET(hscroll), 0, 1, 1, 2, + gtk_table_attach(tab, GTK_WIDGET(hscrollgroup), 0, 1, 1, 2, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 ); - gtk_widget_show(GTK_WIDGET(hscroll)); - gtk_widget_show(GTK_WIDGET(vscroll)); + gtk_widget_show_all(GTK_WIDGET(hscrollgroup)); + gtk_widget_show_all(GTK_WIDGET(vscrollgroup)); gtk_widget_show(GTK_WIDGET(hpan)); gtk_widget_show(GTK_WIDGET(tab)); @@ -280,9 +290,6 @@ melys_track_info_update(mtrack->info); melys_track_display_update(mtrack->display); - //gtk_adjustment_changed(mtrack->vadj); - //gtk_adjustment_changed(mtrack->hadj); - //gtk_adjustment_changed(mtrack->posadj); /* No signal yet */ @@ -320,3 +327,203 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(object); +>>function scroll_group +static GtkBox * +MelysTrack *mtrack; The mtrack widget +GtkWidget *sb; Scrollbar +gboolean vert; True if the vertical case + +>>description +Create a box and place in the scrollbar and the magnifying glasses. +Set up the magnifying glass buttons to expand and shrink the main +views. + +>>code + GtkBox *box; + GtkWidget *plusbutton; + GtkWidget *minusbutton; + GtkWidget *plusicon; + GtkWidget *minusicon; + + if (vert) + box = (GtkBox *)gtk_vbox_new(0, 0); + else + box = (GtkBox *)gtk_hbox_new(0, 0); + + gtk_box_pack_start(box, sb, 1, 1, 0); + + plusbutton = gtk_button_new(); + minusbutton = gtk_button_new(); + + gtk_widget_set_usize(plusbutton, 18, 18); + gtk_widget_set_usize(minusbutton, 18, 18); + + plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); + minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); + + gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); + gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); + + gtk_box_pack_end(box, plusbutton, 0, 0, 0); + gtk_box_pack_end(box, minusbutton, 0, 0, 0); + + if (vert) { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + vert_expand, mtrack); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + vert_shrink, mtrack); + } else { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + horiz_expand, mtrack); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + horiz_shrink, mtrack); + } + + gtk_signal_connect(GTK_OBJECT(plusbutton), "released", + button_release, mtrack); + gtk_signal_connect(GTK_OBJECT(minusbutton), "released", + button_release, mtrack); + + return box; + + +>>function horiz_shrink +static void +GtkWidget *w; +gpointer data; + +>>description +Reduce the horizontal size of the parts. + +>>code + MelysTrack *mtrack = data; + + if (mtrack->hscale < 8) + mtrack->hscale++; + else + mtrack->hscale *= 1.25; + melys_track_display_set_hscale(mtrack->display, mtrack->hscale); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); + + +>>function horiz_expand +static void +GtkWidget *w; +gpointer data; + +>>description +Increase the horizontal size of the parts. + +>>code + MelysTrack *mtrack = data; + + mtrack->hscale /= 1.25; + if (mtrack->hscale < 2) + mtrack->hscale = 2; + melys_track_display_set_hscale(mtrack->display, mtrack->hscale); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); + + +>>function vert_expand +static void +GtkWidget *w; +gpointer data; + +>>description +Make the vertical size of the tracks larger. + +>>code + MelysTrack *mtrack = data; + + mtrack->vscale += 2; + melys_track_info_set_height(mtrack->info, mtrack->vscale, + TRACK_TITLE_HEIGHT); + melys_track_display_set_height(mtrack->display, mtrack->vscale, + TRACK_TITLE_HEIGHT); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); + + +>>function vert_shrink +static void +GtkWidget *w; +gpointer data; + +>>description +Make the vertical size of the tracks smaller. + +>>code + MelysTrack *mtrack = data; + + mtrack->vscale -= 2; + if (mtrack->vscale <= TRACK_SEPARATION) + mtrack->vscale = 1 + TRACK_SEPARATION; + melys_track_info_set_height(mtrack->info, mtrack->vscale, + TRACK_TITLE_HEIGHT); + melys_track_display_set_height(mtrack->display, mtrack->vscale, + TRACK_TITLE_HEIGHT); + + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + song_view_update(mtrack->song); + set_button_repeat(mtrack, w); + +>>function set_button_repeat +static void +MelysTrack *mtrack; +GtkWidget *button; + +>>description +When you press a magnification button a function is set +up to be called repeatedly to simulate pressing the button. +So if you just hold the button down the view will zoom continuously. + +>>code + + if (mtrack->button_repeat_to == 0) { + gtk_object_set_data(GTK_OBJECT(button), "mtrack", mtrack); + mtrack->button_repeat_to = gtk_timeout_add(150, + (GtkFunction)click_it, button); + } + + +>>function click_it +static gboolean +GtkButton *button; + +>>description +This is part of the auto-repeat for controlling magnification. +When you hold down a magnification button this routine gets +called every so often and it emits a signal as though the button +has been pressed again. + +>>code + MelysTrack *mtrack; + + mtrack = gtk_object_get_data(GTK_OBJECT(button), "mtrack"); + gtk_signal_emit_by_name(GTK_OBJECT(button), "pressed", mtrack); + + return TRUE; + +>>function button_release +static void +GtkWidget *w; The button that was released +MelysTrack *mtrack; The MelysTrack + +>>description +When a magnification button is released we remove the timout that +is doing the auto-repeat. + +>>code + + if (mtrack->button_repeat_to) + gtk_timeout_remove(mtrack->button_repeat_to); + + mtrack->button_repeat_to = 0; diff -rNu melys-0.0.18/widgets/melystrackdisplay.c melys-0.0.19/widgets/melystrackdisplay.c --- melys-0.0.18/widgets/melystrackdisplay.c Thu Oct 14 18:18:20 1999 +++ melys-0.0.19/widgets/melystrackdisplay.c Sat Oct 16 15:08:42 1999 @@ -381,6 +381,32 @@ melys_track_display_update(mdisp); } +void +melys_track_display_set_hscale(MelysTrackDisplay *mdisp, int hscale) +{ + mdisp->hscale = hscale; + melys_rule_set_hscale(MELYS_RULE(mdisp->title), hscale); +} + +/* + * Set the height of the track and of the title. In addition + * there will be a separation distance. This function is + * called by MelysTrack. + * + * Arguments: + * height - New track height + * htitle - The title height + */ +void +melys_track_display_set_height(MelysTrackDisplay *mdisp, int height, + int htitle) +{ + mdisp->height = height; + mdisp->vspace = height + TRACK_SEPARATION; + mdisp->htitle = htitle; + mdisp->vtitle = htitle + TRACK_SEPARATION; +} + /* * A scrollbar has been moved. So we have to set our current * position and redraw. @@ -523,6 +549,9 @@ } } } + + if (mdisp->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); } /* @@ -552,9 +581,10 @@ if (GTK_OBJECT_DESTROYED(mdisp)) return; - if (MD_MODIFIED(part) == FALSE) + if (!MD_MODIFIED(mdisp->mdroot) && !MD_MODIFIED(part)) return; +//printf("updating part root %d part %d\n", MD_MODIFIED(mdisp->mdroot), MD_MODIFIED(part)); /* Is this a reference to a part (drawn with dotted outline) */ if (MD_TYPE(part) == MD_TYPE_PARTREF) ref = TRUE; @@ -644,6 +674,7 @@ "y", (double) 2, "text", pname, "font_gdk", GTK_WIDGET(mdisp)->style->font, + "fill_color_gdk", >K_WIDGET(mdisp)->style->fg[state], "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, @@ -661,9 +692,6 @@ "outline_color", "black", "dotted_border", ref, NULL); - - if (mdisp->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); } /* @@ -1271,6 +1299,7 @@ unsigned long t; t = mdisp->click_tick; + t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); part = mdisp->click_part; track = mdisp->click_track; @@ -1323,10 +1352,19 @@ track = mdisp->click_track; /* have to unselect as this hold a reference to the on-screen part */ - if (MD_SELECTED(part)) - sel_clear_part(mdisp, part); + if (MD_SELECTED(part)) { + GList *list; + + while ((list = mdisp->sel_list) != NULL) { + struct sel_info *info; - md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); + info = list->data; + md_remove(info->con, (struct element *)info->part); + sel_clear_part(mdisp, info->part); + } + } else { + md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); + } } /* @@ -1588,6 +1626,7 @@ drop_track = y_to_track(mdisp, y); drop_tick = x_to_tick(mdisp, x); + len = data->length / sizeof(struct drag_element_data); dragdata = (struct drag_element_data *)data->data; @@ -1648,6 +1687,7 @@ t = drop_tick + dp->tick_offset - tick_start; g_assert(t >= 0); + t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); /* * The new part should have its time and devchan set to diff -rNu melys-0.0.18/widgets/melystrackdisplay.m melys-0.0.19/widgets/melystrackdisplay.m --- melys-0.0.18/widgets/melystrackdisplay.m Thu Oct 14 00:04:46 1999 +++ melys-0.0.19/widgets/melystrackdisplay.m Sat Oct 16 14:00:59 1999 @@ -87,8 +87,8 @@ /* Horizontal scale. Ticks per pixel */ int hscale; - /* The offset from the top of allocated space to text baseline */ - int vtextoffset; + /* The snap to grid setting */ + int snap; /* Allocated area that track information is being displayed in */ GdkRectangle track_area; @@ -392,6 +392,31 @@ melys_track_display_update(mdisp); +>>function melys_track_display_set_hscale +void +MelysTrackDisplay *mdisp; +int hscale; + +>>code + mdisp->hscale = hscale; + melys_rule_set_hscale(MELYS_RULE(mdisp->title), hscale); + + +>>function melys_track_display_set_height +void +MelysTrackDisplay *mdisp; +int height; New track height +int htitle; The title height +>>description +Set the height of the track and of the title. +In addition there will be a separation distance. +This function is called by MelysTrack. +>>code + mdisp->height = height; + mdisp->vspace = height + TRACK_SEPARATION; + mdisp->htitle = htitle; + mdisp->vtitle = htitle + TRACK_SEPARATION; + >>function disp_scroll static void GtkAdjustment *adj; @@ -541,6 +566,8 @@ } } + if (mdisp->posline) + gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); >>function update_part_item @@ -569,9 +596,10 @@ if (GTK_OBJECT_DESTROYED(mdisp)) return; - if (MD_MODIFIED(part) == FALSE) + if (!MD_MODIFIED(mdisp->mdroot) && !MD_MODIFIED(part)) return; +//printf("updating part root %d part %d\n", MD_MODIFIED(mdisp->mdroot), MD_MODIFIED(part)); /* Is this a reference to a part (drawn with dotted outline) */ if (MD_TYPE(part) == MD_TYPE_PARTREF) ref = TRUE; @@ -661,6 +689,7 @@ "y", (double) 2, "text", pname, "font_gdk", GTK_WIDGET(mdisp)->style->font, + "fill_color_gdk", >K_WIDGET(mdisp)->style->fg[state], "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, @@ -679,9 +708,6 @@ "dotted_border", ref, NULL); - if (mdisp->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); - >>function disp_destroy static void @@ -1337,6 +1363,7 @@ unsigned long t; t = mdisp->click_tick; + t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); part = mdisp->click_part; track = mdisp->click_track; @@ -1393,10 +1420,19 @@ track = mdisp->click_track; /* have to unselect as this hold a reference to the on-screen part */ - if (MD_SELECTED(part)) - sel_clear_part(mdisp, part); + if (MD_SELECTED(part)) { + GList *list; - md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); + while ((list = mdisp->sel_list) != NULL) { + struct sel_info *info; + + info = list->data; + md_remove(info->con, (struct element *)info->part); + sel_clear_part(mdisp, info->part); + } + } else { + md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); + } >>function part_prop_cb @@ -1676,6 +1712,7 @@ drop_track = y_to_track(mdisp, y); drop_tick = x_to_tick(mdisp, x); + len = data->length / sizeof(struct drag_element_data); dragdata = (struct drag_element_data *)data->data; @@ -1736,6 +1773,7 @@ t = drop_tick + dp->tick_offset - tick_start; g_assert(t >= 0); + t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); /* * The new part should have its time and devchan set to diff -rNu melys-0.0.18/widgets/melystrackinfo.c melys-0.0.19/widgets/melystrackinfo.c --- melys-0.0.18/widgets/melystrackinfo.c Thu Oct 14 18:18:21 1999 +++ melys-0.0.19/widgets/melystrackinfo.c Sat Oct 16 15:08:42 1999 @@ -100,8 +100,6 @@ #define COL_PADDING 2 -/* Padding to avoid overwriting the pan handle (gtk bug?) */ -#define PAN_PADDING 2 #define TMP_BUF_SIZE 100 @@ -385,7 +383,7 @@ root = minfo->mdroot; all = MD_MODIFIED(root); - MD_SET_MODIFIED(root, FALSE); + if (all) { gtk_widget_queue_draw(GTK_WIDGET(minfo)); } else { @@ -553,8 +551,6 @@ tot += widget->style->klass->xthickness; } - tot += PAN_PADDING; - req->width = tot; } @@ -578,12 +574,12 @@ /* Save the track area, not including title area */ minfo->track_area.x = allocation->x; minfo->track_area.y = allocation->y + minfo->vtitle; - minfo->track_area.width = allocation->width - PAN_PADDING; + minfo->track_area.width = allocation->width; minfo->track_area.height = allocation->height - minfo->vtitle; gdk_window_move_resize(widget->window, allocation->x, allocation->y, - allocation->width - PAN_PADDING, allocation->height); + allocation->width, allocation->height); /* Set up the vertical scrollbar */ track_vscroll_calc(minfo); diff -rNu melys-0.0.18/widgets/melystrackinfo.m melys-0.0.19/widgets/melystrackinfo.m --- melys-0.0.18/widgets/melystrackinfo.m Mon Oct 4 22:31:42 1999 +++ melys-0.0.19/widgets/melystrackinfo.m Fri Oct 15 11:57:36 1999 @@ -156,8 +156,6 @@ #define COL_PADDING 2 -/* Padding to avoid overwriting the pan handle (gtk bug?) */ -#define PAN_PADDING 2 >>function melys_track_info_new GtkWidget * @@ -354,7 +352,7 @@ root = minfo->mdroot; all = MD_MODIFIED(root); - MD_SET_MODIFIED(root, FALSE); + if (all) { gtk_widget_queue_draw(GTK_WIDGET(minfo)); } else { @@ -525,8 +523,6 @@ tot += widget->style->klass->xthickness; } - tot += PAN_PADDING; - req->width = tot; @@ -553,12 +549,12 @@ /* Save the track area, not including title area */ minfo->track_area.x = allocation->x; minfo->track_area.y = allocation->y + minfo->vtitle; - minfo->track_area.width = allocation->width - PAN_PADDING; + minfo->track_area.width = allocation->width; minfo->track_area.height = allocation->height - minfo->vtitle; gdk_window_move_resize(widget->window, allocation->x, allocation->y, - allocation->width - PAN_PADDING, allocation->height); + allocation->width, allocation->height); /* Set up the vertical scrollbar */ track_vscroll_calc(minfo);