diff -rNu melys-0.1.5/ChangeLog melys-0.1.6/ChangeLog --- melys-0.1.5/ChangeLog Wed Nov 24 22:52:00 1999 +++ melys-0.1.6/ChangeLog Mon Nov 29 10:46:57 1999 @@ -1,4 +1,115 @@ +1999-11-29 Steve Ratcliffe + + * make.conf: Undid temporary changes + + * config/ports.m: + Fixed crash when ALSA_{INPUT|OUTPUT}_PORTS are not set. + + * help/C/Makefile, help/C/melys.sgml, help/C/tempo.sgml: + Some help for the tempo change view. + + * md/mdconv.m: Don't remove the program changes from the MD tree. + + * README: Update the requirements for libxml + + * widgets/melyspiano.m, widgets/melysrule.m, widgets/melysscale.m, + widgets/melysscroll.m, widgets/melystempo.m, widgets/viewcontrol.m: + Now have a scale for the tempo widget. + Moved the zero point offset kludge from vcp to mscroll. + +1999-11-28 Steve Ratcliffe + + * widgets/melystrack.m, widgets/melysview.m, widgets/viewcontrol.m: + Now melys_view uses melys_scroll for its canvas part. + + * widgets/melyskeys.m, widgets/melysrule.m, widgets/melysscroll.m, + widgets/melystrack.m, widgets/melystrackdisplay.m, + widgets/melysview.m, widgets/viewcontrol.m: + Added a new widget to base melys_keys on. It is a general scrolling + canvas that can be set to scroll in either or both directions. + It will be used for the vertical scale on the tempo view and + for the keysignature and timesignature. + It could perhaps be used for the ruler and for the canvas part of + melys_view. + +1999-11-27 Steve Ratcliffe + + * widgets/melyskeys.m: Fix spello in comment + + * files/midiwrite.m, make.conf, md/mdseq.m, md/mdutil.m, + widgets/melystrackdisplay.m, widgets/melysview.m: + Another bunch of changes for ticktime_t + + * midi/record.m, programs/melplay.m, programs/melys.m, seq/seqlib.m, + seq/seqmidi.m, util/util.m, widgets/melyspos.m, widgets/melystempo.m, + widgets/melystrackdisplay.m, widgets/melysview.m, files/mdmlwrite.m, + files/midiread.m, files/midiwrite.m, md/elements.m, md/mdadd.m, + md/mdlist.m, md/mdseq.m, md/mdtools.m, md/mdundo.m, md/mdutil.m, + midi/play.m, make.conf: + Change the type of all normal time variables to ticktime_t. + + * widgets/melysrule.m, widgets/viewcontrol.m: + Changes to allow an offset in the display. Used for the tempomap + so that the initial tempo change isn't half hidden. + + * md/mdutil.m: Add md_get_duration to find the duration of notes as + well as containers. + + * md/mdconv.m: Reading midi0 files was too slow. So changed + the remove/add cycle to basically avoid the remove part. + +1999-11-26 Steve Ratcliffe + + * widgets/melystempo.m: Keep the duration of the tempomap to be + the same as the duration of the root. + + * widgets/melystempo.m: Now there is a line connecting together + the tempo changes. + + * widgets/melystempo.m: The new tempo view. This is just a + first cut. It will also have timesignature and keysignature bars. + Also it needs a scale down the left hand side. + + * widgets/melyspiano.m, widgets/melystrackinfo.m, widgets/melysview.m: + 1. Make the display info free function accessible from the melys_view + widget. + 2. There was a silly bug where MD_DURATION just happened to work with + notes because the length field was at the same offset as the duration + in containers. + 3. Other stuff to allow the new tempo view to be accessed. + + * widgets/melyskeys.m, widgets/melyspiano.m, widgets/melysview.m: + We now have highlighting on the piano keys as you move around + the notes. Also the octaves are now labeled. + +1999-11-25 Steve Ratcliffe + + * widgets/melystrackdisplay.m, widgets/melystrackinfo.m, + widgets/melysview.m, widgets/viewcontrol.m: + Now you can select the piano view from a part. When you do so then + only the notes in that part are shown. If the part does not start at + time 0 then the view doesn't either etc. + + * help/C/track.sgml: fixed spellos + + * help/C/piano.sgml: more detail on piano view + + * widgets/melyspiano.m: + Removed the canvas event handler as this is all going to + be done in melys_view. + + * widgets/melysview.m: + Add signals for the current mouse position over the canvas. + These can be used to show the current position in the status + line etc. + + * widgets/melyskeys.m: + Fix bug where the notes and the keys would move slightly out + of step when scrolling. + 1999-11-24 Steve Ratcliffe + + * version: Version 0.1.5 Two releases in the same day! * widgets/melystrackdisplay.m: Fixes to use the allocation of the canvas rather than diff -rNu melys-0.1.5/README melys-0.1.6/README --- melys-0.1.5/README Wed Nov 24 22:53:23 1999 +++ melys-0.1.6/README Mon Nov 29 08:40:56 1999 @@ -53,10 +53,13 @@ Requirements. ------------- - - You will need the gnome libraries including libxml. I am trying not - to require anything too up-to-the minute and so anything past version 1.0 - should be OK. But do get the latest version you can, just for - the bug fixes if nothing else. + - You will need the gnome libraries. I am trying not + to require anything too up-to-the minute and so anything past version + 1.0 should be OK. But do get the latest version you can, just for + the bug fixes if nothing else. I recommend getting the "October Gnome" + release. + + - libxml version 1.7 or above. - GTK+ 1.2 diff -rNu melys-0.1.5/config/ports.c melys-0.1.6/config/ports.c --- melys-0.1.5/config/ports.c Wed Nov 24 22:54:56 1999 +++ melys-0.1.6/config/ports.c Mon Nov 29 10:47:52 1999 @@ -44,7 +44,7 @@ /* At present there is no configuration of course */ portdesc = getenv("ALSA_INPUT_PORTS"); if (portdesc == NULL) { - ethrow(debugError, "ALSA_INPUT_PORTS not set in environment"); + *addrp = NULL; return 0; } @@ -71,7 +71,7 @@ /* Old name, for compatability */ portdesc = getenv("ALSA_OUT_PORT"); if (portdesc == NULL) { - ethrow(debugError, "ALSA_OUTPUT_PORTS not set in environment"); + *addrp = NULL; return 0; } } diff -rNu melys-0.1.5/config/ports.m melys-0.1.6/config/ports.m --- melys-0.1.5/config/ports.m Tue Nov 23 20:42:02 1999 +++ melys-0.1.6/config/ports.m Mon Nov 29 10:36:41 1999 @@ -31,7 +31,7 @@ /* At present there is no configuration of course */ portdesc = getenv("ALSA_INPUT_PORTS"); if (portdesc == NULL) { - ethrow(debugError, "ALSA_INPUT_PORTS not set in environment"); + *addrp = NULL; return 0; } @@ -57,7 +57,7 @@ /* Old name, for compatability */ portdesc = getenv("ALSA_OUT_PORT"); if (portdesc == NULL) { - ethrow(debugError, "ALSA_OUTPUT_PORTS not set in environment"); + *addrp = NULL; return 0; } } diff -rNu melys-0.1.5/files/mdmlwrite.c melys-0.1.6/files/mdmlwrite.c --- melys-0.1.5/files/mdmlwrite.c Wed Nov 24 22:54:58 1999 +++ melys-0.1.6/files/mdmlwrite.c Mon Nov 29 10:47:56 1999 @@ -29,9 +29,9 @@ struct mdmlstate { - unsigned long lasttime; /* Last event time */ + ticktime_t lasttime; /* Last event time */ int devchan; /* Current device channel */ - unsigned long starttime; /* Use to do relative times */ + ticktime_t starttime; /* Use to do relative times */ }; /* Static functions */ @@ -102,7 +102,7 @@ /* Now build all the top level elements */ c = MD_CONTAINER(root); - for (i = 0; i < c->elements->len; i++) { + for (i = 0; i < MD_CONTAINER_LEN(c); i++) { el = g_ptr_array_index(c->elements, i); switch (el->type) { @@ -236,12 +236,12 @@ int elind; xmlNodePtr node; struct element *el; - unsigned long ostart; + ticktime_t ostart; ostart = msp->starttime; msp->starttime = MD_ELEMENT(c)->element_time; - for (elind = 0; elind < c->elements->len; elind++) { + for (elind = 0; elind < MD_CONTAINER_LEN(c); elind++) { el = g_ptr_array_index(c->elements, elind); node = NULL; @@ -372,7 +372,7 @@ static void set_common_atts(struct mdmlstate *msp, xmlNodePtr node, struct element *el) { - unsigned long t; + ticktime_t t; t = el->element_time - msp->starttime; //if (t != msp->lasttime) { diff -rNu melys-0.1.5/files/mdmlwrite.m melys-0.1.6/files/mdmlwrite.m --- melys-0.1.5/files/mdmlwrite.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/files/mdmlwrite.m Sat Nov 27 11:43:22 1999 @@ -15,9 +15,9 @@ >>extern struct mdmlstate { - unsigned long lasttime; /* Last event time */ + ticktime_t lasttime; /* Last event time */ int devchan; /* Current device channel */ - unsigned long starttime; /* Use to do relative times */ + ticktime_t starttime; /* Use to do relative times */ }; >>header @@ -81,7 +81,7 @@ /* Now build all the top level elements */ c = MD_CONTAINER(root); - for (i = 0; i < c->elements->len; i++) { + for (i = 0; i < MD_CONTAINER_LEN(c); i++) { el = g_ptr_array_index(c->elements, i); switch (el->type) { @@ -213,12 +213,12 @@ int elind; xmlNodePtr node; struct element *el; - unsigned long ostart; + ticktime_t ostart; ostart = msp->starttime; msp->starttime = MD_ELEMENT(c)->element_time; - for (elind = 0; elind < c->elements->len; elind++) { + for (elind = 0; elind < MD_CONTAINER_LEN(c); elind++) { el = g_ptr_array_index(c->elements, elind); node = NULL; @@ -347,7 +347,7 @@ This applies completely across the file, including track changes etc. >>code - unsigned long t; + ticktime_t t; t = el->element_time - msp->starttime; //if (t != msp->lasttime) { diff -rNu melys-0.1.5/files/midiread.c melys-0.1.6/files/midiread.c --- melys-0.1.5/files/midiread.c Wed Nov 24 22:54:58 1999 +++ melys-0.1.6/files/midiread.c Mon Nov 29 10:47:57 1999 @@ -46,7 +46,7 @@ int chunk_size; /* Size of current chunk */ int chunk_count; /* Count within current chunk */ GPtrArray *notes; /* Currently on notes */ - unsigned long track_duration; /* Track duration */ + ticktime_t track_duration; /* Track duration */ struct tempomapElement *tempo_map; /* The tempo map */ struct headElement *head; /* Pointer into head element */ @@ -301,7 +301,7 @@ } restart: - for (i = 0; i < msp->notes->len; i++) { + for (i = 0; i < (int)msp->notes->len; i++) { struct noteElement *ns; ns = g_ptr_array_index(msp->notes, i); msp->device = MD_ELEMENT(ns)->device_channel; diff -rNu melys-0.1.5/files/midiread.m melys-0.1.6/files/midiread.m --- melys-0.1.5/files/midiread.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/files/midiread.m Sat Nov 27 11:43:22 1999 @@ -77,7 +77,7 @@ int chunk_size; /* Size of current chunk */ int chunk_count; /* Count within current chunk */ GPtrArray *notes; /* Currently on notes */ - unsigned long track_duration; /* Track duration */ + ticktime_t track_duration; /* Track duration */ struct tempomapElement *tempo_map; /* The tempo map */ struct headElement *head; /* Pointer into head element */ @@ -315,7 +315,7 @@ } restart: - for (i = 0; i < msp->notes->len; i++) { + for (i = 0; i < (int)msp->notes->len; i++) { struct noteElement *ns; ns = g_ptr_array_index(msp->notes, i); msp->device = MD_ELEMENT(ns)->device_channel; diff -rNu melys-0.1.5/files/midiwrite.c melys-0.1.6/files/midiwrite.c --- melys-0.1.5/files/midiwrite.c Wed Nov 24 22:54:59 1999 +++ melys-0.1.6/files/midiwrite.c Mon Nov 29 10:47:58 1999 @@ -35,7 +35,7 @@ int track_start; /* Offset at the start of the track */ int out_offset; /* Current write offset */ int prev_status; /* Previous status byte */ - int prev_time; /* Previous time */ + ticktime_t prev_time; /* Previous time */ int port; /* Current output port */ int flags; /* File format flags */ struct rootElement *root; /* Pointer to the root */ @@ -58,8 +58,8 @@ static void put_var(struct midiwstate *msp, int val); static void put_data(struct midiwstate *msp, guint8 *data, int length); static gint noteoff_cmp(gconstpointer item1, gconstpointer item2); -static void run_queue(struct midiwstate *msp, unsigned long time); -static void put_program(struct midiwstate *msp, int chan, unsigned long time, +static void run_queue(struct midiwstate *msp, ticktime_t time); +static void put_program(struct midiwstate *msp, int chan, ticktime_t time, int program); static void put_prologue(struct midiwstate *msp, struct trackElement *track); @@ -101,7 +101,7 @@ midi_write(struct File *file, FILE *fp, struct rootElement *root) { struct midiwstate *msp; - unsigned long inittime; + ticktime_t inittime; msp = g_new0(struct midiwstate, 1); msp->file = file; @@ -377,7 +377,7 @@ put_int_at(struct midiwstate *msp, int n, int pos, int val) { - g_return_if_fail(pos < msp->out->len); + g_return_if_fail(pos < (int)msp->out->len); set_int(msp->out->data+pos, n, val); } @@ -560,7 +560,7 @@ * time - Dequeue events at and before this time */ static void -run_queue(struct midiwstate *msp, unsigned long time) +run_queue(struct midiwstate *msp, ticktime_t time) { GSList *litem; @@ -603,7 +603,7 @@ * program - The MD program number */ static void -put_program(struct midiwstate *msp, int chan, unsigned long time, int program) +put_program(struct midiwstate *msp, int chan, ticktime_t time, int program) { if (program > 127) { diff -rNu melys-0.1.5/files/midiwrite.m melys-0.1.6/files/midiwrite.m --- melys-0.1.5/files/midiwrite.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/files/midiwrite.m Sat Nov 27 11:50:52 1999 @@ -31,7 +31,7 @@ int track_start; /* Offset at the start of the track */ int out_offset; /* Current write offset */ int prev_status; /* Previous status byte */ - int prev_time; /* Previous time */ + ticktime_t prev_time; /* Previous time */ int port; /* Current output port */ int flags; /* File format flags */ struct rootElement *root; /* Pointer to the root */ @@ -76,7 +76,7 @@ Write the md tree as a midi file to the specified file stream. >>code struct midiwstate *msp; - unsigned long inittime; + ticktime_t inittime; msp = g_new0(struct midiwstate, 1); msp->file = file; @@ -348,7 +348,7 @@ This is only used to re-writing the track size. >>code - g_return_if_fail(pos < msp->out->len); + g_return_if_fail(pos < (int)msp->out->len); set_int(msp->out->data+pos, n, val); @@ -509,7 +509,7 @@ >>function run_queue static void struct midiwstate *msp; Midi write state -unsigned long time; Dequeue events at and before this time +ticktime_t time; Dequeue events at and before this time >>description Run the queue of pending events that need to be pushed out before @@ -550,7 +550,7 @@ static void struct midiwstate *msp; Midi write state int chan; Channel for this change -unsigned long time; Time for change +ticktime_t time; Time for change int program; The MD program number >>description diff -rNu melys-0.1.5/help/C/Makefile melys-0.1.6/help/C/Makefile --- melys-0.1.5/help/C/Makefile Sat Nov 20 16:46:38 1999 +++ melys-0.1.6/help/C/Makefile Mon Nov 29 10:25:15 1999 @@ -10,7 +10,7 @@ DIR = $(HELPINSTDIR)/$(LOCALEDIR) # The source files -SGMLFILES = melys.sgml menus.sgml track.sgml piano.sgml +SGMLFILES = melys.sgml menus.sgml track.sgml piano.sgml tempo.sgml # Stuff that gets created and needs removing. diff -rNu melys-0.1.5/help/C/html/melys.html melys-0.1.6/help/C/html/melys.html --- melys-0.1.5/help/C/html/melys.html Wed Nov 24 22:55:19 1999 +++ melys-0.1.6/help/C/html/melys.html Mon Nov 29 10:48:37 1999 @@ -175,13 +175,41 @@ >
Accessing a piano roll view
Editing in the piano roll view
4. Tempo map view
The tempo map view
Accessing a tempo view
Editing in the tempomap view
 Next
The piano roll view

This is a very traditional piano roll view.

This is a very traditional piano roll view. + A piano keyboard is down the left hand side and rectangles + representing the notes are on the right hand pane. + The ruler across the top shows the bars. +

When you open a view, the scrollbars are adjusted to show the + highest pitched note at the top of the display.

Accessing a piano roll view

Right click on a track in the track information - display. +> You can open a piano roll view on a complete track + or for a single part in a track. + You can have as many views open as you like, on the same or + different tracks, or the same or different parts. + + Right click on a track in the track information + display or a part in the part display. This will bring up a menu, from which you should select . A new notebook page will be opened containing the notes - for that track. - - It will also be possible to display just a single part - in the future. + for that track or part. The view can be placed into its own window by dragging on the appropriate notebook tab and dropping it outside of Melys.

If a piano view for a part is displayed then you can only + see notes that start within that part. + Notes that start before will not be visible even if they extend + when playing into the part. + When the song is playing, the play position pointer will become + visible when the part being viewed is playing, just as you + would expect. +

There is no way to close a view just yet, the close option in the menu closes the whole song. @@ -113,7 +137,7 @@ >

Zooming

Clicking and holding down a zoom button - will cause the zooming to occur continuously.

Editing in the piano roll view

Editing is designed to be consistant throughout Melys once +> Editing is designed to be consistent throughout Melys once you know how to edit in the track view, you should find that editing notes is very similar. - - Not everything will be finished until version 0.2.0. - so some things will just not work yet. - + The following sections describe what is implemented so far.

Selecting notes

Moving notes

Notes can be moved by dragging them with the left mouse button. Hold down the shift key when releasing the mouse - button.

If several notes are selected and you drag one of them, then all + the selected notes will move together. + So it is possible to, for example, select all the notes of a chord + and transpose them together or change their timing. + +

Copying notes

Notes can be copied by dragging them with the left + mouse button. + Hold down the control key when releasing the mouse button. + It is possible to copy several notes at once by selecting them + first. + See the previous section on + moving notes + for more details.

 Next Tempo map viewTempo map view
Melys User's Guide
Prev 

Chapter 4. Tempo map view

This chapter deals with the tempo map view of Melys. + In this view you can +

  • Modify the tempo of the song. +

  • Add new tempo changes. +

It works like the other main views in Melys, there is a ruler + across the top showing bar lines and a scale in beats per minute (bpm) + down the side. + You can scale the view in either direction using the magnifying glass + buttons.

You can have several tempo map views open at the same time, + although this is mostly pointless. + Changes made in one view will be reflected in all other open + views.

The tempo map view

Accessing a tempo view

Right click on the track information pane of the main + track view. + Then select + Tempomap view from the menu. + It does not matter which track you click on as there is just + the one tempomap for the song.

Editing in the tempomap view

Note: There needs to be a better way to do some of these + things. + +

Each tempo change is represented by a little square. + These are connected by a line, the horizontal line shows the + current tempo at that time. + The scale at the left is in beats per minute, from zero up to a + thousand BPM. +

Changing the tempo

At present the way to change the tempo is to drag the square + representing the tempo change to another place, hold down the shift + key before dropping it. + You can change the time of the change as well by this method. +

Adding a new tempo change

At present the way to add a new tempo change is to copy an existing + one using drag and drop. + Click and drag on an existing tempo change square + (there will always be one at the beginning at least) + and hold down the control key when releasing the mouse button. + A new tempo change will be created at the drop point. +

Copying/moving a set of tempo changes

You can select a number of tempo changes by control-clicking them. + Then, just like on all the other views, if you drag one one of the + selected changes, all the selected changes will be moved or + copied as a unit. +

PrevHome 
Piano roll view  
\ No newline at end of file diff -rNu melys-0.1.5/help/C/melys.sgml melys-0.1.6/help/C/melys.sgml --- melys-0.1.5/help/C/melys.sgml Sat Nov 20 16:46:39 1999 +++ melys-0.1.6/help/C/melys.sgml Mon Nov 29 10:25:15 1999 @@ -9,6 +9,7 @@ + ] > @@ -52,5 +53,6 @@ &MENUS-CHAPTER; &TRACK-CHAPTER; &PIANO-CHAPTER; +&TEMPO-CHAPTER; diff -rNu melys-0.1.5/help/C/piano.sgml melys-0.1.6/help/C/piano.sgml --- melys-0.1.5/help/C/piano.sgml Sat Nov 20 16:46:39 1999 +++ melys-0.1.6/help/C/piano.sgml Thu Nov 25 15:21:25 1999 @@ -18,24 +18,40 @@ The piano roll view This is a very traditional piano roll view. + A piano keyboard is down the left hand side and rectangles + representing the notes are on the right hand pane. + The ruler across the top shows the bars. + + When you open a view, the scrollbars are adjusted to show the + highest pitched note at the top of the display. Accessing a piano roll view + You can open a piano roll view on a complete track + or for a single part in a track. + You can have as many views open as you like, on the same or + different tracks, or the same or different parts. + Right click on a track in the track information - display. + display or a part in the part display. This will bring up a menu, from which you should select + If a piano view for a part is displayed then you can only + see notes that start within that part. + Notes that start before will not be visible even if they extend + when playing into the part. + When the song is playing, the play position pointer will become + visible when the part being viewed is playing, just as you + would expect. + There is no way to close a view just yet, the close option in the menu closes the whole song. @@ -47,19 +63,16 @@ You can zoom in both the horizontal and vertical directions. Clicking and holding down a zoom button - will cause the zooming to occur continuously. + will cause the zooming to occur continuously until you release the + button. Editing in the piano roll view - Editing is designed to be consistant throughout &mel; once + Editing is designed to be consistent throughout &mel; once you know how to edit in the track view, you should find that editing notes is very similar. - - - Not everything will be finished until version 0.2.0. - so some things will just not work yet. - + The following sections describe what is implemented so far. Selecting notes @@ -69,11 +82,29 @@ By holding down the control key while selecting you can select more than one note. - + Moving notes Notes can be moved by dragging them with the left mouse button. Hold down the shift key when releasing the mouse button. + + If several notes are selected and you drag one of them, then all + the selected notes will move together. + So it is possible to, for example, select all the notes of a chord + and transpose them together or change their timing. + + + Copying notes + + Notes can be copied by dragging them with the left + mouse button. + Hold down the control key when releasing the mouse button. + It is possible to copy several notes at once by selecting them + first. + See the previous section on + moving notes + for more details. + diff -rNu melys-0.1.5/help/C/tempo.sgml melys-0.1.6/help/C/tempo.sgml --- melys-0.1.5/help/C/tempo.sgml Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/help/C/tempo.sgml Mon Nov 29 10:25:15 1999 @@ -0,0 +1,77 @@ + +Tempo map view + + + This chapter deals with the tempo map view of &mel;. + In this view you can + + + + Modify the tempo of the song. + + + Add new tempo changes. + + + + It works like the other main views in &mel;, there is a ruler + across the top showing bar lines and a scale in beats per minute (bpm) + down the side. + You can scale the view in either direction using the magnifying glass + buttons. + + + You can have several tempo map views open at the same time, + although this is mostly pointless. + Changes made in one view will be reflected in all other open + views. + + + The tempo map view + + + Accessing a tempo view + + Right click on the track information pane of the main + track view. + Then select + + Editing in the tempomap view + + + Note: There needs to be a better way to do some of these + things. + + + Each tempo change is represented by a little square. + These are connected by a line, the horizontal line shows the + current tempo at that time. + The scale at the left is in beats per minute, from zero up to a + thousand BPM. + + Changing the tempo + + At present the way to change the tempo is to drag the square + representing the tempo change to another place, hold down the shift + key before dropping it. + You can change the time of the change as well by this method. + + Adding a new tempo change + + At present the way to add a new tempo change is to copy an existing + one using drag and drop. + Click and drag on an existing tempo change square + (there will always be one at the beginning at least) + and hold down the control key when releasing the mouse button. + A new tempo change will be created at the drop point. + + Copying/moving a set of tempo changes + + You can select a number of tempo changes by control-clicking them. + Then, just like on all the other views, if you drag one one of the + selected changes, all the selected changes will be moved or + copied as a unit. diff -rNu melys-0.1.5/help/C/track.sgml melys-0.1.6/help/C/track.sgml --- melys-0.1.5/help/C/track.sgml Mon Oct 25 13:34:02 1999 +++ melys-0.1.6/help/C/track.sgml Thu Nov 25 15:21:36 1999 @@ -15,7 +15,7 @@ the track view. The track menu diff -rNu melys-0.1.5/include/elements.h melys-0.1.6/include/elements.h --- melys-0.1.5/include/elements.h Wed Nov 24 22:54:44 1999 +++ melys-0.1.6/include/elements.h Mon Nov 29 10:47:34 1999 @@ -30,7 +30,7 @@ struct element { struct containerElement *con; /* Containing element */ union un_time { - unsigned long tick; + ticktime_t tick; struct real_time { long tv_sec; long tv_nsec; @@ -54,8 +54,8 @@ struct containerElement { struct element parent; GPtrArray *elements; /* List of elements */ - guint32 duration; /* duration time for this container */ - guint32 max_duration; /* duration including note lengths */ + ticktime_t duration; /* duration time for this container */ + ticktime_t max_duration; /* duration including note lengths */ }; #define MD_CONTAINER(e) \ ((struct containerElement *)MD_CHECK_CAST((struct element *)(e), MD_TYPE_CONTAINER)) @@ -324,7 +324,7 @@ struct textElement *md_text_new(int type, char *text); struct smpteoffsetElement *md_smpteoffset_new(short hours, short minutes, short seconds, short frames, short subframes); -struct noopElement *md_noop_new(unsigned long time); +struct noopElement *md_noop_new(ticktime_t 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); diff -rNu melys-0.1.5/include/md.h melys-0.1.6/include/md.h --- melys-0.1.5/include/md.h Wed Nov 24 22:54:44 1999 +++ melys-0.1.6/include/md.h Mon Nov 29 10:47:34 1999 @@ -39,8 +39,8 @@ void md_merge_in(struct containerElement *ctrk, struct containerElement *list, enum merge_mode mode); void merge_in_elem(struct containerElement *ctrk, struct element *el); -void md_ensure_parts(struct containerElement *ctrk, unsigned long begin, - unsigned long end); +void md_ensure_parts(struct containerElement *ctrk, ticktime_t begin, + ticktime_t end); int md_get_nfree(void); struct element *md_copy(struct element *e); @@ -60,7 +60,7 @@ struct element *md_list_nth_elem(struct containerElement *c, int n); struct element *md_list_next(struct containerElement *c, struct element *el); struct element *md_list_find_by_time(struct containerElement *ctrk, - unsigned long time); + ticktime_t time); void md_save_elem(struct containerElement *c, struct element *el); struct element *md_copy(struct element *e); @@ -71,13 +71,13 @@ void md_seq_end(struct sequenceState *seq); struct element *md_seq_next(struct sequenceState *seq); void md_elem_seek(struct sequenceState *seq, struct tracklikeElement *ltrack, - unsigned long time); + ticktime_t time); void md_elem_seek_back(struct sequenceState *seq, - struct tracklikeElement *ltrack, unsigned long time); + struct tracklikeElement *ltrack, ticktime_t time); struct element *md_copy(struct element *e); -struct partElement *md_split(struct partElement *origpart, unsigned long t); +struct partElement *md_split(struct partElement *origpart, ticktime_t t); void md_part_join(struct containerElement *c, struct partElement *part1); struct element *md_copy(struct element *e); @@ -103,7 +103,7 @@ void md_undo_op(struct undo_set *undo, enum undo_op op, struct containerElement *c, struct element *el); void md_undo_time_op(struct undo_set *undo, enum undo_op op, - struct element *el, unsigned long t); + struct element *el, ticktime_t t); void md_undo_back(struct undo_set *undo); void md_undo_forward(struct undo_set *undo); struct element *md_copy(struct element *e); @@ -114,7 +114,7 @@ */ #define MD_TYPE(el) ( ((struct element *)(el))->type) #define MD_TIME(el) ( ((struct element *)(el))->element_time) -#define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) +#define MD_DURATION(el) ( MD_CONTAINER(el)->duration ) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) @@ -133,8 +133,10 @@ #define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed) #define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE) #define MD_UNDO(el) NULL /* XXX */ +#define MD_TEMPO_TO_BPM(ut) ((double)60000000 / (ut)) +#define MD_BPM_TO_TEMPO(bpm) ((double) 60000000 / (bpm)) -#define MD_CONTAINER_LEN(c) ( ((struct containerElement *)c)->elements->len) +#define MD_CONTAINER_LEN(c) ( (int)((struct containerElement *)c)->elements->len) #define MD_GET_INDEX(c, i) \ ( (struct element *)((struct containerElement *)c)->elements->pdata[i]) #define MD_TRACK_NUMBER(trk) ( ((struct tracklikeElement *)trk)->number) @@ -203,22 +205,23 @@ void md_walk(struct containerElement *c, walkFunc fn, void *arg, int flags); struct rootElement *md_empty(void); struct rootElement *md_song_new(void); +ticktime_t md_get_duration(struct element *el); struct trackElement *md_track_nth(struct rootElement *root, int n); void md_ensure_track(struct rootElement *root, int n); struct tempomapElement *md_get_tempomap(struct rootElement *root); void md_set_devchan(struct element *base, int devchan); void md_set_program(struct containerElement *base, int program, gboolean clear); -void md_change_time(struct element *el, unsigned long t); +void md_change_time(struct element *el, ticktime_t t); void md_clear_all_mod(struct element *base); void md_clear_data(struct element *base); void md_clear_all_sel_by_type(struct element *base, int type); GSList *md_build_sel(GSList *list, struct element *base, int type); void md_shrink(struct rootElement *root); -void md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, +void md_tick_to_mbt(struct tempomapElement *tempomap, ticktime_t tick, struct mbt *mbtp); -unsigned long md_mbt_to_tick(struct tempomapElement *tempomap, +ticktime_t md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp); -unsigned long md_snap_tick(struct tempomapElement *tmap, unsigned long tick, +ticktime_t md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, int snap); struct element *md_copy(struct element *e); diff -rNu melys-0.1.5/include/melyskeys.h melys-0.1.6/include/melyskeys.h --- melys-0.1.5/include/melyskeys.h Wed Nov 24 22:54:45 1999 +++ melys-0.1.6/include/melyskeys.h Mon Nov 29 10:47:35 1999 @@ -21,29 +21,33 @@ typedef struct _MelysKeysClass MelysKeysClass; + /* * State for each key on the board. */ struct keystate { GtkObject *item; /* The canvas item */ + GtkObject *label; /* Some keys have a label */ }; #define NKEYS 128 /* The number of keys */ #define WHITE_LEN 60 /* The length of a white key */ #define BLACK_LEN 36 /* The length of a black key */ #define MELYS_KEYS_WIDTH 80 /* The width of the widget */ +#define TEXT_OFF 64 + +#define NLABELS ((NKEYS+12)/12) + +#include "melysscroll.h" /* * The MelysKeys structure. Each instance of the class is * allocated one of these structures. */ struct _MelysKeys { - GnomeCanvas gnome_canvas; - - ViewControl *vcp; /* Vertical control for this view */ - - int voffset; /* Previous vertical offset */ + MelysScroll melys_scroll; + int highlight; /* The highlighted key */ struct keystate keys[NKEYS]; /* Individual key state */ }; @@ -53,9 +57,10 @@ */ struct _MelysKeysClass { GnomeCanvasClass parent_class; - // XXX class definition here + + void (*key_pressed)(MelysKeys *, int); }; guint melys_keys_get_type(void); GtkWidget *melys_keys_new(ViewControl *vcp); -void melys_keys_set_control(MelysKeys *mkeys, ViewControl *vcp); +void melys_keys_highlight(GtkWidget *mview, int thing, gpointer _mkeys); diff -rNu melys-0.1.5/include/melyspos.h melys-0.1.6/include/melyspos.h --- melys-0.1.5/include/melyspos.h Wed Nov 24 22:54:46 1999 +++ melys-0.1.6/include/melyspos.h Mon Nov 29 10:47:35 1999 @@ -36,7 +36,7 @@ int sig_id; /* Connection to posadj */ - unsigned long lasttime; + ticktime_t lasttime; }; struct _MelysPosClass { diff -rNu melys-0.1.5/include/melysrule.h melys-0.1.6/include/melysrule.h --- melys-0.1.5/include/melysrule.h Wed Nov 24 22:54:46 1999 +++ melys-0.1.6/include/melysrule.h Mon Nov 29 10:47:36 1999 @@ -32,6 +32,7 @@ ViewControl *vcp; /* Horizontal adj for this rule */ int hoffset; /* Previous horizontal adjustment */ + int hbase; /* Zero point base TEMP XXX */ struct tempomapElement *tempomap; }; diff -rNu melys-0.1.5/include/melysscale.h melys-0.1.6/include/melysscale.h --- melys-0.1.5/include/melysscale.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/include/melysscale.h Mon Nov 29 10:47:36 1999 @@ -0,0 +1,51 @@ +/* + * + * 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 intended for vertical scales of limited range. + * + * + */ + +#define MELYS_SCALE(obj) GTK_CHECK_CAST(obj, melys_scale_get_type(), MelysScale) +#define MELYS_SCALE_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_scale_get_type(), MelysScaleClass) +#define IS_MELYS_SCALE(obj) GTK_CHECK_TYPE(obj, melys_scale_get_type()) + +typedef struct _MelysScale MelysScale; +typedef struct _MelysScaleClass MelysScaleClass; + + +/* + * The MelysScale structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysScale { + MelysScroll melys_scroll; + + int low; + int high; + int step; + + GSList *itemlist; +}; + +/* + * The MelysScaleClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysScaleClass { + MelysScrollClass parent_class; + // XXX class definition here +}; + +guint melys_scale_get_type(void); +GtkWidget *melys_scale_new(ViewControl *vcp, int low, int high, int step); diff -rNu melys-0.1.5/include/melysscroll.h melys-0.1.6/include/melysscroll.h --- melys-0.1.5/include/melysscroll.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/include/melysscroll.h Mon Nov 29 10:47:36 1999 @@ -0,0 +1,62 @@ +/* + * + * 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. + * + */ + +#define MELYS_SCROLL(obj) GTK_CHECK_CAST(obj, melys_scroll_get_type(), MelysScroll) +#define MELYS_SCROLL_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_scroll_get_type(), MelysScrollClass) +#define IS_MELYS_SCROLL(obj) GTK_CHECK_TYPE(obj, melys_scroll_get_type()) + +typedef struct _MelysScroll MelysScroll; +typedef struct _MelysScrollClass MelysScrollClass; + + +/* + * The MelysScroll structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysScroll { + GnomeCanvas gnome_canvas; + + ViewControl *vcp; /* Controls for this view */ + + /* Dimentions for if the widget does not scroll in one direction */ + int width; + int height; + + /* Previous offsets */ + int voffset; /* Previous veritcal offset */ + int hoffset; /* Previous horizontal offset */ + + /* Base offset of zero point */ + int hbase; + + int which; /* Whether vertical or horizontal (or both) */ +}; + +/* + * The MelysScrollClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysScrollClass { + GnomeCanvasClass parent_class; + + /* A scale change */ + void (*scale_changed)(MelysScroll *); +}; + +guint melys_scroll_get_type(void); +GtkWidget *melys_scroll_new(ViewControl *vcp, int which, int width, + int height); +void melys_scroll_set_control(MelysScroll *mscroll, ViewControl *vcp, + int which, int width, int height); diff -rNu melys-0.1.5/include/melystempo.h melys-0.1.6/include/melystempo.h --- melys-0.1.5/include/melystempo.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/include/melystempo.h Mon Nov 29 10:47:36 1999 @@ -0,0 +1,48 @@ +/* + * + * 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. + * + * + * + * + * + */ + +#define MELYS_TEMPO(obj) GTK_CHECK_CAST(obj, melys_tempo_get_type(), MelysTempo) +#define MELYS_TEMPO_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_tempo_get_type(), MelysTempoClass) +#define IS_MELYS_TEMPO(obj) GTK_CHECK_TYPE(obj, melys_tempo_get_type()) + +typedef struct _MelysTempo MelysTempo; +typedef struct _MelysTempoClass MelysTempoClass; + + +/* + * The MelysTempo structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysTempo { + MelysView melys_view; + + GtkObject *lines; /* The lines connecting the changes */ +}; + +/* + * The MelysTempoClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysTempoClass { + MelysViewClass parent_class; + // XXX class definition here +}; + +guint melys_tempo_get_type(void); +GtkWidget *melys_tempo_new(struct tempomapElement *tmap); diff -rNu melys-0.1.5/include/melystrackdisplay.h melys-0.1.6/include/melystrackdisplay.h --- melys-0.1.5/include/melystrackdisplay.h Wed Nov 24 22:54:46 1999 +++ melys-0.1.6/include/melystrackdisplay.h Mon Nov 29 10:47:36 1999 @@ -78,7 +78,7 @@ /* Saved click position and state information */ struct partElement *click_part; /* Part that was click on */ - unsigned long click_tick; /* Clicked tick position */ + ticktime_t click_tick; /* Clicked tick position */ struct trackElement *click_track; /* Clicked track */ int click_ntrack; /* Clicked track position */ enum click_state click_state; /* mouse state */ diff -rNu melys-0.1.5/include/melystrackinfo.h melys-0.1.6/include/melystrackinfo.h --- melys-0.1.5/include/melystrackinfo.h Wed Nov 24 22:54:46 1999 +++ melys-0.1.6/include/melystrackinfo.h Mon Nov 29 10:47:36 1999 @@ -98,3 +98,4 @@ struct rootElement *root); void melys_track_info_update(MelysTrackInfo *minfo); char *get_info_string(MelysTrackInfo *minfo, int itype, int ntrack); +void create_piano(struct song *song, struct containerElement *con); diff -rNu melys-0.1.5/include/melysview.h melys-0.1.6/include/melysview.h --- melys-0.1.5/include/melysview.h Wed Nov 24 22:54:47 1999 +++ melys-0.1.6/include/melysview.h Mon Nov 29 10:47:37 1999 @@ -70,6 +70,7 @@ GtkWidget *ruler; /* A ruler that can be used */ GtkWidget *posline; /* Song position pointer */ //GtkWidget *menu; /* The item context menu */ + /* For the posline */ void *points; @@ -79,12 +80,15 @@ /* Button click state */ int click_state; struct element *click_elem; /* Element clicked on */ - unsigned long click_tick; /* Time at point of click */ + ticktime_t click_tick; /* Time at point of click */ /* The 'thing' is not necessarily the immediate parent of click_elem */ /* although it usually will be and it will be an ancestor */ int click_nthing; /* The y position */ struct containerElement *click_base; /* Thing at y position */ + + int mouse_tick; /* Last mouse tick position */ + int mouse_thing; /* Last mouse thing position */ }; /* @@ -94,14 +98,15 @@ struct _MelysViewClass { GtkVBoxClass parent_class; + /* Signals */ void (*scale_changed)(MelysView *); + /* Mouse moved */ + void (*thing_position)(MelysView *, int); + void (*tick_position)(MelysView *, int); /* Method to get the base containing element */ struct containerElement *(*get_base_from_pos)(MelysView *, int thing); - /* Method to get the container to drop into */ - //struct containerElement *(*get_drop_con_from_pos)(MelysView *, int thing); - /* Drop element */ gboolean (*drop_elem)(MelysView *, struct element *, int thing); @@ -120,5 +125,6 @@ guint melys_view_get_type(void); +void view_display_info_free(gpointer _dinfo); void melys_view_set_song(MelysView *mview, struct song *song); int melys_view_item_event(GtkObject *item, GdkEvent *event, gpointer data); diff -rNu melys-0.1.5/include/seqlib.h melys-0.1.6/include/seqlib.h --- melys-0.1.5/include/seqlib.h Wed Nov 24 22:54:42 1999 +++ melys-0.1.6/include/seqlib.h Mon Nov 29 10:47:32 1999 @@ -79,7 +79,7 @@ void seq_timer_stop(seq_context_t *ctxp); void seq_timer_continue(seq_context_t *ctxp); void seq_control_timer(seq_context_t *ctxp, int onoff); -unsigned long seq_get_time(seq_context_t *ctxp); +ticktime_t seq_get_time(seq_context_t *ctxp); int seq_write(seq_context_t *ctxp, snd_seq_event_t *ep); int seq_control_write(seq_context_t *ctxp, snd_seq_event_t *ep); snd_seq_event_t *seq_read(seq_context_t *ctxp); @@ -111,7 +111,7 @@ void seq_midi_sysex(seq_context_t *ctxp, snd_seq_event_t *ep, int status, unsigned char *data, int length); void seq_midi_echo(seq_context_t *ctxp, snd_seq_event_t *ep, int val); -void seq_midi_send_echo(seq_context_t *ctxp, unsigned long time, int type); +void seq_midi_send_echo(seq_context_t *ctxp, ticktime_t time, int type); struct rootElement; int seq_get_ports_from_desc(char *portdesc, snd_seq_addr_t **addrp); diff -rNu melys-0.1.5/include/util.h melys-0.1.6/include/util.h --- melys-0.1.5/include/util.h Wed Nov 24 22:54:44 1999 +++ melys-0.1.6/include/util.h Mon Nov 29 10:47:34 1999 @@ -42,13 +42,16 @@ /* Useful macros */ /* The number of elements in an array */ -#define NELEM(a) ( sizeof(a)/ sizeof((a)[0])) +#define NELEM(a) ((int)( sizeof(a)/ sizeof((a)[0]))) /* End of an array for use in loops */ #define ENDOF(a) ((a) + NELEM(a)) /* Typedef for the affine transformations */ typedef double affine_t[6]; + +/* Typedef for times */ +typedef long ticktime_t; #ifdef DEBUG /* diff -rNu melys-0.1.5/include/viewcontrol.h melys-0.1.6/include/viewcontrol.h --- melys-0.1.5/include/viewcontrol.h Wed Nov 24 22:54:48 1999 +++ melys-0.1.6/include/viewcontrol.h Mon Nov 29 10:47:37 1999 @@ -26,6 +26,14 @@ typedef struct _ViewControlClass ViewControlClass; +/* Scrolling directions */ +enum scroll_dir { + VC_HORIZONTAL = 0x01, + VC_VERTICAL = 0x02, + VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) +}; + + struct _ViewControl { GtkObject object; @@ -71,6 +79,8 @@ ViewControl *view_control_new(void); void view_control_set_vertical(ViewControl *vcp, int vscale); void view_control_set_horizontal(ViewControl *vcp, int hscale); +void view_control_set_range(ViewControl *vcp, int which, gfloat lower, + gfloat upper); void view_control_set_limits(ViewControl *vcp, int hmin, int hmax, int vmin, int vmax); int view_control_x_to_tick(ViewControl *vcp, int xpix); diff -rNu melys-0.1.5/md/elements.c melys-0.1.6/md/elements.c --- melys-0.1.5/md/elements.c Wed Nov 24 22:54:59 1999 +++ melys-0.1.6/md/elements.c Mon Nov 29 10:47:59 1999 @@ -1066,7 +1066,7 @@ * Create and initialise a noop element. */ struct noopElement * -md_noop_new(unsigned long time) +md_noop_new(ticktime_t time) { struct noopElement * e; diff -rNu melys-0.1.5/md/elements.m melys-0.1.6/md/elements.m --- melys-0.1.5/md/elements.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/md/elements.m Sat Nov 27 11:43:22 1999 @@ -44,7 +44,7 @@ >>elementdef element struct containerElement *con; /* Containing element */ union un_time { - unsigned long tick; + ticktime_t tick; struct real_time { long tv_sec; long tv_nsec; @@ -82,8 +82,8 @@ */ >>elementdef container element GPtrArray *elements; /* List of elements */ - guint32 duration; /* duration time for this container */ - guint32 max_duration; /* duration including note lengths */ + ticktime_t duration; /* duration time for this container */ + ticktime_t max_duration; /* duration including note lengths */ init e->elements = g_ptr_array_new(); @@ -365,7 +365,7 @@ * one to be created. */ >>elementdef noop element -new unsigned long time +new ticktime_t time MD_TIME(e) = time; diff -rNu melys-0.1.5/md/mdadd.c melys-0.1.6/md/mdadd.c --- melys-0.1.5/md/mdadd.c Wed Nov 24 22:55:00 1999 +++ melys-0.1.6/md/mdadd.c Mon Nov 29 10:48:00 1999 @@ -46,9 +46,9 @@ void md_add_elem(struct containerElement *c, struct element *el, int sort) { - unsigned long endtime; - unsigned long max_time; - unsigned long t; + ticktime_t endtime; + ticktime_t max_time; + ticktime_t t; g_assert(el->con == NULL); if (el->floating) @@ -183,7 +183,7 @@ if (el->type >= MD_CONTAINER_BEGIN) { c = (struct containerElement *)el; - for (i = 0; i < c->elements->len; i++) { + for (i = 0; i < MD_CONTAINER_LEN(c); i++) { ep = g_ptr_array_index(c->elements, i); md_free(ep); } @@ -388,13 +388,13 @@ * end - End time */ void -md_ensure_parts(struct containerElement *ctrk, unsigned long begin, - unsigned long end) +md_ensure_parts(struct containerElement *ctrk, ticktime_t begin, + ticktime_t end) { struct containerElement *con; struct containerElement *cnext; struct element *el; - unsigned long end2; + ticktime_t end2; el = md_list_first(ctrk); if (el && !iscontainer(el)) diff -rNu melys-0.1.5/md/mdadd.m melys-0.1.6/md/mdadd.m --- melys-0.1.5/md/mdadd.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/md/mdadd.m Sat Nov 27 11:43:22 1999 @@ -51,9 +51,9 @@ Event is appended or sorted into its correct position. >>code - unsigned long endtime; - unsigned long max_time; - unsigned long t; + ticktime_t endtime; + ticktime_t max_time; + ticktime_t t; g_assert(el->con == NULL); if (el->floating) @@ -190,7 +190,7 @@ if (el->type >= MD_CONTAINER_BEGIN) { c = (struct containerElement *)el; - for (i = 0; i < c->elements->len; i++) { + for (i = 0; i < MD_CONTAINER_LEN(c); i++) { ep = g_ptr_array_index(c->elements, i); md_free(ep); } @@ -405,8 +405,8 @@ >>function md_ensure_parts void struct containerElement *ctrk; -unsigned long begin; Begin time -unsigned long end; End time +ticktime_t begin; Begin time +ticktime_t end; End time >>description Ensure that there are part containers allocated from the times @@ -418,7 +418,7 @@ struct containerElement *con; struct containerElement *cnext; struct element *el; - unsigned long end2; + ticktime_t end2; el = md_list_first(ctrk); if (el && !iscontainer(el)) diff -rNu melys-0.1.5/md/mdconv.c melys-0.1.6/md/mdconv.c --- melys-0.1.5/md/mdconv.c Wed Nov 24 22:55:00 1999 +++ melys-0.1.6/md/mdconv.c Mon Nov 29 10:48:00 1999 @@ -121,11 +121,8 @@ tnum = el->device_channel % MAX_0_TRACKS; maxtnum = MAX(tnum, maxtnum); - MD_REF(el); - md_remove(con, el); + el->con = NULL; /* Note: not yet removed from con */ md_add(MD_CONTAINER(parts[tnum]), el); - i--; - MD_UNREF(el); } md_ensure_track(root, maxtnum - 1); @@ -229,8 +226,8 @@ MD_UNREF(track->program); MD_REF(prg); track->program = prg; - md_remove(MD_CONTAINER(part), el); - ind--; + /* md_remove(MD_CONTAINER(part), el); */ + /* ind--; */ break; } } diff -rNu melys-0.1.5/md/mdconv.m melys-0.1.6/md/mdconv.m --- melys-0.1.5/md/mdconv.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/md/mdconv.m Mon Nov 29 08:41:49 1999 @@ -115,11 +115,8 @@ tnum = el->device_channel % MAX_0_TRACKS; maxtnum = MAX(tnum, maxtnum); - MD_REF(el); - md_remove(con, el); + el->con = NULL; /* Note: not yet removed from con */ md_add(MD_CONTAINER(parts[tnum]), el); - i--; - MD_UNREF(el); } md_ensure_track(root, maxtnum - 1); @@ -226,8 +223,8 @@ MD_UNREF(track->program); MD_REF(prg); track->program = prg; - md_remove(MD_CONTAINER(part), el); - ind--; + /* md_remove(MD_CONTAINER(part), el); */ + /* ind--; */ break; } } diff -rNu melys-0.1.5/md/mdlist.c melys-0.1.6/md/mdlist.c --- melys-0.1.5/md/mdlist.c Wed Nov 24 22:55:00 1999 +++ melys-0.1.6/md/mdlist.c Mon Nov 29 10:48:00 1999 @@ -61,11 +61,11 @@ g_return_val_if_fail(el != NULL, 0); g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ - for (n = 0; n < c->elements->len; n++) { + for (n = 0; n < MD_CONTAINER_LEN(c); n++) { p = c->elements->pdata[n]; if (p == NULL) { /* This was the one we have just added, add */ - g_assert(n == c->elements->len - 1); /* check it was */ + g_assert(n == (int)c->elements->len - 1); /* check it was */ c->elements->pdata[n] = el; return n; } else if (MD_TIME(p) == MD_TIME(el)) { @@ -175,9 +175,9 @@ { int n; - for (n = 0; n < c->elements->len; n++) { + for (n = 0; n < MD_CONTAINER_LEN(c); n++) { if (c->elements->pdata[n] == el) { - if (n < c->elements->len - 1) + if (n < MD_CONTAINER_LEN(c) - 1) return c->elements->pdata[n+1]; break; } @@ -197,7 +197,7 @@ * time - Find container that covers this element */ struct element * -md_list_find_by_time(struct containerElement *ctrk, unsigned long time) +md_list_find_by_time(struct containerElement *ctrk, ticktime_t time) { struct element *el; int n; diff -rNu melys-0.1.5/md/mdlist.m melys-0.1.6/md/mdlist.m --- melys-0.1.5/md/mdlist.m Fri Nov 12 18:23:36 1999 +++ melys-0.1.6/md/mdlist.m Sat Nov 27 11:43:22 1999 @@ -55,11 +55,11 @@ g_return_val_if_fail(el != NULL, 0); g_ptr_array_add(c->elements, NULL); /* Ensure enough space */ - for (n = 0; n < c->elements->len; n++) { + for (n = 0; n < MD_CONTAINER_LEN(c); n++) { p = c->elements->pdata[n]; if (p == NULL) { /* This was the one we have just added, add */ - g_assert(n == c->elements->len - 1); /* check it was */ + g_assert(n == (int)c->elements->len - 1); /* check it was */ c->elements->pdata[n] = el; return n; } else if (MD_TIME(p) == MD_TIME(el)) { @@ -169,9 +169,9 @@ >>code int n; - for (n = 0; n < c->elements->len; n++) { + for (n = 0; n < MD_CONTAINER_LEN(c); n++) { if (c->elements->pdata[n] == el) { - if (n < c->elements->len - 1) + if (n < MD_CONTAINER_LEN(c) - 1) return c->elements->pdata[n+1]; break; } @@ -182,7 +182,7 @@ >>function md_list_find_by_time struct element * struct containerElement *ctrk; A track like container -unsigned long time; Find container that covers this element +ticktime_t time; Find container that covers this element >>description Find the container that encompases the given time. diff -rNu melys-0.1.5/md/mdseq.c melys-0.1.6/md/mdseq.c --- melys-0.1.5/md/mdseq.c Wed Nov 24 22:55:00 1999 +++ melys-0.1.6/md/mdseq.c Mon Nov 29 10:48:01 1999 @@ -28,7 +28,7 @@ struct trackinfo { struct tracklikeElement *ltrack; /* The associated track */ GXStack *stack; /* The position stack */ - long time; /* Time of last found element on this track */ + ticktime_t time; /* Time of last found element on this track */ struct element *lastelem; /* Last element returned */ gboolean need_next; /* Need to step onto next element */ int istrack:1; /* Is this really a track, (not tempomap) */ @@ -333,7 +333,7 @@ if (pos->pos < 0) { el = MD_ELEMENT(pos->con); next = 1; - } else if (pos->pos >= pos->con->elements->len) { + } else if (pos->pos >= MD_CONTAINER_LEN(pos->con)) { /* Do not pop the initial track element */ if (MD_TYPE(pos->con) == MD_TYPE_TRACK) return NULL; @@ -365,7 +365,7 @@ */ void md_elem_seek(struct sequenceState *seq, struct tracklikeElement *ltrack, - unsigned long time) + ticktime_t time) { struct pos pos; struct pos *posp; @@ -422,7 +422,7 @@ */ void md_elem_seek_back(struct sequenceState *seq, struct tracklikeElement *ltrack, - unsigned long time) + ticktime_t time) { struct pos *posp; struct trackinfo *ti; diff -rNu melys-0.1.5/md/mdseq.m melys-0.1.6/md/mdseq.m --- melys-0.1.5/md/mdseq.m Tue Oct 19 22:58:49 1999 +++ melys-0.1.6/md/mdseq.m Sat Nov 27 11:50:52 1999 @@ -21,7 +21,7 @@ struct trackinfo { struct tracklikeElement *ltrack; /* The associated track */ GXStack *stack; /* The position stack */ - long time; /* Time of last found element on this track */ + ticktime_t time; /* Time of last found element on this track */ struct element *lastelem; /* Last element returned */ gboolean need_next; /* Need to step onto next element */ int istrack:1; /* Is this really a track, (not tempomap) */ @@ -335,7 +335,7 @@ if (pos->pos < 0) { el = MD_ELEMENT(pos->con); next = 1; - } else if (pos->pos >= pos->con->elements->len) { + } else if (pos->pos >= MD_CONTAINER_LEN(pos->con)) { /* Do not pop the initial track element */ if (MD_TYPE(pos->con) == MD_TYPE_TRACK) return NULL; @@ -364,7 +364,7 @@ void struct sequenceState *seq; struct tracklikeElement *ltrack; -unsigned long time; +ticktime_t time; >>description Set the play pointer stack on the specifed track so that the next @@ -424,7 +424,7 @@ void struct sequenceState *seq; struct tracklikeElement *ltrack; -unsigned long time; +ticktime_t time; >>description Seek to the specified time as in diff -rNu melys-0.1.5/md/mdtools.c melys-0.1.6/md/mdtools.c --- melys-0.1.5/md/mdtools.c Wed Nov 24 22:55:01 1999 +++ melys-0.1.6/md/mdtools.c Mon Nov 29 10:48:01 1999 @@ -38,7 +38,7 @@ * t - The time to split it at */ struct partElement * -md_split(struct partElement *origpart, unsigned long t) +md_split(struct partElement *origpart, ticktime_t t) { struct partElement *newpart; struct element *el; @@ -94,7 +94,7 @@ { struct partElement *part2; struct element *el; - unsigned long endtime; + ticktime_t endtime; int i; part2 = NULL; diff -rNu melys-0.1.5/md/mdtools.m melys-0.1.6/md/mdtools.m --- melys-0.1.5/md/mdtools.m Sun Nov 14 19:29:36 1999 +++ melys-0.1.6/md/mdtools.m Sat Nov 27 11:43:22 1999 @@ -18,7 +18,7 @@ >>function md_split struct partElement * struct partElement *origpart; The part to split -unsigned long t; The time to split it at +ticktime_t t; The time to split it at >>description Split a part at a specified time. @@ -90,7 +90,7 @@ >>code struct partElement *part2; struct element *el; - unsigned long endtime; + ticktime_t endtime; int i; part2 = NULL; diff -rNu melys-0.1.5/md/mdundo.c melys-0.1.6/md/mdundo.c --- melys-0.1.5/md/mdundo.c Wed Nov 24 22:55:01 1999 +++ melys-0.1.6/md/mdundo.c Mon Nov 29 10:48:02 1999 @@ -93,7 +93,7 @@ */ void md_undo_time_op(struct undo_set *undo, enum undo_op op, struct element *el, - unsigned long t) + ticktime_t t) { } diff -rNu melys-0.1.5/md/mdundo.m melys-0.1.6/md/mdundo.m --- melys-0.1.5/md/mdundo.m Thu Oct 14 12:05:09 1999 +++ melys-0.1.6/md/mdundo.m Sat Nov 27 11:43:22 1999 @@ -83,7 +83,7 @@ struct undo_set *undo; The undo set for the element enum undo_op op; Operation performed struct element *el; Element that was added/removed/changed -unsigned long t; The time difference to apply +ticktime_t t; The time difference to apply >>description Save an time based operation (duration, diff -rNu melys-0.1.5/md/mdutil.c melys-0.1.6/md/mdutil.c --- melys-0.1.5/md/mdutil.c Wed Nov 24 22:55:01 1999 +++ melys-0.1.6/md/mdutil.c Mon Nov 29 10:48:02 1999 @@ -28,8 +28,8 @@ /* Static functions */ -static void set_diff_time(struct element *base, unsigned long tdiff); -static void mbtoffset(struct timesigElement *tsig, unsigned long tdiff, +static void set_diff_time(struct element *base, ticktime_t tdiff); +static void mbtoffset(struct timesigElement *tsig, ticktime_t tdiff, int timebase, struct mbt *mbtp); @@ -53,7 +53,7 @@ { struct element *el; GPtrArray *ar; - int i; + unsigned i; if (flags == 0) flags = MD_WALK_ALL; @@ -133,6 +133,24 @@ return root; } +ticktime_t +md_get_duration(struct element *el) +{ + + if (iscontainer(el)) + return MD_CONTAINER(el)->duration; + else switch (MD_TYPE(el)) { + case MD_TYPE_NOTE: + return MD_NOTE(el)->length; + case MD_TYPE_TEMPO: + return 400; + default: + g_warning("Unexpected element type %d for md_get_duration", MD_TYPE(el)); + break; + } + return 0; +} + /* * Get the nth track of the composition. Track numbers start at * 0. Routine assumes that tempomap is at position 1 and that @@ -143,7 +161,7 @@ { GPtrArray *p; struct trackElement *track = NULL; - int idx; + unsigned idx; if (n < 0 || root == NULL) return NULL; @@ -275,10 +293,10 @@ * t - The time to change to. */ void -md_change_time(struct element *el, unsigned long t) +md_change_time(struct element *el, ticktime_t t) { struct undo_set *undo; - unsigned long tdiff; + ticktime_t tdiff; undo = MD_UNDO(el); @@ -291,7 +309,7 @@ /* */ static void -set_diff_time(struct element *base, unsigned long tdiff) +set_diff_time(struct element *base, ticktime_t tdiff) { int i; struct element *el; @@ -412,7 +430,7 @@ { struct trackElement *track; struct element *epart; - long dur, max_track, max_part; + ticktime_t dur, max_track, max_part; int i; int j; @@ -444,13 +462,13 @@ * mbtp - Meters, beats and ticks return value */ void -md_tick_to_mbt(struct tempomapElement *tempomap, unsigned long tick, +md_tick_to_mbt(struct tempomapElement *tempomap, ticktime_t tick, struct mbt *mbtp) { struct timesigElement *lasttsig; struct timesigElement *tsig; struct mapElement *map; - unsigned long t; + ticktime_t t; int i; int count; @@ -497,15 +515,15 @@ * tempomap - the tempomap * inmbtp - Meters, beats and ticks input value */ -unsigned long +ticktime_t md_mbt_to_tick(struct tempomapElement *tempomap, struct mbt *inmbtp) { struct timesigElement *lasttsig; struct timesigElement *tsig; struct mapElement *map; struct mbt mbt; - unsigned long t; - unsigned long full; + ticktime_t t; + ticktime_t full; int i; int count; @@ -550,8 +568,8 @@ return t; } -unsigned long -md_snap_tick(struct tempomapElement *tmap, unsigned long tick, int snap) +ticktime_t +md_snap_tick(struct tempomapElement *tmap, ticktime_t tick, int snap) { struct mbt mbt; @@ -578,7 +596,7 @@ * mbtp - output as meters, beats and ticks */ static void -mbtoffset(struct timesigElement *tsig, unsigned long tdiff, int timebase, +mbtoffset(struct timesigElement *tsig, ticktime_t tdiff, int timebase, struct mbt *mbtp) { int full; diff -rNu melys-0.1.5/md/mdutil.m melys-0.1.6/md/mdutil.m --- melys-0.1.5/md/mdutil.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/md/mdutil.m Sat Nov 27 11:50:52 1999 @@ -23,7 +23,7 @@ */ #define MD_TYPE(el) ( ((struct element *)(el))->type) #define MD_TIME(el) ( ((struct element *)(el))->element_time) -#define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) +#define MD_DURATION(el) ( MD_CONTAINER(el)->duration ) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) @@ -42,8 +42,10 @@ #define MD_IS_DESTROYED(el) ( ((struct element *)el)->destroyed) #define iscontainer(el) ( (MD_TYPE(el) >= MD_CONTAINER_BEGIN)? TRUE: FALSE) #define MD_UNDO(el) NULL /* XXX */ +#define MD_TEMPO_TO_BPM(ut) ((double)60000000 / (ut)) +#define MD_BPM_TO_TEMPO(bpm) ((double) 60000000 / (bpm)) -#define MD_CONTAINER_LEN(c) ( ((struct containerElement *)c)->elements->len) +#define MD_CONTAINER_LEN(c) ( (int)((struct containerElement *)c)->elements->len) #define MD_GET_INDEX(c, i) \ ( (struct element *)((struct containerElement *)c)->elements->pdata[i]) #define MD_TRACK_NUMBER(trk) ( ((struct tracklikeElement *)trk)->number) @@ -131,7 +133,7 @@ >>code struct element *el; GPtrArray *ar; - int i; + unsigned i; if (flags == 0) flags = MD_WALK_ALL; @@ -213,6 +215,25 @@ return root; +>>function md_get_duration +ticktime_t +struct element *el; + +>>code + + if (iscontainer(el)) + return MD_CONTAINER(el)->duration; + else switch (MD_TYPE(el)) { + case MD_TYPE_NOTE: + return MD_NOTE(el)->length; + case MD_TYPE_TEMPO: + return 400; + default: + g_warning("Unexpected element type %d for @func_name", MD_TYPE(el)); + break; + } + return 0; + >>function md_track_nth struct trackElement * struct rootElement *root; @@ -227,7 +248,7 @@ >>code GPtrArray *p; struct trackElement *track = NULL; - int idx; + unsigned idx; if (n < 0 || root == NULL) return NULL; @@ -363,7 +384,7 @@ >>function md_change_time void struct element *el; The element to change time -unsigned long t; The time to change to. +ticktime_t t; The time to change to. >>description Change the time in such a way that it can be undone again. @@ -374,7 +395,7 @@ >>code struct undo_set *undo; - unsigned long tdiff; + ticktime_t tdiff; undo = MD_UNDO(el); @@ -387,7 +408,7 @@ >>function set_diff_time static void struct element *base; -unsigned long tdiff; +ticktime_t tdiff; >>description >>code @@ -526,7 +547,7 @@ >>code struct trackElement *track; struct element *epart; - long dur, max_track, max_part; + ticktime_t dur, max_track, max_part; int i; int j; @@ -551,7 +572,7 @@ >>function md_tick_to_mbt void struct tempomapElement *tempomap; the tempomap -unsigned long tick; Input time +ticktime_t tick; Input time struct mbt *mbtp; Meters, beats and ticks return value >>description @@ -561,7 +582,7 @@ struct timesigElement *lasttsig; struct timesigElement *tsig; struct mapElement *map; - unsigned long t; + ticktime_t t; int i; int count; @@ -602,7 +623,7 @@ >>function md_mbt_to_tick -unsigned long +ticktime_t struct tempomapElement *tempomap; the tempomap struct mbt *inmbtp; Meters, beats and ticks input value @@ -614,8 +635,8 @@ struct timesigElement *tsig; struct mapElement *map; struct mbt mbt; - unsigned long t; - unsigned long full; + ticktime_t t; + ticktime_t full; int i; int count; @@ -661,9 +682,9 @@ >>function md_snap_tick -unsigned long +ticktime_t struct tempomapElement *tmap; The tempomap -unsigned long tick; The tick value to snap +ticktime_t tick; The tick value to snap int snap; The boundry to snap to >>code @@ -682,7 +703,7 @@ >>function mbtoffset static void struct timesigElement *tsig; an individual time signature element -unsigned long tdiff; the time difference from begining of tsig in ticks +ticktime_t tdiff; the time difference from begining of tsig in ticks int timebase; Beats per quarter note struct mbt *mbtp; output as meters, beats and ticks diff -rNu melys-0.1.5/midi/play.c melys-0.1.6/midi/play.c --- melys-0.1.5/midi/play.c Wed Nov 24 22:55:08 1999 +++ melys-0.1.6/midi/play.c Mon Nov 29 10:48:18 1999 @@ -358,7 +358,7 @@ #elif defined(SND_SEQ_IOCTL_RESET_POOL) { snd_seq_reset_pool_t reset; - unsigned long now; + ticktime_t now; int i; static int warned; @@ -404,8 +404,8 @@ void play_unmute(struct play *play, struct trackElement *track) { - unsigned long now; - unsigned long ahead; + ticktime_t now; + ticktime_t ahead; dprintf1("midi play unmute\n"); now = seq_get_time(play->ctxp); @@ -416,7 +416,7 @@ snd_seq_remove_events_t fqueue; snd_seq_addr_t *addr; struct trackElement *t; - unsigned long t2; + ticktime_t t2; int dev; int chan; int n; @@ -517,7 +517,7 @@ { struct element *el = NULL; int status = 0; - unsigned long end; + ticktime_t end; debug_pool(play); @@ -654,7 +654,7 @@ play_pos_cb(gpointer data) { struct play *play = data; - unsigned long t; + ticktime_t t; t = seq_get_time(play->ctxp); diff -rNu melys-0.1.5/midi/play.m melys-0.1.6/midi/play.m --- melys-0.1.5/midi/play.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/midi/play.m Sat Nov 27 11:43:22 1999 @@ -351,7 +351,7 @@ #elif defined(SND_SEQ_IOCTL_RESET_POOL) { snd_seq_reset_pool_t reset; - unsigned long now; + ticktime_t now; int i; static int warned; @@ -400,8 +400,8 @@ struct trackElement *track; >>code - unsigned long now; - unsigned long ahead; + ticktime_t now; + ticktime_t ahead; dprintf1("midi play unmute\n"); now = seq_get_time(play->ctxp); @@ -412,7 +412,7 @@ snd_seq_remove_events_t fqueue; snd_seq_addr_t *addr; struct trackElement *t; - unsigned long t2; + ticktime_t t2; int dev; int chan; int n; @@ -518,7 +518,7 @@ >>code struct element *el = NULL; int status = 0; - unsigned long end; + ticktime_t end; debug_pool(play); @@ -654,7 +654,7 @@ >>code struct play *play = data; - unsigned long t; + ticktime_t t; t = seq_get_time(play->ctxp); diff -rNu melys-0.1.5/midi/record.c melys-0.1.6/midi/record.c --- melys-0.1.5/midi/record.c Wed Nov 24 22:55:08 1999 +++ melys-0.1.6/midi/record.c Mon Nov 29 10:48:18 1999 @@ -224,7 +224,7 @@ * are just copies pointing to the real saved note events, so * we just have to adjust the duration. */ - for (i = 0; i < track->notes->len; i++) { + for (i = 0; i < (int)track->notes->len; i++) { el = (struct element *)g_ptr_array_index(track->notes, i); MD_NOTE(el)->length = endtime - el->element_time; } diff -rNu melys-0.1.5/midi/record.m melys-0.1.6/midi/record.m --- melys-0.1.5/midi/record.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/midi/record.m Sat Nov 27 11:43:23 1999 @@ -202,7 +202,7 @@ * are just copies pointing to the real saved note events, so * we just have to adjust the duration. */ - for (i = 0; i < track->notes->len; i++) { + for (i = 0; i < (int)track->notes->len; i++) { el = (struct element *)g_ptr_array_index(track->notes, i); MD_NOTE(el)->length = endtime - el->element_time; } diff -rNu melys-0.1.5/programs/Makefile melys-0.1.6/programs/Makefile --- melys-0.1.5/programs/Makefile Wed Nov 24 22:54:55 1999 +++ melys-0.1.6/programs/Makefile Mon Nov 29 10:47:51 1999 @@ -58,6 +58,8 @@ ../widgets/melysrule.o ../widgets/melyspos.o \ ../widgets/viewcontrol.o ../widgets/melysview.o \ ../widgets/melyspiano.o ../widgets/melyskeys.o \ + ../widgets/melystempo.o ../widgets/melysscale.o \ + ../widgets/melysscroll.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ diff -rNu melys-0.1.5/programs/melplay.c melys-0.1.6/programs/melplay.c --- melys-0.1.5/programs/melplay.c Wed Nov 24 22:55:10 1999 +++ melys-0.1.6/programs/melplay.c Mon Nov 29 10:48:21 1999 @@ -231,7 +231,7 @@ struct rootElement *root; struct sequenceState *seq; struct element *el; - unsigned long end; + ticktime_t end; snd_seq_event_t *ep; struct File *file; @@ -326,7 +326,7 @@ continue; for (port = 0; port < sysinfo.ports; port++) { - int cap; + unsigned cap; err = snd_seq_get_any_port_info(handle, client, port, &pinfo); if (err < 0) diff -rNu melys-0.1.5/programs/melplay.m melys-0.1.6/programs/melplay.m --- melys-0.1.5/programs/melplay.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/programs/melplay.m Sat Nov 27 11:43:23 1999 @@ -226,7 +226,7 @@ struct rootElement *root; struct sequenceState *seq; struct element *el; - unsigned long end; + ticktime_t end; snd_seq_event_t *ep; struct File *file; @@ -323,7 +323,7 @@ continue; for (port = 0; port < sysinfo.ports; port++) { - int cap; + unsigned cap; err = snd_seq_get_any_port_info(handle, client, port, &pinfo); if (err < 0) diff -rNu melys-0.1.5/programs/melys.m melys-0.1.6/programs/melys.m --- melys-0.1.5/programs/melys.m Wed Nov 24 22:50:42 1999 +++ melys-0.1.6/programs/melys.m Mon Nov 29 08:42:18 1999 @@ -32,6 +32,8 @@ >>make --objects ../widgets/melysrule.o ../widgets/melyspos.o >>make --objects ../widgets/viewcontrol.o ../widgets/melysview.o >>make --objects ../widgets/melyspiano.o ../widgets/melyskeys.o +>>make --objects ../widgets/melystempo.o ../widgets/melysscale.o +>>make --objects ../widgets/melysscroll.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header diff -rNu melys-0.1.5/seq/seqlib.c melys-0.1.6/seq/seqlib.c --- melys-0.1.5/seq/seqlib.c Wed Nov 24 22:54:56 1999 +++ melys-0.1.6/seq/seqlib.c Mon Nov 29 10:47:53 1999 @@ -311,7 +311,7 @@ snd_seq_addr_t addr; GArray *list; int ret = 0; - int i; + unsigned i; list = get_addr_list(ctxp, inout); if (!list) @@ -380,7 +380,7 @@ if (!list) return -EINVAL; - for (i = 0; i < list->len; i++) { + for (i = 0; i < (int)list->len; i++) { addr = g_array_index(list, snd_seq_addr_t, i); @@ -426,7 +426,7 @@ list = get_addr_list(ctxp, inout); - if (dev >= list->len) + if (dev >= (int)list->len) return NULL; addr = &g_array_index(list, snd_seq_addr_t, dev); @@ -616,7 +616,7 @@ /* * Get the current song time in ticks. */ -unsigned long +ticktime_t seq_get_time(seq_context_t *ctxp) { diff -rNu melys-0.1.5/seq/seqlib.m melys-0.1.6/seq/seqlib.m --- melys-0.1.5/seq/seqlib.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/seq/seqlib.m Sat Nov 27 11:43:23 1999 @@ -354,7 +354,7 @@ snd_seq_addr_t addr; GArray *list; int ret = 0; - int i; + unsigned i; list = get_addr_list(ctxp, inout); if (!list) @@ -424,7 +424,7 @@ if (!list) return -EINVAL; - for (i = 0; i < list->len; i++) { + for (i = 0; i < (int)list->len; i++) { addr = g_array_index(list, snd_seq_addr_t, i); @@ -470,7 +470,7 @@ list = get_addr_list(ctxp, inout); - if (dev >= list->len) + if (dev >= (int)list->len) return NULL; addr = &g_array_index(list, snd_seq_addr_t, dev); @@ -654,7 +654,7 @@ >>function seq_get_time -unsigned long +ticktime_t seq_context_t *ctxp; >>description Get the current song time in ticks. diff -rNu melys-0.1.5/seq/seqmidi.c melys-0.1.6/seq/seqmidi.c --- melys-0.1.5/seq/seqmidi.c Wed Nov 24 22:54:57 1999 +++ melys-0.1.6/seq/seqmidi.c Mon Nov 29 10:47:54 1999 @@ -319,7 +319,7 @@ * type - A piece of data that will be placed in the event */ void -seq_midi_send_echo(seq_context_t *ctxp, unsigned long time, int type) +seq_midi_send_echo(seq_context_t *ctxp, ticktime_t time, int type) { snd_seq_event_t ev; union un_time t; diff -rNu melys-0.1.5/seq/seqmidi.m melys-0.1.6/seq/seqmidi.m --- melys-0.1.5/seq/seqmidi.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/seq/seqmidi.m Sat Nov 27 11:43:23 1999 @@ -271,7 +271,7 @@ >>function seq_midi_send_echo void seq_context_t *ctxp; Application context -unsigned long time; Time of event +ticktime_t time; Time of event int type; A piece of data that will be placed in the event >>description Send an echo event back to the source client at the specified time. diff -rNu melys-0.1.5/util/util.m melys-0.1.6/util/util.m --- melys-0.1.5/util/util.m Sun Sep 26 20:53:58 1999 +++ melys-0.1.6/util/util.m Sat Nov 27 11:43:23 1999 @@ -19,13 +19,16 @@ /* Useful macros */ /* The number of elements in an array */ -#define NELEM(a) ( sizeof(a)/ sizeof((a)[0])) +#define NELEM(a) ((int)( sizeof(a)/ sizeof((a)[0]))) /* End of an array for use in loops */ #define ENDOF(a) ((a) + NELEM(a)) /* Typedef for the affine transformations */ typedef double affine_t[6]; + +/* Typedef for times */ +typedef long ticktime_t; #ifdef DEBUG /* diff -rNu melys-0.1.5/version melys-0.1.6/version --- melys-0.1.5/version Wed Nov 24 22:54:23 1999 +++ melys-0.1.6/version Mon Nov 29 10:47:17 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.5" +#define MELYS_VERSION_STRING "0.1.6" diff -rNu melys-0.1.5/widgets/.cvsignore melys-0.1.6/widgets/.cvsignore --- melys-0.1.5/widgets/.cvsignore Wed Nov 24 22:54:54 1999 +++ melys-0.1.6/widgets/.cvsignore Mon Nov 29 10:47:49 1999 @@ -3,6 +3,9 @@ melyspiano.c melyspos.c melysrule.c +melysscale.c +melysscroll.c +melystempo.c melystrack.c melystrackdisplay.c melystrackinfo.c diff -rNu melys-0.1.5/widgets/Makefile melys-0.1.6/widgets/Makefile --- melys-0.1.5/widgets/Makefile Wed Nov 24 22:54:54 1999 +++ melys-0.1.6/widgets/Makefile Mon Nov 29 10:47:49 1999 @@ -9,6 +9,9 @@ melyspiano.o \ melyspos.o \ melysrule.o \ + melysscale.o \ + melysscroll.o \ + melystempo.o \ melystrack.o \ melystrackdisplay.o \ melystrackinfo.o \ @@ -22,6 +25,9 @@ melyspiano.c \ melyspos.c \ melysrule.c \ + melysscale.c \ + melysscroll.c \ + melystempo.c \ melystrack.c \ melystrackdisplay.c \ melystrackinfo.c \ @@ -35,6 +41,9 @@ ../include/melyspiano.h \ ../include/melyspos.h \ ../include/melysrule.h \ + ../include/melysscale.h \ + ../include/melysscroll.h \ + ../include/melystempo.h \ ../include/melystrack.h \ ../include/melystrackdisplay.h \ ../include/melystrackinfo.h \ @@ -83,6 +92,7 @@ melysview.o: ../include/viewcontrol.h melysview.o: ../include/melysrule.h melysview.o: ../include/melwidgets.h +melysview.o: ../include/melysscroll.h melysview.o: ../include/song.h melysview.o: ../include/melysview.h melysview.o: ../include/meldnd.h @@ -93,9 +103,13 @@ melyspiano.o: ../include/melysview.h melyspiano.o: ../include/melyskeys.h melyspiano.o: ../include/melyspiano.h +melystransport.o: ../include/melystransport.h register.o: ../include/melreg.h -melyskeys.o: ../include/viewcontrol.h -melyskeys.o: ../include/melyskeys.h +melysscale.o: ../include/viewcontrol.h +melysscale.o: ../include/melysscroll.h +melysscale.o: ../include/melysscale.h +melysscroll.o: ../include/viewcontrol.h +melysscroll.o: ../include/melysscroll.h melyspartitem.o: ../include/elements.h melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h @@ -128,9 +142,11 @@ melystrackinfo.o: ../include/viewcontrol.h melystrackinfo.o: ../include/melysview.h melystrackinfo.o: ../include/melyspiano.h +melystrackinfo.o: ../include/melystempo.h melystrackinfo.o: ../include/melystrackinfo.h melystrackinfo.o: ../include/melystrack.h -melystransport.o: ../include/melystransport.h +melyskeys.o: ../include/viewcontrol.h +melyskeys.o: ../include/melyskeys.h melyspos.o: ../include/elements.h melyspos.o: ../include/md.h melyspos.o: ../include/melyspos.h @@ -144,3 +160,13 @@ melystrack.o: ../include/melystrackinfo.h melystrack.o: ../include/melystrackdisplay.h melystrack.o: ../include/melystrack.h +melystempo.o: ../include/viewcontrol.h +melystempo.o: ../include/melysscroll.h +melystempo.o: ../include/melysview.h +melystempo.o: ../include/melysscale.h +melystempo.o: ../include/melysrule.h +melystempo.o: ../include/melwidgets.h +melystempo.o: ../include/elements.h +melystempo.o: ../include/md.h +melystempo.o: ../include/song.h +melystempo.o: ../include/melystempo.h diff -rNu melys-0.1.5/widgets/melyskeys.c melys-0.1.6/widgets/melyskeys.c --- melys-0.1.5/widgets/melyskeys.c Wed Nov 24 22:55:04 1999 +++ melys-0.1.6/widgets/melyskeys.c Mon Nov 29 10:48:08 1999 @@ -20,6 +20,7 @@ #include "gtk/gtksignal.h" #include "libgnomeui/gnome-canvas.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "libgnomeui/gnome-canvas-text.h" #include "viewcontrol.h" #include "melyskeys.h" #include "intl.h" @@ -30,36 +31,45 @@ /* The list of signal id's that are being added for MelysKeys. */ enum { - // XXX symbols for all signals here - // will have piano key pressed + KEY_PRESSED, LAST_SIGNAL }; /* Argument numbers */ enum { ARG_0, - // XXX argument names go here }; /* Defines to scale between y-coords and key values */ #define y_to_key(mkeys, y) view_control_y_to_thing( \ - MELYS_KEYS(mkeys)->vcp, y) + MELYS_SCROLL(mkeys)->vcp, y) #define key_to_y(mkeys, key) view_control_thing_to_y( \ - MELYS_KEYS(mkeys)->vcp, key) - + MELYS_SCROLL(mkeys)->vcp, key) #define WHITE 0 #define BLACK 1 +/* Starting at C if you walk along the back of the keyboard + * this is the pattern that you get */ +static int ktype[] = { + WHITE, BLACK, WHITE, BLACK, WHITE, WHITE, + BLACK, WHITE, BLACK, WHITE, BLACK, WHITE, +}; + +/* Colours */ +#define COLOUR_WHITE 0xffffffff +#define COLOUR_WHITE_HL 0xf2f288ff +#define COLOUR_BLACK 0x000000ff +#define COLOUR_BLACK_HL 0xc0c070ff + /* Static functions */ static void melys_keys_init(MelysKeys *mkeys); static void melys_keys_class_init(MelysKeysClass *klass); -static void keys_scroll(GtkAdjustment *adj, gpointer data); -static void scale_changed(GtkObject *obj, gpointer data); +static void scale_changed(MelysScroll *mscroll); -static GnomeCanvasClass *parent_class = NULL; +static MelysScrollClass *parent_class = NULL; static gint melys_keys_signals[LAST_SIGNAL]; @@ -83,7 +93,7 @@ (GtkClassInitFunc) NULL, }; - mtype = gtk_type_unique(gnome_canvas_get_type(), &minfo); + mtype = gtk_type_unique(melys_scroll_get_type(), &minfo); } return mtype; @@ -97,8 +107,10 @@ { MelysKeys *mkeys = MELYS_KEYS(gtk_type_new(melys_keys_get_type())); - if (vcp) - melys_keys_set_control(mkeys, vcp); + g_return_val_if_fail(vcp, GTK_WIDGET(mkeys)); + + melys_scroll_set_control(MELYS_SCROLL(mkeys), vcp, + VC_VERTICAL, MELYS_KEYS_WIDTH, 0); return GTK_WIDGET(mkeys); } @@ -116,6 +128,7 @@ for (i = 0; i < NKEYS; i++) { mkeys->keys[i].item = NULL; + mkeys->keys[i].label = NULL; } } @@ -129,64 +142,24 @@ melys_keys_class_init(MelysKeysClass *klass) { GtkObjectClass *object_class; - GnomeCanvasClass *gnome_canvas_class; + MelysScrollClass *melys_scroll_class; object_class = (GtkObjectClass *)klass; - gnome_canvas_class = (GnomeCanvasClass *)klass; - - parent_class = gtk_type_class(gnome_canvas_get_type()); + melys_scroll_class = (MelysScrollClass *)klass; - // XXX Add args + parent_class = gtk_type_class(melys_scroll_get_type()); - // XXX Create signals + melys_keys_signals[KEY_PRESSED] = gtk_signal_new("key-pressed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysKeysClass, key_pressed), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT); gtk_object_class_add_signals(object_class, melys_keys_signals, LAST_SIGNAL); - // XXX all the overrides come here - - // XXX Our functions -} - -void -melys_keys_set_control(MelysKeys *mkeys, ViewControl *vcp) -{ - - if (vcp) { - if (mkeys->vcp) - gtk_object_unref((GtkObject *) mkeys->vcp); - mkeys->vcp = vcp; - gtk_object_ref((GtkObject *) vcp); - - gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", - scale_changed, mkeys); - gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", - GTK_SIGNAL_FUNC(keys_scroll), mkeys); - - scale_changed(GTK_OBJECT(vcp), mkeys); - } -} - -static void -keys_scroll(GtkAdjustment *adj, gpointer data) -{ - MelysKeys *mkeys = data; - GnomeCanvas *canvas; - int changed = 0; - - if (adj == mkeys->vcp->vadj) { - if ((int)adj->value != mkeys->voffset) { - changed = 1; - mkeys->voffset = (int)(adj->value + 0.5); - } - } - - - if (changed) { - - canvas = GNOME_CANVAS(mkeys); - - gnome_canvas_scroll_to(canvas, 0, mkeys->voffset * mkeys->vcp->vscale); - } + melys_scroll_class->scale_changed = scale_changed; } /* @@ -194,41 +167,28 @@ * keyboard so that the semitones are equally spaced. * * Arguments: - * obj - This is the view control - * data - Our own data + * mscroll - This is the view control */ static void -scale_changed(GtkObject *obj, gpointer data) +scale_changed(MelysScroll *mscroll) { - MelysKeys *mkeys = data; + MelysKeys *mkeys = MELYS_KEYS(mscroll); int len; int colour; double width; - int octpos; /* possition at octave */ + int octpos; /* position at octave */ int pos; int key; int nwhite; char *outline; - static int ktype[] = { - /* Starting at C if you walk along the back of the keyboard - * this is the pattern that you get */ - WHITE, BLACK, WHITE, BLACK, WHITE, WHITE, - BLACK, WHITE, BLACK, WHITE, BLACK, WHITE, - }; - - gtk_widget_set_usize(GTK_WIDGET(mkeys), MELYS_KEYS_WIDTH, 1); - gnome_canvas_set_scroll_region(GNOME_CANVAS(mkeys), - 0.0, 0.0, - MELYS_KEYS_WIDTH, - mkeys->vcp->vscale * NKEYS); + GnomeCanvasGroup *rgroup; + + rgroup = gnome_canvas_root(GNOME_CANVAS(mkeys)); nwhite = 0; octpos = 0; for (key = 0; key < NKEYS; key++) { if (mkeys->keys[key].item == NULL) { - GnomeCanvasGroup *rgroup; - - rgroup = gnome_canvas_root(GNOME_CANVAS(mkeys)); mkeys->keys[key].item = (GtkObject *)gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_RECT, @@ -238,8 +198,37 @@ } if ((key % 12) == 0) { - octpos = (NKEYS - key) * mkeys->vcp->vscale; + octpos = (NKEYS - key) * mscroll->vcp->vscale; nwhite = 0; + + /* + * Now add the labels for the octaves. We label each C key and + * we start at C0. Sometimes people start with C-2 or + * something strange. + */ + if (mkeys->keys[key].label == NULL) { + char *str; + + /* + * For the first time, we create the label + */ + str = g_strdup_printf("C%d", key/12); + mkeys->keys[key].label = (GtkObject*)gnome_canvas_item_new( + rgroup, GNOME_TYPE_CANVAS_TEXT, + "text", str, + "anchor", GTK_ANCHOR_SOUTH_WEST, + "font_gdk", GTK_WIDGET(mkeys)->style->font, + "fill_color_gdk", + >K_WIDGET(mkeys)->style->fg[GTK_STATE_NORMAL], + NULL); + g_free(str); + } + + /* Update the label position */ + gnome_canvas_item_set((GnomeCanvasItem *)mkeys->keys[key].label, + "x", (double) TEXT_OFF, + "y", (double) octpos + 4, + NULL); } if (ktype[key % 12] == WHITE) { @@ -247,8 +236,8 @@ * A white key has a width of 1/7 of an octave. */ len = WHITE_LEN; - width = ((double)mkeys->vcp->vscale*12 / 7); - colour = 0xffffffff; + width = ((double)mscroll->vcp->vscale*12 / 7); + colour = COLOUR_WHITE; outline = "black"; pos = octpos - nwhite * width + 0.5; nwhite++; @@ -257,16 +246,12 @@ * A black key has a width of 1/12 of an octave. */ len = BLACK_LEN; - width = mkeys->vcp->vscale; - colour = 0x000000ff; - outline = NULL; - pos = (NKEYS - key) * mkeys->vcp->vscale; + width = mscroll->vcp->vscale; + colour = COLOUR_BLACK; + outline = "black"; + pos = (NKEYS - key) * mscroll->vcp->vscale; } -if(key == 0) -colour = 0x33ffffff; -if(key == NKEYS-1) -colour = 0x33ffffff; gnome_canvas_item_set(GNOME_CANVAS_ITEM(mkeys->keys[key].item), "x2", (double) len, "y1", (double) pos - (int)(width+0.5), @@ -279,4 +264,52 @@ gnome_canvas_item_lower_to_bottom (GNOME_CANVAS_ITEM(mkeys->keys[key].item)); } +} + +/* + * This routine is designed to be connected to the + * "thing-position" signal of the melys_view. It will + * highlight the keys as you move the mouse around. + * + * Arguments: + * thing - The key to highlight + * _mkeys - This will be our widget + */ +void +melys_keys_highlight(GtkWidget *mview, int thing, gpointer _mkeys) +{ + MelysKeys *mkeys = _mkeys; + struct keystate *ksp; + int colour; + int key; + int oldkey; + + /* Reset old highlight */ + oldkey = mkeys->highlight; + ksp = &mkeys->keys[oldkey]; + if (ktype[oldkey % 12] == WHITE) + colour = COLOUR_WHITE; + else + colour = COLOUR_BLACK; + gnome_canvas_item_set((GnomeCanvasItem *) ksp->item, + "fill_color_rgba", colour, + NULL); + + /* We get thing as -1 if the mouse has left */ + if (thing < 0 || thing >= NKEYS) + return; + + key = NKEYS - 1 - thing; + + /* Set new hightlight */ + ksp = &mkeys->keys[key]; + if (ktype[key % 12] == WHITE) + colour = COLOUR_WHITE_HL; + else + colour = COLOUR_BLACK_HL; + gnome_canvas_item_set((GnomeCanvasItem *) ksp->item, + "fill_color_rgba", colour, + NULL); + + mkeys->highlight = key; } diff -rNu melys-0.1.5/widgets/melyskeys.m melys-0.1.6/widgets/melyskeys.m --- melys-0.1.5/widgets/melyskeys.m Wed Nov 24 22:43:52 1999 +++ melys-0.1.6/widgets/melyskeys.m Sun Nov 28 14:12:55 1999 @@ -15,36 +15,41 @@ >>header gtk/gtksignal.h >>header libgnomeui/gnome-canvas.h >>header libgnomeui/gnome-canvas-rect-ellipse.h +>>header libgnomeui/gnome-canvas-text.h >>header viewcontrol.h ->>gtkobject melys_keys gnome_canvas +>>gtkobject melys_keys melys_scroll >>headerdef @header + /* * State for each key on the board. */ struct keystate { GtkObject *item; /* The canvas item */ + GtkObject *label; /* Some keys have a label */ }; #define NKEYS 128 /* The number of keys */ #define WHITE_LEN 60 /* The length of a white key */ #define BLACK_LEN 36 /* The length of a black key */ #define MELYS_KEYS_WIDTH 80 /* The width of the widget */ +#define TEXT_OFF 64 + +#define NLABELS ((NKEYS+12)/12) + +#include "melysscroll.h" /* * The MelysKeys structure. Each instance of the class is * allocated one of these structures. */ struct _MelysKeys { - GnomeCanvas gnome_canvas; - - ViewControl *vcp; /* Vertical control for this view */ - - int voffset; /* Previous vertical offset */ + MelysScroll melys_scroll; + int highlight; /* The highlighted key */ struct keystate keys[NKEYS]; /* Individual key state */ }; @@ -54,30 +59,46 @@ */ struct _MelysKeysClass { GnomeCanvasClass parent_class; - // XXX class definition here + + void (*key_pressed)(MelysKeys *, int); }; >>extern /* The list of signal id's that are being added for MelysKeys. */ enum { - // XXX symbols for all signals here - // will have piano key pressed + KEY_PRESSED, LAST_SIGNAL }; /* Argument numbers */ enum { ARG_0, - // XXX argument names go here }; /* Defines to scale between y-coords and key values */ #define y_to_key(mkeys, y) view_control_y_to_thing( \ - MELYS_KEYS(mkeys)->vcp, y) + MELYS_SCROLL(mkeys)->vcp, y) #define key_to_y(mkeys, key) view_control_thing_to_y( \ - MELYS_KEYS(mkeys)->vcp, key) + MELYS_SCROLL(mkeys)->vcp, key) + +>>extern +#define WHITE 0 +#define BLACK 1 + +/* Starting at C if you walk along the back of the keyboard + * this is the pattern that you get */ +static int ktype[] = { + WHITE, BLACK, WHITE, BLACK, WHITE, WHITE, + BLACK, WHITE, BLACK, WHITE, BLACK, WHITE, +}; + +/* Colours */ +#define COLOUR_WHITE 0xffffffff +#define COLOUR_WHITE_HL 0xf2f288ff +#define COLOUR_BLACK 0x000000ff +#define COLOUR_BLACK_HL 0xc0c070ff >>function melys_keys_new @@ -89,11 +110,14 @@ >>code MelysKeys *mkeys = MELYS_KEYS(gtk_type_new(melys_keys_get_type())); - if (vcp) - melys_keys_set_control(mkeys, vcp); + g_return_val_if_fail(vcp, GTK_WIDGET(mkeys)); + + melys_scroll_set_control(MELYS_SCROLL(mkeys), vcp, + VC_VERTICAL, MELYS_KEYS_WIDTH, 0); return GTK_WIDGET(mkeys); + >>function melys_keys_init static void MelysKeys *mkeys; The MelysKeys to init @@ -104,6 +128,7 @@ for (i = 0; i < NKEYS; i++) { mkeys->keys[i].item = NULL; + mkeys->keys[i].label = NULL; } @@ -116,80 +141,29 @@ >>code GtkObjectClass *object_class; - GnomeCanvasClass *gnome_canvas_class; + MelysScrollClass *melys_scroll_class; object_class = (GtkObjectClass *)klass; - gnome_canvas_class = (GnomeCanvasClass *)klass; - - parent_class = gtk_type_class(gnome_canvas_get_type()); + melys_scroll_class = (MelysScrollClass *)klass; - // XXX Add args + parent_class = gtk_type_class(melys_scroll_get_type()); - // XXX Create signals + melys_keys_signals[KEY_PRESSED] = gtk_signal_new("key-pressed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysKeysClass, key_pressed), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT); gtk_object_class_add_signals(object_class, melys_keys_signals, LAST_SIGNAL); - // XXX all the overrides come here - - // XXX Our functions - - ->>function melys_keys_set_control -void -MelysKeys *mkeys; -ViewControl *vcp; - ->>code - - if (vcp) { - if (mkeys->vcp) - gtk_object_unref((GtkObject *) mkeys->vcp); - mkeys->vcp = vcp; - gtk_object_ref((GtkObject *) vcp); - - gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", - scale_changed, mkeys); - gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", - GTK_SIGNAL_FUNC(keys_scroll), mkeys); - - scale_changed(GTK_OBJECT(vcp), mkeys); - } - - ->>function keys_scroll -static void -GtkAdjustment *adj; -gpointer data; - ->>code - MelysKeys *mkeys = data; - GnomeCanvas *canvas; - int changed = 0; - - if (adj == mkeys->vcp->vadj) { - if ((int)adj->value != mkeys->voffset) { - changed = 1; - mkeys->voffset = (int)(adj->value + 0.5); - } - } - - - if (changed) { - - canvas = GNOME_CANVAS(mkeys); + melys_scroll_class->scale_changed = scale_changed; - gnome_canvas_scroll_to(canvas, 0, mkeys->voffset * mkeys->vcp->vscale); - } - - ->>extern -#define WHITE 0 -#define BLACK 1 >>function scale_changed static void -GtkObject *obj; This is the view control -gpointer data; Our own data +MelysScroll *mscroll; This is the view control >>description Draw or redraw all the piano keys. @@ -197,35 +171,23 @@ equally spaced. >>code - MelysKeys *mkeys = data; + MelysKeys *mkeys = MELYS_KEYS(mscroll); int len; int colour; double width; - int octpos; /* possition at octave */ + int octpos; /* position at octave */ int pos; int key; int nwhite; char *outline; - static int ktype[] = { - /* Starting at C if you walk along the back of the keyboard - * this is the pattern that you get */ - WHITE, BLACK, WHITE, BLACK, WHITE, WHITE, - BLACK, WHITE, BLACK, WHITE, BLACK, WHITE, - }; - - gtk_widget_set_usize(GTK_WIDGET(mkeys), MELYS_KEYS_WIDTH, 1); - gnome_canvas_set_scroll_region(GNOME_CANVAS(mkeys), - 0.0, 0.0, - MELYS_KEYS_WIDTH, - mkeys->vcp->vscale * NKEYS); + GnomeCanvasGroup *rgroup; + + rgroup = gnome_canvas_root(GNOME_CANVAS(mkeys)); nwhite = 0; octpos = 0; for (key = 0; key < NKEYS; key++) { if (mkeys->keys[key].item == NULL) { - GnomeCanvasGroup *rgroup; - - rgroup = gnome_canvas_root(GNOME_CANVAS(mkeys)); mkeys->keys[key].item = (GtkObject *)gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_RECT, @@ -235,8 +197,37 @@ } if ((key % 12) == 0) { - octpos = (NKEYS - key) * mkeys->vcp->vscale; + octpos = (NKEYS - key) * mscroll->vcp->vscale; nwhite = 0; + + /* + * Now add the labels for the octaves. We label each C key and + * we start at C0. Sometimes people start with C-2 or + * something strange. + */ + if (mkeys->keys[key].label == NULL) { + char *str; + + /* + * For the first time, we create the label + */ + str = g_strdup_printf("C%d", key/12); + mkeys->keys[key].label = (GtkObject*)gnome_canvas_item_new( + rgroup, GNOME_TYPE_CANVAS_TEXT, + "text", str, + "anchor", GTK_ANCHOR_SOUTH_WEST, + "font_gdk", GTK_WIDGET(mkeys)->style->font, + "fill_color_gdk", + >K_WIDGET(mkeys)->style->fg[GTK_STATE_NORMAL], + NULL); + g_free(str); + } + + /* Update the label position */ + gnome_canvas_item_set((GnomeCanvasItem *)mkeys->keys[key].label, + "x", (double) TEXT_OFF, + "y", (double) octpos + 4, + NULL); } if (ktype[key % 12] == WHITE) { @@ -244,8 +235,8 @@ * A white key has a width of 1/7 of an octave. */ len = WHITE_LEN; - width = ((double)mkeys->vcp->vscale*12 / 7); - colour = 0xffffffff; + width = ((double)mscroll->vcp->vscale*12 / 7); + colour = COLOUR_WHITE; outline = "black"; pos = octpos - nwhite * width + 0.5; nwhite++; @@ -254,16 +245,12 @@ * A black key has a width of 1/12 of an octave. */ len = BLACK_LEN; - width = mkeys->vcp->vscale; - colour = 0x000000ff; - outline = NULL; - pos = (NKEYS - key) * mkeys->vcp->vscale; + width = mscroll->vcp->vscale; + colour = COLOUR_BLACK; + outline = "black"; + pos = (NKEYS - key) * mscroll->vcp->vscale; } -if(key == 0) -colour = 0x33ffffff; -if(key == NKEYS-1) -colour = 0x33ffffff; gnome_canvas_item_set(GNOME_CANVAS_ITEM(mkeys->keys[key].item), "x2", (double) len, "y1", (double) pos - (int)(width+0.5), @@ -276,3 +263,54 @@ gnome_canvas_item_lower_to_bottom (GNOME_CANVAS_ITEM(mkeys->keys[key].item)); } + + + +>>function melys_keys_highlight +void +GtkWidget *mview; +int thing; The key to highlight +gpointer _mkeys; This will be our widget + +>>description +This routine is designed to be connected to the "thing-position" signal of +the melys_view. +It will highlight the keys as you move the mouse around. + +>>code + MelysKeys *mkeys = _mkeys; + struct keystate *ksp; + int colour; + int key; + int oldkey; + + /* Reset old highlight */ + oldkey = mkeys->highlight; + ksp = &mkeys->keys[oldkey]; + if (ktype[oldkey % 12] == WHITE) + colour = COLOUR_WHITE; + else + colour = COLOUR_BLACK; + gnome_canvas_item_set((GnomeCanvasItem *) ksp->item, + "fill_color_rgba", colour, + NULL); + + /* We get thing as -1 if the mouse has left */ + if (thing < 0 || thing >= NKEYS) + return; + + key = NKEYS - 1 - thing; + + /* Set new hightlight */ + ksp = &mkeys->keys[key]; + if (ktype[key % 12] == WHITE) + colour = COLOUR_WHITE_HL; + else + colour = COLOUR_BLACK_HL; + gnome_canvas_item_set((GnomeCanvasItem *) ksp->item, + "fill_color_rgba", colour, + NULL); + + mkeys->highlight = key; + + diff -rNu melys-0.1.5/widgets/melyspiano.c melys-0.1.6/widgets/melyspiano.c --- melys-0.1.5/widgets/melyspiano.c Wed Nov 24 22:55:04 1999 +++ melys-0.1.6/widgets/melyspiano.c Mon Nov 29 10:48:09 1999 @@ -59,17 +59,14 @@ /* Static functions */ static void melys_piano_init(MelysPiano *mpiano); -static int canvas_event(GtkWidget *w, GdkEvent *event, gpointer data); static void melys_piano_class_init(MelysPianoClass *klass); static void piano_scale_changed(MelysView *mview); -static void piano_destroy(GtkObject *obj); 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 int get_nthing(MelysView *mview, struct element *el); static gboolean drop_elem(MelysView *mview, struct element *elem, int nthing); @@ -139,6 +136,7 @@ view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); + view_control_set_limits(mview->vcp, 1, 0, 4, 0); tab = (GtkTable *)gtk_table_new(3, 3, 0); @@ -204,16 +202,8 @@ mview->vthings = NKEYS; /* There are NKEYS midi notes */ - gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", - GTK_SIGNAL_FUNC(canvas_event), NULL); -} - -static int -canvas_event(GtkWidget *w, GdkEvent *event, gpointer data) -{ - //printf("canvas event %d\n", event->type); - //mel_debug_print_type("event:", w); - return FALSE; + gtk_signal_connect(GTK_OBJECT(mview), "thing-position", + melys_keys_highlight, mkeys); } /* @@ -235,7 +225,6 @@ parent_class = gtk_type_class(melys_view_get_type()); - object_class->destroy = piano_destroy; widget_class->draw = piano_draw; widget_class->realize = piano_realize; @@ -262,14 +251,6 @@ } static void -piano_destroy(GtkObject *obj) -{ - //MelysPiano *mpiano = MELYS_PIANO(obj); - - GTK_OBJECT_CLASS(parent_class)->destroy(obj); -} - -static void piano_draw(GtkWidget *w, GdkRectangle *area) { MelysPiano *mpiano = MELYS_PIANO(w); @@ -395,7 +376,7 @@ dinfo->con = con; g_dataset_set_data_full(note, mview->infostr, - dinfo, display_info_free); + dinfo, view_display_info_free); gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); gtk_signal_connect(GTK_OBJECT(item), "event", @@ -424,19 +405,6 @@ 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->con); - MD_WUNREF(dinfo->elem); - - g_free(_dinfo); } static int diff -rNu melys-0.1.5/widgets/melyspiano.m melys-0.1.6/widgets/melyspiano.m --- melys-0.1.5/widgets/melyspiano.m Wed Nov 24 22:43:52 1999 +++ melys-0.1.6/widgets/melyspiano.m Mon Nov 29 01:22:23 1999 @@ -102,6 +102,7 @@ view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); + view_control_set_limits(mview->vcp, 1, 0, 4, 0); tab = (GtkTable *)gtk_table_new(3, 3, 0); @@ -167,20 +168,10 @@ mview->vthings = NKEYS; /* There are NKEYS midi notes */ - gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", - GTK_SIGNAL_FUNC(canvas_event), NULL); + gtk_signal_connect(GTK_OBJECT(mview), "thing-position", + melys_keys_highlight, mkeys); ->>function canvas_event -static int -GtkWidget *w; -GdkEvent *event; -gpointer data; ->>code - //printf("canvas event %d\n", event->type); - //mel_debug_print_type("event:", w); - return FALSE; - >>function melys_piano_class_init static void MelysPianoClass *klass; The class to initialise @@ -199,7 +190,6 @@ parent_class = gtk_type_class(melys_view_get_type()); - object_class->destroy = piano_destroy; widget_class->draw = piano_draw; widget_class->realize = piano_realize; @@ -227,15 +217,6 @@ piano_con_draw(MELYS_PIANO(mview), mview->viewcon, TRUE); ->>function piano_destroy -static void -GtkObject *obj; - ->>code - //MelysPiano *mpiano = MELYS_PIANO(obj); - - GTK_OBJECT_CLASS(parent_class)->destroy(obj); - >>function piano_draw static void GtkWidget *w; @@ -375,7 +356,7 @@ dinfo->con = con; g_dataset_set_data_full(note, mview->infostr, - dinfo, display_info_free); + dinfo, view_display_info_free); gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); gtk_signal_connect(GTK_OBJECT(item), "event", @@ -406,20 +387,6 @@ 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->con); - MD_WUNREF(dinfo->elem); - - g_free(_dinfo); >>function get_nthing static int diff -rNu melys-0.1.5/widgets/melyspos.c melys-0.1.6/widgets/melyspos.c --- melys-0.1.5/widgets/melyspos.c Wed Nov 24 22:55:05 1999 +++ melys-0.1.6/widgets/melyspos.c Mon Nov 29 10:48:09 1999 @@ -179,13 +179,13 @@ { MelysPos *mpos = data; struct mbt mbt; - unsigned long t; + ticktime_t t; char buf[POS_LABEL_LEN]; g_return_if_fail(mpos->tempomap != NULL); g_return_if_fail(mpos->posadj != NULL); - t = (unsigned long) mpos->posadj->value; + t = (ticktime_t) mpos->posadj->value; if (t != mpos->lasttime) { mpos->lasttime = t; diff -rNu melys-0.1.5/widgets/melyspos.m melys-0.1.6/widgets/melyspos.m --- melys-0.1.5/widgets/melyspos.m Mon Oct 25 20:37:17 1999 +++ melys-0.1.6/widgets/melyspos.m Sat Nov 27 11:43:23 1999 @@ -35,7 +35,7 @@ int sig_id; /* Connection to posadj */ - unsigned long lasttime; + ticktime_t lasttime; }; struct _MelysPosClass { @@ -159,13 +159,13 @@ >>code MelysPos *mpos = data; struct mbt mbt; - unsigned long t; + ticktime_t t; char buf[POS_LABEL_LEN]; g_return_if_fail(mpos->tempomap != NULL); g_return_if_fail(mpos->posadj != NULL); - t = (unsigned long) mpos->posadj->value; + t = (ticktime_t) mpos->posadj->value; if (t != mpos->lasttime) { mpos->lasttime = t; diff -rNu melys-0.1.5/widgets/melysrule.c melys-0.1.6/widgets/melysrule.c --- melys-0.1.5/widgets/melysrule.c Wed Nov 24 22:55:05 1999 +++ melys-0.1.6/widgets/melysrule.c Mon Nov 29 10:48:10 1999 @@ -174,6 +174,9 @@ { MelysRule *mrule = data; + if (!GTK_WIDGET_REALIZED(mrule)) + return; + gdk_window_clear(((GtkWidget *)mrule)->window); gtk_widget_queue_draw((GtkWidget *)mrule); } @@ -215,6 +218,7 @@ gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); for (; x < ap->x + ap->width; ) { + x += mrule->hbase; if ((mbt.bars % 4) == 0) { yoff = 10; g_snprintf(numbuf, 20, "%d", mbt.bars+1); diff -rNu melys-0.1.5/widgets/melysrule.m melys-0.1.6/widgets/melysrule.m --- melys-0.1.5/widgets/melysrule.m Mon Nov 15 14:50:54 1999 +++ melys-0.1.6/widgets/melysrule.m Mon Nov 29 01:22:23 1999 @@ -32,6 +32,7 @@ ViewControl *vcp; /* Horizontal adj for this rule */ int hoffset; /* Previous horizontal adjustment */ + int hbase; /* Zero point base TEMP XXX */ struct tempomapElement *tempomap; }; @@ -145,6 +146,9 @@ >>code MelysRule *mrule = data; + if (!GTK_WIDGET_REALIZED(mrule)) + return; + gdk_window_clear(((GtkWidget *)mrule)->window); gtk_widget_queue_draw((GtkWidget *)mrule); @@ -189,6 +193,7 @@ gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], ap); for (; x < ap->x + ap->width; ) { + x += mrule->hbase; if ((mbt.bars % 4) == 0) { yoff = 10; g_snprintf(numbuf, 20, "%d", mbt.bars+1); diff -rNu melys-0.1.5/widgets/melysscale.c melys-0.1.6/widgets/melysscale.c --- melys-0.1.5/widgets/melysscale.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/widgets/melysscale.c Mon Nov 29 10:48:10 1999 @@ -0,0 +1,214 @@ +/* + * + * 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 intended for vertical scales of limited range. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-util.h" +#include "libgnomeui/gnome-canvas-line.h" +#include "libgnomeui/gnome-canvas-text.h" +#include "viewcontrol.h" +#include "melysscroll.h" +#include "melysscale.h" +#include "intl.h" + + + + +#define MELYS_SCALE_WIDTH 40 + +/* The list of signal id's that are being added for MelysScale. */ +enum { + // XXX symbols for all signals here + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + +/* Static functions */ +static void melys_scale_init(MelysScale *mscale); +static void melys_scale_class_init(MelysScaleClass *klass); +static void scale_scale_changed(MelysScroll *mscroll); + + +static MelysScrollClass *parent_class = NULL; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_scale_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysScale", + sizeof(MelysScale), + sizeof(MelysScaleClass), + (GtkClassInitFunc) melys_scale_class_init, + (GtkObjectInitFunc) melys_scale_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(melys_scroll_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysScale object. + * + * Arguments: + * vcp - The control widget + * low - Low point of the range + * high - High point of the range + * step - Step size for markings. + */ +GtkWidget * +melys_scale_new(ViewControl *vcp, int low, int high, int step) +{ + MelysScale *mscale = MELYS_SCALE(gtk_type_new(melys_scale_get_type())); + + g_return_val_if_fail(vcp, GTK_WIDGET(mscale)); + + mscale->low = low; + mscale->high = high; + mscale->step = step; + melys_scroll_set_control(MELYS_SCROLL(mscale), vcp, + VC_VERTICAL, MELYS_SCALE_WIDTH, 0); + + return GTK_WIDGET(mscale); +} + +/* + * Initialise the MelysScale. + * + * Arguments: + * mscale - The MelysScale to init + */ +static void +melys_scale_init(MelysScale *mscale) +{ + + mscale->itemlist = NULL; +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_scale_class_init(MelysScaleClass *klass) +{ + GtkObjectClass *object_class; + MelysScrollClass *melys_scroll_class; + + object_class = (GtkObjectClass *)klass; + melys_scroll_class = (MelysScrollClass *)klass; + + parent_class = gtk_type_class(melys_scroll_get_type()); + + melys_scroll_class->scale_changed = scale_scale_changed; +} + +static void +scale_scale_changed(MelysScroll *mscroll) +{ + MelysScale *mscale; + GnomeCanvasGroup *rgroup; + GnomeCanvasItem *item; + GnomeCanvasPoints *points; + GSList *list; + int n; + + mscale = MELYS_SCALE(mscroll); + + if (mscale->itemlist == NULL) { + + for (n = mscale->low; n < mscale->high; n += mscale->step) { + char *str; + + rgroup = gnome_canvas_root(GNOME_CANVAS(mscroll)); + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_LINE, + "width_pixels", 1, + "fill_color_gdk", + >K_WIDGET(mscale)->style->fg[GTK_STATE_NORMAL], + NULL); + mscale->itemlist = g_slist_prepend(mscale->itemlist, item); + + str = g_strdup_printf("%d", mscale->high - n); + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_TEXT, + "text", str, + "anchor", GTK_ANCHOR_WEST, + "font_gdk", GTK_WIDGET(mscale)->style->font, + "fill_color_gdk", + >K_WIDGET(mscale)->style->fg[GTK_STATE_NORMAL], + NULL); + mscale->itemlist = g_slist_prepend(mscale->itemlist, item); + + g_free(str); + } + + mscale->itemlist = g_slist_reverse(mscale->itemlist); + } + + points = gnome_canvas_points_new(2); + + list = mscale->itemlist; + n = mscale->low; + while (list) { + item = list->data; + + /* The line mark is first */ + points->coords[0] = MELYS_SCALE_WIDTH - 5; /* x1 */ + points->coords[1] = view_control_thing_to_y(mscroll->vcp, n); + points->coords[2] = MELYS_SCALE_WIDTH; /* x2 */ + points->coords[3] = view_control_thing_to_y(mscroll->vcp, n); + gnome_canvas_item_set(item, + "points", points, + NULL); + + list = list->next; + g_assert(list); + item = list->data; + + gnome_canvas_item_set(item, + "x", (double) 4, + "y", (double) view_control_thing_to_y(mscroll->vcp, n), + NULL); + + list = list->next; + n += mscale->step; + } + + gnome_canvas_points_unref(points); +} diff -rNu melys-0.1.5/widgets/melysscale.m melys-0.1.6/widgets/melysscale.m --- melys-0.1.5/widgets/melysscale.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/widgets/melysscale.m Mon Nov 29 01:22:23 1999 @@ -0,0 +1,196 @@ +>>name melysscale.m - A vertical scale with limited marks. + +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 intended for vertical scales of limited range. + +>>extern + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-util.h +>>header libgnomeui/gnome-canvas-line.h +>>header libgnomeui/gnome-canvas-text.h +>>header viewcontrol.h +>>header melysscroll.h + +>>set nosignals +>>gtkobject melys_scale melys_scroll + +>>headerdef @header + +/* + * The MelysScale structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysScale { + MelysScroll melys_scroll; + + int low; + int high; + int step; + + GSList *itemlist; +}; + +/* + * The MelysScaleClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysScaleClass { + MelysScrollClass parent_class; + // XXX class definition here +}; + +>>extern + +#define MELYS_SCALE_WIDTH 40 + +/* The list of signal id's that are being added for MelysScale. */ +enum { + // XXX symbols for all signals here + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + + +>>function melys_scale_new +GtkWidget * +ViewControl *vcp; The control widget +int low; Low point of the range +int high; High point of the range +int step; Step size for markings. + +>>description +Create a new MelysScale object. +>>code + MelysScale *mscale = MELYS_SCALE(gtk_type_new(melys_scale_get_type())); + + g_return_val_if_fail(vcp, GTK_WIDGET(mscale)); + + mscale->low = low; + mscale->high = high; + mscale->step = step; + melys_scroll_set_control(MELYS_SCROLL(mscale), vcp, + VC_VERTICAL, MELYS_SCALE_WIDTH, 0); + + return GTK_WIDGET(mscale); + + +>>function melys_scale_init +static void +MelysScale *mscale; The MelysScale to init +>>description +Initialise the MelysScale. +>>code + + mscale->itemlist = NULL; + + +>>function melys_scale_class_init +static void +MelysScaleClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + MelysScrollClass *melys_scroll_class; + + object_class = (GtkObjectClass *)klass; + melys_scroll_class = (MelysScrollClass *)klass; + + parent_class = gtk_type_class(melys_scroll_get_type()); + + melys_scroll_class->scale_changed = scale_scale_changed; + + +>>function scale_scale_changed +static void +MelysScroll *mscroll; + +>>code + MelysScale *mscale; + GnomeCanvasGroup *rgroup; + GnomeCanvasItem *item; + GnomeCanvasPoints *points; + GSList *list; + int n; + + mscale = MELYS_SCALE(mscroll); + + if (mscale->itemlist == NULL) { + + for (n = mscale->low; n < mscale->high; n += mscale->step) { + char *str; + + rgroup = gnome_canvas_root(GNOME_CANVAS(mscroll)); + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_LINE, + "width_pixels", 1, + "fill_color_gdk", + >K_WIDGET(mscale)->style->fg[GTK_STATE_NORMAL], + NULL); + mscale->itemlist = g_slist_prepend(mscale->itemlist, item); + + str = g_strdup_printf("%d", mscale->high - n); + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_TEXT, + "text", str, + "anchor", GTK_ANCHOR_WEST, + "font_gdk", GTK_WIDGET(mscale)->style->font, + "fill_color_gdk", + >K_WIDGET(mscale)->style->fg[GTK_STATE_NORMAL], + NULL); + mscale->itemlist = g_slist_prepend(mscale->itemlist, item); + + g_free(str); + } + + mscale->itemlist = g_slist_reverse(mscale->itemlist); + } + + points = gnome_canvas_points_new(2); + + list = mscale->itemlist; + n = mscale->low; + while (list) { + item = list->data; + + /* The line mark is first */ + points->coords[0] = MELYS_SCALE_WIDTH - 5; /* x1 */ + points->coords[1] = view_control_thing_to_y(mscroll->vcp, n); + points->coords[2] = MELYS_SCALE_WIDTH; /* x2 */ + points->coords[3] = view_control_thing_to_y(mscroll->vcp, n); + gnome_canvas_item_set(item, + "points", points, + NULL); + + list = list->next; + g_assert(list); + item = list->data; + + gnome_canvas_item_set(item, + "x", (double) 4, + "y", (double) view_control_thing_to_y(mscroll->vcp, n), + NULL); + + list = list->next; + n += mscale->step; + } + + gnome_canvas_points_unref(points); diff -rNu melys-0.1.5/widgets/melysscroll.c melys-0.1.6/widgets/melysscroll.c --- melys-0.1.5/widgets/melysscroll.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/widgets/melysscroll.c Mon Nov 29 10:48:10 1999 @@ -0,0 +1,284 @@ +/* + * + * 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. + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtksignal.h" +#include "libgnomeui/gnome-canvas.h" +#include "viewcontrol.h" +#include "melysscroll.h" +#include "intl.h" + + + + + + +/* The list of signal id's that are being added for MelysScroll. */ +enum { + SCALE_CHANGED, + LAST_SIGNAL +}; + +#define tick_to_x(ms, tick) view_control_tick_to_x( \ + ms->vcp, tick) + +/* Static functions */ +static void melys_scroll_init(MelysScroll *XXX); +static void melys_scroll_class_init(MelysScrollClass *klass); +static void scroll_destroy(GtkObject *obj); +static void scroll_scroll(GtkAdjustment *adj, gpointer data); +static void vcp_scale_changed(ViewControl *vcp, gpointer data); +static void vcp_adj_changed(GtkAdjustment *adj, gpointer data); +static void scroll_set_region(MelysScroll *mscroll); + + +static GnomeCanvasClass *parent_class = NULL; + +static gint melys_scroll_signals[LAST_SIGNAL]; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_scroll_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysScroll", + sizeof(MelysScroll), + sizeof(MelysScrollClass), + (GtkClassInitFunc) melys_scroll_class_init, + (GtkObjectInitFunc) melys_scroll_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gnome_canvas_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysScroll object. + * + * Arguments: + * vcp - The view control + * which - Which directions we scroll in + * width - Set if fixed width + * height - Set if fixed height + */ +GtkWidget * +melys_scroll_new(ViewControl *vcp, int which, int width, int height) +{ + MelysScroll *mscroll = MELYS_SCROLL(gtk_type_new(melys_scroll_get_type())); + + if (vcp) + melys_scroll_set_control(mscroll, vcp, which, width, height); + + return GTK_WIDGET(mscroll); +} + +/* + * Initialise the MelysScroll. + * + * Arguments: + * XXX - The MelysScroll to init + */ +static void +melys_scroll_init(MelysScroll *XXX) +{ + // XXX add any children etc. +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_scroll_class_init(MelysScrollClass *klass) +{ + GtkObjectClass *object_class; + GnomeCanvasClass *gnome_canvas_class; + + object_class = (GtkObjectClass *)klass; + gnome_canvas_class = (GnomeCanvasClass *)klass; + + parent_class = gtk_type_class(gnome_canvas_get_type()); + + melys_scroll_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysScrollClass, scale_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0 + ); + + gtk_object_class_add_signals(object_class, melys_scroll_signals, + LAST_SIGNAL); + + object_class->destroy = scroll_destroy; + + klass->scale_changed = NULL; +} + +/* + * Set the controls for this view. + * + * Arguments: + * vcp - if (vcp) + */ +void +melys_scroll_set_control(MelysScroll *mscroll, ViewControl *vcp, int which, + int width, int height) +{ + + + mscroll->which = which; + mscroll->width = width; + mscroll->height = height; + + gtk_widget_set_usize(GTK_WIDGET(mscroll), width, height); + + if (vcp) { + if (mscroll->vcp) + gtk_object_unref((GtkObject *) mscroll->vcp); + mscroll->vcp = vcp; + gtk_object_ref((GtkObject *) vcp); + + gtk_signal_connect_after(GTK_OBJECT(vcp), "scale-changed", + vcp_scale_changed, mscroll); + + if (which & VC_HORIZONTAL) { + gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", + GTK_SIGNAL_FUNC(scroll_scroll), mscroll); + gtk_signal_connect((GtkObject *)vcp->hadj, "changed", + GTK_SIGNAL_FUNC(vcp_adj_changed), mscroll); + } + if (which & VC_VERTICAL) { + gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", + GTK_SIGNAL_FUNC(scroll_scroll), mscroll); + gtk_signal_connect((GtkObject *)vcp->vadj, "changed", + GTK_SIGNAL_FUNC(vcp_adj_changed), mscroll); + } + + vcp_scale_changed(vcp, mscroll); + } +} + +static void +scroll_destroy(GtkObject *obj) +{ + MelysScroll *mscroll = MELYS_SCROLL(obj); + + if (mscroll->vcp) { + gtk_object_unref(GTK_OBJECT(mscroll->vcp)); + mscroll->vcp = NULL; + } + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); +} + +static void +scroll_scroll(GtkAdjustment *adj, gpointer data) +{ + MelysScroll *mscroll = data; + GnomeCanvas *canvas; + gboolean xchanged = FALSE; + gboolean ychanged = FALSE; + + if (adj == mscroll->vcp->hadj) { + if ((int)adj->value != mscroll->hoffset) { + xchanged = 1; + mscroll->hoffset = (int)adj->value; + } + } + if (adj == mscroll->vcp->vadj) { + if ((int)adj->value != mscroll->voffset) { + ychanged = 1; + mscroll->voffset = (int)adj->value; + } + } + + if (xchanged || ychanged) { + canvas = GNOME_CANVAS(mscroll); + gnome_canvas_scroll_to(canvas, + tick_to_x(mscroll, mscroll->hoffset), + mscroll->voffset * mscroll->vcp->vscale); + } +} + +/* + * The scale has changed. Deal with setting the scroll region + * and re-emit as our own scale_changed signal. + * + * Arguments: + * vcp - This is the view control + * data - Our own data + */ +static void +vcp_scale_changed(ViewControl *vcp, gpointer data) +{ + MelysScroll *mscroll = data; + + /* It looks better to do them in this order */ + gtk_signal_emit(GTK_OBJECT(mscroll), melys_scroll_signals[SCALE_CHANGED]); + scroll_set_region(mscroll); +} + +static void +vcp_adj_changed(GtkAdjustment *adj, gpointer data) +{ + scroll_set_region(MELYS_SCROLL(data)); +} + +/* + * You need to set the scroll region when the scaling changes or + * the adjustment range changes. + */ +static void +scroll_set_region(MelysScroll *mscroll) +{ + ViewControl *vcp = mscroll->vcp; + int width; + int height; + + if (mscroll->which & VC_HORIZONTAL) + width = tick_to_x(mscroll, vcp->hadj->upper); + else + width = mscroll->width; + if (mscroll->which & VC_VERTICAL) + height = vcp->vadj->upper * vcp->vscale; + else + height = mscroll->height; + + gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), + -mscroll->hbase, 0.0, + width, height); + + mscroll->voffset = -1; + scroll_scroll(vcp->vadj, mscroll); + mscroll->hoffset = -1; + scroll_scroll(vcp->hadj, mscroll); +} diff -rNu melys-0.1.5/widgets/melysscroll.m melys-0.1.6/widgets/melysscroll.m --- melys-0.1.5/widgets/melysscroll.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/widgets/melysscroll.m Mon Nov 29 01:22:23 1999 @@ -0,0 +1,280 @@ +>>name melysscroll.m - A scrolled scalable canvas area in one or two directions. + +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. +>>extern + +>>header gtk/gtksignal.h + +>>header libgnomeui/gnome-canvas.h + +>>header viewcontrol.h + +>>gtkobject melys_scroll gnome_canvas + +>>headerdef @header + +/* + * The MelysScroll structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysScroll { + GnomeCanvas gnome_canvas; + + ViewControl *vcp; /* Controls for this view */ + + /* Dimentions for if the widget does not scroll in one direction */ + int width; + int height; + + /* Previous offsets */ + int voffset; /* Previous veritcal offset */ + int hoffset; /* Previous horizontal offset */ + + /* Base offset of zero point */ + int hbase; + + int which; /* Whether vertical or horizontal (or both) */ +}; + +/* + * The MelysScrollClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysScrollClass { + GnomeCanvasClass parent_class; + + /* A scale change */ + void (*scale_changed)(MelysScroll *); +}; + +>>extern + +/* The list of signal id's that are being added for MelysScroll. */ +enum { + SCALE_CHANGED, + LAST_SIGNAL +}; + +#define tick_to_x(ms, tick) view_control_tick_to_x( \ + ms->vcp, tick) + +>>function melys_scroll_new +GtkWidget * +ViewControl *vcp; The view control +int which; Which directions we scroll in +int width; Set if fixed width +int height; Set if fixed height + +>>description +Create a new MelysScroll object. + +>>code + MelysScroll *mscroll = MELYS_SCROLL(gtk_type_new(melys_scroll_get_type())); + + if (vcp) + melys_scroll_set_control(mscroll, vcp, which, width, height); + + return GTK_WIDGET(mscroll); + +>>function melys_scroll_init +static void +MelysScroll *XXX; The MelysScroll to init +>>description +Initialise the MelysScroll. +>>code + // XXX add any children etc. + + +>>function melys_scroll_class_init +static void +MelysScrollClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + GnomeCanvasClass *gnome_canvas_class; + + object_class = (GtkObjectClass *)klass; + gnome_canvas_class = (GnomeCanvasClass *)klass; + + parent_class = gtk_type_class(gnome_canvas_get_type()); + + melys_scroll_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysScrollClass, scale_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0 + ); + + gtk_object_class_add_signals(object_class, melys_scroll_signals, + LAST_SIGNAL); + + object_class->destroy = scroll_destroy; + + klass->scale_changed = NULL; + + +>>function melys_scroll_set_control +void +MelysScroll *mscroll; +ViewControl *vcp; if (vcp) +int which; +int width; +int height; + +>>description +Set the controls for this view. + +>>code + + + mscroll->which = which; + mscroll->width = width; + mscroll->height = height; + + gtk_widget_set_usize(GTK_WIDGET(mscroll), width, height); + + if (vcp) { + if (mscroll->vcp) + gtk_object_unref((GtkObject *) mscroll->vcp); + mscroll->vcp = vcp; + gtk_object_ref((GtkObject *) vcp); + + gtk_signal_connect_after(GTK_OBJECT(vcp), "scale-changed", + vcp_scale_changed, mscroll); + + if (which & VC_HORIZONTAL) { + gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", + GTK_SIGNAL_FUNC(scroll_scroll), mscroll); + gtk_signal_connect((GtkObject *)vcp->hadj, "changed", + GTK_SIGNAL_FUNC(vcp_adj_changed), mscroll); + } + if (which & VC_VERTICAL) { + gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", + GTK_SIGNAL_FUNC(scroll_scroll), mscroll); + gtk_signal_connect((GtkObject *)vcp->vadj, "changed", + GTK_SIGNAL_FUNC(vcp_adj_changed), mscroll); + } + + vcp_scale_changed(vcp, mscroll); + } + + +>>function scroll_destroy +static void +GtkObject *obj; + +>>code + MelysScroll *mscroll = MELYS_SCROLL(obj); + + if (mscroll->vcp) { + gtk_object_unref(GTK_OBJECT(mscroll->vcp)); + mscroll->vcp = NULL; + } + + if (GTK_OBJECT_CLASS(parent_class)->destroy) + (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); + + +>>function scroll_scroll +static void +GtkAdjustment *adj; +gpointer data; + +>>code + MelysScroll *mscroll = data; + GnomeCanvas *canvas; + gboolean xchanged = FALSE; + gboolean ychanged = FALSE; + + if (adj == mscroll->vcp->hadj) { + if ((int)adj->value != mscroll->hoffset) { + xchanged = 1; + mscroll->hoffset = (int)adj->value; + } + } + if (adj == mscroll->vcp->vadj) { + if ((int)adj->value != mscroll->voffset) { + ychanged = 1; + mscroll->voffset = (int)adj->value; + } + } + + if (xchanged || ychanged) { + canvas = GNOME_CANVAS(mscroll); + gnome_canvas_scroll_to(canvas, + tick_to_x(mscroll, mscroll->hoffset), + mscroll->voffset * mscroll->vcp->vscale); + } + + +>>function vcp_scale_changed +static void +ViewControl *vcp; This is the view control +gpointer data; Our own data + +>>description +The scale has changed. +Deal with setting the scroll region and re-emit +as our own scale_changed signal. + +>>code + MelysScroll *mscroll = data; + + /* It looks better to do them in this order */ + gtk_signal_emit(GTK_OBJECT(mscroll), melys_scroll_signals[SCALE_CHANGED]); + scroll_set_region(mscroll); + + +>>function vcp_adj_changed +static void +GtkAdjustment *adj; +gpointer data; This is our mscroll + +>>code + scroll_set_region(MELYS_SCROLL(data)); + + +>>function scroll_set_region +static void +MelysScroll *mscroll; + +>>description +You need to set the scroll region when the scaling changes or +the adjustment range changes. + +>>code + ViewControl *vcp = mscroll->vcp; + int width; + int height; + + if (mscroll->which & VC_HORIZONTAL) + width = tick_to_x(mscroll, vcp->hadj->upper); + else + width = mscroll->width; + if (mscroll->which & VC_VERTICAL) + height = vcp->vadj->upper * vcp->vscale; + else + height = mscroll->height; + + gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), + -mscroll->hbase, 0.0, + width, height); + + mscroll->voffset = -1; + scroll_scroll(vcp->vadj, mscroll); + mscroll->hoffset = -1; + scroll_scroll(vcp->hadj, mscroll); + diff -rNu melys-0.1.5/widgets/melystempo.c melys-0.1.6/widgets/melystempo.c --- melys-0.1.5/widgets/melystempo.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/widgets/melystempo.c Mon Nov 29 10:48:11 1999 @@ -0,0 +1,491 @@ +/* + * + * 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. + * + * + * + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtktable.h" +#include "gtk/gtkvbox.h" +#include "gtk/gtkhbox.h" +#include "gtk/gtkframe.h" +#include "gtk/gtksignal.h" +#include "gtk/gtklabel.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-canvas-util.h" +#include "libgnomeui/gnome-canvas-line.h" +#include "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "viewcontrol.h" +#include "melysscroll.h" +#include "melysview.h" +#include "melysscale.h" +#include "melysrule.h" +#include "melwidgets.h" +#include "elements.h" +#include "md.h" +#include "song.h" +#include "melystempo.h" +#include "intl.h" + + +/* The list of signal id's that are being added for MelysTempo. */ +enum { + // XXX symbols for all signals here + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + + +/* + * scale conversions + */ +#define MAX_BPM 1000 +#define thing_to_bpm(n) (MAX_BPM - (n)) +#define bpm_to_thing(b) (MAX_BPM - (b)) +#define thing_to_tempo(n) (MD_BPM_TO_TEMPO(thing_to_bpm(n))) +#define tempo_to_thing(tempo) (bpm_to_thing(MD_TEMPO_TO_BPM(tempo)) ) +#define tick_to_x(tp, t) view_control_tick_to_x( \ + MELYS_VIEW(tp)->vcp, t) +#define tempo_to_y(tp, ut) view_control_thing_to_y( \ + MELYS_VIEW(tp)->vcp, MAX_BPM - MD_TEMPO_TO_BPM(ut)) + +/* Static functions */ +static void melys_tempo_init(MelysTempo *mtempo); +static void melys_tempo_class_init(MelysTempoClass *klass); +static void tempo_realize(GtkWidget *w); +static void tempo_draw(GtkWidget *w, GdkRectangle *area); +static void tempo_common_draw(MelysTempo *mtempo, gboolean force); +static void update_tempo(MelysTempo *mtempo, struct tempoElement *tempo, + gboolean force); +static void tempo_scale_changed(MelysView *mview); +static int tempo_get_nthing(MelysView *mview, struct element *el); +static gboolean tempo_drop_elem(MelysView *mview, struct element *elem, + int nthing); + + +static MelysViewClass *parent_class = NULL; + +static gint melys_tempo_signals[LAST_SIGNAL]; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_tempo_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysTempo", + sizeof(MelysTempo), + sizeof(MelysTempoClass), + (GtkClassInitFunc) melys_tempo_class_init, + (GtkObjectInitFunc) melys_tempo_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(melys_view_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysTempo object. + */ +GtkWidget * +melys_tempo_new(struct tempomapElement *tmap) +{ + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_tempo_get_type())); + MelysView *mview = MELYS_VIEW(w); + + mview->viewcon = MD_CONTAINER(tmap); + MD_REF(tmap); + + return w; +} + +/* + * Initialise the MelysTempo. + * + * Arguments: + * mtempo - The MelysTempo to init + */ +static void +melys_tempo_init(MelysTempo *mtempo) +{ + MelysView *mview = MELYS_VIEW(mtempo); + GtkWidget *mscale; + GtkTable *tab; + GtkBox *vbox; + GtkBox *vbox2; + GtkBox *hbox; + GtkWidget *invis; + GtkWidget *frame1; + GtkWidget *frame2; + + mview->vcp->vspace = 0; /* No separation between items on scale */ + MELYS_SCROLL(mview->canvas)->hbase = 5; + MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ + view_control_set_vertical(mview->vcp, 1); + view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 4); + view_control_set_limits(mview->vcp, 1, 0, 1, 0); + + tab = (GtkTable *)gtk_table_new(2, 2, FALSE); + gtk_box_pack_start(GTK_BOX(mtempo), GTK_WIDGET(tab), 1, 1, 0); + + /* vert scrollbar group */ + gtk_table_attach(tab, mview->vcp->vsb, 1, 2, 0, 1, + 0, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, 0 + ); + gtk_table_attach(tab, mview->vcp->hsb, 0, 1, 1, 2, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, + 0, 0 + ); + + vbox = (GtkBox *)gtk_vbox_new(0, 0); + frame1 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); + + gtk_box_pack_start(vbox, mview->ruler, 0, 0, 0); + gtk_box_pack_start(vbox, mview->canvas, 1, 1, 0); + + gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox)); + + vbox2 = (GtkBox *)gtk_vbox_new(0, 0); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); + mscale = melys_scale_new(mview->vcp, 0, MAX_BPM, 40); + invis = gtk_label_new(""); + + /* Pack them into a box */ + gtk_container_add(GTK_CONTAINER(frame2), mscale); + gtk_box_pack_start(vbox2, invis, 0, 0, 0); + gtk_box_pack_start(vbox2, frame2, 1, 1, 0); + + hbox = (GtkBox *)gtk_hbox_new(0, 0); + gtk_box_pack_start(hbox, GTK_WIDGET(vbox2), 0, 0, 0); + gtk_box_pack_start(hbox, GTK_WIDGET(frame1), 1, 1, 0); + gtk_table_attach(tab, GTK_WIDGET(hbox), 0, 1, 0, 2, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + 0, 0 + ); + + gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); + gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); + mview->vthings = MAX_BPM; /* Allow up to this many bpm */ + + gtk_widget_show_all(GTK_WIDGET(tab)); +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_tempo_class_init(MelysTempoClass *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()); + + // XXX Add args + + // XXX Create signals + + gtk_object_class_add_signals(object_class, + melys_tempo_signals, LAST_SIGNAL); + + widget_class->draw = tempo_draw; + widget_class->realize = tempo_realize; + + melys_view_class->scale_changed = tempo_scale_changed; + melys_view_class->get_nthing = tempo_get_nthing; + melys_view_class->drop_elem = tempo_drop_elem; +} + +static void +tempo_realize(GtkWidget *w) +{ + MelysTempo *mtempo = MELYS_TEMPO(w); + + if (GTK_WIDGET_CLASS(parent_class)->realize) + GTK_WIDGET_CLASS(parent_class)->realize(w); + + tempo_scale_changed(MELYS_VIEW(mtempo)); +} + +static void +tempo_draw(GtkWidget *w, GdkRectangle *area) +{ + + tempo_common_draw(MELYS_TEMPO(w), FALSE); + + GTK_WIDGET_CLASS(parent_class)->draw(w, area); +} + +/* + * Draw the tempo elements within the tempomap. + */ +static void +tempo_common_draw(MelysTempo *mtempo, gboolean force) +{ + int n; + int ntempos; + int maxtempo; + int lasttempo; + int pnum; + struct element *el; + struct tempomapElement *tmap; + MelysView *mview; + GnomeCanvasPoints *points; + + mview = MELYS_VIEW(mtempo); + + tmap = (struct tempomapElement *)mview->viewcon; + g_return_if_fail(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); + + ntempos = 0; + + /* Make sure that duration is same as root + * NB: modified is NOT set */ + MD_CONTAINER(tmap)->duration = MD_DURATION(mview->song->mdroot); + + /* Ensure that the line is created */ + if (mtempo->lines == NULL) { + mtempo->lines = (GtkObject *)gnome_canvas_item_new( + gnome_canvas_root((GnomeCanvas*)mview->canvas), + GNOME_TYPE_CANVAS_LINE, + NULL); + } + + /* + * First set the litle marks that show where tempo changes + * occur. + */ + for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { + el = MD_GET_INDEX(tmap, n); + if (el->type == MD_TYPE_TEMPO) { + update_tempo(mtempo, MD_TEMPO(el), force); + ntempos++; + } + } + + /* + * Now draw the line that connects all the change points. + * You need two line points per change. + */ + points = gnome_canvas_points_new(2 * ntempos); + pnum = 0; + lasttempo = -1; + maxtempo = 0; + + for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { + el = MD_GET_INDEX(tmap, n); + if (el->type == MD_TYPE_TEMPO) { + if (lasttempo > 0) { + points->coords[pnum] = tick_to_x(mtempo, MD_TIME(el)); + points->coords[pnum+1] = tempo_to_y(mtempo, lasttempo); + pnum += 2; + } + + points->coords[pnum] = tick_to_x(mtempo, MD_TIME(el)); + points->coords[pnum+1] = tempo_to_y(mtempo, + MD_TEMPO(el)->micro_tempo); + pnum += 2; + + lasttempo = MD_TEMPO(el)->micro_tempo; + maxtempo = MAX(lasttempo, maxtempo); + } + } + + points->coords[pnum] = tick_to_x(mtempo, MD_ENDTIME(mview->song->mdroot)); + points->coords[pnum+1] = tempo_to_y(mtempo, lasttempo); + + gnome_canvas_item_set(GNOME_CANVAS_ITEM(mtempo->lines), + "points", points, + NULL); + + gnome_canvas_points_unref(points); + + if (maxtempo) { + GtkAdjustment *adj; + + /* + * If the slider is right at the top, then we try to adjust + * it so that all the changes are in view. + */ + adj = mview->vcp->vadj; + if (adj->value == 0) { + gtk_adjustment_clamp_page(adj, + (gfloat) bpm_to_thing(1), + (gfloat) tempo_to_thing(maxtempo)); + } + + /* It is essential to call this even when no change... */ + gtk_adjustment_value_changed(adj); + } +} + +/* + * Create the canvas item for this tempo element or update its + * position on a scale change. + */ +static void +update_tempo(MelysTempo *mtempo, struct tempoElement *tempo, gboolean force) +{ + MelysView *mview; + GnomeCanvasItem *item; + struct display_info *dinfo; + struct tempomapElement *tmap; + int state; + + mview = MELYS_VIEW(mtempo); + + /* If elements are destroyed then we can't touch them */ + if (MD_IS_DESTROYED(tempo) || MD_IS_DESTROYED(mview->viewcon)) + return; + + /* If the element is not modified then there is no need to do anything */ + if (!force && !MD_MODIFIED(mview->viewcon) && !MD_MODIFIED(tempo)) + return; + + if (GTK_OBJECT_DESTROYED(mtempo)) + return; + + tmap = MD_TEMPOMAP(mview->viewcon); + + /* See if this note is selected or not */ + if (MD_SELECTED(tempo)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + dinfo = g_dataset_get_data(tempo, mview->infostr); + if (dinfo == NULL) { + GnomeCanvasGroup *rgroup; + + rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); + + /* + * A diamond shape would be cool, but we will draw a little + * box for now. + * Or a circle?? + */ + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_RECT, + "x1", (double) -4.0, + "y1", (double) -4.0, + "x2", (double) 4.0, + "y2", (double) 4.0, + "width_pixels", 1, + "outline_color", "black", + NULL); + + dinfo = g_new(struct display_info, 1); + gtk_object_ref((GtkObject *) item); + dinfo->item = (GtkObject *)item; + + MD_WREF(tempo); + dinfo->elem = MD_ELEMENT(tempo); + + MD_WREF(tmap); + dinfo->con = MD_CONTAINER(tmap); + + g_dataset_set_data_full(tempo, mview->infostr, + dinfo, view_display_info_free); + gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); + + gtk_signal_connect(GTK_OBJECT(item), "event", + GTK_SIGNAL_FUNC(melys_view_item_event), mtempo); + + } + + g_assert(dinfo != NULL); + item = GNOME_CANVAS_ITEM(dinfo->item); + + canvas_item_move_abs(item, tick_to_x(mtempo, MD_TIME(tempo)), + tempo_to_y(mtempo, tempo->micro_tempo)); + + gnome_canvas_item_set(item, + "fill_color_gdk", >K_WIDGET(mtempo)->style->light[state], + NULL); +} + +/* + * 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 +tempo_scale_changed(MelysView *mview) +{ + + g_return_if_fail(mview->viewcon); + + if (MELYS_VIEW_CLASS(parent_class)->scale_changed) + MELYS_VIEW_CLASS(parent_class)->scale_changed(mview); + + tempo_common_draw(MELYS_TEMPO(mview), TRUE); +} + +static int +tempo_get_nthing(MelysView *mview, struct element *el) +{ + + /* Return the value in bpm */ + /* Mmmm... should be a double? */ + return tempo_to_thing(MD_TEMPO(el)->micro_tempo); +} + +/* + * Deal with dropping an element on to us. + */ +static gboolean +tempo_drop_elem(MelysView *mview, struct element *elem, int nthing) +{ + + if (MD_TYPE(elem) != MD_TYPE_TEMPO) + return FALSE; + + MD_TEMPO(elem)->micro_tempo = thing_to_tempo(nthing); + md_add_sort(mview->viewcon, elem); + + return TRUE; +} diff -rNu melys-0.1.5/widgets/melystempo.m melys-0.1.6/widgets/melystempo.m --- melys-0.1.5/widgets/melystempo.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.6/widgets/melystempo.m Mon Nov 29 08:56:51 1999 @@ -0,0 +1,478 @@ +>>name melystempo.m - Display for tempo, time-signature and key-signature. + +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. + +>>header gtk/gtktable.h +>>header gtk/gtkvbox.h +>>header gtk/gtkhbox.h +>>header gtk/gtkframe.h +>>header gtk/gtksignal.h +>>header gtk/gtklabel.h + +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-canvas-util.h +>>header libgnomeui/gnome-canvas-line.h +>>header libgnomeui/gnome-canvas-rect-ellipse.h + +>>header viewcontrol.h +>>header melysscroll.h +>>header melysview.h +>>header melysscale.h +>># /* TEMP */ +>>header melysrule.h +>>header melwidgets.h +>>header elements.h +>>header md.h +>>header song.h + +>>gtkobject melys_tempo melys_view + +>>headerdef @header + +/* + * The MelysTempo structure. Each instance of the class is + * allocated one of these structures. + */ +struct _MelysTempo { + MelysView melys_view; + + GtkObject *lines; /* The lines connecting the changes */ +}; + +/* + * The MelysTempoClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysTempoClass { + MelysViewClass parent_class; + // XXX class definition here +}; + +>>extern + +/* The list of signal id's that are being added for MelysTempo. */ +enum { + // XXX symbols for all signals here + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + +>>extern + +/* + * scale conversions + */ +#define MAX_BPM 1000 +#define thing_to_bpm(n) (MAX_BPM - (n)) +#define bpm_to_thing(b) (MAX_BPM - (b)) +#define thing_to_tempo(n) (MD_BPM_TO_TEMPO(thing_to_bpm(n))) +#define tempo_to_thing(tempo) (bpm_to_thing(MD_TEMPO_TO_BPM(tempo)) ) +#define tick_to_x(tp, t) view_control_tick_to_x( \ + MELYS_VIEW(tp)->vcp, t) +#define tempo_to_y(tp, ut) view_control_thing_to_y( \ + MELYS_VIEW(tp)->vcp, MAX_BPM - MD_TEMPO_TO_BPM(ut)) + + +>>function melys_tempo_new +GtkWidget * +struct tempomapElement *tmap; + +>>description +Create a new MelysTempo object. +>>code + GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_tempo_get_type())); + MelysView *mview = MELYS_VIEW(w); + + mview->viewcon = MD_CONTAINER(tmap); + MD_REF(tmap); + + return w; + + +>>function melys_tempo_init +static void +MelysTempo *mtempo; The MelysTempo to init +>>description +Initialise the MelysTempo. +>>code + MelysView *mview = MELYS_VIEW(mtempo); + GtkWidget *mscale; + GtkTable *tab; + GtkBox *vbox; + GtkBox *vbox2; + GtkBox *hbox; + GtkWidget *invis; + GtkWidget *frame1; + GtkWidget *frame2; + + mview->vcp->vspace = 0; /* No separation between items on scale */ + MELYS_SCROLL(mview->canvas)->hbase = 5; + MELYS_RULE(mview->ruler)->hbase = 5; /* TEMP */ + view_control_set_vertical(mview->vcp, 1); + view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE * 4); + view_control_set_limits(mview->vcp, 1, 0, 1, 0); + + tab = (GtkTable *)gtk_table_new(2, 2, FALSE); + gtk_box_pack_start(GTK_BOX(mtempo), GTK_WIDGET(tab), 1, 1, 0); + + /* vert scrollbar group */ + gtk_table_attach(tab, mview->vcp->vsb, 1, 2, 0, 1, + 0, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, 0 + ); + gtk_table_attach(tab, mview->vcp->hsb, 0, 1, 1, 2, + GTK_FILL|GTK_SHRINK|GTK_EXPAND, + 0, + 0, 0 + ); + + vbox = (GtkBox *)gtk_vbox_new(0, 0); + frame1 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); + + gtk_box_pack_start(vbox, mview->ruler, 0, 0, 0); + gtk_box_pack_start(vbox, mview->canvas, 1, 1, 0); + + gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox)); + + vbox2 = (GtkBox *)gtk_vbox_new(0, 0); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); + mscale = melys_scale_new(mview->vcp, 0, MAX_BPM, 40); + invis = gtk_label_new(""); + + /* Pack them into a box */ + gtk_container_add(GTK_CONTAINER(frame2), mscale); + gtk_box_pack_start(vbox2, invis, 0, 0, 0); + gtk_box_pack_start(vbox2, frame2, 1, 1, 0); + + hbox = (GtkBox *)gtk_hbox_new(0, 0); + gtk_box_pack_start(hbox, GTK_WIDGET(vbox2), 0, 0, 0); + gtk_box_pack_start(hbox, GTK_WIDGET(frame1), 1, 1, 0); + gtk_table_attach(tab, GTK_WIDGET(hbox), 0, 1, 0, 2, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + 0, 0 + ); + + gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); + gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); + mview->vthings = MAX_BPM; /* Allow up to this many bpm */ + + gtk_widget_show_all(GTK_WIDGET(tab)); + + +>>function melys_tempo_class_init +static void +MelysTempoClass *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()); + + // XXX Add args + + // XXX Create signals + + gtk_object_class_add_signals(object_class, + melys_tempo_signals, LAST_SIGNAL); + + widget_class->draw = tempo_draw; + widget_class->realize = tempo_realize; + + melys_view_class->scale_changed = tempo_scale_changed; + melys_view_class->get_nthing = tempo_get_nthing; + melys_view_class->drop_elem = tempo_drop_elem; + + +>>function tempo_realize +static void +GtkWidget *w; + +>>code + MelysTempo *mtempo = MELYS_TEMPO(w); + + if (GTK_WIDGET_CLASS(parent_class)->realize) + GTK_WIDGET_CLASS(parent_class)->realize(w); + + tempo_scale_changed(MELYS_VIEW(mtempo)); + +>>function tempo_draw +static void +GtkWidget *w; +GdkRectangle *area; + +>>code + + tempo_common_draw(MELYS_TEMPO(w), FALSE); + + GTK_WIDGET_CLASS(parent_class)->draw(w, area); + + +>>function tempo_common_draw +static void +MelysTempo *mtempo; +gboolean force; + +>>description +Draw the tempo elements within the tempomap. + +>>code + int n; + int ntempos; + int maxtempo; + int lasttempo; + int pnum; + struct element *el; + struct tempomapElement *tmap; + MelysView *mview; + GnomeCanvasPoints *points; + + mview = MELYS_VIEW(mtempo); + + tmap = (struct tempomapElement *)mview->viewcon; + g_return_if_fail(MD_TYPE(tmap) == MD_TYPE_TEMPOMAP); + + ntempos = 0; + + /* Make sure that duration is same as root + * NB: modified is NOT set */ + MD_CONTAINER(tmap)->duration = MD_DURATION(mview->song->mdroot); + + /* Ensure that the line is created */ + if (mtempo->lines == NULL) { + mtempo->lines = (GtkObject *)gnome_canvas_item_new( + gnome_canvas_root((GnomeCanvas*)mview->canvas), + GNOME_TYPE_CANVAS_LINE, + NULL); + } + + /* + * First set the litle marks that show where tempo changes + * occur. + */ + for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { + el = MD_GET_INDEX(tmap, n); + if (el->type == MD_TYPE_TEMPO) { + update_tempo(mtempo, MD_TEMPO(el), force); + ntempos++; + } + } + + /* + * Now draw the line that connects all the change points. + * You need two line points per change. + */ + points = gnome_canvas_points_new(2 * ntempos); + pnum = 0; + lasttempo = -1; + maxtempo = 0; + + for (n = 0; n < MD_CONTAINER_LEN(tmap); n++) { + el = MD_GET_INDEX(tmap, n); + if (el->type == MD_TYPE_TEMPO) { + if (lasttempo > 0) { + points->coords[pnum] = tick_to_x(mtempo, MD_TIME(el)); + points->coords[pnum+1] = tempo_to_y(mtempo, lasttempo); + pnum += 2; + } + + points->coords[pnum] = tick_to_x(mtempo, MD_TIME(el)); + points->coords[pnum+1] = tempo_to_y(mtempo, + MD_TEMPO(el)->micro_tempo); + pnum += 2; + + lasttempo = MD_TEMPO(el)->micro_tempo; + maxtempo = MAX(lasttempo, maxtempo); + } + } + + points->coords[pnum] = tick_to_x(mtempo, MD_ENDTIME(mview->song->mdroot)); + points->coords[pnum+1] = tempo_to_y(mtempo, lasttempo); + + gnome_canvas_item_set(GNOME_CANVAS_ITEM(mtempo->lines), + "points", points, + NULL); + + gnome_canvas_points_unref(points); + + if (maxtempo) { + GtkAdjustment *adj; + + /* + * If the slider is right at the top, then we try to adjust + * it so that all the changes are in view. + */ + adj = mview->vcp->vadj; + if (adj->value == 0) { + gtk_adjustment_clamp_page(adj, + (gfloat) bpm_to_thing(1), + (gfloat) tempo_to_thing(maxtempo)); + } + + /* It is essential to call this even when no change... */ + gtk_adjustment_value_changed(adj); + } + +>>function update_tempo +static void +MelysTempo *mtempo; +struct tempoElement *tempo; +gboolean force; + +>>description +Create the canvas item for this tempo element or update its +position on a scale change. + +>>code + MelysView *mview; + GnomeCanvasItem *item; + struct display_info *dinfo; + struct tempomapElement *tmap; + int state; + + mview = MELYS_VIEW(mtempo); + + /* If elements are destroyed then we can't touch them */ + if (MD_IS_DESTROYED(tempo) || MD_IS_DESTROYED(mview->viewcon)) + return; + + /* If the element is not modified then there is no need to do anything */ + if (!force && !MD_MODIFIED(mview->viewcon) && !MD_MODIFIED(tempo)) + return; + + if (GTK_OBJECT_DESTROYED(mtempo)) + return; + + tmap = MD_TEMPOMAP(mview->viewcon); + + /* See if this note is selected or not */ + if (MD_SELECTED(tempo)) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_NORMAL; + + dinfo = g_dataset_get_data(tempo, mview->infostr); + if (dinfo == NULL) { + GnomeCanvasGroup *rgroup; + + rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); + + /* + * A diamond shape would be cool, but we will draw a little + * box for now. + * Or a circle?? + */ + item = gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_RECT, + "x1", (double) -4.0, + "y1", (double) -4.0, + "x2", (double) 4.0, + "y2", (double) 4.0, + "width_pixels", 1, + "outline_color", "black", + NULL); + + dinfo = g_new(struct display_info, 1); + gtk_object_ref((GtkObject *) item); + dinfo->item = (GtkObject *)item; + + MD_WREF(tempo); + dinfo->elem = MD_ELEMENT(tempo); + + MD_WREF(tmap); + dinfo->con = MD_CONTAINER(tmap); + + g_dataset_set_data_full(tempo, mview->infostr, + dinfo, view_display_info_free); + gtk_object_set_data(GTK_OBJECT(item), mview->infostr, dinfo); + + gtk_signal_connect(GTK_OBJECT(item), "event", + GTK_SIGNAL_FUNC(melys_view_item_event), mtempo); + + } + + g_assert(dinfo != NULL); + item = GNOME_CANVAS_ITEM(dinfo->item); + + canvas_item_move_abs(item, tick_to_x(mtempo, MD_TIME(tempo)), + tempo_to_y(mtempo, tempo->micro_tempo)); + + gnome_canvas_item_set(item, + "fill_color_gdk", >K_WIDGET(mtempo)->style->light[state], + NULL); + +>>function tempo_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->viewcon); + + if (MELYS_VIEW_CLASS(parent_class)->scale_changed) + MELYS_VIEW_CLASS(parent_class)->scale_changed(mview); + + tempo_common_draw(MELYS_TEMPO(mview), TRUE); + + +>>function tempo_get_nthing +static int +MelysView *mview; +struct element *el; + +>>code + + /* Return the value in bpm */ + /* Mmmm... should be a double? */ + return tempo_to_thing(MD_TEMPO(el)->micro_tempo); + + +>>function tempo_drop_elem +static gboolean +MelysView *mview; +struct element *elem; +int nthing; + +>>description +Deal with dropping an element on to us. + +>>code + + if (MD_TYPE(elem) != MD_TYPE_TEMPO) + return FALSE; + + MD_TEMPO(elem)->micro_tempo = thing_to_tempo(nthing); + md_add_sort(mview->viewcon, elem); + + return TRUE; diff -rNu melys-0.1.5/widgets/melystrack.c melys-0.1.6/widgets/melystrack.c --- melys-0.1.5/widgets/melystrack.c Wed Nov 24 22:55:05 1999 +++ melys-0.1.6/widgets/melystrack.c Mon Nov 29 10:48:11 1999 @@ -216,10 +216,8 @@ * Reset the adjustments. We do not control the horizontal * adjustment. That is handled by trackdisplay. */ - mtrack->vcp->vadj->lower = 0.0; - mtrack->vcp->vadj->upper = root->tracks; + view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); - gtk_adjustment_changed(mtrack->vcp->vadj); melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -251,8 +249,8 @@ MelysTrack *mtrack = (MelysTrack *) w; /* Re-set the vertical scrollbar limits */ - mtrack->vcp->vadj->lower = 0.0; - mtrack->vcp->vadj->upper = (double)mtrack->mdroot->tracks; + view_control_set_range(mtrack->vcp, + VC_VERTICAL, 0.0, mtrack->mdroot->tracks); /* We do not own the horizontal scrollbar */ @@ -299,10 +297,6 @@ static void zoom(GtkObject *obj, gpointer data) { - MelysTrack *mtrack = data; - if (mtrack->mdroot) - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - if (mtrack->song) - song_view_update(mtrack->song); + gtk_widget_queue_draw(GTK_WIDGET(data)); } diff -rNu melys-0.1.5/widgets/melystrack.m melys-0.1.6/widgets/melystrack.m --- melys-0.1.5/widgets/melystrack.m Wed Nov 10 13:13:30 1999 +++ melys-0.1.6/widgets/melystrack.m Sun Nov 28 16:14:23 1999 @@ -200,10 +200,8 @@ * Reset the adjustments. We do not control the horizontal * adjustment. That is handled by trackdisplay. */ - mtrack->vcp->vadj->lower = 0.0; - mtrack->vcp->vadj->upper = root->tracks; + view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); - gtk_adjustment_changed(mtrack->vcp->vadj); melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -241,8 +239,8 @@ MelysTrack *mtrack = (MelysTrack *) w; /* Re-set the vertical scrollbar limits */ - mtrack->vcp->vadj->lower = 0.0; - mtrack->vcp->vadj->upper = (double)mtrack->mdroot->tracks; + view_control_set_range(mtrack->vcp, + VC_VERTICAL, 0.0, mtrack->mdroot->tracks); /* We do not own the horizontal scrollbar */ @@ -290,10 +288,6 @@ gpointer data; >>code - MelysTrack *mtrack = data; - if (mtrack->mdroot) - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - if (mtrack->song) - song_view_update(mtrack->song); + gtk_widget_queue_draw(GTK_WIDGET(data)); diff -rNu melys-0.1.5/widgets/melystrackdisplay.c melys-0.1.6/widgets/melystrackdisplay.c --- melys-0.1.5/widgets/melystrackdisplay.c Wed Nov 24 22:55:06 1999 +++ melys-0.1.6/widgets/melystrackdisplay.c Mon Nov 29 10:48:12 1999 @@ -138,6 +138,7 @@ static void slice_cb(GtkWidget *w, gpointer data); static void join_cb(GtkWidget *w, gpointer data); static void delete_cb(GtkWidget *w, gpointer data); +static void piano_cb(GtkWidget *w, gpointer data); static void part_prop_cb(GtkWidget *w, gpointer data); static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time, gpointer user_data); @@ -183,6 +184,17 @@ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, + GNOMEUIINFO_SEPARATOR, + + {GNOME_APP_UI_ITEM, N_("Piano roll view"), + N_("Open a piano roll view for this part"), + piano_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + + GNOMEUIINFO_SEPARATOR, + {GNOME_APP_UI_ITEM, N_("Properties..."), N_("Part property box"), part_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ @@ -402,9 +414,10 @@ { /* Get the scroll to position correct */ - mdisp->vcp->hadj->value--; /* slight hack, sorry */ + mdisp->hoffset = -1; disp_scroll(mdisp->vcp->hadj, mdisp); - set_hscroll(mdisp); + mdisp->voffset = -1; + disp_scroll(mdisp->vcp->vadj, mdisp); } /* @@ -454,12 +467,12 @@ { MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); GtkAdjustment *hadj; - long t; + ticktime_t t; int x; hadj = mdisp->vcp->hadj; - t = (unsigned long)mdisp->posadj->value; + t = (ticktime_t)mdisp->posadj->value; x = tick_to_x(mdisp, t); if (x != tick_to_x(mdisp, mdisp->poffset)) { @@ -494,8 +507,8 @@ GTK_WIDGET(mdisp->canvas)->allocation.width); boundry = page_width / 10; - if (t - mdisp->hoffset > page_width - boundry && - t - mdisp->hoffset <= page_width) { + if (t - mdisp->hoffset > (ticktime_t)page_width - boundry && + t - mdisp->hoffset <= (ticktime_t)page_width) { hadj->value += page_width - 2*boundry; @@ -1200,13 +1213,11 @@ pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp->canvas)->allocation.width); ticklen = MD_ENDTIME(mdisp->mdroot) + 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(mdisp, 20); - gtk_adjustment_changed(adj); + + view_control_set_range(mdisp->vcp, VC_HORIZONTAL, 0.0, ticklen); if (adj->value > adj->upper - adj->page_size) adj->value = adj->upper - adj->page_size; @@ -1243,7 +1254,7 @@ struct partElement *part; struct partElement *newpart; struct trackElement *track; - unsigned long t; + ticktime_t t; t = mdisp->click_tick; t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); @@ -1273,7 +1284,7 @@ MelysTrackDisplay *mdisp = data; struct partElement *part; struct trackElement *track; - unsigned long t; + ticktime_t t; t = mdisp->click_tick; @@ -1320,6 +1331,16 @@ } } +static void +piano_cb(GtkWidget *w, gpointer data) +{ + MelysTrackDisplay *mdisp = data; + extern void create_piano(struct song *, struct containerElement *); + + /* borrow routine from trackinfo */ + create_piano(mdisp->song, MD_CONTAINER(mdisp->click_part)); +} + /* * Bring up the part property box. */ @@ -1565,7 +1586,7 @@ struct drag_element_data *dp; struct partElement *newpart; struct trackElement *track; - unsigned long t; + ticktime_t t; int drop_track; int drop_tick; int track_start = 0; diff -rNu melys-0.1.5/widgets/melystrackdisplay.m melys-0.1.6/widgets/melystrackdisplay.m --- melys-0.1.5/widgets/melystrackdisplay.m Wed Nov 24 22:47:47 1999 +++ melys-0.1.6/widgets/melystrackdisplay.m Sun Nov 28 14:12:55 1999 @@ -104,7 +104,7 @@ /* Saved click position and state information */ struct partElement *click_part; /* Part that was click on */ - unsigned long click_tick; /* Clicked tick position */ + ticktime_t click_tick; /* Clicked tick position */ struct trackElement *click_track; /* Clicked track */ int click_ntrack; /* Clicked track position */ enum click_state click_state; /* mouse state */ @@ -188,6 +188,17 @@ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, + GNOMEUIINFO_SEPARATOR, + + {GNOME_APP_UI_ITEM, N_("Piano roll view"), + N_("Open a piano roll view for this part"), + piano_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + + GNOMEUIINFO_SEPARATOR, + {GNOME_APP_UI_ITEM, N_("Properties..."), N_("Part property box"), part_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ @@ -380,9 +391,10 @@ >>code /* Get the scroll to position correct */ - mdisp->vcp->hadj->value--; /* slight hack, sorry */ + mdisp->hoffset = -1; disp_scroll(mdisp->vcp->hadj, mdisp); - set_hscroll(mdisp); + mdisp->voffset = -1; + disp_scroll(mdisp->vcp->vadj, mdisp); >>function disp_scroll @@ -436,12 +448,12 @@ >>code MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); GtkAdjustment *hadj; - long t; + ticktime_t t; int x; hadj = mdisp->vcp->hadj; - t = (unsigned long)mdisp->posadj->value; + t = (ticktime_t)mdisp->posadj->value; x = tick_to_x(mdisp, t); if (x != tick_to_x(mdisp, mdisp->poffset)) { @@ -476,8 +488,8 @@ GTK_WIDGET(mdisp->canvas)->allocation.width); boundry = page_width / 10; - if (t - mdisp->hoffset > page_width - boundry && - t - mdisp->hoffset <= page_width) { + if (t - mdisp->hoffset > (ticktime_t)page_width - boundry && + t - mdisp->hoffset <= (ticktime_t)page_width) { hadj->value += page_width - 2*boundry; @@ -1219,13 +1231,11 @@ pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp->canvas)->allocation.width); ticklen = MD_ENDTIME(mdisp->mdroot) + 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(mdisp, 20); - gtk_adjustment_changed(adj); + + view_control_set_range(mdisp->vcp, VC_HORIZONTAL, 0.0, ticklen); if (adj->value > adj->upper - adj->page_size) adj->value = adj->upper - adj->page_size; @@ -1266,7 +1276,7 @@ struct partElement *part; struct partElement *newpart; struct trackElement *track; - unsigned long t; + ticktime_t t; t = mdisp->click_tick; t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); @@ -1298,7 +1308,7 @@ MelysTrackDisplay *mdisp = data; struct partElement *part; struct trackElement *track; - unsigned long t; + ticktime_t t; t = mdisp->click_tick; @@ -1346,6 +1356,18 @@ md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); } +>>function piano_cb +static void +GtkWidget *w; +gpointer data; The track display widget + +>>code + MelysTrackDisplay *mdisp = data; + extern void create_piano(struct song *, struct containerElement *); + + /* borrow routine from trackinfo */ + create_piano(mdisp->song, MD_CONTAINER(mdisp->click_part)); + >>function part_prop_cb static void @@ -1610,7 +1632,7 @@ struct drag_element_data *dp; struct partElement *newpart; struct trackElement *track; - unsigned long t; + ticktime_t t; int drop_track; int drop_tick; int track_start = 0; diff -rNu melys-0.1.5/widgets/melystrackinfo.c melys-0.1.6/widgets/melystrackinfo.c --- melys-0.1.5/widgets/melystrackinfo.c Wed Nov 24 22:55:06 1999 +++ melys-0.1.6/widgets/melystrackinfo.c Mon Nov 29 10:48:14 1999 @@ -44,6 +44,7 @@ #include "viewcontrol.h" #include "melysview.h" #include "melyspiano.h" +#include "melystempo.h" #include "melystrackinfo.h" #include "melystrack.h" #include "intl.h" @@ -95,7 +96,7 @@ } def_col_info[] = { {NUMBER, COL_TEXT, "", 20, FALSE}, - {NAME, COL_TEXT, N_("Name"), 100, TRUE}, + {NAME, COL_TEXT, N_("Name"), 80, TRUE}, {PROGRAM, COL_TEXT, N_("Prog"), 28, TRUE}, {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, @@ -162,6 +163,8 @@ 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 tempo_cb(GtkWidget *w, gpointer data); +static void create_tempo(struct song *song); static void props_cb(GtkWidget *w, gpointer data); @@ -187,12 +190,23 @@ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, + GNOMEUIINFO_SEPARATOR, + {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_("_Tempomap view"), + N_("Open a view of the tempo, time and key signatures for this track"), + tempo_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + + GNOMEUIINFO_SEPARATOR, + {GNOME_APP_UI_ITEM, N_("Properties..."), N_("Bring up the track properties dialog"), props_cb, (gpointer)0, (gpointer)0, /* Callback and data */ @@ -1557,15 +1571,43 @@ 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); + create_piano(minfo->song, MD_CONTAINER(track)); +} + +void +create_piano(struct song *song, struct containerElement *con) +{ + MelysPiano *mp; + + mp = (MelysPiano *)melys_piano_new(con); + melys_view_set_song(MELYS_VIEW(mp), song); + mel_add_view(song->mdi, song->child, GTK_WIDGET(mp), 0); +} + +static void +tempo_cb(GtkWidget *w, gpointer data) +{ + MelysTrackInfo *minfo = data; + + create_tempo(minfo->song); +} + +static void +create_tempo(struct song *song) +{ + MelysTempo *mtempo; + struct tempomapElement *tmap; + + tmap = md_get_tempomap(song->mdroot); + + mtempo = (MelysTempo *)melys_tempo_new(tmap); + melys_view_set_song(MELYS_VIEW(mtempo), song); + mel_add_view(song->mdi, song->child, GTK_WIDGET(mtempo), 0); } static void diff -rNu melys-0.1.5/widgets/melystrackinfo.m melys-0.1.6/widgets/melystrackinfo.m --- melys-0.1.5/widgets/melystrackinfo.m Tue Nov 23 20:42:05 1999 +++ melys-0.1.6/widgets/melystrackinfo.m Fri Nov 26 22:07:50 1999 @@ -36,6 +36,7 @@ >>header viewcontrol.h >>header melysview.h >>header melyspiano.h +>>header melystempo.h >>gtkobject melys_track_info gtk_widget @@ -150,7 +151,7 @@ } def_col_info[] = { {NUMBER, COL_TEXT, "", 20, FALSE}, - {NAME, COL_TEXT, N_("Name"), 100, TRUE}, + {NAME, COL_TEXT, N_("Name"), 80, TRUE}, {PROGRAM, COL_TEXT, N_("Prog"), 28, TRUE}, {CHANNEL, COL_TEXT, N_("C"), 14, TRUE}, {MUTE, COL_BUTTON, N_("Mute"), 28, TRUE}, @@ -180,12 +181,23 @@ (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ 0, (GdkModifierType)0, /* Accel */ (GtkWidget*)0 }, + GNOMEUIINFO_SEPARATOR, + {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_("_Tempomap view"), + N_("Open a view of the tempo, time and key signatures for this track"), + tempo_cb, (gpointer)0, (gpointer)0, /* Callback and data */ + (GnomeUIPixmapType)0, NULL, /* Pixmap and info */ + 0, (GdkModifierType)0, /* Accel */ + (GtkWidget*)0 }, + + GNOMEUIINFO_SEPARATOR, + {GNOME_APP_UI_ITEM, N_("Properties..."), N_("Bring up the track properties dialog"), props_cb, (gpointer)0, (gpointer)0, /* Callback and data */ @@ -1619,15 +1631,51 @@ 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); + create_piano(minfo->song, MD_CONTAINER(track)); + + +>>function create_piano +void +struct song *song; +struct containerElement *con; + +>>code + MelysPiano *mp; + + mp = (MelysPiano *)melys_piano_new(con); + melys_view_set_song(MELYS_VIEW(mp), song); + mel_add_view(song->mdi, song->child, GTK_WIDGET(mp), 0); + + +>>function tempo_cb +static void +GtkWidget *w; The menu item +gpointer data; The minfo + +>>code + MelysTrackInfo *minfo = data; + + create_tempo(minfo->song); + + +>>function create_tempo +static void +struct song *song; + +>>code + MelysTempo *mtempo; + struct tempomapElement *tmap; + + tmap = md_get_tempomap(song->mdroot); + + mtempo = (MelysTempo *)melys_tempo_new(tmap); + melys_view_set_song(MELYS_VIEW(mtempo), song); + mel_add_view(song->mdi, song->child, GTK_WIDGET(mtempo), 0); >>function props_cb diff -rNu melys-0.1.5/widgets/melysview.c melys-0.1.6/widgets/melysview.c --- melys-0.1.5/widgets/melysview.c Wed Nov 24 22:55:07 1999 +++ melys-0.1.6/widgets/melysview.c Mon Nov 29 10:48:15 1999 @@ -36,6 +36,7 @@ #include "viewcontrol.h" #include "melysrule.h" #include "melwidgets.h" +#include "melysscroll.h" #include "song.h" #include "melysview.h" #include "meldnd.h" @@ -52,6 +53,8 @@ /* The list of signal id's that are being added for MelysView. */ enum { SCALE_CHANGED, + THING_POSITION, + TICK_POSITION, LAST_SIGNAL }; @@ -98,7 +101,7 @@ static void melys_view_class_init(MelysViewClass *klass); static void view_destroy(GtkObject *obj); static void view_draw(GtkWidget *widget, GdkRectangle *area); -static void view_scroll(GtkAdjustment *adj, gpointer data); +static int canvas_event(GtkWidget *w, GdkEvent *event, gpointer data); static void button_press(MelysView *mview, struct element *elem, GdkEventButton *event); static void button_release(MelysView *mview, struct element *elem, @@ -108,8 +111,8 @@ static void set_hscroll(MelysView *mview); static void set_vscroll(MelysView *mview); static void song_pos_cb(GtkAdjustment *adj, gpointer data); -static void set_scroll_region(MelysView *mview); -static void vcp_changed(GtkObject *vobj, gpointer data); +static void set_scrolls(MelysView *mview); +static void vcp_scale_changed(GtkObject *vobj, gpointer data); static void view_scale_changed(MelysView *mview); static void drag_setup(MelysView *mview, GdkEventMotion *event); static gboolean drag_motion(GtkWidget *widget, GdkDragContext *context, @@ -131,7 +134,6 @@ gpointer user_data); static struct containerElement *view_def_get_base(MelysView *mview, int thing); static gboolean view_def_drop(MelysView *mview, struct element *el, int thing); -static int nthing_unimplemented(MelysView *mview, struct element *el); static GtkVBoxClass *parent_class = NULL; @@ -204,7 +206,7 @@ #else gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_colormap(gdk_imlib_get_colormap()); - canvas = (GnomeCanvas *)gnome_canvas_new(); + canvas = (GnomeCanvas *)melys_scroll_new(mview->vcp, VC_BOTH, 0, 0); #endif mview->canvas = GTK_WIDGET(canvas); @@ -220,12 +222,8 @@ mview->infostr = g_strdup_printf("%d-info", ViewID++); - gtk_signal_connect((GtkObject *)mview->vcp, "scale-changed", - (GtkSignalFunc)vcp_changed, mview); - gtk_signal_connect((GtkObject *)mview->vcp->hadj, "value-changed", - (GtkSignalFunc)view_scroll, mview); - gtk_signal_connect((GtkObject *)mview->vcp->vadj, "value-changed", - (GtkSignalFunc)view_scroll, mview); + gtk_signal_connect(GTK_OBJECT(mview->vcp), "scale-changed", + vcp_scale_changed, mview); /* Set up a drop site for this widget */ gtk_drag_dest_set(GTK_WIDGET(mview->canvas), @@ -243,6 +241,8 @@ GTK_SIGNAL_FUNC(drag_leave), mview); gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", GTK_SIGNAL_FUNC(drag_end), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", + GTK_SIGNAL_FUNC(canvas_event), mview); } /* @@ -271,6 +271,22 @@ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0 ); + melys_view_signals[THING_POSITION] = gtk_signal_new("thing-position", + GTK_RUN_FIRST|GTK_RUN_NO_RECURSE, + object_class->type, + GTK_SIGNAL_OFFSET(MelysViewClass, thing_position), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT + ); + melys_view_signals[TICK_POSITION] = gtk_signal_new("tick-position", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysViewClass, tick_position), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT + ); gtk_object_class_add_signals(object_class, melys_view_signals, LAST_SIGNAL); @@ -281,7 +297,7 @@ klass->scale_changed = view_scale_changed; klass->get_base_from_pos = view_def_get_base; klass->drop_elem = view_def_drop; - klass->get_nthing = nthing_unimplemented; + klass->get_nthing = NULL; } static void @@ -330,6 +346,19 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); } +void +view_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->con); + MD_WUNREF(dinfo->elem); + + g_free(_dinfo); +} + /* * Look through all the parts and set up the part items for each * part. @@ -339,49 +368,12 @@ { MelysView *mview = (MelysView *)widget; - set_scroll_region(mview); + set_scrolls(mview); if (mview->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); GTK_WIDGET_CLASS(parent_class)->draw(widget, area); -} - -/* - * Scroll the canvas to the correct position. Called when a - * scrollbar changes and when resizing etc. - */ -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); - } } @@ -419,6 +411,51 @@ } /* + * An event on the canvas. Events appear to come here first, + * must return false to allow the items to see them. + */ +static int +canvas_event(GtkWidget *w, GdkEvent *event, gpointer data) +{ + MelysView *mview = MELYS_VIEW(data); + int thing; + double dx, dy; + int x, y; + + gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), + (double) event->motion.x, event->motion.y, + &dx, &dy); + + x = dx; y = dy; + + switch (event->type) { + case GDK_LEAVE_NOTIFY: + x = -1; y = -1; + goto sendnone; + + case GDK_MOTION_NOTIFY: + sendnone: + if (x != mview->mouse_tick) { + mview->mouse_tick = x; + gtk_signal_emit(GTK_OBJECT(mview), + melys_view_signals[TICK_POSITION], x); + } + + thing = (y<0)? -1: y_to_thing(mview, y); + if (thing != mview->mouse_thing) { + mview->mouse_tick = thing; + gtk_signal_emit(GTK_OBJECT(mview), + melys_view_signals[THING_POSITION], thing); + } + break; + default: + break; + } + + return FALSE; +} + +/* * The implementation connects "event" of all its relavent * canvas items to this function which implements the * standard behaviour for button clicks etc. @@ -605,13 +642,12 @@ pageticks = x_to_tick(mview, GTK_WIDGET(mview->canvas)->allocation.width); ticklen = MD_ENDTIME(mview->viewcon) + 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); + + view_control_set_range(mview->vcp, + VC_HORIZONTAL, MD_TIME(mview->viewcon), ticklen); if (adj->value > adj->upper - adj->page_size) adj->value = adj->upper - adj->page_size; @@ -627,18 +663,16 @@ set_vscroll(MelysView *mview) { int height; + GtkAdjustment *adj; height = GTK_WIDGET(mview->canvas)->allocation.height; + adj = mview->vcp->vadj; - mview->vcp->vadj->page_size = - (height / mview->vcp->vscale); - mview->vcp->vadj->page_increment = mview->vcp->vadj->page_size; + adj->page_size = height / mview->vcp->vscale; + adj->page_increment = adj->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); + view_control_set_range(mview->vcp, VC_VERTICAL, 0.0, mview->vthings); } /* @@ -655,12 +689,12 @@ { MelysView *mview = MELYS_VIEW(data); GtkAdjustment *hadj; - long t; + ticktime_t t; int x; hadj = mview->vcp->hadj; - t = (unsigned long)mview->posadj->value; + t = (ticktime_t)mview->posadj->value; x = tick_to_x(mview, t); if (x != tick_to_x(mview, mview->poffset)) { @@ -677,11 +711,15 @@ * Increase the root duration to match, add on extra to * avoid too many repeated calls -- it can be shrunk again * later. + * XXX needs some thought -- should only increase when we are + * recording. We do not want views on parts to cause the part to + * increase. */ - if (t > MD_ENDTIME(mview->viewcon)) { + if (MD_TYPE(mview->viewcon) == MD_TYPE_TRACK && + t > MD_ENDTIME(mview->viewcon)) { MD_SET_DURATION(mview->viewcon, t + hadj->page_size); mview->posadj->upper = MD_ENDTIME(mview->viewcon); - set_scroll_region(mview); + set_scrolls(mview); } /* @@ -695,12 +733,12 @@ GTK_WIDGET(mview->canvas)->allocation.width); boundry = page_width / 10; - if (t - mview->hoffset > page_width - boundry && - t - mview->hoffset <= page_width) { + if (t - mview->hoffset > (ticktime_t)page_width - boundry && + t - mview->hoffset <= (ticktime_t)page_width) { hadj->value += page_width - 2*boundry; - set_scroll_region(mview); + set_scrolls(mview); } /* @@ -709,7 +747,7 @@ */ if (x < 5) {/*XXX*/ hadj->value = 0; - set_scroll_region(mview); + set_scrolls(mview); } } } @@ -722,11 +760,13 @@ * conjunction with our scroll bars. */ static void -set_scroll_region(MelysView *mview) +set_scrolls(MelysView *mview) { int height; - GnomeCanvas *canvas = GNOME_CANVAS(mview->canvas); GnomeCanvasPoints *points; + GtkAdjustment *hadj; + GtkAdjustment *vadj; + ViewControl *vcp; /* You need to set vthings */ g_return_if_fail(mview->vthings != 0); @@ -734,32 +774,15 @@ if (!GTK_WIDGET_REALIZED(mview)) return; + vcp = mview->vcp; + hadj = vcp->hadj; + vadj = vcp->vadj; + /* It is our job to modify the page_size for the horizontal scroll */ set_hscroll(mview); set_vscroll(mview); -#ifdef maybe_needed_for_track_display - /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mview->canvas)->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; - } -#endif - height = mview->vcp->vadj->upper * mview->vcp->vscale; - gnome_canvas_set_scroll_region(canvas, - 0.0, 0.0, - mview->vcp->hadj->upper, - height - ); points = mview->points; points->coords[0] = 0.0; @@ -773,7 +796,7 @@ } static void -vcp_changed(GtkObject *vobj, gpointer data) +vcp_scale_changed(GtkObject *vobj, gpointer data) { GtkObject *mviewobj = data; @@ -792,8 +815,7 @@ view_scale_changed(MelysView *mview) { - mview->voffset = -1; - set_scroll_region(mview); + set_scrolls(mview); } /* @@ -834,11 +856,9 @@ for (i = 0; i < len; i++) { int nthing; - //struct sel_info *sinfo; struct element *elem; elem = g_slist_nth_data(list, i); - //ntrack = MD_TRACK_NUMBER(sinfo->con); nthing = VIEW_CLASS(mview)->get_nthing(mview, elem); @@ -846,7 +866,7 @@ dragdata[i].con = elem->con; /*XXX not needed */ dragdata[i].tick_offset = MD_TIME(elem) - mview->click_tick; dragdata[i].thing_offset = nthing - mview->click_nthing; - dragdata[i].tick_len = MD_DURATION(elem); + dragdata[i].tick_len = md_get_duration(elem); } dragdata[0].len = len; dragdata[0].data_size = sizeof(*dragdata); @@ -1087,7 +1107,7 @@ struct drag_element_data *dragdata; struct drag_element_data *dp; struct element *newelem; - unsigned long t; + ticktime_t t; int drop_thing; int drop_tick; int thing_start = 0; @@ -1129,10 +1149,6 @@ */ for (i = 0; i < len; i++) { dp = dragdata+i; -#if 0 - if (dp->element->type != MD_TYPE_PART) - goto error; -#endif /* Check and adjust for droping before the beginning */ if (dp->thing_offset + drop_thing < 0) @@ -1258,11 +1274,4 @@ return TRUE; -} - -static int -nthing_unimplemented(MelysView *mview, struct element *el) -{ - g_warning("The get_nthing method is not implemented"); - return 0; } diff -rNu melys-0.1.5/widgets/melysview.m melys-0.1.6/widgets/melysview.m --- melys-0.1.5/widgets/melysview.m Wed Nov 24 22:43:52 1999 +++ melys-0.1.6/widgets/melysview.m Sun Nov 28 16:14:23 1999 @@ -33,6 +33,7 @@ >>header viewcontrol.h >>header melysrule.h >>header melwidgets.h +>>header melysscroll.h >>header song.h @@ -84,6 +85,7 @@ GtkWidget *ruler; /* A ruler that can be used */ GtkWidget *posline; /* Song position pointer */ //GtkWidget *menu; /* The item context menu */ + /* For the posline */ void *points; @@ -93,12 +95,15 @@ /* Button click state */ int click_state; struct element *click_elem; /* Element clicked on */ - unsigned long click_tick; /* Time at point of click */ + ticktime_t click_tick; /* Time at point of click */ /* The 'thing' is not necessarily the immediate parent of click_elem */ /* although it usually will be and it will be an ancestor */ int click_nthing; /* The y position */ struct containerElement *click_base; /* Thing at y position */ + + int mouse_tick; /* Last mouse tick position */ + int mouse_thing; /* Last mouse thing position */ }; /* @@ -108,14 +113,15 @@ struct _MelysViewClass { GtkVBoxClass parent_class; + /* Signals */ void (*scale_changed)(MelysView *); + /* Mouse moved */ + void (*thing_position)(MelysView *, int); + void (*tick_position)(MelysView *, int); /* Method to get the base containing element */ struct containerElement *(*get_base_from_pos)(MelysView *, int thing); - /* Method to get the container to drop into */ - //struct containerElement *(*get_drop_con_from_pos)(MelysView *, int thing); - /* Drop element */ gboolean (*drop_elem)(MelysView *, struct element *, int thing); @@ -176,6 +182,8 @@ >>set signals enum { SCALE_CHANGED, + THING_POSITION, + TICK_POSITION, LAST_SIGNAL }; @@ -254,7 +262,7 @@ #else gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_colormap(gdk_imlib_get_colormap()); - canvas = (GnomeCanvas *)gnome_canvas_new(); + canvas = (GnomeCanvas *)melys_scroll_new(mview->vcp, VC_BOTH, 0, 0); #endif mview->canvas = GTK_WIDGET(canvas); @@ -270,12 +278,8 @@ mview->infostr = g_strdup_printf("%d-info", ViewID++); - gtk_signal_connect((GtkObject *)mview->vcp, "scale-changed", - (GtkSignalFunc)vcp_changed, mview); - gtk_signal_connect((GtkObject *)mview->vcp->hadj, "value-changed", - (GtkSignalFunc)view_scroll, mview); - gtk_signal_connect((GtkObject *)mview->vcp->vadj, "value-changed", - (GtkSignalFunc)view_scroll, mview); + gtk_signal_connect(GTK_OBJECT(mview->vcp), "scale-changed", + vcp_scale_changed, mview); /* Set up a drop site for this widget */ gtk_drag_dest_set(GTK_WIDGET(mview->canvas), @@ -293,6 +297,8 @@ GTK_SIGNAL_FUNC(drag_leave), mview); gtk_signal_connect(GTK_OBJECT(mview->canvas), "drag-end", GTK_SIGNAL_FUNC(drag_end), mview); + gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", + GTK_SIGNAL_FUNC(canvas_event), mview); @@ -321,6 +327,22 @@ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0 ); + melys_view_signals[THING_POSITION] = gtk_signal_new("thing-position", + GTK_RUN_FIRST|GTK_RUN_NO_RECURSE, + object_class->type, + GTK_SIGNAL_OFFSET(MelysViewClass, thing_position), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT + ); + melys_view_signals[TICK_POSITION] = gtk_signal_new("tick-position", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET(MelysViewClass, tick_position), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT + ); gtk_object_class_add_signals(object_class, melys_view_signals, LAST_SIGNAL); @@ -331,7 +353,7 @@ klass->scale_changed = view_scale_changed; klass->get_base_from_pos = view_def_get_base; klass->drop_elem = view_def_drop; - klass->get_nthing = nthing_unimplemented; + klass->get_nthing = NULL; >>function view_destroy @@ -382,6 +404,21 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); +>>function view_display_info_free +void +gpointer _dinfo; + +>>code + struct display_info *dinfo = _dinfo; + + gtk_object_destroy((GtkObject *) dinfo->item); + gtk_object_unref((GtkObject *) dinfo->item); + MD_WUNREF(dinfo->con); + MD_WUNREF(dinfo->elem); + + g_free(_dinfo); + + >>function view_draw static void GtkWidget *widget; @@ -394,52 +431,13 @@ >>code MelysView *mview = (MelysView *)widget; - set_scroll_region(mview); + set_scrolls(mview); if (mview->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); GTK_WIDGET_CLASS(parent_class)->draw(widget, area); ->>function view_scroll -static void -GtkAdjustment *adj; -gpointer data; - ->>description -Scroll the canvas to the correct position. -Called when a scrollbar changes and when resizing etc. - ->>code - MelysView *mview = data; - GnomeCanvas *canvas; - 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 @@ -472,6 +470,56 @@ gtk_signal_emit(GTK_OBJECT(mview), melys_view_signals[SCALE_CHANGED]); +>>function canvas_event +static int +GtkWidget *w; +GdkEvent *event; +gpointer data; + +>>description +An event on the canvas. +Events appear to come here first, must return false to +allow the items to see them. + +>>code + MelysView *mview = MELYS_VIEW(data); + int thing; + double dx, dy; + int x, y; + + gnome_canvas_window_to_world(GNOME_CANVAS(mview->canvas), + (double) event->motion.x, event->motion.y, + &dx, &dy); + + x = dx; y = dy; + + switch (event->type) { + case GDK_LEAVE_NOTIFY: + x = -1; y = -1; + goto sendnone; + + case GDK_MOTION_NOTIFY: + sendnone: + if (x != mview->mouse_tick) { + mview->mouse_tick = x; + gtk_signal_emit(GTK_OBJECT(mview), + melys_view_signals[TICK_POSITION], x); + } + + thing = (y<0)? -1: y_to_thing(mview, y); + if (thing != mview->mouse_thing) { + mview->mouse_tick = thing; + gtk_signal_emit(GTK_OBJECT(mview), + melys_view_signals[THING_POSITION], thing); + } + break; + default: + break; + } + + return FALSE; + + >>function melys_view_item_event int GtkObject *item; This is the canvas item that is receiving the event @@ -672,13 +720,12 @@ pageticks = x_to_tick(mview, GTK_WIDGET(mview->canvas)->allocation.width); ticklen = MD_ENDTIME(mview->viewcon) + 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); + + view_control_set_range(mview->vcp, + VC_HORIZONTAL, MD_TIME(mview->viewcon), ticklen); if (adj->value > adj->upper - adj->page_size) adj->value = adj->upper - adj->page_size; @@ -697,18 +744,16 @@ >>code int height; + GtkAdjustment *adj; height = GTK_WIDGET(mview->canvas)->allocation.height; + adj = mview->vcp->vadj; - mview->vcp->vadj->page_size = - (height / mview->vcp->vscale); - mview->vcp->vadj->page_increment = mview->vcp->vadj->page_size; + adj->page_size = height / mview->vcp->vscale; + adj->page_increment = adj->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); + view_control_set_range(mview->vcp, VC_VERTICAL, 0.0, mview->vthings); >>function song_pos_cb @@ -724,12 +769,12 @@ >>code MelysView *mview = MELYS_VIEW(data); GtkAdjustment *hadj; - long t; + ticktime_t t; int x; hadj = mview->vcp->hadj; - t = (unsigned long)mview->posadj->value; + t = (ticktime_t)mview->posadj->value; x = tick_to_x(mview, t); if (x != tick_to_x(mview, mview->poffset)) { @@ -746,11 +791,15 @@ * Increase the root duration to match, add on extra to * avoid too many repeated calls -- it can be shrunk again * later. + * XXX needs some thought -- should only increase when we are + * recording. We do not want views on parts to cause the part to + * increase. */ - if (t > MD_ENDTIME(mview->viewcon)) { + if (MD_TYPE(mview->viewcon) == MD_TYPE_TRACK && + t > MD_ENDTIME(mview->viewcon)) { MD_SET_DURATION(mview->viewcon, t + hadj->page_size); mview->posadj->upper = MD_ENDTIME(mview->viewcon); - set_scroll_region(mview); + set_scrolls(mview); } /* @@ -764,12 +813,12 @@ GTK_WIDGET(mview->canvas)->allocation.width); boundry = page_width / 10; - if (t - mview->hoffset > page_width - boundry && - t - mview->hoffset <= page_width) { + if (t - mview->hoffset > (ticktime_t)page_width - boundry && + t - mview->hoffset <= (ticktime_t)page_width) { hadj->value += page_width - 2*boundry; - set_scroll_region(mview); + set_scrolls(mview); } /* @@ -778,13 +827,13 @@ */ if (x < 5) {/*XXX*/ hadj->value = 0; - set_scroll_region(mview); + set_scrolls(mview); } } ->>function set_scroll_region +>>function set_scrolls static void MelysView *mview; @@ -798,8 +847,10 @@ >>code int height; - GnomeCanvas *canvas = GNOME_CANVAS(mview->canvas); GnomeCanvasPoints *points; + GtkAdjustment *hadj; + GtkAdjustment *vadj; + ViewControl *vcp; /* You need to set vthings */ g_return_if_fail(mview->vthings != 0); @@ -807,32 +858,15 @@ if (!GTK_WIDGET_REALIZED(mview)) return; + vcp = mview->vcp; + hadj = vcp->hadj; + vadj = vcp->vadj; + /* It is our job to modify the page_size for the horizontal scroll */ set_hscroll(mview); set_vscroll(mview); -#ifdef maybe_needed_for_track_display - /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mview->canvas)->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; - } -#endif - height = mview->vcp->vadj->upper * mview->vcp->vscale; - gnome_canvas_set_scroll_region(canvas, - 0.0, 0.0, - mview->vcp->hadj->upper, - height - ); points = mview->points; points->coords[0] = 0.0; @@ -845,7 +879,7 @@ NULL); ->>function vcp_changed +>>function vcp_scale_changed static void GtkObject *vobj; This will be the vcp gpointer data; This is our mview info @@ -870,8 +904,7 @@ >>code - mview->voffset = -1; - set_scroll_region(mview); + set_scrolls(mview); >>function drag_setup @@ -914,11 +947,9 @@ for (i = 0; i < len; i++) { int nthing; - //struct sel_info *sinfo; struct element *elem; elem = g_slist_nth_data(list, i); - //ntrack = MD_TRACK_NUMBER(sinfo->con); nthing = VIEW_CLASS(mview)->get_nthing(mview, elem); @@ -926,7 +957,7 @@ dragdata[i].con = elem->con; /*XXX not needed */ dragdata[i].tick_offset = MD_TIME(elem) - mview->click_tick; dragdata[i].thing_offset = nthing - mview->click_nthing; - dragdata[i].tick_len = MD_DURATION(elem); + dragdata[i].tick_len = md_get_duration(elem); } dragdata[0].len = len; dragdata[0].data_size = sizeof(*dragdata); @@ -1180,7 +1211,7 @@ struct drag_element_data *dragdata; struct drag_element_data *dp; struct element *newelem; - unsigned long t; + ticktime_t t; int drop_thing; int drop_tick; int thing_start = 0; @@ -1222,10 +1253,6 @@ */ for (i = 0; i < len; i++) { dp = dragdata+i; -#if 0 - if (dp->element->type != MD_TYPE_PART) - goto error; -#endif /* Check and adjust for droping before the beginning */ if (dp->thing_offset + drop_thing < 0) @@ -1366,11 +1393,3 @@ return TRUE; ->>function nthing_unimplemented -static int -MelysView *mview; -struct element *el; - ->>code - g_warning("The get_nthing method is not implemented"); - return 0; diff -rNu melys-0.1.5/widgets/viewcontrol.c melys-0.1.6/widgets/viewcontrol.c --- melys-0.1.5/widgets/viewcontrol.c Wed Nov 24 22:55:08 1999 +++ melys-0.1.6/widgets/viewcontrol.c Mon Nov 29 10:48:17 1999 @@ -52,7 +52,6 @@ /* Argument numbers */ enum { ARG_0, - // XXX argument names go here }; /* Static functions */ @@ -107,8 +106,6 @@ { ViewControl *vcp = VIEW_CONTROL(gtk_type_new(view_control_get_type())); - // XXX Fill in here or replace previous line - return vcp; } @@ -182,8 +179,6 @@ parent_class = gtk_type_class(gtk_object_get_type()); - // XXX Add args - view_control_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", GTK_RUN_FIRST, object_class->type, @@ -403,6 +398,26 @@ { vcp->hscale = hscale; +} + +/* + * Set the range for one of the adjustments. + */ +void +view_control_set_range(ViewControl *vcp, int which, gfloat lower, + gfloat upper) +{ + GtkAdjustment *adj; + + if (which & VC_HORIZONTAL) + adj = vcp->hadj; + else + adj = vcp->vadj; + + adj->upper = upper; + adj->lower = lower; + + gtk_adjustment_changed(adj); } /* diff -rNu melys-0.1.5/widgets/viewcontrol.m melys-0.1.6/widgets/viewcontrol.m --- melys-0.1.5/widgets/viewcontrol.m Sat Nov 13 09:21:59 1999 +++ melys-0.1.6/widgets/viewcontrol.m Mon Nov 29 01:22:23 1999 @@ -37,6 +37,14 @@ >>headerdef @header +/* Scrolling directions */ +enum scroll_dir { + VC_HORIZONTAL = 0x01, + VC_VERTICAL = 0x02, + VC_BOTH = (VC_HORIZONTAL|VC_VERTICAL) +}; + + struct _ViewControl { GtkObject object; @@ -90,7 +98,6 @@ /* Argument numbers */ enum { ARG_0, - // XXX argument names go here }; @@ -101,8 +108,6 @@ >>code ViewControl *vcp = VIEW_CONTROL(gtk_type_new(view_control_get_type())); - // XXX Fill in here or replace previous line - return vcp; >>function view_control_init @@ -171,8 +176,6 @@ parent_class = gtk_type_class(gtk_object_get_type()); - // XXX Add args - view_control_signals[SCALE_CHANGED] = gtk_signal_new("scale-changed", GTK_RUN_FIRST, object_class->type, @@ -409,6 +412,29 @@ >>code vcp->hscale = hscale; + +>>function view_control_set_range +void +ViewControl *vcp; +int which; +gfloat lower; +gfloat upper; + +>>description +Set the range for one of the adjustments. + +>>code + GtkAdjustment *adj; + + if (which & VC_HORIZONTAL) + adj = vcp->hadj; + else + adj = vcp->vadj; + + adj->upper = upper; + adj->lower = lower; + + gtk_adjustment_changed(adj); >>function view_control_set_limits