diff -rNu melys-0.0.11/ChangeLog melys-0.0.12/ChangeLog --- melys-0.0.11/ChangeLog Sun Sep 19 23:02:58 1999 +++ melys-0.0.12/ChangeLog Wed Sep 22 21:43:52 1999 @@ -1,7 +1,57 @@ -1999-09-19 Steve Ratcliffe +1999-09-22 Steve Ratcliffe + + * widgets/melyspartitem.m, widgets/melystrackdisplay.m: + A first stab at a working display pane. + Uses a custom item to display the parts. + + * widgets/melystrack.m: + Implementation of horizontal scrollbar adjustments + + * widgets/melystrackinfo.m: Used selected macros + + * md/elements.m, md/mdutil.m: Selected now a element level flag + Also added partref in preparation + + * gui/menus.m: Selected now a element level flag + + * song/song.m: added view_update calls after the end of recording + so that the results become visible straight away + + * doc/mdml.dtd: added id to part + + * files/mdmlread.m, files/mdmlwrite.m: + selected is now a common attribute + + * files/midiread.m, files/midiwrite.m: + Fixed major breakage of the midi code. All the tests have been + run and it is working again. Writing to type 0 files does not + work, but never has. Will be fixed soon. + + * doc/README: Added a readme to point to the help directory. + + * make.conf: Use gnome-config directly in the ld flags. + + * mlib/PROJECT/mgtk.py: + Add comment in code template for the signal enum + + * widgets/melyspartitem.m: + The item, based on a rectangle that is going to be used for + the part display. + +1999-09-20 Steve Ratcliffe + + * md/mdutil.m: Added MD_DURATION to get the duration of a container. + + * gui/trackprop.m, song/song.m: reference counting changes + +1999-09-19 Steve Ratcliffe * REL-0-0-11 + * ChangeLog, INSTALL, README, help/C/track.sgml, po/melys.pot, + po/zz.po, version: + Final doc updates for 0.0.11 + * song/song.m: add similar message for record and no seq * seq/seqlib.m: Fix for crash when no sequencer present. @@ -20,7 +70,7 @@ Improvements to mostly eliminate the flicker that used to be seen during scrolling. -1999-09-18 Steve Ratcliffe +1999-09-18 Steve Ratcliffe * programs/melplay.m: Add code to play a prologue to set up the midi channels @@ -63,13 +113,13 @@ * Makefile: Improve makefile action after make clobber -1999-09-17 Steve Ratcliffe +1999-09-17 Steve Ratcliffe * seq/seqlib.m: Update the timer control for the corrected ALSA api. * md/mdadd.m: Add an element remove function md_remove() -1999-09-16 Steve Ratcliffe +1999-09-16 Steve Ratcliffe * programs/melys.m: Added to make objects. @@ -115,7 +165,7 @@ * gui/trackprop.m: First working track properties with basic fields. -1999-09-15 Steve Ratcliffe +1999-09-15 Steve Ratcliffe * files/mdmlread.m, files/mdmlwrite.m, files/midiread.m: Dealt with some memory leaks @@ -156,7 +206,7 @@ * md/elements.m, md/mdadd.m, md/mdlist.m: Event merging is now working. -1999-09-14 Steve Ratcliffe +1999-09-14 Steve Ratcliffe * mlib/PROJECT/base.py: Containers are now regarded as being containers(!) @@ -188,13 +238,13 @@ Clicking in the title area used to set a button. Now does nothing but will bring up a dialogue in the future. -1999-09-13 Steve Ratcliffe +1999-09-13 Steve Ratcliffe * mlib/PROJECT/base.py: Fix the element initialisation code generation. Init calls now correctly chain up. -1999-09-12 Steve Ratcliffe +1999-09-12 Steve Ratcliffe * widgets/melystrack.m, widgets/melystrackinfo.m: Record and track adding/removing fixes @@ -220,11 +270,11 @@ could also create an empty midi file if you can think of any use for that. -1999-09-11 Steve Ratcliffe +1999-09-11 Steve Ratcliffe * gui/main.m: Add the button 3 context menu for the info pane. -1999-09-08 Steve Ratcliffe +1999-09-08 Steve Ratcliffe * gui/menus.m, md/elements.m, md/mdutil.m, midi/play.m, midi/record.m, programs/showseq.m, seq/seqlib.m, Makefile: @@ -235,13 +285,13 @@ * help/C/topic.dat, help/C/track.sgml: New track view section documentation. -1999-08-29 Steve Ratcliffe +1999-08-29 Steve Ratcliffe * help/C/Makefile, help/C/index.html, help/C/melys.sgml, help/C/track.sgml: Some documentation updates. Now there is some basic documentation for the track view. -1999-08-20 Steve Ratcliffe +1999-08-20 Steve Ratcliffe * gui/menus.m, pixmaps/mb3.png, pixmaps/menu_icons.m, pixmaps/mpause.png, pixmaps/mpause.xpm, pixmaps/mplay.png, pixmaps/mplay.xpm, @@ -249,7 +299,7 @@ pixmaps/play.png, programs/melys.m: Made the menu item pixmaps built in data -1999-08-19 Steve Ratcliffe +1999-08-19 Steve Ratcliffe * widgets/melystrackinfo.m: Fixed solo to match its specification. @@ -265,7 +315,7 @@ * midi/play.m: Updated for latest patch. -1999-08-18 Steve Ratcliffe +1999-08-18 Steve Ratcliffe * widgets/melystrackinfo.m: Fixed some scribbling over the shadow along the dividing @@ -278,7 +328,7 @@ * midi/record.m: Fixed bug where subpart was getting the wrong device/channel. -1999-08-16 Steve Ratcliffe +1999-08-16 Steve Ratcliffe * ChangeLog, INSTALL, README, programs/melys.m: For REL-0-0-8 @@ -288,12 +338,12 @@ widgets/melystrackinfo.m, Makefile, files/mdmlread.m: Added the mute function. Makes use of an alsa patch. -1999-08-15 Steve Ratcliffe +1999-08-15 Steve Ratcliffe * md/mdutil.m: It is important to play the tempomap as well... A seek function added to reset the play position on a track. -1999-08-13 Steve Ratcliffe +1999-08-13 Steve Ratcliffe * md/mdutil.m: Previous version didn't work (and looks like even the old method @@ -310,7 +360,7 @@ * pixmaps/balls.m: added -1999-08-12 Steve Ratcliffe +1999-08-12 Steve Ratcliffe * md/elements.m, md/mdutil.m: Completely re-wrote the sequencing stuff. It is now much simpler, @@ -327,7 +377,7 @@ own memory leaks.. xmlGetProp returns strdup information so I have to free it. -1999-08-11 Steve Ratcliffe +1999-08-11 Steve Ratcliffe * programs/melplay.m: Got melplay to work. You can use it to play any file that @@ -354,7 +404,7 @@ Attempt to keep the focus in the main window where it is more useful. -1999-08-10 Steve Ratcliffe +1999-08-10 Steve Ratcliffe * files/.cvsignore, files/format.m, gui/main.m, programs/.cvsignore, programs/melplay.m, programs/melys.m, @@ -384,7 +434,7 @@ Renamed to melplay.m which will be a command line Melys player. It will be able to play any file that Melys can read. -1999-08-09 Steve Ratcliffe +1999-08-09 Steve Ratcliffe * ChangeLog: REL-0-0-6 @@ -412,7 +462,7 @@ * util/except.m: removed stack trace debug, which always seemed to hang -1999-08-09 Steve Ratcliffe +1999-08-09 Steve Ratcliffe * song/song.m: Warning about type 0 files (temporary) and now if can't read @@ -440,7 +490,7 @@ * util/except.m: removed stack trace debug, which always seemed to hang anyway. -1999-08-08 Steve Ratcliffe +1999-08-08 Steve Ratcliffe * util/util.m: Changed default debug level down to 0 @@ -450,7 +500,7 @@ track based view complete The left pane is starting to be operational. The sliders do not do anything yet though. -1999-08-07 Steve Ratcliffe +1999-08-07 Steve Ratcliffe * util/util.m: debuging routines added @@ -464,7 +514,7 @@ * help/C/melys.sgml: a little more text -1999-08-06 Steve Ratcliffe +1999-08-06 Steve Ratcliffe * help/C/Makefile: added @@ -488,11 +538,11 @@ * files/format.m, files/mdmlread.m, files/mdmlwrite.m: Track and part now have a name property -1999-08-04 Steve Ratcliffe +1999-08-04 Steve Ratcliffe * files/mdmlread.m: Fix negative durations on empty container elements -1999-08-02 Steve Ratcliffe +1999-08-02 Steve Ratcliffe * files/midiread.m: There may be more than one on event for an off event. (Probably @@ -500,11 +550,11 @@ * md/mdutil.m: Fix initial tempo to be 120 -1999-07-30 Steve Ratcliffe +1999-07-30 Steve Ratcliffe * mlib/PROJECT/mgtk.py: Improved and fixed the gtk object generation -1999-07-29 Steve Ratcliffe +1999-07-29 Steve Ratcliffe * README: Updated the README a little (REL-0-0-4) @@ -533,7 +583,7 @@ song/song.m: First working record feature -1999-07-27 Steve Ratcliffe +1999-07-27 Steve Ratcliffe * config/ports.m, files/format.m, gui/main.m, gui/menus.m, midi/play.m, midi/record.m, programs/melys.m, seq/seqlib.m, @@ -542,7 +592,7 @@ play engine in preparation for record. Now back to the state it was in before: can play files. -1999-07-24 Steve Ratcliffe +1999-07-24 Steve Ratcliffe * programs/.cvsignore, programs/melys.m, programs/pmidi.m: Modified to track the library functions @@ -568,12 +618,12 @@ * doc/mdml.dtd: Took out some SGML ism's. Has now been run though a real xml validating parser so it should now be valid XML. -1999-07-21 Steve Ratcliffe +1999-07-21 Steve Ratcliffe * midi/play.m: Lots of changes but mainly re-organisation. No new features. Should ease adding record. -1999-07-20 Steve Ratcliffe +1999-07-20 Steve Ratcliffe * seq/seqlib.m: Bugs with freeing the context fixed @@ -612,14 +662,14 @@ * files/midiread.m: Fix so that .mid files get the correct ending time -1999-07-19 Steve Ratcliffe +1999-07-19 Steve Ratcliffe * files/mdmlread.m, files/midiwrite.m, make.conf, md/elements.m, midi/play.m, programs/pmidi.m, seq/seqlib.m, seq/seqmidi.m, util/except.m: snapshot: mostly working play, some bugs -1999-07-18 Steve Ratcliffe +1999-07-18 Steve Ratcliffe * widgets/register.m, Makefile, doc/mdml.dtd, files/mdmlread.m, files/mdmlwrite.m, files/midiread.m, files/midiwrite.m, @@ -637,12 +687,12 @@ * widgets/register.m: first cut of the register functions -1999-07-17 Steve Ratcliffe +1999-07-17 Steve Ratcliffe * mlib/PROJECT/base.py, mlib/PROJECT/mgtk.py: New gtkobject tag for creating gtk objects -1999-07-16 Steve Ratcliffe +1999-07-16 Steve Ratcliffe * doc/mdml.dtd: updated dtd spec @@ -660,7 +710,7 @@ programs/melys.m: A very initial first screen -1999-07-15 Steve Ratcliffe +1999-07-15 Steve Ratcliffe * Makefile, files/mdmlread.m, files/mdmlwrite.m, files/midiread.m, files/midiwrite.m, include/intl.h, md/elements.m, md/mdutil.m, @@ -668,7 +718,7 @@ Real head element now. Fixes to be able to sequence over song with in them -1999-07-14 Steve Ratcliffe +1999-07-14 Steve Ratcliffe * doc/mdml.dtd, files/.cvsignore, files/mdmlwrite.m, files/midiread.m, files/midiwrite.m, include/intl.h, @@ -680,7 +730,7 @@ * gui/mlib.conf, md/mlib.conf, files/mlib.conf: added -1999-07-10 Steve Ratcliffe +1999-07-10 Steve Ratcliffe * doc/mdml.dtd, doc/sgmldecl: Added files @@ -716,14 +766,14 @@ * ChangeLog, Makefile, make.conf: After the makefile generation -1999-07-06 Steve Ratcliffe +1999-07-06 Steve Ratcliffe * programs/pmidi.m: Removed the server option * files/midiread.m, programs/mdmlconv.m, programs/pmidi.m: Mostly finished up with pmidi -1999-06-08 Steve Ratcliffe +1999-06-08 Steve Ratcliffe * seq/seqmidi.m: free allocated data @@ -737,7 +787,7 @@ * seq/seqlib.m, seq/seqmidi.m: Fixed the sysex bug -1999-06-01 Steve Ratcliffe +1999-06-01 Steve Ratcliffe * programs/pmidi.m: Add smpteoffset processing (ignore it) @@ -746,12 +796,12 @@ * files/mdmlread.m: Most conversion issues fixed. Taged as trusted-conv-1 -1999-05-31 Steve Ratcliffe +1999-05-31 Steve Ratcliffe * files/mdmlread.m, files/midiread.m, files/midiwrite.m: Mostly working, there and back midi to mdml -1999-05-25 Steve Ratcliffe +1999-05-25 Steve Ratcliffe * ChangeLog, files/midiread.m, files/midiwrite.m, md/elements.m, md/mdutil.m, mlib/PROJECT/base.py, @@ -759,12 +809,12 @@ seq/seqmidi.m, util/except.m: Location of header directory is now specified by config -1999-05-24 Steve Ratcliffe +1999-05-24 Steve Ratcliffe * include/.cvsignore, make.conf, md/mdutil.m, seq/seqlib.m, seq/seqmidi.m: The basic playmidi functionality is working -1999-05-23 Steve Ratcliffe +1999-05-23 Steve Ratcliffe * seq/seqlib.m, seq/seqmidi.m: Lots of sequencer interface routines @@ -772,22 +822,22 @@ * md/elements.m, md/mdutil.m: Allow sequencing over all elements -1999-05-21 Steve Ratcliffe +1999-05-21 Steve Ratcliffe * seq/seqlib.m: first version of seqlib -1999-05-20 Steve Ratcliffe +1999-05-20 Steve Ratcliffe * files/midiread.m: Tempomap items now get a timestamp -1999-05-17 Steve Ratcliffe +1999-05-17 Steve Ratcliffe * files/mdmlwrite.m, files/midiread.m, include/midi.h, make.conf, md/elements.m, mlib/PROJECT/base.py, mlib/PROJECT/header.py, test/test.m, util/except.m: Can now write midi files -1999-05-14 Steve Ratcliffe +1999-05-14 Steve Ratcliffe * files/mdmlwrite.m, files/midiread.m, md/element.m, md/elements.m, mlib/PROJECT/__init__.py, mlib/PROJECT/base.py, mlib/PROJECT/cmds.py, diff -rNu melys-0.0.11/Makefile melys-0.0.12/Makefile --- melys-0.0.11/Makefile Sun Sep 19 23:09:27 1999 +++ melys-0.0.12/Makefile Wed Sep 22 20:53:57 1999 @@ -19,7 +19,7 @@ then mcode -o Makefile -fmake *.m ; fi) || exit 1;\ done -$(HEADER): +$(HEADER) headers: for i in $(DIRS); do \ (cd $$i; mcode -f header *.m >/dev/null) || exit 1; done diff -rNu melys-0.0.11/README melys-0.0.12/README --- melys-0.0.11/README Sun Sep 19 23:02:58 1999 +++ melys-0.0.12/README Wed Sep 22 21:43:52 1999 @@ -66,10 +66,9 @@ Bug reporting ------------- -My attitude to bugs is that they are not allowed, even in software -under heavy development as this is. So if you find any mail them -to melys@parabola.demon.co.uk if you have a fix all the better, but -the main thing is get the bug submitted. +My attitude to bugs is that they are not allowed even in software under +heavy development as this is. So if you find any, then please mail them +to melys@parabola.demon.co.uk Authors ------- diff -rNu melys-0.0.11/doc/README melys-0.0.12/doc/README --- melys-0.0.11/doc/README Thu Jan 1 00:00:00 1970 +++ melys-0.0.12/doc/README Wed Sep 22 11:05:33 1999 @@ -0,0 +1,2 @@ +See also the 'help' directory which contains all the documentation +that is accessible from the application. diff -rNu melys-0.0.11/doc/mdml.dtd melys-0.0.12/doc/mdml.dtd --- melys-0.0.11/doc/mdml.dtd Sun Sep 12 23:40:34 1999 +++ melys-0.0.12/doc/mdml.dtd Wed Sep 22 20:51:10 1999 @@ -1,10 +1,12 @@ @@ -58,16 +60,16 @@ %att.common; duration CDATA #IMPLIED name CDATA #IMPLIED + id CDATA #IMPLIED > - ] > diff -rNu melys-0.0.11/help/C/track.sgml melys-0.0.12/help/C/track.sgml --- melys-0.0.11/help/C/track.sgml Sun Sep 19 23:02:58 1999 +++ melys-0.0.12/help/C/track.sgml Wed Sep 22 21:38:40 1999 @@ -125,15 +125,23 @@ You can type in any name for the track. + There is no limit on the length of the name. Output device - This currently does nothing. - It will - allow you to set the destination MIDI device for this track. + Sets the you to set the destination MIDI device for this track. + Currently there is no way to set up devices from within + &mel;, this will be implemented in a later version. + The device list is taken from the ALSA_OUTPUT_PORTS + environment variable. + This is a comma separated list of &alsa; sequencer ports. + You can use the utility showseq to display + a list of available sequenver ports on your system. + All ports labeled diff -rNu melys-0.0.11/include/elements.h melys-0.0.12/include/elements.h --- melys-0.0.11/include/elements.h Sun Sep 19 23:10:01 1999 +++ melys-0.0.12/include/elements.h Wed Sep 22 23:10:26 1999 @@ -25,11 +25,6 @@ #define MD_CONTAINER_BEGIN 50 /* Begining of container types */ -/* - * The basic element type. All elements have a time associated with - * them and most use the device and channel field. - * This should be kept as small as possible. - */ struct element { guint32 element_time; /* Time for this element */ short device_channel; /* Device/channel for this element */ @@ -37,6 +32,7 @@ char tag; /* Element tag */ int refcount:8; /* Reference count */ int floating:1; /* Not added to anything yet */ + int selected:1; /* Element is selected */ int modified:1; /* Element was modified */ }; #define MD_ELEMENT(e) \ @@ -84,7 +80,6 @@ int program; /* Extended program number */ int inputdev; /* Input device for this track */ /* Flags (Maybe should go on container) */ - int selected:1; /* track is selected */ int record:1; /* Set for record */ int mute:1; /* Track muted */ int solo:1; /* Set for solo */ @@ -122,15 +117,27 @@ struct containerElement parent; char *name; /* Part name */ int id; /* Part id unique among all referenced parts */ + /* Private stuff not to be written out */ + gpointer item; /* pointer to displayed item */ }; #define MD_PART(e) \ ((struct partElement *)md_check_cast((struct element *)(e), MD_TYPE_PART)) +struct partrefElement { + struct element parent; + char *name; /* Name of this part (need not be the same as part ref'ed) */ + struct partElement *ref; /* The part referenced */ + /* Private stuff not to be written out */ + gpointer item; /* pointer to displayed item */ +}; +#define MD_PARTREF(e) \ + ((struct partrefElement *)md_check_cast((struct element *)(e), MD_TYPE_PARTREF)) + + struct takeElement { struct containerElement parent; char *name; - char selected; }; #define MD_TAKE(e) \ ((struct takeElement *)md_check_cast((struct element *)(e), MD_TYPE_TAKE)) @@ -268,6 +275,7 @@ struct tempomapElement *md_tempomap_new(void); struct noteElement *md_note_new(char note, char vel, short length); struct partElement *md_part_new(void); +struct partrefElement *md_partref_new(void); struct takeElement *md_take_new(void); struct controlElement *md_control_new(char control, char value); struct programElement *md_program_new(int program); @@ -287,6 +295,7 @@ struct noopElement *md_noop_new(unsigned long time); struct element *md_check_cast(struct element *el, int type); struct rootElement *md_root_inc_ref(struct rootElement *root); +int md_part_id(void); /* Defines for types */ @@ -301,15 +310,16 @@ #define MD_TYPE_SYSEX 8 #define MD_TYPE_TIMESIG 9 #define MD_TYPE_CONTAINER (10 + MD_CONTAINER_BEGIN) -#define MD_TYPE_KEYTOUCH 11 -#define MD_TYPE_PITCH 12 -#define MD_TYPE_PART (13 + MD_CONTAINER_BEGIN) -#define MD_TYPE_META 14 -#define MD_TYPE_PRESSURE 15 -#define MD_TYPE_TEMPO 16 -#define MD_TYPE_TEXT 17 -#define MD_TYPE_TRACK (18 + MD_CONTAINER_BEGIN) -#define MD_TYPE_KEYSIG 19 -#define MD_TYPE_HEAD (20 + MD_CONTAINER_BEGIN) -#define MD_TYPE_MAP 21 -#define MD_TYPE_CONTROL 22 +#define MD_TYPE_PARTREF 11 +#define MD_TYPE_KEYTOUCH 12 +#define MD_TYPE_PITCH 13 +#define MD_TYPE_PART (14 + MD_CONTAINER_BEGIN) +#define MD_TYPE_META 15 +#define MD_TYPE_PRESSURE 16 +#define MD_TYPE_TEMPO 17 +#define MD_TYPE_TEXT 18 +#define MD_TYPE_TRACK (19 + MD_CONTAINER_BEGIN) +#define MD_TYPE_KEYSIG 20 +#define MD_TYPE_HEAD (21 + MD_CONTAINER_BEGIN) +#define MD_TYPE_MAP 22 +#define MD_TYPE_CONTROL 23 diff -rNu melys-0.0.11/include/md.h melys-0.0.12/include/md.h --- melys-0.0.11/include/md.h Sun Sep 19 23:10:01 1999 +++ melys-0.0.12/include/md.h Wed Sep 22 23:10:26 1999 @@ -72,20 +72,29 @@ * Some macros to handle accessing some common fields in the * element */ +#define MD_TYPE(el) ( ((struct element *)(el))->type) #define MD_TIME(el) ( ((struct element *)(el))->element_time) +#define MD_SET_TIME(el, t) MD_TIME(el) = (t) +#define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) #define MD_DEV(el) ( (((struct element *)(el))->device_channel & ~0x0f) >> 4) #define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) #define MD_REF(el) (((struct element *)(el))->refcount++) -#define MD_UNREF(el) md_free((struct element *)(el)) +#define MD_FREE(el) md_free((struct element *)(el)) +#define MD_UNREF(el) MD_FREE(el) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) #define MD_SET_DEVCHAN(el, dev, chan) \ (((struct element *)el)->device_channel = (dev)<<4 | ((chan) & 0xf)) #define MD_MODIFIED(el) ( ((struct element *)el)->modified ) #define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) +#define MD_SELECTED(el) ( ((struct element *)el)->selected ) +#define MD_SET_SELECTED(el, tf) do { \ + ((struct element *)el)->selected = (tf); \ + MD_SET_MODIFIED(el, 1); \ + } while (0) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ diff -rNu melys-0.0.11/include/melyspartitem.h melys-0.0.12/include/melyspartitem.h --- melys-0.0.11/include/melyspartitem.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.12/include/melyspartitem.h Wed Sep 22 23:10:27 1999 @@ -0,0 +1,50 @@ +/* + * + * 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 wiget is a slight modification to the rectangle item. + * We want to be able to have a dashed border and also hold + * some data referencing the part that it belongs to. + * The data could be held as object-data, but the dashed border + * is not available in the gnome rectangle item at the time of writing. + * We may also want in the future to draw squigles to mark midi events. + * + * + * + * + * + */ + +#define MELYS_PART_ITEM(obj) GTK_CHECK_CAST(obj, melys_part_item_get_type(), MelysPartItem) +#define MELYS_PART_ITEM_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_part_item_get_type(), MelysPartItemClass) +#define IS_MELYS_PART_ITEM(obj) GTK_CHECK_TYPE(obj, melys_part_item_get_type()) + +typedef struct _MelysPartItem MelysPartItem; +typedef struct _MelysPartItemClass MelysPartItemClass; + + +struct _MelysPartItem { + GnomeCanvasRect gnome_canvas_rect; + + int dotted; + + struct element *part; /* The part being represented */ + struct trackElement *track; /* Track this part belongs to */ + struct rootElement *root; /* The complete root */ +}; + +struct _MelysPartItemClass { + GnomeCanvasRectClass parent_class; +}; + +guint melys_part_item_get_type(void); +GnomeCanvasItem *melys_part_item_new(void); diff -rNu melys-0.0.11/include/melystrack.h melys-0.0.12/include/melystrack.h --- melys-0.0.11/include/melystrack.h Sun Sep 19 23:10:02 1999 +++ melys-0.0.12/include/melystrack.h Wed Sep 22 23:10:27 1999 @@ -34,8 +34,13 @@ struct rootElement *mdroot; struct song *song; + + int vtitle; /* Title height */ + int vscale; /* pixels per track */ + int hscale; /* ticks per x pixel */ }; + struct _MelysTrackClass { GtkVBoxClass parent_class; // XXX class definition here @@ -47,6 +52,7 @@ #define TRACK_DEF_HEIGHT 16 #define TRACK_SEPARATION 2 #define TRACK_TITLE_HEIGHT 20 +#define TRACK_DEF_HSCALE 48 guint melys_track_get_type(void); diff -rNu melys-0.0.11/include/melystrackdisplay.h melys-0.0.12/include/melystrackdisplay.h --- melys-0.0.11/include/melystrackdisplay.h Sun Sep 19 23:10:02 1999 +++ melys-0.0.12/include/melystrackdisplay.h Wed Sep 22 23:10:27 1999 @@ -11,7 +11,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * */ #define MELYS_TRACK_DISPLAY(obj) GTK_CHECK_CAST(obj, melys_track_display_get_type(), MelysTrackDisplay) @@ -24,13 +23,53 @@ struct _MelysTrackDisplay { GtkVBox vbox; - // XXX object definition here + + /* The adjustments for scrolling */ + GtkAdjustment *vadj; + GtkAdjustment *hadj; + + /* Amount of vertical scrolling, in tracks (you never see half a track) */ + int voffset; + /* Horizontal offset, in ticks */ + int hoffset; + + /* + * The amount of vertical space used by tracks is under control of + * the parent MelysTrack widget. This is because we must be in + * sync between MelysTrackInfo and MelysTrackDisplay. + */ + + /* The amount of vertical space that a track takes up */ + int vspace; /* height + spacing */ + int height; /* without separation */ + int htitle; /* Title height */ + int vtitle; /* Title vertical space */ + + /* Horizontal scale. Ticks per pixel */ + int hscale; + + /* The offset from the top of allocated space to text baseline */ + int vtextoffset; + + /* Allocated area that track information is being displayed in */ + GdkRectangle track_area; + + /* The actual composition that is being displayed */ + struct rootElement *mdroot; + struct song *song; + + /* The sub-widgets that make up this widget */ + GtkWidget *canvas; + GtkWidget *title; + }; struct _MelysTrackDisplayClass { GtkVBoxClass parent_class; - // XXX class definition here }; guint melys_track_display_get_type(void); -GtkWidget *melys_track_display_new(void); +GtkWidget *melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj); +void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, + struct rootElement *root); +void melys_track_display_update(MelysTrackDisplay *mdisp); diff -rNu melys-0.0.11/include/melystrackinfo.h melys-0.0.12/include/melystrackinfo.h --- melys-0.0.11/include/melystrackinfo.h Sun Sep 19 23:10:02 1999 +++ melys-0.0.12/include/melystrackinfo.h Wed Sep 22 23:10:28 1999 @@ -98,5 +98,4 @@ void melys_track_info_set_md_root(MelysTrackInfo *minfo, struct rootElement *root); void melys_track_info_update(MelysTrackInfo *minfo); -int y_to_track(MelysTrackInfo *minfo, int ypix); char *get_info_string(MelysTrackInfo *minfo, int itype, int ntrack); diff -rNu melys-0.0.11/make.conf melys-0.0.12/make.conf --- melys-0.0.11/make.conf Wed Sep 15 17:01:38 1999 +++ melys-0.0.12/make.conf Wed Sep 22 10:13:17 1999 @@ -20,7 +20,7 @@ GNOMEFLAGS = -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/X11R6/include -I/usr/lib/glib/include # Gnome libs: output of "gnome-config --libs gnome gnomeui" -GNOMELIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -laudiofile -lm -ldb -lglib -ldl +GNOMELIBS = `gnome-config --libs gnome gnomeui` # Options to link with glib # GLIB = -lglib diff -rNu melys-0.0.11/md/elements.c melys-0.0.12/md/elements.c --- melys-0.0.11/md/elements.c Sun Sep 19 23:10:12 1999 +++ melys-0.0.12/md/elements.c Wed Sep 22 23:10:38 1999 @@ -28,12 +28,21 @@ #include "intl.h" +static int partid; + +/* + * The basic element type. All elements have a time associated with + * them and most use the device and channel field. + * This should be kept as small as possible. + */ + static void md_element_init(struct element *e); static void md_container_init(struct containerElement *e); static void md_root_init(struct rootElement *e); static void md_head_init(struct headElement *e); static void md_track_init(struct trackElement *e); static void md_part_init(struct partElement *e); +static void md_partref_init(struct partrefElement *e); static void md_take_init(struct takeElement *e); static void md_meta_init(struct metaElement *e); static void md_map_init(struct mapElement *e); @@ -243,6 +252,37 @@ md_container_init(MD_CONTAINER(e)); e->name = NULL; + e->item = NULL; +} + +/* + * Create and initialise a partref element. + */ +struct partrefElement * +md_partref_new(void) +{ + struct partrefElement * e; + + e = g_malloc0(sizeof(*e)); + MD_ELEMENT(e)->type = MD_TYPE_PARTREF; + md_partref_init(MD_PARTREF(e)); + return e; +} + +/* + * Initialize data structures within the element. This is + * only really required when pointers need allocating. + * Arguments: + * e - Element to init + */ +static void +md_partref_init(struct partrefElement *e) +{ + + md_element_init(MD_ELEMENT(e)); + e->name = NULL; + e->ref = NULL; + e->item = NULL; } /* @@ -600,4 +640,10 @@ ((struct element *)root)->refcount++; return root; +} + +int +md_part_id(void) +{ + return partid++; } diff -rNu melys-0.0.11/md/elements.m melys-0.0.12/md/elements.m --- melys-0.0.11/md/elements.m Sat Sep 18 17:01:25 1999 +++ melys-0.0.12/md/elements.m Wed Sep 22 20:53:18 1999 @@ -27,6 +27,10 @@ #define MD_CONTAINER_BEGIN 50 /* Begining of container types */ +>>extern + +static int partid; + /* * The basic element type. All elements have a time associated with * them and most use the device and channel field. @@ -39,6 +43,7 @@ char tag; /* Element tag */ int refcount:8; /* Reference count */ int floating:1; /* Not added to anything yet */ + int selected:1; /* Element is selected */ int modified:1; /* Element was modified */ init e->refcount = 1; @@ -93,7 +98,6 @@ int inputdev; /* Input device for this track */ /* Flags (Maybe should go on container) */ - int selected:1; /* track is selected */ int record:1; /* Set for record */ int mute:1; /* Track muted */ int solo:1; /* Set for solo */ @@ -128,12 +132,26 @@ >>elementdef part container char *name; /* Part name */ int id; /* Part id unique among all referenced parts */ + + /* Private stuff not to be written out */ + gpointer item; /* pointer to displayed item */ init e->name = NULL; + e->item = NULL; + +>>elementdef partref element + char *name; /* Name of this part (need not be the same as part ref'ed) */ + struct partElement *ref; /* The part referenced */ + + /* Private stuff not to be written out */ + gpointer item; /* pointer to displayed item */ +init + e->name = NULL; + e->ref = NULL; + e->item = NULL; >>elementdef take container char *name; - char selected; init e->name = NULL; @@ -324,3 +342,8 @@ ((struct element *)root)->refcount++; return root; + +>>function md_part_id +int +>>code + return partid++; diff -rNu melys-0.0.11/md/mdutil.m melys-0.0.12/md/mdutil.m --- melys-0.0.11/md/mdutil.m Sun Sep 19 21:50:28 1999 +++ melys-0.0.12/md/mdutil.m Wed Sep 22 20:53:18 1999 @@ -20,20 +20,29 @@ * Some macros to handle accessing some common fields in the * element */ +#define MD_TYPE(el) ( ((struct element *)(el))->type) #define MD_TIME(el) ( ((struct element *)(el))->element_time) +#define MD_SET_TIME(el, t) MD_TIME(el) = (t) +#define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) #define MD_DEV(el) ( (((struct element *)(el))->device_channel & ~0x0f) >> 4) #define MD_CHAN(el) ( (((struct element *)(el))->device_channel & 0x0f)) #define MD_REF(el) (((struct element *)(el))->refcount++) -#define MD_UNREF(el) md_free((struct element *)(el)) +#define MD_FREE(el) md_free((struct element *)(el)) +#define MD_UNREF(el) MD_FREE(el) #define MD_MK_DEVCHAN(dev, chan) \ ((dev)<<4 | ((chan) & 0xf)) #define MD_SET_DEVCHAN(el, dev, chan) \ (((struct element *)el)->device_channel = (dev)<<4 | ((chan) & 0xf)) #define MD_MODIFIED(el) ( ((struct element *)el)->modified ) #define MD_SET_MODIFIED(el, v) ( ((struct element *)el)->modified = v) +#define MD_SELECTED(el) ( ((struct element *)el)->selected ) +#define MD_SET_SELECTED(el, tf) do { \ + ((struct element *)el)->selected = (tf); \ + MD_SET_MODIFIED(el, 1); \ + } while (0) /* Defines for md_walk() */ #define MD_WALK_ALL 1 /* Include all elements including deleted, hidden*/ diff -rNu melys-0.0.11/mlib/PROJECT/mgtk.py melys-0.0.12/mlib/PROJECT/mgtk.py --- melys-0.0.11/mlib/PROJECT/mgtk.py Fri Aug 6 11:58:36 1999 +++ melys-0.0.12/mlib/PROJECT/mgtk.py Wed Sep 22 10:12:15 1999 @@ -102,10 +102,19 @@ }; >>extern + +/* The list of signal id's that are being added for %(objname)s. */ enum { // XXX symbols for all signals here LAST_SIGNAL }; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + >>function %(objprefix)s_new GtkWidget * diff -rNu melys-0.0.11/programs/Makefile melys-0.0.12/programs/Makefile --- melys-0.0.11/programs/Makefile Sun Sep 19 23:10:08 1999 +++ melys-0.0.12/programs/Makefile Wed Sep 22 23:10:34 1999 @@ -50,7 +50,7 @@ ../song/song.o \ ../config/ports.o \ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ - ../widgets/melystrackdisplay.o \ + ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o SHOWSEQOBJS = \ diff -rNu melys-0.0.11/programs/mdmlconv.c melys-0.0.12/programs/mdmlconv.c --- melys-0.0.11/programs/mdmlconv.c Sun Sep 19 23:10:17 1999 +++ melys-0.0.12/programs/mdmlconv.c Wed Sep 22 23:10:44 1999 @@ -209,7 +209,7 @@ root->head->author = "author"; root->head->title = "Sweet song"; root->head->comment = "This template was created with mdmlconv"; - take->selected = 1; + MD_SET_SELECTED(take, TRUE); track->name = "Track 1"; part->name = "part1"; diff -rNu melys-0.0.11/programs/mdmlconv.m melys-0.0.12/programs/mdmlconv.m --- melys-0.0.11/programs/mdmlconv.m Thu Sep 16 12:35:07 1999 +++ melys-0.0.12/programs/mdmlconv.m Wed Sep 22 20:50:30 1999 @@ -201,7 +201,7 @@ root->head->author = "author"; root->head->title = "Sweet song"; root->head->comment = "This template was created with mdmlconv"; - take->selected = 1; + MD_SET_SELECTED(take, TRUE); track->name = "Track 1"; part->name = "part1"; diff -rNu melys-0.0.11/programs/melys.m melys-0.0.12/programs/melys.m --- melys-0.0.11/programs/melys.m Sat Sep 18 17:11:02 1999 +++ melys-0.0.12/programs/melys.m Wed Sep 22 20:50:30 1999 @@ -27,7 +27,7 @@ >>make --objects ../song/song.o >>make --objects ../config/ports.o >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o ->>make --objects ../widgets/melystrackdisplay.o +>>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o >>header diff -rNu melys-0.0.11/seq/seqplay.c melys-0.0.12/seq/seqplay.c --- melys-0.0.11/seq/seqplay.c Sun Sep 19 23:10:10 1999 +++ melys-0.0.12/seq/seqplay.c Wed Sep 22 23:10:36 1999 @@ -38,6 +38,11 @@ * for the ECHO_END_PROLOGUE event. Then stop the timer and * restart it and play the reset of the song. * + * Note that this is a temporary algorithm. A better one would + * be to calculate how much time is available before notes are + * played on each channel and send the setup in order so as to not + * have to have any additional time at all. + * */ void midi_play_prologue(struct seq_context *ctxp, struct rootElement *root) diff -rNu melys-0.0.11/seq/seqplay.m melys-0.0.12/seq/seqplay.m --- melys-0.0.11/seq/seqplay.m Sat Sep 18 17:05:24 1999 +++ melys-0.0.12/seq/seqplay.m Wed Sep 22 21:38:40 1999 @@ -29,6 +29,11 @@ for the ECHO_END_PROLOGUE event. Then stop the timer and restart it and play the reset of the song. +Note that this is a temporary algorithm. +A better one would be to calculate how much time is available +before notes are played on each channel and send the setup +in order so as to not have to have any additional time at all. + >>code struct trackElement *track; snd_seq_real_time_t time = {0}; diff -rNu melys-0.0.11/song/song.c melys-0.0.12/song/song.c --- melys-0.0.11/song/song.c Sun Sep 19 23:10:09 1999 +++ melys-0.0.12/song/song.c Wed Sep 22 23:10:35 1999 @@ -139,8 +139,8 @@ song->newtrack = md_track_new(); song->tracknum++; - gtk_widget_queue_draw(song->trackview); } + song_view_update(song); } /* @@ -179,6 +179,8 @@ { record_stop(song->record); + + song_view_update(song); } /* @@ -250,17 +252,6 @@ if (sd->mdroot) { md_free(MD_ELEMENT(sd->mdroot)); sd->mdroot = NULL; - } - - if (sd->open_dialog) { - w = reg_get_widget(sd->open_dialog); - if (w) - gtk_widget_destroy(w); - } - if (sd->save_dialog) { - w = reg_get_widget(sd->save_dialog); - if (w) - gtk_widget_destroy(w); } /* Record (and any other subcontext) must be freed first */ diff -rNu melys-0.0.11/song/song.m melys-0.0.12/song/song.m --- melys-0.0.11/song/song.m Sun Sep 19 22:43:12 1999 +++ melys-0.0.12/song/song.m Wed Sep 22 20:52:07 1999 @@ -172,8 +172,8 @@ song->newtrack = md_track_new(); song->tracknum++; - gtk_widget_queue_draw(song->trackview); } + song_view_update(song); >>function song_record_start @@ -216,6 +216,8 @@ record_stop(song->record); + song_view_update(song); + >>function song_get_data struct song * @@ -283,17 +285,6 @@ if (sd->mdroot) { md_free(MD_ELEMENT(sd->mdroot)); sd->mdroot = NULL; - } - - if (sd->open_dialog) { - w = reg_get_widget(sd->open_dialog); - if (w) - gtk_widget_destroy(w); - } - if (sd->save_dialog) { - w = reg_get_widget(sd->save_dialog); - if (w) - gtk_widget_destroy(w); } /* Record (and any other subcontext) must be freed first */ diff -rNu melys-0.0.11/version melys-0.0.12/version --- melys-0.0.11/version Sun Sep 19 23:02:58 1999 +++ melys-0.0.12/version Wed Sep 22 23:10:01 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.11" +#define MELYS_VERSION_STRING "0.0.12" diff -rNu melys-0.0.11/widgets/.cvsignore melys-0.0.12/widgets/.cvsignore --- melys-0.0.11/widgets/.cvsignore Sun Sep 19 23:10:07 1999 +++ melys-0.0.12/widgets/.cvsignore Wed Sep 22 23:10:33 1999 @@ -1,3 +1,4 @@ +melyspartitem.c melystrack.c melystrackdisplay.c melystrackinfo.c diff -rNu melys-0.0.11/widgets/Makefile melys-0.0.12/widgets/Makefile --- melys-0.0.11/widgets/Makefile Sun Sep 19 23:10:07 1999 +++ melys-0.0.12/widgets/Makefile Wed Sep 22 23:10:33 1999 @@ -4,19 +4,22 @@ include $(TOP)/make.conf TARGETS = -OBJS = melystrack.o \ +OBJS = melyspartitem.o \ + melystrack.o \ melystrackdisplay.o \ melystrackinfo.o \ melystransport.o \ misc.o \ register.o -GENCFILES = melystrack.c \ +GENCFILES = melyspartitem.c \ + melystrack.c \ melystrackdisplay.c \ melystrackinfo.c \ melystransport.c \ misc.c \ register.c -GENHFILES = ../include/melystrack.h \ +GENHFILES = ../include/melyspartitem.h \ + ../include/melystrack.h \ ../include/melystrackdisplay.h \ ../include/melystrackinfo.h \ ../include/melystransport.h \ @@ -53,15 +56,14 @@ .m.c: mcode $(MCODEFLAGS) -o $@ $< -melystransport.o: ../include/melystransport.h -melystrack.o: ../include/song.h -melystrack.o: ../include/elements.h -melystrack.o: ../include/md.h -melystrack.o: ../include/melystrackinfo.h -melystrack.o: ../include/melystrackdisplay.h -melystrack.o: ../include/melystrack.h +melyspartitem.o: ../include/elements.h +melyspartitem.o: ../include/md.h +melyspartitem.o: ../include/melyspartitem.h +melystrackdisplay.o: ../include/melystrack.h +melystrackdisplay.o: ../include/melyspartitem.h +melystrackdisplay.o: ../include/elements.h +melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/melystrackdisplay.h -register.o: ../include/melreg.h misc.o: ../include/melwidgets.h melystrackinfo.o: ../include/melmsg.h melystrackinfo.o: ../include/melgui.h @@ -71,3 +73,11 @@ melystrackinfo.o: ../include/song.h melystrackinfo.o: ../include/melystrackinfo.h melystrackinfo.o: ../include/melystrack.h +melystransport.o: ../include/melystransport.h +melystrack.o: ../include/song.h +melystrack.o: ../include/elements.h +melystrack.o: ../include/md.h +melystrack.o: ../include/melystrackinfo.h +melystrack.o: ../include/melystrackdisplay.h +melystrack.o: ../include/melystrack.h +register.o: ../include/melreg.h diff -rNu melys-0.0.11/widgets/melyspartitem.c melys-0.0.12/widgets/melyspartitem.c --- melys-0.0.11/widgets/melyspartitem.c Thu Jan 1 00:00:00 1970 +++ melys-0.0.12/widgets/melyspartitem.c Wed Sep 22 23:10:41 1999 @@ -0,0 +1,228 @@ +/* + * + * 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 wiget is a slight modification to the rectangle item. + * We want to be able to have a dashed border and also hold + * some data referencing the part that it belongs to. + * The data could be held as object-data, but the dashed border + * is not available in the gnome rectangle item at the time of writing. + * We may also want in the future to draw squigles to mark midi events. + * + * + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtk.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "elements.h" +#include "md.h" +#include "melyspartitem.h" +#include "intl.h" + + +/* Signal id numbers */ +enum { + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + ARG_DOTTED_BORDER +}; + +typedef double affine_t[6]; + +static void melys_part_item_init(MelysPartItem *XXX); +static void melys_part_item_class_init(MelysPartItemClass *klass); +static void part_item_update(GnomeCanvasItem *item, affine_t affine, + ArtSVP *clip_path, gint flags); +static void part_get_arg(GtkObject *object, GtkArg *arg, guint arg_id); +static void part_set_arg(GtkObject *object, GtkArg *arg, guint arg_id); +static void set_outline(GdkGC *gc, int dotted); + + +static gint melys_part_item_signals[LAST_SIGNAL]; + +static GnomeCanvasRectClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_part_item_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysPartItem", + sizeof(MelysPartItem), + sizeof(MelysPartItemClass), + (GtkClassInitFunc) melys_part_item_class_init, + (GtkObjectInitFunc) melys_part_item_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gnome_canvas_rect_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysPartItem object. + */ +GnomeCanvasItem * +melys_part_item_new(void) +{ + GnomeCanvasItem *item = GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); + + + return item; +} + +/* + * Initialise the MelysPartItem. + * Arguments: + * XXX - The MelysPartItem to init + */ +static void +melys_part_item_init(MelysPartItem *XXX) +{ + // XXX add any children etc. +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_part_item_class_init(MelysPartItemClass *klass) +{ + GtkObjectClass *object_class; + GnomeCanvasRectClass *gnome_canvas_rect_class; + GnomeCanvasItemClass *item_class; + + object_class = (GtkObjectClass *)klass; + item_class = (GnomeCanvasItemClass *)klass; + gnome_canvas_rect_class = (GnomeCanvasRectClass *)klass; + + parent_class = gtk_type_class(gnome_canvas_rect_get_type()); + + gtk_object_add_arg_type ("MelysPartItem::dotted_border", GTK_TYPE_INT, + GTK_ARG_READWRITE, ARG_DOTTED_BORDER); + + gtk_object_class_add_signals(object_class, melys_part_item_signals, + LAST_SIGNAL); + + object_class->set_arg = part_set_arg; + object_class->get_arg = part_get_arg; + item_class->update = part_item_update; +} + +/* + * We intercept the update routine to set up the dashed + * outline. + * + */ +static void +part_item_update(GnomeCanvasItem *item, affine_t affine, ArtSVP *clip_path, + gint flags) +{ + GnomeCanvasRE *re; + MelysPartItem *pitem; + + re = GNOME_CANVAS_RE(item); + pitem = MELYS_PART_ITEM(item); + + /* First chain up to do most of the real work */ + GNOME_CANVAS_ITEM_CLASS(parent_class)->update(item, affine, clip_path, + flags); + + if (!item->canvas->aa) { + set_outline(re->outline_gc, pitem->dotted); + } +} + +static void +part_get_arg(GtkObject *object, GtkArg *arg, guint arg_id) +{ + MelysPartItem *pitem; + GnomeCanvasRE *re; + GnomeCanvasItem *item; + + pitem = MELYS_PART_ITEM(object); + re = GNOME_CANVAS_RE(object); + item = GNOME_CANVAS_ITEM(object); + + switch (arg_id) { + case ARG_DOTTED_BORDER: + GTK_VALUE_INT(*arg) = pitem->dotted; + break; + default: + arg->type = GTK_TYPE_INVALID; + break; + } +} + +static void +part_set_arg(GtkObject *object, GtkArg *arg, guint arg_id) +{ + MelysPartItem *pitem; + GnomeCanvasRE *re; + GnomeCanvasItem *item; + + pitem = MELYS_PART_ITEM(object); + re = GNOME_CANVAS_RE(object); + item = GNOME_CANVAS_ITEM(object); + + + switch (arg_id) { + case ARG_DOTTED_BORDER: + pitem->dotted = GTK_VALUE_INT(*arg); + gnome_canvas_item_request_update(item); + break; + default: + break; + } +} + +static void +set_outline(GdkGC *gc, int dotted) +{ + gchar dash_list[] = { + 3, 3 + }; + int type; + + if (dotted) + type = GDK_LINE_ON_OFF_DASH; + else + type = GDK_LINE_SOLID; + + gdk_gc_set_line_attributes(gc, 1, type, + GDK_CAP_BUTT, GDK_JOIN_MITER); + gdk_gc_set_dashes(gc, 0, dash_list, NELEM(dash_list)); +} diff -rNu melys-0.0.11/widgets/melyspartitem.m melys-0.0.12/widgets/melyspartitem.m --- melys-0.0.11/widgets/melyspartitem.m Thu Jan 1 00:00:00 1970 +++ melys-0.0.12/widgets/melyspartitem.m Wed Sep 22 21:25:59 1999 @@ -0,0 +1,205 @@ +>>name melyspartitem.m - represents track parts in the track display + +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 wiget is a slight modification to the rectangle item. +We want to be able to have a dashed border and also hold +some data referencing the part that it belongs to. +The data could be held as object-data, but the dashed border +is not available in the gnome rectangle item at the time of writing. +We may also want in the future to draw squigles to mark midi events. + +>>header gtk/gtk.h + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-rect-ellipse.h + +>>header elements.h +>>header md.h + +>>gtkobject melys_part_item gnome_canvas_rect + +>>headerdef @header + +struct _MelysPartItem { + GnomeCanvasRect gnome_canvas_rect; + + int dotted; + + struct element *part; /* The part being represented */ + struct trackElement *track; /* Track this part belongs to */ + struct rootElement *root; /* The complete root */ +}; + +struct _MelysPartItemClass { + GnomeCanvasRectClass parent_class; +}; + +>>extern + +/* Signal id numbers */ +enum { + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + ARG_DOTTED_BORDER +}; + +typedef double affine_t[6]; + +>>function melys_part_item_new +GnomeCanvasItem * +>>description +Create a new MelysPartItem object. +>>code + GnomeCanvasItem *item = GNOME_CANVAS_ITEM(gtk_type_new(melys_part_item_get_type())); + + + return item; + +>>function melys_part_item_init +static void +MelysPartItem *XXX; The MelysPartItem to init +>>description +Initialise the MelysPartItem. +>>code + // XXX add any children etc. + + +>>function melys_part_item_class_init +static void +MelysPartItemClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GnomeCanvasRectClass *gnome_canvas_rect_class; + GnomeCanvasItemClass *item_class; + + object_class = (GtkObjectClass *)klass; + item_class = (GnomeCanvasItemClass *)klass; + gnome_canvas_rect_class = (GnomeCanvasRectClass *)klass; + + parent_class = gtk_type_class(gnome_canvas_rect_get_type()); + + gtk_object_add_arg_type ("MelysPartItem::dotted_border", GTK_TYPE_INT, + GTK_ARG_READWRITE, ARG_DOTTED_BORDER); + + gtk_object_class_add_signals(object_class, melys_part_item_signals, + LAST_SIGNAL); + + object_class->set_arg = part_set_arg; + object_class->get_arg = part_get_arg; + item_class->update = part_item_update; + + +>>function part_item_update +static void +GnomeCanvasItem *item; +affine_t affine; +ArtSVP *clip_path; +gint flags; + +>>description +We intercept the update routine to set up the dashed outline. + +>>code + GnomeCanvasRE *re; + MelysPartItem *pitem; + + re = GNOME_CANVAS_RE(item); + pitem = MELYS_PART_ITEM(item); + + /* First chain up to do most of the real work */ + GNOME_CANVAS_ITEM_CLASS(parent_class)->update(item, affine, clip_path, + flags); + + if (!item->canvas->aa) { + set_outline(re->outline_gc, pitem->dotted); + } + + +>>function part_get_arg +static void +GtkObject *object; +GtkArg *arg; +guint arg_id; + +>>code + MelysPartItem *pitem; + GnomeCanvasRE *re; + GnomeCanvasItem *item; + + pitem = MELYS_PART_ITEM(object); + re = GNOME_CANVAS_RE(object); + item = GNOME_CANVAS_ITEM(object); + + switch (arg_id) { + case ARG_DOTTED_BORDER: + GTK_VALUE_INT(*arg) = pitem->dotted; + break; + default: + arg->type = GTK_TYPE_INVALID; + break; + } + + +>>function part_set_arg +static void +GtkObject *object; +GtkArg *arg; +guint arg_id; + +>>code + MelysPartItem *pitem; + GnomeCanvasRE *re; + GnomeCanvasItem *item; + + pitem = MELYS_PART_ITEM(object); + re = GNOME_CANVAS_RE(object); + item = GNOME_CANVAS_ITEM(object); + + + switch (arg_id) { + case ARG_DOTTED_BORDER: + pitem->dotted = GTK_VALUE_INT(*arg); + gnome_canvas_item_request_update(item); + break; + default: + break; + } + + +>>function set_outline +static void +GdkGC *gc; +int dotted; + +>>code + gchar dash_list[] = { + 3, 3 + }; + int type; + + if (dotted) + type = GDK_LINE_ON_OFF_DASH; + else + type = GDK_LINE_SOLID; + + gdk_gc_set_line_attributes(gc, 1, type, + GDK_CAP_BUTT, GDK_JOIN_MITER); + gdk_gc_set_dashes(gc, 0, dash_list, NELEM(dash_list)); diff -rNu melys-0.0.11/widgets/melystrack.c melys-0.0.12/widgets/melystrack.c --- melys-0.0.11/widgets/melystrack.c Sun Sep 19 23:10:14 1999 +++ melys-0.0.12/widgets/melystrack.c Wed Sep 22 23:10:41 1999 @@ -36,6 +36,8 @@ static void melys_track_init(MelysTrack *mtp); static void melys_track_class_init(MelysTrackClass *klass); static void destroy(GtkObject *object); +static int x_to_tick(MelysTrack *mtrack, int xpix); +static int tick_to_x(MelysTrack *mtrack, int tick); static gint melys_track_signals[LAST_SIGNAL]; @@ -119,7 +121,7 @@ vscroll = (GtkVScrollbar*)gtk_vscrollbar_new(vadj); info = (MelysTrackInfo*)melys_track_info_new(vadj); - disp = (MelysTrackDisplay*)melys_track_display_new(); + disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj); hpan = (GtkHPaned*)gtk_hpaned_new(); gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(info)); @@ -159,6 +161,10 @@ mtp->info = info; mtp->display = disp; + + mtp->vtitle = TRACK_TITLE_HEIGHT; + mtp->vscale = TRACK_DEF_HEIGHT + TRACK_SEPARATION; + mtp->hscale = TRACK_DEF_HSCALE; } /* @@ -180,16 +186,9 @@ parent_class = gtk_type_class(gtk_vbox_get_type()); - // XXX Add args - - // XXX Create signals - gtk_object_class_add_signals(object_class, melys_track_signals, LAST_SIGNAL); - // XXX all the overrides come here object_class->destroy = destroy; - - // XXX Our functions } /* @@ -211,8 +210,13 @@ gtk_adjustment_set_value(mtrack->vadj, 0.0); gtk_adjustment_changed(mtrack->vadj); + mtrack->hadj->lower = 0.0; + mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(root)); + gtk_adjustment_set_value(mtrack->hadj, 0.0); + gtk_adjustment_changed(mtrack->hadj); + melys_track_info_set_md_root(mtrack->info, root); - //melys_track_display_set_md_root(mtrack->display, root); + melys_track_display_set_md_root(mtrack->display, root); } void @@ -221,9 +225,7 @@ mtrack->song = song; mtrack->info->song = song; - //mtrack->display->song = song; - //melys_track_info_set_song(mtrack->info, song); - //melys_track_display_set_song(mtrack->info, song); + mtrack->display->song = song; } /* @@ -241,7 +243,12 @@ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = (double)mtrack->mdroot->tracks; + mtrack->hadj->lower = 0.0; + mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(mtrack->mdroot)); + //gtk_adjustment_changed(mtrack->hadj); + melys_track_info_update(mtrack->info); + melys_track_display_update(mtrack->display); /* No signal yet */ } @@ -276,4 +283,25 @@ if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(object); +} + +static int +x_to_tick(MelysTrack *mtrack, int xpix) +{ + int tick; + + tick = xpix * mtrack->hscale; + return tick; +} + +static int +tick_to_x(MelysTrack *mtrack, int tick) +{ + int x; + + g_return_val_if_fail(mtrack->hscale != 0, 0); + + x = tick / mtrack->hscale; + + return x; } diff -rNu melys-0.0.11/widgets/melystrack.m melys-0.0.12/widgets/melystrack.m --- melys-0.0.11/widgets/melystrack.m Thu Sep 16 12:39:59 1999 +++ melys-0.0.12/widgets/melystrack.m Wed Sep 22 21:25:11 1999 @@ -35,8 +35,13 @@ struct rootElement *mdroot; struct song *song; + + int vtitle; /* Title height */ + int vscale; /* pixels per track */ + int hscale; /* ticks per x pixel */ }; + struct _MelysTrackClass { GtkVBoxClass parent_class; // XXX class definition here @@ -48,6 +53,7 @@ #define TRACK_DEF_HEIGHT 16 #define TRACK_SEPARATION 2 #define TRACK_TITLE_HEIGHT 20 +#define TRACK_DEF_HSCALE 48 >>extern @@ -104,7 +110,7 @@ vscroll = (GtkVScrollbar*)gtk_vscrollbar_new(vadj); info = (MelysTrackInfo*)melys_track_info_new(vadj); - disp = (MelysTrackDisplay*)melys_track_display_new(); + disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj); hpan = (GtkHPaned*)gtk_hpaned_new(); gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(info)); @@ -145,6 +151,10 @@ mtp->info = info; mtp->display = disp; + mtp->vtitle = TRACK_TITLE_HEIGHT; + mtp->vscale = TRACK_DEF_HEIGHT + TRACK_SEPARATION; + mtp->hscale = TRACK_DEF_HSCALE; + >>function melys_track_class_init static void MelysTrackClass *klass; The class to initialise @@ -163,16 +173,10 @@ parent_class = gtk_type_class(gtk_vbox_get_type()); - // XXX Add args - - // XXX Create signals - gtk_object_class_add_signals(object_class, melys_track_signals, LAST_SIGNAL); - // XXX all the overrides come here object_class->destroy = destroy; - // XXX Our functions >>function melys_track_set_md_root @@ -196,8 +200,13 @@ gtk_adjustment_set_value(mtrack->vadj, 0.0); gtk_adjustment_changed(mtrack->vadj); + mtrack->hadj->lower = 0.0; + mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(root)); + gtk_adjustment_set_value(mtrack->hadj, 0.0); + gtk_adjustment_changed(mtrack->hadj); + melys_track_info_set_md_root(mtrack->info, root); - //melys_track_display_set_md_root(mtrack->display, root); + melys_track_display_set_md_root(mtrack->display, root); >>function melys_track_set_song @@ -209,9 +218,8 @@ mtrack->song = song; mtrack->info->song = song; - //mtrack->display->song = song; - //melys_track_info_set_song(mtrack->info, song); - //melys_track_display_set_song(mtrack->info, song); + mtrack->display->song = song; + >>function melys_track_update void @@ -228,7 +236,12 @@ mtrack->vadj->lower = 0.0; mtrack->vadj->upper = (double)mtrack->mdroot->tracks; + mtrack->hadj->lower = 0.0; + mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(mtrack->mdroot)); + //gtk_adjustment_changed(mtrack->hadj); + melys_track_info_update(mtrack->info); + melys_track_display_update(mtrack->display); /* No signal yet */ @@ -263,3 +276,28 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(object); +>>function x_to_tick +static int +MelysTrack *mtrack; +int xpix; + +>>code + int tick; + + tick = xpix * mtrack->hscale; + return tick; + + +>>function tick_to_x +static int +MelysTrack *mtrack; +int tick; + +>>code + int x; + + g_return_val_if_fail(mtrack->hscale != 0, 0); + + x = tick / mtrack->hscale; + + return x; diff -rNu melys-0.0.11/widgets/melystrackdisplay.c melys-0.0.12/widgets/melystrackdisplay.c --- melys-0.0.11/widgets/melystrackdisplay.c Sun Sep 19 23:10:15 1999 +++ melys-0.0.12/widgets/melystrackdisplay.c Wed Sep 22 23:10:42 1999 @@ -11,24 +11,53 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * */ #include "glib.h" #include "except.h" #include "util.h" +#include "gdk_imlib.h" +#include "gtk/gtkwidget.h" +#include "gtk/gtkframe.h" #include "gtk/gtkvbox.h" +#include "gtk/gtksignal.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "libgnomeui/gnome-canvas-line.h" +#include "libgnomeui/gnome-canvas-util.h" +#include "libart_lgpl/art_affine.h" +#include "melystrack.h" +#include "melyspartitem.h" +#include "elements.h" +#include "md.h" #include "melystrackdisplay.h" #include "intl.h" + + + + + enum { - // XXX symbols for all signals here LAST_SIGNAL }; -static void melys_track_display_init(MelysTrackDisplay *XXX); +GnomeCanvasItem *item; + +static void melys_track_display_init(MelysTrackDisplay *mdisp); static void melys_track_display_class_init(MelysTrackDisplayClass *klass); +static void disp_scroll(GtkAdjustment *adj, gpointer data); +static void create_part_item(MelysTrackDisplay *mdisp, struct element *part, + struct trackElement *track); +static void item_destroy(GtkObject *obj, gpointer data); +static void disp_destroy(GtkObject *obj); +static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation); +static void set_scroll_region(MelysTrackDisplay *mdisp); +static int y_to_track(MelysTrackDisplay *mdisp, int ypix); +static int track_to_y(MelysTrackDisplay *mdisp, int n); +static int x_to_tick(MelysTrackDisplay *mdisp, int xpix); +static int tick_to_x(MelysTrackDisplay *mdisp, int tick); static gint melys_track_display_signals[LAST_SIGNAL]; @@ -63,26 +92,108 @@ /* * Create a new MelysTrackDisplay object. + * + * Arguments: + * hadj - Horizontal adjustment + * vadj - Horizontal adjustment */ GtkWidget * -melys_track_display_new(void) +melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj) { - GtkWidget *XXX = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); + MelysTrackDisplay *mdisp; + + mdisp = (MelysTrackDisplay*)w; + + mdisp->hadj = hadj; + mdisp->vadj = vadj; + + gtk_signal_connect((GtkObject *)hadj, "value-changed", + (GtkSignalFunc)disp_scroll, mdisp); + gtk_signal_connect((GtkObject *)vadj, "value-changed", + (GtkSignalFunc)disp_scroll, mdisp); - // XXX Fill in here or replace previous line + gtk_object_ref((GtkObject*)hadj); + gtk_object_ref((GtkObject*)vadj); - return XXX; + return GTK_WIDGET(mdisp); } /* * Initialise the MelysTrackDisplay. * Arguments: - * XXX - The MelysTrackDisplay to init + * mdisp - The MelysTrackDisplay to init */ static void -melys_track_display_init(MelysTrackDisplay *XXX) +melys_track_display_init(MelysTrackDisplay *mdisp) { - // XXX add any children etc. + GtkWidget *frame; + GnomeCanvas *canvas; + GnomeCanvas *title; + GtkWidget *box; + + mdisp->height = TRACK_DEF_HEIGHT; + mdisp->vspace = TRACK_DEF_HEIGHT + TRACK_SEPARATION; + mdisp->htitle = TRACK_TITLE_HEIGHT; + mdisp->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; + mdisp->hscale = TRACK_DEF_HSCALE; + mdisp->voffset = 0; + mdisp->hoffset = 0; + + mdisp->mdroot = NULL; + mdisp->song = NULL; + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + + box = gtk_vbox_new(0, 0); + +#if 0 +#define AA +#endif +#ifdef AA + gtk_widget_push_visual(gdk_rgb_get_visual()); + gtk_widget_push_colormap(gdk_rgb_get_cmap()); + canvas = (GnomeCanvas *)gnome_canvas_new_aa(); + title = (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(); + title = (GnomeCanvas *)gnome_canvas_new(); +#endif + +#if 0 +{ +item = gnome_canvas_item_new(gnome_canvas_root(canvas), + melys_part_item_get_type(), + "x1", 10.0, + "y1", 10.0, + "x2", 200.0, + "y2", 50.0, + "fill_color", "yellow", + "width_pixels", 1, + "outline_color", "black", + NULL + ); +} +#endif + + mdisp->canvas = GTK_WIDGET(canvas); + mdisp->title = GTK_WIDGET(title); + gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); + + /* + * Build up the pane. The title row has a fixed height but + * expands to fill the horizontal space. The canvas expands + * to fill the rest of the space. + * Its all held in a frame. + */ + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); + gtk_container_add(GTK_CONTAINER(frame), box); + gtk_container_add(GTK_CONTAINER(mdisp), frame); + gtk_widget_show_all(GTK_WIDGET(mdisp)); } /* @@ -95,9 +206,11 @@ melys_track_display_class_init(MelysTrackDisplayClass *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()); @@ -108,7 +221,336 @@ gtk_object_class_add_signals(object_class, melys_track_display_signals, LAST_SIGNAL); - // XXX all the overrides come here + /* Set up all the overrides */ + object_class->destroy = disp_destroy; + + //widget_class->realize = disp_realise; + //widget_class->size_request = disp_size_request; + widget_class->size_allocate = disp_size_allocate; + //widget_class->unrealize = disp_unrealise; + //widget_class->draw = disp_draw; + //widget_class->expose_event = disp_expose; + //widget_class->enter_notify_event = disp_enter; + //widget_class->button_press_event = disp_button_press; // XXX Our functions +} + +void +melys_track_display_set_md_root(MelysTrackDisplay *mdisp, + struct rootElement *root) +{ + GnomeCanvas *canvas; + + g_return_if_fail(root != NULL); + + if (mdisp->mdroot) + md_free((struct element *)mdisp->mdroot); + mdisp->mdroot = md_root_inc_ref(root); + + canvas = GNOME_CANVAS(mdisp->canvas); + + melys_track_display_update(mdisp); +} + +/* + * A scrollbar has been moved. So we have to set our current + * position and redraw. + * + */ +static void +disp_scroll(GtkAdjustment *adj, gpointer data) +{ + MelysTrackDisplay *mdisp = data; + GnomeCanvas *canvas; + int changed = 0; + + if (adj == mdisp->hadj) { + if ((int)adj->value != mdisp->hoffset) { + changed = 1; + mdisp->hoffset = (int)adj->value; + } + } + if (adj == mdisp->vadj) { + if ((int)adj->value != mdisp->voffset) { + changed = 1; + mdisp->voffset = (int)adj->value; + } + } + + canvas = GNOME_CANVAS(mdisp->canvas); + + if (changed) { + gnome_canvas_scroll_to(canvas, + mdisp->hoffset, mdisp->voffset * mdisp->vspace); + } +} + +/* + * Look through all the parts and set up the part items for each + * part. + * + */ +void +melys_track_display_update(MelysTrackDisplay *mdisp) +{ + int n; + int p; + struct trackElement *track; + struct element *part; /* note that this could be part or partref */ + + for (n = 0; n < mdisp->mdroot->tracks; n++) { + track = md_track_nth(mdisp->mdroot, n); + + for (p = 0; p < MD_CONTAINER(track)->elements->len; p++) { + part = MD_CONTAINER(track)->elements->pdata[p]; + + switch (MD_TYPE(part)) { + case MD_TYPE_PART: + case MD_TYPE_PARTREF: + create_part_item(mdisp, part, track); + break; + default: + dprintf(0, "Unexpexted type %d in melys_track_display_update", MD_TYPE(part)); + break; + } + } + } + + set_scroll_region(mdisp); +} + +static void +create_part_item(MelysTrackDisplay *mdisp, struct element *part, + struct trackElement *track) +{ + gboolean ref = FALSE; + GnomeCanvasItem *item; + MelysPartItem *pitem; + MelysPartItem **itempp; + int state; + +#if 0 + if (MD_MODIFIED(part) == FALSE) { + dprintf(0, "part not modified"); + return; + } +#endif + + /* Is this a reference to a part (drawn with dotted outline) */ + if (MD_TYPE(part) == MD_TYPE_PARTREF) + ref = TRUE; + + /* See if this part is selected or not */ + if (MD_SELECTED(part)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + switch (MD_TYPE(part)) { + case MD_TYPE_PART: + itempp = (MelysPartItem **)&MD_PART(part)->item; + break; + case MD_TYPE_PARTREF: + itempp = (MelysPartItem **)&MD_PARTREF(part)->item; + break; + default: + g_return_if_fail(0); + break; + } + + item = (GnomeCanvasItem *)*itempp; + if (item == NULL) { + GnomeCanvasGroup *group; + group = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + item = gnome_canvas_item_new(group, melys_part_item_get_type(), + NULL); + *itempp = (MelysPartItem *)item; + } + + g_assert(item != NULL); + pitem = MELYS_PART_ITEM(item); + + /* Set the location and size */ + gnome_canvas_item_set(item, + "x1", (double) tick_to_x(mdisp, MD_TIME(part)), + "y1", (double) track_to_y(mdisp, track->number), + "x2", (double) tick_to_x(mdisp, MD_ENDTIME(part)), + "y2", (double) track_to_y(mdisp, track->number) + mdisp->height, + "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], + "width_pixels", 1, + "outline_color", "black", + "dotted_border", ref, + NULL); + + MD_REF(part); + pitem->part = part; + + MD_REF(track); + pitem->track = track; + + pitem->root = md_root_inc_ref(mdisp->mdroot); + + gtk_signal_connect(GTK_OBJECT(item), "destroy", item_destroy, NULL); +} + +static void +item_destroy(GtkObject *obj, gpointer data) +{ + MelysPartItem *pitem = MELYS_PART_ITEM(obj); + + if (pitem->part) + MD_FREE(pitem->part); + if (pitem->track) + MD_FREE(pitem->track); + if (pitem->root) + MD_FREE(pitem->root); +} + +static void +disp_destroy(GtkObject *obj) +{ + MelysTrackDisplay *mdisp; + + g_return_if_fail(IS_MELYS_TRACK_DISPLAY(obj)); + + mdisp = (MelysTrackDisplay*)obj; + + if (mdisp->hadj) { + gtk_object_unref(GTK_OBJECT(mdisp->hadj)); + mdisp->hadj = NULL; + } + if (mdisp->vadj) { + gtk_object_unref(GTK_OBJECT(mdisp->vadj)); + mdisp->vadj = NULL; + } + + if (mdisp->mdroot) { + md_free(MD_ELEMENT(mdisp->mdroot)); + mdisp->mdroot = NULL; + } + + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); +} + +/* + * Intercept the size allocation routine to set our scroll + * region. The region must at least as large as the allocated + * space and also large enough to hold the complete song. + * + */ +static void +disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation) +{ + MelysTrackDisplay *mdisp; + GnomeCanvas *canvas; + + g_return_if_fail(widget != NULL); + g_return_if_fail(IS_MELYS_TRACK_DISPLAY(widget)); + g_return_if_fail(allocation != NULL); + + /* Do the real work first */ + if (GTK_WIDGET_CLASS(parent_class)->size_allocate) + (GTK_WIDGET_CLASS(parent_class)->size_allocate)(widget, allocation); + + mdisp = (MelysTrackDisplay *)widget; + canvas = GNOME_CANVAS(mdisp->canvas); + + if (GTK_WIDGET_REALIZED (widget)) { + + set_scroll_region(mdisp); + melys_track_display_update(mdisp); + } +} + +/* + * Set the canvas scrolling region. + * + */ +static void +set_scroll_region(MelysTrackDisplay *mdisp) +{ + int width, height; + GnomeCanvas *canvas = GNOME_CANVAS(mdisp->canvas); + + /* the allocated area is the minimum to use */ + width = GTK_WIDGET(mdisp)->allocation.width; + height = GTK_WIDGET(mdisp)->allocation.height; + + mdisp->hadj->page_size = width; + gtk_adjustment_changed(mdisp->hadj); + + if (width < tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot))) + width = tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot)); + if (height < mdisp->mdroot->tracks * mdisp->vspace) + height = mdisp->mdroot->tracks * mdisp->vspace; + + gnome_canvas_set_scroll_region(canvas, + 0.0, 0.0, + width, + height + ); +} + +/* + * Given a y position within the widget window, return the + * track number that belongs to that co-ordintate. Track + * numbers start at 0, -1 means no track in other words the y + * position is before the tracks start or after. + * + * Do we even need this? + * + * Arguments: + * mdisp - The widget + * ypix - Y pixel widget co-ordinate + */ +static int +y_to_track(MelysTrackDisplay *mdisp, int ypix) +{ + int n; + + n = ypix; + + n /= mdisp->vspace; + + n += mdisp->voffset; + + dprintf(3, "Y %d, voff %d track %d", ypix, mdisp->voffset, n); + + return n; +} + +static int +track_to_y(MelysTrackDisplay *mdisp, int n) +{ + int ypix; + + ypix = n + mdisp->voffset; + + ypix *= mdisp->vspace; + + return ypix; +} + +static int +x_to_tick(MelysTrackDisplay *mdisp, int xpix) +{ + int tick; + + tick = xpix * mdisp->hscale; + return tick; +} + +static int +tick_to_x(MelysTrackDisplay *mdisp, int tick) +{ + int x; + + g_return_val_if_fail(mdisp->hscale != 0, 0); + + x = tick / mdisp->hscale; + + return x; } diff -rNu melys-0.0.11/widgets/melystrackdisplay.m melys-0.0.12/widgets/melystrackdisplay.m --- melys-0.0.11/widgets/melystrackdisplay.m Fri Aug 6 11:58:37 1999 +++ melys-0.0.12/widgets/melystrackdisplay.m Wed Sep 22 21:38:07 1999 @@ -1,4 +1,4 @@ ->>name melystrackdisplay.m - XXX +>>name melystrackdisplay.m - the track parts display Copyright (C) 1999 Steve Ratcliffe @@ -10,46 +10,184 @@ 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. - +>>extern +>>header gdk_imlib.h +>>header gtk/gtkwidget.h +>>header gtk/gtkframe.h >>header gtk/gtkvbox.h +>>header gtk/gtksignal.h + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-rect-ellipse.h +>>header libgnomeui/gnome-canvas-line.h +>>header libgnomeui/gnome-canvas-util.h + +>>header libart_lgpl/art_affine.h + +>>header melystrack.h +>>header melyspartitem.h + +>>header elements.h +>>header md.h + >>gtkobject melys_track_display MelysTrackDisplay gtk_vbox GtkVBox >>headerdef @header struct _MelysTrackDisplay { GtkVBox vbox; - // XXX object definition here + + /* The adjustments for scrolling */ + GtkAdjustment *vadj; + GtkAdjustment *hadj; + + /* Amount of vertical scrolling, in tracks (you never see half a track) */ + int voffset; + /* Horizontal offset, in ticks */ + int hoffset; + + /* + * The amount of vertical space used by tracks is under control of + * the parent MelysTrack widget. This is because we must be in + * sync between MelysTrackInfo and MelysTrackDisplay. + */ + + /* The amount of vertical space that a track takes up */ + int vspace; /* height + spacing */ + int height; /* without separation */ + int htitle; /* Title height */ + int vtitle; /* Title vertical space */ + + /* Horizontal scale. Ticks per pixel */ + int hscale; + + /* The offset from the top of allocated space to text baseline */ + int vtextoffset; + + /* Allocated area that track information is being displayed in */ + GdkRectangle track_area; + + /* The actual composition that is being displayed */ + struct rootElement *mdroot; + struct song *song; + + /* The sub-widgets that make up this widget */ + GtkWidget *canvas; + GtkWidget *title; + }; struct _MelysTrackDisplayClass { GtkVBoxClass parent_class; - // XXX class definition here }; >>extern enum { - // XXX symbols for all signals here LAST_SIGNAL }; +GnomeCanvasItem *item; + >>function melys_track_display_new GtkWidget * +GtkAdjustment *hadj; Horizontal adjustment +GtkAdjustment *vadj; Horizontal adjustment + >>description Create a new MelysTrackDisplay object. + >>code - GtkWidget *XXX = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); + MelysTrackDisplay *mdisp; + + mdisp = (MelysTrackDisplay*)w; + + mdisp->hadj = hadj; + mdisp->vadj = vadj; - // XXX Fill in here or replace previous line + gtk_signal_connect((GtkObject *)hadj, "value-changed", + (GtkSignalFunc)disp_scroll, mdisp); + gtk_signal_connect((GtkObject *)vadj, "value-changed", + (GtkSignalFunc)disp_scroll, mdisp); - return XXX; + gtk_object_ref((GtkObject*)hadj); + gtk_object_ref((GtkObject*)vadj); + + return GTK_WIDGET(mdisp); >>function melys_track_display_init static void -MelysTrackDisplay *XXX; The MelysTrackDisplay to init +MelysTrackDisplay *mdisp; The MelysTrackDisplay to init >>description Initialise the MelysTrackDisplay. >>code - // XXX add any children etc. + GtkWidget *frame; + GnomeCanvas *canvas; + GnomeCanvas *title; + GtkWidget *box; + + mdisp->height = TRACK_DEF_HEIGHT; + mdisp->vspace = TRACK_DEF_HEIGHT + TRACK_SEPARATION; + mdisp->htitle = TRACK_TITLE_HEIGHT; + mdisp->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; + mdisp->hscale = TRACK_DEF_HSCALE; + mdisp->voffset = 0; + mdisp->hoffset = 0; + + mdisp->mdroot = NULL; + mdisp->song = NULL; + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + + box = gtk_vbox_new(0, 0); + +#if 0 +#define AA +#endif +#ifdef AA + gtk_widget_push_visual(gdk_rgb_get_visual()); + gtk_widget_push_colormap(gdk_rgb_get_cmap()); + canvas = (GnomeCanvas *)gnome_canvas_new_aa(); + title = (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(); + title = (GnomeCanvas *)gnome_canvas_new(); +#endif + +#if 0 +{ +item = gnome_canvas_item_new(gnome_canvas_root(canvas), + melys_part_item_get_type(), + "x1", 10.0, + "y1", 10.0, + "x2", 200.0, + "y2", 50.0, + "fill_color", "yellow", + "width_pixels", 1, + "outline_color", "black", + NULL + ); +} +#endif + + mdisp->canvas = GTK_WIDGET(canvas); + mdisp->title = GTK_WIDGET(title); + gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); + + /* + * Build up the pane. The title row has a fixed height but + * expands to fill the horizontal space. The canvas expands + * to fill the rest of the space. + * Its all held in a frame. + */ + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); + gtk_container_add(GTK_CONTAINER(frame), box); + gtk_container_add(GTK_CONTAINER(mdisp), frame); + gtk_widget_show_all(GTK_WIDGET(mdisp)); >>function melys_track_display_class_init @@ -61,9 +199,11 @@ >>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()); @@ -74,8 +214,359 @@ gtk_object_class_add_signals(object_class, melys_track_display_signals, LAST_SIGNAL); - // XXX all the overrides come here + /* Set up all the overrides */ + object_class->destroy = disp_destroy; + + //widget_class->realize = disp_realise; + //widget_class->size_request = disp_size_request; + widget_class->size_allocate = disp_size_allocate; + //widget_class->unrealize = disp_unrealise; + //widget_class->draw = disp_draw; + //widget_class->expose_event = disp_expose; + //widget_class->enter_notify_event = disp_enter; + //widget_class->button_press_event = disp_button_press; // XXX Our functions +>>function melys_track_display_set_md_root +void +MelysTrackDisplay *mdisp; +struct rootElement *root; + +>>code + GnomeCanvas *canvas; + + g_return_if_fail(root != NULL); + + if (mdisp->mdroot) + md_free((struct element *)mdisp->mdroot); + mdisp->mdroot = md_root_inc_ref(root); + + canvas = GNOME_CANVAS(mdisp->canvas); + + melys_track_display_update(mdisp); + + +>>function disp_scroll +static void +GtkAdjustment *adj; +gpointer data; +>>description +A scrollbar has been moved. +So we have to set our current position and redraw. + +>>code + MelysTrackDisplay *mdisp = data; + GnomeCanvas *canvas; + int changed = 0; + + if (adj == mdisp->hadj) { + if ((int)adj->value != mdisp->hoffset) { + changed = 1; + mdisp->hoffset = (int)adj->value; + } + } + if (adj == mdisp->vadj) { + if ((int)adj->value != mdisp->voffset) { + changed = 1; + mdisp->voffset = (int)adj->value; + } + } + + canvas = GNOME_CANVAS(mdisp->canvas); + + if (changed) { + gnome_canvas_scroll_to(canvas, + mdisp->hoffset, mdisp->voffset * mdisp->vspace); + } + + + +>>function melys_track_display_update +void +MelysTrackDisplay *mdisp; + +>>description +Look through all the parts and set up the part items for +each part. + +>>code + int n; + int p; + struct trackElement *track; + struct element *part; /* note that this could be part or partref */ + + for (n = 0; n < mdisp->mdroot->tracks; n++) { + track = md_track_nth(mdisp->mdroot, n); + + for (p = 0; p < MD_CONTAINER(track)->elements->len; p++) { + part = MD_CONTAINER(track)->elements->pdata[p]; + + switch (MD_TYPE(part)) { + case MD_TYPE_PART: + case MD_TYPE_PARTREF: + create_part_item(mdisp, part, track); + break; + default: + dprintf(0, "Unexpexted type %d in @func_name", MD_TYPE(part)); + break; + } + } + } + + set_scroll_region(mdisp); + +>>function create_part_item +static void +MelysTrackDisplay *mdisp; +struct element *part; Part or reference to part +struct trackElement *track; The track + +>>code + gboolean ref = FALSE; + GnomeCanvasItem *item; + MelysPartItem *pitem; + MelysPartItem **itempp; + int state; + +#if 0 + if (MD_MODIFIED(part) == FALSE) { + dprintf(0, "part not modified"); + return; + } +#endif + + /* Is this a reference to a part (drawn with dotted outline) */ + if (MD_TYPE(part) == MD_TYPE_PARTREF) + ref = TRUE; + + /* See if this part is selected or not */ + if (MD_SELECTED(part)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + switch (MD_TYPE(part)) { + case MD_TYPE_PART: + itempp = (MelysPartItem **)&MD_PART(part)->item; + break; + case MD_TYPE_PARTREF: + itempp = (MelysPartItem **)&MD_PARTREF(part)->item; + break; + default: + g_return_if_fail(0); + break; + } + + item = (GnomeCanvasItem *)*itempp; + if (item == NULL) { + GnomeCanvasGroup *group; + group = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + item = gnome_canvas_item_new(group, melys_part_item_get_type(), + NULL); + *itempp = (MelysPartItem *)item; + } + + g_assert(item != NULL); + pitem = MELYS_PART_ITEM(item); + + /* Set the location and size */ + gnome_canvas_item_set(item, + "x1", (double) tick_to_x(mdisp, MD_TIME(part)), + "y1", (double) track_to_y(mdisp, track->number), + "x2", (double) tick_to_x(mdisp, MD_ENDTIME(part)), + "y2", (double) track_to_y(mdisp, track->number) + mdisp->height, + "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], + "width_pixels", 1, + "outline_color", "black", + "dotted_border", ref, + NULL); + + MD_REF(part); + pitem->part = part; + + MD_REF(track); + pitem->track = track; + + pitem->root = md_root_inc_ref(mdisp->mdroot); + + gtk_signal_connect(GTK_OBJECT(item), "destroy", item_destroy, NULL); + + +>>function item_destroy +static void +GtkObject *obj; +gpointer data; + +>>code + MelysPartItem *pitem = MELYS_PART_ITEM(obj); + + if (pitem->part) + MD_FREE(pitem->part); + if (pitem->track) + MD_FREE(pitem->track); + if (pitem->root) + MD_FREE(pitem->root); + + +>>function disp_destroy +static void +GtkObject *obj; + +>>code + MelysTrackDisplay *mdisp; + + g_return_if_fail(IS_MELYS_TRACK_DISPLAY(obj)); + + mdisp = (MelysTrackDisplay*)obj; + + if (mdisp->hadj) { + gtk_object_unref(GTK_OBJECT(mdisp->hadj)); + mdisp->hadj = NULL; + } + if (mdisp->vadj) { + gtk_object_unref(GTK_OBJECT(mdisp->vadj)); + mdisp->vadj = NULL; + } + + if (mdisp->mdroot) { + md_free(MD_ELEMENT(mdisp->mdroot)); + mdisp->mdroot = NULL; + } + + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); + + + +>>function disp_size_allocate +static void +GtkWidget *widget; +GtkAllocation *allocation; + +>>description +Intercept the size allocation routine to set our scroll region. +The region must at least as large as the allocated space and also +large enough to hold the complete song. + +>>code + MelysTrackDisplay *mdisp; + GnomeCanvas *canvas; + + g_return_if_fail(widget != NULL); + g_return_if_fail(IS_MELYS_TRACK_DISPLAY(widget)); + g_return_if_fail(allocation != NULL); + + /* Do the real work first */ + if (GTK_WIDGET_CLASS(parent_class)->size_allocate) + (GTK_WIDGET_CLASS(parent_class)->size_allocate)(widget, allocation); + + mdisp = (MelysTrackDisplay *)widget; + canvas = GNOME_CANVAS(mdisp->canvas); + + if (GTK_WIDGET_REALIZED (widget)) { + + set_scroll_region(mdisp); + melys_track_display_update(mdisp); + } + + +>>function set_scroll_region +static void +MelysTrackDisplay *mdisp; + +>>description +Set the canvas scrolling region. + +>>code + int width, height; + GnomeCanvas *canvas = GNOME_CANVAS(mdisp->canvas); + + /* the allocated area is the minimum to use */ + width = GTK_WIDGET(mdisp)->allocation.width; + height = GTK_WIDGET(mdisp)->allocation.height; + + mdisp->hadj->page_size = width; + gtk_adjustment_changed(mdisp->hadj); + + if (width < tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot))) + width = tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot)); + if (height < mdisp->mdroot->tracks * mdisp->vspace) + height = mdisp->mdroot->tracks * mdisp->vspace; + + gnome_canvas_set_scroll_region(canvas, + 0.0, 0.0, + width, + height + ); + + +>>function y_to_track +static int +MelysTrackDisplay *mdisp; The widget +int ypix; Y pixel widget co-ordinate + +>>description +Given a y position within the widget window, return +the track number that belongs to that co-ordintate. +Track numbers start at 0, -1 means no track in other words +the y position is before the tracks start or after. + +Do we even need this? + +>>code + int n; + + n = ypix; + + n /= mdisp->vspace; + + n += mdisp->voffset; + + dprintf(3, "Y %d, voff %d track %d", ypix, mdisp->voffset, n); + + return n; + +>>function track_to_y +static int +MelysTrackDisplay *mdisp; The widget +int n; The track number + +>>code + int ypix; + + ypix = n + mdisp->voffset; + + ypix *= mdisp->vspace; + + return ypix; + + + +>>function x_to_tick +static int +MelysTrackDisplay *mdisp; +int xpix; + +>>code + int tick; + + tick = xpix * mdisp->hscale; + return tick; + + +>>function tick_to_x +static int +MelysTrackDisplay *mdisp; +int tick; + +>>code + int x; + + g_return_val_if_fail(mdisp->hscale != 0, 0); + + x = tick / mdisp->hscale; + + return x; diff -rNu melys-0.0.11/widgets/melystrackinfo.c melys-0.0.12/widgets/melystrackinfo.c --- melys-0.0.11/widgets/melystrackinfo.c Sun Sep 19 23:10:15 1999 +++ melys-0.0.12/widgets/melystrackinfo.c Wed Sep 22 23:10:42 1999 @@ -142,6 +142,7 @@ static void real_mute_track(MelysTrackInfo *minfo, struct trackElement *track); static void real_unmute_track(MelysTrackInfo *minfo, struct trackElement *track); +static int y_to_track(MelysTrackInfo *minfo, int ypix); static int track_to_y(MelysTrackInfo *minfo, int n); static struct col_info *x_to_col_info(MelysTrackInfo *minfo, int x); static void track_info_scroll(GtkAdjustment *adj, gpointer data); @@ -246,6 +247,7 @@ minfo->voffset = 0; minfo->mdroot = NULL; + minfo->song = NULL; } /* @@ -349,8 +351,6 @@ melys_track_info_set_md_root(MelysTrackInfo *minfo, struct rootElement *root) { - dprintf1("Setting mdroot %p", root); - if (root == NULL) return; @@ -712,7 +712,7 @@ cip = minfo->col_infos+i; - if (ntrack >= 0 && track && track->selected && cip->kind == COL_TEXT) { + if (ntrack >= 0 && track && MD_SELECTED(track) && cip->kind == COL_TEXT) { fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; } else { @@ -915,10 +915,17 @@ shadow_type = GTK_SHADOW_IN; } +#if 1 gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, shadow_type, ap->x, ap->y + BUTTON_SURROUND, ap->width, ap->height - 2*BUTTON_SURROUND); +#else + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, shadow_type, + ap->x, ap->y, + ap->width, minfo->height); +#endif } /* @@ -1051,17 +1058,17 @@ if (!otrack) break; - if (otrack->selected && otrack != track) + if (MD_SELECTED(otrack) && otrack != track) unselect_track(minfo, otrack); } - //if (!track->selected) + //if (!MD_SELECTED(track)) select_track(minfo, track, cip->type); //else ;/* column action */ } else if (masks == GDK_CONTROL_MASK) { - if (track->selected) + if (MD_SELECTED(track)) unselect_track(minfo, track); else select_track(minfo, track, cip->type); @@ -1221,8 +1228,8 @@ track->record ^= 1; } - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[RECORD_TRACK], track, 1); + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[RECORD_TRACK], + track, 1); } /* @@ -1235,7 +1242,7 @@ { int page; - if (track->selected) { + if (MD_SELECTED(track)) { switch (coltype) { case PROGRAM: page = TRACK_PROP_INSTR; @@ -1247,14 +1254,14 @@ track_prop_box(track, minfo->song, page); } - track->selected = 1; + MD_SET_SELECTED(track, TRUE); } static void unselect_track(MelysTrackInfo *minfo, struct trackElement *track) { - track->selected = 0; + MD_SET_SELECTED(track, FALSE); one_track_redraw(minfo, -1, track); } @@ -1300,7 +1307,7 @@ * minfo - The widget * ypix - Y pixel widget co-ordinate */ -int +static int y_to_track(MelysTrackInfo *minfo, int ypix) { int n; diff -rNu melys-0.0.11/widgets/melystrackinfo.m melys-0.0.12/widgets/melystrackinfo.m --- melys-0.0.11/widgets/melystrackinfo.m Sun Sep 19 21:26:17 1999 +++ melys-0.0.12/widgets/melystrackinfo.m Wed Sep 22 21:38:07 1999 @@ -221,6 +221,7 @@ minfo->voffset = 0; minfo->mdroot = NULL; + minfo->song = NULL; >>function melys_track_info_class_init @@ -324,8 +325,6 @@ >>code - dprintf1("Setting mdroot %p", root); - if (root == NULL) return; @@ -697,7 +696,7 @@ cip = minfo->col_infos+i; - if (ntrack >= 0 && track && track->selected && cip->kind == COL_TEXT) { + if (ntrack >= 0 && track && MD_SELECTED(track) && cip->kind == COL_TEXT) { fg_gc = widget->style->fg_gc[GTK_STATE_SELECTED]; bg_gc = widget->style->bg_gc[GTK_STATE_SELECTED]; } else { @@ -909,10 +908,17 @@ shadow_type = GTK_SHADOW_IN; } +#if 1 gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, shadow_type, ap->x, ap->y + BUTTON_SURROUND, ap->width, ap->height - 2*BUTTON_SURROUND); +#else + gtk_draw_shadow(widget->style, widget->window, + GTK_STATE_NORMAL, shadow_type, + ap->x, ap->y, + ap->width, minfo->height); +#endif >>function track_info_expose static int @@ -1068,17 +1074,17 @@ if (!otrack) break; - if (otrack->selected && otrack != track) + if (MD_SELECTED(otrack) && otrack != track) unselect_track(minfo, otrack); } - //if (!track->selected) + //if (!MD_SELECTED(track)) select_track(minfo, track, cip->type); //else ;/* column action */ } else if (masks == GDK_CONTROL_MASK) { - if (track->selected) + if (MD_SELECTED(track)) unselect_track(minfo, track); else select_track(minfo, track, cip->type); @@ -1245,8 +1251,8 @@ track->record ^= 1; } - gtk_signal_emit(GTK_OBJECT(minfo), - melys_track_info_signals[RECORD_TRACK], track, 1); + gtk_signal_emit(GTK_OBJECT(minfo), melys_track_info_signals[RECORD_TRACK], + track, 1); >># ==== Selection and click actions @@ -1265,7 +1271,7 @@ >>code int page; - if (track->selected) { + if (MD_SELECTED(track)) { switch (coltype) { case PROGRAM: page = TRACK_PROP_INSTR; @@ -1277,7 +1283,7 @@ track_prop_box(track, minfo->song, page); } - track->selected = 1; + MD_SET_SELECTED(track, TRUE); >>function unselect_track static void @@ -1286,7 +1292,7 @@ >>code - track->selected = 0; + MD_SET_SELECTED(track, FALSE); one_track_redraw(minfo, -1, track); >>function mute_track @@ -1334,7 +1340,7 @@ >># ==== Utility routines >>function y_to_track -int +static int MelysTrackInfo *minfo; The widget int ypix; Y pixel widget co-ordinate diff -rNu melys-0.0.11/widgets/melystransport.c melys-0.0.12/widgets/melystransport.c --- melys-0.0.11/widgets/melystransport.c Sun Sep 19 23:10:15 1999 +++ melys-0.0.12/widgets/melystransport.c Wed Sep 22 23:10:42 1999 @@ -22,9 +22,17 @@ #include "melystransport.h" #include "intl.h" + +/* The list of signal id's that are being added for MelysTransport. */ enum { // XXX symbols for all signals here LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here }; static void melys_transport_init(MelysTransport *XXX);