diff -rNu melys-0.0.12/ChangeLog melys-0.0.13/ChangeLog --- melys-0.0.12/ChangeLog Wed Sep 22 21:43:52 1999 +++ melys-0.0.13/ChangeLog Thu Sep 23 16:57:06 1999 @@ -1,4 +1,45 @@ -1999-09-22 Steve Ratcliffe +1999-09-23 Steve Ratcliffe + + * REL-0-0-13 + + * widgets/melystrackdisplay.m: + Fixed bug in title ruler drawing, where a line was always drawn + at the begining of the exposed area even if there shouldn't have + been one there. + For some reason the adjustment value can go negative, just + detect this and ignore it. + + * md/mdutil.m: Added a MD_SET_DURATION macro. + + * midi/record.m: + When a part is added that is beyond the end of the root + then extend the root to cover it. + + * seq/seqmidi.m: If we don't have the correct device it used to + send to device 0. This is not correct when 0 is in + use as well. So we just effectively drop the events by + sending them to 0.0.0.0. + + * widgets/melystrackinfo.m: + Code simplified somewhat as we no long attempt to draw the + frame as part of this widget. The parent widget supplies + the frame (now why didn't I think of that before...) + + * widgets/melystrackdisplay.m: Complete phase 1 of the display screen. + Rudimentary scale along the top (not yet bar lines, unless 4/4 192 ppq :-) + Parts are labeled with the part name (defaults to track name). + Fixes to get the scrolling behaviour correct. + + * widgets/melystrack.m: Now handles supplying a frame for each child. + Some fixes to the adjustment handling. + +1999-09-22 Steve Ratcliffe + + * REL-0-0-12 + * version: Took out spurious nulls + + * ChangeLog, README: For REL-0-0-12 + * version: Version 0.0.12 * widgets/melyspartitem.m, widgets/melystrackdisplay.m: A first stab at a working display pane. diff -rNu melys-0.0.12/gui/trackprop.c melys-0.0.13/gui/trackprop.c --- melys-0.0.12/gui/trackprop.c Wed Sep 22 23:10:40 1999 +++ melys-0.0.13/gui/trackprop.c Thu Sep 23 17:03:24 1999 @@ -172,7 +172,6 @@ GtkWidget *devlab; GtkWidget *devlist; GtkWidget *devbox; - GList *devnames = NULL; /* Channel number */ GtkWidget *chanbox; GtkWidget *chanlab; diff -rNu melys-0.0.12/gui/trackprop.m melys-0.0.13/gui/trackprop.m --- melys-0.0.12/gui/trackprop.m Mon Sep 20 14:41:39 1999 +++ melys-0.0.13/gui/trackprop.m Thu Sep 23 16:17:26 1999 @@ -162,7 +162,6 @@ GtkWidget *devlab; GtkWidget *devlist; GtkWidget *devbox; - GList *devnames = NULL; /* Channel number */ GtkWidget *chanbox; GtkWidget *chanlab; diff -rNu melys-0.0.12/include/md.h melys-0.0.13/include/md.h --- melys-0.0.12/include/md.h Wed Sep 22 23:10:26 1999 +++ melys-0.0.13/include/md.h Thu Sep 23 17:03:09 1999 @@ -76,6 +76,10 @@ #define MD_TIME(el) ( ((struct element *)(el))->element_time) #define MD_SET_TIME(el, t) MD_TIME(el) = (t) #define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) +#define MD_SET_DURATION(el, t) do { \ + ((struct containerElement *)(el))->duration = (t); \ + MD_SET_MODIFIED(el, TRUE); \ + } while (0) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) diff -rNu melys-0.0.12/include/melmidi.h melys-0.0.13/include/melmidi.h --- melys-0.0.12/include/melmidi.h Wed Sep 22 23:10:28 1999 +++ melys-0.0.13/include/melmidi.h Thu Sep 23 17:03:11 1999 @@ -13,6 +13,8 @@ * * * + * + * */ /* Opaque type to save all playing state */ diff -rNu melys-0.0.12/include/melyspartitem.h melys-0.0.13/include/melyspartitem.h --- melys-0.0.12/include/melyspartitem.h Wed Sep 22 23:10:27 1999 +++ melys-0.0.13/include/melyspartitem.h Thu Sep 23 17:03:10 1999 @@ -35,6 +35,9 @@ struct _MelysPartItem { GnomeCanvasRect gnome_canvas_rect; + GnomeCanvasGroup *group; /* Group that this is a part of */ + GnomeCanvasItem *text; /* Text for this part */ + int dotted; struct element *part; /* The part being represented */ diff -rNu melys-0.0.12/include/melystrack.h melys-0.0.13/include/melystrack.h --- melys-0.0.12/include/melystrack.h Wed Sep 22 23:10:27 1999 +++ melys-0.0.13/include/melystrack.h Thu Sep 23 17:03:10 1999 @@ -49,10 +49,11 @@ /* * Definitions that are shared between the two panes */ -#define TRACK_DEF_HEIGHT 16 -#define TRACK_SEPARATION 2 -#define TRACK_TITLE_HEIGHT 20 -#define TRACK_DEF_HSCALE 48 +#define TRACK_DEF_HEIGHT 16 /* Default track height */ +#define TRACK_SEPARATION 2 /* Track separation */ +#define TRACK_TITLE_HEIGHT 20 /* Title hight */ +#define TRACK_DEF_HSCALE 24 /* Default horizontal scale */ +#define TRACK_TITLE_RULE 4 /* Offset from bottom of title area */ guint melys_track_get_type(void); diff -rNu melys-0.0.12/include/seqplay.h melys-0.0.13/include/seqplay.h --- melys-0.0.12/include/seqplay.h Thu Jan 1 00:00:00 1970 +++ melys-0.0.13/include/seqplay.h Thu Sep 23 17:03:07 1999 @@ -0,0 +1,17 @@ +/* + * + * 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. + * + * + */ + +void midi_play_prologue(struct seq_context *ctxp, struct rootElement *root); diff -rNu melys-0.0.12/md/mdutil.m melys-0.0.13/md/mdutil.m --- melys-0.0.12/md/mdutil.m Wed Sep 22 20:53:18 1999 +++ melys-0.0.13/md/mdutil.m Thu Sep 23 16:17:08 1999 @@ -24,6 +24,10 @@ #define MD_TIME(el) ( ((struct element *)(el))->element_time) #define MD_SET_TIME(el, t) MD_TIME(el) = (t) #define MD_DURATION(el) ( ((struct containerElement *)(el))->duration ) +#define MD_SET_DURATION(el, t) do { \ + ((struct containerElement *)(el))->duration = (t); \ + MD_SET_MODIFIED(el, TRUE); \ + } while (0) #define MD_ENDTIME(el) \ (MD_TIME(el) + ((struct containerElement *)(el))->duration) #define MD_DEVCHAN(el) (((struct element *)(el))->device_channel) diff -rNu melys-0.0.12/midi/Makefile melys-0.0.13/midi/Makefile --- melys-0.0.12/midi/Makefile Wed Sep 22 23:10:33 1999 +++ melys-0.0.13/midi/Makefile Thu Sep 23 17:03:16 1999 @@ -41,6 +41,7 @@ mcode $(MCODEFLAGS) -o $@ $< play.o: ../include/seqlib.h +play.o: ../include/seqplay.h play.o: ../include/elements.h play.o: ../include/md.h play.o: ../include/config.h diff -rNu melys-0.0.12/midi/play.c melys-0.0.13/midi/play.c --- melys-0.0.12/midi/play.c Wed Sep 22 23:10:43 1999 +++ melys-0.0.13/midi/play.c Thu Sep 23 17:03:27 1999 @@ -13,6 +13,8 @@ * * * + * + * */ @@ -23,12 +25,13 @@ #include #include #include +#include "gdk/gdk.h" +#include "gtk/gtkmain.h" #include "seqlib.h" +#include "seqplay.h" #include "elements.h" #include "md.h" #include "config.h" -#include "gdk/gdk.h" -#include "gtk/gtkmain.h" #include "melmsg.h" #include "melmidi.h" #include "intl.h" diff -rNu melys-0.0.12/midi/play.m melys-0.0.13/midi/play.m --- melys-0.0.12/midi/play.m Sun Sep 19 22:38:55 1999 +++ melys-0.0.13/midi/play.m Thu Sep 23 16:17:29 1999 @@ -15,12 +15,15 @@ >>header >>header >>header + +>>header gdk/gdk.h +>>header gtk/gtkmain.h + >>header seqlib.h +>>header seqplay.h >>header elements.h >>header md.h >>header config.h ->>header gdk/gdk.h ->>header gtk/gtkmain.h >>header melmsg.h >>headerdef --decl melmidi.h diff -rNu melys-0.0.12/midi/record.c melys-0.0.13/midi/record.c --- melys-0.0.12/midi/record.c Wed Sep 22 23:10:44 1999 +++ melys-0.0.13/midi/record.c Thu Sep 23 17:03:27 1999 @@ -234,6 +234,13 @@ md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); track->newpart = NULL; g_ptr_array_free(track->notes, 1); + + /* + * If the track has been extended by the recording + * then we may need to extend the root. + */ + if (MD_ENDTIME(track) > MD_ENDTIME(record->mdroot)) + MD_SET_DURATION(record->mdroot, MD_ENDTIME(track)); } } diff -rNu melys-0.0.12/midi/record.m melys-0.0.13/midi/record.m --- melys-0.0.12/midi/record.m Sun Sep 19 22:38:55 1999 +++ melys-0.0.13/midi/record.m Thu Sep 23 16:16:55 1999 @@ -211,6 +211,13 @@ md_merge_in(MD_TRACK(track), track->newpart, MD_ADD_MERGE); track->newpart = NULL; g_ptr_array_free(track->notes, 1); + + /* + * If the track has been extended by the recording + * then we may need to extend the root. + */ + if (MD_ENDTIME(track) > MD_ENDTIME(record->mdroot)) + MD_SET_DURATION(record->mdroot, MD_ENDTIME(track)); } diff -rNu melys-0.0.12/programs/Makefile melys-0.0.13/programs/Makefile --- melys-0.0.12/programs/Makefile Wed Sep 22 23:10:34 1999 +++ melys-0.0.13/programs/Makefile Thu Sep 23 17:03:17 1999 @@ -108,6 +108,7 @@ mdmlconv.o: ../include/elements.h mdmlconv.o: ../include/md.h melplay.o: ../include/seqlib.h +melplay.o: ../include/seqplay.h melplay.o: ../include/elements.h melplay.o: ../include/melfile.h melplay.o: ../include/melmidi.h diff -rNu melys-0.0.12/programs/melplay.c melys-0.0.13/programs/melplay.c --- melys-0.0.12/programs/melplay.c Wed Sep 22 23:10:45 1999 +++ melys-0.0.13/programs/melplay.c Thu Sep 23 17:03:28 1999 @@ -24,6 +24,7 @@ #include #include #include "seqlib.h" +#include "seqplay.h" #include "elements.h" #include "melfile.h" #include "melmidi.h" diff -rNu melys-0.0.12/programs/melplay.m melys-0.0.13/programs/melplay.m --- melys-0.0.12/programs/melplay.m Sat Sep 18 17:10:35 1999 +++ melys-0.0.13/programs/melplay.m Thu Sep 23 16:17:29 1999 @@ -27,6 +27,7 @@ >>header >>header >>header seqlib.h +>>header seqplay.h >>header elements.h >>header melfile.h >>header melmidi.h diff -rNu melys-0.0.12/seq/Makefile melys-0.0.13/seq/Makefile --- melys-0.0.12/seq/Makefile Wed Sep 22 23:10:30 1999 +++ melys-0.0.13/seq/Makefile Thu Sep 23 17:03:12 1999 @@ -14,7 +14,7 @@ sequtil.c GENHFILES = ../include/seqlib.h \ seqpriv.h \ - ../include/melmidi.h + ../include/seqplay.h @@ -50,6 +50,7 @@ seqplay.o: ../include/elements.h seqplay.o: ../include/md.h seqplay.o: ../include/melmidi.h +seqplay.o: ../include/seqplay.h seqmidi.o: ../include/seqlib.h seqmidi.o: ./seqpriv.h seqlib.o: ../include/seqlib.h diff -rNu melys-0.0.12/seq/seqmidi.c melys-0.0.13/seq/seqmidi.c --- melys-0.0.12/seq/seqmidi.c Wed Sep 22 23:10:35 1999 +++ melys-0.0.13/seq/seqmidi.c Thu Sep 23 17:03:18 1999 @@ -49,13 +49,17 @@ int dev; int channel; snd_seq_addr_t *addr; + static snd_seq_addr_t zeroaddr; dev = DEV(devchan); channel = CHAN(devchan); addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + + /* If there is no device available send it elsewhere */ + /* Other ideas welcome... */ if (!addr) - addr = seq_dev_addr(ctxp, 0, SEQ_ADDR_OUTPUT); + addr = &zeroaddr; memset(ep, '\0', sizeof(*ep)); ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; diff -rNu melys-0.0.12/seq/seqmidi.m melys-0.0.13/seq/seqmidi.m --- melys-0.0.12/seq/seqmidi.m Sun Sep 19 21:50:32 1999 +++ melys-0.0.13/seq/seqmidi.m Thu Sep 23 16:15:13 1999 @@ -37,13 +37,17 @@ int dev; int channel; snd_seq_addr_t *addr; + static snd_seq_addr_t zeroaddr; dev = DEV(devchan); channel = CHAN(devchan); addr = seq_dev_addr(ctxp, dev, SEQ_ADDR_OUTPUT); + + /* If there is no device available send it elsewhere */ + /* Other ideas welcome... */ if (!addr) - addr = seq_dev_addr(ctxp, 0, SEQ_ADDR_OUTPUT); + addr = &zeroaddr; memset(ep, '\0', sizeof(*ep)); ep->flags = SND_SEQ_TIME_STAMP_TICK | SND_SEQ_TIME_MODE_ABS; diff -rNu melys-0.0.12/seq/seqplay.c melys-0.0.13/seq/seqplay.c --- melys-0.0.12/seq/seqplay.c Wed Sep 22 23:10:36 1999 +++ melys-0.0.13/seq/seqplay.c Thu Sep 23 17:03:18 1999 @@ -22,7 +22,9 @@ #include "elements.h" #include "md.h" #include "melmidi.h" +#include "seqplay.h" #include "intl.h" + static snd_seq_real_time_t set_time(snd_seq_event_t *ep, diff -rNu melys-0.0.12/seq/seqplay.m melys-0.0.13/seq/seqplay.m --- melys-0.0.12/seq/seqplay.m Wed Sep 22 21:38:40 1999 +++ melys-0.0.13/seq/seqplay.m Thu Sep 23 16:17:29 1999 @@ -11,10 +11,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +>>extern + >>header seqlib.h >>header elements.h >>header md.h ->>headerdef --decl melmidi.h +>>header melmidi.h + +>>headerdef --decl seqplay.h >>function midi_play_prologue void diff -rNu melys-0.0.12/song/song.c melys-0.0.13/song/song.c --- melys-0.0.12/song/song.c Wed Sep 22 23:10:35 1999 +++ melys-0.0.13/song/song.c Thu Sep 23 17:03:17 1999 @@ -242,7 +242,6 @@ song_destroy(gpointer data) { struct song *sd; - GtkWidget *w; dprintf1("song_destroy"); diff -rNu melys-0.0.12/song/song.m melys-0.0.13/song/song.m --- melys-0.0.12/song/song.m Wed Sep 22 20:52:07 1999 +++ melys-0.0.13/song/song.m Thu Sep 23 16:17:29 1999 @@ -275,7 +275,6 @@ >>code struct song *sd; - GtkWidget *w; dprintf1("@func_name"); diff -rNu melys-0.0.12/version melys-0.0.13/version --- melys-0.0.12/version Wed Sep 22 23:10:01 1999 +++ melys-0.0.13/version Thu Sep 23 16:20:48 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.0.12" +#define MELYS_VERSION_STRING "0.0.13" diff -rNu melys-0.0.12/widgets/melyspartitem.m melys-0.0.13/widgets/melyspartitem.m --- melys-0.0.12/widgets/melyspartitem.m Wed Sep 22 21:25:59 1999 +++ melys-0.0.13/widgets/melyspartitem.m Thu Sep 23 15:19:53 1999 @@ -33,6 +33,9 @@ struct _MelysPartItem { GnomeCanvasRect gnome_canvas_rect; + GnomeCanvasGroup *group; /* Group that this is a part of */ + GnomeCanvasItem *text; /* Text for this part */ + int dotted; struct element *part; /* The part being represented */ diff -rNu melys-0.0.12/widgets/melystrack.c melys-0.0.13/widgets/melystrack.c --- melys-0.0.12/widgets/melystrack.c Wed Sep 22 23:10:41 1999 +++ melys-0.0.13/widgets/melystrack.c Thu Sep 23 17:03:25 1999 @@ -36,8 +36,6 @@ static void melys_track_init(MelysTrack *mtp); static void melys_track_class_init(MelysTrackClass *klass); static void destroy(GtkObject *object); -static int x_to_tick(MelysTrack *mtrack, int xpix); -static int tick_to_x(MelysTrack *mtrack, int tick); static gint melys_track_signals[LAST_SIGNAL]; @@ -101,6 +99,8 @@ GtkTable *tab; MelysTrackInfo *info; MelysTrackDisplay *disp; + GtkWidget *frame1; + GtkWidget *frame2; tab = (GtkTable*)gtk_table_new(4, 4, FALSE); @@ -120,14 +120,23 @@ hscroll = (GtkHScrollbar*)gtk_hscrollbar_new(hadj); vscroll = (GtkVScrollbar*)gtk_vscrollbar_new(vadj); + frame1 = gtk_frame_new(NULL); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); + info = (MelysTrackInfo*)melys_track_info_new(vadj); disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj); + gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); + gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); + + gtk_widget_show_all((GtkWidget *)frame1); + gtk_widget_show_all((GtkWidget *)frame2); + hpan = (GtkHPaned*)gtk_hpaned_new(); - gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(info)); - gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(disp)); - gtk_widget_show(GTK_WIDGET(info)); - gtk_widget_show(GTK_WIDGET(disp)); + gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(frame1)); + gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(frame2)); gtk_table_attach(tab, GTK_WIDGET(hpan), 0, 1, 0, 1, GTK_FILL|GTK_SHRINK|GTK_EXPAND, @@ -211,7 +220,7 @@ gtk_adjustment_changed(mtrack->vadj); mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(root)); + mtrack->hadj->upper = MD_ENDTIME(root); gtk_adjustment_set_value(mtrack->hadj, 0.0); gtk_adjustment_changed(mtrack->hadj); @@ -244,8 +253,7 @@ mtrack->vadj->upper = (double)mtrack->mdroot->tracks; mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(mtrack->mdroot)); - //gtk_adjustment_changed(mtrack->hadj); + mtrack->hadj->upper = MD_ENDTIME(mtrack->mdroot); melys_track_info_update(mtrack->info); melys_track_display_update(mtrack->display); @@ -283,25 +291,4 @@ if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(object); -} - -static int -x_to_tick(MelysTrack *mtrack, int xpix) -{ - int tick; - - tick = xpix * mtrack->hscale; - return tick; -} - -static int -tick_to_x(MelysTrack *mtrack, int tick) -{ - int x; - - g_return_val_if_fail(mtrack->hscale != 0, 0); - - x = tick / mtrack->hscale; - - return x; } diff -rNu melys-0.0.12/widgets/melystrack.m melys-0.0.13/widgets/melystrack.m --- melys-0.0.12/widgets/melystrack.m Wed Sep 22 21:25:11 1999 +++ melys-0.0.13/widgets/melystrack.m Thu Sep 23 15:21:01 1999 @@ -50,10 +50,11 @@ /* * Definitions that are shared between the two panes */ -#define TRACK_DEF_HEIGHT 16 -#define TRACK_SEPARATION 2 -#define TRACK_TITLE_HEIGHT 20 -#define TRACK_DEF_HSCALE 48 +#define TRACK_DEF_HEIGHT 16 /* Default track height */ +#define TRACK_SEPARATION 2 /* Track separation */ +#define TRACK_TITLE_HEIGHT 20 /* Title hight */ +#define TRACK_DEF_HSCALE 24 /* Default horizontal scale */ +#define TRACK_TITLE_RULE 4 /* Offset from bottom of title area */ >>extern @@ -90,6 +91,8 @@ GtkTable *tab; MelysTrackInfo *info; MelysTrackDisplay *disp; + GtkWidget *frame1; + GtkWidget *frame2; tab = (GtkTable*)gtk_table_new(4, 4, FALSE); @@ -109,14 +112,23 @@ hscroll = (GtkHScrollbar*)gtk_hscrollbar_new(hadj); vscroll = (GtkVScrollbar*)gtk_vscrollbar_new(vadj); + frame1 = gtk_frame_new(NULL); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_IN); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); + info = (MelysTrackInfo*)melys_track_info_new(vadj); disp = (MelysTrackDisplay*)melys_track_display_new(hadj, vadj); + gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); + gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); + + gtk_widget_show_all((GtkWidget *)frame1); + gtk_widget_show_all((GtkWidget *)frame2); + hpan = (GtkHPaned*)gtk_hpaned_new(); - gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(info)); - gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(disp)); - gtk_widget_show(GTK_WIDGET(info)); - gtk_widget_show(GTK_WIDGET(disp)); + gtk_paned_add1(GTK_PANED(hpan), GTK_WIDGET(frame1)); + gtk_paned_add2(GTK_PANED(hpan), GTK_WIDGET(frame2)); gtk_table_attach(tab, GTK_WIDGET(hpan), 0, 1, 0, 1, GTK_FILL|GTK_SHRINK|GTK_EXPAND, @@ -155,6 +167,7 @@ mtp->vscale = TRACK_DEF_HEIGHT + TRACK_SEPARATION; mtp->hscale = TRACK_DEF_HSCALE; + >>function melys_track_class_init static void MelysTrackClass *klass; The class to initialise @@ -201,7 +214,7 @@ gtk_adjustment_changed(mtrack->vadj); mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(root)); + mtrack->hadj->upper = MD_ENDTIME(root); gtk_adjustment_set_value(mtrack->hadj, 0.0); gtk_adjustment_changed(mtrack->hadj); @@ -237,8 +250,7 @@ mtrack->vadj->upper = (double)mtrack->mdroot->tracks; mtrack->hadj->lower = 0.0; - mtrack->hadj->upper = tick_to_x(mtrack, MD_ENDTIME(mtrack->mdroot)); - //gtk_adjustment_changed(mtrack->hadj); + mtrack->hadj->upper = MD_ENDTIME(mtrack->mdroot); melys_track_info_update(mtrack->info); melys_track_display_update(mtrack->display); @@ -276,28 +288,3 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(object); ->>function x_to_tick -static int -MelysTrack *mtrack; -int xpix; - ->>code - int tick; - - tick = xpix * mtrack->hscale; - return tick; - - ->>function tick_to_x -static int -MelysTrack *mtrack; -int tick; - ->>code - int x; - - g_return_val_if_fail(mtrack->hscale != 0, 0); - - x = tick / mtrack->hscale; - - return x; diff -rNu melys-0.0.12/widgets/melystrackdisplay.c melys-0.0.13/widgets/melystrackdisplay.c --- melys-0.0.12/widgets/melystrackdisplay.c Wed Sep 22 23:10:42 1999 +++ melys-0.0.13/widgets/melystrackdisplay.c Thu Sep 23 17:03:25 1999 @@ -19,13 +19,14 @@ #include "util.h" #include "gdk_imlib.h" #include "gtk/gtkwidget.h" -#include "gtk/gtkframe.h" #include "gtk/gtkvbox.h" #include "gtk/gtksignal.h" +#include "gtk/gtkdrawingarea.h" #include "libgnomeui/gnome-canvas.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" #include "libgnomeui/gnome-canvas-line.h" #include "libgnomeui/gnome-canvas-util.h" +#include "libgnomeui/gnome-canvas-text.h" #include "libart_lgpl/art_affine.h" #include "melystrack.h" #include "melyspartitem.h" @@ -52,8 +53,11 @@ struct trackElement *track); static void item_destroy(GtkObject *obj, gpointer data); static void disp_destroy(GtkObject *obj); +static void item_event(GtkWidget *widget, GdkEvent *event, gpointer data); static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation); static void set_scroll_region(MelysTrackDisplay *mdisp); +static gboolean title_expose(GtkWidget *widget, GdkEventExpose *event, + gpointer data); static int y_to_track(MelysTrackDisplay *mdisp, int ypix); static int track_to_y(MelysTrackDisplay *mdisp, int n); static int x_to_tick(MelysTrackDisplay *mdisp, int xpix); @@ -127,9 +131,8 @@ static void melys_track_display_init(MelysTrackDisplay *mdisp) { - GtkWidget *frame; GnomeCanvas *canvas; - GnomeCanvas *title; + GtkDrawingArea *title; GtkWidget *box; mdisp->height = TRACK_DEF_HEIGHT; @@ -143,11 +146,12 @@ mdisp->mdroot = NULL; mdisp->song = NULL; - frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); - box = gtk_vbox_new(0, 0); + title = (GtkDrawingArea *)gtk_drawing_area_new(); + gtk_signal_connect(GTK_OBJECT(title), "expose-event", + GTK_SIGNAL_FUNC(title_expose), mdisp); + #if 0 #define AA #endif @@ -155,12 +159,10 @@ gtk_widget_push_visual(gdk_rgb_get_visual()); gtk_widget_push_colormap(gdk_rgb_get_cmap()); canvas = (GnomeCanvas *)gnome_canvas_new_aa(); - title = (GnomeCanvas *)gnome_canvas_new_aa(); #else gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_colormap(gdk_imlib_get_colormap()); canvas = (GnomeCanvas *)gnome_canvas_new(); - title = (GnomeCanvas *)gnome_canvas_new(); #endif #if 0 @@ -187,12 +189,10 @@ * Build up the pane. The title row has a fixed height but * expands to fill the horizontal space. The canvas expands * to fill the rest of the space. - * Its all held in a frame. */ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); - gtk_container_add(GTK_CONTAINER(frame), box); - gtk_container_add(GTK_CONTAINER(mdisp), frame); + gtk_container_add(GTK_CONTAINER(mdisp), box); gtk_widget_show_all(GTK_WIDGET(mdisp)); } @@ -263,26 +263,37 @@ { MelysTrackDisplay *mdisp = data; GnomeCanvas *canvas; - int changed = 0; + int ychanged = 0; + int xchanged = 0; if (adj == mdisp->hadj) { if ((int)adj->value != mdisp->hoffset) { - changed = 1; - mdisp->hoffset = (int)adj->value; + if (adj->value >= 0) { + xchanged = 1; + mdisp->hoffset = (int)adj->value; + } } } if (adj == mdisp->vadj) { if ((int)adj->value != mdisp->voffset) { - changed = 1; - mdisp->voffset = (int)adj->value; + ychanged = 1; + mdisp->voffset = (int)(adj->value + 0.1); } } canvas = GNOME_CANVAS(mdisp->canvas); - if (changed) { + if (xchanged || ychanged) { + + /* Clear title area so it will be redrawn (could be optimised) */ + if (xchanged) + gdk_window_clear_area_e(mdisp->title->window, + 0, 0, + mdisp->title->allocation.width, + mdisp->title->allocation.height); + gnome_canvas_scroll_to(canvas, - mdisp->hoffset, mdisp->voffset * mdisp->vspace); + tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace); } } @@ -299,6 +310,8 @@ struct trackElement *track; struct element *part; /* note that this could be part or partref */ + set_scroll_region(mdisp); + for (n = 0; n < mdisp->mdroot->tracks; n++) { track = md_track_nth(mdisp->mdroot, n); @@ -316,8 +329,6 @@ } } } - - set_scroll_region(mdisp); } static void @@ -328,6 +339,7 @@ GnomeCanvasItem *item; MelysPartItem *pitem; MelysPartItem **itempp; + char *pname; int state; #if 0 @@ -350,9 +362,11 @@ switch (MD_TYPE(part)) { case MD_TYPE_PART: itempp = (MelysPartItem **)&MD_PART(part)->item; + pname = MD_PART(part)->name; break; case MD_TYPE_PARTREF: itempp = (MelysPartItem **)&MD_PARTREF(part)->item; + pname = MD_PARTREF(part)->name; break; default: g_return_if_fail(0); @@ -361,22 +375,64 @@ item = (GnomeCanvasItem *)*itempp; if (item == NULL) { + GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; - group = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + GnomeCanvasItem *text; + char *name; + + rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + + group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_GROUP, NULL); item = gnome_canvas_item_new(group, melys_part_item_get_type(), - NULL); + NULL); + + if (pname && strcmp(pname, "") != 0) + name = pname; + else if (track->name) + name = track->name; + else + name = ""; + + text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, + "text", name, + NULL); + + MELYS_PART_ITEM(item)->group = group; + MELYS_PART_ITEM(item)->text = text; *itempp = (MelysPartItem *)item; } g_assert(item != NULL); pitem = MELYS_PART_ITEM(item); - /* Set the location and size */ + /* + * The scheme here is that we have a group that contains + * the part rectangle and maybe text. We position the group + * as a whole. The rectangle and the text both are position + * at around 0,0 within the group. + */ + + /* The whole group is positioned */ + gnome_canvas_item_set((GnomeCanvasItem *)pitem->group, + "x", (double) tick_to_x(mdisp, MD_TIME(part)), + "y", (double) track_to_y(mdisp, track->number), + NULL); + + /* Set the font and text properties */ + gnome_canvas_item_set(pitem->text, + "x", (double) 2, + "y", (double) 2, + "font_gdk", GTK_WIDGET(mdisp)->style->font, + "anchor", GTK_ANCHOR_NORTH_WEST, + NULL); + + /* This size of the part is set here */ gnome_canvas_item_set(item, - "x1", (double) tick_to_x(mdisp, MD_TIME(part)), - "y1", (double) track_to_y(mdisp, track->number), - "x2", (double) tick_to_x(mdisp, MD_ENDTIME(part)), - "y2", (double) track_to_y(mdisp, track->number) + mdisp->height, + "x1", (double) 0.0, + "y1", (double) 0.0, + "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), + "y2", (double) mdisp->height, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], "width_pixels", 1, "outline_color", "black", @@ -392,6 +448,7 @@ pitem->root = md_root_inc_ref(mdisp->mdroot); gtk_signal_connect(GTK_OBJECT(item), "destroy", item_destroy, NULL); + gtk_signal_connect(GTK_OBJECT(item), "event", item_event, NULL); } static void @@ -435,6 +492,16 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); } +static void +item_event(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + MelysPartItem *pitem; + + pitem = MELYS_PART_ITEM(widget); + + dprintf(1, "event %d for track %s\n", event->type, pitem->track->name); +} + /* * Intercept the size allocation routine to set our scroll * region. The region must at least as large as the allocated @@ -458,7 +525,7 @@ mdisp = (MelysTrackDisplay *)widget; canvas = GNOME_CANVAS(mdisp->canvas); - if (GTK_WIDGET_REALIZED (widget)) { + if (GTK_WIDGET_REALIZED(widget)) { set_scroll_region(mdisp); melys_track_display_update(mdisp); @@ -479,13 +546,24 @@ width = GTK_WIDGET(mdisp)->allocation.width; height = GTK_WIDGET(mdisp)->allocation.height; - mdisp->hadj->page_size = width; + /* It is our job to modify the page_size for the horizontal scroll + * do not modify the bounds here + */ + mdisp->hadj->page_size = x_to_tick(mdisp, width); + mdisp->hadj->page_increment = x_to_tick(mdisp, width); + mdisp->hadj->step_increment = x_to_tick(mdisp, 20); gtk_adjustment_changed(mdisp->hadj); if (width < tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot))) width = tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot)); - if (height < mdisp->mdroot->tracks * mdisp->vspace) - height = mdisp->mdroot->tracks * mdisp->vspace; + if (height < mdisp->mdroot->tracks * mdisp->vspace) { + int last; + int extra; + + last = (int)(mdisp->vadj->upper - mdisp->vadj->page_size)/mdisp->vspace; + extra = height - last; + height = mdisp->mdroot->tracks * mdisp->vspace + extra; + } gnome_canvas_set_scroll_region(canvas, 0.0, 0.0, @@ -495,6 +573,65 @@ } /* + * Temporary ruler routine. Obviously this needs to look at + * the tempo map and find the time signature records and do + * proper bar lines. + * + */ +static gboolean +title_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data) +{ + MelysTrackDisplay *mdisp; + char numbuf[20]; + int qn; + int x; + int tick; + int yoff; + + if (!GTK_WIDGET_DRAWABLE(widget)) + return FALSE; + + mdisp = MELYS_TRACK_DISPLAY(data); + + x = event->area.x; + tick = mdisp->hoffset + x_to_tick(mdisp, x); + qn = tick/192; + + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], + &event->area); + + /* Adjust x to the first tick-line that needs drawing */ + x = tick_to_x(mdisp, qn*192 - mdisp->hoffset); + + for (; x < event->area.x + event->area.width; ) { + if ((qn % 4) == 0) { + yoff = 10; + g_snprintf(numbuf, 20, "%d", qn/4); + gdk_draw_string(widget->window, + widget->style->font, + widget->style->fg_gc[widget->state], + x+2, yoff, numbuf); + } else + yoff = 18; + + gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + x, yoff, x, mdisp->vtitle - TRACK_TITLE_RULE); + + /* Increment to the next one */ + qn++; + x = tick_to_x(mdisp, qn * 192 - mdisp->hoffset); + } + + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); + + gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + 0, mdisp->vtitle - TRACK_TITLE_RULE, + widget->allocation.width, mdisp->vtitle - TRACK_TITLE_RULE); + + return TRUE; +} + +/* * Given a y position within the widget window, return the * track number that belongs to that co-ordintate. Track * numbers start at 0, -1 means no track in other words the y @@ -527,9 +664,7 @@ { int ypix; - ypix = n + mdisp->voffset; - - ypix *= mdisp->vspace; + ypix = n * mdisp->vspace; return ypix; } diff -rNu melys-0.0.12/widgets/melystrackdisplay.m melys-0.0.13/widgets/melystrackdisplay.m --- melys-0.0.12/widgets/melystrackdisplay.m Wed Sep 22 21:38:07 1999 +++ melys-0.0.13/widgets/melystrackdisplay.m Thu Sep 23 16:55:45 1999 @@ -13,14 +13,15 @@ >>extern >>header gdk_imlib.h >>header gtk/gtkwidget.h ->>header gtk/gtkframe.h >>header gtk/gtkvbox.h >>header gtk/gtksignal.h +>>header gtk/gtkdrawingarea.h >>header libgnomeui/gnome-canvas.h >>header libgnomeui/gnome-canvas-rect-ellipse.h >>header libgnomeui/gnome-canvas-line.h >>header libgnomeui/gnome-canvas-util.h +>>header libgnomeui/gnome-canvas-text.h >>header libart_lgpl/art_affine.h @@ -121,9 +122,8 @@ >>description Initialise the MelysTrackDisplay. >>code - GtkWidget *frame; GnomeCanvas *canvas; - GnomeCanvas *title; + GtkDrawingArea *title; GtkWidget *box; mdisp->height = TRACK_DEF_HEIGHT; @@ -137,11 +137,12 @@ mdisp->mdroot = NULL; mdisp->song = NULL; - frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); - box = gtk_vbox_new(0, 0); + title = (GtkDrawingArea *)gtk_drawing_area_new(); + gtk_signal_connect(GTK_OBJECT(title), "expose-event", + GTK_SIGNAL_FUNC(title_expose), mdisp); + #if 0 #define AA #endif @@ -149,12 +150,10 @@ gtk_widget_push_visual(gdk_rgb_get_visual()); gtk_widget_push_colormap(gdk_rgb_get_cmap()); canvas = (GnomeCanvas *)gnome_canvas_new_aa(); - title = (GnomeCanvas *)gnome_canvas_new_aa(); #else gtk_widget_push_visual(gdk_imlib_get_visual()); gtk_widget_push_colormap(gdk_imlib_get_colormap()); canvas = (GnomeCanvas *)gnome_canvas_new(); - title = (GnomeCanvas *)gnome_canvas_new(); #endif #if 0 @@ -181,12 +180,10 @@ * Build up the pane. The title row has a fixed height but * expands to fill the horizontal space. The canvas expands * to fill the rest of the space. - * Its all held in a frame. */ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); - gtk_container_add(GTK_CONTAINER(frame), box); - gtk_container_add(GTK_CONTAINER(mdisp), frame); + gtk_container_add(GTK_CONTAINER(mdisp), box); gtk_widget_show_all(GTK_WIDGET(mdisp)); @@ -259,26 +256,37 @@ >>code MelysTrackDisplay *mdisp = data; GnomeCanvas *canvas; - int changed = 0; + int ychanged = 0; + int xchanged = 0; if (adj == mdisp->hadj) { if ((int)adj->value != mdisp->hoffset) { - changed = 1; - mdisp->hoffset = (int)adj->value; + if (adj->value >= 0) { + xchanged = 1; + mdisp->hoffset = (int)adj->value; + } } } if (adj == mdisp->vadj) { if ((int)adj->value != mdisp->voffset) { - changed = 1; - mdisp->voffset = (int)adj->value; + ychanged = 1; + mdisp->voffset = (int)(adj->value + 0.1); } } canvas = GNOME_CANVAS(mdisp->canvas); - if (changed) { + if (xchanged || ychanged) { + + /* Clear title area so it will be redrawn (could be optimised) */ + if (xchanged) + gdk_window_clear_area_e(mdisp->title->window, + 0, 0, + mdisp->title->allocation.width, + mdisp->title->allocation.height); + gnome_canvas_scroll_to(canvas, - mdisp->hoffset, mdisp->voffset * mdisp->vspace); + tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace); } @@ -297,6 +305,8 @@ struct trackElement *track; struct element *part; /* note that this could be part or partref */ + set_scroll_region(mdisp); + for (n = 0; n < mdisp->mdroot->tracks; n++) { track = md_track_nth(mdisp->mdroot, n); @@ -315,7 +325,6 @@ } } - set_scroll_region(mdisp); >>function create_part_item static void @@ -328,6 +337,7 @@ GnomeCanvasItem *item; MelysPartItem *pitem; MelysPartItem **itempp; + char *pname; int state; #if 0 @@ -350,9 +360,11 @@ switch (MD_TYPE(part)) { case MD_TYPE_PART: itempp = (MelysPartItem **)&MD_PART(part)->item; + pname = MD_PART(part)->name; break; case MD_TYPE_PARTREF: itempp = (MelysPartItem **)&MD_PARTREF(part)->item; + pname = MD_PARTREF(part)->name; break; default: g_return_if_fail(0); @@ -361,22 +373,64 @@ item = (GnomeCanvasItem *)*itempp; if (item == NULL) { + GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; - group = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + GnomeCanvasItem *text; + char *name; + + rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + + group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, + GNOME_TYPE_CANVAS_GROUP, NULL); item = gnome_canvas_item_new(group, melys_part_item_get_type(), - NULL); + NULL); + + if (pname && strcmp(pname, "") != 0) + name = pname; + else if (track->name) + name = track->name; + else + name = ""; + + text = gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_TEXT, + "text", name, + NULL); + + MELYS_PART_ITEM(item)->group = group; + MELYS_PART_ITEM(item)->text = text; *itempp = (MelysPartItem *)item; } g_assert(item != NULL); pitem = MELYS_PART_ITEM(item); - /* Set the location and size */ + /* + * The scheme here is that we have a group that contains + * the part rectangle and maybe text. We position the group + * as a whole. The rectangle and the text both are position + * at around 0,0 within the group. + */ + + /* The whole group is positioned */ + gnome_canvas_item_set((GnomeCanvasItem *)pitem->group, + "x", (double) tick_to_x(mdisp, MD_TIME(part)), + "y", (double) track_to_y(mdisp, track->number), + NULL); + + /* Set the font and text properties */ + gnome_canvas_item_set(pitem->text, + "x", (double) 2, + "y", (double) 2, + "font_gdk", GTK_WIDGET(mdisp)->style->font, + "anchor", GTK_ANCHOR_NORTH_WEST, + NULL); + + /* This size of the part is set here */ gnome_canvas_item_set(item, - "x1", (double) tick_to_x(mdisp, MD_TIME(part)), - "y1", (double) track_to_y(mdisp, track->number), - "x2", (double) tick_to_x(mdisp, MD_ENDTIME(part)), - "y2", (double) track_to_y(mdisp, track->number) + mdisp->height, + "x1", (double) 0.0, + "y1", (double) 0.0, + "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), + "y2", (double) mdisp->height, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], "width_pixels", 1, "outline_color", "black", @@ -392,6 +446,7 @@ pitem->root = md_root_inc_ref(mdisp->mdroot); gtk_signal_connect(GTK_OBJECT(item), "destroy", item_destroy, NULL); + gtk_signal_connect(GTK_OBJECT(item), "event", item_event, NULL); >>function item_destroy @@ -441,6 +496,20 @@ +>>function item_event +static void +GtkWidget *widget; +GdkEvent *event; +gpointer data; + +>>code + MelysPartItem *pitem; + + pitem = MELYS_PART_ITEM(widget); + + dprintf(1, "event %d for track %s\n", event->type, pitem->track->name); + + >>function disp_size_allocate static void GtkWidget *widget; @@ -466,7 +535,7 @@ mdisp = (MelysTrackDisplay *)widget; canvas = GNOME_CANVAS(mdisp->canvas); - if (GTK_WIDGET_REALIZED (widget)) { + if (GTK_WIDGET_REALIZED(widget)) { set_scroll_region(mdisp); melys_track_display_update(mdisp); @@ -488,13 +557,24 @@ width = GTK_WIDGET(mdisp)->allocation.width; height = GTK_WIDGET(mdisp)->allocation.height; - mdisp->hadj->page_size = width; + /* It is our job to modify the page_size for the horizontal scroll + * do not modify the bounds here + */ + mdisp->hadj->page_size = x_to_tick(mdisp, width); + mdisp->hadj->page_increment = x_to_tick(mdisp, width); + mdisp->hadj->step_increment = x_to_tick(mdisp, 20); gtk_adjustment_changed(mdisp->hadj); if (width < tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot))) width = tick_to_x(mdisp, MD_ENDTIME(mdisp->mdroot)); - if (height < mdisp->mdroot->tracks * mdisp->vspace) - height = mdisp->mdroot->tracks * mdisp->vspace; + if (height < mdisp->mdroot->tracks * mdisp->vspace) { + int last; + int extra; + + last = (int)(mdisp->vadj->upper - mdisp->vadj->page_size)/mdisp->vspace; + extra = height - last; + height = mdisp->mdroot->tracks * mdisp->vspace + extra; + } gnome_canvas_set_scroll_region(canvas, 0.0, 0.0, @@ -502,6 +582,66 @@ height ); +>>function title_expose +static gboolean +GtkWidget *widget; +GdkEventExpose *event; +gpointer data; + +>>description +Temporary ruler routine. +Obviously this needs to look at the tempo map and +find the time signature records and do proper bar lines. + +>>code + MelysTrackDisplay *mdisp; + char numbuf[20]; + int qn; + int x; + int tick; + int yoff; + + if (!GTK_WIDGET_DRAWABLE(widget)) + return FALSE; + + mdisp = MELYS_TRACK_DISPLAY(data); + + x = event->area.x; + tick = mdisp->hoffset + x_to_tick(mdisp, x); + qn = tick/192; + + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], + &event->area); + + /* Adjust x to the first tick-line that needs drawing */ + x = tick_to_x(mdisp, qn*192 - mdisp->hoffset); + + for (; x < event->area.x + event->area.width; ) { + if ((qn % 4) == 0) { + yoff = 10; + g_snprintf(numbuf, 20, "%d", qn/4); + gdk_draw_string(widget->window, + widget->style->font, + widget->style->fg_gc[widget->state], + x+2, yoff, numbuf); + } else + yoff = 18; + + gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + x, yoff, x, mdisp->vtitle - TRACK_TITLE_RULE); + + /* Increment to the next one */ + qn++; + x = tick_to_x(mdisp, qn * 192 - mdisp->hoffset); + } + + gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); + + gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], + 0, mdisp->vtitle - TRACK_TITLE_RULE, + widget->allocation.width, mdisp->vtitle - TRACK_TITLE_RULE); + + return TRUE; >>function y_to_track static int @@ -537,9 +677,7 @@ >>code int ypix; - ypix = n + mdisp->voffset; - - ypix *= mdisp->vspace; + ypix = n * mdisp->vspace; return ypix; diff -rNu melys-0.0.12/widgets/melystrackinfo.c melys-0.0.13/widgets/melystrackinfo.c --- melys-0.0.12/widgets/melystrackinfo.c Wed Sep 22 23:10:42 1999 +++ melys-0.0.13/widgets/melystrackinfo.c Thu Sep 23 17:03:26 1999 @@ -531,7 +531,7 @@ * Add up all the column widths and include the separator * width. */ - tot = widget->style->klass->xthickness; + tot = 0; for (i = 0; i < minfo->col_used; i++) { tot += minfo->col_infos[i].width; tot += 2*COL_PADDING; @@ -546,7 +546,6 @@ tot += widget->style->klass->xthickness; } - tot += widget->style->klass->xthickness; tot += PAN_PADDING; req->width = tot; @@ -594,7 +593,7 @@ { minfo->vadj->page_size = - ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; + (minfo->track_area.height / minfo->vspace); minfo->vadj->page_increment = minfo->vadj->page_size; gtk_adjustment_changed(minfo->vadj); @@ -636,11 +635,6 @@ /* The clear is needed for scrolling... may be removed in future */ - if (ap->x == 0) - ap->x = style->klass->xthickness; - if (ap->y == 0) - ap->y = style->klass->xthickness; - start = y_to_track(minfo, ap->y); end = y_to_track(minfo, ap->y + ap->height) + 1; if (start < 0) @@ -670,16 +664,12 @@ /* Draw in the separator line bewtween the titles and rows */ gdk_draw_line(widget->window, fg_gc, - 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + 0, minfo->vtitle - TRACK_TITLE_RULE, + minfo->track_area.width, minfo->vtitle - TRACK_TITLE_RULE); dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) draw_row(minfo, ntrack); - - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, - minfo->track_area.width, minfo->vtitle + minfo->track_area.height); } /* @@ -699,7 +689,6 @@ struct trackElement *track; struct col_info *cip; int xpos; - int wid; int i; widget = (GtkWidget *)minfo; @@ -707,7 +696,7 @@ track = md_track_nth(minfo->mdroot, ntrack); - xpos = style->klass->xthickness; + xpos = 0; for (i = 0; i < minfo->col_used; i++) { cip = minfo->col_infos+i; @@ -725,11 +714,6 @@ area.width = cip->width + 2*COL_PADDING; area.height = minfo->vspace; - /* Check not scribbling on our shadow */ - wid = minfo->track_area.width - 2*style->klass->xthickness; - if (area.x + area.width > wid && area.x < wid) - area.width = wid - area.x; - gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, area.width, area.height); @@ -742,11 +726,6 @@ area.x = xpos; area.width = cip->width; - /* Check not scribbling on our shadow */ - wid = minfo->track_area.width - style->klass->xthickness; - if (area.x + area.width > wid && area.x < wid) - area.width = wid - area.x; - gdk_gc_set_clip_rectangle(fg_gc, &area); draw_col(minfo, ntrack, track, &area, cip, fg_gc); @@ -1340,7 +1319,7 @@ n -= minfo->voffset; if (n <= -1) - return GTK_WIDGET(minfo)->style->klass->xthickness; + return 0; ypix = n * minfo->vspace + minfo->vtitle; @@ -1425,7 +1404,7 @@ /* * I am just redrawing the whole pane here, it would be - * best to do real scrolling, but it looks fast enough + * best to do copy areas, but it looks fast enough * to me at the moment. Perhaps this will change */ gtk_widget_queue_clear((GtkWidget*)minfo); diff -rNu melys-0.0.12/widgets/melystrackinfo.m melys-0.0.13/widgets/melystrackinfo.m --- melys-0.0.12/widgets/melystrackinfo.m Wed Sep 22 21:38:07 1999 +++ melys-0.0.13/widgets/melystrackinfo.m Thu Sep 23 15:24:10 1999 @@ -509,7 +509,7 @@ * Add up all the column widths and include the separator * width. */ - tot = widget->style->klass->xthickness; + tot = 0; for (i = 0; i < minfo->col_used; i++) { tot += minfo->col_infos[i].width; tot += 2*COL_PADDING; @@ -524,7 +524,6 @@ tot += widget->style->klass->xthickness; } - tot += widget->style->klass->xthickness; tot += PAN_PADDING; req->width = tot; @@ -578,7 +577,7 @@ >>code minfo->vadj->page_size = - ((gfloat)minfo->track_area.height / minfo->vspace) - 1.5; + (minfo->track_area.height / minfo->vspace); minfo->vadj->page_increment = minfo->vadj->page_size; gtk_adjustment_changed(minfo->vadj); @@ -620,11 +619,6 @@ /* The clear is needed for scrolling... may be removed in future */ - if (ap->x == 0) - ap->x = style->klass->xthickness; - if (ap->y == 0) - ap->y = style->klass->xthickness; - start = y_to_track(minfo, ap->y); end = y_to_track(minfo, ap->y + ap->height) + 1; if (start < 0) @@ -654,16 +648,13 @@ /* Draw in the separator line bewtween the titles and rows */ gdk_draw_line(widget->window, fg_gc, - 0, minfo->vtitle-1, minfo->track_area.width, minfo->vtitle-1); + 0, minfo->vtitle - TRACK_TITLE_RULE, + minfo->track_area.width, minfo->vtitle - TRACK_TITLE_RULE); dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) draw_row(minfo, ntrack); - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, - minfo->track_area.width, minfo->vtitle + minfo->track_area.height); >>function draw_row static void @@ -683,7 +674,6 @@ struct trackElement *track; struct col_info *cip; int xpos; - int wid; int i; widget = (GtkWidget *)minfo; @@ -691,7 +681,7 @@ track = md_track_nth(minfo->mdroot, ntrack); - xpos = style->klass->xthickness; + xpos = 0; for (i = 0; i < minfo->col_used; i++) { cip = minfo->col_infos+i; @@ -709,11 +699,6 @@ area.width = cip->width + 2*COL_PADDING; area.height = minfo->vspace; - /* Check not scribbling on our shadow */ - wid = minfo->track_area.width - 2*style->klass->xthickness; - if (area.x + area.width > wid && area.x < wid) - area.width = wid - area.x; - gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, area.width, area.height); @@ -726,11 +711,6 @@ area.x = xpos; area.width = cip->width; - /* Check not scribbling on our shadow */ - wid = minfo->track_area.width - style->klass->xthickness; - if (area.x + area.width > wid && area.x < wid) - area.width = wid - area.x; - gdk_gc_set_clip_rectangle(fg_gc, &area); draw_col(minfo, ntrack, track, &area, cip, fg_gc); @@ -1379,7 +1359,7 @@ n -= minfo->voffset; if (n <= -1) - return GTK_WIDGET(minfo)->style->klass->xthickness; + return 0; ypix = n * minfo->vspace + minfo->vtitle; @@ -1473,7 +1453,7 @@ /* * I am just redrawing the whole pane here, it would be - * best to do real scrolling, but it looks fast enough + * best to do copy areas, but it looks fast enough * to me at the moment. Perhaps this will change */ gtk_widget_queue_clear((GtkWidget*)minfo);