diff -rNu melys-0.1.4/ChangeLog melys-0.1.5/ChangeLog --- melys-0.1.4/ChangeLog Wed Nov 24 00:15:22 1999 +++ melys-0.1.5/ChangeLog Wed Nov 24 22:52:00 1999 @@ -1,3 +1,19 @@ +1999-11-24 Steve Ratcliffe + + * widgets/melystrackdisplay.m: + Fixes to use the allocation of the canvas rather than + the widget itself. + + * widgets/melyskeys.m, widgets/melyspiano.m, widgets/melysview.m: + Added the keyboard part of the piano roll display. + Also fixed a bug where you couldn't see right down to note 0. + + * version: Version 0.1.4 + + * ChangeLog: For release. + + * doc/mdml.dtd: Updated version number for last change + 1999-11-23 Steve Ratcliffe * doc/mdml.dtd: Add the new midi tag. diff -rNu melys-0.1.4/README melys-0.1.5/README --- melys-0.1.4/README Mon Nov 15 23:49:44 1999 +++ melys-0.1.5/README Wed Nov 24 22:53:23 1999 @@ -21,15 +21,13 @@ time and also onto a different track. Parts can also be dragged to another window in the same application. -There is now half a piano roll view. (There is no keyboard part -just yet) You can move notes around in it and copy them. No -deletion or changing the length yet. +There is now a piano roll view. You can move notes around in it and +copy them. No deletion or changing the length yet. At present you can: - Read in files in either midi format or the Melys native format MDML. There can be several files open at once. - - Play a file, stop it in the middle and resume it, mute tracks, solo tracks. diff -rNu melys-0.1.4/include/melyskeys.h melys-0.1.5/include/melyskeys.h --- melys-0.1.4/include/melyskeys.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.5/include/melyskeys.h Wed Nov 24 22:54:45 1999 @@ -0,0 +1,61 @@ +/* + * + * 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_KEYS(obj) GTK_CHECK_CAST(obj, melys_keys_get_type(), MelysKeys) +#define MELYS_KEYS_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, melys_keys_get_type(), MelysKeysClass) +#define IS_MELYS_KEYS(obj) GTK_CHECK_TYPE(obj, melys_keys_get_type()) + +typedef struct _MelysKeys MelysKeys; +typedef struct _MelysKeysClass MelysKeysClass; + + +/* + * State for each key on the board. + */ +struct keystate { + GtkObject *item; /* The canvas item */ +}; + +#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 */ + +/* + * 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 */ + + struct keystate keys[NKEYS]; /* Individual key state */ +}; + +/* + * The MelysKeysClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysKeysClass { + GnomeCanvasClass parent_class; + // XXX class definition here +}; + +guint melys_keys_get_type(void); +GtkWidget *melys_keys_new(ViewControl *vcp); +void melys_keys_set_control(MelysKeys *mkeys, ViewControl *vcp); diff -rNu melys-0.1.4/programs/Makefile melys-0.1.5/programs/Makefile --- melys-0.1.4/programs/Makefile Wed Nov 24 00:21:38 1999 +++ melys-0.1.5/programs/Makefile Wed Nov 24 22:54:55 1999 @@ -56,8 +56,8 @@ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \ ../widgets/melysrule.o ../widgets/melyspos.o \ - ../widgets/viewcontrol.o \ - ../widgets/melysview.o ../widgets/melyspiano.o \ + ../widgets/viewcontrol.o ../widgets/melysview.o \ + ../widgets/melyspiano.o ../widgets/melyskeys.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ diff -rNu melys-0.1.4/programs/melys.m melys-0.1.5/programs/melys.m --- melys-0.1.4/programs/melys.m Sat Nov 13 12:30:35 1999 +++ melys-0.1.5/programs/melys.m Wed Nov 24 22:50:42 1999 @@ -30,8 +30,8 @@ >>make --objects ../widgets/melystrack.o ../widgets/melystrackinfo.o >>make --objects ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o >>make --objects ../widgets/melysrule.o ../widgets/melyspos.o ->>make --objects ../widgets/viewcontrol.o ->>make --objects ../widgets/melysview.o ../widgets/melyspiano.o +>>make --objects ../widgets/viewcontrol.o ../widgets/melysview.o +>>make --objects ../widgets/melyspiano.o ../widgets/melyskeys.o >>make --objects ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header diff -rNu melys-0.1.4/version melys-0.1.5/version --- melys-0.1.4/version Wed Nov 24 00:16:42 1999 +++ melys-0.1.5/version Wed Nov 24 22:54:23 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.4" +#define MELYS_VERSION_STRING "0.1.5" diff -rNu melys-0.1.4/widgets/.cvsignore melys-0.1.5/widgets/.cvsignore --- melys-0.1.4/widgets/.cvsignore Wed Nov 24 00:21:37 1999 +++ melys-0.1.5/widgets/.cvsignore Wed Nov 24 22:54:54 1999 @@ -1,3 +1,4 @@ +melyskeys.c melyspartitem.c melyspiano.c melyspos.c diff -rNu melys-0.1.4/widgets/Makefile melys-0.1.5/widgets/Makefile --- melys-0.1.4/widgets/Makefile Wed Nov 24 00:21:37 1999 +++ melys-0.1.5/widgets/Makefile Wed Nov 24 22:54:54 1999 @@ -4,7 +4,8 @@ include $(TOP)/make.conf TARGETS = -OBJS = melyspartitem.o \ +OBJS = melyskeys.o \ + melyspartitem.o \ melyspiano.o \ melyspos.o \ melysrule.o \ @@ -16,7 +17,8 @@ misc.o \ register.o \ viewcontrol.o -GENCFILES = melyspartitem.c \ +GENCFILES = melyskeys.c \ + melyspartitem.c \ melyspiano.c \ melyspos.c \ melysrule.c \ @@ -28,7 +30,8 @@ misc.c \ register.c \ viewcontrol.c -GENHFILES = ../include/melyspartitem.h \ +GENHFILES = ../include/melyskeys.h \ + ../include/melyspartitem.h \ ../include/melyspiano.h \ ../include/melyspos.h \ ../include/melysrule.h \ @@ -88,8 +91,11 @@ melyspiano.o: ../include/viewcontrol.h melyspiano.o: ../include/melwidgets.h melyspiano.o: ../include/melysview.h +melyspiano.o: ../include/melyskeys.h melyspiano.o: ../include/melyspiano.h register.o: ../include/melreg.h +melyskeys.o: ../include/viewcontrol.h +melyskeys.o: ../include/melyskeys.h melyspartitem.o: ../include/elements.h melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h diff -rNu melys-0.1.4/widgets/melyskeys.c melys-0.1.5/widgets/melyskeys.c --- melys-0.1.4/widgets/melyskeys.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.5/widgets/melyskeys.c Wed Nov 24 22:55:04 1999 @@ -0,0 +1,282 @@ +/* + * + * 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 "libgnomeui/gnome-canvas-rect-ellipse.h" +#include "viewcontrol.h" +#include "melyskeys.h" +#include "intl.h" + + + + + +/* The list of signal id's that are being added for MelysKeys. */ +enum { + // XXX symbols for all signals here + // will have piano 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) + +#define key_to_y(mkeys, key) view_control_thing_to_y( \ + MELYS_KEYS(mkeys)->vcp, key) + + +#define WHITE 0 +#define BLACK 1 + +/* 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 GnomeCanvasClass *parent_class = NULL; + +static gint melys_keys_signals[LAST_SIGNAL]; + +/* + * Return a unique integer that represents the object type. + */ +guint +melys_keys_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "MelysKeys", + sizeof(MelysKeys), + sizeof(MelysKeysClass), + (GtkClassInitFunc) melys_keys_class_init, + (GtkObjectInitFunc) melys_keys_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gnome_canvas_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new MelysKeys object. + */ +GtkWidget * +melys_keys_new(ViewControl *vcp) +{ + MelysKeys *mkeys = MELYS_KEYS(gtk_type_new(melys_keys_get_type())); + + if (vcp) + melys_keys_set_control(mkeys, vcp); + + return GTK_WIDGET(mkeys); +} + +/* + * Initialise the MelysKeys. + * + * Arguments: + * mkeys - The MelysKeys to init + */ +static void +melys_keys_init(MelysKeys *mkeys) +{ + int i; + + for (i = 0; i < NKEYS; i++) { + mkeys->keys[i].item = NULL; + } +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +melys_keys_class_init(MelysKeysClass *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()); + + // XXX Add args + + // XXX Create signals + + 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); + } +} + +/* + * Draw or redraw all the piano keys. It is drawn like a real + * keyboard so that the semitones are equally spaced. + * + * Arguments: + * obj - This is the view control + * data - Our own data + */ +static void +scale_changed(GtkObject *obj, gpointer data) +{ + MelysKeys *mkeys = data; + int len; + int colour; + double width; + int octpos; /* possition 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); + + 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, + "x1", (double) 0.0, + "width_pixels", 1, + NULL); + } + + if ((key % 12) == 0) { + octpos = (NKEYS - key) * mkeys->vcp->vscale; + nwhite = 0; + } + + if (ktype[key % 12] == WHITE) { + /* + * A white key has a width of 1/7 of an octave. + */ + len = WHITE_LEN; + width = ((double)mkeys->vcp->vscale*12 / 7); + colour = 0xffffffff; + outline = "black"; + pos = octpos - nwhite * width + 0.5; + nwhite++; + } else { + /* + * 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; + } + +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), + "y2", (double) pos, + "fill_color_rgba", colour, + "outline_color", outline, + NULL); + + if (ktype[key % 12] == WHITE) + gnome_canvas_item_lower_to_bottom + (GNOME_CANVAS_ITEM(mkeys->keys[key].item)); + } +} diff -rNu melys-0.1.4/widgets/melyskeys.m melys-0.1.5/widgets/melyskeys.m --- melys-0.1.4/widgets/melyskeys.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.5/widgets/melyskeys.m Wed Nov 24 22:43:52 1999 @@ -0,0 +1,278 @@ +>>name melyskeys.m - A keyboard widget for the piano roll + +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 libgnomeui/gnome-canvas-rect-ellipse.h + +>>header viewcontrol.h + +>>gtkobject melys_keys gnome_canvas + +>>headerdef @header + +/* + * State for each key on the board. + */ +struct keystate { + GtkObject *item; /* The canvas item */ +}; + +#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 */ + +/* + * 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 */ + + struct keystate keys[NKEYS]; /* Individual key state */ +}; + +/* + * The MelysKeysClass structure. There is only one of these + * allocated for the class. + */ +struct _MelysKeysClass { + GnomeCanvasClass parent_class; + // XXX class definition here +}; + +>>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 + 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) + +#define key_to_y(mkeys, key) view_control_thing_to_y( \ + MELYS_KEYS(mkeys)->vcp, key) + + +>>function melys_keys_new +GtkWidget * +ViewControl *vcp; + +>>description +Create a new MelysKeys object. +>>code + MelysKeys *mkeys = MELYS_KEYS(gtk_type_new(melys_keys_get_type())); + + if (vcp) + melys_keys_set_control(mkeys, vcp); + + return GTK_WIDGET(mkeys); + +>>function melys_keys_init +static void +MelysKeys *mkeys; The MelysKeys to init +>>description +Initialise the MelysKeys. +>>code + int i; + + for (i = 0; i < NKEYS; i++) { + mkeys->keys[i].item = NULL; + } + + +>>function melys_keys_class_init +static void +MelysKeysClass *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()); + + // XXX Add args + + // XXX Create signals + + 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); + + 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 + +>>description +Draw or redraw all the piano keys. +It is drawn like a real keyboard so that the semitones are +equally spaced. + +>>code + MelysKeys *mkeys = data; + int len; + int colour; + double width; + int octpos; /* possition 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); + + 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, + "x1", (double) 0.0, + "width_pixels", 1, + NULL); + } + + if ((key % 12) == 0) { + octpos = (NKEYS - key) * mkeys->vcp->vscale; + nwhite = 0; + } + + if (ktype[key % 12] == WHITE) { + /* + * A white key has a width of 1/7 of an octave. + */ + len = WHITE_LEN; + width = ((double)mkeys->vcp->vscale*12 / 7); + colour = 0xffffffff; + outline = "black"; + pos = octpos - nwhite * width + 0.5; + nwhite++; + } else { + /* + * 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; + } + +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), + "y2", (double) pos, + "fill_color_rgba", colour, + "outline_color", outline, + NULL); + + if (ktype[key % 12] == WHITE) + gnome_canvas_item_lower_to_bottom + (GNOME_CANVAS_ITEM(mkeys->keys[key].item)); + } diff -rNu melys-0.1.4/widgets/melyspiano.c melys-0.1.5/widgets/melyspiano.c --- melys-0.1.4/widgets/melyspiano.c Wed Nov 24 00:21:47 1999 +++ melys-0.1.5/widgets/melyspiano.c Wed Nov 24 22:55:04 1999 @@ -31,6 +31,7 @@ #include "gtk/gtkvbox.h" #include "gtk/gtktable.h" #include "gtk/gtkframe.h" +#include "gtk/gtklabel.h" #include "libgnomeui/gnome-canvas.h" #include "libgnomeui/gnome-canvas-rect-ellipse.h" #include "libgnomeui/gnome-canvas-util.h" @@ -39,6 +40,7 @@ #include "viewcontrol.h" #include "melwidgets.h" #include "melysview.h" +#include "melyskeys.h" #include "melyspiano.h" #include "intl.h" @@ -47,11 +49,13 @@ #define tick_to_x(mp, t) view_control_tick_to_x( \ MELYS_VIEW(mp)->vcp, t) -/* Notes are numbered 0-127 from the bottom where our y-coords go in +/* Notes are numbered 0-NKEYS from the bottom where our y-coords go in * the other direction */ #define note_to_y(mp, n) view_control_thing_to_y( \ - MELYS_VIEW(mp)->vcp, (127 - (n))) + MELYS_VIEW(mp)->vcp, (NKEYS-1 - (n))) +#define note_to_thing(n) (NKEYS-1 - (n)) +#define thing_to_note(n) (NKEYS-1 - (n)) /* Static functions */ static void melys_piano_init(MelysPiano *mpiano); @@ -127,7 +131,11 @@ GtkTable *tab; MelysView *mview = MELYS_VIEW(mpiano); GtkWidget *frame1; + GtkWidget *frame2; GtkBox *vbox1; + GtkBox *vbox2; + GtkWidget *mkeys; + GtkWidget *invis; view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); @@ -141,12 +149,12 @@ */ /* The vert scrollbar group */ - gtk_table_attach(tab, mview->vcp->vsb, 2, 4, 0, 3, + gtk_table_attach(tab, mview->vcp->vsb, 2, 3, 0, 2, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 3, 4, + gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 2, 3, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 @@ -166,16 +174,35 @@ gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); /* And add the frame */ - gtk_table_attach(tab, frame1, 1, 2, 0, 3, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, + gtk_table_attach(tab, frame1, 1, 2, 0, 2, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + 0, 0 + ); + + /* The keyboard */ + vbox2 = (GtkBox *)gtk_vbox_new(0, 0); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); + mkeys = melys_keys_new(mview->vcp); + invis = gtk_label_new(""); + + /* Pack them into a box */ + gtk_box_pack_start(vbox2, invis, 0, 0, 0); + gtk_container_add(GTK_CONTAINER(frame2), mkeys); + gtk_box_pack_start(vbox2, frame2, 1, 1, 0); + + gtk_table_attach(tab, GTK_WIDGET(vbox2), 0, 1, 0, 2, + 0, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, 0, 0 ); - gtk_widget_set_usize(mview->ruler, 1, mview->vcp->vtitle); + gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); + gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); gtk_widget_show_all(GTK_WIDGET(tab)); - mview->vthings = 127; /* There are 127 midi notes */ + mview->vthings = NKEYS; /* There are NKEYS midi notes */ gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", GTK_SIGNAL_FUNC(canvas_event), NULL); @@ -264,7 +291,7 @@ { int n; int maxnote = 0; - int minnote = 127; + int minnote = NKEYS; struct element *el; struct noteElement *note; @@ -303,7 +330,8 @@ adj = MELYS_VIEW(mpiano)->vcp->vadj; if (adj->value == 0) gtk_adjustment_clamp_page(adj, - (gfloat) 127 - maxnote, (gfloat) 127 - minnote); + (gfloat) note_to_thing(maxnote), + (gfloat) note_to_thing(minnote)); gtk_adjustment_value_changed(adj); } @@ -414,7 +442,8 @@ static int get_nthing(MelysView *mview, struct element *el) { - return 127 - MD_NOTE(el)->note; + + return note_to_thing(MD_NOTE(el)->note); } /* @@ -435,7 +464,7 @@ MD_REF(el); md_remove(el->con, el); if (MD_TYPE(el) == MD_TYPE_NOTE) - drop_elem(mview, el, 127 - MD_NOTE(el)->note); + drop_elem(mview, el, note_to_thing(MD_NOTE(el)->note)); MD_UNREF(el); } } else if (elem->type == MD_TYPE_NOTE) { @@ -444,7 +473,7 @@ md_ensure_parts(mview->viewcon, MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); - MD_NOTE(elem)->note = 127 - nthing; + MD_NOTE(elem)->note = thing_to_note(nthing); MELYS_VIEW_CLASS(parent_class)->drop_elem(mview, elem, nthing); } diff -rNu melys-0.1.4/widgets/melyspiano.m melys-0.1.5/widgets/melyspiano.m --- melys-0.1.4/widgets/melyspiano.m Mon Nov 15 23:39:10 1999 +++ melys-0.1.5/widgets/melyspiano.m Wed Nov 24 22:43:52 1999 @@ -20,6 +20,7 @@ >>header gtk/gtkvbox.h >>header gtk/gtktable.h >>header gtk/gtkframe.h +>>header gtk/gtklabel.h >>header libgnomeui/gnome-canvas.h >>header libgnomeui/gnome-canvas-rect-ellipse.h @@ -31,6 +32,7 @@ >>header viewcontrol.h >>header melwidgets.h >>header melysview.h +>>header melyskeys.h >>set nosignals >>gtkobject melys_piano melys_view @@ -52,11 +54,13 @@ #define tick_to_x(mp, t) view_control_tick_to_x( \ MELYS_VIEW(mp)->vcp, t) -/* Notes are numbered 0-127 from the bottom where our y-coords go in +/* Notes are numbered 0-NKEYS from the bottom where our y-coords go in * the other direction */ #define note_to_y(mp, n) view_control_thing_to_y( \ - MELYS_VIEW(mp)->vcp, (127 - (n))) + MELYS_VIEW(mp)->vcp, (NKEYS-1 - (n))) +#define note_to_thing(n) (NKEYS-1 - (n)) +#define thing_to_note(n) (NKEYS-1 - (n)) @@ -90,7 +94,11 @@ GtkTable *tab; MelysView *mview = MELYS_VIEW(mpiano); GtkWidget *frame1; + GtkWidget *frame2; GtkBox *vbox1; + GtkBox *vbox2; + GtkWidget *mkeys; + GtkWidget *invis; view_control_set_vertical(mview->vcp, 8); view_control_set_horizontal(mview->vcp, VIEW_DEF_HSCALE/4); @@ -104,12 +112,12 @@ */ /* The vert scrollbar group */ - gtk_table_attach(tab, mview->vcp->vsb, 2, 4, 0, 3, + gtk_table_attach(tab, mview->vcp->vsb, 2, 3, 0, 2, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 3, 4, + gtk_table_attach(tab, mview->vcp->hsb, 0, 2, 2, 3, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 @@ -129,16 +137,35 @@ gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(vbox1)); /* And add the frame */ - gtk_table_attach(tab, frame1, 1, 2, 0, 3, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, - GTK_FILL|GTK_SHRINK|GTK_EXPAND, + gtk_table_attach(tab, frame1, 1, 2, 0, 2, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, + 0, 0 + ); + + /* The keyboard */ + vbox2 = (GtkBox *)gtk_vbox_new(0, 0); + frame2 = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame2), GTK_SHADOW_IN); + mkeys = melys_keys_new(mview->vcp); + invis = gtk_label_new(""); + + /* Pack them into a box */ + gtk_box_pack_start(vbox2, invis, 0, 0, 0); + gtk_container_add(GTK_CONTAINER(frame2), mkeys); + gtk_box_pack_start(vbox2, frame2, 1, 1, 0); + + gtk_table_attach(tab, GTK_WIDGET(vbox2), 0, 1, 0, 2, + 0, + GTK_SHRINK|GTK_EXPAND|GTK_FILL, 0, 0 ); - gtk_widget_set_usize(mview->ruler, 1, mview->vcp->vtitle); + gtk_widget_set_usize(invis, 0, mview->vcp->vtitle); + gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); gtk_widget_show_all(GTK_WIDGET(tab)); - mview->vthings = 127; /* There are 127 midi notes */ + mview->vthings = NKEYS; /* There are NKEYS midi notes */ gtk_signal_connect(GTK_OBJECT(mview->canvas), "event", GTK_SIGNAL_FUNC(canvas_event), NULL); @@ -240,7 +267,7 @@ >>code int n; int maxnote = 0; - int minnote = 127; + int minnote = NKEYS; struct element *el; struct noteElement *note; @@ -279,7 +306,8 @@ adj = MELYS_VIEW(mpiano)->vcp->vadj; if (adj->value == 0) gtk_adjustment_clamp_page(adj, - (gfloat) 127 - maxnote, (gfloat) 127 - minnote); + (gfloat) note_to_thing(maxnote), + (gfloat) note_to_thing(minnote)); gtk_adjustment_value_changed(adj); } @@ -399,7 +427,8 @@ struct element *el; >>code - return 127 - MD_NOTE(el)->note; + + return note_to_thing(MD_NOTE(el)->note); >>function drop_elem @@ -424,7 +453,7 @@ MD_REF(el); md_remove(el->con, el); if (MD_TYPE(el) == MD_TYPE_NOTE) - drop_elem(mview, el, 127 - MD_NOTE(el)->note); + drop_elem(mview, el, note_to_thing(MD_NOTE(el)->note)); MD_UNREF(el); } } else if (elem->type == MD_TYPE_NOTE) { @@ -433,7 +462,7 @@ md_ensure_parts(mview->viewcon, MD_TIME(elem), MD_TIME(elem) + MD_NOTE(elem)->length); - MD_NOTE(elem)->note = 127 - nthing; + MD_NOTE(elem)->note = thing_to_note(nthing); MELYS_VIEW_CLASS(parent_class)->drop_elem(mview, elem, nthing); } diff -rNu melys-0.1.4/widgets/melystrackdisplay.c melys-0.1.5/widgets/melystrackdisplay.c --- melys-0.1.4/widgets/melystrackdisplay.c Wed Nov 24 00:21:49 1999 +++ melys-0.1.5/widgets/melystrackdisplay.c Wed Nov 24 22:55:06 1999 @@ -490,7 +490,8 @@ * scroll. This is so you can scroll by hand with out it * always jumping back. */ - page_width = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + page_width = x_to_tick(mdisp, + GTK_WIDGET(mdisp->canvas)->allocation.width); boundry = page_width / 10; if (t - mdisp->hoffset > page_width - boundry && @@ -1148,7 +1149,7 @@ set_hscroll(mdisp); /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mdisp)->allocation.height; + height = GTK_WIDGET(mdisp->canvas)->allocation.height; if (height < mdisp->mdroot->tracks * mdisp->vcp->vscale) { int last; @@ -1196,7 +1197,7 @@ adj = mdisp->vcp->hadj; - pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp->canvas)->allocation.width); ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; adj->lower = 0.0; @@ -1457,7 +1458,7 @@ /* If this is say a note, then we need to squash down */ if (!iscontainer(dragdata[0].element)) - oldata->yoffset /= 127; + oldata->yoffset /= 128; /* * Create the individual outlines for each part that is being @@ -1472,7 +1473,7 @@ if (iscontainer(dp->element)) squeeze = 1; else - squeeze = 127; + squeeze = 128; x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset); y1 = track_to_y(mdisp, dp->thing_offset - track_offset); diff -rNu melys-0.1.4/widgets/melystrackdisplay.m melys-0.1.5/widgets/melystrackdisplay.m --- melys-0.1.4/widgets/melystrackdisplay.m Mon Nov 15 23:38:19 1999 +++ melys-0.1.5/widgets/melystrackdisplay.m Wed Nov 24 22:47:47 1999 @@ -472,7 +472,8 @@ * scroll. This is so you can scroll by hand with out it * always jumping back. */ - page_width = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + page_width = x_to_tick(mdisp, + GTK_WIDGET(mdisp->canvas)->allocation.width); boundry = page_width / 10; if (t - mdisp->hoffset > page_width - boundry && @@ -1164,7 +1165,7 @@ set_hscroll(mdisp); /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mdisp)->allocation.height; + height = GTK_WIDGET(mdisp->canvas)->allocation.height; if (height < mdisp->mdroot->tracks * mdisp->vcp->vscale) { int last; @@ -1215,7 +1216,7 @@ adj = mdisp->vcp->hadj; - pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); + pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp->canvas)->allocation.width); ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; adj->lower = 0.0; @@ -1495,7 +1496,7 @@ /* If this is say a note, then we need to squash down */ if (!iscontainer(dragdata[0].element)) - oldata->yoffset /= 127; + oldata->yoffset /= 128; /* * Create the individual outlines for each part that is being @@ -1510,7 +1511,7 @@ if (iscontainer(dp->element)) squeeze = 1; else - squeeze = 127; + squeeze = 128; x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset); y1 = track_to_y(mdisp, dp->thing_offset - track_offset); diff -rNu melys-0.1.4/widgets/melysview.c melys-0.1.5/widgets/melysview.c --- melys-0.1.4/widgets/melysview.c Wed Nov 24 00:21:50 1999 +++ melys-0.1.5/widgets/melysview.c Wed Nov 24 22:55:07 1999 @@ -97,6 +97,7 @@ static void melys_view_init(MelysView *mview); 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 void button_press(MelysView *mview, struct element *elem, GdkEventButton *event); @@ -107,7 +108,6 @@ static void set_hscroll(MelysView *mview); static void set_vscroll(MelysView *mview); static void song_pos_cb(GtkAdjustment *adj, gpointer data); -static void view_draw(GtkWidget *widget, GdkRectangle *area); static void set_scroll_region(MelysView *mview); static void vcp_changed(GtkObject *vobj, gpointer data); static void view_scale_changed(MelysView *mview); @@ -331,6 +331,23 @@ } /* + * Look through all the parts and set up the part items for each + * part. + */ +static void +view_draw(GtkWidget *widget, GdkRectangle *area) +{ + MelysView *mview = (MelysView *)widget; + + set_scroll_region(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. */ @@ -585,7 +602,7 @@ adj = mview->vcp->hadj; - pageticks = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + pageticks = x_to_tick(mview, GTK_WIDGET(mview->canvas)->allocation.width); ticklen = MD_ENDTIME(mview->viewcon) + pageticks; adj->lower = 0.0; @@ -611,7 +628,7 @@ { int height; - height = GTK_WIDGET(mview)->allocation.height; + height = GTK_WIDGET(mview->canvas)->allocation.height; mview->vcp->vadj->page_size = (height / mview->vcp->vscale); @@ -674,7 +691,8 @@ * scroll. This is so you can scroll by hand with out it * always jumping back. */ - page_width = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + page_width = x_to_tick(mview, + GTK_WIDGET(mview->canvas)->allocation.width); boundry = page_width / 10; if (t - mview->hoffset > page_width - boundry && @@ -697,23 +715,6 @@ } /* - * Look through all the parts and set up the part items for each - * part. - */ -static void -view_draw(GtkWidget *widget, GdkRectangle *area) -{ - MelysView *mview = (MelysView *)widget; - - set_scroll_region(mview); - - if (mview->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); - - GTK_WIDGET_CLASS(parent_class)->draw(widget, area); -} - -/* * Set the canvas scrolling region. The complete area * required to show the current song at the current scaling is * calculated. This is the scroll region for the canvas and the @@ -737,8 +738,9 @@ set_hscroll(mview); set_vscroll(mview); +#ifdef maybe_needed_for_track_display /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mview)->allocation.height; + height = GTK_WIDGET(mview->canvas)->allocation.height; if (height < mview->vthings * mview->vcp->vscale) { int last; @@ -750,7 +752,9 @@ 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, diff -rNu melys-0.1.4/widgets/melysview.m melys-0.1.5/widgets/melysview.m --- melys-0.1.4/widgets/melysview.m Mon Nov 15 23:37:16 1999 +++ melys-0.1.5/widgets/melysview.m Wed Nov 24 22:43:52 1999 @@ -382,6 +382,25 @@ (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); +>>function view_draw +static void +GtkWidget *widget; +GdkRectangle *area; + +>>description +Look through all the parts and set up the part items for +each part. + +>>code + MelysView *mview = (MelysView *)widget; + + set_scroll_region(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; @@ -650,7 +669,7 @@ adj = mview->vcp->hadj; - pageticks = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + pageticks = x_to_tick(mview, GTK_WIDGET(mview->canvas)->allocation.width); ticklen = MD_ENDTIME(mview->viewcon) + pageticks; adj->lower = 0.0; @@ -679,7 +698,7 @@ >>code int height; - height = GTK_WIDGET(mview)->allocation.height; + height = GTK_WIDGET(mview->canvas)->allocation.height; mview->vcp->vadj->page_size = (height / mview->vcp->vscale); @@ -741,7 +760,8 @@ * scroll. This is so you can scroll by hand with out it * always jumping back. */ - page_width = x_to_tick(mview, GTK_WIDGET(mview)->allocation.width); + page_width = x_to_tick(mview, + GTK_WIDGET(mview->canvas)->allocation.width); boundry = page_width / 10; if (t - mview->hoffset > page_width - boundry && @@ -763,25 +783,6 @@ } ->>function view_draw -static void -GtkWidget *widget; -GdkRectangle *area; - ->>description -Look through all the parts and set up the part items for -each part. - ->>code - MelysView *mview = (MelysView *)widget; - - set_scroll_region(mview); - - if (mview->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mview->posline); - - GTK_WIDGET_CLASS(parent_class)->draw(widget, area); - >>function set_scroll_region static void @@ -810,8 +811,9 @@ set_hscroll(mview); set_vscroll(mview); +#ifdef maybe_needed_for_track_display /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mview)->allocation.height; + height = GTK_WIDGET(mview->canvas)->allocation.height; if (height < mview->vthings * mview->vcp->vscale) { int last; @@ -823,7 +825,9 @@ 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,