diff -rNu melys-0.1.1/ChangeLog melys-0.1.2/ChangeLog --- melys-0.1.1/ChangeLog Mon Nov 8 13:21:38 1999 +++ melys-0.1.2/ChangeLog Sat Nov 13 13:18:17 1999 @@ -1,5 +1,96 @@ +1999-11-13 Steve Ratcliffe + + * 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 correctly 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-12 Steve Ratcliffe + + * md/mdadd.m, md/mdlist.m: + Now allow tracks to be sorted into place based on their + number. (they are always renumbered afterwards still). + + * files/mdmlread.m: + Bug with the way that mdml files are read in. v0.1.0 was OK + 0.1.1 probably affected and so shouldn't be used. + + * files/midiread.m: Fixed a memory leak + +1999-11-11 Steve Ratcliffe + + * midi/record.m, midi/play.m, seq/seqlib.m, song/song.m: + Ran the excelent memprof program and found that there + were a few minor memory leaks. + All leaks that are my fault are now fixed. There was also + a leak in alsa-lib for every event received. + +1999-11-10 Steve Ratcliffe + + * song/song.m: The song position pointer obviously belongs to + the song and not to the track view... I can't believe that I + did this but there is no one else to blame. + + * widgets/melyspiano.m, widgets/melysrule.m, widgets/melystrack.m, + widgets/melystrackdisplay.m, widgets/melystrackinfo.m, + widgets/melysview.m, widgets/viewcontrol.m: + First stage in creating a melys_view widget to be the base + class for the pianoroll, tempo and track windows. + Modified Files: + melysrule.m melystrack.m melystrackdisplay.m melystrackinfo.m + viewcontrol.m + Added Files: + melyspiano.m melysview.m + 1999-11-08 Steve Ratcliffe + * make.conf: Removed unused version number + + * version: Version 0.1.1 * version.c: For release 0.1.1 * song/song.m: Fix warning and remove an unused. diff -rNu melys-0.1.1/files/mdmlread.c melys-0.1.2/files/mdmlread.c --- melys-0.1.1/files/mdmlread.c Mon Nov 8 13:24:57 1999 +++ melys-0.1.2/files/mdmlread.c Sat Nov 13 13:27:54 1999 @@ -755,8 +755,10 @@ msp->currtime = MD_ENDTIME(el); gx_stack_pop(msp->estack, NULL); ls = gx_stack_top(msp->estack); - if (ls && ls->elem && el) + if (ls && ls->elem && el) { md_add(MD_CONTAINER(ls->elem), el); + msp->starttime = MD_TIME(ls->elem); + } } static xmlEntityPtr diff -rNu melys-0.1.1/files/mdmlread.m melys-0.1.2/files/mdmlread.m --- melys-0.1.1/files/mdmlread.m Mon Nov 1 20:32:36 1999 +++ melys-0.1.2/files/mdmlread.m Fri Nov 12 10:30:05 1999 @@ -731,8 +731,10 @@ msp->currtime = MD_ENDTIME(el); gx_stack_pop(msp->estack, NULL); ls = gx_stack_top(msp->estack); - if (ls && ls->elem && el) + if (ls && ls->elem && el) { md_add(MD_CONTAINER(ls->elem), el); + msp->starttime = MD_TIME(ls->elem); + } >>function getEntity diff -rNu melys-0.1.1/files/midiread.c melys-0.1.2/files/midiread.c --- melys-0.1.1/files/midiread.c Mon Nov 8 13:24:57 1999 +++ melys-0.1.2/files/midiread.c Sat Nov 13 13:27:55 1999 @@ -461,6 +461,7 @@ el = (struct element *)handle_meta(msp, type, data); } else { el = (struct element *)md_sysex_new(status, data, length); + g_free(data); } break; default: diff -rNu melys-0.1.1/files/midiread.m melys-0.1.2/files/midiread.m --- melys-0.1.1/files/midiread.m Sun Oct 24 19:22:12 1999 +++ melys-0.1.2/files/midiread.m Fri Nov 12 09:03:24 1999 @@ -474,6 +474,7 @@ el = (struct element *)handle_meta(msp, type, data); } else { el = (struct element *)md_sysex_new(status, data, length); + g_free(data); } break; default: diff -rNu melys-0.1.1/gui/Makefile melys-0.1.2/gui/Makefile --- melys-0.1.1/gui/Makefile Mon Nov 8 13:24:52 1999 +++ melys-0.1.2/gui/Makefile Sat Nov 13 13:27:49 1999 @@ -91,8 +91,6 @@ main.o: ../include/meldnd.h main.o: ../include/song.h main.o: ../include/melys.h -main.o: ../include/viewcontrol.h -main.o: ../include/melystrackinfo.h main.o: ../include/melystrack.h main.o: ../include/melyspos.h main.o: ../include/md.h diff -rNu melys-0.1.1/gui/main.c melys-0.1.2/gui/main.c --- melys-0.1.1/gui/main.c Mon Nov 8 13:25:01 1999 +++ melys-0.1.2/gui/main.c Sat Nov 13 13:27:59 1999 @@ -29,7 +29,6 @@ #include "libgnomeui/gnome-mdi-child.h" #include "libgnomeui/gnome-mdi-generic-child.h" #include "libgnomeui/gnome-dialog-util.h" -#include "libgnomeui/gnome-popup-help.h" #include "menus.h" #include "elements.h" #include "melreg.h" @@ -38,8 +37,6 @@ #include "meldnd.h" #include "song.h" #include "melys.h" -#include "viewcontrol.h" -#include "melystrackinfo.h" #include "melystrack.h" #include "melyspos.h" #include "md.h" @@ -54,15 +51,6 @@ /* For dialogs that do not belong to a particular song */ static regid_t UnattachedDialog; -/* - * Help text for the context menu on the info pane - */ -static char *trackinfohelp = N_( - "Here you can view the tracks and modify properties" - " of the track such as instrument and midi channel." - " You can also add and delete tracks from this menu" - ); - static GnomeMDI *MainMDI; static struct except childError; struct except *noActiveChildError = &childError; @@ -291,6 +279,7 @@ root = file_read(file); if (mel_file_error(psong, file, parent)) return NULL; + file_close(file); if (root->head->format == 0) md_split_midi0(root); @@ -347,6 +336,7 @@ mel_add_view(GtkObject *mdi, GtkObject *child, GtkWidget *view, gboolean toplevel) { + struct song *song = song_get_data(child); gtk_object_set_data(child, MEL_NEW_VIEW, view); @@ -357,6 +347,8 @@ gnome_mdi_add_toplevel_view(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); else gnome_mdi_add_view(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); + + song_set_view(song, view); } /* @@ -370,9 +362,7 @@ gboolean toplevel) { GtkWidget *w; - MelysTrackInfo *minfo; struct song *song = song_get_data(child); - extern GnomeUIInfo tracksmenu[]; /* Our initial view is the track based view */ w = melys_track_new(root); @@ -382,17 +372,9 @@ (w, 80*gdk_screen_width()/100, 50*gdk_screen_height()/100); } - /* - * Set the button three context menu. - */ - minfo = MELYS_TRACK(w)->info; - gnome_widget_add_help_with_uidata(GTK_WIDGET(minfo), _(trackinfohelp), - tracksmenu, mdi); - - song_set_trackview(song, w); + song_set_view(song, w); melys_track_set_song(MELYS_TRACK(w), song); - play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj); mel_add_view(mdi, child, w, toplevel); @@ -672,7 +654,6 @@ GnomeApp *app; struct song *song; MelysPos *pos; - GtkAdjustment *adj; dprintf1("view_changed_cb"); @@ -688,11 +669,8 @@ pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); song = get_song_from_mdi((GtkObject *)mdi); - adj = NULL; - if (song->trackview) - adj = ((MelysTrack *)song->trackview)->posadj; - if (adj) - melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), adj); + melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), + song->posadj); } } diff -rNu melys-0.1.1/gui/main.m melys-0.1.2/gui/main.m --- melys-0.1.1/gui/main.m Mon Nov 8 13:09:26 1999 +++ melys-0.1.2/gui/main.m Sat Nov 13 09:09:12 1999 @@ -20,7 +20,7 @@ >>header libgnomeui/gnome-mdi-child.h >>header libgnomeui/gnome-mdi-generic-child.h >>header libgnomeui/gnome-dialog-util.h ->>header libgnomeui/gnome-popup-help.h +>># header libgnomeui/gnome-popup-help.h >>header menus.h >>header elements.h @@ -30,9 +30,6 @@ >>header meldnd.h >>header song.h >>header melys.h ->># The need for trackinfo should be removed ->>header viewcontrol.h ->>header melystrackinfo.h >>header melystrack.h >>header melyspos.h >>header md.h @@ -84,15 +81,6 @@ /* For dialogs that do not belong to a particular song */ static regid_t UnattachedDialog; -/* - * Help text for the context menu on the info pane - */ -static char *trackinfohelp = N_( - "Here you can view the tracks and modify properties" - " of the track such as instrument and midi channel." - " You can also add and delete tracks from this menu" - ); - static GnomeMDI *MainMDI; static struct except childError; struct except *noActiveChildError = &childError; @@ -299,6 +287,7 @@ root = file_read(file); if (mel_file_error(psong, file, parent)) return NULL; + file_close(file); if (root->head->format == 0) md_split_midi0(root); @@ -355,6 +344,7 @@ We have to go in a very round about way of doing this... >>code + struct song *song = song_get_data(child); gtk_object_set_data(child, MEL_NEW_VIEW, view); @@ -366,6 +356,7 @@ else gnome_mdi_add_view(GNOME_MDI(mdi), GNOME_MDI_CHILD(child)); + song_set_view(song, view); >>function mel_initial_view void @@ -378,9 +369,7 @@ >>code GtkWidget *w; - MelysTrackInfo *minfo; struct song *song = song_get_data(child); - extern GnomeUIInfo tracksmenu[]; /* Our initial view is the track based view */ w = melys_track_new(root); @@ -390,17 +379,9 @@ (w, 80*gdk_screen_width()/100, 50*gdk_screen_height()/100); } - /* - * Set the button three context menu. - */ - minfo = MELYS_TRACK(w)->info; - gnome_widget_add_help_with_uidata(GTK_WIDGET(minfo), _(trackinfohelp), - tracksmenu, mdi); - - song_set_trackview(song, w); + song_set_view(song, w); melys_track_set_song(MELYS_TRACK(w), song); - play_set_pos_adj(song->play, MELYS_TRACK(song->trackview)->posadj); mel_add_view(mdi, child, w, toplevel); @@ -702,7 +683,6 @@ GnomeApp *app; struct song *song; MelysPos *pos; - GtkAdjustment *adj; dprintf1("@func_name"); @@ -718,11 +698,8 @@ pos = gtk_object_get_data(GTK_OBJECT(app), "song-position"); song = get_song_from_mdi((GtkObject *)mdi); - adj = NULL; - if (song->trackview) - adj = ((MelysTrack *)song->trackview)->posadj; - if (adj) - melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), adj); + melys_pos_set_controls(pos, md_get_tempomap(song->mdroot), + song->posadj); } diff -rNu melys-0.1.1/gui/menus.c melys-0.1.2/gui/menus.c --- melys-0.1.1/gui/menus.c Mon Nov 8 13:25:02 1999 +++ melys-0.1.2/gui/menus.c Sat Nov 13 13:28:00 1999 @@ -487,7 +487,6 @@ /* Make some attempt to clean up to help in memleak detection */ gnome_mdi_remove_all(mdi, FALSE); - gtk_object_destroy(GTK_OBJECT(mdi)); gtk_object_unref(GTK_OBJECT(mdi)); while (gtk_events_pending()) @@ -735,7 +734,6 @@ mel_song_info(sd, NULL, _("Number of allocated elements %d\n" ), md_get_nfree()); - #endif } diff -rNu melys-0.1.1/gui/menus.m melys-0.1.2/gui/menus.m --- melys-0.1.1/gui/menus.m Mon Oct 25 20:29:30 1999 +++ melys-0.1.2/gui/menus.m Sat Nov 13 12:53:44 1999 @@ -452,7 +452,6 @@ /* Make some attempt to clean up to help in memleak detection */ gnome_mdi_remove_all(mdi, FALSE); - gtk_object_destroy(GTK_OBJECT(mdi)); gtk_object_unref(GTK_OBJECT(mdi)); while (gtk_events_pending()) @@ -704,7 +703,6 @@ mel_song_info(sd, NULL, _("Number of allocated elements %d\n" ), md_get_nfree()); - #endif diff -rNu melys-0.1.1/include/md.h melys-0.1.2/include/md.h --- melys-0.1.1/include/md.h Mon Nov 8 13:24:44 1999 +++ melys-0.1.2/include/md.h Sat Nov 13 13:27:42 1999 @@ -206,6 +206,7 @@ gboolean clear); 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_shrink(struct rootElement *root); void md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, struct mbt *mbtp); diff -rNu melys-0.1.1/include/meldnd.h melys-0.1.2/include/meldnd.h --- melys-0.1.1/include/meldnd.h Mon Nov 8 13:24:47 1999 +++ melys-0.1.2/include/meldnd.h Sat Nov 13 13:27:44 1999 @@ -11,6 +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. + * + * */ /* diff -rNu melys-0.1.1/include/melyspiano.h melys-0.1.2/include/melyspiano.h --- melys-0.1.1/include/melyspiano.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.2/include/melyspiano.h Sat Nov 13 13:27:44 1999 @@ -0,0 +1,44 @@ +/* + * + * 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 ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * This is the top level widget for the piano roll. It + * is mainly a container for other widgets that combine + * to make the piano roll. + * + * + * + * + * + * + */ + +#define MELYS_PIANO(obj) GTK_CHECK_CAST(obj, melys_piano_get_type(), MelysPiano) +#define MELYS_PIANO_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_piano_get_type(), MelysPianoClass) +#define IS_MELYS_PIANO(obj) GTK_CHECK_TYPE(obj, melys_piano_get_type()) + +typedef struct _MelysPiano MelysPiano; +typedef struct _MelysPianoClass MelysPianoClass; + + +struct _MelysPiano { + MelysView melys_view; + + char *infostr; +}; + +struct _MelysPianoClass { + MelysViewClass parent_class; +}; + +guint melys_piano_get_type(void); +GtkWidget *melys_piano_new(struct containerElement *con); diff -rNu melys-0.1.1/include/melystrack.h melys-0.1.2/include/melystrack.h --- melys-0.1.1/include/melystrack.h Mon Nov 8 13:24:47 1999 +++ melys-0.1.2/include/melystrack.h Sat Nov 13 13:27:44 1999 @@ -45,9 +45,6 @@ */ #define TRACK_DEF_HEIGHT 16 /* Default track height */ #define TRACK_SEPARATION 2 /* Track separation */ -#define TRACK_TITLE_HEIGHT 20 /* Title hight */ -#define TRACK_DEF_HSCALE 24 /* Default horizontal scale */ -#define TRACK_TITLE_RULE 4 /* Offset from bottom of title area */ guint melys_track_get_type(void); diff -rNu melys-0.1.1/include/melystrackdisplay.h melys-0.1.2/include/melystrackdisplay.h --- melys-0.1.1/include/melystrackdisplay.h Mon Nov 8 13:24:47 1999 +++ melys-0.1.2/include/melystrackdisplay.h Sat Nov 13 13:27:44 1999 @@ -11,6 +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. + * + * */ #define MELYS_TRACK_DISPLAY(obj) GTK_CHECK_CAST(obj, melys_track_display_get_type(), MelysTrackDisplay) @@ -85,7 +89,8 @@ }; guint melys_track_display_get_type(void); -GtkWidget *melys_track_display_new(ViewControl *vcp, GtkAdjustment *posadj); +GtkWidget *melys_track_display_new(ViewControl *vcp); void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root); +void melys_track_display_set_song(MelysTrackDisplay *mdisp, struct song *song); void display_info_free(gpointer _info); diff -rNu melys-0.1.1/include/melystrackinfo.h melys-0.1.2/include/melystrackinfo.h --- melys-0.1.1/include/melystrackinfo.h Mon Nov 8 13:24:47 1999 +++ melys-0.1.2/include/melystrackinfo.h Sat Nov 13 13:27:44 1999 @@ -20,6 +20,8 @@ * * * + * + * */ #define MELYS_TRACK_INFO(obj) GTK_CHECK_CAST(obj, melys_track_info_get_type(), MelysTrackInfo) @@ -62,6 +64,9 @@ /* Allocated area that track information is being displayed in */ GdkRectangle track_area; + /* Our context menu */ + GtkWidget *menu; + /* The actual composition that is being displayed */ struct rootElement *mdroot; @@ -75,6 +80,8 @@ GdkPixmap *solo_label; GdkBitmap *solo_mask; + /* Button click information */ + int click_track; /* the track that was clicked */ }; struct _MelysTrackInfoClass { diff -rNu melys-0.1.1/include/melysview.h melys-0.1.2/include/melysview.h --- melys-0.1.1/include/melysview.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.2/include/melysview.h Sat Nov 13 13:27:45 1999 @@ -0,0 +1,90 @@ +/* + * + * 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 ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + * + * + * + * + * + * + * + */ + +#define MELYS_VIEW(obj) GTK_CHECK_CAST(obj, melys_view_get_type(), MelysView) +#define MELYS_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_view_get_type(), MelysViewClass) +#define IS_MELYS_VIEW(obj) GTK_CHECK_TYPE(obj, melys_view_get_type()) + +typedef struct _MelysView MelysView; +typedef struct _MelysViewClass MelysViewClass; + + +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + ETC +}; + +struct _MelysView { + GtkVBox vbox; + + ViewControl *vcp; + + GtkAdjustment *posadj; /* Song position adjustment */ + + /* Amount of vertical scrolling, in things (you never see half a thing) */ + int voffset; + /* Horizontal offset, in ticks */ + int hoffset; + /* Play position offset, in ticks */ + int poffset; + + /* The number of things in the vertical direction */ + int vthings; /* Number of notes, tracks whatever */ + + /* From aligning to a grid */ + enum snap_type snap; + + struct containerElement *elem; + struct song *song; + struct tempomapElement *tempomap; + + /* Widgets that are controlled by this widget */ + GtkWidget *canvas; /* The canvas that the subclass will place items on */ + GtkWidget *ruler; /* A ruler that can be used */ + GtkWidget *posline; /* Song position pointer */ + + void *points; +}; + +struct _MelysViewClass { + GtkVBoxClass parent_class; + + void (*scale_changed)(MelysView *); +}; + +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); diff -rNu melys-0.1.1/include/song.h melys-0.1.2/include/song.h --- melys-0.1.1/include/song.h Mon Nov 8 13:24:42 1999 +++ melys-0.1.2/include/song.h Sat Nov 13 13:27:40 1999 @@ -43,20 +43,24 @@ struct play *play; /* Play data */ struct record *record; /* Record data */ + GtkAdjustment *posadj; /* Song position adjustment */ /* Somewhat temporary recording of track */ struct trackElement *newtrack; /* Track being recorded */ int tracknum; /* The output dev/channel */ /* Here are all the views on this file */ - GtkWidget *trackview; + GSList *viewlist; + + /* Not sure if we should really have this... */ + GtkWidget *trackview; /* The main view */ int redrawing; /* True if redrawing (the id of the idle task) */ int unused:1; /* This song has not been used (no file etc) */ }; -void song_set_trackview(struct song *song, GtkWidget *view); +void song_set_view(struct song *song, GtkWidget *view); void song_setup(struct song *song, char *filename, struct rootElement *root); void song_play_start(struct song *song); void song_play_pause(struct song *song); diff -rNu melys-0.1.1/include/viewcontrol.h melys-0.1.2/include/viewcontrol.h --- melys-0.1.1/include/viewcontrol.h Mon Nov 8 13:24:47 1999 +++ melys-0.1.2/include/viewcontrol.h Sat Nov 13 13:27:45 1999 @@ -33,7 +33,7 @@ GtkAdjustment *hadj; /* Horizontal adjustment position */ GtkAdjustment *vadj; /* Vertical adjustment position */ - /* Scrollbars */ + /* Scrollbar groups */ GtkWidget *hsb; /* The horizontal scrollbar group */ GtkWidget *vsb; /* The vertical scrollbar group */ @@ -61,10 +61,15 @@ void (*scale_changed)(ViewControl *); }; +#define VIEW_DEF_HEIGHT 16 /* Default track height */ +#define VIEW_SEPARATION 2 /* Track separation */ +#define VIEW_TITLE_HEIGHT 20 /* Title hight */ +#define VIEW_DEF_HSCALE 24 /* Default horizontal scale */ +#define VIEW_TITLE_RULE 4 /* Offset from bottom of title area */ + guint view_control_get_type(void); ViewControl *view_control_new(void); -void view_control_set_vertical(ViewControl *vcp, int vscale, int vspace, - int vheight, int vtitle); +void view_control_set_vertical(ViewControl *vcp, int vscale); void view_control_set_horizontal(ViewControl *vcp, int hscale); void view_control_set_limits(ViewControl *vcp, int hmin, int hmax, int vmin, int vmax); diff -rNu melys-0.1.1/make.conf melys-0.1.2/make.conf --- melys-0.1.1/make.conf Tue Oct 19 00:10:56 1999 +++ melys-0.1.2/make.conf Mon Nov 8 13:45:50 1999 @@ -1,7 +1,4 @@ -# Version of Melys -VERSION = 0.0.10 - # Options required by the C compiler COPTS = -g -O2 -Wall diff -rNu melys-0.1.1/md/mdadd.c melys-0.1.2/md/mdadd.c --- melys-0.1.1/md/mdadd.c Mon Nov 8 13:24:59 1999 +++ melys-0.1.2/md/mdadd.c Sat Nov 13 13:27:56 1999 @@ -70,7 +70,9 @@ break; case MD_TYPE_TRACK: - MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks++; + if (!sort) + MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks; + MD_ROOT(c)->tracks++; /* Default a name if there isn't one already */ MD_ROOT(c)->trackid++; @@ -185,9 +187,10 @@ } g_ptr_array_free(c->elements, 1); - /* Destroy any associated data */ - g_dataset_destroy(c); } + + /* Destroy any associated data */ + g_dataset_destroy(el); switch (el->type) { case MD_TYPE_TEXT: diff -rNu melys-0.1.1/md/mdadd.m melys-0.1.2/md/mdadd.m --- melys-0.1.1/md/mdadd.m Sun Oct 24 00:32:51 1999 +++ melys-0.1.2/md/mdadd.m Fri Nov 12 18:23:36 1999 @@ -72,7 +72,9 @@ break; case MD_TYPE_TRACK: - MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks++; + if (!sort) + MD_TRACKLIKE(el)->number = MD_ROOT(c)->tracks; + MD_ROOT(c)->tracks++; /* Default a name if there isn't one already */ MD_ROOT(c)->trackid++; @@ -189,9 +191,10 @@ } g_ptr_array_free(c->elements, 1); - /* Destroy any associated data */ - g_dataset_destroy(c); } + + /* Destroy any associated data */ + g_dataset_destroy(el); switch (el->type) { case MD_TYPE_TEXT: diff -rNu melys-0.1.1/md/mdlist.c melys-0.1.2/md/mdlist.c --- melys-0.1.1/md/mdlist.c Mon Nov 8 13:24:59 1999 +++ melys-0.1.2/md/mdlist.c Sat Nov 13 13:27:57 1999 @@ -68,6 +68,12 @@ g_assert(n == c->elements->len - 1); /* check it was */ c->elements->pdata[n] = el; return n; + } else if (MD_TIME(p) == MD_TIME(el)) { + if (el->type == MD_TYPE_TRACK && MD_TYPE(p) == MD_TYPE_TRACK) { + if (MD_TRACKLIKE(p)->number <= MD_TRACKLIKE(el)->number) + continue; + } else + continue; } else if (MD_TIME(p) <= MD_TIME(el)) { /* Keep going */ diff -rNu melys-0.1.1/md/mdlist.m melys-0.1.2/md/mdlist.m --- melys-0.1.1/md/mdlist.m Tue Oct 12 14:52:59 1999 +++ melys-0.1.2/md/mdlist.m Fri Nov 12 18:23:36 1999 @@ -62,6 +62,12 @@ g_assert(n == c->elements->len - 1); /* check it was */ c->elements->pdata[n] = el; return n; + } else if (MD_TIME(p) == MD_TIME(el)) { + if (el->type == MD_TYPE_TRACK && MD_TYPE(p) == MD_TYPE_TRACK) { + if (MD_TRACKLIKE(p)->number <= MD_TRACKLIKE(el)->number) + continue; + } else + continue; } else if (MD_TIME(p) <= MD_TIME(el)) { /* Keep going */ diff -rNu melys-0.1.1/md/mdutil.c melys-0.1.2/md/mdutil.c --- melys-0.1.1/md/mdutil.c Mon Nov 8 13:25:00 1999 +++ melys-0.1.2/md/mdutil.c Sat Nov 13 13:27:58 1999 @@ -330,6 +330,32 @@ } /* + * Clear all data that has been set with g_dataset_set_data. + * This will destroy all the display info that we set and so + * remove all associated display items. We need to do this + * because even when deleted elements will almost never be + * freed when the undo system is working. + */ +void +md_clear_data(struct element *base) +{ + int i; + struct element *el; + + g_dataset_destroy(base); + + if (iscontainer(base)) { + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + if (iscontainer(el)) + md_clear_data(el); + else + g_dataset_destroy(el); + } + } +} + +/* * Shrink the root duration to just fit the track durations. * This is needed because we artificially increase the root * duration while recording. The tracks are also shrunk down diff -rNu melys-0.1.1/md/mdutil.m melys-0.1.2/md/mdutil.m --- melys-0.1.1/md/mdutil.m Fri Oct 22 11:03:30 1999 +++ melys-0.1.2/md/mdutil.m Sat Nov 13 09:09:47 1999 @@ -429,6 +429,34 @@ } +>>function md_clear_data +void +struct element *base; + +>>description +Clear all data that has been set with g_dataset_set_data. +This will destroy all the display info that we set and so +remove all associated display items. +We need to do this because even when deleted elements will almost +never be freed when the undo system is working. + +>>code + int i; + struct element *el; + + g_dataset_destroy(base); + + if (iscontainer(base)) { + for (i = 0; i < MD_CONTAINER_LEN(base); i++) { + el = MD_GET_INDEX(base, i); + if (iscontainer(el)) + md_clear_data(el); + else + g_dataset_destroy(el); + } + } + + >>function md_shrink void struct rootElement *root; diff -rNu melys-0.1.1/midi/play.c melys-0.1.2/midi/play.c --- melys-0.1.1/midi/play.c Mon Nov 8 13:25:06 1999 +++ melys-0.1.2/midi/play.c Sat Nov 13 13:28:05 1999 @@ -169,9 +169,11 @@ n = conf_get_input_ports(&addrs); seq_set_addresses(play->ctxp, SEQ_ADDR_INPUT, addrs, n); + g_free(addrs); n = conf_get_output_ports(&addrs); seq_set_addresses(play->ctxp, SEQ_ADDR_OUTPUT, addrs, n); + g_free(addrs); } /* diff -rNu melys-0.1.1/midi/play.m melys-0.1.2/midi/play.m --- melys-0.1.1/midi/play.m Sun Oct 3 12:24:46 1999 +++ melys-0.1.2/midi/play.m Thu Nov 11 23:54:44 1999 @@ -157,9 +157,11 @@ n = conf_get_input_ports(&addrs); seq_set_addresses(play->ctxp, SEQ_ADDR_INPUT, addrs, n); + g_free(addrs); n = conf_get_output_ports(&addrs); seq_set_addresses(play->ctxp, SEQ_ADDR_OUTPUT, addrs, n); + g_free(addrs); >>function play_start diff -rNu melys-0.1.1/midi/record.c melys-0.1.2/midi/record.c --- melys-0.1.1/midi/record.c Mon Nov 8 13:25:06 1999 +++ melys-0.1.2/midi/record.c Sat Nov 13 13:28:05 1999 @@ -128,9 +128,11 @@ n = conf_get_input_ports(&addrs); seq_set_addresses(record->ctxp, SEQ_ADDR_INPUT, addrs, n); + g_free(addrs); n = conf_get_output_ports(&addrs); seq_set_addresses(record->ctxp, SEQ_ADDR_OUTPUT, addrs, n); + g_free(addrs); seq_connect_addresses(record->ctxp, SEQ_ADDR_INPUT); add_io_cb(record, INPUT_ALL); @@ -288,7 +290,6 @@ } } snd_seq_free_event(ep); - } } diff -rNu melys-0.1.1/midi/record.m melys-0.1.2/midi/record.m --- melys-0.1.1/midi/record.m Wed Oct 13 00:32:49 1999 +++ melys-0.1.2/midi/record.m Thu Nov 11 23:54:45 1999 @@ -110,9 +110,11 @@ n = conf_get_input_ports(&addrs); seq_set_addresses(record->ctxp, SEQ_ADDR_INPUT, addrs, n); + g_free(addrs); n = conf_get_output_ports(&addrs); seq_set_addresses(record->ctxp, SEQ_ADDR_OUTPUT, addrs, n); + g_free(addrs); seq_connect_addresses(record->ctxp, SEQ_ADDR_INPUT); add_io_cb(record, INPUT_ALL); @@ -264,7 +266,6 @@ } } snd_seq_free_event(ep); - } diff -rNu melys-0.1.1/mlib/PROJECT/mgtk.py melys-0.1.2/mlib/PROJECT/mgtk.py --- melys-0.1.1/mlib/PROJECT/mgtk.py Sat Oct 23 00:24:48 1999 +++ melys-0.1.2/mlib/PROJECT/mgtk.py Sat Nov 13 12:28:22 1999 @@ -108,7 +108,6 @@ >>extern /* The list of signal id's that are being added for %(objname)s. */ ->>set signals enum { // XXX symbols for all signals here LAST_SIGNAL @@ -227,7 +226,7 @@ try: nosigs = m.getvar("nosignals") - except (KeyError, mcode.error): + except (KeyError, mcode.error), msg: str = signal_skel % vardict f = cStringIO.StringIO(str) m.process_file(f) diff -rNu melys-0.1.1/programs/Makefile melys-0.1.2/programs/Makefile --- melys-0.1.1/programs/Makefile Mon Nov 8 13:24:54 1999 +++ melys-0.1.2/programs/Makefile Sat Nov 13 13:27:52 1999 @@ -57,6 +57,7 @@ ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \ ../widgets/melysrule.o ../widgets/melyspos.o \ ../widgets/viewcontrol.o \ + ../widgets/melysview.o ../widgets/melyspiano.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ diff -rNu melys-0.1.1/programs/melys.m melys-0.1.2/programs/melys.m --- melys-0.1.1/programs/melys.m Mon Nov 8 13:11:34 1999 +++ melys-0.1.2/programs/melys.m Sat Nov 13 12:30:35 1999 @@ -31,6 +31,7 @@ >>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o >>make --objects ../widgets/melysrule.o ../widgets/melyspos.o >>make --objects ../widgets/viewcontrol.o +>>make --objects ../widgets/melysview.o ../widgets/melyspiano.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header diff -rNu melys-0.1.1/seq/seqlib.c melys-0.1.2/seq/seqlib.c --- melys-0.1.1/seq/seqlib.c Mon Nov 8 13:24:55 1999 +++ melys-0.1.2/seq/seqlib.c Sat Nov 13 13:27:53 1999 @@ -162,7 +162,7 @@ void seq_context_free(seq_context_t *ctxp) { - seq_context_t *ncp; + seq_context_t *ncp, *ncp2; if (ctxp == NULL) return; @@ -182,11 +182,11 @@ ctxp->srclist = NULL; /* Free all subcontext's */ - for (ctxp = ctxp->next; ctxp; ctxp = ncp) { - ncp = ctxp->next; + for (ncp = ctxp->next; ncp; ncp = ncp2) { + ncp2 = ncp->next; - seq_context_free(ctxp); - g_free(ctxp); + seq_context_free(ncp); + g_free(ncp); } g_free(ctxp); diff -rNu melys-0.1.1/seq/seqlib.m melys-0.1.2/seq/seqlib.m --- melys-0.1.1/seq/seqlib.m Mon Sep 27 14:05:13 1999 +++ melys-0.1.2/seq/seqlib.m Thu Nov 11 23:54:43 1999 @@ -196,7 +196,7 @@ If the main context is freed then the sequencer is closed. TODO: link all together so can all be closed at once. >>code - seq_context_t *ncp; + seq_context_t *ncp, *ncp2; if (ctxp == NULL) return; @@ -216,11 +216,11 @@ ctxp->srclist = NULL; /* Free all subcontext's */ - for (ctxp = ctxp->next; ctxp; ctxp = ncp) { - ncp = ctxp->next; + for (ncp = ctxp->next; ncp; ncp = ncp2) { + ncp2 = ncp->next; - seq_context_free(ctxp); - g_free(ctxp); + seq_context_free(ncp); + g_free(ncp); } g_free(ctxp); diff -rNu melys-0.1.1/song/song.c melys-0.1.2/song/song.c --- melys-0.1.1/song/song.c Mon Nov 8 13:24:55 1999 +++ melys-0.1.2/song/song.c Sat Nov 13 13:27:52 1999 @@ -42,15 +42,18 @@ void -song_set_trackview(struct song *song, GtkWidget *view) +song_set_view(struct song *song, GtkWidget *view) { - song->trackview = view; + song->viewlist = g_slist_prepend(song->viewlist, view); - gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, - "mute_track", song_mute_track, song); - gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, - "unmute_track", song_unmute_track, song); + if (IS_MELYS_TRACK(view)) { + song->trackview = view; + gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, + "mute_track", song_mute_track, song); + gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, + "unmute_track", song_unmute_track, song); + } } /* @@ -71,6 +74,11 @@ md_free(MD_ELEMENT(song->mdroot)); song->mdroot = root; + song->posadj->lower = 0.0; + song->posadj->upper = MD_ENDTIME(root); + gtk_adjustment_set_value(song->posadj, 0.0); + gtk_adjustment_changed(song->posadj); + play_set_mdroot(song->play, root); record_set_mdroot(song->record, root); @@ -236,6 +244,14 @@ sd->dialog = 0; sd->play = play_new(); sd->record = record_new(play_get_context(sd->play)); + sd->posadj = (GtkAdjustment *)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 + ); + gtk_object_ref((GtkObject *)sd->posadj); + gtk_object_sink((GtkObject *)sd->posadj); + play_set_pos_adj(sd->play, sd->posadj); gtk_object_set_data_full(GTK_OBJECT(child), MEL_SONG_DATA, sd, song_destroy); @@ -258,6 +274,9 @@ sd = data; /* Destroy all resources */ + + gtk_object_unref((GtkObject *)sd->posadj); + if (sd->mdroot) { md_free(MD_ELEMENT(sd->mdroot)); sd->mdroot = NULL; @@ -285,8 +304,13 @@ void song_view_update(struct song *song) { + GSList *list; - gtk_widget_queue_draw(GTK_WIDGET(song->trackview)); + list = song->viewlist; + while (list) { + gtk_widget_queue_draw(GTK_WIDGET(list->data)); + list = list->next; + } /* After all drawing is done we want to clear all modified bits */ if (!song->redrawing) @@ -310,7 +334,6 @@ { /* Determine if this is an audio or midi track */ - /* Mmm, yes its a midi track.... */ play_mute(song->play, track); @@ -320,8 +343,8 @@ song_unmute_track(GtkObject *notused, struct trackElement *track, struct song *song) { - /* Determine if this is an audio or midi track */ + /* Determine if this is an audio or midi track */ /* Its a midi track.... */ play_unmute(song->play, track); diff -rNu melys-0.1.1/song/song.m melys-0.1.2/song/song.m --- melys-0.1.1/song/song.m Mon Nov 8 13:10:32 1999 +++ melys-0.1.2/song/song.m Sat Nov 13 09:11:16 1999 @@ -56,13 +56,17 @@ struct play *play; /* Play data */ struct record *record; /* Record data */ + GtkAdjustment *posadj; /* Song position adjustment */ /* Somewhat temporary recording of track */ struct trackElement *newtrack; /* Track being recorded */ int tracknum; /* The output dev/channel */ /* Here are all the views on this file */ - GtkWidget *trackview; + GSList *viewlist; + + /* Not sure if we should really have this... */ + GtkWidget *trackview; /* The main view */ int redrawing; /* True if redrawing (the id of the idle task) */ int unused:1; /* This song has not been used (no file etc) */ @@ -70,19 +74,22 @@ >>header melgui.h ->>function song_set_trackview +>>function song_set_view void struct song *song; GtkWidget *view; >>code - song->trackview = view; + song->viewlist = g_slist_prepend(song->viewlist, view); - gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, - "mute_track", song_mute_track, song); - gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, - "unmute_track", song_unmute_track, song); + if (IS_MELYS_TRACK(view)) { + song->trackview = view; + gtk_signal_connect((GtkObject *)((MelysTrack *)view)->info, + "mute_track", song_mute_track, song); + gtk_signal_connect((GtkObject *)((MelysTrack*)view)->info, + "unmute_track", song_unmute_track, song); + } >>function song_setup @@ -108,6 +115,11 @@ md_free(MD_ELEMENT(song->mdroot)); song->mdroot = root; + song->posadj->lower = 0.0; + song->posadj->upper = MD_ENDTIME(root); + gtk_adjustment_set_value(song->posadj, 0.0); + gtk_adjustment_changed(song->posadj); + play_set_mdroot(song->play, root); record_set_mdroot(song->record, root); @@ -274,6 +286,14 @@ sd->dialog = 0; sd->play = play_new(); sd->record = record_new(play_get_context(sd->play)); + sd->posadj = (GtkAdjustment *)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 + ); + gtk_object_ref((GtkObject *)sd->posadj); + gtk_object_sink((GtkObject *)sd->posadj); + play_set_pos_adj(sd->play, sd->posadj); gtk_object_set_data_full(GTK_OBJECT(child), MEL_SONG_DATA, sd, song_destroy); @@ -297,6 +317,9 @@ sd = data; /* Destroy all resources */ + + gtk_object_unref((GtkObject *)sd->posadj); + if (sd->mdroot) { md_free(MD_ELEMENT(sd->mdroot)); sd->mdroot = NULL; @@ -327,13 +350,19 @@ The view widgets could optimise and check what has changed. >>code + GSList *list; - gtk_widget_queue_draw(GTK_WIDGET(song->trackview)); + list = song->viewlist; + while (list) { + gtk_widget_queue_draw(GTK_WIDGET(list->data)); + list = list->next; + } /* After all drawing is done we want to clear all modified bits */ if (!song->redrawing) song->redrawing = gtk_idle_add(song_clear_mod, song); + >>function song_clear_mod static int void *s; @@ -353,11 +382,11 @@ >>code /* Determine if this is an audio or midi track */ - /* Mmm, yes its a midi track.... */ play_mute(song->play, track); + >>function song_unmute_track static void GtkObject *notused; @@ -365,8 +394,8 @@ struct song *song; >>code - /* Determine if this is an audio or midi track */ + /* Determine if this is an audio or midi track */ /* Its a midi track.... */ play_unmute(song->play, track); diff -rNu melys-0.1.1/version melys-0.1.2/version --- melys-0.1.1/version Mon Nov 8 13:20:57 1999 +++ melys-0.1.2/version Sat Nov 13 13:18:25 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.1" +#define MELYS_VERSION_STRING "0.1.2" diff -rNu melys-0.1.1/widgets/.cvsignore melys-0.1.2/widgets/.cvsignore --- melys-0.1.1/widgets/.cvsignore Mon Nov 8 13:24:53 1999 +++ melys-0.1.2/widgets/.cvsignore Sat Nov 13 13:27:51 1999 @@ -1,10 +1,12 @@ melyspartitem.c +melyspiano.c melyspos.c melysrule.c melystrack.c melystrackdisplay.c melystrackinfo.c melystransport.c +melysview.c misc.c register.c viewcontrol.c diff -rNu melys-0.1.1/widgets/Makefile melys-0.1.2/widgets/Makefile --- melys-0.1.1/widgets/Makefile Mon Nov 8 13:24:53 1999 +++ melys-0.1.2/widgets/Makefile Sat Nov 13 13:27:51 1999 @@ -5,26 +5,31 @@ TARGETS = OBJS = melyspartitem.o \ + melyspiano.o \ melyspos.o \ melysrule.o \ melystrack.o \ melystrackdisplay.o \ melystrackinfo.o \ melystransport.o \ + melysview.o \ misc.o \ register.o \ viewcontrol.o GENCFILES = melyspartitem.c \ + melyspiano.c \ melyspos.c \ melysrule.c \ melystrack.c \ melystrackdisplay.c \ melystrackinfo.c \ melystransport.c \ + melysview.c \ misc.c \ register.c \ viewcontrol.c GENHFILES = ../include/melyspartitem.h \ + ../include/melyspiano.h \ ../include/melyspos.h \ ../include/melysrule.h \ ../include/melystrack.h \ @@ -32,6 +37,7 @@ ../include/meldnd.h \ ../include/melystrackinfo.h \ ../include/melystransport.h \ + ../include/melysview.h \ ../include/melwidgets.h \ ../include/melreg.h \ ../include/viewcontrol.h @@ -66,14 +72,23 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< -melysrule.o: ../include/elements.h -melysrule.o: ../include/viewcontrol.h -melysrule.o: ../include/melystrack.h -melysrule.o: ../include/md.h -melysrule.o: ../include/melysrule.h viewcontrol.o: ../include/pixmaps.h viewcontrol.o: ../include/melgui.h viewcontrol.o: ../include/viewcontrol.h +melysview.o: ../include/elements.h +melysview.o: ../include/md.h +melysview.o: ../include/viewcontrol.h +melysview.o: ../include/melysrule.h +melysview.o: ../include/melwidgets.h +melysview.o: ../include/song.h +melysview.o: ../include/melysview.h +melyspiano.o: ../include/elements.h +melyspiano.o: ../include/md.h +melyspiano.o: ../include/viewcontrol.h +melyspiano.o: ../include/melwidgets.h +melyspiano.o: ../include/melysview.h +melyspiano.o: ../include/melyspiano.h +register.o: ../include/melreg.h melyspartitem.o: ../include/elements.h melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h @@ -92,6 +107,11 @@ misc.o: ../include/pixmaps.h misc.o: ../include/melgui.h misc.o: ../include/melwidgets.h +melysrule.o: ../include/elements.h +melysrule.o: ../include/viewcontrol.h +melysrule.o: ../include/melystrack.h +melysrule.o: ../include/md.h +melysrule.o: ../include/melysrule.h melystrackinfo.o: ../include/melmsg.h melystrackinfo.o: ../include/melgui.h melystrackinfo.o: ../include/pixmaps.h @@ -99,6 +119,8 @@ melystrackinfo.o: ../include/md.h melystrackinfo.o: ../include/song.h melystrackinfo.o: ../include/viewcontrol.h +melystrackinfo.o: ../include/melysview.h +melystrackinfo.o: ../include/melyspiano.h melystrackinfo.o: ../include/melystrackinfo.h melystrackinfo.o: ../include/melystrack.h melystransport.o: ../include/melystransport.h @@ -115,4 +137,3 @@ melystrack.o: ../include/melystrackinfo.h melystrack.o: ../include/melystrackdisplay.h melystrack.o: ../include/melystrack.h -register.o: ../include/melreg.h diff -rNu melys-0.1.1/widgets/melyspiano.c melys-0.1.2/widgets/melyspiano.c --- melys-0.1.1/widgets/melyspiano.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.2/widgets/melyspiano.c Sat Nov 13 13:28:01 1999 @@ -0,0 +1,407 @@ +/* + * + * 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 ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * This is the top level widget for the piano roll. It + * is mainly a container for other widgets that combine + * to make the piano roll. + * + * + * + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtkwidget.h" +#include "gtk/gtkvbox.h" +#include "gtk/gtktable.h" +#include "gtk/gtkframe.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "libgnomeui/gnome-canvas-util.h" +#include "elements.h" +#include "md.h" +#include "viewcontrol.h" +#include "melwidgets.h" +#include "melysview.h" +#include "melyspiano.h" +#include "intl.h" + + + +/* 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) + +/* Notes are numbered 0-127 from the bottom where our y-coords go in + * the other direction + */ +#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 void melys_piano_class_init(MelysPianoClass *klass); +static void piano_scale_changed(MelysView *mview); +static void piano_destroy(GtkObject *obj); +static void piano_draw(GtkWidget *w, GdkRectangle *area); +static void piano_con_draw(MelysPiano *mpiano, struct containerElement *con, + int force); +static void update_note(MelysPiano *mpiano, struct containerElement *con, + struct noteElement *note, int force); +static void piano_realize(GtkWidget *w); +static void display_info_free(gpointer _dinfo); + + +static MelysViewClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_piano_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysPiano", + sizeof(MelysPiano), + sizeof(MelysPianoClass), + (GtkClassInitFunc) melys_piano_class_init, + (GtkObjectInitFunc) melys_piano_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(melys_view_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysPiano object. It is always created based + * on a particular element to be displayed. You can have + * several of these views on the same song if you want. + */ +GtkWidget * +melys_piano_new(struct containerElement *con) +{ + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_piano_get_type())); + MelysView *mview = MELYS_VIEW(w); + + mview->elem = con; + MD_REF(con); + + return w; +} + +/* + * Initialise the MelysPiano. + * + * Arguments: + * mpiano - The MelysPiano to init + */ +static void +melys_piano_init(MelysPiano *mpiano) +{ + GtkTable *tab; + MelysView *mview = MELYS_VIEW(mpiano); + GtkWidget *frame1; + GtkBox *vbox1; + + view_control_set_vertical(mview->vcp, 8); + + tab = (GtkTable *)gtk_table_new(3, 3, 0); + + gtk_box_pack_start(GTK_BOX(mpiano), GTK_WIDGET(tab), 1, 1, 0); + + /* + * Attach everything in the correct place, see the diagram + */ + + /* The vert scrollbar group */ + gtk_table_attach(tab, mview->vcp->vsb, 2, 4, 0, 3, + 0, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, 0 + ); + gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 3, 4, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, + 0, 0 + ); + + /* The main canvas and ruler */ + + vbox1 = (GtkBox *)gtk_vbox_new(0, 0); + frame1 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); + + /* Pack the canvas and ruler in a box */ + gtk_box_pack_start(vbox1, mview->ruler, 0, 0, 0); + gtk_box_pack_start(vbox1, mview->canvas, 1, 1, 0); + + /* Put the lot in a frame */ + gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); + + /* And add the frame */ + gtk_table_attach(tab, frame1, 1, 2, 0, 3, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, 0 + ); + + gtk_widget_set_usize(mview->ruler, 1, mview->vcp->vtitle); + gtk_widget_show_all(GTK_WIDGET(tab)); + + mview->vthings = 127; /* There are 127 midi notes */ + + mpiano->infostr = g_strdup_printf("piano-%d-info", PianoID++); +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_piano_class_init(MelysPianoClass *klass) +{ + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + MelysViewClass *melys_view_class; + + object_class = (GtkObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + melys_view_class = (MelysViewClass *)klass; + + parent_class = gtk_type_class(melys_view_get_type()); + + object_class->destroy = piano_destroy; + widget_class->draw = piano_draw; + widget_class->realize = piano_realize; + + melys_view_class->scale_changed = piano_scale_changed; +} + +/* + * There is nothing to draw on the canvas, we just make sure that + * the items are configured correctly and let the canvas draw + * them. + */ +static void +piano_scale_changed(MelysView *mview) +{ + + g_return_if_fail(mview->elem); + + 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); +} + +static void +piano_destroy(GtkObject *obj) +{ + MelysPiano *mpiano = MELYS_PIANO(obj); + + /* XXX should destroy datasets first */ + g_free(mpiano->infostr); + + GTK_OBJECT_CLASS(parent_class)->destroy(obj); +} + +static void +piano_draw(GtkWidget *w, GdkRectangle *area) +{ + MelysPiano *mpiano = MELYS_PIANO(w); + + piano_con_draw(mpiano, MELYS_VIEW(mpiano)->elem, FALSE); + + GTK_WIDGET_CLASS(parent_class)->draw(w, area); +} + +/* + * Draw the notes within this container. If there are sub + * containers then this routine is called recursively until + * the notes are found and drawn. The area parameter may be + * useful to optimise the display but on the whole we have to + * check the whole lot. + */ +static void +piano_con_draw(MelysPiano *mpiano, struct containerElement *con, int force) +{ + int n; + int maxnote = 0; + int minnote = 127; + struct element *el; + struct noteElement *note; + + g_assert(iscontainer(con)); + + if (!GTK_WIDGET_REALIZED(mpiano)) + return; + + for (n = 0; n < MD_CONTAINER_LEN(con); n++) { + el = MD_GET_INDEX(con, n); + if (iscontainer(el)) + piano_con_draw(mpiano, MD_CONTAINER(el), force); + else if (el->type == MD_TYPE_NOTE) { + note = MD_NOTE(el); + maxnote = MAX(note->note, maxnote); + minnote = MIN(note->note, minnote); + update_note(mpiano, con, note, force); + } + } + + if (maxnote) { + GtkAdjustment *adj; + + minnote -= 8; + minnote = MAX(0, minnote); + + /* + * If the slider is right at the top, then we try to adjust + * it so that all the notes are in view. The highest note + * will be set at the top of the visible display. + * + * If the slider is not at the top then we leave alone, as + * you may have set it somewhere in particular and done want + * to see it jumping about. + */ + adj = MELYS_VIEW(mpiano)->vcp->vadj; + if (adj->value == 0) + gtk_adjustment_clamp_page(adj, + (gfloat) 127 - maxnote, (gfloat) 127 - minnote); + + gtk_adjustment_value_changed(adj); + } +} + +/* + * Update the dimensions of the item representing the note. + */ +static void +update_note(MelysPiano *mpiano, struct containerElement *con, + struct noteElement *note, int force) +{ + GnomeCanvasItem *item; + struct display_info *dinfo; + int state; + + g_return_if_fail(note != NULL); + + /* If elements are destroyed then we can't touch them */ + if (MD_IS_DESTROYED(note) || MD_IS_DESTROYED(con)) + return; + + /* If the element is not modified then there is no need to do anything */ + if (!force && !MD_MODIFIED(con) && !MD_MODIFIED(note)) + return; + + if (GTK_OBJECT_DESTROYED(mpiano)) + return; + + /* 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); + if (dinfo == NULL) { + GnomeCanvasGroup *rgroup; + + rgroup = gnome_canvas_root((GnomeCanvas*)MELYS_VIEW(mpiano)->canvas); + + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_RECT, + "x1", (double) 0.0, + "y1", (double) 0.0, + "width_pixels", 1, + "outline_color", "black", + NULL); + + dinfo = g_new(struct display_info, 1); + gtk_object_ref((GtkObject *) item); + dinfo->item = item; + + MD_WREF(note); + dinfo->note = note; + + MD_WREF(con); + dinfo->cpart = con; + + g_dataset_set_data_full(note, mpiano->infostr, + dinfo, display_info_free); + } + + g_assert(dinfo != NULL); + 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, + "fill_color_gdk", >K_WIDGET(mpiano)->style->light[state], + NULL); +} + +static void +piano_realize(GtkWidget *w) +{ + MelysPiano *mpiano = MELYS_PIANO(w); + + if (GTK_WIDGET_CLASS(parent_class)->realize) + GTK_WIDGET_CLASS(parent_class)->realize(w); + + piano_scale_changed(MELYS_VIEW(mpiano)); +} + +static void +display_info_free(gpointer _dinfo) +{ + struct display_info *dinfo = _dinfo; + + gtk_object_destroy((GtkObject *) dinfo->item); + gtk_object_unref((GtkObject *) dinfo->item); + MD_WUNREF(dinfo->cpart); + MD_WUNREF(dinfo->note); + + g_free(_dinfo); +} diff -rNu melys-0.1.1/widgets/melyspiano.m melys-0.1.2/widgets/melyspiano.m --- melys-0.1.1/widgets/melyspiano.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.2/widgets/melyspiano.m Sat Nov 13 12:30:10 1999 @@ -0,0 +1,390 @@ +>>name melyspiano.m - Piano roll container widget. + +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 ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +This is the top level widget for the piano roll. It +is mainly a container for other widgets that combine +to make the piano roll. + +>>header gtk/gtkwidget.h +>>header gtk/gtkvbox.h +>>header gtk/gtktable.h +>>header gtk/gtkframe.h + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-rect-ellipse.h +>>header libgnomeui/gnome-canvas-util.h + +>>header elements.h +>>header md.h + +>>header viewcontrol.h +>>header melwidgets.h +>>header melysview.h + +>>set nosignals +>>gtkobject melys_piano melys_view + +>>headerdef @header + +struct _MelysPiano { + MelysView melys_view; + + char *infostr; +}; + +struct _MelysPianoClass { + MelysViewClass parent_class; +}; + +>>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) + +/* Notes are numbered 0-127 from the bottom where our y-coords go in + * the other direction + */ +#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; + + +>>function melys_piano_new +GtkWidget * +struct containerElement *con; + +>>description +Create a new MelysPiano object. +It is always created based on a particular element to +be displayed. +You can have several of these views on +the same song if you want. + +>>code + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_piano_get_type())); + MelysView *mview = MELYS_VIEW(w); + + mview->elem = con; + MD_REF(con); + + return w; + + +>>function melys_piano_init +static void +MelysPiano *mpiano; The MelysPiano to init +>>description +Initialise the MelysPiano. +>>code + GtkTable *tab; + MelysView *mview = MELYS_VIEW(mpiano); + GtkWidget *frame1; + GtkBox *vbox1; + + view_control_set_vertical(mview->vcp, 8); + + tab = (GtkTable *)gtk_table_new(3, 3, 0); + + gtk_box_pack_start(GTK_BOX(mpiano), GTK_WIDGET(tab), 1, 1, 0); + + /* + * Attach everything in the correct place, see the diagram + */ + + /* The vert scrollbar group */ + gtk_table_attach(tab, mview->vcp->vsb, 2, 4, 0, 3, + 0, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, 0 + ); + gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 3, 4, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, + 0, 0 + ); + + /* The main canvas and ruler */ + + vbox1 = (GtkBox *)gtk_vbox_new(0, 0); + frame1 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); + + /* Pack the canvas and ruler in a box */ + gtk_box_pack_start(vbox1, mview->ruler, 0, 0, 0); + gtk_box_pack_start(vbox1, mview->canvas, 1, 1, 0); + + /* Put the lot in a frame */ + gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); + + /* And add the frame */ + gtk_table_attach(tab, frame1, 1, 2, 0, 3, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, 0 + ); + + gtk_widget_set_usize(mview->ruler, 1, mview->vcp->vtitle); + gtk_widget_show_all(GTK_WIDGET(tab)); + + mview->vthings = 127; /* There are 127 midi notes */ + + mpiano->infostr = g_strdup_printf("piano-%d-info", PianoID++); + + +>>function melys_piano_class_init +static void +MelysPianoClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + MelysViewClass *melys_view_class; + + object_class = (GtkObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + melys_view_class = (MelysViewClass *)klass; + + parent_class = gtk_type_class(melys_view_get_type()); + + object_class->destroy = piano_destroy; + widget_class->draw = piano_draw; + widget_class->realize = piano_realize; + + melys_view_class->scale_changed = piano_scale_changed; + + +>>function piano_scale_changed +static void +MelysView *mview; + +>>description +There is nothing to draw on the canvas, we just make sure that +the items are configured correctly and let the canvas +draw them. + +>>code + + g_return_if_fail(mview->elem); + + 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); + + +>>function piano_destroy +static void +GtkObject *obj; + +>>code + MelysPiano *mpiano = MELYS_PIANO(obj); + + /* XXX should destroy datasets first */ + g_free(mpiano->infostr); + + GTK_OBJECT_CLASS(parent_class)->destroy(obj); + +>>function piano_draw +static void +GtkWidget *w; +GdkRectangle *area; + +>>code + MelysPiano *mpiano = MELYS_PIANO(w); + + piano_con_draw(mpiano, MELYS_VIEW(mpiano)->elem, FALSE); + + GTK_WIDGET_CLASS(parent_class)->draw(w, area); + + +>>function piano_con_draw +static void +MelysPiano *mpiano; +struct containerElement *con; +int force; + +>>description +Draw the notes within this container. +If there are sub containers then this routine is called recursively +until the notes are found and drawn. +The +.A area +parameter may be useful to optimise the display but on the whole +we have to check the whole lot. + +>>code + int n; + int maxnote = 0; + int minnote = 127; + struct element *el; + struct noteElement *note; + + g_assert(iscontainer(con)); + + if (!GTK_WIDGET_REALIZED(mpiano)) + return; + + for (n = 0; n < MD_CONTAINER_LEN(con); n++) { + el = MD_GET_INDEX(con, n); + if (iscontainer(el)) + piano_con_draw(mpiano, MD_CONTAINER(el), force); + else if (el->type == MD_TYPE_NOTE) { + note = MD_NOTE(el); + maxnote = MAX(note->note, maxnote); + minnote = MIN(note->note, minnote); + update_note(mpiano, con, note, force); + } + } + + if (maxnote) { + GtkAdjustment *adj; + + minnote -= 8; + minnote = MAX(0, minnote); + + /* + * If the slider is right at the top, then we try to adjust + * it so that all the notes are in view. The highest note + * will be set at the top of the visible display. + * + * If the slider is not at the top then we leave alone, as + * you may have set it somewhere in particular and done want + * to see it jumping about. + */ + adj = MELYS_VIEW(mpiano)->vcp->vadj; + if (adj->value == 0) + gtk_adjustment_clamp_page(adj, + (gfloat) 127 - maxnote, (gfloat) 127 - minnote); + + gtk_adjustment_value_changed(adj); + } + + +>>function update_note +static void +MelysPiano *mpiano; +struct containerElement *con; +struct noteElement *note; +int force; + +>>description +Update the dimensions of the item representing the note. + +>>code + GnomeCanvasItem *item; + struct display_info *dinfo; + int state; + + g_return_if_fail(note != NULL); + + /* If elements are destroyed then we can't touch them */ + if (MD_IS_DESTROYED(note) || MD_IS_DESTROYED(con)) + return; + + /* If the element is not modified then there is no need to do anything */ + if (!force && !MD_MODIFIED(con) && !MD_MODIFIED(note)) + return; + + if (GTK_OBJECT_DESTROYED(mpiano)) + return; + + /* 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); + if (dinfo == NULL) { + GnomeCanvasGroup *rgroup; + + rgroup = gnome_canvas_root((GnomeCanvas*)MELYS_VIEW(mpiano)->canvas); + + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_RECT, + "x1", (double) 0.0, + "y1", (double) 0.0, + "width_pixels", 1, + "outline_color", "black", + NULL); + + dinfo = g_new(struct display_info, 1); + gtk_object_ref((GtkObject *) item); + dinfo->item = item; + + MD_WREF(note); + dinfo->note = note; + + MD_WREF(con); + dinfo->cpart = con; + + g_dataset_set_data_full(note, mpiano->infostr, + dinfo, display_info_free); + } + + g_assert(dinfo != NULL); + 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, + "fill_color_gdk", >K_WIDGET(mpiano)->style->light[state], + NULL); + +>>function piano_realize +static void +GtkWidget *w; + +>>code + MelysPiano *mpiano = MELYS_PIANO(w); + + if (GTK_WIDGET_CLASS(parent_class)->realize) + GTK_WIDGET_CLASS(parent_class)->realize(w); + + piano_scale_changed(MELYS_VIEW(mpiano)); + + +>>function display_info_free +static void +gpointer _dinfo; + +>>code + struct display_info *dinfo = _dinfo; + + gtk_object_destroy((GtkObject *) dinfo->item); + gtk_object_unref((GtkObject *) dinfo->item); + MD_WUNREF(dinfo->cpart); + MD_WUNREF(dinfo->note); + + g_free(_dinfo); diff -rNu melys-0.1.1/widgets/melysrule.c melys-0.1.2/widgets/melysrule.c --- melys-0.1.1/widgets/melysrule.c Mon Nov 8 13:25:03 1999 +++ melys-0.1.2/widgets/melysrule.c Sat Nov 13 13:28:01 1999 @@ -176,6 +176,7 @@ MelysRule *mrule = data; gdk_window_clear(((GtkWidget *)mrule)->window); + gtk_widget_queue_draw((GtkWidget *)mrule); } /* @@ -192,10 +193,10 @@ int tick; int yoff; - if (!GTK_WIDGET_DRAWABLE(widget)) + mrule = MELYS_RULE(widget); + if (!GTK_WIDGET_DRAWABLE(widget) || !mrule->tempomap) return; - mrule = MELYS_RULE(widget); tempomap = mrule->tempomap; x = ap->x; @@ -226,7 +227,7 @@ yoff = 18; gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - x, yoff, x, mrule->vcp->vtitle - TRACK_TITLE_RULE); + x, yoff, x, mrule->vcp->vtitle - VIEW_TITLE_RULE); /* Increment to the next one */ mbt.bars++; @@ -237,8 +238,8 @@ gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - 0, mrule->vcp->vtitle - TRACK_TITLE_RULE, - widget->allocation.width, mrule->vcp->vtitle - TRACK_TITLE_RULE); + 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, + widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); return; } diff -rNu melys-0.1.1/widgets/melysrule.m melys-0.1.2/widgets/melysrule.m --- melys-0.1.1/widgets/melysrule.m Mon Nov 8 13:03:02 1999 +++ melys-0.1.2/widgets/melysrule.m Sat Nov 13 09:19:09 1999 @@ -145,6 +145,7 @@ MelysRule *mrule = data; gdk_window_clear(((GtkWidget *)mrule)->window); + gtk_widget_queue_draw((GtkWidget *)mrule); >>function rule_draw @@ -164,10 +165,10 @@ int tick; int yoff; - if (!GTK_WIDGET_DRAWABLE(widget)) + mrule = MELYS_RULE(widget); + if (!GTK_WIDGET_DRAWABLE(widget) || !mrule->tempomap) return; - mrule = MELYS_RULE(widget); tempomap = mrule->tempomap; x = ap->x; @@ -198,7 +199,7 @@ yoff = 18; gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - x, yoff, x, mrule->vcp->vtitle - TRACK_TITLE_RULE); + x, yoff, x, mrule->vcp->vtitle - VIEW_TITLE_RULE); /* Increment to the next one */ mbt.bars++; @@ -209,8 +210,8 @@ gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - 0, mrule->vcp->vtitle - TRACK_TITLE_RULE, - widget->allocation.width, mrule->vcp->vtitle - TRACK_TITLE_RULE); + 0, mrule->vcp->vtitle - VIEW_TITLE_RULE, + widget->allocation.width, mrule->vcp->vtitle - VIEW_TITLE_RULE); return; diff -rNu melys-0.1.1/widgets/melystrack.c melys-0.1.2/widgets/melystrack.c --- melys-0.1.1/widgets/melystrack.c Mon Nov 8 13:25:04 1999 +++ melys-0.1.2/widgets/melystrack.c Sat Nov 13 13:28:02 1999 @@ -108,7 +108,6 @@ static void melys_track_init(MelysTrack *mtrack) { - GtkAdjustment *posadj; GtkHPaned *hpan; GtkTable *tab; MelysTrackInfo *info; @@ -122,11 +121,7 @@ gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); vcp = (ViewControl *)view_control_new(); - view_control_set_vertical(vcp, - TRACK_DEF_HEIGHT + TRACK_SEPARATION, - TRACK_SEPARATION, TRACK_DEF_HEIGHT, - TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION); - view_control_set_horizontal(vcp, TRACK_DEF_HSCALE); + view_control_set_vertical(vcp, TRACK_DEF_HEIGHT + TRACK_SEPARATION); view_control_set_limits(vcp, 1, 0, 9, 0); mtrack->vcp = vcp; @@ -135,19 +130,13 @@ gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); - posadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - frame1 = gtk_frame_new(NULL); frame2 = gtk_frame_new(NULL); gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); info = (MelysTrackInfo*)melys_track_info_new(vcp); - disp = (MelysTrackDisplay*)melys_track_display_new(vcp, posadj); + disp = (MelysTrackDisplay*)melys_track_display_new(vcp); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -180,10 +169,6 @@ gtk_widget_show(GTK_WIDGET(hpan)); gtk_widget_show(GTK_WIDGET(tab)); - mtrack->posadj = posadj; - gtk_object_ref((GtkObject*)posadj); - gtk_object_sink((GtkObject*)posadj); - mtrack->info = info; mtrack->display = disp; } @@ -236,11 +221,6 @@ gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); gtk_adjustment_changed(mtrack->vcp->vadj); - mtrack->posadj->lower = 0.0; - mtrack->posadj->upper = MD_ENDTIME(root); - gtk_adjustment_set_value(mtrack->posadj, 0.0); - gtk_adjustment_changed(mtrack->posadj); - melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); } @@ -250,8 +230,13 @@ { mtrack->song = song; + + g_assert(song->posadj); + mtrack->posadj = song->posadj; + gtk_object_ref((GtkObject *)mtrack->posadj); + mtrack->info->song = song; - mtrack->display->song = song; + melys_track_display_set_song(mtrack->display, song); } /* diff -rNu melys-0.1.1/widgets/melystrack.m melys-0.1.2/widgets/melystrack.m --- melys-0.1.1/widgets/melystrack.m Mon Nov 8 13:03:02 1999 +++ melys-0.1.2/widgets/melystrack.m Wed Nov 10 13:13:30 1999 @@ -62,9 +62,6 @@ */ #define TRACK_DEF_HEIGHT 16 /* Default track height */ #define TRACK_SEPARATION 2 /* Track separation */ -#define TRACK_TITLE_HEIGHT 20 /* Title hight */ -#define TRACK_DEF_HSCALE 24 /* Default horizontal scale */ -#define TRACK_TITLE_RULE 4 /* Offset from bottom of title area */ >>extern @@ -92,7 +89,6 @@ >>description Initialise the MelysTrack. >>code - GtkAdjustment *posadj; GtkHPaned *hpan; GtkTable *tab; MelysTrackInfo *info; @@ -106,11 +102,7 @@ gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); vcp = (ViewControl *)view_control_new(); - view_control_set_vertical(vcp, - TRACK_DEF_HEIGHT + TRACK_SEPARATION, - TRACK_SEPARATION, TRACK_DEF_HEIGHT, - TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION); - view_control_set_horizontal(vcp, TRACK_DEF_HSCALE); + view_control_set_vertical(vcp, TRACK_DEF_HEIGHT + TRACK_SEPARATION); view_control_set_limits(vcp, 1, 0, 9, 0); mtrack->vcp = vcp; @@ -119,19 +111,13 @@ gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); - posadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - frame1 = gtk_frame_new(NULL); frame2 = gtk_frame_new(NULL); gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); info = (MelysTrackInfo*)melys_track_info_new(vcp); - disp = (MelysTrackDisplay*)melys_track_display_new(vcp, posadj); + disp = (MelysTrackDisplay*)melys_track_display_new(vcp); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -164,10 +150,6 @@ gtk_widget_show(GTK_WIDGET(hpan)); gtk_widget_show(GTK_WIDGET(tab)); - mtrack->posadj = posadj; - gtk_object_ref((GtkObject*)posadj); - gtk_object_sink((GtkObject*)posadj); - mtrack->info = info; mtrack->display = disp; @@ -223,11 +205,6 @@ gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); gtk_adjustment_changed(mtrack->vcp->vadj); - mtrack->posadj->lower = 0.0; - mtrack->posadj->upper = MD_ENDTIME(root); - gtk_adjustment_set_value(mtrack->posadj, 0.0); - gtk_adjustment_changed(mtrack->posadj); - melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -240,8 +217,13 @@ >>code mtrack->song = song; + + g_assert(song->posadj); + mtrack->posadj = song->posadj; + gtk_object_ref((GtkObject *)mtrack->posadj); + mtrack->info->song = song; - mtrack->display->song = song; + melys_track_display_set_song(mtrack->display, song); >>function track_draw diff -rNu melys-0.1.1/widgets/melystrackdisplay.c melys-0.1.2/widgets/melystrackdisplay.c --- melys-0.1.1/widgets/melystrackdisplay.c Mon Nov 8 13:25:04 1999 +++ melys-0.1.2/widgets/melystrackdisplay.c Sat Nov 13 13:28:02 1999 @@ -11,6 +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. + * + * */ @@ -223,10 +227,9 @@ * * Arguments: * vcp - Adjustments and scaling - * posadj - Song position adjustment */ GtkWidget * -melys_track_display_new(ViewControl *vcp, GtkAdjustment *posadj) +melys_track_display_new(ViewControl *vcp) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); MelysTrackDisplay *mdisp; @@ -234,7 +237,6 @@ mdisp = (MelysTrackDisplay*)w; mdisp->vcp = vcp; - mdisp->posadj = posadj; gtk_signal_connect((GtkObject *)vcp, "scale-changed", scale_changed, mdisp); @@ -242,11 +244,8 @@ (GtkSignalFunc)disp_scroll, mdisp); gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); - gtk_signal_connect((GtkObject *)posadj, "value-changed", - (GtkSignalFunc)song_pos_cb, mdisp); gtk_object_ref((GtkObject*)vcp); - gtk_object_ref((GtkObject*)posadj); melys_rule_set_adj(MELYS_RULE(mdisp->title), vcp); @@ -383,6 +382,19 @@ build_sel_list(mdisp); /* There may be some parts already selected */ } +void +melys_track_display_set_song(MelysTrackDisplay *mdisp, struct song *song) +{ + mdisp->song = song; + + g_assert(song->posadj); + mdisp->posadj = song->posadj; + gtk_object_ref((GtkObject *) mdisp->posadj); + + gtk_signal_connect_while_alive((GtkObject *)mdisp->posadj, + "value-changed", (GtkSignalFunc)song_pos_cb, mdisp, GTK_OBJECT(mdisp)); +} + /* * The scaling has changed. Recalculate all sizes. * @@ -610,12 +622,21 @@ group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_GROUP, NULL); + item = gnome_canvas_item_new(group, melys_part_item_get_type(), + "x1", (double) 0.0, + "y1", (double) 0.0, + "width_pixels", 1, + "outline_color", "black", + "dotted_border", ref, NULL); - text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, - "text", pname, + "x", (double) 2, + "y", (double) 2, + "font_gdk", GTK_WIDGET(mdisp)->style->font, + "anchor", GTK_ANCHOR_NORTH_WEST, + "clip", TRUE, NULL); pitem = MELYS_PART_ITEM(item); @@ -666,27 +687,19 @@ /* Set the font and text properties */ gnome_canvas_item_set(dinfo->text, - "x", (double) 2, - "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, "clip_height", (double) mdisp->vcp->vheight-2, NULL); /* This size of the part is set here */ gnome_canvas_item_set(dinfo->pitem, - "x1", (double) 0.0, - "y1", (double) 0.0, + "x1", 0.0, + "y1", 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), "y2", (double) mdisp->vcp->vheight, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], - "width_pixels", 1, - "outline_color", "black", - "dotted_border", ref, NULL); } @@ -722,7 +735,6 @@ mdisp->mdroot = NULL; } - if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); } @@ -1299,10 +1311,12 @@ struct sel_info *info; info = list->data; + 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)); md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); } } diff -rNu melys-0.1.1/widgets/melystrackdisplay.m melys-0.1.2/widgets/melystrackdisplay.m --- melys-0.1.1/widgets/melystrackdisplay.m Mon Nov 8 13:03:02 1999 +++ melys-0.1.2/widgets/melystrackdisplay.m Sat Nov 13 09:16:36 1999 @@ -10,6 +10,10 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of 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. + >>extern >>header gdk_imlib.h @@ -229,7 +233,6 @@ >>function melys_track_display_new GtkWidget * ViewControl *vcp; Adjustments and scaling -GtkAdjustment *posadj; Song position adjustment >>description Create a new MelysTrackDisplay object. @@ -241,7 +244,6 @@ mdisp = (MelysTrackDisplay*)w; mdisp->vcp = vcp; - mdisp->posadj = posadj; gtk_signal_connect((GtkObject *)vcp, "scale-changed", scale_changed, mdisp); @@ -249,11 +251,8 @@ (GtkSignalFunc)disp_scroll, mdisp); gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); - gtk_signal_connect((GtkObject *)posadj, "value-changed", - (GtkSignalFunc)song_pos_cb, mdisp); gtk_object_ref((GtkObject*)vcp); - gtk_object_ref((GtkObject*)posadj); melys_rule_set_adj(MELYS_RULE(mdisp->title), vcp); @@ -387,6 +386,21 @@ build_sel_list(mdisp); /* There may be some parts already selected */ +>>function melys_track_display_set_song +void +MelysTrackDisplay *mdisp; +struct song *song; + +>>code + mdisp->song = song; + + g_assert(song->posadj); + mdisp->posadj = song->posadj; + gtk_object_ref((GtkObject *) mdisp->posadj); + + gtk_signal_connect_while_alive((GtkObject *)mdisp->posadj, + "value-changed", (GtkSignalFunc)song_pos_cb, mdisp, GTK_OBJECT(mdisp)); + >>function scale_changed static void @@ -621,12 +635,21 @@ group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_GROUP, NULL); + item = gnome_canvas_item_new(group, melys_part_item_get_type(), + "x1", (double) 0.0, + "y1", (double) 0.0, + "width_pixels", 1, + "outline_color", "black", + "dotted_border", ref, NULL); - text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, - "text", pname, + "x", (double) 2, + "y", (double) 2, + "font_gdk", GTK_WIDGET(mdisp)->style->font, + "anchor", GTK_ANCHOR_NORTH_WEST, + "clip", TRUE, NULL); pitem = MELYS_PART_ITEM(item); @@ -677,27 +700,19 @@ /* Set the font and text properties */ gnome_canvas_item_set(dinfo->text, - "x", (double) 2, - "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, "clip_height", (double) mdisp->vcp->vheight-2, NULL); /* This size of the part is set here */ gnome_canvas_item_set(dinfo->pitem, - "x1", (double) 0.0, - "y1", (double) 0.0, + "x1", 0.0, + "y1", 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), "y2", (double) mdisp->vcp->vheight, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], - "width_pixels", 1, - "outline_color", "black", - "dotted_border", ref, NULL); >>function disp_destroy @@ -734,7 +749,6 @@ mdisp->mdroot = NULL; } - if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); @@ -1352,10 +1366,12 @@ struct sel_info *info; info = list->data; + 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)); md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); } diff -rNu melys-0.1.1/widgets/melystrackinfo.c melys-0.1.2/widgets/melystrackinfo.c --- melys-0.1.1/widgets/melystrackinfo.c Mon Nov 8 13:25:05 1999 +++ melys-0.1.2/widgets/melystrackinfo.c Sat Nov 13 13:28:03 1999 @@ -20,6 +20,8 @@ * * * + * + * */ @@ -30,6 +32,9 @@ #include "gtk/gtkadjustment.h" #include "gtk/gtksignal.h" #include "gtk/gtkvbox.h" +#include "libgnomeui/gnome-app.h" +#include "libgnomeui/gnome-app-helper.h" +#include "libgnomeui/gnome-popup-menu.h" #include "melmsg.h" #include "melgui.h" #include "pixmaps.h" @@ -37,6 +42,8 @@ #include "md.h" #include "song.h" #include "viewcontrol.h" +#include "melysview.h" +#include "melyspiano.h" #include "melystrackinfo.h" #include "melystrack.h" #include "intl.h" @@ -100,7 +107,6 @@ #define COL_PADDING 2 - #define TMP_BUF_SIZE 100 /* Static functions */ @@ -152,12 +158,49 @@ static void track_info_scroll(GtkAdjustment *adj, gpointer data); static void one_track_redraw(MelysTrackInfo *minfo, int number, struct trackElement *track); +static void add_track_cb(GtkWidget *w, gpointer data); +static void delete_track_cb(GtkWidget *w, gpointer data); +static void delete_empty_cb(GtkWidget *w, gpointer data); +static void piano_cb(GtkWidget *w, gpointer data); +static void props_cb(GtkWidget *w, gpointer data); static GtkWidgetClass *parent_class = NULL; static gint melys_track_info_signals[LAST_SIGNAL]; +/* The popup menu */ +static GnomeUIInfo tracksmenu[] = { + {GNOME_APP_UI_ITEM, N_("_Add"), 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"), + delete_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 _empty"), N_("Delete all empty tracks"), + delete_empty_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_("_Piano roll view"), + N_("Open a new piano roll view for this track"), + piano_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_("Properties..."), + N_("Bring up the track properties dialog"), + props_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + GNOMEUIINFO_END +}; + /* * Return a unique integer that represents the object type. */ @@ -250,6 +293,9 @@ minfo->mdroot = NULL; minfo->song = NULL; + minfo->menu = gnome_popup_menu_new(tracksmenu); + gtk_object_ref(GTK_OBJECT(minfo->menu)); + gtk_object_sink(GTK_OBJECT(minfo->menu)); } /* @@ -495,6 +541,8 @@ minfo->mdroot = NULL; } + gtk_widget_unref(minfo->menu); + minfo->col_used = 0; if (GTK_OBJECT_CLASS(parent_class)->destroy) @@ -657,8 +705,8 @@ /* Draw in the separator line bewtween the titles and rows */ gdk_draw_line(widget->window, fg_gc, - 0, minfo->vcp->vtitle - TRACK_TITLE_RULE, - minfo->track_area.width, minfo->vcp->vtitle - TRACK_TITLE_RULE); + 0, minfo->vcp->vtitle - VIEW_TITLE_RULE, + minfo->track_area.width, minfo->vcp->vtitle - VIEW_TITLE_RULE); dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) @@ -960,6 +1008,7 @@ /* Get the appropriate track for this button press */ row = y_to_track(minfo, event->y); + minfo->click_track = row; track = md_track_nth(minfo->mdroot, row); if (track == NULL) @@ -980,6 +1029,10 @@ button1_button(minfo, track, cip, event); break; + case 3: + gnome_popup_menu_do_popup(minfo->menu, NULL, NULL, event, minfo); + break; + default: break; } @@ -1436,4 +1489,93 @@ } MD_SET_MODIFIED(track, 0); +} + +static void +add_track_cb(GtkWidget *w, gpointer data) +{ + MelysTrackInfo *minfo = data; + struct trackElement *track; + + g_assert(minfo->mdroot); + + track = md_track_new(); + MD_ELEMENT(track)->device_channel = minfo->mdroot->tracks; + MD_TRACKLIKE(track)->number = minfo->click_track; + + md_add_sort(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); + song_view_update(minfo->song); +} + +static void +delete_track_cb(GtkWidget *w, gpointer data) +{ + MelysTrackInfo *minfo = data; + struct trackElement *track; + struct trackElement *trk; + int i; + + track = md_track_nth(minfo->mdroot, minfo->click_track); + + if (MD_SELECTED(track)) { + rescan: + for (i = 0; i < minfo->mdroot->tracks; i++) { + trk = md_track_nth(minfo->mdroot, i); + + if (MD_SELECTED(trk)) { + md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); + goto rescan; + } + } + } else { + md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); + } + + song_view_update(minfo->song); +} + +static void +delete_empty_cb(GtkWidget *w, gpointer data) +{ + MelysTrackInfo *minfo = data; + struct trackElement *trk; + int i; + + rescan: + for (i = 0; i < minfo->mdroot->tracks; i++) { + trk = md_track_nth(minfo->mdroot, i); + + if (MD_CONTAINER(trk)->elements->len == 0) { + md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); + goto rescan; + } + } + song_view_update(minfo->song); +} + +static void +piano_cb(GtkWidget *w, gpointer data) +{ + GtkWidget *mp; + MelysTrackInfo *minfo = data; + struct trackElement *track; + + track = md_track_nth(minfo->mdroot, minfo->click_track); + + mp = melys_piano_new(MD_CONTAINER(track)); + melys_view_set_song(MELYS_VIEW(mp), minfo->song); + mel_add_view(minfo->song->mdi, minfo->song->child, mp, 0); +} + +static void +props_cb(GtkWidget *w, gpointer data) +{ + MelysTrackInfo *minfo = data; + struct trackElement *track; + + track = md_track_nth(minfo->mdroot, minfo->click_track); + g_return_if_fail(track); + g_assert(MD_TYPE(track) == MD_TYPE_TRACK); + + track_prop_box(track, minfo->song, 0); } diff -rNu melys-0.1.1/widgets/melystrackinfo.m melys-0.1.2/widgets/melystrackinfo.m --- melys-0.1.1/widgets/melystrackinfo.m Mon Nov 8 13:03:02 1999 +++ melys-0.1.2/widgets/melystrackinfo.m Sat Nov 13 12:41:08 1999 @@ -22,6 +22,11 @@ >>header gtk/gtkadjustment.h >>header gtk/gtksignal.h >>header gtk/gtkvbox.h + +>>header libgnomeui/gnome-app.h +>>header libgnomeui/gnome-app-helper.h +>>header libgnomeui/gnome-popup-menu.h + >>header melmsg.h >>header melgui.h >>header pixmaps.h @@ -29,6 +34,8 @@ >>header md.h >>header song.h >>header viewcontrol.h +>>header melysview.h +>>header melyspiano.h >>gtkobject melys_track_info gtk_widget @@ -66,6 +73,9 @@ /* Allocated area that track information is being displayed in */ GdkRectangle track_area; + /* Our context menu */ + GtkWidget *menu; + /* The actual composition that is being displayed */ struct rootElement *mdroot; @@ -79,6 +89,8 @@ GdkPixmap *solo_label; GdkBitmap *solo_mask; + /* Button click information */ + int click_track; /* the track that was clicked */ }; struct _MelysTrackInfoClass { @@ -149,6 +161,39 @@ /* A border to the protect the column lines */ #define COL_PADDING 2 +>>extern -a +/* The popup menu */ +static GnomeUIInfo tracksmenu[] = { + {GNOME_APP_UI_ITEM, N_("_Add"), 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"), + delete_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 _empty"), N_("Delete all empty tracks"), + delete_empty_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_("_Piano roll view"), + N_("Open a new piano roll view for this track"), + piano_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_("Properties..."), + N_("Bring up the track properties dialog"), + props_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + GNOMEUIINFO_END +}; + >>function melys_track_info_new GtkWidget * @@ -209,6 +254,9 @@ minfo->mdroot = NULL; minfo->song = NULL; + minfo->menu = gnome_popup_menu_new(tracksmenu); + gtk_object_ref(GTK_OBJECT(minfo->menu)); + gtk_object_sink(GTK_OBJECT(minfo->menu)); >>function melys_track_info_class_init @@ -460,6 +508,8 @@ minfo->mdroot = NULL; } + gtk_widget_unref(minfo->menu); + minfo->col_used = 0; if (GTK_OBJECT_CLASS(parent_class)->destroy) @@ -629,8 +679,8 @@ /* Draw in the separator line bewtween the titles and rows */ gdk_draw_line(widget->window, fg_gc, - 0, minfo->vcp->vtitle - TRACK_TITLE_RULE, - minfo->track_area.width, minfo->vcp->vtitle - TRACK_TITLE_RULE); + 0, minfo->vcp->vtitle - VIEW_TITLE_RULE, + minfo->track_area.width, minfo->vcp->vtitle - VIEW_TITLE_RULE); dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) @@ -955,6 +1005,7 @@ /* Get the appropriate track for this button press */ row = y_to_track(minfo, event->y); + minfo->click_track = row; track = md_track_nth(minfo->mdroot, row); if (track == NULL) @@ -975,6 +1026,10 @@ button1_button(minfo, track, cip, event); break; + case 3: + gnome_popup_menu_do_popup(minfo->menu, NULL, NULL, event, minfo); + break; + default: break; } @@ -1486,4 +1541,106 @@ } MD_SET_MODIFIED(track, 0); + + +>>function add_track_cb +static void +GtkWidget *w; The menu item +gpointer data; The minfo + +>>code + MelysTrackInfo *minfo = data; + struct trackElement *track; + + g_assert(minfo->mdroot); + + track = md_track_new(); + MD_ELEMENT(track)->device_channel = minfo->mdroot->tracks; + MD_TRACKLIKE(track)->number = minfo->click_track; + + md_add_sort(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); + song_view_update(minfo->song); + + +>>function delete_track_cb +static void +GtkWidget *w; The menu item +gpointer data; The minfo + +>>code + MelysTrackInfo *minfo = data; + struct trackElement *track; + struct trackElement *trk; + int i; + + track = md_track_nth(minfo->mdroot, minfo->click_track); + + if (MD_SELECTED(track)) { + rescan: + for (i = 0; i < minfo->mdroot->tracks; i++) { + trk = md_track_nth(minfo->mdroot, i); + + if (MD_SELECTED(trk)) { + md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); + goto rescan; + } + } + } else { + md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(track)); + } + + song_view_update(minfo->song); + +>>function delete_empty_cb +static void +GtkWidget *w; The menu item +gpointer data; The minfo + +>>code + MelysTrackInfo *minfo = data; + struct trackElement *trk; + int i; + + rescan: + for (i = 0; i < minfo->mdroot->tracks; i++) { + trk = md_track_nth(minfo->mdroot, i); + + if (MD_CONTAINER(trk)->elements->len == 0) { + md_remove(MD_CONTAINER(minfo->mdroot), MD_ELEMENT(trk)); + goto rescan; + } + } + song_view_update(minfo->song); + +>>function piano_cb +static void +GtkWidget *w; The menu item +gpointer data; The minfo + +>>code + GtkWidget *mp; + MelysTrackInfo *minfo = data; + struct trackElement *track; + + track = md_track_nth(minfo->mdroot, minfo->click_track); + + mp = melys_piano_new(MD_CONTAINER(track)); + melys_view_set_song(MELYS_VIEW(mp), minfo->song); + mel_add_view(minfo->song->mdi, minfo->song->child, mp, 0); + + +>>function props_cb +static void +GtkWidget *w; The menu item +gpointer data; The minfo + +>>code + MelysTrackInfo *minfo = data; + struct trackElement *track; + + track = md_track_nth(minfo->mdroot, minfo->click_track); + g_return_if_fail(track); + g_assert(MD_TYPE(track) == MD_TYPE_TRACK); + + track_prop_box(track, minfo->song, 0); diff -rNu melys-0.1.1/widgets/melysview.c melys-0.1.2/widgets/melysview.c --- melys-0.1.1/widgets/melysview.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.2/widgets/melysview.c Sat Nov 13 13:28:03 1999 @@ -0,0 +1,616 @@ +/* + * + * 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 ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + * + * + * + * + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gdk_imlib.h" +#include "gtk/gtkvbox.h" +#include "gtk/gtkdrawingarea.h" +#include "gtk/gtkadjustment.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-util.h" +#include "libgnomeui/gnome-canvas-line.h" +#include "libgnomeui/gnome-popup-menu.h" +#include "elements.h" +#include "md.h" +#include "viewcontrol.h" +#include "melysrule.h" +#include "melwidgets.h" +#include "song.h" +#include "melysview.h" +#include "intl.h" + + +/* The list of signal id's that are being added for MelysView. */ +enum { + SCALE_CHANGED, + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, +}; + + +#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)) + +/* 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 set_hscroll(MelysView *mview); +static void set_vscroll(MelysView *mview); +static void song_pos_cb(GtkAdjustment *adj, gpointer data); +static void view_draw(GtkWidget *widget, GdkRectangle *area); +static void set_scroll_region(MelysView *mview); +static void vcp_changed(GtkObject *vobj, gpointer data); +static void view_scale_changed(MelysView *mview); + + +static GtkVBoxClass *parent_class = NULL; + +static gint melys_view_signals[LAST_SIGNAL]; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_view_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysView", + sizeof(MelysView), + sizeof(MelysViewClass), + (GtkClassInitFunc) melys_view_class_init, + (GtkObjectInitFunc) melys_view_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gtk_vbox_get_type(), &minfo); + } + + return mtype; +} + +/* + * Initialise the MelysView. + * + * Arguments: + * mview - The MelysView to init + */ +static void +melys_view_init(MelysView *mview) +{ + GnomeCanvas *canvas; + + mview->vcp = view_control_new(); + mview->voffset = 0; + mview->hoffset = 0; + mview->poffset = 0; + mview->vthings = 0; + + mview->elem = NULL; + mview->song = NULL; + + mview->points = gnome_canvas_points_new(2); + +#if 0 + mview->click_elem = NULL; + mview->click_con = NULL; + mview->click_state = CLICK_INACTIVE; + + mview->sel_list = NULL; +#endif + + mview->ruler = (GtkWidget *)melys_rule_new(mview->vcp); + gtk_widget_ref(mview->ruler); + +#undef AA +#ifdef AA + /* The aa canvas is buggy at present Oct 1999 */ + gtk_widget_push_visual(gdk_rgb_get_visual()); + gtk_widget_push_colormap(gdk_rgb_get_cmap()); + canvas = (GnomeCanvas *)gnome_canvas_new_aa(); +#else + gtk_widget_push_visual(gdk_imlib_get_visual()); + gtk_widget_push_colormap(gdk_imlib_get_colormap()); + canvas = (GnomeCanvas *)gnome_canvas_new(); +#endif + + mview->canvas = GTK_WIDGET(canvas); + gtk_widget_ref(mview->canvas); + + /* Create the pop up menu */ + //mview->menu = gnome_popup_menu_new(displaymenu); + + mview->posline = (GtkWidget *)gnome_canvas_item_new( + gnome_canvas_root(canvas), + GNOME_TYPE_CANVAS_LINE, + NULL); + + gtk_signal_connect((GtkObject *)mview->vcp, "scale-changed", + (GtkSignalFunc)vcp_changed, mview); + gtk_signal_connect((GtkObject *)mview->vcp->hadj, "value-changed", + (GtkSignalFunc)view_scroll, mview); + 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, + 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", + GTK_SIGNAL_FUNC(drag_data_send), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-data-received", + GTK_SIGNAL_FUNC(drag_data_received), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-motion", + GTK_SIGNAL_FUNC(drag_motion), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-leave", + GTK_SIGNAL_FUNC(drag_leave), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", + GTK_SIGNAL_FUNC(drag_end), mview); + +#endif +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_view_class_init(MelysViewClass *klass) +{ + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkVBoxClass *vbox_class; + + object_class = (GtkObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + vbox_class = (GtkVBoxClass *)klass; + + 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, + GTK_SIGNAL_OFFSET(MelysViewClass, scale_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0 + ); + + gtk_object_class_add_signals(object_class, melys_view_signals, LAST_SIGNAL); + + object_class->destroy = view_destroy; + + widget_class->draw = view_draw; + + klass->scale_changed = view_scale_changed; +} + +static void +view_destroy(GtkObject *obj) +{ + MelysView *mview = MELYS_VIEW(obj); + + g_return_if_fail(IS_MELYS_VIEW(obj)); + + //clear_all_part_sel(mview, FALSE); + + gnome_canvas_points_unref(mview->points); + + if (mview->posline) + gtk_object_destroy(GTK_OBJECT(mview->posline)); + + if (mview->vcp) { + gtk_object_unref(GTK_OBJECT(mview->vcp)); + mview->vcp = NULL; + } + if (mview->posadj) { + gtk_object_unref(GTK_OBJECT(mview->posadj)); + mview->posadj = NULL; + } + if (mview->ruler) { + gtk_widget_unref(mview->ruler); + mview->ruler = NULL; + } + if (mview->canvas) { + gtk_widget_unref(mview->canvas); + mview->canvas = NULL; + } + + if (mview->elem) { + md_free(MD_ELEMENT(mview->elem)); + mview->elem = NULL; + } + if (mview->tempomap) { + md_free(MD_ELEMENT(mview->tempomap)); + mview->tempomap = NULL; + } + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); +} + +static void +view_scroll(GtkAdjustment *adj, gpointer data) +{ + MelysView *mview = data; + GnomeCanvas *canvas; + int changed = 0; + + if (adj == mview->vcp->hadj) { + if ((int)adj->value != mview->hoffset) { + if (adj->value >= 0) { + changed = 1; + mview->hoffset = (int)adj->value; + } + } + } + if (adj == mview->vcp->vadj) { + if ((int)adj->value != mview->voffset) { + changed = 1; + mview->voffset = (int)(adj->value + 0.1); + } + } + + + if (changed) { + + canvas = GNOME_CANVAS(mview->canvas); + + gnome_canvas_scroll_to(canvas, + tick_to_x(mview, mview->hoffset), + mview->voffset * mview->vcp->vscale); + } + + + +} + +void +melys_view_set_song(MelysView *mview, struct song *song) +{ + g_return_if_fail(mview->song == NULL); + + mview->song = song; + if (song->mdroot) { + mview->tempomap = md_get_tempomap(song->mdroot); + MD_REF(mview->tempomap); + } + melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); + + if (song->posadj) { + mview->posadj = song->posadj; + gtk_object_ref((GtkObject *)mview->posadj); + gtk_signal_connect_while_alive((GtkObject *)mview->posadj, + "value-changed", (GtkSignalFunc)song_pos_cb, mview, + GTK_OBJECT(mview)); + } + + gtk_signal_emit(GTK_OBJECT(mview), melys_view_signals[SCALE_CHANGED]); +} + +/* + * Set the music description root. If there was an existing one + * it is freed first. Everything is reset to display the new + * song. + * + * Arguments: + * mview - The view + */ +void +melys_view_set_mdroot(MelysView *mview, struct rootElement *root) +{ + +#if 0 + g_return_if_fail(root != NULL); + + if (mview->mdroot) + md_free((struct element *)mview->mdroot); + mview->mdroot = md_root_inc_ref(root); + + 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)); + } + + //build_sel_list(mview); /* There may be some parts already selected */ +#endif +} + +/* + * We own the horizontal adjustment in the track display. + * Therefore set the bounds and keep the value correct here. + * The range is set to the duration of the piece plus a full width + * of the display area. + */ +static void +set_hscroll(MelysView *mview) +{ + int pageticks; + int ticklen; + GtkAdjustment *adj; + + if (!GTK_WIDGET_REALIZED(mview)) + return; + + adj = mview->vcp->hadj; + + pageticks = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + ticklen = MD_ENDTIME(mview->elem) + pageticks; + + adj->lower = 0.0; + adj->upper = (double) ticklen; + + adj->page_size = pageticks; + adj->page_increment = adj->page_size; + adj->step_increment = x_to_tick(mview, 20); + gtk_adjustment_changed(adj); + + if (adj->value > adj->upper - adj->page_size) + adj->value = adj->upper - adj->page_size; + + gtk_adjustment_value_changed(adj); +} + +/* + * Calculate how many things are visible on the page and set + * this as the page increment. Err on the low side. + */ +static void +set_vscroll(MelysView *mview) +{ + int height; + + height = GTK_WIDGET(mview)->allocation.height; + + mview->vcp->vadj->page_size = + (height / mview->vcp->vscale); + mview->vcp->vadj->page_increment = mview->vcp->vadj->page_size; + + /* Re-set the vertical scrollbar limits */ + mview->vcp->vadj->lower = 0.0; + mview->vcp->vadj->upper = (double)mview->vthings; + + gtk_adjustment_changed(mview->vcp->vadj); +} + +/* + * This gets called when the song position pointer is updated. + * This could be because the user changed it in a different + * widget or during playback. + * + * Arguments: + * adj - The song adjusment + * data - This is our mview pointer + */ +static void +song_pos_cb(GtkAdjustment *adj, gpointer data) +{ + MelysView *mview = MELYS_VIEW(data); + GtkAdjustment *hadj; + long t; + int x; + + hadj = mview->vcp->hadj; + + t = (unsigned long)mview->posadj->value; + x = tick_to_x(mview, t); + + if (x != tick_to_x(mview, mview->poffset)) { + int boundry; + int page_width; + + mview->poffset = t; + canvas_item_move_abs((GnomeCanvasItem*)mview->posline, + tick_to_x(mview, t), 0.0); + + /* + * First if this time is over the endtime then we are recording + * or otherwise increasing the length of the song. + * Increase the root duration to match, add on extra to + * 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); + set_scroll_region(mview); + } + + /* + * If we are just about to go off the end then shift the + * canvas over so that we are just over from the left. + * But if the line is already past the edge then don't + * scroll. This is so you can scroll by hand with out it + * always jumping back. + */ + page_width = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + boundry = page_width / 10; + + if (t - mview->hoffset > page_width - boundry && + t - mview->hoffset <= page_width) { + + hadj->value += page_width - 2*boundry; + + set_scroll_region(mview); + } + + /* + * This is a temporary way to ensure that we return to the + * beginning when starting playing. + */ + if (x < 5) {/*XXX*/ + hadj->value = 0; + set_scroll_region(mview); + } + } +} + +/* + * Look through all the parts and set up the part items for each + * part. + */ +static void +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); + + GTK_WIDGET_CLASS(parent_class)->draw(widget, area); +} + +/* + * Set the canvas scrolling region. The complete area + * required to show the current song at the current scaling is + * calculated. This is the scroll region for the canvas and the + * canvas will take care of allowing that regions to be seen in + * conjunction with our scroll bars. + */ +static void +set_scroll_region(MelysView *mview) +{ + int height; + GnomeCanvas *canvas = GNOME_CANVAS(mview->canvas); + GnomeCanvasPoints *points; + + /* You need to set vthings */ + g_return_if_fail(mview->vthings != 0); + + if (!GTK_WIDGET_REALIZED(mview)) + return; + + /* It is our job to modify the page_size for the horizontal scroll */ + set_hscroll(mview); + set_vscroll(mview); + + /* the allocated area is the minimum to use */ + height = GTK_WIDGET(mview)->allocation.height; + + if (height < mview->vthings * mview->vcp->vscale) { + int last; + int extra; + ViewControl *vcp; + + vcp = mview->vcp; + last = (int)(vcp->vadj->upper - vcp->vadj->page_size) / vcp->vscale; + extra = height - last; + height = mview->vthings * vcp->vscale + extra; + } + + gnome_canvas_set_scroll_region(canvas, + 0.0, 0.0, + mview->vcp->hadj->upper, + height + ); + + points = mview->points; + points->coords[0] = 0.0; + points->coords[1] = 0.0; + points->coords[2] = 0.0; + points->coords[3] = height; + + gnome_canvas_item_set((GnomeCanvasItem *)mview->posline, + "points", points, + NULL); +} + +static void +vcp_changed(GtkObject *vobj, gpointer data) +{ + GtkObject *mviewobj = data; + + /* + * Emit our own melys_view::scale-changed signal in + * response to a view_control::scale-changed + */ + gtk_signal_emit(mviewobj, melys_view_signals[SCALE_CHANGED]); +} + +static void +view_scale_changed(MelysView *mview) +{ + + mview->voffset = -1; + set_scroll_region(mview); +} diff -rNu melys-0.1.1/widgets/melysview.m melys-0.1.2/widgets/melysview.m --- melys-0.1.1/widgets/melysview.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.2/widgets/melysview.m Sat Nov 13 09:20:14 1999 @@ -0,0 +1,633 @@ +>>name melysview.m - A base class for graphical views of a song. + +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 ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +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. + + +>>header gdk_imlib.h +>>header gtk/gtkvbox.h +>>header gtk/gtkdrawingarea.h +>>header gtk/gtkadjustment.h + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-util.h +>>header libgnomeui/gnome-canvas-line.h +>>header libgnomeui/gnome-popup-menu.h + +>>header elements.h +>>header md.h +>>header viewcontrol.h +>>header melysrule.h +>>header melwidgets.h +>>header song.h + + +>>gtkobject melys_view MelysView gtk_vbox GtkVBox + +>>headerdef @header + +/* + * Snap to grid types. + */ +enum snap_type { + SNAP_NONE, + SNAP_BAR, + SNAP_1, + SNAP_1_2, + SNAP_1_4, + SNAP_1_8, + SNAP_1_16, + SNAP_1_32, + ETC +}; + +struct _MelysView { + GtkVBox vbox; + + ViewControl *vcp; + + GtkAdjustment *posadj; /* Song position adjustment */ + + /* Amount of vertical scrolling, in things (you never see half a thing) */ + int voffset; + /* Horizontal offset, in ticks */ + int hoffset; + /* Play position offset, in ticks */ + int poffset; + + /* The number of things in the vertical direction */ + int vthings; /* Number of notes, tracks whatever */ + + /* From aligning to a grid */ + enum snap_type snap; + + struct containerElement *elem; + struct song *song; + struct tempomapElement *tempomap; + + /* Widgets that are controlled by this widget */ + GtkWidget *canvas; /* The canvas that the subclass will place items on */ + GtkWidget *ruler; /* A ruler that can be used */ + GtkWidget *posline; /* Song position pointer */ + + void *points; +}; + +struct _MelysViewClass { + GtkVBoxClass parent_class; + + void (*scale_changed)(MelysView *); +}; + +>>extern + +/* The list of signal id's that are being added for MelysView. */ +>>set signals +enum { + SCALE_CHANGED, + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, +}; + + +#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)) + +>>function melys_view_init +static void +MelysView *mview; The MelysView to init +>>description +Initialise the MelysView. +>>code + GnomeCanvas *canvas; + + mview->vcp = view_control_new(); + mview->voffset = 0; + mview->hoffset = 0; + mview->poffset = 0; + mview->vthings = 0; + + mview->elem = NULL; + mview->song = NULL; + + mview->points = gnome_canvas_points_new(2); + +#if 0 + mview->click_elem = NULL; + mview->click_con = NULL; + mview->click_state = CLICK_INACTIVE; + + mview->sel_list = NULL; +#endif + + mview->ruler = (GtkWidget *)melys_rule_new(mview->vcp); + gtk_widget_ref(mview->ruler); + +#undef AA +#ifdef AA + /* The aa canvas is buggy at present Oct 1999 */ + gtk_widget_push_visual(gdk_rgb_get_visual()); + gtk_widget_push_colormap(gdk_rgb_get_cmap()); + canvas = (GnomeCanvas *)gnome_canvas_new_aa(); +#else + gtk_widget_push_visual(gdk_imlib_get_visual()); + gtk_widget_push_colormap(gdk_imlib_get_colormap()); + canvas = (GnomeCanvas *)gnome_canvas_new(); +#endif + + mview->canvas = GTK_WIDGET(canvas); + gtk_widget_ref(mview->canvas); + + /* Create the pop up menu */ + //mview->menu = gnome_popup_menu_new(displaymenu); + + mview->posline = (GtkWidget *)gnome_canvas_item_new( + gnome_canvas_root(canvas), + GNOME_TYPE_CANVAS_LINE, + NULL); + + gtk_signal_connect((GtkObject *)mview->vcp, "scale-changed", + (GtkSignalFunc)vcp_changed, mview); + gtk_signal_connect((GtkObject *)mview->vcp->hadj, "value-changed", + (GtkSignalFunc)view_scroll, mview); + 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, + 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", + GTK_SIGNAL_FUNC(drag_data_send), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-data-received", + GTK_SIGNAL_FUNC(drag_data_received), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-motion", + GTK_SIGNAL_FUNC(drag_motion), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-leave", + GTK_SIGNAL_FUNC(drag_leave), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", + GTK_SIGNAL_FUNC(drag_end), mview); + +#endif + + +>>function melys_view_class_init +static void +MelysViewClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkVBoxClass *vbox_class; + + object_class = (GtkObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + vbox_class = (GtkVBoxClass *)klass; + + 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, + GTK_SIGNAL_OFFSET(MelysViewClass, scale_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0 + ); + + gtk_object_class_add_signals(object_class, melys_view_signals, LAST_SIGNAL); + + object_class->destroy = view_destroy; + + widget_class->draw = view_draw; + + klass->scale_changed = view_scale_changed; + + +>>function view_destroy +static void +GtkObject *obj; + +>>code + MelysView *mview = MELYS_VIEW(obj); + + g_return_if_fail(IS_MELYS_VIEW(obj)); + + //clear_all_part_sel(mview, FALSE); + + gnome_canvas_points_unref(mview->points); + + if (mview->posline) + gtk_object_destroy(GTK_OBJECT(mview->posline)); + + if (mview->vcp) { + gtk_object_unref(GTK_OBJECT(mview->vcp)); + mview->vcp = NULL; + } + if (mview->posadj) { + gtk_object_unref(GTK_OBJECT(mview->posadj)); + mview->posadj = NULL; + } + if (mview->ruler) { + gtk_widget_unref(mview->ruler); + mview->ruler = NULL; + } + if (mview->canvas) { + gtk_widget_unref(mview->canvas); + mview->canvas = NULL; + } + + if (mview->elem) { + md_free(MD_ELEMENT(mview->elem)); + mview->elem = NULL; + } + if (mview->tempomap) { + md_free(MD_ELEMENT(mview->tempomap)); + mview->tempomap = NULL; + } + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); + +>>function view_scroll +static void +GtkAdjustment *adj; +gpointer data; +>>code + MelysView *mview = data; + GnomeCanvas *canvas; + int changed = 0; + + if (adj == mview->vcp->hadj) { + if ((int)adj->value != mview->hoffset) { + if (adj->value >= 0) { + changed = 1; + mview->hoffset = (int)adj->value; + } + } + } + if (adj == mview->vcp->vadj) { + if ((int)adj->value != mview->voffset) { + changed = 1; + mview->voffset = (int)(adj->value + 0.1); + } + } + + + if (changed) { + + canvas = GNOME_CANVAS(mview->canvas); + + gnome_canvas_scroll_to(canvas, + tick_to_x(mview, mview->hoffset), + mview->voffset * mview->vcp->vscale); + } + + + +>>function melys_view_set_song +void +MelysView *mview; The view +struct song *song; The song to set + +>>code + g_return_if_fail(mview->song == NULL); + + mview->song = song; + if (song->mdroot) { + mview->tempomap = md_get_tempomap(song->mdroot); + MD_REF(mview->tempomap); + } + melys_rule_set_tempomap(MELYS_RULE(mview->ruler), mview->tempomap); + + if (song->posadj) { + mview->posadj = song->posadj; + gtk_object_ref((GtkObject *)mview->posadj); + gtk_signal_connect_while_alive((GtkObject *)mview->posadj, + "value-changed", (GtkSignalFunc)song_pos_cb, mview, + GTK_OBJECT(mview)); + } + + gtk_signal_emit(GTK_OBJECT(mview), melys_view_signals[SCALE_CHANGED]); + + +>>function melys_view_set_mdroot +void +MelysView *mview; The view +struct rootElement *root; + +>>description +Set the music description root. +If there was an existing one it is freed first. +Everything is reset to display the new song. + +>>code + +#if 0 + g_return_if_fail(root != NULL); + + if (mview->mdroot) + md_free((struct element *)mview->mdroot); + mview->mdroot = md_root_inc_ref(root); + + 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)); + } + + //build_sel_list(mview); /* There may be some parts already selected */ +#endif + +>>function set_hscroll +static void +MelysView *mview; + +>>description +We own the horizontal adjustment in the track display. +Therefore set the bounds and keep the value correct here. +The range is set to the duration of the piece plus a full width +of the display area. + +>>code + int pageticks; + int ticklen; + GtkAdjustment *adj; + + if (!GTK_WIDGET_REALIZED(mview)) + return; + + adj = mview->vcp->hadj; + + pageticks = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + ticklen = MD_ENDTIME(mview->elem) + pageticks; + + adj->lower = 0.0; + adj->upper = (double) ticklen; + + adj->page_size = pageticks; + adj->page_increment = adj->page_size; + adj->step_increment = x_to_tick(mview, 20); + gtk_adjustment_changed(adj); + + if (adj->value > adj->upper - adj->page_size) + adj->value = adj->upper - adj->page_size; + + gtk_adjustment_value_changed(adj); + + +>>function set_vscroll +static void +MelysView *mview; + +>>description +Calculate how many things are visible on the page and set this +as the page increment. +Err on the low side. + +>>code + int height; + + height = GTK_WIDGET(mview)->allocation.height; + + mview->vcp->vadj->page_size = + (height / mview->vcp->vscale); + mview->vcp->vadj->page_increment = mview->vcp->vadj->page_size; + + /* Re-set the vertical scrollbar limits */ + mview->vcp->vadj->lower = 0.0; + mview->vcp->vadj->upper = (double)mview->vthings; + + gtk_adjustment_changed(mview->vcp->vadj); + + +>>function song_pos_cb +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 +widget or during playback. + +>>code + MelysView *mview = MELYS_VIEW(data); + GtkAdjustment *hadj; + long t; + int x; + + hadj = mview->vcp->hadj; + + t = (unsigned long)mview->posadj->value; + x = tick_to_x(mview, t); + + if (x != tick_to_x(mview, mview->poffset)) { + int boundry; + int page_width; + + mview->poffset = t; + canvas_item_move_abs((GnomeCanvasItem*)mview->posline, + tick_to_x(mview, t), 0.0); + + /* + * First if this time is over the endtime then we are recording + * or otherwise increasing the length of the song. + * Increase the root duration to match, add on extra to + * 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); + set_scroll_region(mview); + } + + /* + * If we are just about to go off the end then shift the + * canvas over so that we are just over from the left. + * But if the line is already past the edge then don't + * scroll. This is so you can scroll by hand with out it + * always jumping back. + */ + page_width = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + boundry = page_width / 10; + + if (t - mview->hoffset > page_width - boundry && + t - mview->hoffset <= page_width) { + + hadj->value += page_width - 2*boundry; + + set_scroll_region(mview); + } + + /* + * This is a temporary way to ensure that we return to the + * beginning when starting playing. + */ + if (x < 5) {/*XXX*/ + hadj->value = 0; + set_scroll_region(mview); + } + } + + +>>function view_draw +static void +GtkWidget *widget; +GdkRectangle *area; + +>>description +Look through all the parts and set up the part items for +each part. + +>>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); + + GTK_WIDGET_CLASS(parent_class)->draw(widget, area); + + +>>function set_scroll_region +static void +MelysView *mview; + +>>description +Set the canvas scrolling region. +The complete area required to show the current song at the +current scaling is calculated. +This is the scroll region for the canvas and the canvas +will take care of allowing that regions to be seen in conjunction +with our scroll bars. + +>>code + int height; + GnomeCanvas *canvas = GNOME_CANVAS(mview->canvas); + GnomeCanvasPoints *points; + + /* You need to set vthings */ + g_return_if_fail(mview->vthings != 0); + + if (!GTK_WIDGET_REALIZED(mview)) + return; + + /* It is our job to modify the page_size for the horizontal scroll */ + set_hscroll(mview); + set_vscroll(mview); + + /* the allocated area is the minimum to use */ + height = GTK_WIDGET(mview)->allocation.height; + + if (height < mview->vthings * mview->vcp->vscale) { + int last; + int extra; + ViewControl *vcp; + + vcp = mview->vcp; + last = (int)(vcp->vadj->upper - vcp->vadj->page_size) / vcp->vscale; + extra = height - last; + height = mview->vthings * vcp->vscale + extra; + } + + gnome_canvas_set_scroll_region(canvas, + 0.0, 0.0, + mview->vcp->hadj->upper, + height + ); + + points = mview->points; + points->coords[0] = 0.0; + points->coords[1] = 0.0; + points->coords[2] = 0.0; + points->coords[3] = height; + + gnome_canvas_item_set((GnomeCanvasItem *)mview->posline, + "points", points, + NULL); + + +>>function vcp_changed +static void +GtkObject *vobj; This will be the vcp +gpointer data; This is our mview info + +>>code + GtkObject *mviewobj = data; + + /* + * Emit our own melys_view::scale-changed signal in + * response to a view_control::scale-changed + */ + gtk_signal_emit(mviewobj, melys_view_signals[SCALE_CHANGED]); + + +>>function view_scale_changed +static void +MelysView *mview; + +>>code + + mview->voffset = -1; + set_scroll_region(mview); diff -rNu melys-0.1.1/widgets/viewcontrol.c melys-0.1.2/widgets/viewcontrol.c --- melys-0.1.1/widgets/viewcontrol.c Mon Nov 8 13:25:06 1999 +++ melys-0.1.2/widgets/viewcontrol.c Sat Nov 13 13:28:04 1999 @@ -154,15 +154,16 @@ gtk_object_ref((GtkObject*)hadj); gtk_object_sink((GtkObject*)hadj); - vcp->vscale = 1; - vcp->vspace = 1; - vcp->vheight = 1; - vcp->hscale = 1; + vcp->vscale = VIEW_DEF_HEIGHT + VIEW_SEPARATION; + vcp->vspace = VIEW_SEPARATION; + vcp->vheight = VIEW_DEF_HEIGHT; + vcp->vtitle = VIEW_TITLE_HEIGHT + 2*VIEW_SEPARATION; + vcp->hscale = VIEW_DEF_HSCALE; /* Some defaults - but you are supposed to set them */ vcp->hminscale = 1; vcp->hmaxscale = 99999; - vcp->vminscale = 1; + vcp->vminscale = 1 + vcp->vspace; vcp->vmaxscale = 99999; } @@ -383,18 +384,12 @@ * * Arguments: * vscale - Vertical scale - * vspace - Vertical space between things - * vheight - The height of the thing - * vtitle - Height of a title area */ void -view_control_set_vertical(ViewControl *vcp, int vscale, int vspace, - int vheight, int vtitle) +view_control_set_vertical(ViewControl *vcp, int vscale) { vcp->vscale = vscale; - vcp->vspace = vspace; - vcp->vheight = vheight; - vcp->vtitle = vtitle; + vcp->vheight = vscale - vcp->vspace; } /* @@ -426,6 +421,8 @@ { vcp->hminscale = hmin; + if (vmin <= vcp->vspace) + vmin = vcp->vspace + 1; vcp->vminscale = vmin; if (hmax) vcp->hmaxscale = hmax; diff -rNu melys-0.1.1/widgets/viewcontrol.m melys-0.1.2/widgets/viewcontrol.m --- melys-0.1.1/widgets/viewcontrol.m Mon Nov 8 13:03:02 1999 +++ melys-0.1.2/widgets/viewcontrol.m Sat Nov 13 09:21:59 1999 @@ -44,7 +44,7 @@ GtkAdjustment *hadj; /* Horizontal adjustment position */ GtkAdjustment *vadj; /* Vertical adjustment position */ - /* Scrollbars */ + /* Scrollbar groups */ GtkWidget *hsb; /* The horizontal scrollbar group */ GtkWidget *vsb; /* The vertical scrollbar group */ @@ -72,6 +72,12 @@ void (*scale_changed)(ViewControl *); }; +#define VIEW_DEF_HEIGHT 16 /* Default track height */ +#define VIEW_SEPARATION 2 /* Track separation */ +#define VIEW_TITLE_HEIGHT 20 /* Title hight */ +#define VIEW_DEF_HSCALE 24 /* Default horizontal scale */ +#define VIEW_TITLE_RULE 4 /* Offset from bottom of title area */ + >>extern /* The list of signal id's that are being added for ViewControl. */ @@ -138,15 +144,16 @@ gtk_object_ref((GtkObject*)hadj); gtk_object_sink((GtkObject*)hadj); - vcp->vscale = 1; - vcp->vspace = 1; - vcp->vheight = 1; - vcp->hscale = 1; + vcp->vscale = VIEW_DEF_HEIGHT + VIEW_SEPARATION; + vcp->vspace = VIEW_SEPARATION; + vcp->vheight = VIEW_DEF_HEIGHT; + vcp->vtitle = VIEW_TITLE_HEIGHT + 2*VIEW_SEPARATION; + vcp->hscale = VIEW_DEF_HSCALE; /* Some defaults - but you are supposed to set them */ vcp->hminscale = 1; vcp->hmaxscale = 99999; - vcp->vminscale = 1; + vcp->vminscale = 1 + vcp->vspace; vcp->vmaxscale = 99999; @@ -383,18 +390,13 @@ void ViewControl *vcp; int vscale; Vertical scale -int vspace; Vertical space between things -int vheight; The height of the thing -int vtitle; Height of a title area >>description Set up the view controls on the vertical side. >>code vcp->vscale = vscale; - vcp->vspace = vspace; - vcp->vheight = vheight; - vcp->vtitle = vtitle; + vcp->vheight = vscale - vcp->vspace; >>function view_control_set_horizontal void @@ -424,6 +426,8 @@ >>code vcp->hminscale = hmin; + if (vmin <= vcp->vspace) + vmin = vcp->vspace + 1; vcp->vminscale = vmin; if (hmax) vcp->hmaxscale = hmax;