diff -rNu melys-0.1.0/ChangeLog melys-0.1.1/ChangeLog --- melys-0.1.0/ChangeLog Tue Oct 26 15:05:15 1999 +++ melys-0.1.1/ChangeLog Mon Nov 8 13:21:38 1999 @@ -1,6 +1,55 @@ +1999-11-08 Steve Ratcliffe + + * version.c: For release 0.1.1 + + * song/song.m: Fix warning and remove an unused. + + * gui/main.m: Need an extra header now + * widgets/melysrule.m, widgets/melystrack.m, widgets/melystrackdisplay.m, + widgets/melystrackinfo.m, widgets/misc.m, widgets/viewcontrol.m: + Reworked to use a bundle containing the adjustments and + scaling factors. This will reduce the code needed for the other + widgets to be written but has little effect at present. + +1999-11-07 Steve Ratcliffe + + * widgets/melystrack.m, widgets/melystrackdisplay.m: + Removed some unused stuff + +1999-11-01 Steve Ratcliffe + + * files/mdmlread.m: + Reading mdml files was broken wrt empty parts that had + no time and duration information. (probably only hand generated + ones would be affected) + + * gui/partprop.m, gui/propbox.m, gui/trackprop.m: + Realized that there was a big problem with only having one + box up at a time, in that it is easy to lose changes. Now use + g_dataset to associate a property box with a particular element. + Re-selecting it will create it or bring it to the top. + Destroying the element will result in the destruction of the + property box. + + * widgets/misc.m, widgets/melystrackdisplay.m, widgets/melystrack.m: + In preparation for other widgets made some changes to allow + more code re-use between them. + Scrollbar and zoom buttons combination routines can now be shared. + + Instead of having an update routine that draws directly, we now + use the normal draw method of the widget... + + * song/song.m: + Use an idle function to clear the modify status after all + redrawing has been done. + This has to be done becuase re-drawing itself is now being done + in an idle function after the call to redraw everything has + been made. The modified bits must stay until all is redrawn. + 1999-10-26 Steve Ratcliffe - * REL-0-1-0 + * version: Version 0.1.0 + * po/melys.pot, po/zz.po, gui/main.m: Updated strings. 1999-10-25 Steve Ratcliffe diff -rNu melys-0.1.0/files/Makefile melys-0.1.1/files/Makefile --- melys-0.1.0/files/Makefile Tue Oct 26 16:28:39 1999 +++ melys-0.1.1/files/Makefile Mon Nov 8 13:24:50 1999 @@ -62,6 +62,6 @@ midiread.o: ../include/melfile.h midiread.o: ../include/midi.h mdmlread.o: ../include/melfile.h +mdmlread.o: ../include/midi.h mdmlread.o: ../include/md.h mdmlread.o: ../include/mdrw.h -mdmlread.o: ../include/midi.h diff -rNu melys-0.1.0/files/mdmlread.c melys-0.1.1/files/mdmlread.c --- melys-0.1.0/files/mdmlread.c Tue Oct 26 16:28:46 1999 +++ melys-0.1.1/files/mdmlread.c Mon Nov 8 13:24:57 1999 @@ -24,25 +24,26 @@ #include "util.h" #include "elements.h" #include +#include +#include #include #include #include -#include #include "melfile.h" +#include "midi.h" #include "md.h" #include "mdrw.h" -#include -#include "midi.h" #include "intl.h" + + xmlSAXHandler SAXhandler; struct mdmlstate { struct File *file; /* Users file handle */ int currtime; /* Previous time */ int starttime; /* Start time for this sub-part */ - int maxtime; /* Max time for this sub-part */ int devchan; /* Current dev/channel */ struct rootElement *root; /* Pointer to root of MD tree */ struct headElement *head; /* Pointer to head element */ @@ -143,7 +144,6 @@ tag_to_md(struct mdmlstate *msp, const xmlChar *name, const xmlChar **attrs) { struct element *retel = NULL; - unsigned long ostart = 0; /* * Its slightly important to have the most likely @@ -223,7 +223,7 @@ int res; msp->currtime = 0; - msp->maxtime = 0; + msp->starttime = 0; msp->devchan = 0; msp->program = 0; msp->hasprogram = 0; @@ -402,10 +402,9 @@ /* Set common attributes like time */ common_atts(msp, attrs, retel); - if (retel && iscontainer(retel)) { - ostart = msp->starttime; - msp->starttime = msp->currtime; - msp->maxtime = 0; + if (retel) { + retel->element_time = msp->currtime; + retel->device_channel = msp->devchan; } return retel; @@ -424,7 +423,6 @@ { int i; int ival; - unsigned long t; if (attrs == NULL || el == NULL) return; @@ -444,18 +442,6 @@ MD_SET_SELECTED(el, TRUE); } } - - el->element_time = msp->currtime; - /* - * Update the max time for this container. - */ - t = el->element_time; - if (el->type == MD_TYPE_NOTE) - t += MD_NOTE(el)->length; /* Add the length */ - if (t > msp->maxtime) - msp->maxtime = t; - - el->device_channel = msp->devchan; } static xmlChar * @@ -648,28 +634,18 @@ static void startElement(void *data, const xmlChar *name, const xmlChar **attrs) { - struct containerElement *con; struct element *el; struct levelstate state; - struct levelstate *ls; struct mdmlstate *msp = data; el = tag_to_md(msp, name, attrs); - ls = (struct levelstate *)gx_stack_top(msp->estack); - if (ls) { - con = MD_CONTAINER(ls->elem); - - g_assert(iscontainer(con)); - - if (el) - md_add(con, el); - } - state.elem = el; state.text = NULL; state.textlen = 0; gx_stack_push(msp->estack, (gpointer) &state); + if (el && iscontainer(el)) + msp->starttime = msp->currtime; } static void @@ -699,7 +675,6 @@ } } - if (ls->text) { if (strcmp(name, "sysex") == 0) { unsigned char *data; @@ -776,12 +751,12 @@ } } + if (el && iscontainer(el)) + msp->currtime = MD_ENDTIME(el); gx_stack_pop(msp->estack, NULL); - if (el && iscontainer(el)) { - ls = gx_stack_top(msp->estack); - if (ls && ls->elem) - msp->starttime = MD_TIME(ls->elem); - } + ls = gx_stack_top(msp->estack); + if (ls && ls->elem && el) + md_add(MD_CONTAINER(ls->elem), el); } static xmlEntityPtr diff -rNu melys-0.1.0/files/mdmlread.m melys-0.1.1/files/mdmlread.m --- melys-0.1.0/files/mdmlread.m Fri Oct 22 23:36:55 1999 +++ melys-0.1.1/files/mdmlread.m Mon Nov 1 20:32:36 1999 @@ -17,11 +17,15 @@ >>extern >>header +>>header +>>header + >>header >>header >>header ->>header + >>header melfile.h +>>header midi.h >>header md.h xmlSAXHandler SAXhandler; @@ -30,7 +34,6 @@ struct File *file; /* Users file handle */ int currtime; /* Previous time */ int starttime; /* Start time for this sub-part */ - int maxtime; /* Max time for this sub-part */ int devchan; /* Current dev/channel */ struct rootElement *root; /* Pointer to root of MD tree */ struct headElement *head; /* Pointer to head element */ @@ -98,8 +101,7 @@ return root; ->>header ->>header midi.h + >>function tag_to_md static struct element * struct mdmlstate *msp; Mdml write state @@ -112,7 +114,6 @@ >>code struct element *retel = NULL; - unsigned long ostart = 0; /* * Its slightly important to have the most likely @@ -192,7 +193,7 @@ int res; msp->currtime = 0; - msp->maxtime = 0; + msp->starttime = 0; msp->devchan = 0; msp->program = 0; msp->hasprogram = 0; @@ -371,10 +372,9 @@ /* Set common attributes like time */ common_atts(msp, attrs, retel); - if (retel && iscontainer(retel)) { - ostart = msp->starttime; - msp->starttime = msp->currtime; - msp->maxtime = 0; + if (retel) { + retel->element_time = msp->currtime; + retel->device_channel = msp->devchan; } return retel; @@ -394,7 +394,6 @@ >>code int i; int ival; - unsigned long t; if (attrs == NULL || el == NULL) return; @@ -415,17 +414,6 @@ } } - el->element_time = msp->currtime; - /* - * Update the max time for this container. - */ - t = el->element_time; - if (el->type == MD_TYPE_NOTE) - t += MD_NOTE(el)->length; /* Add the length */ - if (t > msp->maxtime) - msp->maxtime = t; - - el->device_channel = msp->devchan; >>function get_str @@ -619,28 +607,18 @@ const xmlChar **attrs; >>code - struct containerElement *con; struct element *el; struct levelstate state; - struct levelstate *ls; struct mdmlstate *msp = data; el = tag_to_md(msp, name, attrs); - ls = (struct levelstate *)gx_stack_top(msp->estack); - if (ls) { - con = MD_CONTAINER(ls->elem); - - g_assert(iscontainer(con)); - - if (el) - md_add(con, el); - } - state.elem = el; state.text = NULL; state.textlen = 0; gx_stack_push(msp->estack, (gpointer) &state); + if (el && iscontainer(el)) + msp->starttime = msp->currtime; >>function endElement @@ -673,7 +651,6 @@ } } - if (ls->text) { if (strcmp(name, "sysex") == 0) { unsigned char *data; @@ -750,12 +727,12 @@ } } + if (el && iscontainer(el)) + msp->currtime = MD_ENDTIME(el); gx_stack_pop(msp->estack, NULL); - if (el && iscontainer(el)) { - ls = gx_stack_top(msp->estack); - if (ls && ls->elem) - msp->starttime = MD_TIME(ls->elem); - } + ls = gx_stack_top(msp->estack); + if (ls && ls->elem && el) + md_add(MD_CONTAINER(ls->elem), el); >>function getEntity diff -rNu melys-0.1.0/gui/Makefile melys-0.1.1/gui/Makefile --- melys-0.1.0/gui/Makefile Tue Oct 26 16:28:41 1999 +++ melys-0.1.1/gui/Makefile Mon Nov 8 13:24:52 1999 @@ -91,8 +91,8 @@ main.o: ../include/meldnd.h main.o: ../include/song.h main.o: ../include/melys.h +main.o: ../include/viewcontrol.h main.o: ../include/melystrackinfo.h -main.o: ../include/melystrackdisplay.h main.o: ../include/melystrack.h main.o: ../include/melyspos.h main.o: ../include/md.h diff -rNu melys-0.1.0/gui/main.c melys-0.1.1/gui/main.c --- melys-0.1.0/gui/main.c Tue Oct 26 16:28:50 1999 +++ melys-0.1.1/gui/main.c Mon Nov 8 13:25:01 1999 @@ -38,8 +38,8 @@ #include "meldnd.h" #include "song.h" #include "melys.h" +#include "viewcontrol.h" #include "melystrackinfo.h" -#include "melystrackdisplay.h" #include "melystrack.h" #include "melyspos.h" #include "md.h" diff -rNu melys-0.1.0/gui/main.m melys-0.1.1/gui/main.m --- melys-0.1.0/gui/main.m Tue Oct 26 15:04:32 1999 +++ melys-0.1.1/gui/main.m Mon Nov 8 13:09:26 1999 @@ -30,8 +30,9 @@ >>header meldnd.h >>header song.h >>header melys.h +>># The need for trackinfo should be removed +>>header viewcontrol.h >>header melystrackinfo.h ->>header melystrackdisplay.h >>header melystrack.h >>header melyspos.h >>header md.h diff -rNu melys-0.1.0/gui/partprop.c melys-0.1.1/gui/partprop.c --- melys-0.1.0/gui/partprop.c Tue Oct 26 16:28:51 1999 +++ melys-0.1.1/gui/partprop.c Mon Nov 8 13:25:02 1999 @@ -83,24 +83,28 @@ gpb = PROP_BOX(prop); - basic = prop_part_info(prop); - basiclab = gtk_label_new(_("Basic")); - prop->basic_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), basic, basiclab); + if (!prop->common.setup) { + prop->common.setup = TRUE; + basic = prop_part_info(prop); + basiclab = gtk_label_new(_("Basic")); + prop->basic_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), basic, basiclab); - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); - /* - * Set up the help system. The standard gnome help system - * for property boxes does not work well for me. So I am - * using a system that allows the help to be in different - * places and can be different sections in the same document. - */ - gtk_signal_connect(GTK_OBJECT(gpb), "help", - GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + /* + * Set up the help system. The standard gnome help system + * for property boxes does not work well for me. So I am + * using a system that allows the help to be in different + * places and can be different sections in the same document. + */ + gtk_signal_connect(GTK_OBJECT(gpb), "help", + GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + } - gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); + gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, + which); gtk_widget_show(gpb); } diff -rNu melys-0.1.0/gui/partprop.m melys-0.1.1/gui/partprop.m --- melys-0.1.0/gui/partprop.m Thu Oct 14 17:31:21 1999 +++ melys-0.1.1/gui/partprop.m Mon Nov 1 17:20:21 1999 @@ -77,24 +77,28 @@ gpb = PROP_BOX(prop); - basic = prop_part_info(prop); - basiclab = gtk_label_new(_("Basic")); - prop->basic_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), basic, basiclab); + if (!prop->common.setup) { + prop->common.setup = TRUE; + basic = prop_part_info(prop); + basiclab = gtk_label_new(_("Basic")); + prop->basic_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), basic, basiclab); - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); - /* - * Set up the help system. The standard gnome help system - * for property boxes does not work well for me. So I am - * using a system that allows the help to be in different - * places and can be different sections in the same document. - */ - gtk_signal_connect(GTK_OBJECT(gpb), "help", - GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + /* + * Set up the help system. The standard gnome help system + * for property boxes does not work well for me. So I am + * using a system that allows the help to be in different + * places and can be different sections in the same document. + */ + gtk_signal_connect(GTK_OBJECT(gpb), "help", + GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + } - gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); + gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, + which); gtk_widget_show(gpb); diff -rNu melys-0.1.0/gui/propbox.c melys-0.1.1/gui/propbox.c --- melys-0.1.0/gui/propbox.c Tue Oct 26 16:28:51 1999 +++ melys-0.1.1/gui/propbox.c Mon Nov 8 13:25:02 1999 @@ -31,13 +31,15 @@ /* Static functions */ -static void prop_destroy(GtkWidget *w, gpointer data); +static void prop_box_destroyed(GtkWidget *w, gpointer data); +static void prop_zap(void *data); /* * This is a common routine for creating the property boxes. It - * enforces the rule that only one can be active at a time and * handles destroying itself when the parent song is closed. + * Also it will be destroyed when the element that it is + * displaying is destroyed. * * Arguments: * song - Song information @@ -51,22 +53,34 @@ struct prop_box *prop; /* - * First get rid of any existing one. + * See if we have an existing box for this element. If + * we have then it is raised and shown. */ - reg_destroy(song->propbox); + prop = g_dataset_get_data(elem, "property-box"); - prop = g_malloc(size); + if (!prop) { - MD_WREF(elem); - prop->elem = elem; - prop->song = song; + prop = g_malloc(size); - gpb = gnome_property_box_new(); - prop->box = gpb; - song->propbox = reg_object((GtkObject*)gpb, (GtkObject*)song->child); + MD_WREF(elem); + prop->elem = elem; + prop->song = song; - gtk_signal_connect(GTK_OBJECT(gpb), "destroy", - GTK_SIGNAL_FUNC(prop_destroy), prop); + gpb = gnome_property_box_new(); + prop->box = gpb; + + gtk_signal_connect(GTK_OBJECT(gpb), "destroy", + GTK_SIGNAL_FUNC(prop_box_destroyed), prop); + + g_dataset_set_data_full(elem, "property-box", prop, prop_zap); + + prop->setup = FALSE; + } + + if (prop->box->window) { + gdk_window_raise(prop->box->window); + gdk_window_show(prop->box->window); + } return prop; } @@ -103,9 +117,35 @@ } static void -prop_destroy(GtkWidget *w, gpointer data) +prop_box_destroyed(GtkWidget *w, gpointer data) { struct prop_box *prop = data; + struct element *elem; + GtkWidget *box = prop->box; - MD_WUNREF(prop->elem); + elem = prop->elem; + box = prop->box; + + prop->elem = NULL; + prop->box = NULL; + + g_dataset_remove_no_notify(elem, "property-box"); + if (elem) + MD_WUNREF(elem); + if (box) + gtk_widget_destroy(box); + +#ifdef DEBUG + memset(prop, 0xA5, sizeof(*prop)); +#endif + g_free(prop); +} + +static void +prop_zap(void *data) +{ + struct prop_box *prop = data; + + if (prop->box) + gtk_widget_destroy(prop->box); } diff -rNu melys-0.1.0/gui/propbox.m melys-0.1.1/gui/propbox.m --- melys-0.1.0/gui/propbox.m Tue Oct 5 21:28:02 1999 +++ melys-0.1.1/gui/propbox.m Mon Nov 1 17:20:21 1999 @@ -32,6 +32,8 @@ struct element *elem; /* The element to be modified */ GtkWidget *box; /* The gnome property box widget */ + + int setup:1; /* Has already been setup */ }; #define PROP_ELEM(p) (((struct prop_box *)p)->elem) @@ -47,30 +49,43 @@ >>description This is a common routine for creating the property boxes. -It enforces the rule that only one can be active at a time -and handles destroying itself when the parent song is closed. +It handles destroying itself when the parent song is closed. +Also it will be destroyed when the element that it +is displaying is destroyed. >>code GtkWidget *gpb; struct prop_box *prop; /* - * First get rid of any existing one. + * See if we have an existing box for this element. If + * we have then it is raised and shown. */ - reg_destroy(song->propbox); + prop = g_dataset_get_data(elem, "property-box"); + + if (!prop) { + + prop = g_malloc(size); + + MD_WREF(elem); + prop->elem = elem; + prop->song = song; - prop = g_malloc(size); + gpb = gnome_property_box_new(); + prop->box = gpb; - MD_WREF(elem); - prop->elem = elem; - prop->song = song; + gtk_signal_connect(GTK_OBJECT(gpb), "destroy", + GTK_SIGNAL_FUNC(prop_box_destroyed), prop); - gpb = gnome_property_box_new(); - prop->box = gpb; - song->propbox = reg_object((GtkObject*)gpb, (GtkObject*)song->child); + g_dataset_set_data_full(elem, "property-box", prop, prop_zap); - gtk_signal_connect(GTK_OBJECT(gpb), "destroy", - GTK_SIGNAL_FUNC(prop_destroy), prop); + prop->setup = FALSE; + } + + if (prop->box->window) { + gdk_window_raise(prop->box->window); + gdk_window_show(prop->box->window); + } return prop; @@ -117,13 +132,39 @@ gnome_property_box_changed((GnomePropertyBox *)prop->box); ->>function prop_destroy +>>function prop_box_destroyed static void GtkWidget *w; gpointer data; >>code struct prop_box *prop = data; + struct element *elem; + GtkWidget *box = prop->box; + + elem = prop->elem; + box = prop->box; + + prop->elem = NULL; + prop->box = NULL; - MD_WUNREF(prop->elem); + g_dataset_remove_no_notify(elem, "property-box"); + if (elem) + MD_WUNREF(elem); + if (box) + gtk_widget_destroy(box); + +#ifdef DEBUG + memset(prop, 0xA5, sizeof(*prop)); +#endif + g_free(prop); +>>function prop_zap +static void +void *data; + +>>code + struct prop_box *prop = data; + + if (prop->box) + gtk_widget_destroy(prop->box); diff -rNu melys-0.1.0/gui/trackprop.c melys-0.1.1/gui/trackprop.c --- melys-0.1.0/gui/trackprop.c Tue Oct 26 16:28:51 1999 +++ melys-0.1.1/gui/trackprop.c Mon Nov 8 13:25:03 1999 @@ -100,29 +100,34 @@ gpb = PROP_BOX(prop); - basic = prop_track_info(prop); - basiclab = gtk_label_new(_("Basic")); - prop->basic_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), basic, basiclab); + if (!prop->common.setup) { + prop->common.setup = TRUE; - instr = prop_track_instruments(prop); - instrlab = gtk_label_new(_("Instruments")); - prop->instrument_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), instr, instrlab); + basic = prop_track_info(prop); + basiclab = gtk_label_new(_("Basic")); + prop->basic_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), basic, basiclab); - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); + instr = prop_track_instruments(prop); + instrlab = gtk_label_new(_("Instruments")); + prop->instrument_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), instr, instrlab); - /* - * Set up the help system. The standard gnome help system - * for property boxes does not work well for me. So I am - * using a system that allows the help to be in different - * places and can be different sections in the same document. - */ - gtk_signal_connect(GTK_OBJECT(gpb), "help", - GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); - gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); + /* + * Set up the help system. The standard gnome help system + * for property boxes does not work well for me. So I am + * using a system that allows the help to be in different + * places and can be different sections in the same document. + */ + gtk_signal_connect(GTK_OBJECT(gpb), "help", + GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + } + + gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, + which); gtk_widget_show(gpb); } diff -rNu melys-0.1.0/gui/trackprop.m melys-0.1.1/gui/trackprop.m --- melys-0.1.0/gui/trackprop.m Mon Oct 25 13:48:09 1999 +++ melys-0.1.1/gui/trackprop.m Mon Nov 1 17:20:21 1999 @@ -93,29 +93,34 @@ gpb = PROP_BOX(prop); - basic = prop_track_info(prop); - basiclab = gtk_label_new(_("Basic")); - prop->basic_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), basic, basiclab); + if (!prop->common.setup) { + prop->common.setup = TRUE; - instr = prop_track_instruments(prop); - instrlab = gtk_label_new(_("Instruments")); - prop->instrument_page = gnome_property_box_append_page( - GNOME_PROPERTY_BOX(gpb), instr, instrlab); + basic = prop_track_info(prop); + basiclab = gtk_label_new(_("Basic")); + prop->basic_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), basic, basiclab); - gtk_signal_connect(GTK_OBJECT(gpb), "apply", - GTK_SIGNAL_FUNC(prop_apply), prop); + instr = prop_track_instruments(prop); + instrlab = gtk_label_new(_("Instruments")); + prop->instrument_page = gnome_property_box_append_page( + GNOME_PROPERTY_BOX(gpb), instr, instrlab); - /* - * Set up the help system. The standard gnome help system - * for property boxes does not work well for me. So I am - * using a system that allows the help to be in different - * places and can be different sections in the same document. - */ - gtk_signal_connect(GTK_OBJECT(gpb), "help", - GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + gtk_signal_connect(GTK_OBJECT(gpb), "apply", + GTK_SIGNAL_FUNC(prop_apply), prop); - gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, which); + /* + * Set up the help system. The standard gnome help system + * for property boxes does not work well for me. So I am + * using a system that allows the help to be in different + * places and can be different sections in the same document. + */ + gtk_signal_connect(GTK_OBJECT(gpb), "help", + GTK_SIGNAL_FUNC(mel_prop_help), &help_entry); + } + + gtk_notebook_set_page((GtkNotebook*)GNOME_PROPERTY_BOX(gpb)->notebook, + which); gtk_widget_show(gpb); diff -rNu melys-0.1.0/include/melgui.h melys-0.1.1/include/melgui.h --- melys-0.1.0/include/melgui.h Tue Oct 26 16:28:35 1999 +++ melys-0.1.1/include/melgui.h Mon Nov 8 13:24:45 1999 @@ -76,6 +76,8 @@ struct element *elem; /* The element to be modified */ GtkWidget *box; /* The gnome property box widget */ + + int setup:1; /* Has already been setup */ }; #define PROP_ELEM(p) (((struct prop_box *)p)->elem) diff -rNu melys-0.1.0/include/melysrule.h melys-0.1.1/include/melysrule.h --- melys-0.1.0/include/melysrule.h Tue Oct 26 16:28:36 1999 +++ melys-0.1.1/include/melysrule.h Mon Nov 8 13:24:47 1999 @@ -27,11 +27,9 @@ struct _MelysRule { GtkDrawingArea drawing_area; - GtkAdjustment *hadj; /* Horizontal adj for this rule */ + ViewControl *vcp; /* Horizontal adj for this rule */ int hoffset; /* Previous horizontal adjustment */ - int hscale; /* The scale */ - int vtitle; /* Vertical title area */ struct tempomapElement *tempomap; }; @@ -41,8 +39,7 @@ }; guint melys_rule_get_type(void); -GtkWidget *melys_rule_new(GtkAdjustment *hadj); -void melys_rule_set_adj(MelysRule *mrule, GtkAdjustment *hadj); +GtkWidget *melys_rule_new(ViewControl *vcp); +void melys_rule_set_adj(MelysRule *mrule, ViewControl *vcp); void melys_rule_set_tempomap(MelysRule *mrule, struct tempomapElement *tempomap); -void melys_rule_set_hscale(MelysRule *mrule, int hscale); diff -rNu melys-0.1.0/include/melystrack.h melys-0.1.1/include/melystrack.h --- melys-0.1.0/include/melystrack.h Tue Oct 26 16:28:36 1999 +++ melys-0.1.1/include/melystrack.h Mon Nov 8 13:24:47 1999 @@ -24,9 +24,7 @@ struct _MelysTrack { GtkVBox vbox; - GtkAdjustment *vadj; - GtkAdjustment *hadj; - + struct _ViewControl *vcp; /* H & V adjustment controls */ GtkAdjustment *posadj; /* Song position adjustment */ struct _MelysTrackInfo *info; @@ -35,11 +33,6 @@ struct rootElement *mdroot; struct song *song; - int vtitle; /* Title height */ - int vscale; /* pixels per track */ - int hscale; /* ticks per x pixel */ - - int button_repeat_to; /* Button repeat timeout id */ }; @@ -61,4 +54,3 @@ GtkWidget *melys_track_new(struct rootElement *root); void melys_track_set_md_root(MelysTrack *mtrack, struct rootElement *root); void melys_track_set_song(MelysTrack *mtrack, struct song *song); -void melys_track_update(MelysTrack *mtrack); diff -rNu melys-0.1.0/include/melystrackdisplay.h melys-0.1.1/include/melystrackdisplay.h --- melys-0.1.0/include/melystrackdisplay.h Tue Oct 26 16:28:36 1999 +++ melys-0.1.1/include/melystrackdisplay.h Mon Nov 8 13:24:47 1999 @@ -36,9 +36,10 @@ struct _MelysTrackDisplay { GtkVBox vbox; + /* Adjustments and scales */ + ViewControl *vcp; + /* The adjustments for scrolling */ - GtkAdjustment *vadj; - GtkAdjustment *hadj; GtkAdjustment *posadj; /* Song position adjustment */ /* Amount of vertical scrolling, in tracks (you never see half a track) */ @@ -54,21 +55,9 @@ * sync between MelysTrackInfo and MelysTrackDisplay. */ - /* The amount of vertical space that a track takes up */ - int vspace; /* height + spacing */ - int height; /* without separation */ - int htitle; /* Title height */ - int vtitle; /* Title vertical space */ - - /* Horizontal scale. Ticks per pixel */ - int hscale; - /* The snap to grid setting */ int snap; - /* Allocated area that track information is being displayed in */ - GdkRectangle track_area; - /* The actual composition that is being displayed */ struct rootElement *mdroot; struct song *song; @@ -96,12 +85,7 @@ }; guint melys_track_display_get_type(void); -GtkWidget *melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj, - GtkAdjustment *posadj); +GtkWidget *melys_track_display_new(ViewControl *vcp, GtkAdjustment *posadj); void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root); -void melys_track_display_set_hscale(MelysTrackDisplay *mdisp, int hscale); -void melys_track_display_set_height(MelysTrackDisplay *mdisp, int height, - int htitle); -void melys_track_display_update(MelysTrackDisplay *mdisp); void display_info_free(gpointer _info); diff -rNu melys-0.1.0/include/melystrackinfo.h melys-0.1.1/include/melystrackinfo.h --- melys-0.1.0/include/melystrackinfo.h Tue Oct 26 16:28:37 1999 +++ melys-0.1.1/include/melystrackinfo.h Mon Nov 8 13:24:47 1999 @@ -36,8 +36,8 @@ struct _MelysTrackInfo { GtkWidget widget; - /* The adjustment for vertical scrolling */ - GtkAdjustment *vadj; + /* The adjustment for vertical scrolling (and other things) */ + ViewControl *vcp; /* Amount of vertical scrolling, in tracks (you never see half a track) */ int voffset; @@ -56,12 +56,6 @@ * sync between MelysTrackInfo and MelysTrackDisplay. */ - /* The amount of vertical space that a track takes up */ - int vspace; - int height; /* without separation */ - int htitle; /* Title height */ - int vtitle; /* Title vertical space */ - /* The offset from the top of allocated space to text baseline */ int vtextoffset; @@ -92,9 +86,7 @@ }; guint melys_track_info_get_type(void); -GtkWidget *melys_track_info_new(GtkAdjustment *vadj); -void melys_track_info_set_height(MelysTrackInfo *minfo, int height, - int htitle); +GtkWidget *melys_track_info_new(ViewControl *vcp); void melys_track_info_set_md_root(MelysTrackInfo *minfo, struct rootElement *root); void melys_track_info_update(MelysTrackInfo *minfo); diff -rNu melys-0.1.0/include/song.h melys-0.1.1/include/song.h --- melys-0.1.0/include/song.h Tue Oct 26 16:28:32 1999 +++ melys-0.1.1/include/song.h Mon Nov 8 13:24:42 1999 @@ -39,7 +39,6 @@ int save_dialog; /* Save dialog box */ int dialog; /* Set if a dialog is in action */ - int propbox; /* Set if a property box is active */ struct play *play; /* Play data */ struct record *record; /* Record data */ @@ -52,6 +51,7 @@ /* Here are all the views on this file */ GtkWidget *trackview; + int redrawing; /* True if redrawing (the id of the idle task) */ int unused:1; /* This song has not been used (no file etc) */ }; diff -rNu melys-0.1.0/include/viewcontrol.h melys-0.1.1/include/viewcontrol.h --- melys-0.1.0/include/viewcontrol.h Thu Jan 1 01:00:00 1970 +++ melys-0.1.1/include/viewcontrol.h Mon Nov 8 13:24:47 1999 @@ -0,0 +1,74 @@ +/* + * + * 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 an object that keeps together a number of things + * that are required to implement the horizontal and vertical controls + * in various of the melys widgets. + * + * + */ + +#define VIEW_CONTROL(obj) GTK_CHECK_CAST(obj, view_control_get_type(), ViewControl) +#define VIEW_CONTROL_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, view_control_get_type(), ViewControlClass) +#define IS_VIEW_CONTROL(obj) GTK_CHECK_TYPE(obj, view_control_get_type()) + +typedef struct _ViewControl ViewControl; +typedef struct _ViewControlClass ViewControlClass; + + +struct _ViewControl { + GtkObject object; + + /* Adjustments */ + GtkAdjustment *hadj; /* Horizontal adjustment position */ + GtkAdjustment *vadj; /* Vertical adjustment position */ + + /* Scrollbars */ + GtkWidget *hsb; /* The horizontal scrollbar group */ + GtkWidget *vsb; /* The vertical scrollbar group */ + + /* Vertical measurements */ + int vscale; /* Number of pixels from one thing to the next */ + int vspace; /* Separation between things */ + int vheight; /* Height of a 'thing' (vscale - vsep) */ + + /* Title height */ + int vtitle; /* Height of a title bar */ + + /* Horizontal measurements */ + int hscale; + + /* A controlling widget can set these to limit zooming */ + int hminscale; + int hmaxscale; + int vminscale; + int vmaxscale; +}; + +struct _ViewControlClass { + GtkObjectClass parent_class; + + void (*scale_changed)(ViewControl *); +}; + +guint view_control_get_type(void); +ViewControl *view_control_new(void); +void view_control_set_vertical(ViewControl *vcp, int vscale, int vspace, + int vheight, int vtitle); +void view_control_set_horizontal(ViewControl *vcp, int hscale); +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); +int view_control_tick_to_x(ViewControl *vcp, int tick); +int view_control_y_to_thing(ViewControl *vcp, int ypix); +int view_control_thing_to_y(ViewControl *vcp, int n); diff -rNu melys-0.1.0/programs/Makefile melys-0.1.1/programs/Makefile --- melys-0.1.0/programs/Makefile Tue Oct 26 16:28:43 1999 +++ melys-0.1.1/programs/Makefile Mon Nov 8 13:24:54 1999 @@ -56,6 +56,7 @@ ../widgets/melystrack.o ../widgets/melystrackinfo.o \ ../widgets/melystrackdisplay.o ../widgets/melyspartitem.o \ ../widgets/melysrule.o ../widgets/melyspos.o \ + ../widgets/viewcontrol.o \ ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o SHOWSEQOBJS = \ diff -rNu melys-0.1.0/programs/melys.m melys-0.1.1/programs/melys.m --- melys-0.1.0/programs/melys.m Sun Oct 24 00:56:50 1999 +++ melys-0.1.1/programs/melys.m Mon Nov 8 13:11:34 1999 @@ -30,6 +30,7 @@ >>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 ../pixmaps/balls.o ../pixmaps/menu_icons.o ../pixmaps/mag.o >>header diff -rNu melys-0.1.0/song/song.c melys-0.1.1/song/song.c --- melys-0.1.0/song/song.c Tue Oct 26 16:28:44 1999 +++ melys-0.1.1/song/song.c Mon Nov 8 13:24:55 1999 @@ -34,6 +34,7 @@ /* Static functions */ +static int song_clear_mod(void *s); static void song_mute_track(gpointer notused, struct trackElement *track, struct song *song); static void song_unmute_track(GtkObject *notused, struct trackElement *track, @@ -285,9 +286,22 @@ song_view_update(struct song *song) { - melys_track_update(MELYS_TRACK(song->trackview)); + gtk_widget_queue_draw(GTK_WIDGET(song->trackview)); + + /* After all drawing is done we want to clear all modified bits */ + if (!song->redrawing) + song->redrawing = gtk_idle_add(song_clear_mod, song); +} + +static int +song_clear_mod(void *s) +{ + struct song *song = s; md_clear_all_mod(MD_ELEMENT(song->mdroot)); + song->redrawing = 0; + + return FALSE; } static void diff -rNu melys-0.1.0/song/song.m melys-0.1.1/song/song.m --- melys-0.1.0/song/song.m Sun Oct 24 09:44:59 1999 +++ melys-0.1.1/song/song.m Mon Nov 8 13:10:32 1999 @@ -52,7 +52,6 @@ int save_dialog; /* Save dialog box */ int dialog; /* Set if a dialog is in action */ - int propbox; /* Set if a property box is active */ struct play *play; /* Play data */ struct record *record; /* Record data */ @@ -65,6 +64,7 @@ /* Here are all the views on this file */ GtkWidget *trackview; + int redrawing; /* True if redrawing (the id of the idle task) */ int unused:1; /* This song has not been used (no file etc) */ }; @@ -328,9 +328,22 @@ >>code - melys_track_update(MELYS_TRACK(song->trackview)); + gtk_widget_queue_draw(GTK_WIDGET(song->trackview)); + + /* After all drawing is done we want to clear all modified bits */ + if (!song->redrawing) + song->redrawing = gtk_idle_add(song_clear_mod, song); + +>>function song_clear_mod +static int +void *s; +>>code + struct song *song = s; md_clear_all_mod(MD_ELEMENT(song->mdroot)); + song->redrawing = 0; + + return FALSE; >>function song_mute_track static void diff -rNu melys-0.1.0/version melys-0.1.1/version --- melys-0.1.0/version Tue Oct 26 15:07:11 1999 +++ melys-0.1.1/version Mon Nov 8 13:20:57 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.0" +#define MELYS_VERSION_STRING "0.1.1" diff -rNu melys-0.1.0/widgets/.cvsignore melys-0.1.1/widgets/.cvsignore --- melys-0.1.0/widgets/.cvsignore Tue Oct 26 16:28:42 1999 +++ melys-0.1.1/widgets/.cvsignore Mon Nov 8 13:24:53 1999 @@ -7,6 +7,7 @@ melystransport.c misc.c register.c +viewcontrol.c Makefile *.mdml *.mdml.gz *.mid .cvsignore diff -rNu melys-0.1.0/widgets/Makefile melys-0.1.1/widgets/Makefile --- melys-0.1.0/widgets/Makefile Tue Oct 26 16:28:42 1999 +++ melys-0.1.1/widgets/Makefile Mon Nov 8 13:24:53 1999 @@ -12,7 +12,8 @@ melystrackinfo.o \ melystransport.o \ misc.o \ - register.o + register.o \ + viewcontrol.o GENCFILES = melyspartitem.c \ melyspos.c \ melysrule.c \ @@ -21,7 +22,8 @@ melystrackinfo.c \ melystransport.c \ misc.c \ - register.c + register.c \ + viewcontrol.c GENHFILES = ../include/melyspartitem.h \ ../include/melyspos.h \ ../include/melysrule.h \ @@ -31,7 +33,8 @@ ../include/melystrackinfo.h \ ../include/melystransport.h \ ../include/melwidgets.h \ - ../include/melreg.h + ../include/melreg.h \ + ../include/viewcontrol.h @@ -64,12 +67,17 @@ mcode $(MCODEFLAGS) -o $@ $< melysrule.o: ../include/elements.h +melysrule.o: ../include/viewcontrol.h melysrule.o: ../include/melystrack.h melysrule.o: ../include/md.h melysrule.o: ../include/melysrule.h +viewcontrol.o: ../include/pixmaps.h +viewcontrol.o: ../include/melgui.h +viewcontrol.o: ../include/viewcontrol.h melyspartitem.o: ../include/elements.h melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h +melystrackdisplay.o: ../include/viewcontrol.h melystrackdisplay.o: ../include/melystrack.h melystrackdisplay.o: ../include/melyspartitem.h melystrackdisplay.o: ../include/melwidgets.h @@ -81,6 +89,8 @@ melystrackdisplay.o: ../include/md.h melystrackdisplay.o: ../include/melystrackdisplay.h melystrackdisplay.o: ../include/meldnd.h +misc.o: ../include/pixmaps.h +misc.o: ../include/melgui.h misc.o: ../include/melwidgets.h melystrackinfo.o: ../include/melmsg.h melystrackinfo.o: ../include/melgui.h @@ -88,6 +98,7 @@ melystrackinfo.o: ../include/elements.h melystrackinfo.o: ../include/md.h melystrackinfo.o: ../include/song.h +melystrackinfo.o: ../include/viewcontrol.h melystrackinfo.o: ../include/melystrackinfo.h melystrackinfo.o: ../include/melystrack.h melystransport.o: ../include/melystransport.h @@ -99,6 +110,8 @@ melystrack.o: ../include/pixmaps.h melystrack.o: ../include/md.h melystrack.o: ../include/melgui.h +melystrack.o: ../include/viewcontrol.h +melystrack.o: ../include/melwidgets.h melystrack.o: ../include/melystrackinfo.h melystrack.o: ../include/melystrackdisplay.h melystrack.o: ../include/melystrack.h diff -rNu melys-0.1.0/widgets/melysrule.c melys-0.1.1/widgets/melysrule.c --- melys-0.1.0/widgets/melysrule.c Tue Oct 26 16:28:52 1999 +++ melys-0.1.1/widgets/melysrule.c Mon Nov 8 13:25:03 1999 @@ -25,6 +25,7 @@ #include "gtk/gtkdrawingarea.h" #include "gtk/gtksignal.h" #include "elements.h" +#include "viewcontrol.h" #include "melystrack.h" #include "md.h" #include "melysrule.h" @@ -36,20 +37,21 @@ LAST_SIGNAL }; -/* Argument numbers */ -enum { - ARG_0, -}; +/* Defines to scale between x-coords and tick values */ +#define x_to_tick(mrule, x) view_control_x_to_tick( \ + MELYS_RULE(mrule)->vcp, x) + +#define tick_to_x(mrule, tick) view_control_tick_to_x( \ + MELYS_RULE(mrule)->vcp, tick) /* Static functions */ static void melys_rule_init(MelysRule *mrule); static void melys_rule_class_init(MelysRuleClass *klass); +static void scale_changed(GtkObject *obj, gpointer data); static void rule_draw(GtkWidget *widget, GdkRectangle *ap); static int rule_expose(GtkWidget *widget, GdkEventExpose *event); static void rule_scroll(GtkAdjustment *adj, gpointer data); static void rule_destroy(GtkObject *obj); -static int tick_to_x(MelysRule *mrule, int tick); -static int x_to_tick(MelysRule *mrule, int xpix); static GtkDrawingAreaClass *parent_class = NULL; @@ -86,14 +88,13 @@ * Create a new MelysRule object. */ GtkWidget * -melys_rule_new(GtkAdjustment *hadj) +melys_rule_new(ViewControl *vcp) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_rule_get_type())); MelysRule *mrule = MELYS_RULE(w); - if (hadj) - gtk_object_ref((GtkObject *)hadj); - mrule->hadj = hadj; + if (vcp) + melys_rule_set_adj(mrule, vcp); return w; } @@ -109,8 +110,7 @@ { mrule->hoffset = 0; - mrule->hscale = TRACK_DEF_HSCALE; - mrule->vtitle = 0; + mrule->vcp = NULL; } /* @@ -132,33 +132,29 @@ parent_class = gtk_type_class(gtk_drawing_area_get_type()); - // XXX Add args - - // XXX Create signals - gtk_object_class_add_signals(object_class, melys_rule_signals, LAST_SIGNAL); widget_class->draw = rule_draw; widget_class->expose_event = rule_expose; object_class->destroy = rule_destroy; - - // XXX Our functions } /* * Set the horizontal adjustment control for this widget. */ void -melys_rule_set_adj(MelysRule *mrule, GtkAdjustment *hadj) +melys_rule_set_adj(MelysRule *mrule, ViewControl *vcp) { - if (hadj) { - if (mrule->hadj) - gtk_object_unref((GtkObject *) mrule->hadj); - mrule->hadj = hadj; - gtk_object_ref((GtkObject *) hadj); - - gtk_signal_connect((GtkObject *)hadj, "value-changed", + if (vcp) { + if (mrule->vcp) + gtk_object_unref((GtkObject *) mrule->vcp); + mrule->vcp = vcp; + gtk_object_ref((GtkObject *) vcp); + + gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", + scale_changed, mrule); + gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", GTK_SIGNAL_FUNC(rule_scroll), mrule); } } @@ -174,16 +170,16 @@ gtk_widget_queue_draw((GtkWidget *) mrule); } -void -melys_rule_set_hscale(MelysRule *mrule, int hscale) +static void +scale_changed(GtkObject *obj, gpointer data) { - mrule->hscale = hscale; + MelysRule *mrule = data; + gdk_window_clear(((GtkWidget *)mrule)->window); - gtk_widget_queue_draw((GtkWidget *) mrule); } /* - * TEMPORARY code. This does not do anything very useful. + * Draw the ruler markings. */ static void rule_draw(GtkWidget *widget, GdkRectangle *ap) @@ -202,9 +198,6 @@ mrule = MELYS_RULE(widget); tempomap = mrule->tempomap; - if (mrule->vtitle == 0) - mrule->vtitle = widget->allocation.height; - x = ap->x; /* Start on the first visible bar boundry */ @@ -233,7 +226,7 @@ yoff = 18; gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - x, yoff, x, mrule->vtitle - TRACK_TITLE_RULE); + x, yoff, x, mrule->vcp->vtitle - TRACK_TITLE_RULE); /* Increment to the next one */ mbt.bars++; @@ -244,8 +237,8 @@ gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - 0, mrule->vtitle - TRACK_TITLE_RULE, - widget->allocation.width, mrule->vtitle - TRACK_TITLE_RULE); + 0, mrule->vcp->vtitle - TRACK_TITLE_RULE, + widget->allocation.width, mrule->vcp->vtitle - TRACK_TITLE_RULE); return; } @@ -277,7 +270,7 @@ GtkWidget *widget = data; int xchanged = 0; - if (adj == mrule->hadj) { + if (adj == mrule->vcp->hadj) { if ((int)adj->value != mrule->hoffset) { if (adj->value >= 0) { xchanged = 1; @@ -305,29 +298,8 @@ MelysRule *mrule = MELYS_RULE(obj); dprintf1("rule_destroy"); - if (mrule->hadj) - gtk_object_unref((GtkObject *) mrule->hadj); + if (mrule->vcp) + gtk_object_unref((GtkObject *) mrule->vcp); if (mrule->tempomap) md_free((struct element *) mrule->tempomap); -} - -static int -tick_to_x(MelysRule *mrule, int tick) -{ - int x; - - g_return_val_if_fail(mrule->hscale != 0, 0); - - x = (tick + mrule->hscale/2) / mrule->hscale; - - return x; -} - -static int -x_to_tick(MelysRule *mrule, int xpix) -{ - int tick; - - tick = xpix * mrule->hscale; - return tick; } diff -rNu melys-0.1.0/widgets/melysrule.m melys-0.1.1/widgets/melysrule.m --- melys-0.1.0/widgets/melysrule.m Fri Oct 15 11:32:54 1999 +++ melys-0.1.1/widgets/melysrule.m Mon Nov 8 13:03:02 1999 @@ -17,6 +17,7 @@ >>header gtk/gtksignal.h >>header elements.h +>>header viewcontrol.h >>header melystrack.h >>header md.h @@ -27,11 +28,9 @@ struct _MelysRule { GtkDrawingArea drawing_area; - GtkAdjustment *hadj; /* Horizontal adj for this rule */ + ViewControl *vcp; /* Horizontal adj for this rule */ int hoffset; /* Previous horizontal adjustment */ - int hscale; /* The scale */ - int vtitle; /* Vertical title area */ struct tempomapElement *tempomap; }; @@ -47,24 +46,25 @@ LAST_SIGNAL }; -/* Argument numbers */ -enum { - ARG_0, -}; +/* Defines to scale between x-coords and tick values */ +#define x_to_tick(mrule, x) view_control_x_to_tick( \ + MELYS_RULE(mrule)->vcp, x) + +#define tick_to_x(mrule, tick) view_control_tick_to_x( \ + MELYS_RULE(mrule)->vcp, tick) >>function melys_rule_new GtkWidget * -GtkAdjustment *hadj; +ViewControl *vcp; >>description Create a new MelysRule object. >>code GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_rule_get_type())); MelysRule *mrule = MELYS_RULE(w); - if (hadj) - gtk_object_ref((GtkObject *)hadj); - mrule->hadj = hadj; + if (vcp) + melys_rule_set_adj(mrule, vcp); return w; @@ -76,8 +76,7 @@ >>code mrule->hoffset = 0; - mrule->hscale = TRACK_DEF_HSCALE; - mrule->vtitle = 0; + mrule->vcp = NULL; >>function melys_rule_class_init static void @@ -97,34 +96,30 @@ parent_class = gtk_type_class(gtk_drawing_area_get_type()); - // XXX Add args - - // XXX Create signals - gtk_object_class_add_signals(object_class, melys_rule_signals, LAST_SIGNAL); widget_class->draw = rule_draw; widget_class->expose_event = rule_expose; object_class->destroy = rule_destroy; - // XXX Our functions - >>function melys_rule_set_adj void MelysRule *mrule; -GtkAdjustment *hadj; +ViewControl *vcp; >>description Set the horizontal adjustment control for this widget. >>code - if (hadj) { - if (mrule->hadj) - gtk_object_unref((GtkObject *) mrule->hadj); - mrule->hadj = hadj; - gtk_object_ref((GtkObject *) hadj); - - gtk_signal_connect((GtkObject *)hadj, "value-changed", + if (vcp) { + if (mrule->vcp) + gtk_object_unref((GtkObject *) mrule->vcp); + mrule->vcp = vcp; + gtk_object_ref((GtkObject *) vcp); + + gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", + scale_changed, mrule); + gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", GTK_SIGNAL_FUNC(rule_scroll), mrule); } @@ -142,14 +137,14 @@ gtk_widget_queue_draw((GtkWidget *) mrule); ->>function melys_rule_set_hscale -void -MelysRule *mrule; -int hscale; +>>function scale_changed +static void +GtkObject *obj; This will be the view control +gpointer data; Our mrule info >>code - mrule->hscale = hscale; + MelysRule *mrule = data; + gdk_window_clear(((GtkWidget *)mrule)->window); - gtk_widget_queue_draw((GtkWidget *) mrule); >>function rule_draw @@ -158,8 +153,8 @@ GdkRectangle *ap; >>description -TEMPORARY code. -This does not do anything very useful. +Draw the ruler markings. + >>code MelysRule *mrule; struct tempomapElement *tempomap; @@ -175,9 +170,6 @@ mrule = MELYS_RULE(widget); tempomap = mrule->tempomap; - if (mrule->vtitle == 0) - mrule->vtitle = widget->allocation.height; - x = ap->x; /* Start on the first visible bar boundry */ @@ -206,7 +198,7 @@ yoff = 18; gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - x, yoff, x, mrule->vtitle - TRACK_TITLE_RULE); + x, yoff, x, mrule->vcp->vtitle - TRACK_TITLE_RULE); /* Increment to the next one */ mbt.bars++; @@ -217,8 +209,8 @@ gdk_gc_set_clip_rectangle(widget->style->fg_gc[widget->state], NULL); gdk_draw_line(widget->window, widget->style->fg_gc[widget->state], - 0, mrule->vtitle - TRACK_TITLE_RULE, - widget->allocation.width, mrule->vtitle - TRACK_TITLE_RULE); + 0, mrule->vcp->vtitle - TRACK_TITLE_RULE, + widget->allocation.width, mrule->vcp->vtitle - TRACK_TITLE_RULE); return; @@ -254,7 +246,7 @@ GtkWidget *widget = data; int xchanged = 0; - if (adj == mrule->hadj) { + if (adj == mrule->vcp->hadj) { if ((int)adj->value != mrule->hoffset) { if (adj->value >= 0) { xchanged = 1; @@ -283,32 +275,9 @@ MelysRule *mrule = MELYS_RULE(obj); dprintf1("@func_name"); - if (mrule->hadj) - gtk_object_unref((GtkObject *) mrule->hadj); + if (mrule->vcp) + gtk_object_unref((GtkObject *) mrule->vcp); if (mrule->tempomap) md_free((struct element *) mrule->tempomap); ->>function tick_to_x -static int -MelysRule *mrule; -int tick; - ->>code - int x; - - g_return_val_if_fail(mrule->hscale != 0, 0); - - x = (tick + mrule->hscale/2) / mrule->hscale; - - return x; - ->>function x_to_tick -static int -MelysRule *mrule; -int xpix; - ->>code - int tick; - tick = xpix * mrule->hscale; - return tick; diff -rNu melys-0.1.0/widgets/melystrack.c melys-0.1.1/widgets/melystrack.c --- melys-0.1.0/widgets/melystrack.c Tue Oct 26 16:28:52 1999 +++ melys-0.1.1/widgets/melystrack.c Mon Nov 8 13:25:04 1999 @@ -23,6 +23,8 @@ #include "pixmaps.h" #include "md.h" #include "melgui.h" +#include "viewcontrol.h" +#include "melwidgets.h" #include "melystrackinfo.h" #include "melystrackdisplay.h" #include "libgnomeui/gnome-pixmap.h" @@ -37,22 +39,18 @@ */ + + enum { LAST_SIGNAL }; /* Static functions */ -static void melys_track_init(MelysTrack *mtp); +static void melys_track_init(MelysTrack *mtrack); static void melys_track_class_init(MelysTrackClass *klass); +static void track_draw(GtkWidget *w, GdkRectangle *area); static void destroy(GtkObject *object); -static GtkBox *scroll_group(MelysTrack *mtrack, GtkWidget *sb, gboolean vert); -static void horiz_shrink(GtkWidget *w, gpointer data); -static void horiz_expand(GtkWidget *w, gpointer data); -static void vert_expand(GtkWidget *w, gpointer data); -static void vert_shrink(GtkWidget *w, gpointer data); -static void set_button_repeat(MelysTrack *mtrack, GtkWidget *button); -static gboolean click_it(GtkButton *button); -static void button_release(GtkWidget *w, MelysTrack *mtrack); +static void zoom(GtkObject *obj, gpointer data); static GtkVBoxClass *parent_class = NULL; @@ -105,55 +103,51 @@ * Initialise the MelysTrack. * * Arguments: - * mtp - The MelysTrack to init + * mtrack - The MelysTrack to init */ static void -melys_track_init(MelysTrack *mtp) +melys_track_init(MelysTrack *mtrack) { - GtkAdjustment *hadj; - GtkAdjustment *vadj; GtkAdjustment *posadj; - GtkHScrollbar *hscroll; - GtkVScrollbar *vscroll; - GtkBox *hscrollgroup; - GtkBox *vscrollgroup; GtkHPaned *hpan; GtkTable *tab; MelysTrackInfo *info; MelysTrackDisplay *disp; GtkWidget *frame1; GtkWidget *frame2; + ViewControl *vcp; tab = (GtkTable*)gtk_table_new(4, 4, FALSE); - gtk_container_add(GTK_CONTAINER(mtp), GTK_WIDGET(tab)); + gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); + + vcp = (ViewControl *)view_control_new(); + view_control_set_vertical(vcp, + TRACK_DEF_HEIGHT + TRACK_SEPARATION, + TRACK_SEPARATION, TRACK_DEF_HEIGHT, + TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION); + view_control_set_horizontal(vcp, TRACK_DEF_HSCALE); + view_control_set_limits(vcp, 1, 0, 9, 0); + + mtrack->vcp = vcp; + gtk_object_ref((GtkObject*)vcp); + gtk_object_sink((GtkObject*)vcp); + + gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); - hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); posadj = (GtkAdjustment*)gtk_adjustment_new(0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ); - 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, posadj); + info = (MelysTrackInfo*)melys_track_info_new(vcp); + disp = (MelysTrackDisplay*)melys_track_display_new(vcp, posadj); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -172,43 +166,26 @@ 0, 0 ); - hscrollgroup = scroll_group(mtp, GTK_WIDGET(hscroll), 0); - vscrollgroup = scroll_group(mtp, GTK_WIDGET(vscroll), 1); - - gtk_table_attach(tab, GTK_WIDGET(vscrollgroup), 1, 2, 0, 1, + gtk_table_attach(tab, GTK_WIDGET(vcp->vsb), 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, GTK_WIDGET(hscrollgroup), 0, 1, 1, 2, + gtk_table_attach(tab, GTK_WIDGET(vcp->hsb), 0, 1, 1, 2, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 ); - gtk_widget_show_all(GTK_WIDGET(hscrollgroup)); - gtk_widget_show_all(GTK_WIDGET(vscrollgroup)); gtk_widget_show(GTK_WIDGET(hpan)); gtk_widget_show(GTK_WIDGET(tab)); - mtp->vadj = vadj; - gtk_object_ref((GtkObject*)vadj); - gtk_object_sink((GtkObject*)vadj); - - mtp->hadj = hadj; - gtk_object_ref((GtkObject*)hadj); - gtk_object_sink((GtkObject*)hadj); - - mtp->posadj = posadj; + mtrack->posadj = posadj; gtk_object_ref((GtkObject*)posadj); gtk_object_sink((GtkObject*)posadj); - mtp->info = info; - mtp->display = disp; - - mtp->vtitle = TRACK_TITLE_HEIGHT; - mtp->vscale = TRACK_DEF_HEIGHT + TRACK_SEPARATION; - mtp->hscale = TRACK_DEF_HSCALE; + mtrack->info = info; + mtrack->display = disp; } /* @@ -221,11 +198,11 @@ melys_track_class_init(MelysTrackClass *klass) { GtkObjectClass *object_class; - GtkVBoxClass *vbox_class; + GtkWidgetClass *widget_class; MelysTrackClass *mtrack_class; object_class = (GtkObjectClass *)klass; - vbox_class = (GtkVBoxClass *)klass; + widget_class = (GtkWidgetClass *)klass; mtrack_class = (MelysTrackClass *)klass; parent_class = gtk_type_class(gtk_vbox_get_type()); @@ -233,6 +210,8 @@ gtk_object_class_add_signals(object_class, melys_track_signals, LAST_SIGNAL); object_class->destroy = destroy; + + widget_class->draw = track_draw; } /* @@ -252,10 +231,10 @@ * Reset the adjustments. We do not control the horizontal * adjustment. That is handled by trackdisplay. */ - mtrack->vadj->lower = 0.0; - mtrack->vadj->upper = root->tracks; - gtk_adjustment_set_value(mtrack->vadj, 0.0); - gtk_adjustment_changed(mtrack->vadj); + mtrack->vcp->vadj->lower = 0.0; + mtrack->vcp->vadj->upper = root->tracks; + gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); + gtk_adjustment_changed(mtrack->vcp->vadj); mtrack->posadj->lower = 0.0; mtrack->posadj->upper = MD_ENDTIME(root); @@ -281,13 +260,14 @@ * redrawn. Emit a signal to allow all other views to also be * redrawn. */ -void -melys_track_update(MelysTrack *mtrack) +static void +track_draw(GtkWidget *w, GdkRectangle *area) { + MelysTrack *mtrack = (MelysTrack *) w; /* Re-set the vertical scrollbar limits */ - mtrack->vadj->lower = 0.0; - mtrack->vadj->upper = (double)mtrack->mdroot->tracks; + mtrack->vcp->vadj->lower = 0.0; + mtrack->vcp->vadj->upper = (double)mtrack->mdroot->tracks; /* We do not own the horizontal scrollbar */ @@ -295,10 +275,7 @@ mtrack->posadj->lower = 0.0; mtrack->posadj->upper = MD_ENDTIME(mtrack->mdroot); - - melys_track_info_update(mtrack->info); - melys_track_display_update(mtrack->display); - + GTK_WIDGET_CLASS(parent_class)->draw(w, area); /* No signal yet */ } @@ -311,223 +288,36 @@ static void destroy(GtkObject *object) { - MelysTrack *mtp; + MelysTrack *mtrack; g_return_if_fail(object != NULL); g_return_if_fail(IS_MELYS_TRACK(object)); - mtp = MELYS_TRACK(object); + mtrack = MELYS_TRACK(object); - if (mtp->mdroot) - md_free(MD_ELEMENT(mtp->mdroot)); + if (mtrack->mdroot) + md_free(MD_ELEMENT(mtrack->mdroot)); - if (mtp->vadj) { - gtk_object_unref(GTK_OBJECT(mtp->vadj)); - mtp->vadj = NULL; - } - if (mtp->hadj) { - gtk_object_unref(GTK_OBJECT(mtp->hadj)); - mtp->hadj = NULL; + if (mtrack->vcp) { + gtk_object_unref(GTK_OBJECT(mtrack->vcp)); + mtrack->vcp = NULL; } - if (mtp->posadj) { - gtk_object_unref(GTK_OBJECT(mtp->posadj)); - mtp->posadj = NULL; + if (mtrack->posadj) { + gtk_object_unref(GTK_OBJECT(mtrack->posadj)); + mtrack->posadj = NULL; } if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(object); } -/* - * Create a box and place in the scrollbar and the magnifying - * glasses. Set up the magnifying glass buttons to expand and - * shrink the main views. - * - * Arguments: - * mtrack - The mtrack widget - * sb - Scrollbar - * vert - True if the vertical case - */ -static GtkBox * -scroll_group(MelysTrack *mtrack, GtkWidget *sb, gboolean vert) -{ - GtkBox *box; - GtkWidget *plusbutton; - GtkWidget *minusbutton; - GtkWidget *plusicon; - GtkWidget *minusicon; - - if (vert) - box = (GtkBox *)gtk_vbox_new(0, 0); - else - box = (GtkBox *)gtk_hbox_new(0, 0); - - gtk_box_pack_start(box, sb, 1, 1, 0); - - plusbutton = gtk_button_new(); - minusbutton = gtk_button_new(); - - gtk_widget_set_usize(plusbutton, 18, 18); - gtk_widget_set_usize(minusbutton, 18, 18); - - plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); - minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); - - gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); - gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); - - gtk_box_pack_end(box, plusbutton, 0, 0, 0); - gtk_box_pack_end(box, minusbutton, 0, 0, 0); - - if (vert) { - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - vert_expand, mtrack); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - vert_shrink, mtrack); - set_tip(plusbutton, _("Expand the height of the tracks")); - set_tip(minusbutton, _("Shrink the height of the tracks")); - } else { - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - horiz_expand, mtrack); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - horiz_shrink, mtrack); - set_tip(plusbutton, _("Increase horizontal scale")); - set_tip(minusbutton, _("Decrease horizontail scale")); - } - - gtk_signal_connect(GTK_OBJECT(plusbutton), "released", - button_release, mtrack); - gtk_signal_connect(GTK_OBJECT(minusbutton), "released", - button_release, mtrack); - - return box; -} - -/* - * Reduce the horizontal size of the parts. - */ -static void -horiz_shrink(GtkWidget *w, gpointer data) -{ - MelysTrack *mtrack = data; - - if (mtrack->hscale < 8) - mtrack->hscale++; - else - mtrack->hscale *= 1.25; - melys_track_display_set_hscale(mtrack->display, mtrack->hscale); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); -} - -/* - * Increase the horizontal size of the parts. - */ -static void -horiz_expand(GtkWidget *w, gpointer data) -{ - MelysTrack *mtrack = data; - - mtrack->hscale /= 1.25; - if (mtrack->hscale < 2) - mtrack->hscale = 2; - melys_track_display_set_hscale(mtrack->display, mtrack->hscale); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); -} - -/* - * Make the vertical size of the tracks larger. - */ static void -vert_expand(GtkWidget *w, gpointer data) +zoom(GtkObject *obj, gpointer data) { MelysTrack *mtrack = data; - mtrack->vscale += 2; - melys_track_info_set_height(mtrack->info, mtrack->vscale, - TRACK_TITLE_HEIGHT); - melys_track_display_set_height(mtrack->display, mtrack->vscale, - TRACK_TITLE_HEIGHT); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); -} - -/* - * Make the vertical size of the tracks smaller. - */ -static void -vert_shrink(GtkWidget *w, gpointer data) -{ - MelysTrack *mtrack = data; - - mtrack->vscale -= 2; - if (mtrack->vscale <= TRACK_SEPARATION) - mtrack->vscale = 1 + TRACK_SEPARATION; - melys_track_info_set_height(mtrack->info, mtrack->vscale, - TRACK_TITLE_HEIGHT); - melys_track_display_set_height(mtrack->display, mtrack->vscale, - TRACK_TITLE_HEIGHT); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); -} - -/* - * When you press a magnification button a function is set up to - * be called repeatedly to simulate pressing the button. So if - * you just hold the button down the view will zoom - * continuously. - */ -static void -set_button_repeat(MelysTrack *mtrack, GtkWidget *button) -{ - - if (mtrack->button_repeat_to == 0) { - gtk_object_set_data(GTK_OBJECT(button), "mtrack", mtrack); - mtrack->button_repeat_to = gtk_timeout_add(150, - (GtkFunction)click_it, button); - } -} - -/* - * This is part of the auto-repeat for controlling - * magnification. When you hold down a magnification button - * this routine gets called every so often and it emits a signal - * as though the button has been pressed again. - */ -static gboolean -click_it(GtkButton *button) -{ - MelysTrack *mtrack; - - mtrack = gtk_object_get_data(GTK_OBJECT(button), "mtrack"); - gtk_signal_emit_by_name(GTK_OBJECT(button), "pressed", mtrack); - - return TRUE; -} - -/* - * When a magnification button is released we remove the - * timout that is doing the auto-repeat. - * - * Arguments: - * w - The button that was released - * mtrack - The MelysTrack - */ -static void -button_release(GtkWidget *w, MelysTrack *mtrack) -{ - - if (mtrack->button_repeat_to) - gtk_timeout_remove(mtrack->button_repeat_to); - - mtrack->button_repeat_to = 0; + if (mtrack->mdroot) + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + if (mtrack->song) + song_view_update(mtrack->song); } diff -rNu melys-0.1.0/widgets/melystrack.m melys-0.1.1/widgets/melystrack.m --- melys-0.1.0/widgets/melystrack.m Fri Oct 22 23:38:40 1999 +++ melys-0.1.1/widgets/melystrack.m Mon Nov 8 13:03:02 1999 @@ -24,8 +24,12 @@ >>header pixmaps.h >>header md.h >>header melgui.h + +>>header viewcontrol.h +>>header melwidgets.h >>header melystrackinfo.h >>header melystrackdisplay.h + >>header libgnomeui/gnome-pixmap.h >># Base on a vertical packing box. @@ -37,9 +41,7 @@ struct _MelysTrack { GtkVBox vbox; - GtkAdjustment *vadj; - GtkAdjustment *hadj; - + struct _ViewControl *vcp; /* H & V adjustment controls */ GtkAdjustment *posadj; /* Song position adjustment */ struct _MelysTrackInfo *info; @@ -48,11 +50,6 @@ struct rootElement *mdroot; struct song *song; - int vtitle; /* Title height */ - int vscale; /* pixels per track */ - int hscale; /* ticks per x pixel */ - - int button_repeat_to; /* Button repeat timeout id */ }; @@ -91,54 +88,50 @@ >>function melys_track_init static void -MelysTrack *mtp; The MelysTrack to init +MelysTrack *mtrack; The MelysTrack to init >>description Initialise the MelysTrack. >>code - GtkAdjustment *hadj; - GtkAdjustment *vadj; GtkAdjustment *posadj; - GtkHScrollbar *hscroll; - GtkVScrollbar *vscroll; - GtkBox *hscrollgroup; - GtkBox *vscrollgroup; GtkHPaned *hpan; GtkTable *tab; MelysTrackInfo *info; MelysTrackDisplay *disp; GtkWidget *frame1; GtkWidget *frame2; + ViewControl *vcp; tab = (GtkTable*)gtk_table_new(4, 4, FALSE); - gtk_container_add(GTK_CONTAINER(mtp), GTK_WIDGET(tab)); + gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); + + vcp = (ViewControl *)view_control_new(); + view_control_set_vertical(vcp, + TRACK_DEF_HEIGHT + TRACK_SEPARATION, + TRACK_SEPARATION, TRACK_DEF_HEIGHT, + TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION); + view_control_set_horizontal(vcp, TRACK_DEF_HSCALE); + view_control_set_limits(vcp, 1, 0, 9, 0); + + mtrack->vcp = vcp; + gtk_object_ref((GtkObject*)vcp); + gtk_object_sink((GtkObject*)vcp); + + gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); - hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); - vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, - 0.0, 0.0, - 1.0, 1.0, - 1.0 - ); posadj = (GtkAdjustment*)gtk_adjustment_new(0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ); - 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, posadj); + info = (MelysTrackInfo*)melys_track_info_new(vcp); + disp = (MelysTrackDisplay*)melys_track_display_new(vcp, posadj); gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -157,43 +150,27 @@ 0, 0 ); - hscrollgroup = scroll_group(mtp, GTK_WIDGET(hscroll), 0); - vscrollgroup = scroll_group(mtp, GTK_WIDGET(vscroll), 1); - - gtk_table_attach(tab, GTK_WIDGET(vscrollgroup), 1, 2, 0, 1, + gtk_table_attach(tab, GTK_WIDGET(vcp->vsb), 1, 2, 0, 1, 0, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0 ); - gtk_table_attach(tab, GTK_WIDGET(hscrollgroup), 0, 1, 1, 2, + gtk_table_attach(tab, GTK_WIDGET(vcp->hsb), 0, 1, 1, 2, GTK_FILL|GTK_SHRINK|GTK_EXPAND, 0, 0, 0 ); - gtk_widget_show_all(GTK_WIDGET(hscrollgroup)); - gtk_widget_show_all(GTK_WIDGET(vscrollgroup)); gtk_widget_show(GTK_WIDGET(hpan)); gtk_widget_show(GTK_WIDGET(tab)); - mtp->vadj = vadj; - gtk_object_ref((GtkObject*)vadj); - gtk_object_sink((GtkObject*)vadj); - - mtp->hadj = hadj; - gtk_object_ref((GtkObject*)hadj); - gtk_object_sink((GtkObject*)hadj); - - mtp->posadj = posadj; + mtrack->posadj = posadj; gtk_object_ref((GtkObject*)posadj); gtk_object_sink((GtkObject*)posadj); - mtp->info = info; - mtp->display = disp; + mtrack->info = info; + mtrack->display = disp; - mtp->vtitle = TRACK_TITLE_HEIGHT; - mtp->vscale = TRACK_DEF_HEIGHT + TRACK_SEPARATION; - mtp->hscale = TRACK_DEF_HSCALE; >>function melys_track_class_init @@ -205,11 +182,11 @@ >>code GtkObjectClass *object_class; - GtkVBoxClass *vbox_class; + GtkWidgetClass *widget_class; MelysTrackClass *mtrack_class; object_class = (GtkObjectClass *)klass; - vbox_class = (GtkVBoxClass *)klass; + widget_class = (GtkWidgetClass *)klass; mtrack_class = (MelysTrackClass *)klass; parent_class = gtk_type_class(gtk_vbox_get_type()); @@ -218,6 +195,7 @@ object_class->destroy = destroy; + widget_class->draw = track_draw; >>function melys_track_set_md_root @@ -240,10 +218,10 @@ * Reset the adjustments. We do not control the horizontal * adjustment. That is handled by trackdisplay. */ - mtrack->vadj->lower = 0.0; - mtrack->vadj->upper = root->tracks; - gtk_adjustment_set_value(mtrack->vadj, 0.0); - gtk_adjustment_changed(mtrack->vadj); + mtrack->vcp->vadj->lower = 0.0; + mtrack->vcp->vadj->upper = root->tracks; + gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); + gtk_adjustment_changed(mtrack->vcp->vadj); mtrack->posadj->lower = 0.0; mtrack->posadj->upper = MD_ENDTIME(root); @@ -266,9 +244,11 @@ mtrack->display->song = song; ->>function melys_track_update -void -MelysTrack *mtrack; +>>function track_draw +static void +GtkWidget *w; +GdkRectangle *area; + >>description This is called when a track is added or removed or some other change is made to the song. @@ -276,10 +256,11 @@ Emit a signal to allow all other views to also be redrawn. >>code + MelysTrack *mtrack = (MelysTrack *) w; /* Re-set the vertical scrollbar limits */ - mtrack->vadj->lower = 0.0; - mtrack->vadj->upper = (double)mtrack->mdroot->tracks; + mtrack->vcp->vadj->lower = 0.0; + mtrack->vcp->vadj->upper = (double)mtrack->mdroot->tracks; /* We do not own the horizontal scrollbar */ @@ -287,10 +268,7 @@ mtrack->posadj->lower = 0.0; mtrack->posadj->upper = MD_ENDTIME(mtrack->mdroot); - - melys_track_info_update(mtrack->info); - melys_track_display_update(mtrack->display); - + GTK_WIDGET_CLASS(parent_class)->draw(w, area); /* No signal yet */ @@ -301,234 +279,39 @@ Destroy the MelysTrack and all its resourses. >>code - MelysTrack *mtp; + MelysTrack *mtrack; g_return_if_fail(object != NULL); g_return_if_fail(IS_MELYS_TRACK(object)); - mtp = MELYS_TRACK(object); + mtrack = MELYS_TRACK(object); - if (mtp->mdroot) - md_free(MD_ELEMENT(mtp->mdroot)); + if (mtrack->mdroot) + md_free(MD_ELEMENT(mtrack->mdroot)); - if (mtp->vadj) { - gtk_object_unref(GTK_OBJECT(mtp->vadj)); - mtp->vadj = NULL; - } - if (mtp->hadj) { - gtk_object_unref(GTK_OBJECT(mtp->hadj)); - mtp->hadj = NULL; + if (mtrack->vcp) { + gtk_object_unref(GTK_OBJECT(mtrack->vcp)); + mtrack->vcp = NULL; } - if (mtp->posadj) { - gtk_object_unref(GTK_OBJECT(mtp->posadj)); - mtp->posadj = NULL; + if (mtrack->posadj) { + gtk_object_unref(GTK_OBJECT(mtrack->posadj)); + mtrack->posadj = NULL; } if (GTK_OBJECT_CLASS(parent_class)->destroy) (GTK_OBJECT_CLASS(parent_class)->destroy)(object); ->>function scroll_group -static GtkBox * -MelysTrack *mtrack; The mtrack widget -GtkWidget *sb; Scrollbar -gboolean vert; True if the vertical case - ->>description -Create a box and place in the scrollbar and the magnifying glasses. -Set up the magnifying glass buttons to expand and shrink the main -views. - ->>code - GtkBox *box; - GtkWidget *plusbutton; - GtkWidget *minusbutton; - GtkWidget *plusicon; - GtkWidget *minusicon; - - if (vert) - box = (GtkBox *)gtk_vbox_new(0, 0); - else - box = (GtkBox *)gtk_hbox_new(0, 0); - - gtk_box_pack_start(box, sb, 1, 1, 0); - - plusbutton = gtk_button_new(); - minusbutton = gtk_button_new(); - - gtk_widget_set_usize(plusbutton, 18, 18); - gtk_widget_set_usize(minusbutton, 18, 18); - - plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); - minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); - - gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); - gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); - - gtk_box_pack_end(box, plusbutton, 0, 0, 0); - gtk_box_pack_end(box, minusbutton, 0, 0, 0); - - if (vert) { - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - vert_expand, mtrack); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - vert_shrink, mtrack); - set_tip(plusbutton, _("Expand the height of the tracks")); - set_tip(minusbutton, _("Shrink the height of the tracks")); - } else { - gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", - horiz_expand, mtrack); - gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", - horiz_shrink, mtrack); - set_tip(plusbutton, _("Increase horizontal scale")); - set_tip(minusbutton, _("Decrease horizontail scale")); - } - - gtk_signal_connect(GTK_OBJECT(plusbutton), "released", - button_release, mtrack); - gtk_signal_connect(GTK_OBJECT(minusbutton), "released", - button_release, mtrack); - - return box; - - ->>function horiz_shrink -static void -GtkWidget *w; -gpointer data; - ->>description -Reduce the horizontal size of the parts. - ->>code - MelysTrack *mtrack = data; - - if (mtrack->hscale < 8) - mtrack->hscale++; - else - mtrack->hscale *= 1.25; - melys_track_display_set_hscale(mtrack->display, mtrack->hscale); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); - - ->>function horiz_expand -static void -GtkWidget *w; -gpointer data; - ->>description -Increase the horizontal size of the parts. - ->>code - MelysTrack *mtrack = data; - - mtrack->hscale /= 1.25; - if (mtrack->hscale < 2) - mtrack->hscale = 2; - melys_track_display_set_hscale(mtrack->display, mtrack->hscale); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); - - ->>function vert_expand -static void -GtkWidget *w; -gpointer data; - ->>description -Make the vertical size of the tracks larger. - ->>code - MelysTrack *mtrack = data; - - mtrack->vscale += 2; - melys_track_info_set_height(mtrack->info, mtrack->vscale, - TRACK_TITLE_HEIGHT); - melys_track_display_set_height(mtrack->display, mtrack->vscale, - TRACK_TITLE_HEIGHT); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); - - ->>function vert_shrink +>>function zoom static void -GtkWidget *w; +GtkObject *obj; The view control gpointer data; ->>description -Make the vertical size of the tracks smaller. - >>code MelysTrack *mtrack = data; - mtrack->vscale -= 2; - if (mtrack->vscale <= TRACK_SEPARATION) - mtrack->vscale = 1 + TRACK_SEPARATION; - melys_track_info_set_height(mtrack->info, mtrack->vscale, - TRACK_TITLE_HEIGHT); - melys_track_display_set_height(mtrack->display, mtrack->vscale, - TRACK_TITLE_HEIGHT); - - MD_SET_MODIFIED(mtrack->mdroot, TRUE); - song_view_update(mtrack->song); - set_button_repeat(mtrack, w); - ->>function set_button_repeat -static void -MelysTrack *mtrack; -GtkWidget *button; - ->>description -When you press a magnification button a function is set -up to be called repeatedly to simulate pressing the button. -So if you just hold the button down the view will zoom continuously. - ->>code - - if (mtrack->button_repeat_to == 0) { - gtk_object_set_data(GTK_OBJECT(button), "mtrack", mtrack); - mtrack->button_repeat_to = gtk_timeout_add(150, - (GtkFunction)click_it, button); - } - - ->>function click_it -static gboolean -GtkButton *button; - ->>description -This is part of the auto-repeat for controlling magnification. -When you hold down a magnification button this routine gets -called every so often and it emits a signal as though the button -has been pressed again. - ->>code - MelysTrack *mtrack; - - mtrack = gtk_object_get_data(GTK_OBJECT(button), "mtrack"); - gtk_signal_emit_by_name(GTK_OBJECT(button), "pressed", mtrack); - - return TRUE; - ->>function button_release -static void -GtkWidget *w; The button that was released -MelysTrack *mtrack; The MelysTrack - ->>description -When a magnification button is released we remove the timout that -is doing the auto-repeat. - ->>code - - if (mtrack->button_repeat_to) - gtk_timeout_remove(mtrack->button_repeat_to); + if (mtrack->mdroot) + MD_SET_MODIFIED(mtrack->mdroot, TRUE); + if (mtrack->song) + song_view_update(mtrack->song); - mtrack->button_repeat_to = 0; diff -rNu melys-0.1.0/widgets/melystrackdisplay.c melys-0.1.1/widgets/melystrackdisplay.c --- melys-0.1.0/widgets/melystrackdisplay.c Tue Oct 26 16:28:53 1999 +++ melys-0.1.1/widgets/melystrackdisplay.c Mon Nov 8 13:25:04 1999 @@ -32,6 +32,7 @@ #include "libgnomeui/gnome-canvas-util.h" #include "libgnomeui/gnome-canvas-text.h" #include "libgnomeui/gnome-popup-menu.h" +#include "viewcontrol.h" #include "melystrack.h" #include "melyspartitem.h" #include "melwidgets.h" @@ -94,11 +95,26 @@ #define CONP struct containerElement * +/* Defines to scale between x-coords and tick values */ +#define x_to_tick(mdisp, x) view_control_x_to_tick( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, x) + +#define tick_to_x(mdisp, tick) view_control_tick_to_x( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, tick) + +#define y_to_track(mdisp, y) view_control_y_to_thing( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, y) + +#define track_to_y(mdisp, track) view_control_thing_to_y( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, track) + /* Static functions */ static void melys_track_display_init(MelysTrackDisplay *mdisp); static void melys_track_display_class_init(MelysTrackDisplayClass *klass); +static void scale_changed(GtkObject *obj, MelysTrackDisplay *mdisp); static void disp_scroll(GtkAdjustment *adj, gpointer data); static void song_pos_cb(GtkAdjustment *adj, gpointer data); +static void display_draw(GtkWidget *widget, GdkRectangle *area); static void update_part_item(MelysTrackDisplay *mdisp, struct trackElement *track, struct partElement *part); static void disp_destroy(GtkObject *obj); @@ -120,10 +136,6 @@ static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation); static void set_scroll_region(MelysTrackDisplay *mdisp); static void set_hscroll(MelysTrackDisplay *mdisp); -static int track_to_y(MelysTrackDisplay *mdisp, int n); -static int y_to_track(MelysTrackDisplay *mdisp, int ypix); -static int x_to_tick(MelysTrackDisplay *mdisp, int xpix); -static int tick_to_x(MelysTrackDisplay *mdisp, int tick); static void slice_cb(GtkWidget *w, gpointer data); static void join_cb(GtkWidget *w, gpointer data); static void delete_cb(GtkWidget *w, gpointer data); @@ -210,35 +222,35 @@ * Create a new MelysTrackDisplay object. * * Arguments: - * hadj - Horizontal adjustment - * vadj - Vertical adjustment + * vcp - Adjustments and scaling * posadj - Song position adjustment */ GtkWidget * -melys_track_display_new(GtkAdjustment *hadj, GtkAdjustment *vadj, - GtkAdjustment *posadj) +melys_track_display_new(ViewControl *vcp, GtkAdjustment *posadj) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); MelysTrackDisplay *mdisp; mdisp = (MelysTrackDisplay*)w; - mdisp->hadj = hadj; - mdisp->vadj = vadj; + mdisp->vcp = vcp; mdisp->posadj = posadj; - gtk_signal_connect((GtkObject *)hadj, "value-changed", + gtk_signal_connect((GtkObject *)vcp, "scale-changed", + scale_changed, mdisp); + gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); - gtk_signal_connect((GtkObject *)vadj, "value-changed", + gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); gtk_signal_connect((GtkObject *)posadj, "value-changed", (GtkSignalFunc)song_pos_cb, mdisp); - gtk_object_ref((GtkObject*)hadj); - gtk_object_ref((GtkObject*)vadj); + gtk_object_ref((GtkObject*)vcp); gtk_object_ref((GtkObject*)posadj); - melys_rule_set_adj(MELYS_RULE(mdisp->title), hadj); + melys_rule_set_adj(MELYS_RULE(mdisp->title), vcp); + + gtk_widget_set_usize(mdisp->title, 1, mdisp->vcp->vtitle); return GTK_WIDGET(mdisp); } @@ -256,11 +268,6 @@ GtkWidget *title; GtkWidget *box; - mdisp->height = TRACK_DEF_HEIGHT; - mdisp->vspace = TRACK_DEF_HEIGHT + TRACK_SEPARATION; - mdisp->htitle = TRACK_TITLE_HEIGHT; - mdisp->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; - mdisp->hscale = TRACK_DEF_HSCALE; mdisp->voffset = 0; mdisp->hoffset = 0; @@ -290,7 +297,6 @@ mdisp->canvas = GTK_WIDGET(canvas); mdisp->title = GTK_WIDGET(title); - gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); /* Create the pop up menu */ mdisp->menu = gnome_popup_menu_new(displaymenu); @@ -350,6 +356,7 @@ object_class->destroy = disp_destroy; widget_class->size_allocate = disp_size_allocate; + widget_class->draw = display_draw; } /* @@ -361,7 +368,6 @@ melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root) { - GnomeCanvas *canvas; g_return_if_fail(root != NULL); @@ -369,46 +375,29 @@ md_free((struct element *)mdisp->mdroot); mdisp->mdroot = md_root_inc_ref(root); - canvas = GNOME_CANVAS(mdisp->canvas); - - mdisp->hadj->value = 0.0; + mdisp->vcp->hadj->value = 0.0; set_hscroll(mdisp); melys_rule_set_tempomap((MelysRule *)mdisp->title, md_get_tempomap(root)); build_sel_list(mdisp); /* There may be some parts already selected */ - - melys_track_display_update(mdisp); -} - -void -melys_track_display_set_hscale(MelysTrackDisplay *mdisp, int hscale) -{ - mdisp->hscale = hscale; - melys_rule_set_hscale(MELYS_RULE(mdisp->title), hscale); - - /* Get the scroll to position correct */ - mdisp->hadj->value--; /* slight hack, sorry */ - gtk_adjustment_value_changed(mdisp->hadj); } /* - * Set the height of the track and of the title. In addition - * there will be a separation distance. This function is - * called by MelysTrack. + * The scaling has changed. Recalculate all sizes. * * Arguments: - * height - New track height - * htitle - The title height + * obj - This will be the vcp + * mdisp - Our info */ -void -melys_track_display_set_height(MelysTrackDisplay *mdisp, int height, - int htitle) +static void +scale_changed(GtkObject *obj, MelysTrackDisplay *mdisp) { - mdisp->height = height; - mdisp->vspace = height + TRACK_SEPARATION; - mdisp->htitle = htitle; - mdisp->vtitle = htitle + TRACK_SEPARATION; + + /* Get the scroll to position correct */ + mdisp->vcp->hadj->value--; /* slight hack, sorry */ + disp_scroll(mdisp->vcp->hadj, mdisp); + set_hscroll(mdisp); } /* @@ -422,7 +411,7 @@ GnomeCanvas *canvas; int changed = 0; - if (adj == mdisp->hadj) { + if (adj == mdisp->vcp->hadj) { if ((int)adj->value != mdisp->hoffset) { if (adj->value >= 0) { changed = 1; @@ -430,7 +419,7 @@ } } } - if (adj == mdisp->vadj) { + if (adj == mdisp->vcp->vadj) { if ((int)adj->value != mdisp->voffset) { changed = 1; mdisp->voffset = (int)(adj->value + 0.1); @@ -444,7 +433,7 @@ gnome_canvas_scroll_to(canvas, tick_to_x(mdisp, mdisp->hoffset), - mdisp->voffset * mdisp->vspace); + mdisp->voffset * mdisp->vcp->vscale); } } @@ -461,7 +450,7 @@ long t; int x; - hadj = mdisp->hadj; + hadj = mdisp->vcp->hadj; t = (unsigned long)mdisp->posadj->value; x = tick_to_x(mdisp, t); @@ -520,11 +509,12 @@ * Look through all the parts and set up the part items for each * part. */ -void -melys_track_display_update(MelysTrackDisplay *mdisp) +static void +display_draw(GtkWidget *widget, GdkRectangle *area) { int n; int p; + MelysTrackDisplay *mdisp = (MelysTrackDisplay *)widget; struct trackElement *track; struct partElement *part; /* note that this could be part or partref */ @@ -538,7 +528,7 @@ if (MD_IS_DESTROYED(part)) { /* This should not be happening */ - dprintf(0, "melys_track_display_update: part is destroyed!\n"); + dprintf(0, "display_draw: part is destroyed!\n"); continue; } @@ -548,7 +538,7 @@ update_part_item(mdisp, track, part); break; default: - dprintf(0, "Unexpexted type %d in melys_track_display_update", MD_TYPE(part)); + dprintf(0, "Unexpexted type %d in display_draw", MD_TYPE(part)); break; } } @@ -556,6 +546,8 @@ if (mdisp->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); + + GTK_WIDGET_CLASS(parent_class)->draw(widget, area); } /* @@ -682,7 +674,7 @@ "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mdisp->height-2, + "clip_height", (double) mdisp->vcp->vheight-2, NULL); /* This size of the part is set here */ @@ -690,7 +682,7 @@ "x1", (double) 0.0, "y1", (double) 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), - "y2", (double) mdisp->height, + "y2", (double) mdisp->vcp->vheight, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], "width_pixels", 1, "outline_color", "black", @@ -716,13 +708,9 @@ if (mdisp->posline) gtk_object_destroy(GTK_OBJECT(mdisp->posline)); - if (mdisp->hadj) { - gtk_object_unref(GTK_OBJECT(mdisp->hadj)); - mdisp->hadj = NULL; - } - if (mdisp->vadj) { - gtk_object_unref(GTK_OBJECT(mdisp->vadj)); - mdisp->vadj = NULL; + if (mdisp->vcp) { + gtk_object_unref(GTK_OBJECT(mdisp->vcp)); + mdisp->vcp = NULL; } if (mdisp->posadj) { gtk_object_unref(GTK_OBJECT(mdisp->posadj)); @@ -1130,8 +1118,6 @@ NULL); mdisp->posline = (gpointer)item; } - - melys_track_display_update(mdisp); } } @@ -1158,18 +1144,18 @@ /* the allocated area is the minimum to use */ height = GTK_WIDGET(mdisp)->allocation.height; - if (height < mdisp->mdroot->tracks * mdisp->vspace) { + if (height < mdisp->mdroot->tracks * mdisp->vcp->vscale) { int last; int extra; - last = (int)(mdisp->vadj->upper - mdisp->vadj->page_size)/mdisp->vspace; + last = (int)(mdisp->vcp->vadj->upper - mdisp->vcp->vadj->page_size)/mdisp->vcp->vscale; extra = height - last; - height = mdisp->mdroot->tracks * mdisp->vspace + extra; + height = mdisp->mdroot->tracks * mdisp->vcp->vscale + extra; } gnome_canvas_set_scroll_region(canvas, 0.0, 0.0, - mdisp->hadj->upper, + mdisp->vcp->hadj->upper, height ); @@ -1202,7 +1188,7 @@ if (!GTK_WIDGET_REALIZED(mdisp)) return; - adj = mdisp->hadj; + adj = mdisp->vcp->hadj; pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; @@ -1237,56 +1223,6 @@ } /* - * Return the y pixel position of the top of the area allocated - * to the specified track . This is relative to the top of the - * canvas and is independant of the scroll position. - * - * Arguments: - * mdisp - The widget - * n - The track number - */ -static int -track_to_y(MelysTrackDisplay *mdisp, int n) -{ - return n * mdisp->vspace; -} - -static int -y_to_track(MelysTrackDisplay *mdisp, int ypix) -{ - return ypix / mdisp->vspace; -} - -/* - * Return the musical tick number given an x pixel value. The x - * value is relative to the left hand side of the canvas. - */ -static int -x_to_tick(MelysTrackDisplay *mdisp, int xpix) -{ - int tick; - - tick = xpix * mdisp->hscale; - return tick; -} - -/* - * Return the x pixel position for the specified tick number. - * The position is relative to the canvas. - */ -static int -tick_to_x(MelysTrackDisplay *mdisp, int tick) -{ - int x; - - g_return_val_if_fail(mdisp->hscale != 0, 0); - - x = (tick + mdisp->hscale/2) / mdisp->hscale; - - return x; -} - -/* * Slice the part in two at the point that the mouse was clicked. * * Arguments: @@ -1522,7 +1458,7 @@ "x1", (double) x1, "y1", (double) y1, "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), - "y2", (double) y1 + mdisp->height, + "y2", (double) y1 + mdisp->vcp->vheight, "width_pixels", 1, "outline_color", "yellow", NULL); @@ -1557,7 +1493,7 @@ return FALSE; wx += oldata->xoffset; - wy += oldata->yoffset - mdisp->height/2; + wy += oldata->yoffset - mdisp->vcp->vheight/2; if (wx < 0) wx = 0; if (wy < 0) wy = 0; diff -rNu melys-0.1.0/widgets/melystrackdisplay.m melys-0.1.1/widgets/melystrackdisplay.m --- melys-0.1.0/widgets/melystrackdisplay.m Mon Oct 25 00:25:56 1999 +++ melys-0.1.1/widgets/melystrackdisplay.m Mon Nov 8 13:03:02 1999 @@ -30,6 +30,7 @@ >>header libgnomeui/gnome-canvas-text.h >>header libgnomeui/gnome-popup-menu.h +>>header viewcontrol.h >>header melystrack.h >>header melyspartitem.h >>header melwidgets.h @@ -60,9 +61,10 @@ struct _MelysTrackDisplay { GtkVBox vbox; + /* Adjustments and scales */ + ViewControl *vcp; + /* The adjustments for scrolling */ - GtkAdjustment *vadj; - GtkAdjustment *hadj; GtkAdjustment *posadj; /* Song position adjustment */ /* Amount of vertical scrolling, in tracks (you never see half a track) */ @@ -78,21 +80,9 @@ * sync between MelysTrackInfo and MelysTrackDisplay. */ - /* The amount of vertical space that a track takes up */ - int vspace; /* height + spacing */ - int height; /* without separation */ - int htitle; /* Title height */ - int vtitle; /* Title vertical space */ - - /* Horizontal scale. Ticks per pixel */ - int hscale; - /* The snap to grid setting */ int snap; - /* Allocated area that track information is being displayed in */ - GdkRectangle track_area; - /* The actual composition that is being displayed */ struct rootElement *mdroot; struct song *song; @@ -192,6 +182,20 @@ #define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) #define CONP struct containerElement * + +/* Defines to scale between x-coords and tick values */ +#define x_to_tick(mdisp, x) view_control_x_to_tick( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, x) + +#define tick_to_x(mdisp, tick) view_control_tick_to_x( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, tick) + +#define y_to_track(mdisp, y) view_control_y_to_thing( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, y) + +#define track_to_y(mdisp, track) view_control_thing_to_y( \ + MELYS_TRACK_DISPLAY(mdisp)->vcp, track) + >>extern -a /* The menu for the display pane */ @@ -224,8 +228,7 @@ >>function melys_track_display_new GtkWidget * -GtkAdjustment *hadj; Horizontal adjustment -GtkAdjustment *vadj; Vertical adjustment +ViewControl *vcp; Adjustments and scaling GtkAdjustment *posadj; Song position adjustment >>description @@ -237,22 +240,24 @@ mdisp = (MelysTrackDisplay*)w; - mdisp->hadj = hadj; - mdisp->vadj = vadj; + mdisp->vcp = vcp; mdisp->posadj = posadj; - gtk_signal_connect((GtkObject *)hadj, "value-changed", + gtk_signal_connect((GtkObject *)vcp, "scale-changed", + scale_changed, mdisp); + gtk_signal_connect((GtkObject *)vcp->hadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); - gtk_signal_connect((GtkObject *)vadj, "value-changed", + gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", (GtkSignalFunc)disp_scroll, mdisp); gtk_signal_connect((GtkObject *)posadj, "value-changed", (GtkSignalFunc)song_pos_cb, mdisp); - gtk_object_ref((GtkObject*)hadj); - gtk_object_ref((GtkObject*)vadj); + gtk_object_ref((GtkObject*)vcp); gtk_object_ref((GtkObject*)posadj); - melys_rule_set_adj(MELYS_RULE(mdisp->title), hadj); + melys_rule_set_adj(MELYS_RULE(mdisp->title), vcp); + + gtk_widget_set_usize(mdisp->title, 1, mdisp->vcp->vtitle); return GTK_WIDGET(mdisp); @@ -267,11 +272,6 @@ GtkWidget *title; GtkWidget *box; - mdisp->height = TRACK_DEF_HEIGHT; - mdisp->vspace = TRACK_DEF_HEIGHT + TRACK_SEPARATION; - mdisp->htitle = TRACK_TITLE_HEIGHT; - mdisp->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; - mdisp->hscale = TRACK_DEF_HSCALE; mdisp->voffset = 0; mdisp->hoffset = 0; @@ -301,7 +301,6 @@ mdisp->canvas = GTK_WIDGET(canvas); mdisp->title = GTK_WIDGET(title); - gtk_widget_set_usize(mdisp->title, 1, mdisp->vtitle); /* Create the pop up menu */ mdisp->menu = gnome_popup_menu_new(displaymenu); @@ -359,6 +358,7 @@ object_class->destroy = disp_destroy; widget_class->size_allocate = disp_size_allocate; + widget_class->draw = display_draw; >>function melys_track_display_set_md_root @@ -372,7 +372,6 @@ Everything is reset to display the new song. >>code - GnomeCanvas *canvas; g_return_if_fail(root != NULL); @@ -380,46 +379,30 @@ md_free((struct element *)mdisp->mdroot); mdisp->mdroot = md_root_inc_ref(root); - canvas = GNOME_CANVAS(mdisp->canvas); - - mdisp->hadj->value = 0.0; + mdisp->vcp->hadj->value = 0.0; set_hscroll(mdisp); melys_rule_set_tempomap((MelysRule *)mdisp->title, md_get_tempomap(root)); build_sel_list(mdisp); /* There may be some parts already selected */ - melys_track_display_update(mdisp); ->>function melys_track_display_set_hscale -void -MelysTrackDisplay *mdisp; -int hscale; +>>function scale_changed +static void +GtkObject *obj; This will be the vcp +MelysTrackDisplay *mdisp; Our info + +>>description +The scaling has changed. +Recalculate all sizes. >>code - mdisp->hscale = hscale; - melys_rule_set_hscale(MELYS_RULE(mdisp->title), hscale); /* Get the scroll to position correct */ - mdisp->hadj->value--; /* slight hack, sorry */ - gtk_adjustment_value_changed(mdisp->hadj); - - ->>function melys_track_display_set_height -void -MelysTrackDisplay *mdisp; -int height; New track height -int htitle; The title height ->>description -Set the height of the track and of the title. -In addition there will be a separation distance. -This function is called by MelysTrack. ->>code - mdisp->height = height; - mdisp->vspace = height + TRACK_SEPARATION; - mdisp->htitle = htitle; - mdisp->vtitle = htitle + TRACK_SEPARATION; + mdisp->vcp->hadj->value--; /* slight hack, sorry */ + disp_scroll(mdisp->vcp->hadj, mdisp); + set_hscroll(mdisp); >>function disp_scroll @@ -435,7 +418,7 @@ GnomeCanvas *canvas; int changed = 0; - if (adj == mdisp->hadj) { + if (adj == mdisp->vcp->hadj) { if ((int)adj->value != mdisp->hoffset) { if (adj->value >= 0) { changed = 1; @@ -443,7 +426,7 @@ } } } - if (adj == mdisp->vadj) { + if (adj == mdisp->vcp->vadj) { if ((int)adj->value != mdisp->voffset) { changed = 1; mdisp->voffset = (int)(adj->value + 0.1); @@ -457,7 +440,7 @@ gnome_canvas_scroll_to(canvas, tick_to_x(mdisp, mdisp->hoffset), - mdisp->voffset * mdisp->vspace); + mdisp->voffset * mdisp->vcp->vscale); } @@ -476,7 +459,7 @@ long t; int x; - hadj = mdisp->hadj; + hadj = mdisp->vcp->hadj; t = (unsigned long)mdisp->posadj->value; x = tick_to_x(mdisp, t); @@ -531,9 +514,10 @@ } ->>function melys_track_display_update -void -MelysTrackDisplay *mdisp; +>>function display_draw +static void +GtkWidget *widget; +GdkRectangle *area; >>description Look through all the parts and set up the part items for @@ -542,6 +526,7 @@ >>code int n; int p; + MelysTrackDisplay *mdisp = (MelysTrackDisplay *)widget; struct trackElement *track; struct partElement *part; /* note that this could be part or partref */ @@ -574,6 +559,8 @@ if (mdisp->posline) gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); + GTK_WIDGET_CLASS(parent_class)->draw(widget, area); + >>function update_part_item static void @@ -698,7 +685,7 @@ "anchor", GTK_ANCHOR_NORTH_WEST, "clip", TRUE, "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mdisp->height-2, + "clip_height", (double) mdisp->vcp->vheight-2, NULL); /* This size of the part is set here */ @@ -706,7 +693,7 @@ "x1", (double) 0.0, "y1", (double) 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), - "y2", (double) mdisp->height, + "y2", (double) mdisp->vcp->vheight, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], "width_pixels", 1, "outline_color", "black", @@ -733,13 +720,9 @@ if (mdisp->posline) gtk_object_destroy(GTK_OBJECT(mdisp->posline)); - if (mdisp->hadj) { - gtk_object_unref(GTK_OBJECT(mdisp->hadj)); - mdisp->hadj = NULL; - } - if (mdisp->vadj) { - gtk_object_unref(GTK_OBJECT(mdisp->vadj)); - mdisp->vadj = NULL; + if (mdisp->vcp) { + gtk_object_unref(GTK_OBJECT(mdisp->vcp)); + mdisp->vcp = NULL; } if (mdisp->posadj) { gtk_object_unref(GTK_OBJECT(mdisp->posadj)); @@ -1174,8 +1157,6 @@ NULL); mdisp->posline = (gpointer)item; } - - melys_track_display_update(mdisp); } @@ -1205,18 +1186,18 @@ /* the allocated area is the minimum to use */ height = GTK_WIDGET(mdisp)->allocation.height; - if (height < mdisp->mdroot->tracks * mdisp->vspace) { + if (height < mdisp->mdroot->tracks * mdisp->vcp->vscale) { int last; int extra; - last = (int)(mdisp->vadj->upper - mdisp->vadj->page_size)/mdisp->vspace; + last = (int)(mdisp->vcp->vadj->upper - mdisp->vcp->vadj->page_size)/mdisp->vcp->vscale; extra = height - last; - height = mdisp->mdroot->tracks * mdisp->vspace + extra; + height = mdisp->mdroot->tracks * mdisp->vcp->vscale + extra; } gnome_canvas_set_scroll_region(canvas, 0.0, 0.0, - mdisp->hadj->upper, + mdisp->vcp->hadj->upper, height ); @@ -1252,7 +1233,7 @@ if (!GTK_WIDGET_REALIZED(mdisp)) return; - adj = mdisp->hadj; + adj = mdisp->vcp->hadj; pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp)->allocation.width); ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; @@ -1289,66 +1270,6 @@ g_free(_info); ->>function track_to_y -static int -MelysTrackDisplay *mdisp; The widget -int n; The track number - ->>description -Return the y pixel position of the top of the area allocated -to the specified -.A track . -This is relative to the top of the canvas and is independant -of the scroll position. - ->>code - return n * mdisp->vspace; - - ->>function y_to_track -static int -MelysTrackDisplay *mdisp; The widget -int ypix; Pixel position - ->>code - return ypix / mdisp->vspace; - - ->>function x_to_tick -static int -MelysTrackDisplay *mdisp; -int xpix; - ->>description -Return the musical tick number given an x pixel value. -The x value is relative to the left hand side of the canvas. - ->>code - int tick; - - tick = xpix * mdisp->hscale; - return tick; - - ->>function tick_to_x -static int -MelysTrackDisplay *mdisp; -int tick; - ->>description -Return the x pixel position for the specified tick number. -The position is relative to the canvas. - ->>code - int x; - - g_return_val_if_fail(mdisp->hscale != 0, 0); - - x = (tick + mdisp->hscale/2) / mdisp->hscale; - - return x; - - >># ----- The menu callbacks ----- >>function slice_cb @@ -1601,7 +1522,7 @@ "x1", (double) x1, "y1", (double) y1, "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), - "y2", (double) y1 + mdisp->height, + "y2", (double) y1 + mdisp->vcp->vheight, "width_pixels", 1, "outline_color", "yellow", NULL); @@ -1642,7 +1563,7 @@ return FALSE; wx += oldata->xoffset; - wy += oldata->yoffset - mdisp->height/2; + wy += oldata->yoffset - mdisp->vcp->vheight/2; if (wx < 0) wx = 0; if (wy < 0) wy = 0; diff -rNu melys-0.1.0/widgets/melystrackinfo.c melys-0.1.1/widgets/melystrackinfo.c --- melys-0.1.0/widgets/melystrackinfo.c Tue Oct 26 16:28:53 1999 +++ melys-0.1.1/widgets/melystrackinfo.c Mon Nov 8 13:25:05 1999 @@ -36,6 +36,7 @@ #include "elements.h" #include "md.h" #include "song.h" +#include "viewcontrol.h" #include "melystrackinfo.h" #include "melystrack.h" #include "intl.h" @@ -105,6 +106,7 @@ /* Static functions */ static void melys_track_info_init(MelysTrackInfo *minfo); static void melys_track_info_class_init(MelysTrackInfoClass *klass); +static void scale_changed(GtkObject *obj, MelysTrackInfo *minfo); static void track_info_realise(GtkWidget *widget); static void track_info_unrealise(GtkWidget *widget); static void track_info_destroy(GtkObject *object); @@ -186,21 +188,23 @@ * Create a new MelysTrackInfo object. * * Arguments: - * vadj - Vertical adjustment + * vcp - For the vertical scrolling and scaling */ GtkWidget * -melys_track_info_new(GtkAdjustment *vadj) +melys_track_info_new(ViewControl *vcp) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_info_get_type())); MelysTrackInfo *minfo; minfo = (MelysTrackInfo*)w; - minfo->vadj = vadj; - gtk_signal_connect((GtkObject *)vadj, "value-changed", + minfo->vcp = vcp; + gtk_signal_connect((GtkObject *)vcp, "scale-changed", + scale_changed, minfo); + gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", (GtkSignalFunc)track_info_scroll, minfo); - gtk_object_ref((GtkObject*)vadj); + gtk_object_ref((GtkObject*)vcp); return w; } @@ -220,7 +224,7 @@ GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); - minfo->vadj = NULL; + minfo->vcp = NULL; used = 0; minfo->col_infos = g_new0(struct col_info, MAX_COLUMNS); @@ -242,12 +246,6 @@ minfo->col_used = used; - minfo->height = TRACK_DEF_HEIGHT; - minfo->vspace = TRACK_DEF_HEIGHT + TRACK_SEPARATION; - - minfo->htitle = TRACK_TITLE_HEIGHT; - minfo->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; - minfo->voffset = 0; minfo->mdroot = NULL; @@ -320,24 +318,17 @@ } /* - * Set the height of the track and of the title. In addition - * there will be a separation distance. This function is - * called by MelysTrack. + * This is called when something in the vcp changes. + * Re-calculate all geometry. * * Arguments: - * height - New track height - * htitle - The title height + * obj - This is the vcp + * minfo - Our info */ -void -melys_track_info_set_height(MelysTrackInfo *minfo, int height, int htitle) +static void +scale_changed(GtkObject *obj, MelysTrackInfo *minfo) { - minfo->height = height; - minfo->vspace = height + TRACK_SEPARATION; - - minfo->htitle = htitle; - minfo->vtitle = htitle + TRACK_SEPARATION; - if (GTK_WIDGET_REALIZED(minfo)) { /* This doesn't actually change at present, but would if @@ -345,6 +336,8 @@ */ minfo->vtextoffset = GTK_WIDGET(minfo)->style->font->ascent + 1.5; } + + track_vscroll_calc(minfo); } /* @@ -492,9 +485,9 @@ g_free(minfo->col_infos); - if (minfo->vadj) { - gtk_object_unref(GTK_OBJECT(minfo->vadj)); - minfo->vadj = NULL; + if (minfo->vcp) { + gtk_object_unref(GTK_OBJECT(minfo->vcp)); + minfo->vcp = NULL; } if (minfo->mdroot) { @@ -571,9 +564,9 @@ /* Save the track area, not including title area */ minfo->track_area.x = allocation->x; - minfo->track_area.y = allocation->y + minfo->vtitle; + minfo->track_area.y = allocation->y + minfo->vcp->vtitle; minfo->track_area.width = allocation->width; - minfo->track_area.height = allocation->height - minfo->vtitle; + minfo->track_area.height = allocation->height - minfo->vcp->vtitle; gdk_window_move_resize(widget->window, allocation->x, allocation->y, @@ -592,11 +585,11 @@ track_vscroll_calc(MelysTrackInfo *minfo) { - minfo->vadj->page_size = - (minfo->track_area.height / minfo->vspace); - minfo->vadj->page_increment = minfo->vadj->page_size; + minfo->vcp->vadj->page_size = + (minfo->track_area.height / minfo->vcp->vscale); + minfo->vcp->vadj->page_increment = minfo->vcp->vadj->page_size; - gtk_adjustment_changed(minfo->vadj); + gtk_adjustment_changed(minfo->vcp->vadj); } /* @@ -664,8 +657,8 @@ /* Draw in the separator line bewtween the titles and rows */ gdk_draw_line(widget->window, fg_gc, - 0, minfo->vtitle - TRACK_TITLE_RULE, - minfo->track_area.width, minfo->vtitle - TRACK_TITLE_RULE); + 0, minfo->vcp->vtitle - TRACK_TITLE_RULE, + minfo->track_area.width, minfo->vcp->vtitle - TRACK_TITLE_RULE); dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) @@ -712,7 +705,7 @@ area.x = xpos; area.y = track_to_y(minfo, ntrack); area.width = cip->width + 2*COL_PADDING; - area.height = minfo->vspace; + area.height = minfo->vcp->vscale; gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, area.width, area.height); @@ -789,7 +782,7 @@ /* Have to draw the vertical lines */ gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, - 0, minfo->track_area.height + minfo->vtitle, + 0, minfo->track_area.height + minfo->vcp->vtitle, ap->x + cip->width + COL_PADDING); } else switch (cip->type) { @@ -894,17 +887,10 @@ shadow_type = GTK_SHADOW_IN; } -#if 1 gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, shadow_type, ap->x, ap->y + BUTTON_SURROUND, ap->width, ap->height - 2*BUTTON_SURROUND); -#else - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, shadow_type, - ap->x, ap->y, - ap->width, minfo->height); -#endif } /* @@ -1000,7 +986,7 @@ y = track_to_y(minfo, row); gtk_widget_queue_draw_area(widget, - 0, y, minfo->track_area.width, minfo->vspace); + 0, y, minfo->track_area.width, minfo->vcp->vscale); return TRUE; } @@ -1280,7 +1266,8 @@ * Given a y position within the widget window, return the * track number that belongs to that co-ordintate. Track * numbers start at 0, -1 means no track in other words the y - * position is before the tracks start or after. + * position is before the tracks start or after. Beware that + * this works differently to the canvas based widgets. * * Arguments: * minfo - The widget @@ -1291,11 +1278,11 @@ { int n; - n = (ypix - minfo->vtitle); + n = (ypix - minfo->vcp->vtitle); if (n < 0) return minfo->voffset; - n /= minfo->vspace; + n /= minfo->vcp->vscale; n += minfo->voffset; @@ -1307,7 +1294,8 @@ /* * Given a track number, return the top y co-ord for that track. * It could be negative if beyond the top of the current track - * area. + * area. Beware that this works differently to the canvas + * based widgets. * * Arguments: * n - Track number @@ -1321,7 +1309,7 @@ if (n <= -1) return 0; - ypix = n * minfo->vspace + minfo->vtitle; + ypix = n * minfo->vcp->vscale + minfo->vcp->vtitle; return ypix; } @@ -1439,7 +1427,7 @@ width = minfo->track_area.width; y = track_to_y(minfo, MD_TRACKLIKE(track)->number); - height = minfo->vspace; + height = minfo->vcp->vscale; dprintf2("Q-DRAW %d: %d,%d %dx%d", MD_TRACKLIKE(track)->number, x, y, width, height); if (y >= 0) diff -rNu melys-0.1.0/widgets/melystrackinfo.m melys-0.1.1/widgets/melystrackinfo.m --- melys-0.1.0/widgets/melystrackinfo.m Sun Oct 24 13:10:27 1999 +++ melys-0.1.1/widgets/melystrackinfo.m Mon Nov 8 13:03:02 1999 @@ -28,6 +28,7 @@ >>header elements.h >>header md.h >>header song.h +>>header viewcontrol.h >>gtkobject melys_track_info gtk_widget @@ -39,8 +40,8 @@ struct _MelysTrackInfo { GtkWidget widget; - /* The adjustment for vertical scrolling */ - GtkAdjustment *vadj; + /* The adjustment for vertical scrolling (and other things) */ + ViewControl *vcp; /* Amount of vertical scrolling, in tracks (you never see half a track) */ int voffset; @@ -59,12 +60,6 @@ * sync between MelysTrackInfo and MelysTrackDisplay. */ - /* The amount of vertical space that a track takes up */ - int vspace; - int height; /* without separation */ - int htitle; /* Title height */ - int vtitle; /* Title vertical space */ - /* The offset from the top of allocated space to text baseline */ int vtextoffset; @@ -157,7 +152,7 @@ >>function melys_track_info_new GtkWidget * -GtkAdjustment *vadj; Vertical adjustment +ViewControl *vcp; For the vertical scrolling and scaling >>description Create a new MelysTrackInfo object. >>code @@ -166,11 +161,13 @@ minfo = (MelysTrackInfo*)w; - minfo->vadj = vadj; - gtk_signal_connect((GtkObject *)vadj, "value-changed", + minfo->vcp = vcp; + gtk_signal_connect((GtkObject *)vcp, "scale-changed", + scale_changed, minfo); + gtk_signal_connect((GtkObject *)vcp->vadj, "value-changed", (GtkSignalFunc)track_info_scroll, minfo); - gtk_object_ref((GtkObject*)vadj); + gtk_object_ref((GtkObject*)vcp); return w; @@ -186,7 +183,7 @@ GTK_WIDGET_SET_FLAGS(minfo, GTK_CAN_FOCUS); - minfo->vadj = NULL; + minfo->vcp = NULL; used = 0; minfo->col_infos = g_new0(struct col_info, MAX_COLUMNS); @@ -208,12 +205,6 @@ minfo->col_used = used; - minfo->height = TRACK_DEF_HEIGHT; - minfo->vspace = TRACK_DEF_HEIGHT + TRACK_SEPARATION; - - minfo->htitle = TRACK_TITLE_HEIGHT; - minfo->vtitle = TRACK_TITLE_HEIGHT + 2*TRACK_SEPARATION; - minfo->voffset = 0; minfo->mdroot = NULL; @@ -284,23 +275,16 @@ klass->record_track = NULL; ->>function melys_track_info_set_height -void -MelysTrackInfo *minfo; -int height; New track height -int htitle; The title height +>>function scale_changed +static void +GtkObject *obj; This is the vcp +MelysTrackInfo *minfo; Our info + >>description -Set the height of the track and of the title. -In addition there will be a separation distance. -This function is called by MelysTrack. +This is called when something in the vcp changes. +Re-calculate all geometry. >>code - minfo->height = height; - minfo->vspace = height + TRACK_SEPARATION; - - minfo->htitle = htitle; - minfo->vtitle = htitle + TRACK_SEPARATION; - if (GTK_WIDGET_REALIZED(minfo)) { /* This doesn't actually change at present, but would if @@ -309,6 +293,8 @@ minfo->vtextoffset = GTK_WIDGET(minfo)->style->font->ascent + 1.5; } + track_vscroll_calc(minfo); + >>function melys_track_info_set_md_root void @@ -464,9 +450,9 @@ g_free(minfo->col_infos); - if (minfo->vadj) { - gtk_object_unref(GTK_OBJECT(minfo->vadj)); - minfo->vadj = NULL; + if (minfo->vcp) { + gtk_object_unref(GTK_OBJECT(minfo->vcp)); + minfo->vcp = NULL; } if (minfo->mdroot) { @@ -546,9 +532,9 @@ /* Save the track area, not including title area */ minfo->track_area.x = allocation->x; - minfo->track_area.y = allocation->y + minfo->vtitle; + minfo->track_area.y = allocation->y + minfo->vcp->vtitle; minfo->track_area.width = allocation->width; - minfo->track_area.height = allocation->height - minfo->vtitle; + minfo->track_area.height = allocation->height - minfo->vcp->vtitle; gdk_window_move_resize(widget->window, allocation->x, allocation->y, @@ -571,11 +557,11 @@ >>code - minfo->vadj->page_size = - (minfo->track_area.height / minfo->vspace); - minfo->vadj->page_increment = minfo->vadj->page_size; + minfo->vcp->vadj->page_size = + (minfo->track_area.height / minfo->vcp->vscale); + minfo->vcp->vadj->page_increment = minfo->vcp->vadj->page_size; - gtk_adjustment_changed(minfo->vadj); + gtk_adjustment_changed(minfo->vcp->vadj); >>function track_info_draw @@ -643,8 +629,8 @@ /* Draw in the separator line bewtween the titles and rows */ gdk_draw_line(widget->window, fg_gc, - 0, minfo->vtitle - TRACK_TITLE_RULE, - minfo->track_area.width, minfo->vtitle - TRACK_TITLE_RULE); + 0, minfo->vcp->vtitle - TRACK_TITLE_RULE, + minfo->track_area.width, minfo->vcp->vtitle - TRACK_TITLE_RULE); dprintf2("start %d end %d, tracks %d", start, end, minfo->mdroot->tracks); for (ntrack = start; ntrack < end; ntrack++) @@ -692,7 +678,7 @@ area.x = xpos; area.y = track_to_y(minfo, ntrack); area.width = cip->width + 2*COL_PADDING; - area.height = minfo->vspace; + area.height = minfo->vcp->vscale; gdk_draw_rectangle(widget->window, bg_gc, TRUE, area.x, area.y, area.width, area.height); @@ -772,7 +758,7 @@ /* Have to draw the vertical lines */ gtk_draw_vline(widget->style, widget->window, GTK_STATE_NORMAL, - 0, minfo->track_area.height + minfo->vtitle, + 0, minfo->track_area.height + minfo->vcp->vtitle, ap->x + cip->width + COL_PADDING); } else switch (cip->type) { @@ -883,17 +869,11 @@ shadow_type = GTK_SHADOW_IN; } -#if 1 gtk_draw_shadow(widget->style, widget->window, GTK_STATE_NORMAL, shadow_type, ap->x, ap->y + BUTTON_SURROUND, ap->width, ap->height - 2*BUTTON_SURROUND); -#else - gtk_draw_shadow(widget->style, widget->window, - GTK_STATE_NORMAL, shadow_type, - ap->x, ap->y, - ap->width, minfo->height); -#endif + >>function track_info_expose static int @@ -1001,7 +981,7 @@ y = track_to_y(minfo, row); gtk_widget_queue_draw_area(widget, - 0, y, minfo->track_area.width, minfo->vspace); + 0, y, minfo->track_area.width, minfo->vcp->vscale); return TRUE; @@ -1333,15 +1313,16 @@ the track number that belongs to that co-ordintate. Track numbers start at 0, -1 means no track in other words the y position is before the tracks start or after. +Beware that this works differently to the canvas based widgets. >>code int n; - n = (ypix - minfo->vtitle); + n = (ypix - minfo->vcp->vtitle); if (n < 0) return minfo->voffset; - n /= minfo->vspace; + n /= minfo->vcp->vscale; n += minfo->voffset; @@ -1357,6 +1338,7 @@ Given a track number, return the top y co-ord for that track. It could be negative if beyond the top of the current track area. +Beware that this works differently to the canvas based widgets. >>code int ypix; @@ -1365,7 +1347,7 @@ if (n <= -1) return 0; - ypix = n * minfo->vspace + minfo->vtitle; + ypix = n * minfo->vcp->vscale + minfo->vcp->vtitle; return ypix; @@ -1495,7 +1477,7 @@ width = minfo->track_area.width; y = track_to_y(minfo, MD_TRACKLIKE(track)->number); - height = minfo->vspace; + height = minfo->vcp->vscale; dprintf2("Q-DRAW %d: %d,%d %dx%d", MD_TRACKLIKE(track)->number, x, y, width, height); if (y >= 0) diff -rNu melys-0.1.0/widgets/misc.c melys-0.1.1/widgets/misc.c --- melys-0.1.0/widgets/misc.c Tue Oct 26 16:28:54 1999 +++ melys-0.1.1/widgets/misc.c Mon Nov 8 13:25:05 1999 @@ -22,6 +22,8 @@ #include "gtk/gtk.h" #include "libgnomeui/gnome-canvas.h" #include "libart_lgpl/art_affine.h" +#include "pixmaps.h" +#include "melgui.h" #include "melwidgets.h" #include "intl.h" diff -rNu melys-0.1.0/widgets/misc.m melys-0.1.1/widgets/misc.m --- melys-0.1.0/widgets/misc.m Fri Sep 24 15:57:29 1999 +++ melys-0.1.1/widgets/misc.m Mon Nov 8 13:03:02 1999 @@ -14,6 +14,8 @@ >>header gtk/gtk.h >>header libgnomeui/gnome-canvas.h >>header libart_lgpl/art_affine.h +>>header pixmaps.h +>>header melgui.h >>headerdef --decl melwidgets.h @@ -56,4 +58,5 @@ art_affine_translate(translate, x, y); gnome_canvas_item_affine_absolute(item, translate); + diff -rNu melys-0.1.0/widgets/viewcontrol.c melys-0.1.1/widgets/viewcontrol.c --- melys-0.1.0/widgets/viewcontrol.c Thu Jan 1 01:00:00 1970 +++ melys-0.1.1/widgets/viewcontrol.c Mon Nov 8 13:25:06 1999 @@ -0,0 +1,488 @@ +/* + * + * 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 an object that keeps together a number of things + * that are required to implement the horizontal and vertical controls + * in various of the melys widgets. + * + * + */ + + +#include "glib.h" +#include "except.h" +#include "util.h" +#include "gtk/gtkobject.h" +#include "gtk/gtkbox.h" +#include "gtk/gtkvbox.h" +#include "gtk/gtkhbox.h" +#include "gtk/gtksignal.h" +#include "gtk/gtkbutton.h" +#include "gtk/gtkadjustment.h" +#include "gtk/gtkhscrollbar.h" +#include "gtk/gtkvscrollbar.h" +#include "gtk/gtkmain.h" +#include "libgnomeui/gnome-pixmap.h" +#include "pixmaps.h" +#include "melgui.h" +#include "viewcontrol.h" +#include "intl.h" + + + + + + +/* The list of signal id's that are being added for ViewControl. */ +enum { + SCALE_CHANGED, + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + +/* Static functions */ +static void view_control_init(ViewControl *vcp); +static void view_control_class_init(ViewControlClass *klass); +static void view_control_destroy(GtkObject *obj); +static GtkWidget *scroll_group(ViewControl *vcp, GtkWidget *sb, gboolean vert); +static void horiz_expand(GtkWidget *w, gpointer data); +static void horiz_shrink(GtkWidget *w, gpointer data); +static void vert_expand(GtkWidget *w, gpointer data); +static void vert_shrink(GtkWidget *w, gpointer data); +static void button_repeat(GtkWidget *but, gpointer data); +static gboolean click_it(gpointer *but); +static void button_release(GtkWidget *w, gpointer data); + + +static GtkObjectClass *parent_class = NULL; + +static gint view_control_signals[LAST_SIGNAL]; + +/* + * Return a unique integer that represents the object type. + */ +guint +view_control_get_type(void) +{ + static guint mtype = 0; + + if (!mtype) { + GtkTypeInfo minfo = { + "ViewControl", + sizeof(ViewControl), + sizeof(ViewControlClass), + (GtkClassInitFunc) view_control_class_init, + (GtkObjectInitFunc) view_control_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL, + (GtkClassInitFunc) NULL, + }; + + mtype = gtk_type_unique(gtk_object_get_type(), &minfo); + } + + return mtype; +} + +/* + * Create a new ViewControl object. + */ +ViewControl * +view_control_new(void) +{ + ViewControl *vcp = VIEW_CONTROL(gtk_type_new(view_control_get_type())); + + // XXX Fill in here or replace previous line + + return vcp; +} + +/* + * Initialise the ViewControl. + * + * Arguments: + * vcp - The ViewControl to init + */ +static void +view_control_init(ViewControl *vcp) +{ + GtkAdjustment *hadj; + GtkAdjustment *vadj; + GtkWidget *hscroll; + GtkWidget *vscroll; + + hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 + ); + vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 + ); + + hscroll = gtk_hscrollbar_new(hadj); + vscroll = gtk_vscrollbar_new(vadj); + + vcp->hsb = scroll_group(vcp, hscroll, 0); + vcp->vsb = scroll_group(vcp, vscroll, 1); + + gtk_widget_show_all(vcp->hsb); + gtk_widget_show_all(vcp->vsb); + + vcp->vadj = vadj; + gtk_object_ref((GtkObject*)vadj); + gtk_object_sink((GtkObject*)vadj); + + vcp->hadj = hadj; + gtk_object_ref((GtkObject*)hadj); + gtk_object_sink((GtkObject*)hadj); + + vcp->vscale = 1; + vcp->vspace = 1; + vcp->vheight = 1; + vcp->hscale = 1; + + /* Some defaults - but you are supposed to set them */ + vcp->hminscale = 1; + vcp->hmaxscale = 99999; + vcp->vminscale = 1; + vcp->vmaxscale = 99999; +} + +/* + * Initialize the class. + * + * Arguments: + * klass - The class to initialise + */ +static void +view_control_class_init(ViewControlClass *klass) +{ + GtkObjectClass *object_class; + + object_class = (GtkObjectClass *)klass; + + 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, + GTK_SIGNAL_OFFSET(ViewControlClass, scale_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0 + ); + + gtk_object_class_add_signals(object_class, view_control_signals, + LAST_SIGNAL); + + object_class->destroy = view_control_destroy; + + klass->scale_changed = NULL; +} + +static void +view_control_destroy(GtkObject *obj) +{ + ViewControl *vcp = VIEW_CONTROL(obj); + + gtk_object_unref(GTK_OBJECT(vcp->hadj)); + gtk_object_unref(GTK_OBJECT(vcp->vadj)); + + gtk_widget_unref(vcp->hsb); + gtk_widget_unref(vcp->vsb); +} + +/* + * Create a box and place in the scrollbar and the magnifying + * glasses. Set up the magnifying glass buttons to expand and + * shrink the main views. + * + * Arguments: + * vcp - The view control + * sb - The scrollbar to use + * vert - True if the vertical case + */ +static GtkWidget * +scroll_group(ViewControl *vcp, GtkWidget *sb, gboolean vert) +{ + GtkBox *box; + GtkWidget *plusbutton; + GtkWidget *minusbutton; + GtkWidget *plusicon; + GtkWidget *minusicon; + + if (vert) + box = (GtkBox *)gtk_vbox_new(0, 0); + else + box = (GtkBox *)gtk_hbox_new(0, 0); + + gtk_box_pack_start(box, sb, 1, 1, 0); + + plusbutton = gtk_button_new(); + minusbutton = gtk_button_new(); + + gtk_widget_set_usize(plusbutton, 18, 18); + gtk_widget_set_usize(minusbutton, 18, 18); + + plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); + minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); + + gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); + gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); + + gtk_box_pack_end(box, plusbutton, 0, 0, 0); + gtk_box_pack_end(box, minusbutton, 0, 0, 0); + + if (vert) { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + vert_expand, vcp); + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + button_repeat, NULL); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + vert_shrink, vcp); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + button_repeat, NULL); + set_tip(plusbutton, _("Increase vertical scale")); + set_tip(minusbutton, _("Decrease vertical scale")); + } else { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + horiz_expand, vcp); + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + button_repeat, NULL); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + horiz_shrink, vcp); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + button_repeat, NULL); + set_tip(plusbutton, _("Increase horizontal scale")); + set_tip(minusbutton, _("Decrease horizontail scale")); + } + + gtk_signal_connect(GTK_OBJECT(plusbutton), "released", + button_release, vcp); + gtk_signal_connect(GTK_OBJECT(minusbutton), "released", + button_release, vcp); + + gtk_widget_ref(GTK_WIDGET(box)); + return GTK_WIDGET(box); +} + +/* + * Increase the horizontal size of the parts. + */ +static void +horiz_expand(GtkWidget *w, gpointer data) +{ + ViewControl *vcp = data; + + vcp->hscale /= 1.25; + if (vcp->hscale < vcp->hminscale) + vcp->hscale = vcp->hminscale; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); +} + +/* + * Increase the horizontal size of the parts. + */ +static void +horiz_shrink(GtkWidget *w, gpointer data) +{ + ViewControl *vcp = data; + int old; + + old = vcp->hscale; + + vcp->hscale *= 1.25; + if (old == vcp->hscale) + vcp->hscale++; + if (vcp->hscale > vcp->hmaxscale) + vcp->hscale = vcp->hmaxscale; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); +} + +/* + * Make the vertical size of the tracks larger. + */ +static void +vert_expand(GtkWidget *w, gpointer data) +{ + ViewControl *vcp = data; + + vcp->vscale += 2; + if (vcp->vscale > vcp->vmaxscale) + vcp->vscale = vcp->vmaxscale; + vcp->vheight = vcp->vscale - vcp->vspace; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); +} + +/* + * Make the vertical size of the tracks smaller. + */ +static void +vert_shrink(GtkWidget *w, gpointer data) +{ + ViewControl *vcp = data; + + vcp->vscale -= 2; + if (vcp->vscale < vcp->vminscale) + vcp->vscale = vcp->vminscale; + + vcp->vheight = vcp->vscale - vcp->vspace; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); +} + +static void +button_repeat(GtkWidget *but, gpointer data) +{ + int to; + + to = gtk_timeout_add(150, (GtkFunction)click_it, but); + gtk_object_set_data_full(GTK_OBJECT(but), "button_repeat", + GINT_TO_POINTER(to), (GtkDestroyNotify)gtk_timeout_remove); +} + +static gboolean +click_it(gpointer *but) +{ + gtk_signal_emit_by_name(GTK_OBJECT(but), "pressed", NULL); + return TRUE; +} + +static void +button_release(GtkWidget *w, gpointer data) +{ + + /* This will automatically remove the timeout */ + gtk_object_remove_data(GTK_OBJECT(w), "button_repeat"); +} + +/* + * Set up the view controls on the vertical side. + * + * Arguments: + * vscale - Vertical scale + * vspace - Vertical space between things + * vheight - The height of the thing + * vtitle - Height of a title area + */ +void +view_control_set_vertical(ViewControl *vcp, int vscale, int vspace, + int vheight, int vtitle) +{ + vcp->vscale = vscale; + vcp->vspace = vspace; + vcp->vheight = vheight; + vcp->vtitle = vtitle; +} + +/* + * Set up the view controls on the horizontal side of things. + * + * Arguments: + * hscale - Horizontal scale + */ +void +view_control_set_horizontal(ViewControl *vcp, int hscale) +{ + + vcp->hscale = hscale; +} + +/* + * Set minimum and maximum values that will be allowed. A max of + * zero means no limit. + * + * Arguments: + * hmin - Horizontal minimum + * hmax - Horizontal maximum + * vmin - Vertical minimum + * vmax - Vertical maximum + */ +void +view_control_set_limits(ViewControl *vcp, int hmin, int hmax, int vmin, + int vmax) +{ + + vcp->hminscale = hmin; + vcp->vminscale = vmin; + if (hmax) + vcp->hmaxscale = hmax; + else + vcp->hmaxscale = G_MAXINT; + if (vmax) + vcp->vmaxscale = vmax; + else + vcp->vmaxscale = G_MAXINT; +} + +/* + * Return the musical tick number given an x pixel value. The x + * value is relative to the left hand side of the canvas. + */ +int +view_control_x_to_tick(ViewControl *vcp, int xpix) +{ + int tick; + + tick = xpix * vcp->hscale; + return tick; +} + +/* + * Return the x pixel position for the specified tick number. + * The position is relative to the canvas. + */ +int +view_control_tick_to_x(ViewControl *vcp, int tick) +{ + int x; + + g_return_val_if_fail(vcp->hscale != 0, 0); + + x = (tick + vcp->hscale/2) / vcp->hscale; + + return x; +} + +int +view_control_y_to_thing(ViewControl *vcp, int ypix) +{ + return ypix / vcp->vscale; +} + +/* + * Return the y pixel position of the top of the area allocated + * to the specified track . This is relative to the top of the + * canvas and is independant of the scroll position. + * + * Arguments: + * vcp - The widget + * n - The track number + */ +int +view_control_thing_to_y(ViewControl *vcp, int n) +{ + return n * vcp->vscale; +} diff -rNu melys-0.1.0/widgets/viewcontrol.m melys-0.1.1/widgets/viewcontrol.m --- melys-0.1.0/widgets/viewcontrol.m Thu Jan 1 01:00:00 1970 +++ melys-0.1.1/widgets/viewcontrol.m Mon Nov 8 13:03:02 1999 @@ -0,0 +1,495 @@ +>>name viewcontrol.m - view control adjustments etc. + +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 an object that keeps together a number of things +that are required to implement the horizontal and vertical controls +in various of the melys widgets. + +>>extern + +>>header gtk/gtkobject.h +>>header gtk/gtkbox.h +>>header gtk/gtkvbox.h +>>header gtk/gtkhbox.h +>>header gtk/gtksignal.h +>>header gtk/gtkbutton.h +>>header gtk/gtkadjustment.h +>>header gtk/gtkhscrollbar.h +>>header gtk/gtkvscrollbar.h +>>header gtk/gtkmain.h + +>>header libgnomeui/gnome-pixmap.h + +>>header pixmaps.h +>>header melgui.h + +>>gtkobject view_control gtk_object + +>>headerdef @header + +struct _ViewControl { + GtkObject object; + + /* Adjustments */ + GtkAdjustment *hadj; /* Horizontal adjustment position */ + GtkAdjustment *vadj; /* Vertical adjustment position */ + + /* Scrollbars */ + GtkWidget *hsb; /* The horizontal scrollbar group */ + GtkWidget *vsb; /* The vertical scrollbar group */ + + /* Vertical measurements */ + int vscale; /* Number of pixels from one thing to the next */ + int vspace; /* Separation between things */ + int vheight; /* Height of a 'thing' (vscale - vsep) */ + + /* Title height */ + int vtitle; /* Height of a title bar */ + + /* Horizontal measurements */ + int hscale; + + /* A controlling widget can set these to limit zooming */ + int hminscale; + int hmaxscale; + int vminscale; + int vmaxscale; +}; + +struct _ViewControlClass { + GtkObjectClass parent_class; + + void (*scale_changed)(ViewControl *); +}; + +>>extern + +/* The list of signal id's that are being added for ViewControl. */ +>>set signals +enum { + SCALE_CHANGED, + LAST_SIGNAL +}; + +/* Argument numbers */ +enum { + ARG_0, + // XXX argument names go here +}; + + +>>function view_control_new +ViewControl * +>>description +Create a new ViewControl object. +>>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 +static void +ViewControl *vcp; The ViewControl to init +>>description +Initialise the ViewControl. +>>code + GtkAdjustment *hadj; + GtkAdjustment *vadj; + GtkWidget *hscroll; + GtkWidget *vscroll; + + hadj = (GtkAdjustment*)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 + ); + vadj = (GtkAdjustment*)gtk_adjustment_new(0.0, + 0.0, 0.0, + 1.0, 1.0, + 1.0 + ); + + hscroll = gtk_hscrollbar_new(hadj); + vscroll = gtk_vscrollbar_new(vadj); + + vcp->hsb = scroll_group(vcp, hscroll, 0); + vcp->vsb = scroll_group(vcp, vscroll, 1); + + gtk_widget_show_all(vcp->hsb); + gtk_widget_show_all(vcp->vsb); + + vcp->vadj = vadj; + gtk_object_ref((GtkObject*)vadj); + gtk_object_sink((GtkObject*)vadj); + + vcp->hadj = hadj; + gtk_object_ref((GtkObject*)hadj); + gtk_object_sink((GtkObject*)hadj); + + vcp->vscale = 1; + vcp->vspace = 1; + vcp->vheight = 1; + vcp->hscale = 1; + + /* Some defaults - but you are supposed to set them */ + vcp->hminscale = 1; + vcp->hmaxscale = 99999; + vcp->vminscale = 1; + vcp->vmaxscale = 99999; + + +>>function view_control_class_init +static void +ViewControlClass *klass; The class to initialise + +>>description +Initialize the class. + +>>code + GtkObjectClass *object_class; + + object_class = (GtkObjectClass *)klass; + + 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, + GTK_SIGNAL_OFFSET(ViewControlClass, scale_changed), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0 + ); + + gtk_object_class_add_signals(object_class, view_control_signals, + LAST_SIGNAL); + + object_class->destroy = view_control_destroy; + + klass->scale_changed = NULL; + + +>>function view_control_destroy +static void +GtkObject *obj; The view control +>>code + ViewControl *vcp = VIEW_CONTROL(obj); + + gtk_object_unref(GTK_OBJECT(vcp->hadj)); + gtk_object_unref(GTK_OBJECT(vcp->vadj)); + + gtk_widget_unref(vcp->hsb); + gtk_widget_unref(vcp->vsb); + + +>>function scroll_group +static GtkWidget * +ViewControl *vcp; The view control +GtkWidget *sb; The scrollbar to use +gboolean vert; True if the vertical case + +>>description +Create a box and place in the scrollbar and the magnifying glasses. +Set up the magnifying glass buttons to expand and shrink the main +views. + +>>code + GtkBox *box; + GtkWidget *plusbutton; + GtkWidget *minusbutton; + GtkWidget *plusicon; + GtkWidget *minusicon; + + if (vert) + box = (GtkBox *)gtk_vbox_new(0, 0); + else + box = (GtkBox *)gtk_hbox_new(0, 0); + + gtk_box_pack_start(box, sb, 1, 1, 0); + + plusbutton = gtk_button_new(); + minusbutton = gtk_button_new(); + + gtk_widget_set_usize(plusbutton, 18, 18); + gtk_widget_set_usize(minusbutton, 18, 18); + + plusicon = gnome_pixmap_new_from_xpm_d(plus_xpm); + minusicon = gnome_pixmap_new_from_xpm_d(minus_xpm); + + gtk_container_add(GTK_CONTAINER(plusbutton), plusicon); + gtk_container_add(GTK_CONTAINER(minusbutton), minusicon); + + gtk_box_pack_end(box, plusbutton, 0, 0, 0); + gtk_box_pack_end(box, minusbutton, 0, 0, 0); + + if (vert) { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + vert_expand, vcp); + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + button_repeat, NULL); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + vert_shrink, vcp); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + button_repeat, NULL); + set_tip(plusbutton, _("Increase vertical scale")); + set_tip(minusbutton, _("Decrease vertical scale")); + } else { + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + horiz_expand, vcp); + gtk_signal_connect(GTK_OBJECT(plusbutton), "pressed", + button_repeat, NULL); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + horiz_shrink, vcp); + gtk_signal_connect(GTK_OBJECT(minusbutton), "pressed", + button_repeat, NULL); + set_tip(plusbutton, _("Increase horizontal scale")); + set_tip(minusbutton, _("Decrease horizontail scale")); + } + + gtk_signal_connect(GTK_OBJECT(plusbutton), "released", + button_release, vcp); + gtk_signal_connect(GTK_OBJECT(minusbutton), "released", + button_release, vcp); + + gtk_widget_ref(GTK_WIDGET(box)); + return GTK_WIDGET(box); + + +>>function horiz_expand +static void +GtkWidget *w; +gpointer data; + +>>description +Increase the horizontal size of the parts. + +>>code + ViewControl *vcp = data; + + vcp->hscale /= 1.25; + if (vcp->hscale < vcp->hminscale) + vcp->hscale = vcp->hminscale; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); + + +>>function horiz_shrink +static void +GtkWidget *w; +gpointer data; + +>>description +Increase the horizontal size of the parts. + +>>code + ViewControl *vcp = data; + int old; + + old = vcp->hscale; + + vcp->hscale *= 1.25; + if (old == vcp->hscale) + vcp->hscale++; + if (vcp->hscale > vcp->hmaxscale) + vcp->hscale = vcp->hmaxscale; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); + + +>>function vert_expand +static void +GtkWidget *w; +gpointer data; + +>>description +Make the vertical size of the tracks larger. + +>>code + ViewControl *vcp = data; + + vcp->vscale += 2; + if (vcp->vscale > vcp->vmaxscale) + vcp->vscale = vcp->vmaxscale; + vcp->vheight = vcp->vscale - vcp->vspace; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); + + +>>function vert_shrink +static void +GtkWidget *w; +gpointer data; + +>>description +Make the vertical size of the tracks smaller. + +>>code + ViewControl *vcp = data; + + vcp->vscale -= 2; + if (vcp->vscale < vcp->vminscale) + vcp->vscale = vcp->vminscale; + + vcp->vheight = vcp->vscale - vcp->vspace; + + gtk_signal_emit(GTK_OBJECT(vcp), view_control_signals[SCALE_CHANGED]); + +>>function button_repeat +static void +GtkWidget *but; +gpointer data; + +>>code + int to; + + to = gtk_timeout_add(150, (GtkFunction)click_it, but); + gtk_object_set_data_full(GTK_OBJECT(but), "button_repeat", + GINT_TO_POINTER(to), (GtkDestroyNotify)gtk_timeout_remove); + + +>>function click_it +static gboolean +gpointer *but; + +>>code + gtk_signal_emit_by_name(GTK_OBJECT(but), "pressed", NULL); + return TRUE; + +>>function button_release +static void +GtkWidget *w; Button that was released +gpointer data; + +>>code + + /* This will automatically remove the timeout */ + gtk_object_remove_data(GTK_OBJECT(w), "button_repeat"); + + +>>function view_control_set_vertical +void +ViewControl *vcp; +int vscale; Vertical scale +int vspace; Vertical space between things +int vheight; The height of the thing +int vtitle; Height of a title area + +>>description +Set up the view controls on the vertical side. + +>>code + vcp->vscale = vscale; + vcp->vspace = vspace; + vcp->vheight = vheight; + vcp->vtitle = vtitle; + +>>function view_control_set_horizontal +void +ViewControl *vcp; +int hscale; Horizontal scale + +>>description +Set up the view controls on the horizontal side of things. + +>>code + + vcp->hscale = hscale; + + +>>function view_control_set_limits +void +ViewControl *vcp; +int hmin; Horizontal minimum +int hmax; Horizontal maximum +int vmin; Vertical minimum +int vmax; Vertical maximum + +>>description +Set minimum and maximum values that will be allowed. +A max of zero means no limit. + +>>code + + vcp->hminscale = hmin; + vcp->vminscale = vmin; + if (hmax) + vcp->hmaxscale = hmax; + else + vcp->hmaxscale = G_MAXINT; + if (vmax) + vcp->vmaxscale = vmax; + else + vcp->vmaxscale = G_MAXINT; + + +>>function view_control_x_to_tick +int +ViewControl *vcp; +int xpix; + +>>description +Return the musical tick number given an x pixel value. +The x value is relative to the left hand side of the canvas. + +>>code + int tick; + + tick = xpix * vcp->hscale; + return tick; + + +>>function view_control_tick_to_x +int +ViewControl *vcp; +int tick; + +>>description +Return the x pixel position for the specified tick number. +The position is relative to the canvas. + +>>code + int x; + + g_return_val_if_fail(vcp->hscale != 0, 0); + + x = (tick + vcp->hscale/2) / vcp->hscale; + + return x; + +>>function view_control_y_to_thing +int +ViewControl *vcp; +int ypix; Pixel position + +>>code + return ypix / vcp->vscale; + + +>>function view_control_thing_to_y +int +ViewControl *vcp; The widget +int n; The track number + +>>description +Return the y pixel position of the top of the area allocated +to the specified +.A track . +This is relative to the top of the canvas and is independant +of the scroll position. + +>>code + return n * vcp->vscale; +