diff -rNu melys-0.1.6/include/melystrack.h melys-0.1.7/include/melystrack.h --- melys-0.1.6/include/melystrack.h Mon Nov 29 10:47:36 1999 +++ melys-0.1.7/include/melystrack.h Mon Nov 29 15:34:43 1999 @@ -49,5 +49,4 @@ guint melys_track_get_type(void); 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); diff -rNu melys-0.1.6/include/melystrackdisplay.h melys-0.1.7/include/melystrackdisplay.h --- melys-0.1.6/include/melystrackdisplay.h Mon Nov 29 10:47:36 1999 +++ melys-0.1.7/include/melystrackdisplay.h Mon Nov 29 15:34:44 1999 @@ -25,6 +25,7 @@ typedef struct _MelysTrackDisplayClass MelysTrackDisplayClass; +#if 0 /* Mouse click state */ enum click_state { CLICK_INACTIVE, @@ -36,61 +37,18 @@ CLICK_ERROR }; +#endif struct _MelysTrackDisplay { - GtkVBox vbox; + MelysView melys_view; - /* Adjustments and scales */ - ViewControl *vcp; - - /* The adjustments for scrolling */ - GtkAdjustment *posadj; /* Song position adjustment */ - - /* Amount of vertical scrolling, in tracks (you never see half a track) */ - int voffset; - /* Horizontal offset, in ticks */ - int hoffset; - /* Play position offset, in ticks */ - int poffset; - - /* - * The amount of vertical space used by tracks is under control of - * the parent MelysTrack widget. This is because we must be in - * sync between MelysTrackInfo and MelysTrackDisplay. - */ - - /* The snap to grid setting */ - int snap; - - /* The actual composition that is being displayed */ - struct rootElement *mdroot; - struct song *song; - - /* The sub-widgets that make up this widget */ - GtkWidget *canvas; - GtkWidget *title; - gpointer posline; - - GtkWidget *menu; - - /* Selected parts */ - GList *sel_list; - - /* Saved click position and state information */ - struct partElement *click_part; /* Part that was click on */ - ticktime_t click_tick; /* Clicked tick position */ - struct trackElement *click_track; /* Clicked track */ - int click_ntrack; /* Clicked track position */ - enum click_state click_state; /* mouse state */ }; struct _MelysTrackDisplayClass { - GtkVBoxClass parent_class; + MelysViewClass parent_class; }; guint melys_track_display_get_type(void); -GtkWidget *melys_track_display_new(ViewControl *vcp); +GtkWidget *melys_track_display_new(void); void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root); -void melys_track_display_set_song(MelysTrackDisplay *mdisp, struct song *song); -void display_info_free(gpointer _info); diff -rNu melys-0.1.6/include/melysview.h melys-0.1.7/include/melysview.h --- melys-0.1.6/include/melysview.h Mon Nov 29 10:47:37 1999 +++ melys-0.1.7/include/melysview.h Mon Nov 29 15:34:44 1999 @@ -69,7 +69,7 @@ GtkWidget *canvas; /* The canvas that the subclass will place items on */ GtkWidget *ruler; /* A ruler that can be used */ GtkWidget *posline; /* Song position pointer */ - //GtkWidget *menu; /* The item context menu */ + GtkWidget *menu; /* The item context menu */ /* For the posline */ void *points; diff -rNu melys-0.1.6/version melys-0.1.7/version --- melys-0.1.6/version Mon Nov 29 10:47:17 1999 +++ melys-0.1.7/version Mon Nov 29 15:34:14 1999 @@ -1 +1 @@ -#define MELYS_VERSION_STRING "0.1.6" +#define MELYS_VERSION_STRING "0.1.7" diff -rNu melys-0.1.6/widgets/Makefile melys-0.1.7/widgets/Makefile --- melys-0.1.6/widgets/Makefile Mon Nov 29 10:47:49 1999 +++ melys-0.1.7/widgets/Makefile Mon Nov 29 15:34:52 1999 @@ -114,6 +114,8 @@ melyspartitem.o: ../include/md.h melyspartitem.o: ../include/melyspartitem.h melystrackdisplay.o: ../include/viewcontrol.h +melystrackdisplay.o: ../include/melysscroll.h +melystrackdisplay.o: ../include/melysview.h melystrackdisplay.o: ../include/melystrack.h melystrackdisplay.o: ../include/melyspartitem.h melystrackdisplay.o: ../include/melwidgets.h @@ -156,9 +158,11 @@ melystrack.o: ../include/md.h melystrack.o: ../include/melgui.h melystrack.o: ../include/viewcontrol.h -melystrack.o: ../include/melwidgets.h +melystrack.o: ../include/melysscroll.h +melystrack.o: ../include/melysview.h melystrack.o: ../include/melystrackinfo.h melystrack.o: ../include/melystrackdisplay.h +melystrack.o: ../include/melwidgets.h melystrack.o: ../include/melystrack.h melystempo.o: ../include/viewcontrol.h melystempo.o: ../include/melysscroll.h diff -rNu melys-0.1.6/widgets/melysscroll.c melys-0.1.7/widgets/melysscroll.c --- melys-0.1.6/widgets/melysscroll.c Mon Nov 29 10:48:10 1999 +++ melys-0.1.7/widgets/melysscroll.c Mon Nov 29 15:35:03 1999 @@ -106,7 +106,7 @@ static void melys_scroll_init(MelysScroll *XXX) { - // XXX add any children etc. + } /* @@ -269,9 +269,12 @@ else width = mscroll->width; if (mscroll->which & VC_VERTICAL) - height = vcp->vadj->upper * vcp->vscale; + height = (1+vcp->vadj->upper) * vcp->vscale; else height = mscroll->height; + + if (height < GTK_WIDGET(mscroll)->allocation.height) + height = GTK_WIDGET(mscroll)->allocation.height; gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), -mscroll->hbase, 0.0, diff -rNu melys-0.1.6/widgets/melysscroll.m melys-0.1.7/widgets/melysscroll.m --- melys-0.1.6/widgets/melysscroll.m Mon Nov 29 01:22:23 1999 +++ melys-0.1.7/widgets/melysscroll.m Mon Nov 29 15:31:55 1999 @@ -91,7 +91,6 @@ >>description Initialise the MelysScroll. >>code - // XXX add any children etc. >>function melys_scroll_class_init @@ -265,9 +264,12 @@ else width = mscroll->width; if (mscroll->which & VC_VERTICAL) - height = vcp->vadj->upper * vcp->vscale; + height = (1+vcp->vadj->upper) * vcp->vscale; else height = mscroll->height; + + if (height < GTK_WIDGET(mscroll)->allocation.height) + height = GTK_WIDGET(mscroll)->allocation.height; gnome_canvas_set_scroll_region(GNOME_CANVAS(mscroll), -mscroll->hbase, 0.0, diff -rNu melys-0.1.6/widgets/melystrack.c melys-0.1.7/widgets/melystrack.c --- melys-0.1.6/widgets/melystrack.c Mon Nov 29 10:48:11 1999 +++ melys-0.1.7/widgets/melystrack.c Mon Nov 29 15:35:03 1999 @@ -23,11 +23,14 @@ #include "pixmaps.h" #include "md.h" #include "melgui.h" +#include "libgnomeui/gnome-canvas.h" +#include "libgnomeui/gnome-pixmap.h" #include "viewcontrol.h" -#include "melwidgets.h" +#include "melysscroll.h" +#include "melysview.h" #include "melystrackinfo.h" #include "melystrackdisplay.h" -#include "libgnomeui/gnome-pixmap.h" +#include "melwidgets.h" #include "melystrack.h" #include "intl.h" @@ -48,6 +51,8 @@ /* Static functions */ static void melys_track_init(MelysTrack *mtrack); static void melys_track_class_init(MelysTrackClass *klass); +static void melys_track_set_md_root(MelysTrack *mtrack, + struct rootElement *root); static void track_draw(GtkWidget *w, GdkRectangle *area); static void destroy(GtkObject *object); static void zoom(GtkObject *obj, gpointer data); @@ -120,13 +125,16 @@ gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); - vcp = (ViewControl *)view_control_new(); + disp = (MelysTrackDisplay*)melys_track_display_new(); + + vcp = (ViewControl *)MELYS_VIEW(disp)->vcp; view_control_set_vertical(vcp, TRACK_DEF_HEIGHT + TRACK_SEPARATION); view_control_set_limits(vcp, 1, 0, 9, 0); + info = (MelysTrackInfo*)melys_track_info_new(vcp); + mtrack->vcp = vcp; gtk_object_ref((GtkObject*)vcp); - gtk_object_sink((GtkObject*)vcp); gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); @@ -135,9 +143,6 @@ 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(vcp); - disp = (MelysTrackDisplay*)melys_track_display_new(vcp); - gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -202,7 +207,7 @@ /* * Set the root for this track view. */ -void +static void melys_track_set_md_root(MelysTrack *mtrack, struct rootElement *root) { @@ -216,8 +221,9 @@ * Reset the adjustments. We do not control the horizontal * adjustment. That is handled by trackdisplay. */ - view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); - gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); + MELYS_VIEW(mtrack->display)->vthings = root->tracks; + //view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); + //gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -233,8 +239,9 @@ mtrack->posadj = song->posadj; gtk_object_ref((GtkObject *)mtrack->posadj); + melys_track_set_md_root(mtrack, song->mdroot); mtrack->info->song = song; - melys_track_display_set_song(mtrack->display, song); + melys_view_set_song(MELYS_VIEW(mtrack->display), song); } /* @@ -249,6 +256,7 @@ MelysTrack *mtrack = (MelysTrack *) w; /* Re-set the vertical scrollbar limits */ + MELYS_VIEW(mtrack->display)->vthings = mtrack->mdroot->tracks; view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, mtrack->mdroot->tracks); diff -rNu melys-0.1.6/widgets/melystrack.m melys-0.1.7/widgets/melystrack.m --- melys-0.1.6/widgets/melystrack.m Sun Nov 28 16:14:23 1999 +++ melys-0.1.7/widgets/melystrack.m Mon Nov 29 15:31:55 1999 @@ -25,12 +25,15 @@ >>header md.h >>header melgui.h +>>header libgnomeui/gnome-canvas.h +>>header libgnomeui/gnome-pixmap.h + >>header viewcontrol.h ->>header melwidgets.h +>>header melysscroll.h +>>header melysview.h >>header melystrackinfo.h >>header melystrackdisplay.h - ->>header libgnomeui/gnome-pixmap.h +>>header melwidgets.h >># Base on a vertical packing box. >># This allows stuff to be put along the top. @@ -101,13 +104,16 @@ gtk_container_add(GTK_CONTAINER(mtrack), GTK_WIDGET(tab)); - vcp = (ViewControl *)view_control_new(); + disp = (MelysTrackDisplay*)melys_track_display_new(); + + vcp = (ViewControl *)MELYS_VIEW(disp)->vcp; view_control_set_vertical(vcp, TRACK_DEF_HEIGHT + TRACK_SEPARATION); view_control_set_limits(vcp, 1, 0, 9, 0); + info = (MelysTrackInfo*)melys_track_info_new(vcp); + mtrack->vcp = vcp; gtk_object_ref((GtkObject*)vcp); - gtk_object_sink((GtkObject*)vcp); gtk_signal_connect(GTK_OBJECT(vcp), "scale-changed", zoom, mtrack); @@ -116,9 +122,6 @@ 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(vcp); - disp = (MelysTrackDisplay*)melys_track_display_new(vcp); - gtk_container_add(GTK_CONTAINER(frame1), GTK_WIDGET(info)); gtk_container_add(GTK_CONTAINER(frame2), GTK_WIDGET(disp)); @@ -181,7 +184,7 @@ >>function melys_track_set_md_root -void +static void MelysTrack *mtrack; struct rootElement *root; @@ -200,8 +203,9 @@ * Reset the adjustments. We do not control the horizontal * adjustment. That is handled by trackdisplay. */ - view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); - gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); + MELYS_VIEW(mtrack->display)->vthings = root->tracks; + //view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, root->tracks); + //gtk_adjustment_set_value(mtrack->vcp->vadj, 0.0); melys_track_info_set_md_root(mtrack->info, root); melys_track_display_set_md_root(mtrack->display, root); @@ -220,8 +224,9 @@ mtrack->posadj = song->posadj; gtk_object_ref((GtkObject *)mtrack->posadj); + melys_track_set_md_root(mtrack, song->mdroot); mtrack->info->song = song; - melys_track_display_set_song(mtrack->display, song); + melys_view_set_song(MELYS_VIEW(mtrack->display), song); >>function track_draw @@ -239,6 +244,7 @@ MelysTrack *mtrack = (MelysTrack *) w; /* Re-set the vertical scrollbar limits */ + MELYS_VIEW(mtrack->display)->vthings = mtrack->mdroot->tracks; view_control_set_range(mtrack->vcp, VC_VERTICAL, 0.0, mtrack->mdroot->tracks); diff -rNu melys-0.1.6/widgets/melystrackdisplay.c melys-0.1.7/widgets/melystrackdisplay.c --- melys-0.1.6/widgets/melystrackdisplay.c Mon Nov 29 10:48:12 1999 +++ melys-0.1.7/widgets/melystrackdisplay.c Mon Nov 29 15:35:04 1999 @@ -37,6 +37,8 @@ #include "libgnomeui/gnome-canvas-text.h" #include "libgnomeui/gnome-popup-menu.h" #include "viewcontrol.h" +#include "melysscroll.h" +#include "melysview.h" #include "melystrack.h" #include "melyspartitem.h" #include "melwidgets.h" @@ -57,111 +59,73 @@ -/* Signals that this widget creates */ -enum { - LAST_SIGNAL -}; - /* * The different canvas items that go together to make * up a part on the display. - * In the future this may just be the one item that holds - * the text etc, and so the need for this structure will go - * away. */ -struct display_info { - GnomeCanvasGroup *group; +struct edisplay_info { + struct display_info normal; + + /* Our extra items, the group is in normal */ GnomeCanvasItem *pitem; GnomeCanvasItem *text; - struct trackElement *track; - struct partElement *part; }; +#if 0 /* Structure to keep selection info */ struct sel_info { struct partElement *part; struct containerElement *con; }; +#endif - +#if 0 /* Drag and drop types */ static const GtkTargetEntry targets[] = { {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, }; +#endif /* All the buttons that we deal with */ -#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) +//#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) -#define CONP struct containerElement * +//#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) + MELYS_VIEW(mdisp)->vcp, x) #define tick_to_x(mdisp, tick) view_control_tick_to_x( \ - MELYS_TRACK_DISPLAY(mdisp)->vcp, tick) + MELYS_VIEW(mdisp)->vcp, tick) #define y_to_track(mdisp, y) view_control_y_to_thing( \ - MELYS_TRACK_DISPLAY(mdisp)->vcp, y) + MELYS_VIEW(mdisp)->vcp, y) #define track_to_y(mdisp, track) view_control_thing_to_y( \ - MELYS_TRACK_DISPLAY(mdisp)->vcp, track) + MELYS_VIEW(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 disp_scale_changed(MelysView *mview); static void display_draw(GtkWidget *widget, GdkRectangle *area); +static void disp_common_draw(MelysTrackDisplay *mdisp, int force); static void update_part_item(MelysTrackDisplay *mdisp, - struct trackElement *track, struct partElement *part); -static void disp_destroy(GtkObject *obj); -static void item_event(GtkWidget *widget, GdkEvent *event, gpointer data); -static void button_press(MelysTrackDisplay *mdisp, struct partElement *part, - GdkEventButton *event); -static void button_release(MelysTrackDisplay *mdisp, struct partElement *part, - GdkEventButton *event); -static void button_motion(MelysTrackDisplay *mdisp, struct partElement *part, - GdkEventMotion *event); -static void drag_setup(MelysTrackDisplay *mdisp, GdkEventMotion *event); -static void build_sel_list(MelysTrackDisplay *mdisp); -static void build_sel1(MelysTrackDisplay *mdisp, struct containerElement *c, - struct element *base); -static void sel_add_list(MelysTrackDisplay *mdisp, struct containerElement *c, - struct partElement *part); -static void clear_all_part_sel(MelysTrackDisplay *mdisp, gboolean clear); -static void sel_clear_part(MelysTrackDisplay *mdisp, struct partElement *part); -static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation); -static void set_scroll_region(MelysTrackDisplay *mdisp); + struct trackElement *track, struct partElement *part, int force); static void set_hscroll(MelysTrackDisplay *mdisp); +static void edisplay_info_free(gpointer _info); static void slice_cb(GtkWidget *w, gpointer data); static void join_cb(GtkWidget *w, gpointer data); static void delete_cb(GtkWidget *w, gpointer data); static void piano_cb(GtkWidget *w, gpointer data); static void part_prop_cb(GtkWidget *w, gpointer data); -static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, - gint y, guint time, gpointer user_data); -static void drag_data_send(GtkWidget *widget, GdkDragContext *context, - GtkSelectionData *selection_data, guint info, guint time, - gpointer data); -static struct outline_data *drag_enter(MelysTrackDisplay *mdisp, - GdkDragContext *context); -static gboolean drag_motion(GtkWidget *widget, GdkDragContext *context, - gint x, gint y, guint time, gpointer user_data); -static void drag_leave(GtkWidget *widget, GdkDragContext *context, guint time, - gpointer user_data); -static void drag_data_received(GtkWidget *widget, GdkDragContext *context, - gint wx, gint wy, GtkSelectionData *data, guint info, guint time, - gpointer user_data); -static void drag_end(GtkWidget *widget, GdkDragContext *drag_context, - gpointer user_data); -static void outline_data_free(gpointer data); - +static struct containerElement *disp_get_base(MelysView *mview, int nthing); +static int disp_get_nthing(MelysView *mview, struct element *elem); +static gboolean disp_drop_elem(MelysView *mview, struct element *elem, + int nthing); -static GtkVBoxClass *parent_class = NULL; -static gint melys_track_display_signals[LAST_SIGNAL]; +static MelysViewClass *parent_class = NULL; /* The menu for the display pane */ @@ -223,7 +187,7 @@ (GtkClassInitFunc) NULL, }; - mtype = gtk_type_unique(gtk_vbox_get_type(), &minfo); + mtype = gtk_type_unique(melys_view_get_type(), &minfo); } return mtype; @@ -231,34 +195,13 @@ /* * Create a new MelysTrackDisplay object. - * - * Arguments: - * vcp - Adjustments and scaling */ GtkWidget * -melys_track_display_new(ViewControl *vcp) +melys_track_display_new(void) { GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); - MelysTrackDisplay *mdisp; - - mdisp = (MelysTrackDisplay*)w; - mdisp->vcp = vcp; - - 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 *)vcp->vadj, "value-changed", - (GtkSignalFunc)disp_scroll, mdisp); - - gtk_object_ref((GtkObject*)vcp); - - melys_rule_set_adj(MELYS_RULE(mdisp->title), vcp); - - gtk_widget_set_usize(mdisp->title, 1, mdisp->vcp->vtitle); - - return GTK_WIDGET(mdisp); + return w; } /* @@ -270,70 +213,25 @@ static void melys_track_display_init(MelysTrackDisplay *mdisp) { - GnomeCanvas *canvas; - GtkWidget *title; + MelysView *mview = MELYS_VIEW(mdisp); GtkWidget *box; - mdisp->voffset = 0; - mdisp->hoffset = 0; - - mdisp->mdroot = NULL; - mdisp->song = NULL; - - mdisp->click_part = NULL; - mdisp->click_track = NULL; - mdisp->click_state = CLICK_INACTIVE; - - mdisp->sel_list = NULL; - box = gtk_vbox_new(0, 0); - title = (GtkWidget *)melys_rule_new(NULL); - -#undef AA -#ifdef AA - /* The aa canvas is buggy at present Oct 1999 */ - gtk_widget_push_visual(gdk_rgb_get_visual()); - gtk_widget_push_colormap(gdk_rgb_get_cmap()); - canvas = (GnomeCanvas *)gnome_canvas_new_aa(); -#else - gtk_widget_push_visual(gdk_imlib_get_visual()); - gtk_widget_push_colormap(gdk_imlib_get_colormap()); - canvas = (GnomeCanvas *)gnome_canvas_new(); -#endif - - mdisp->canvas = GTK_WIDGET(canvas); - mdisp->title = GTK_WIDGET(title); /* Create the pop up menu */ - mdisp->menu = gnome_popup_menu_new(displaymenu); + mview->menu = gnome_popup_menu_new(displaymenu); /* * Build up the pane. The title row has a fixed height but * expands to fill the horizontal space. The canvas expands * to fill the rest of the space. */ - gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); - gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); - gtk_container_add(GTK_CONTAINER(mdisp), box); - - gtk_widget_show_all(GTK_WIDGET(mdisp)); - - /* Set up a drop site for this widget */ - gtk_drag_dest_set(GTK_WIDGET(mdisp->canvas), GTK_DEST_DEFAULT_MOTION, - targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); - - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-drop", - GTK_SIGNAL_FUNC(drag_drop), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-get", - GTK_SIGNAL_FUNC(drag_data_send), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-received", - GTK_SIGNAL_FUNC(drag_data_received), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-motion", - GTK_SIGNAL_FUNC(drag_motion), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-leave", - GTK_SIGNAL_FUNC(drag_leave), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-end", - GTK_SIGNAL_FUNC(drag_end), mdisp); + gtk_box_pack_start(GTK_BOX(box), mview->ruler, 0, 0, 0); + gtk_box_pack_start(GTK_BOX(box), mview->canvas, 1, 1, 0); + gtk_box_pack_start(GTK_BOX(mdisp), box, 1, 1, 0); + + gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); + gtk_widget_show_all(GTK_WIDGET(box)); } /* @@ -347,183 +245,53 @@ { GtkObjectClass *object_class; GtkWidgetClass *widget_class; - GtkVBoxClass *vbox_class; + MelysViewClass *view_class; object_class = (GtkObjectClass *)klass; widget_class = (GtkWidgetClass *)klass; - vbox_class = (GtkVBoxClass *)klass; - - parent_class = gtk_type_class(gtk_vbox_get_type()); + view_class = (MelysViewClass *)klass; - gtk_object_class_add_signals(object_class, - melys_track_display_signals, LAST_SIGNAL); + parent_class = gtk_type_class(melys_view_get_type()); /* Set up all the overrides */ - object_class->destroy = disp_destroy; + //object_class->destroy = disp_destroy; - widget_class->size_allocate = disp_size_allocate; + //widget_class->size_allocate = disp_size_allocate; widget_class->draw = display_draw; + + view_class->scale_changed = disp_scale_changed; + view_class->get_nthing = disp_get_nthing; + view_class->drop_elem = disp_drop_elem; + view_class->get_base_from_pos = disp_get_base; } -/* - * Set the music description root. If there was an existing one - * it is freed first. Everything is reset to display the new - * song. - */ void melys_track_display_set_md_root(MelysTrackDisplay *mdisp, struct rootElement *root) { - - g_return_if_fail(root != NULL); - - if (mdisp->mdroot) - md_free((struct element *)mdisp->mdroot); - mdisp->mdroot = md_root_inc_ref(root); - - 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 */ -} - -void -melys_track_display_set_song(MelysTrackDisplay *mdisp, struct song *song) -{ - mdisp->song = song; - - g_assert(song->posadj); - mdisp->posadj = song->posadj; - gtk_object_ref((GtkObject *) mdisp->posadj); - - gtk_signal_connect_while_alive((GtkObject *)mdisp->posadj, - "value-changed", (GtkSignalFunc)song_pos_cb, mdisp, GTK_OBJECT(mdisp)); + MELYS_VIEW(mdisp)->viewcon = MD_CONTAINER(root); + MELYS_VIEW(mdisp)->vthings = root->tracks; } /* * The scaling has changed. Recalculate all sizes. - * - * Arguments: - * obj - This will be the vcp - * mdisp - Our info - */ -static void -scale_changed(GtkObject *obj, MelysTrackDisplay *mdisp) -{ - - /* Get the scroll to position correct */ - mdisp->hoffset = -1; - disp_scroll(mdisp->vcp->hadj, mdisp); - mdisp->voffset = -1; - disp_scroll(mdisp->vcp->vadj, mdisp); -} - -/* - * A scrollbar has been moved. So we have to set our current - * position and redraw. */ static void -disp_scroll(GtkAdjustment *adj, gpointer data) +disp_scale_changed(MelysView *mview) { - MelysTrackDisplay *mdisp = data; - GnomeCanvas *canvas; - int changed = 0; - - if (adj == mdisp->vcp->hadj) { - if ((int)adj->value != mdisp->hoffset) { - if (adj->value >= 0) { - changed = 1; - mdisp->hoffset = (int)adj->value; - } - } - } - if (adj == mdisp->vcp->vadj) { - if ((int)adj->value != mdisp->voffset) { - changed = 1; - mdisp->voffset = (int)(adj->value + 0.1); - } - } - - - if (changed) { - canvas = GNOME_CANVAS(mdisp->canvas); + if (parent_class->scale_changed) + (*parent_class->scale_changed)(mview); - gnome_canvas_scroll_to(canvas, - tick_to_x(mdisp, mdisp->hoffset), - mdisp->voffset * mdisp->vcp->vscale); - } + disp_common_draw(MELYS_TRACK_DISPLAY(mview), TRUE); } -/* - * This gets called when the song position pointer is updated. - * This could be because the user changed it in a different - * widget or during playback. - */ static void -song_pos_cb(GtkAdjustment *adj, gpointer data) +display_draw(GtkWidget *widget, GdkRectangle *area) { - MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); - GtkAdjustment *hadj; - ticktime_t t; - int x; - - hadj = mdisp->vcp->hadj; - t = (ticktime_t)mdisp->posadj->value; - x = tick_to_x(mdisp, t); - - if (x != tick_to_x(mdisp, mdisp->poffset)) { - int boundry; - int page_width; - - mdisp->poffset = t; - canvas_item_move_abs((GnomeCanvasItem*)mdisp->posline, - tick_to_x(mdisp, t), 0.0); - - /* - * First if this time is over the endtime then we are recording - * or otherwise increasing the length of the song. - * Increase the root duration to match, add on extra to - * avoid too many repeated calls -- it can be shrunk again - * later. - */ - if (t > MD_ENDTIME(mdisp->mdroot)) { - MD_SET_DURATION(mdisp->mdroot, t + hadj->page_size); - mdisp->posadj->upper = MD_ENDTIME(mdisp->mdroot); - set_scroll_region(mdisp); - } - - /* - * If we are just about to go off the end then shift the - * canvas over so that we are just over from the left. - * But if the line is already past the edge then don't - * scroll. This is so you can scroll by hand with out it - * always jumping back. - */ - page_width = x_to_tick(mdisp, - GTK_WIDGET(mdisp->canvas)->allocation.width); - boundry = page_width / 10; - - if (t - mdisp->hoffset > (ticktime_t)page_width - boundry && - t - mdisp->hoffset <= (ticktime_t)page_width) { - - hadj->value += page_width - 2*boundry; - - set_scroll_region(mdisp); - } - - /* - * This is a temporary way to ensure that we return to the - * beginning when starting playing. - */ - if (x < 5) {/*XXX*/ - hadj->value = 0; - set_scroll_region(mdisp); - } - } + disp_common_draw(MELYS_TRACK_DISPLAY(widget), FALSE); + GTK_WIDGET_CLASS(parent_class)->draw(widget, area); } /* @@ -531,44 +299,41 @@ * part. */ static void -display_draw(GtkWidget *widget, GdkRectangle *area) +disp_common_draw(MelysTrackDisplay *mdisp, int force) { int n; int p; - MelysTrackDisplay *mdisp = (MelysTrackDisplay *)widget; + MelysView *mview = MELYS_VIEW(mdisp); struct trackElement *track; struct partElement *part; /* note that this could be part or partref */ + struct rootElement *root; - set_scroll_region(mdisp); + set_hscroll(mdisp); - for (n = 0; n < mdisp->mdroot->tracks; n++) { - track = md_track_nth(mdisp->mdroot, n); + root = MD_ROOT(mview->viewcon); + for (n = 0; n < root->tracks; n++) { + track = md_track_nth(root, n); for (p = 0; p < MD_CONTAINER_LEN(track); p++) { part = (struct partElement *) MD_GET_INDEX(track, p); if (MD_IS_DESTROYED(part)) { /* This should not be happening */ - dprintf(0, "display_draw: part is destroyed!\n"); + dprintf(0, "disp_common_draw: part is destroyed!\n"); continue; } switch (MD_TYPE(part)) { case MD_TYPE_PART: case MD_TYPE_PARTREF: - update_part_item(mdisp, track, part); + update_part_item(mdisp, track, part, force); break; default: - dprintf(0, "Unexpexted type %d in display_draw", MD_TYPE(part)); + dprintf(0, "Unexpexted type %d in disp_common_draw", MD_TYPE(part)); break; } } } - - if (mdisp->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); - - GTK_WIDGET_CLASS(parent_class)->draw(widget, area); } /* @@ -581,24 +346,29 @@ */ static void update_part_item(MelysTrackDisplay *mdisp, struct trackElement *track, - struct partElement *part) + struct partElement *part, int force) { gboolean ref = FALSE; GnomeCanvasItem *item; MelysPartItem *pitem; - struct display_info *dinfo; + MelysView *mview; + struct edisplay_info *dinfo; + struct rootElement *root; char *pname; int state; g_return_if_fail(part != NULL && track != NULL); + mview = MELYS_VIEW(mdisp); + root = MD_ROOT(mview->viewcon); + if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) return; if (GTK_OBJECT_DESTROYED(mdisp)) return; - if (!MD_MODIFIED(mdisp->mdroot) && !MD_MODIFIED(part)) + if (!force && !MD_MODIFIED(root) && !MD_MODIFIED(part)) return; //printf("updating part root %d part %d\n", MD_MODIFIED(mdisp->mdroot), MD_MODIFIED(part)); @@ -621,13 +391,13 @@ else pname = ""; - dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); + dinfo = (struct edisplay_info *)g_dataset_get_data(part, mview->infostr); if (dinfo == NULL) { GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; GnomeCanvasItem *text; - rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_GROUP, NULL); @@ -657,26 +427,27 @@ * reference to the part, we use WREF calls to avoid * circular references. */ - dinfo = g_new(struct display_info, 1); + dinfo = g_new(struct edisplay_info, 1); gtk_object_ref((GtkObject*)group); - dinfo->group = group; + dinfo->normal.item = GTK_OBJECT(group); gtk_object_ref((GtkObject*)item); dinfo->pitem = item; gtk_object_ref((GtkObject*)text); dinfo->text = text; MD_WREF(part); - dinfo->part = part; + dinfo->normal.elem = MD_ELEMENT(part); MD_WREF(track); - dinfo->track = track; + dinfo->normal.con = MD_CONTAINER(track); - g_dataset_set_data_full(part, "display-info", - dinfo, display_info_free); + g_dataset_set_data_full(part, mview->infostr, + dinfo, edisplay_info_free); + gtk_object_set_data(GTK_OBJECT(group), mview->infostr, dinfo); MD_WREF(part); gtk_object_set_data_full(GTK_OBJECT(group), "part", part, (GtkDestroyNotify)md_wfree); gtk_signal_connect_while_alive(GTK_OBJECT(group), "event", - item_event, mdisp, (GtkObject*)mdisp); + GTK_SIGNAL_FUNC(melys_view_item_event), mdisp, (GtkObject*)mdisp); } g_assert(dinfo != NULL); @@ -689,7 +460,7 @@ * at around 0,0 within the group. */ /* The whole group is positioned */ - gnome_canvas_item_set((GnomeCanvasItem *)dinfo->group, + gnome_canvas_item_set((GnomeCanvasItem *)dinfo->normal.item, "x", (double) tick_to_x(mdisp, MD_TIME(part)), "y", (double) track_to_y(mdisp, MD_TRACKLIKE(track)->number), NULL); @@ -699,7 +470,7 @@ "text", pname, "fill_color_gdk", >K_WIDGET(mdisp)->style->fg[state], "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mdisp->vcp->vheight-2, + "clip_height", (double) mview->vcp->vheight-2, NULL); /* This size of the part is set here */ @@ -707,492 +478,12 @@ "x1", 0.0, "y1", 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), - "y2", (double) mdisp->vcp->vheight, + "y2", (double) mview->vcp->vheight, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], NULL); } /* - * The whole display widget has been destroyed. This should - * lead to all associated resources being freed. - */ -static void -disp_destroy(GtkObject *obj) -{ - MelysTrackDisplay *mdisp; - - g_return_if_fail(IS_MELYS_TRACK_DISPLAY(obj)); - - mdisp = (MelysTrackDisplay*)obj; - - clear_all_part_sel(mdisp, FALSE); - - if (mdisp->posline) - gtk_object_destroy(GTK_OBJECT(mdisp->posline)); - - if (mdisp->vcp) { - gtk_object_unref(GTK_OBJECT(mdisp->vcp)); - mdisp->vcp = NULL; - } - if (mdisp->posadj) { - gtk_object_unref(GTK_OBJECT(mdisp->posadj)); - mdisp->posadj = NULL; - } - - if (mdisp->mdroot) { - md_free(MD_ELEMENT(mdisp->mdroot)); - mdisp->mdroot = NULL; - } - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); -} - -/* - * An event has been received on one of the part - * representations on the display canvas. - * All events come through here, so we switch out to more - * specific routines once we have worked out what the event is. - * - * Arguments: - * widget - This will be a canvas group - * event - The event - * data - This will be the MelysTrackDisplay - */ -static void -item_event(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - MelysTrackDisplay *mdisp = data; - struct partElement *part; - GdkEventButton *bevent = (GdkEventButton *)event; - GdkEventMotion *mevent = (GdkEventMotion *)event; - - /* Get the display data from the group */ - part = gtk_object_get_data(GTK_OBJECT(widget), "part"); - g_assert(part); - - dprintf(3, "event %d for part %s", event->type, part->name); - - switch (event->type) { - case GDK_BUTTON_PRESS: - /* Save the original location */ - mdisp->click_part = part; - mdisp->click_tick = x_to_tick(mdisp, event->button.x); - mdisp->click_ntrack = y_to_track(mdisp, event->button.y); - mdisp->click_track = md_track_nth(mdisp->mdroot, mdisp->click_ntrack); - - button_press(mdisp, part, bevent); - break; - - case GDK_2BUTTON_PRESS: - part_prop_box(part, mdisp->song, 0); - break; - - case GDK_BUTTON_RELEASE: - button_release(mdisp, part, bevent); - break; - - case GDK_MOTION_NOTIFY: - if (mevent->state & ALL_BUTTON_MASK) - button_motion(mdisp, part, mevent); - break; - default: - break; - } -} - -/* - * Action to take when button 1 is pressed. - */ -static void -button_press(MelysTrackDisplay *mdisp, struct partElement *part, - GdkEventButton *event) -{ - if (mdisp->click_state != CLICK_INACTIVE) { - mdisp->click_state = CLICK_ERROR; - return; - } - - switch (event->button) { - case 1: - mdisp->click_state = CLICK_BUTTON1_DOWN; - break; - - case 2: - mdisp->click_state = CLICK_BUTTON2_DOWN; - break; - - case 3: - /* - * We checked that we were in the correct state, but - * do not change state as the popup menu takes - * control and we never see a button release. - */ - gnome_popup_menu_do_popup(mdisp->menu, NULL, NULL, event, mdisp); - break; - } -} - -/* - * Button 1 has been pressed on a part item. This selects the - * item. - */ -static void -button_release(MelysTrackDisplay *mdisp, struct partElement *part, - GdkEventButton *event) -{ - int mask; - struct display_info *dinfo; - - dinfo = g_dataset_get_data(part, "display-info"); - - if (mdisp->click_state == CLICK_ERROR) { - - mask = event->state & ALL_BUTTON_MASK; - - switch (event->button) { - case 1: mask &= ~GDK_BUTTON1_MASK; break; - case 2: mask &= ~GDK_BUTTON2_MASK; break; - case 3: mask &= ~GDK_BUTTON3_MASK; break; - } - - /* - * We had an error, now if this is the last button - * to be released then we can clear back to inactive state. - */ - if (mask == 0) - mdisp->click_state = CLICK_INACTIVE; - return; - } - - switch (event->button) { - case 1: - - dprintf2("Button at %f,%f\n", event->x, event->y); - if (!(event->state & GDK_CONTROL_MASK)) - clear_all_part_sel(mdisp, TRUE); - - if (MD_SELECTED(part)) { - MD_SET_SELECTED(part, FALSE); - sel_clear_part(mdisp, part); - } else { - MD_SET_SELECTED(part, TRUE); - sel_add_list(mdisp, MD_CONTAINER(dinfo->track), part); - } - - update_part_item(mdisp, dinfo->track, part); - - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) - mdisp->click_state = CLICK_INACTIVE; - break; - - case 2: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) - mdisp->click_state = CLICK_INACTIVE; - break; - - case 3: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) - mdisp->click_state = CLICK_INACTIVE; - break; - } -} - -/* - * Motion when a button is pressed down. Drag and drop on button - * 1, gesture based editing on button 2. - */ -static void -button_motion(MelysTrackDisplay *mdisp, struct partElement *part, - GdkEventMotion *event) -{ - - switch (mdisp->click_state) { - case CLICK_BUTTON1_DOWN: - drag_setup(mdisp, event); - mdisp->click_state = CLICK_INACTIVE; - break; - default: - break; - } -} - -/* - */ -static void -drag_setup(MelysTrackDisplay *mdisp, GdkEventMotion *event) -{ - GtkTargetList *tlist; - struct partElement *clickpart; - struct drag_element_data *dragdata; - struct sel_info selinfo; - GList *list; - int len; - int i; - - tlist = gtk_target_list_new(targets, NELEM(targets)); - - clickpart = mdisp->click_part; - - /* - * If the part that was click was selected, then we move all - * selected parts. If it wasn't then we just move the part that - * was clicked. - */ - if (MD_SELECTED(clickpart)) { - len = g_list_length(mdisp->sel_list); - list = mdisp->sel_list; - } else { - - /* - * Not moving the selected parts. Just create a - * temporary list of the single part. - */ - len = 1; - selinfo.part = clickpart; - selinfo.con = (CONP) md_track_nth(mdisp->mdroot, - mdisp->click_ntrack); - - list = g_list_append(NULL, &selinfo); - } - - dragdata = g_new0(struct drag_element_data, len); - - for (i = 0; i < len; i++) { - int ntrack; - struct sel_info *sinfo; - - sinfo = g_list_nth_data(list, i); - ntrack = MD_TRACK_NUMBER(sinfo->con); - - dragdata[i].element = MD_ELEMENT(sinfo->part); - dragdata[i].con = sinfo->con; - dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick; - dragdata[i].thing_offset = ntrack - mdisp->click_ntrack; - dragdata[i].tick_len = MD_DURATION(sinfo->part); - } - dragdata[0].len = len; - dragdata[0].data_size = sizeof(*dragdata); - - if (list != mdisp->sel_list) - g_list_free(list); - - gtk_object_set_data_full(GTK_OBJECT(mdisp->canvas), "drag-element-data", - dragdata, g_free); - gtk_object_set_data(GTK_OBJECT(mdisp->canvas), "drag-element-data-len", - GINT_TO_POINTER(len)); - - gtk_drag_begin(GTK_WIDGET(mdisp->canvas), - tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, - 1 /* The button number */, (GdkEvent*)event); - - gtk_target_list_unref(tlist); -} - -/* - * Build up a list of all the selected parts. - */ -static void -build_sel_list(MelysTrackDisplay *mdisp) -{ - struct element *el; - int i; - - clear_all_part_sel(mdisp, FALSE); - - for (i = 0; i < MD_CONTAINER_LEN(mdisp->mdroot); i++) { - el = MD_GET_INDEX(mdisp->mdroot, i); - build_sel1(mdisp, MD_CONTAINER(mdisp->mdroot), el); - } -} - -/* - * Helper routine for build_sel_list that examines a single - * element and adds it to the selection list if required. - */ -static void -build_sel1(MelysTrackDisplay *mdisp, struct containerElement *c, - struct element *base) -{ - struct element *el; - int i; - - if (base->type == MD_TYPE_PART || base->type == MD_TYPE_PARTREF) { - if (MD_SELECTED(base)) - sel_add_list(mdisp, c, MD_PART(base)); - } - - if (iscontainer(base)) { - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - build_sel1(mdisp, MD_CONTAINER(base), el); - } - } -} - -/* - * Add a record of a part selection to the selection list. - */ -static void -sel_add_list(MelysTrackDisplay *mdisp, struct containerElement *c, - struct partElement *part) -{ - struct sel_info *info; - - info = g_new(struct sel_info, 1); - - MD_REF(part); - MD_REF(c); - info->part = part; - info->con = c; - - mdisp->sel_list = g_list_append(mdisp->sel_list, info); -} - -/* - * Clear the selection status on all parts. - * - * Arguments: - * mdisp - this will be the mdisp structure - */ -static void -clear_all_part_sel(MelysTrackDisplay *mdisp, gboolean clear) -{ - GList *list; - - while (mdisp->sel_list) { - struct sel_info *info; - - list = g_list_first(mdisp->sel_list); - info = list->data; - if (clear) - MD_SET_SELECTED(info->part, FALSE); - sel_clear_part(mdisp, info->part); - } -} - -/* - * Clear the selection status of the specified part . - */ -static void -sel_clear_part(MelysTrackDisplay *mdisp, struct partElement *part) -{ - GList *list; - struct display_info *dinfo; - struct sel_info *info; - - /* Find the sel_info for this part */ - list = g_list_first(mdisp->sel_list); - do { - info = list->data; - if (info->part == part) - break; - } while ((list = g_list_next(list)) != NULL); - - g_assert(list != NULL); - - /* Remove from list */ - mdisp->sel_list = g_list_remove(mdisp->sel_list, info); - /* Now update the display */ - if (!MD_IS_DESTROYED(part)) { - dinfo = (struct display_info *)g_dataset_get_data(part, - "display-info"); - - if (dinfo) - update_part_item(mdisp, dinfo->track, dinfo->part); - } - - MD_UNREF(info->part); - MD_UNREF(info->con); -} - -/* - * Intercept the size allocation routine to set our scroll - * region. The region must at least as large as the allocated - * space and also large enough to hold the complete song. - */ -static void -disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation) -{ - MelysTrackDisplay *mdisp; - GnomeCanvas *canvas; - - g_return_if_fail(widget != NULL); - g_return_if_fail(IS_MELYS_TRACK_DISPLAY(widget)); - g_return_if_fail(allocation != NULL); - - /* Do the real work first */ - if (GTK_WIDGET_CLASS(parent_class)->size_allocate) - (GTK_WIDGET_CLASS(parent_class)->size_allocate)(widget, allocation); - - mdisp = (MelysTrackDisplay *)widget; - canvas = GNOME_CANVAS(mdisp->canvas); - - if (GTK_WIDGET_REALIZED(widget)) { - GnomeCanvasItem *item; - - item = (GnomeCanvasItem *)mdisp->posline; - if (item == NULL) { - item = gnome_canvas_item_new(gnome_canvas_root(canvas), - GNOME_TYPE_CANVAS_LINE, - NULL); - mdisp->posline = (gpointer)item; - } - } -} - -/* - * Set the canvas scrolling region. The complete area - * required to show the current song at the current scaling is - * calculated. This is the scroll region for the canvas and the - * canvas will take care of allowing that regions to be seen in - * conjunction with our scroll bars. - */ -static void -set_scroll_region(MelysTrackDisplay *mdisp) -{ - int height; - GnomeCanvas *canvas = GNOME_CANVAS(mdisp->canvas); - GnomeCanvasPoints *points; - - if (!GTK_WIDGET_REALIZED(mdisp)) - return; - - /* It is our job to modify the page_size for the horizontal scroll */ - set_hscroll(mdisp); - - /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mdisp->canvas)->allocation.height; - - if (height < mdisp->mdroot->tracks * mdisp->vcp->vscale) { - int last; - int extra; - - last = (int)(mdisp->vcp->vadj->upper - mdisp->vcp->vadj->page_size)/mdisp->vcp->vscale; - extra = height - last; - height = mdisp->mdroot->tracks * mdisp->vcp->vscale + extra; - } - - gnome_canvas_set_scroll_region(canvas, - 0.0, 0.0, - mdisp->vcp->hadj->upper, - height - ); - - points = gnome_canvas_points_new(2); - points->coords[0] = 0.0; - points->coords[1] = 0.0; - points->coords[2] = 0.0; - points->coords[3] = height; - - gnome_canvas_item_set((GnomeCanvasItem *)mdisp->posline, - "points", points, - NULL); - - gnome_canvas_points_unref(points); -} - -/* * We own the horizontal adjustment in the track display. * Therefore set the bounds and keep the value correct here. * The range is set to the duration of the piece plus a full width @@ -1203,21 +494,24 @@ { int pageticks; int ticklen; + MelysView *mview; GtkAdjustment *adj; if (!GTK_WIDGET_REALIZED(mdisp)) return; - adj = mdisp->vcp->hadj; + mview = MELYS_VIEW(mdisp); - pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp->canvas)->allocation.width); - ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; + adj = mview->vcp->hadj; + + pageticks = x_to_tick(mdisp, GTK_WIDGET(mview->canvas)->allocation.width); + ticklen = MD_ENDTIME(mview->viewcon) + pageticks; adj->page_size = pageticks; adj->page_increment = adj->page_size; adj->step_increment = x_to_tick(mdisp, 20); - view_control_set_range(mdisp->vcp, VC_HORIZONTAL, 0.0, ticklen); + view_control_set_range(mview->vcp, VC_HORIZONTAL, 0.0, ticklen); if (adj->value > adj->upper - adj->page_size) adj->value = adj->upper - adj->page_size; @@ -1225,19 +519,15 @@ gtk_adjustment_value_changed(adj); } -void -display_info_free(gpointer _info) +static void +edisplay_info_free(gpointer _info) { - struct display_info *info = _info; + struct edisplay_info *einfo = _info; - gtk_object_destroy((GtkObject *)info->group); - gtk_object_unref((GtkObject*)info->group); - gtk_object_unref((GtkObject*)info->pitem); - gtk_object_unref((GtkObject*)info->text); - MD_WUNREF(info->track); - MD_WUNREF(info->part); + gtk_object_unref((GtkObject*)einfo->pitem); + gtk_object_unref((GtkObject*)einfo->text); - g_free(_info); + view_display_info_free((struct display_info *)einfo); } /* @@ -1251,16 +541,17 @@ slice_cb(GtkWidget *w, gpointer data) { MelysTrackDisplay *mdisp = data; + MelysView *mview = data; struct partElement *part; struct partElement *newpart; struct trackElement *track; ticktime_t t; - t = mdisp->click_tick; - t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); + t = mview->click_tick; + t = md_snap_tick(mview->tempomap, t, mview->snap); - part = mdisp->click_part; - track = mdisp->click_track; + part = MD_PART(mview->click_elem); + track = MD_TRACK(mview->click_base); if (MD_IS_DESTROYED(part)) return; @@ -1270,8 +561,8 @@ md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); - update_part_item(mdisp, track, part); - update_part_item(mdisp, track, newpart); + update_part_item(mdisp, track, part, FALSE); + update_part_item(mdisp, track, newpart, FALSE); } /* @@ -1282,18 +573,19 @@ join_cb(GtkWidget *w, gpointer data) { MelysTrackDisplay *mdisp = data; + MelysView *mview = data; struct partElement *part; struct trackElement *track; ticktime_t t; - t = mdisp->click_tick; + t = mview->click_tick; - part = mdisp->click_part; - track = mdisp->click_track; + part = MD_PART(mview->click_elem); + track = MD_TRACK(mview->click_base); md_part_join(MD_CONTAINER(track), part); - update_part_item(mdisp, track, part); + update_part_item(mdisp, track, part, FALSE); } /* @@ -1302,29 +594,32 @@ static void delete_cb(GtkWidget *w, gpointer data) { - MelysTrackDisplay *mdisp = data; + MelysView *mview = data; struct partElement *part; struct trackElement *track; + struct element *el; - part = mdisp->click_part; - track = mdisp->click_track; + part = MD_PART(mview->click_elem); + track = MD_TRACK(mview->click_base); if (MD_SELECTED(part)) { - GList *list; - - while ((list = mdisp->sel_list) != NULL) { - struct sel_info *info; + GSList *sellist; + GSList *li; - info = list->data; + sellist = md_build_sel(NULL, MD_ELEMENT(track), MD_TYPE_PART); + sellist = md_build_sel(sellist, MD_ELEMENT(track), MD_TYPE_PARTREF); - /* have to unselect as this holds a reference - * to the on-screen item */ - sel_clear_part(mdisp, info->part); + li = sellist; + while (li) { + + el = li->data; + md_clear_data(el); + md_remove(el->con, el); + li = li->next; + } - md_clear_data(MD_ELEMENT(info->part)); - md_remove(info->con, (struct element *)info->part); + g_slist_free(sellist); - } } else { md_clear_data(MD_ELEMENT(part)); md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); @@ -1334,11 +629,11 @@ static void piano_cb(GtkWidget *w, gpointer data) { - MelysTrackDisplay *mdisp = data; + MelysView *mview = data; extern void create_piano(struct song *, struct containerElement *); /* borrow routine from trackinfo */ - create_piano(mdisp->song, MD_CONTAINER(mdisp->click_part)); + create_piano(mview->song, MD_CONTAINER(mview->click_elem)); } /* @@ -1347,383 +642,59 @@ static void part_prop_cb(GtkWidget *w, gpointer data) { - MelysTrackDisplay *mdisp = data; + MelysView *mview = data; - part_prop_box(mdisp->click_part, mdisp->song, 0); + part_prop_box(MD_PART(mview->click_elem), mview->song, 0); } /* - * A callback that is called when a drop is made. We study the - * context and decide which format to request. Then we request - * the data. - * - * Arguments: - * widget - The destination canvas widget + * Return the base element for the specified thing position. + * This is a track. It is not just the containing element of the + * part as the part may be inside another part. */ -static gboolean -drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y, - guint time, gpointer user_data) +static struct containerElement * +disp_get_base(MelysView *mview, int nthing) { + struct rootElement *root; + struct trackElement *track; - dprintf(2, "drag drop on %s 0x%x at %d,%d\n", - gtk_type_name(GTK_OBJECT_TYPE(widget)), widget, x, y); - - /* We want the internal element format */ - gtk_drag_get_data(widget, context, MelysElemAtom, time); - - return TRUE; -} - -/* - * This is a callback that is executed when the drag_data_get - * signal is received. This means that we are being asked to - * send the data to the destination. It sends the element that - * is being dragged to the receiving end. - * - * Arguments: - * widget - The source widget - * context - The drag context - * selection_data - The data is set into here - * info - Identification of transfer type - * time - The associated time - * data - The mdisp widget - */ -static void -drag_data_send(GtkWidget *widget, GdkDragContext *context, - GtkSelectionData *selection_data, guint info, guint time, - gpointer data) -{ - MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); - struct partElement *part; - struct drag_element_data *dragdata; - int len; - - if (info != MELYS_ELEM_ATOM_ID) { - g_warning("unexpected drag type received"); - return; - } - - part = mdisp->click_part; + root = MD_ROOT(mview->viewcon); + track = md_track_nth(root, nthing); - dragdata = gtk_object_get_data(GTK_OBJECT(mdisp->canvas), - "drag-element-data"); - len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp->canvas), - "drag-element-data-len")); - - gtk_selection_data_set(selection_data, - selection_data->target, 8, - (guchar *)dragdata, len * sizeof(*dragdata)); + return MD_CONTAINER(track); } -/* - * When a drag enters this widget, we construct a set of - * outlines that represent the position of the drag. The - * following drag motion events will be used to move these - * outlines around. - * Keep in mind that the source of the drag could be a different - * type of widget. It could also be from a different - * application and even from a different machine, although - * this isn't supported yet. - */ -static struct outline_data * -drag_enter(MelysTrackDisplay *mdisp, GdkDragContext *context) +static int +disp_get_nthing(MelysView *mview, struct element *elem) { - GtkWidget *srcw; - GnomeCanvasGroup *group; - struct outline_data *oldata; - struct drag_element_data *dragdata; - struct drag_element_data *dp; - long tick_offset; - int track_offset; - int i; - int len; - - srcw = gtk_drag_get_source_widget(context); - if (srcw == NULL) { - /* Another app probably which we don't yet deal with */ - return NULL; - } - - oldata = g_new(struct outline_data, 1); - dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data"); - len = dragdata[0].len; - - track_offset = tick_offset = 0; - - /* - * Calculate the offset from the click point to the top left - * hand corner of the rectangle that would enclose all the parts. - */ - for (i = 0; i < len; i++) { - dp = dragdata + i; - track_offset = MIN(track_offset, dp->thing_offset); - tick_offset = MIN(tick_offset, dp->tick_offset); + while (elem) { + if (MD_TYPE(elem) == MD_TYPE_TRACK) + return MD_TRACK_NUMBER(elem); + elem = MD_ELEMENT(elem->con); } - - /* - * All the outlines are placed into this group so that they - * can be moved as a unit to follow the cursor. - */ - group = (GnomeCanvasGroup *) gnome_canvas_item_new( - gnome_canvas_root((GnomeCanvas*)mdisp->canvas), - GNOME_TYPE_CANVAS_GROUP, - "x", 0.0, - "y", 0.0, - NULL); - - /* We now have enough information to fill the outline data */ - oldata->group = group; - oldata->xoffset = tick_to_x(mdisp, tick_offset); - oldata->yoffset = track_to_y(mdisp, track_offset); - - /* If this is say a note, then we need to squash down */ - if (!iscontainer(dragdata[0].element)) - oldata->yoffset /= 128; - - /* - * Create the individual outlines for each part that is being - * moved. - */ - for (i = 0; i < len; i++) { - int x1, y1; - int squeeze; - - dp = dragdata + i; - - if (iscontainer(dp->element)) - squeeze = 1; - else - squeeze = 128; - - x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset); - y1 = track_to_y(mdisp, dp->thing_offset - track_offset); - - gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, - "x1", (double) x1, - "y1", (double) y1/squeeze, - "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), - "y2", (double) (y1 + mdisp->vcp->vheight) / squeeze, - "width_pixels", 1, - "outline_color", "yellow", - NULL); - } - - /* Save for later use */ - gtk_object_set_data_full(GTK_OBJECT(mdisp), "outline-data", oldata, - (GtkDestroyNotify)outline_data_free); - - return oldata; + g_warning("disp_get_nthing couldn't find thing"); + return 0; } /* - * Move around the drag outline group so that the user can tell - * where the drag will land. + * Deal with dropping an element onto us. The nthing parameter + * is the track to drop onto. */ static gboolean -drag_motion(GtkWidget *widget, GdkDragContext *context, gint x, gint y, - guint time, gpointer user_data) +disp_drop_elem(MelysView *mview, struct element *elem, int nthing) { - MelysTrackDisplay *mdisp = user_data; - struct outline_data *oldata; - double wx, wy; - - gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), - (double)x, (double)y, &wx, &wy); - - oldata = gtk_object_get_data(GTK_OBJECT(mdisp), "outline-data"); - if (oldata == NULL) - oldata = drag_enter(mdisp, context); - if (oldata == NULL) - return FALSE; - - wx += oldata->xoffset; - wy += oldata->yoffset - mdisp->vcp->vheight/2; - - if (wx < 0) wx = 0; - if (wy < 0) wy = 0; - - canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); - - return TRUE; -} - -/* - * This gets called when the drag leaves our window and also at - * the end of the drag. So its a good place to tidy up in. - */ -static void -drag_leave(GtkWidget *widget, GdkDragContext *context, guint time, - gpointer user_data) -{ - MelysTrackDisplay *mdisp = user_data; - - gtk_object_remove_data(GTK_OBJECT(mdisp), "outline-data"); -} - -/* - * This routine is called when a signal arrives on the - * destination widget to say that data has actually been - * received. - * - * Arguments: - * widget - The destination widget - * context - The drag context - * wx - The drop point in window coords (I think) - * wy - The drop point - * data - Data from the other side - * info - The type of drag - * time - Time of event - * user_data - User data, probably not used - */ -static void -drag_data_received(GtkWidget *widget, GdkDragContext *context, gint wx, - gint wy, GtkSelectionData *data, guint info, guint time, - gpointer user_data) -{ - MelysTrackDisplay *mdisp; - struct drag_element_data *dragdata; - struct drag_element_data *dp; - struct partElement *newpart; struct trackElement *track; - ticktime_t t; - int drop_track; - int drop_tick; - int track_start = 0; - int tick_start = 0; - int minoff = 0; - int snapadj; - gboolean needrm = FALSE; - int x, y; - double dx, dy; - int len; - int i; - - mdisp = MELYS_TRACK_DISPLAY(user_data); - - /* We are given window coordinate, so convert to world coords */ - gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), - wx, wy, &dx, &dy); - x = (int)dx; - y = (int)dy; - - dprintf(2, "data received len %d %p, at %d,%d", - data->length, *(char **)data->data,x, y); - - drop_track = y_to_track(mdisp, y); - drop_tick = x_to_tick(mdisp, x); - - - len = data->length / sizeof(struct drag_element_data); - dragdata = (struct drag_element_data *)data->data; - - /* - * Do a first pass through the elements. We must either do - * them all or do none of them. If the user has droped a set - * of parts such that one of them would be before the start - * of the canvas then we must offset them all by the exact amount - * to keep all parts on the canvas. - */ - for (i = 0; i < len; i++) { - dp = dragdata+i; - if (dp->element->type != MD_TYPE_PART) - goto error; - - /* Check and adjust for droping before the beginning */ - if (dp->thing_offset + drop_track < 0) - track_start = MIN(track_start, dp->thing_offset + drop_track); - - /* Check and adjust for droping before the beginning */ - if (dp->tick_offset + drop_tick < 0) - tick_start = MIN(tick_start, dp->tick_offset + drop_tick); - - minoff = MIN(minoff, dp->tick_offset); - } - - drop_tick -= tick_start; - - snapadj = md_snap_tick(md_get_tempomap(mdisp->mdroot), minoff + drop_tick, mdisp->snap) - (minoff + drop_tick); - - md_undo_begin_set(MD_UNDO(mdisp->mdroot)); - - for (i = 0; i < len; i++) { - int tn; - - dp = dragdata + i; - - switch (context->action) { - case GDK_ACTION_MOVE: - newpart = MD_PART(dp->element); - - MD_REF(newpart); - md_remove(dp->con, dp->element); - - needrm = TRUE; - break; - - case GDK_ACTION_COPY: - newpart = MD_PART(md_copy(dp->element)); - MD_REF(newpart); - break; + struct rootElement *root; - default: - newpart = NULL; - g_assert_not_reached(); - } - - tn = drop_track + dp->thing_offset - track_start; - - /* Make sure that the track exists and create it if not */ - md_ensure_track(mdisp->mdroot, tn); - track = md_track_nth(mdisp->mdroot, tn); - - - t = snapadj + drop_tick + dp->tick_offset; - g_assert(t >= 0); - - /* - * The new part should have its time and devchan set to - * the new values. It is then added to the track. - */ - md_change_time(MD_ELEMENT(newpart), t); - md_set_devchan(MD_ELEMENT(newpart), MD_DEVCHAN(track)); - md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); - - MD_UNREF(newpart); - - md_clear_data(MD_ELEMENT(newpart)); - update_part_item(mdisp, track, newpart); - } - - gtk_drag_finish(context, TRUE, needrm, time); - md_undo_end_set(MD_UNDO(mdisp->mdroot)); - md_shrink(mdisp->mdroot); - - build_sel_list(mdisp); - - if (mdisp->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); - song_view_update(mdisp->song); - return; + root = MD_ROOT(mview->viewcon); - error: - gtk_drag_finish(context, FALSE, FALSE, time); -} - -static void -drag_end(GtkWidget *widget, GdkDragContext *drag_context, gpointer user_data) -{ - MelysTrackDisplay *mdisp = user_data; - - gtk_object_remove_data(GTK_OBJECT(mdisp), "drag-element-data"); - build_sel_list(mdisp); -} - -static void -outline_data_free(gpointer data) -{ - struct outline_data *od = data; + if (MD_TYPE(elem) == MD_TYPE_PART) { + md_ensure_track(root, nthing); + track = md_track_nth(MD_ROOT(mview->viewcon), nthing); + md_add_sort(MD_CONTAINER(track), elem); + } else + return FALSE; - gtk_object_destroy(GTK_OBJECT(od->group)); - g_free(od); + return TRUE; } diff -rNu melys-0.1.6/widgets/melystrackdisplay.m melys-0.1.7/widgets/melystrackdisplay.m --- melys-0.1.6/widgets/melystrackdisplay.m Sun Nov 28 14:12:55 1999 +++ melys-0.1.7/widgets/melystrackdisplay.m Mon Nov 29 15:31:55 1999 @@ -35,6 +35,8 @@ >>header libgnomeui/gnome-popup-menu.h >>header viewcontrol.h +>>header melysscroll.h +>>header melysview.h >>header melystrack.h >>header melyspartitem.h >>header melwidgets.h @@ -47,10 +49,12 @@ >>header song.h >>header md.h ->>gtkobject melys_track_display MelysTrackDisplay gtk_vbox GtkVBox +>>set nosignals +>>gtkobject melys_track_display melys_view >>headerdef @header +#if 0 /* Mouse click state */ enum click_state { CLICK_INACTIVE, @@ -62,109 +66,63 @@ CLICK_ERROR }; +#endif struct _MelysTrackDisplay { - GtkVBox vbox; - - /* Adjustments and scales */ - ViewControl *vcp; - - /* The adjustments for scrolling */ - GtkAdjustment *posadj; /* Song position adjustment */ - - /* Amount of vertical scrolling, in tracks (you never see half a track) */ - int voffset; - /* Horizontal offset, in ticks */ - int hoffset; - /* Play position offset, in ticks */ - int poffset; - - /* - * The amount of vertical space used by tracks is under control of - * the parent MelysTrack widget. This is because we must be in - * sync between MelysTrackInfo and MelysTrackDisplay. - */ + MelysView melys_view; - /* The snap to grid setting */ - int snap; - - /* The actual composition that is being displayed */ - struct rootElement *mdroot; - struct song *song; - - /* The sub-widgets that make up this widget */ - GtkWidget *canvas; - GtkWidget *title; - gpointer posline; - - GtkWidget *menu; - - /* Selected parts */ - GList *sel_list; - - /* Saved click position and state information */ - struct partElement *click_part; /* Part that was click on */ - ticktime_t click_tick; /* Clicked tick position */ - struct trackElement *click_track; /* Clicked track */ - int click_ntrack; /* Clicked track position */ - enum click_state click_state; /* mouse state */ }; struct _MelysTrackDisplayClass { - GtkVBoxClass parent_class; + MelysViewClass parent_class; }; >>extern -/* Signals that this widget creates */ -enum { - LAST_SIGNAL -}; - /* * The different canvas items that go together to make * up a part on the display. - * In the future this may just be the one item that holds - * the text etc, and so the need for this structure will go - * away. */ -struct display_info { - GnomeCanvasGroup *group; +struct edisplay_info { + struct display_info normal; + + /* Our extra items, the group is in normal */ GnomeCanvasItem *pitem; GnomeCanvasItem *text; - struct trackElement *track; - struct partElement *part; }; +#if 0 /* Structure to keep selection info */ struct sel_info { struct partElement *part; struct containerElement *con; }; +#endif - +#if 0 /* Drag and drop types */ static const GtkTargetEntry targets[] = { {MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID}, }; +#endif /* All the buttons that we deal with */ -#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) +//#define ALL_BUTTON_MASK (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK) -#define CONP struct containerElement * +//#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) + MELYS_VIEW(mdisp)->vcp, x) #define tick_to_x(mdisp, tick) view_control_tick_to_x( \ - MELYS_TRACK_DISPLAY(mdisp)->vcp, tick) + MELYS_VIEW(mdisp)->vcp, tick) #define y_to_track(mdisp, y) view_control_y_to_thing( \ - MELYS_TRACK_DISPLAY(mdisp)->vcp, y) + MELYS_VIEW(mdisp)->vcp, y) #define track_to_y(mdisp, track) view_control_thing_to_y( \ - MELYS_TRACK_DISPLAY(mdisp)->vcp, track) + MELYS_VIEW(mdisp)->vcp, track) >>extern -a @@ -209,33 +167,14 @@ >>function melys_track_display_new GtkWidget * -ViewControl *vcp; Adjustments and scaling >>description Create a new MelysTrackDisplay object. >>code GtkWidget *w = GTK_WIDGET(gtk_type_new(melys_track_display_get_type())); - MelysTrackDisplay *mdisp; - - mdisp = (MelysTrackDisplay*)w; - - mdisp->vcp = vcp; - - 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 *)vcp->vadj, "value-changed", - (GtkSignalFunc)disp_scroll, mdisp); - - gtk_object_ref((GtkObject*)vcp); - melys_rule_set_adj(MELYS_RULE(mdisp->title), vcp); - - gtk_widget_set_usize(mdisp->title, 1, mdisp->vcp->vtitle); - - return GTK_WIDGET(mdisp); + return w; >>function melys_track_display_init @@ -244,70 +183,26 @@ >>description Initialise the MelysTrackDisplay. >>code - GnomeCanvas *canvas; - GtkWidget *title; + MelysView *mview = MELYS_VIEW(mdisp); GtkWidget *box; - mdisp->voffset = 0; - mdisp->hoffset = 0; - - mdisp->mdroot = NULL; - mdisp->song = NULL; - - mdisp->click_part = NULL; - mdisp->click_track = NULL; - mdisp->click_state = CLICK_INACTIVE; - - mdisp->sel_list = NULL; - box = gtk_vbox_new(0, 0); - title = (GtkWidget *)melys_rule_new(NULL); - -#undef AA -#ifdef AA - /* The aa canvas is buggy at present Oct 1999 */ - gtk_widget_push_visual(gdk_rgb_get_visual()); - gtk_widget_push_colormap(gdk_rgb_get_cmap()); - canvas = (GnomeCanvas *)gnome_canvas_new_aa(); -#else - gtk_widget_push_visual(gdk_imlib_get_visual()); - gtk_widget_push_colormap(gdk_imlib_get_colormap()); - canvas = (GnomeCanvas *)gnome_canvas_new(); -#endif - - mdisp->canvas = GTK_WIDGET(canvas); - mdisp->title = GTK_WIDGET(title); /* Create the pop up menu */ - mdisp->menu = gnome_popup_menu_new(displaymenu); + mview->menu = gnome_popup_menu_new(displaymenu); /* * Build up the pane. The title row has a fixed height but * expands to fill the horizontal space. The canvas expands * to fill the rest of the space. */ - gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(title), 0, 0, 0); - gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(canvas), 1, 1, 0); - gtk_container_add(GTK_CONTAINER(mdisp), box); - - gtk_widget_show_all(GTK_WIDGET(mdisp)); - - /* Set up a drop site for this widget */ - gtk_drag_dest_set(GTK_WIDGET(mdisp->canvas), GTK_DEST_DEFAULT_MOTION, - targets, NELEM(targets), GDK_ACTION_MOVE|GDK_ACTION_COPY); - - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-drop", - GTK_SIGNAL_FUNC(drag_drop), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-get", - GTK_SIGNAL_FUNC(drag_data_send), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-received", - GTK_SIGNAL_FUNC(drag_data_received), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-motion", - GTK_SIGNAL_FUNC(drag_motion), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-leave", - GTK_SIGNAL_FUNC(drag_leave), mdisp); - gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-end", - GTK_SIGNAL_FUNC(drag_end), mdisp); + gtk_box_pack_start(GTK_BOX(box), mview->ruler, 0, 0, 0); + gtk_box_pack_start(GTK_BOX(box), mview->canvas, 1, 1, 0); + gtk_box_pack_start(GTK_BOX(mdisp), box, 1, 1, 0); + + gtk_widget_set_usize(mview->ruler, 0, mview->vcp->vtitle); + gtk_widget_show_all(GTK_WIDGET(box)); + >>function melys_track_display_class_init static void @@ -319,70 +214,39 @@ >>code GtkObjectClass *object_class; GtkWidgetClass *widget_class; - GtkVBoxClass *vbox_class; + MelysViewClass *view_class; object_class = (GtkObjectClass *)klass; widget_class = (GtkWidgetClass *)klass; - vbox_class = (GtkVBoxClass *)klass; - - parent_class = gtk_type_class(gtk_vbox_get_type()); + view_class = (MelysViewClass *)klass; - gtk_object_class_add_signals(object_class, - melys_track_display_signals, LAST_SIGNAL); + parent_class = gtk_type_class(melys_view_get_type()); /* Set up all the overrides */ - object_class->destroy = disp_destroy; + //object_class->destroy = disp_destroy; - widget_class->size_allocate = disp_size_allocate; + //widget_class->size_allocate = disp_size_allocate; widget_class->draw = display_draw; + view_class->scale_changed = disp_scale_changed; + view_class->get_nthing = disp_get_nthing; + view_class->drop_elem = disp_drop_elem; + view_class->get_base_from_pos = disp_get_base; + >>function melys_track_display_set_md_root void MelysTrackDisplay *mdisp; struct rootElement *root; ->>description -Set the music description root. -If there was an existing one it is freed first. -Everything is reset to display the new song. - ->>code - - g_return_if_fail(root != NULL); - - if (mdisp->mdroot) - md_free((struct element *)mdisp->mdroot); - mdisp->mdroot = md_root_inc_ref(root); - - 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 */ - - ->>function melys_track_display_set_song -void -MelysTrackDisplay *mdisp; -struct song *song; - >>code - mdisp->song = song; - - g_assert(song->posadj); - mdisp->posadj = song->posadj; - gtk_object_ref((GtkObject *) mdisp->posadj); - - gtk_signal_connect_while_alive((GtkObject *)mdisp->posadj, - "value-changed", (GtkSignalFunc)song_pos_cb, mdisp, GTK_OBJECT(mdisp)); + MELYS_VIEW(mdisp)->viewcon = MD_CONTAINER(root); + MELYS_VIEW(mdisp)->vthings = root->tracks; ->>function scale_changed +>>function disp_scale_changed static void -GtkObject *obj; This will be the vcp -MelysTrackDisplay *mdisp; Our info +MelysView *mview; >>description The scaling has changed. @@ -390,127 +254,27 @@ >>code - /* Get the scroll to position correct */ - mdisp->hoffset = -1; - disp_scroll(mdisp->vcp->hadj, mdisp); - mdisp->voffset = -1; - disp_scroll(mdisp->vcp->vadj, mdisp); - - ->>function disp_scroll -static void -GtkAdjustment *adj; -gpointer data; ->>description -A scrollbar has been moved. -So we have to set our current position and redraw. - ->>code - MelysTrackDisplay *mdisp = data; - GnomeCanvas *canvas; - int changed = 0; - - if (adj == mdisp->vcp->hadj) { - if ((int)adj->value != mdisp->hoffset) { - if (adj->value >= 0) { - changed = 1; - mdisp->hoffset = (int)adj->value; - } - } - } - if (adj == mdisp->vcp->vadj) { - if ((int)adj->value != mdisp->voffset) { - changed = 1; - mdisp->voffset = (int)(adj->value + 0.1); - } - } - - - if (changed) { + if (parent_class->scale_changed) + (*parent_class->scale_changed)(mview); - canvas = GNOME_CANVAS(mdisp->canvas); - - gnome_canvas_scroll_to(canvas, - tick_to_x(mdisp, mdisp->hoffset), - mdisp->voffset * mdisp->vcp->vscale); - } + disp_common_draw(MELYS_TRACK_DISPLAY(mview), TRUE); ->>function song_pos_cb +>>function display_draw static void -GtkAdjustment *adj; -gpointer data; ->>description -This gets called when the song position pointer is updated. -This could be because the user changed it in a different -widget or during playback. +GtkWidget *widget; +GdkRectangle *area; >>code - MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); - GtkAdjustment *hadj; - ticktime_t t; - int x; - - hadj = mdisp->vcp->hadj; - - t = (ticktime_t)mdisp->posadj->value; - x = tick_to_x(mdisp, t); - - if (x != tick_to_x(mdisp, mdisp->poffset)) { - int boundry; - int page_width; - - mdisp->poffset = t; - canvas_item_move_abs((GnomeCanvasItem*)mdisp->posline, - tick_to_x(mdisp, t), 0.0); - - /* - * First if this time is over the endtime then we are recording - * or otherwise increasing the length of the song. - * Increase the root duration to match, add on extra to - * avoid too many repeated calls -- it can be shrunk again - * later. - */ - if (t > MD_ENDTIME(mdisp->mdroot)) { - MD_SET_DURATION(mdisp->mdroot, t + hadj->page_size); - mdisp->posadj->upper = MD_ENDTIME(mdisp->mdroot); - set_scroll_region(mdisp); - } - - /* - * If we are just about to go off the end then shift the - * canvas over so that we are just over from the left. - * But if the line is already past the edge then don't - * scroll. This is so you can scroll by hand with out it - * always jumping back. - */ - page_width = x_to_tick(mdisp, - GTK_WIDGET(mdisp->canvas)->allocation.width); - boundry = page_width / 10; - - if (t - mdisp->hoffset > (ticktime_t)page_width - boundry && - t - mdisp->hoffset <= (ticktime_t)page_width) { - hadj->value += page_width - 2*boundry; - - set_scroll_region(mdisp); - } - - /* - * This is a temporary way to ensure that we return to the - * beginning when starting playing. - */ - if (x < 5) {/*XXX*/ - hadj->value = 0; - set_scroll_region(mdisp); - } - } + disp_common_draw(MELYS_TRACK_DISPLAY(widget), FALSE); + GTK_WIDGET_CLASS(parent_class)->draw(widget, area); ->>function display_draw +>>function disp_common_draw static void -GtkWidget *widget; -GdkRectangle *area; +MelysTrackDisplay *mdisp; +int force; >>description Look through all the parts and set up the part items for @@ -519,14 +283,16 @@ >>code int n; int p; - MelysTrackDisplay *mdisp = (MelysTrackDisplay *)widget; + MelysView *mview = MELYS_VIEW(mdisp); struct trackElement *track; struct partElement *part; /* note that this could be part or partref */ + struct rootElement *root; - set_scroll_region(mdisp); + set_hscroll(mdisp); - for (n = 0; n < mdisp->mdroot->tracks; n++) { - track = md_track_nth(mdisp->mdroot, n); + root = MD_ROOT(mview->viewcon); + for (n = 0; n < root->tracks; n++) { + track = md_track_nth(root, n); for (p = 0; p < MD_CONTAINER_LEN(track); p++) { part = (struct partElement *) MD_GET_INDEX(track, p); @@ -540,7 +306,7 @@ switch (MD_TYPE(part)) { case MD_TYPE_PART: case MD_TYPE_PARTREF: - update_part_item(mdisp, track, part); + update_part_item(mdisp, track, part, force); break; default: dprintf(0, "Unexpexted type %d in @func_name", MD_TYPE(part)); @@ -549,10 +315,6 @@ } } - if (mdisp->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); - - GTK_WIDGET_CLASS(parent_class)->draw(widget, area); >>function update_part_item @@ -560,6 +322,7 @@ MelysTrackDisplay *mdisp; struct trackElement *track; The track struct partElement *part; Part or reference to part +int force; >>description Given the part this routine creates or updates the representation @@ -569,19 +332,24 @@ gboolean ref = FALSE; GnomeCanvasItem *item; MelysPartItem *pitem; - struct display_info *dinfo; + MelysView *mview; + struct edisplay_info *dinfo; + struct rootElement *root; char *pname; int state; g_return_if_fail(part != NULL && track != NULL); + mview = MELYS_VIEW(mdisp); + root = MD_ROOT(mview->viewcon); + if (MD_IS_DESTROYED(part) || MD_IS_DESTROYED(track)) return; if (GTK_OBJECT_DESTROYED(mdisp)) return; - if (!MD_MODIFIED(mdisp->mdroot) && !MD_MODIFIED(part)) + if (!force && !MD_MODIFIED(root) && !MD_MODIFIED(part)) return; //printf("updating part root %d part %d\n", MD_MODIFIED(mdisp->mdroot), MD_MODIFIED(part)); @@ -604,13 +372,13 @@ else pname = ""; - dinfo = (struct display_info *)g_dataset_get_data(part, "display-info"); + dinfo = (struct edisplay_info *)g_dataset_get_data(part, mview->infostr); if (dinfo == NULL) { GnomeCanvasGroup *rgroup; GnomeCanvasGroup *group; GnomeCanvasItem *text; - rgroup = gnome_canvas_root((GnomeCanvas*)mdisp->canvas); + rgroup = gnome_canvas_root((GnomeCanvas*)mview->canvas); group = (GnomeCanvasGroup *)gnome_canvas_item_new(rgroup, GNOME_TYPE_CANVAS_GROUP, NULL); @@ -640,26 +408,27 @@ * reference to the part, we use WREF calls to avoid * circular references. */ - dinfo = g_new(struct display_info, 1); + dinfo = g_new(struct edisplay_info, 1); gtk_object_ref((GtkObject*)group); - dinfo->group = group; + dinfo->normal.item = GTK_OBJECT(group); gtk_object_ref((GtkObject*)item); dinfo->pitem = item; gtk_object_ref((GtkObject*)text); dinfo->text = text; MD_WREF(part); - dinfo->part = part; + dinfo->normal.elem = MD_ELEMENT(part); MD_WREF(track); - dinfo->track = track; + dinfo->normal.con = MD_CONTAINER(track); - g_dataset_set_data_full(part, "display-info", - dinfo, display_info_free); + g_dataset_set_data_full(part, mview->infostr, + dinfo, edisplay_info_free); + gtk_object_set_data(GTK_OBJECT(group), mview->infostr, dinfo); MD_WREF(part); gtk_object_set_data_full(GTK_OBJECT(group), "part", part, (GtkDestroyNotify)md_wfree); gtk_signal_connect_while_alive(GTK_OBJECT(group), "event", - item_event, mdisp, (GtkObject*)mdisp); + GTK_SIGNAL_FUNC(melys_view_item_event), mdisp, (GtkObject*)mdisp); } g_assert(dinfo != NULL); @@ -672,7 +441,7 @@ * at around 0,0 within the group. */ /* The whole group is positioned */ - gnome_canvas_item_set((GnomeCanvasItem *)dinfo->group, + gnome_canvas_item_set((GnomeCanvasItem *)dinfo->normal.item, "x", (double) tick_to_x(mdisp, MD_TIME(part)), "y", (double) track_to_y(mdisp, MD_TRACKLIKE(track)->number), NULL); @@ -682,7 +451,7 @@ "text", pname, "fill_color_gdk", >K_WIDGET(mdisp)->style->fg[state], "clip_width", (double) tick_to_x(mdisp, MD_DURATION(part))-2, - "clip_height", (double) mdisp->vcp->vheight-2, + "clip_height", (double) mview->vcp->vheight-2, NULL); /* This size of the part is set here */ @@ -690,523 +459,10 @@ "x1", 0.0, "y1", 0.0, "x2", (double) tick_to_x(mdisp, MD_DURATION(part)), - "y2", (double) mdisp->vcp->vheight, + "y2", (double) mview->vcp->vheight, "fill_color_gdk", >K_WIDGET(mdisp)->style->light[state], NULL); ->>function disp_destroy -static void -GtkObject *obj; - ->>description -The whole display widget has been destroyed. -This should lead to all associated resources being freed. - ->>code - MelysTrackDisplay *mdisp; - - g_return_if_fail(IS_MELYS_TRACK_DISPLAY(obj)); - - mdisp = (MelysTrackDisplay*)obj; - - clear_all_part_sel(mdisp, FALSE); - - if (mdisp->posline) - gtk_object_destroy(GTK_OBJECT(mdisp->posline)); - - if (mdisp->vcp) { - gtk_object_unref(GTK_OBJECT(mdisp->vcp)); - mdisp->vcp = NULL; - } - if (mdisp->posadj) { - gtk_object_unref(GTK_OBJECT(mdisp->posadj)); - mdisp->posadj = NULL; - } - - if (mdisp->mdroot) { - md_free(MD_ELEMENT(mdisp->mdroot)); - mdisp->mdroot = NULL; - } - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (GTK_OBJECT_CLASS(parent_class)->destroy)(obj); - - - ->>function item_event -static void -GtkWidget *widget; This will be a canvas group -GdkEvent *event; The event -gpointer data; This will be the MelysTrackDisplay - ->>description -An event has been received on one of the part representations -on the display canvas. - -All events come through here, so we switch out to more specific -routines once we have worked out what the event is. - ->>code - MelysTrackDisplay *mdisp = data; - struct partElement *part; - GdkEventButton *bevent = (GdkEventButton *)event; - GdkEventMotion *mevent = (GdkEventMotion *)event; - - /* Get the display data from the group */ - part = gtk_object_get_data(GTK_OBJECT(widget), "part"); - g_assert(part); - - dprintf(3, "event %d for part %s", event->type, part->name); - - switch (event->type) { - case GDK_BUTTON_PRESS: - /* Save the original location */ - mdisp->click_part = part; - mdisp->click_tick = x_to_tick(mdisp, event->button.x); - mdisp->click_ntrack = y_to_track(mdisp, event->button.y); - mdisp->click_track = md_track_nth(mdisp->mdroot, mdisp->click_ntrack); - - button_press(mdisp, part, bevent); - break; - - case GDK_2BUTTON_PRESS: - part_prop_box(part, mdisp->song, 0); - break; - - case GDK_BUTTON_RELEASE: - button_release(mdisp, part, bevent); - break; - - case GDK_MOTION_NOTIFY: - if (mevent->state & ALL_BUTTON_MASK) - button_motion(mdisp, part, mevent); - break; - default: - break; - } - - ->>function button_press -static void -MelysTrackDisplay *mdisp; -struct partElement *part; -GdkEventButton *event; ->>description -Action to take when button 1 is pressed. - ->>code - if (mdisp->click_state != CLICK_INACTIVE) { - mdisp->click_state = CLICK_ERROR; - return; - } - - switch (event->button) { - case 1: - mdisp->click_state = CLICK_BUTTON1_DOWN; - break; - - case 2: - mdisp->click_state = CLICK_BUTTON2_DOWN; - break; - - case 3: - /* - * We checked that we were in the correct state, but - * do not change state as the popup menu takes - * control and we never see a button release. - */ - gnome_popup_menu_do_popup(mdisp->menu, NULL, NULL, event, mdisp); - break; - } - - ->>function button_release -static void -MelysTrackDisplay *mdisp; -struct partElement *part; -GdkEventButton *event; - ->>description -Button 1 has been pressed on a part item. -This selects the item. - ->>code - int mask; - struct display_info *dinfo; - - dinfo = g_dataset_get_data(part, "display-info"); - - if (mdisp->click_state == CLICK_ERROR) { - - mask = event->state & ALL_BUTTON_MASK; - - switch (event->button) { - case 1: mask &= ~GDK_BUTTON1_MASK; break; - case 2: mask &= ~GDK_BUTTON2_MASK; break; - case 3: mask &= ~GDK_BUTTON3_MASK; break; - } - - /* - * We had an error, now if this is the last button - * to be released then we can clear back to inactive state. - */ - if (mask == 0) - mdisp->click_state = CLICK_INACTIVE; - return; - } - - switch (event->button) { - case 1: - - dprintf2("Button at %f,%f\n", event->x, event->y); - if (!(event->state & GDK_CONTROL_MASK)) - clear_all_part_sel(mdisp, TRUE); - - if (MD_SELECTED(part)) { - MD_SET_SELECTED(part, FALSE); - sel_clear_part(mdisp, part); - } else { - MD_SET_SELECTED(part, TRUE); - sel_add_list(mdisp, MD_CONTAINER(dinfo->track), part); - } - - update_part_item(mdisp, dinfo->track, part); - - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK) - mdisp->click_state = CLICK_INACTIVE; - break; - - case 2: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) - mdisp->click_state = CLICK_INACTIVE; - break; - - case 3: - if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK) - mdisp->click_state = CLICK_INACTIVE; - break; - } - - ->>function button_motion -static void -MelysTrackDisplay *mdisp; -struct partElement *part; -GdkEventMotion *event; - ->>description -Motion when a button is pressed down. -Drag and drop on button 1, gesture based editing on button 2. - ->>code - - switch (mdisp->click_state) { - case CLICK_BUTTON1_DOWN: - drag_setup(mdisp, event); - mdisp->click_state = CLICK_INACTIVE; - break; - default: - break; - } - - ->>function drag_setup -static void -MelysTrackDisplay *mdisp; -GdkEventMotion *event; - ->>description ->>code - GtkTargetList *tlist; - struct partElement *clickpart; - struct drag_element_data *dragdata; - struct sel_info selinfo; - GList *list; - int len; - int i; - - tlist = gtk_target_list_new(targets, NELEM(targets)); - - clickpart = mdisp->click_part; - - /* - * If the part that was click was selected, then we move all - * selected parts. If it wasn't then we just move the part that - * was clicked. - */ - if (MD_SELECTED(clickpart)) { - len = g_list_length(mdisp->sel_list); - list = mdisp->sel_list; - } else { - - /* - * Not moving the selected parts. Just create a - * temporary list of the single part. - */ - len = 1; - selinfo.part = clickpart; - selinfo.con = (CONP) md_track_nth(mdisp->mdroot, - mdisp->click_ntrack); - - list = g_list_append(NULL, &selinfo); - } - - dragdata = g_new0(struct drag_element_data, len); - - for (i = 0; i < len; i++) { - int ntrack; - struct sel_info *sinfo; - - sinfo = g_list_nth_data(list, i); - ntrack = MD_TRACK_NUMBER(sinfo->con); - - dragdata[i].element = MD_ELEMENT(sinfo->part); - dragdata[i].con = sinfo->con; - dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick; - dragdata[i].thing_offset = ntrack - mdisp->click_ntrack; - dragdata[i].tick_len = MD_DURATION(sinfo->part); - } - dragdata[0].len = len; - dragdata[0].data_size = sizeof(*dragdata); - - if (list != mdisp->sel_list) - g_list_free(list); - - gtk_object_set_data_full(GTK_OBJECT(mdisp->canvas), "drag-element-data", - dragdata, g_free); - gtk_object_set_data(GTK_OBJECT(mdisp->canvas), "drag-element-data-len", - GINT_TO_POINTER(len)); - - gtk_drag_begin(GTK_WIDGET(mdisp->canvas), - tlist, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK, - 1 /* The button number */, (GdkEvent*)event); - - gtk_target_list_unref(tlist); - - ->>function build_sel_list -static void -MelysTrackDisplay *mdisp; - ->>description -Build up a list of all the selected parts. - ->>code - struct element *el; - int i; - - clear_all_part_sel(mdisp, FALSE); - - for (i = 0; i < MD_CONTAINER_LEN(mdisp->mdroot); i++) { - el = MD_GET_INDEX(mdisp->mdroot, i); - build_sel1(mdisp, MD_CONTAINER(mdisp->mdroot), el); - } - - ->>function build_sel1 -static void -MelysTrackDisplay *mdisp; -struct containerElement *c; -struct element *base; - ->>description -Helper routine for -.F build_sel_list -that examines a single element and adds it to the selection list -if required. - ->>code - struct element *el; - int i; - - if (base->type == MD_TYPE_PART || base->type == MD_TYPE_PARTREF) { - if (MD_SELECTED(base)) - sel_add_list(mdisp, c, MD_PART(base)); - } - - if (iscontainer(base)) { - for (i = 0; i < MD_CONTAINER_LEN(base); i++) { - el = MD_GET_INDEX(base, i); - build_sel1(mdisp, MD_CONTAINER(base), el); - } - } - - ->>function sel_add_list -static void -MelysTrackDisplay *mdisp; -struct containerElement *c; -struct partElement *part; - ->>description -Add a record of a part selection to the selection list. - ->>code - struct sel_info *info; - - info = g_new(struct sel_info, 1); - - MD_REF(part); - MD_REF(c); - info->part = part; - info->con = c; - - mdisp->sel_list = g_list_append(mdisp->sel_list, info); - - ->>function clear_all_part_sel -static void -MelysTrackDisplay *mdisp; this will be the mdisp structure -gboolean clear; - ->>description -Clear the selection status on all parts. - ->>code - GList *list; - - while (mdisp->sel_list) { - struct sel_info *info; - - list = g_list_first(mdisp->sel_list); - info = list->data; - if (clear) - MD_SET_SELECTED(info->part, FALSE); - sel_clear_part(mdisp, info->part); - } - - ->>function sel_clear_part -static void -MelysTrackDisplay *mdisp; -struct partElement *part; - ->>description -Clear the selection status of the specified -.A part . - ->>code - GList *list; - struct display_info *dinfo; - struct sel_info *info; - - /* Find the sel_info for this part */ - list = g_list_first(mdisp->sel_list); - do { - info = list->data; - if (info->part == part) - break; - } while ((list = g_list_next(list)) != NULL); - - g_assert(list != NULL); - - /* Remove from list */ - mdisp->sel_list = g_list_remove(mdisp->sel_list, info); - /* Now update the display */ - if (!MD_IS_DESTROYED(part)) { - dinfo = (struct display_info *)g_dataset_get_data(part, - "display-info"); - - if (dinfo) - update_part_item(mdisp, dinfo->track, dinfo->part); - } - - MD_UNREF(info->part); - MD_UNREF(info->con); - - ->>function disp_size_allocate -static void -GtkWidget *widget; -GtkAllocation *allocation; - ->>description -Intercept the size allocation routine to set our scroll region. -The region must at least as large as the allocated space and also -large enough to hold the complete song. - ->>code - MelysTrackDisplay *mdisp; - GnomeCanvas *canvas; - - g_return_if_fail(widget != NULL); - g_return_if_fail(IS_MELYS_TRACK_DISPLAY(widget)); - g_return_if_fail(allocation != NULL); - - /* Do the real work first */ - if (GTK_WIDGET_CLASS(parent_class)->size_allocate) - (GTK_WIDGET_CLASS(parent_class)->size_allocate)(widget, allocation); - - mdisp = (MelysTrackDisplay *)widget; - canvas = GNOME_CANVAS(mdisp->canvas); - - if (GTK_WIDGET_REALIZED(widget)) { - GnomeCanvasItem *item; - - item = (GnomeCanvasItem *)mdisp->posline; - if (item == NULL) { - item = gnome_canvas_item_new(gnome_canvas_root(canvas), - GNOME_TYPE_CANVAS_LINE, - NULL); - mdisp->posline = (gpointer)item; - } - } - - ->>function set_scroll_region -static void -MelysTrackDisplay *mdisp; - ->>description -Set the canvas scrolling region. -The complete area required to show the current song at the -current scaling is calculated. -This is the scroll region for the canvas and the canvas -will take care of allowing that regions to be seen in conjunction -with our scroll bars. - ->>code - int height; - GnomeCanvas *canvas = GNOME_CANVAS(mdisp->canvas); - GnomeCanvasPoints *points; - - if (!GTK_WIDGET_REALIZED(mdisp)) - return; - - /* It is our job to modify the page_size for the horizontal scroll */ - set_hscroll(mdisp); - - /* the allocated area is the minimum to use */ - height = GTK_WIDGET(mdisp->canvas)->allocation.height; - - if (height < mdisp->mdroot->tracks * mdisp->vcp->vscale) { - int last; - int extra; - - last = (int)(mdisp->vcp->vadj->upper - mdisp->vcp->vadj->page_size)/mdisp->vcp->vscale; - extra = height - last; - height = mdisp->mdroot->tracks * mdisp->vcp->vscale + extra; - } - - gnome_canvas_set_scroll_region(canvas, - 0.0, 0.0, - mdisp->vcp->hadj->upper, - height - ); - - points = gnome_canvas_points_new(2); - points->coords[0] = 0.0; - points->coords[1] = 0.0; - points->coords[2] = 0.0; - points->coords[3] = height; - - gnome_canvas_item_set((GnomeCanvasItem *)mdisp->posline, - "points", points, - NULL); - - gnome_canvas_points_unref(points); - - >>function set_hscroll static void @@ -1221,21 +477,24 @@ >>code int pageticks; int ticklen; + MelysView *mview; GtkAdjustment *adj; if (!GTK_WIDGET_REALIZED(mdisp)) return; - adj = mdisp->vcp->hadj; + mview = MELYS_VIEW(mdisp); + + adj = mview->vcp->hadj; - pageticks = x_to_tick(mdisp, GTK_WIDGET(mdisp->canvas)->allocation.width); - ticklen = MD_ENDTIME(mdisp->mdroot) + pageticks; + pageticks = x_to_tick(mdisp, GTK_WIDGET(mview->canvas)->allocation.width); + ticklen = MD_ENDTIME(mview->viewcon) + pageticks; adj->page_size = pageticks; adj->page_increment = adj->page_size; adj->step_increment = x_to_tick(mdisp, 20); - view_control_set_range(mdisp->vcp, VC_HORIZONTAL, 0.0, ticklen); + view_control_set_range(mview->vcp, VC_HORIZONTAL, 0.0, ticklen); if (adj->value > adj->upper - adj->page_size) adj->value = adj->upper - adj->page_size; @@ -1244,21 +503,17 @@ ->>function display_info_free -void +>>function edisplay_info_free +static void gpointer _info; >>code - struct display_info *info = _info; + struct edisplay_info *einfo = _info; - gtk_object_destroy((GtkObject *)info->group); - gtk_object_unref((GtkObject*)info->group); - gtk_object_unref((GtkObject*)info->pitem); - gtk_object_unref((GtkObject*)info->text); - MD_WUNREF(info->track); - MD_WUNREF(info->part); + gtk_object_unref((GtkObject*)einfo->pitem); + gtk_object_unref((GtkObject*)einfo->text); - g_free(_info); + view_display_info_free((struct display_info *)einfo); >># ----- The menu callbacks ----- @@ -1273,16 +528,17 @@ >>code MelysTrackDisplay *mdisp = data; + MelysView *mview = data; struct partElement *part; struct partElement *newpart; struct trackElement *track; ticktime_t t; - t = mdisp->click_tick; - t = md_snap_tick(md_get_tempomap(mdisp->mdroot), t, mdisp->snap); + t = mview->click_tick; + t = md_snap_tick(mview->tempomap, t, mview->snap); - part = mdisp->click_part; - track = mdisp->click_track; + part = MD_PART(mview->click_elem); + track = MD_TRACK(mview->click_base); if (MD_IS_DESTROYED(part)) return; @@ -1292,8 +548,8 @@ md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); - update_part_item(mdisp, track, part); - update_part_item(mdisp, track, newpart); + update_part_item(mdisp, track, part, FALSE); + update_part_item(mdisp, track, newpart, FALSE); >>function join_cb @@ -1306,18 +562,19 @@ >>code MelysTrackDisplay *mdisp = data; + MelysView *mview = data; struct partElement *part; struct trackElement *track; ticktime_t t; - t = mdisp->click_tick; + t = mview->click_tick; - part = mdisp->click_part; - track = mdisp->click_track; + part = MD_PART(mview->click_elem); + track = MD_TRACK(mview->click_base); md_part_join(MD_CONTAINER(track), part); - update_part_item(mdisp, track, part); + update_part_item(mdisp, track, part, FALSE); >>function delete_cb @@ -1328,45 +585,49 @@ Delete all parts that are selected. >>code - MelysTrackDisplay *mdisp = data; + MelysView *mview = data; struct partElement *part; struct trackElement *track; + struct element *el; - part = mdisp->click_part; - track = mdisp->click_track; + part = MD_PART(mview->click_elem); + track = MD_TRACK(mview->click_base); if (MD_SELECTED(part)) { - GList *list; + GSList *sellist; + GSList *li; - while ((list = mdisp->sel_list) != NULL) { - struct sel_info *info; + sellist = md_build_sel(NULL, MD_ELEMENT(track), MD_TYPE_PART); + sellist = md_build_sel(sellist, MD_ELEMENT(track), MD_TYPE_PARTREF); - info = list->data; - - /* have to unselect as this holds a reference - * to the on-screen item */ - sel_clear_part(mdisp, info->part); + li = sellist; + while (li) { + + el = li->data; + md_clear_data(el); + md_remove(el->con, el); + li = li->next; + } - md_clear_data(MD_ELEMENT(info->part)); - md_remove(info->con, (struct element *)info->part); + g_slist_free(sellist); - } } else { md_clear_data(MD_ELEMENT(part)); md_remove(MD_CONTAINER(track), MD_ELEMENT(part)); } + >>function piano_cb static void GtkWidget *w; gpointer data; The track display widget >>code - MelysTrackDisplay *mdisp = data; + MelysView *mview = data; extern void create_piano(struct song *, struct containerElement *); /* borrow routine from trackinfo */ - create_piano(mdisp->song, MD_CONTAINER(mdisp->click_part)); + create_piano(mview->song, MD_CONTAINER(mview->click_elem)); >>function part_prop_cb @@ -1378,402 +639,71 @@ Bring up the part property box. >>code - MelysTrackDisplay *mdisp = data; - - part_prop_box(mdisp->click_part, mdisp->song, 0); - - ->># ---- The drag and drop routines ------ - ->>function drag_drop -static gboolean -GtkWidget *widget; The destination canvas widget -GdkDragContext *context; -gint x; -gint y; -guint time; -gpointer user_data; - ->>description -A callback that is called when a drop is made. -We study the context and decide which format to request. -Then we request the data. - ->>code + MelysView *mview = data; - dprintf(2, "drag drop on %s 0x%x at %d,%d\n", - gtk_type_name(GTK_OBJECT_TYPE(widget)), widget, x, y); + part_prop_box(MD_PART(mview->click_elem), mview->song, 0); - /* We want the internal element format */ - gtk_drag_get_data(widget, context, MelysElemAtom, time); - return TRUE; - - ->>function drag_data_send -static void -GtkWidget *widget; The source widget -GdkDragContext *context; The drag context -GtkSelectionData *selection_data; The data is set into here -guint info; Identification of transfer type -guint time; The associated time -gpointer data; The mdisp widget +>>function disp_get_base +static struct containerElement * +MelysView *mview; +int nthing; >>description -This is a callback that is executed when the drag_data_get signal is -received. -This means that we are being asked to send the data to -the destination. -It sends the element that is being dragged to the receiving -end. +Return the base element for the specified thing position. +This is a track. +It is not just the containing element of the part as the part +may be inside another part. >>code - MelysTrackDisplay *mdisp = MELYS_TRACK_DISPLAY(data); - struct partElement *part; - struct drag_element_data *dragdata; - int len; - - if (info != MELYS_ELEM_ATOM_ID) { - g_warning("unexpected drag type received"); - return; - } - - part = mdisp->click_part; + struct rootElement *root; + struct trackElement *track; - dragdata = gtk_object_get_data(GTK_OBJECT(mdisp->canvas), - "drag-element-data"); - len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp->canvas), - "drag-element-data-len")); + root = MD_ROOT(mview->viewcon); + track = md_track_nth(root, nthing); - gtk_selection_data_set(selection_data, - selection_data->target, 8, - (guchar *)dragdata, len * sizeof(*dragdata)); + return MD_CONTAINER(track); ->>function drag_enter -static struct outline_data * -MelysTrackDisplay *mdisp; -GdkDragContext *context; +>># --- The drag and drop routines --- ->>description -When a drag enters this widget, we construct a set of outlines -that represent the position of the drag. -The following drag motion events will be used to move these -outlines around. - -Keep in mind that the source of the drag could be a different type of -widget. -It could also be from a different application and even from a -different machine, although this isn't supported yet. +>>function disp_get_nthing +static int +MelysView *mview; +struct element *elem; >>code - GtkWidget *srcw; - GnomeCanvasGroup *group; - struct outline_data *oldata; - struct drag_element_data *dragdata; - struct drag_element_data *dp; - long tick_offset; - int track_offset; - int i; - int len; - - srcw = gtk_drag_get_source_widget(context); - if (srcw == NULL) { - /* Another app probably which we don't yet deal with */ - return NULL; - } - - oldata = g_new(struct outline_data, 1); - dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data"); - len = dragdata[0].len; - - track_offset = tick_offset = 0; - - /* - * Calculate the offset from the click point to the top left - * hand corner of the rectangle that would enclose all the parts. - */ - for (i = 0; i < len; i++) { - dp = dragdata + i; - - track_offset = MIN(track_offset, dp->thing_offset); - tick_offset = MIN(tick_offset, dp->tick_offset); - } - - /* - * All the outlines are placed into this group so that they - * can be moved as a unit to follow the cursor. - */ - group = (GnomeCanvasGroup *) gnome_canvas_item_new( - gnome_canvas_root((GnomeCanvas*)mdisp->canvas), - GNOME_TYPE_CANVAS_GROUP, - "x", 0.0, - "y", 0.0, - NULL); - - /* We now have enough information to fill the outline data */ - oldata->group = group; - oldata->xoffset = tick_to_x(mdisp, tick_offset); - oldata->yoffset = track_to_y(mdisp, track_offset); - - /* If this is say a note, then we need to squash down */ - if (!iscontainer(dragdata[0].element)) - oldata->yoffset /= 128; - /* - * Create the individual outlines for each part that is being - * moved. - */ - for (i = 0; i < len; i++) { - int x1, y1; - int squeeze; - - dp = dragdata + i; - - if (iscontainer(dp->element)) - squeeze = 1; - else - squeeze = 128; - - x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset); - y1 = track_to_y(mdisp, dp->thing_offset - track_offset); - - gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT, - "x1", (double) x1, - "y1", (double) y1/squeeze, - "x2", (double) x1 + tick_to_x(mdisp, dp->tick_len), - "y2", (double) (y1 + mdisp->vcp->vheight) / squeeze, - "width_pixels", 1, - "outline_color", "yellow", - NULL); + while (elem) { + if (MD_TYPE(elem) == MD_TYPE_TRACK) + return MD_TRACK_NUMBER(elem); + elem = MD_ELEMENT(elem->con); } + g_warning("@func_name couldn't find thing"); + return 0; - /* Save for later use */ - gtk_object_set_data_full(GTK_OBJECT(mdisp), "outline-data", oldata, - (GtkDestroyNotify)outline_data_free); - - return oldata; - ->>function drag_motion +>>function disp_drop_elem static gboolean -GtkWidget *widget; -GdkDragContext *context; -gint x; -gint y; -guint time; -gpointer user_data; - ->>description -Move around the drag outline group so that the user -can tell where the drag will land. - ->>code - MelysTrackDisplay *mdisp = user_data; - struct outline_data *oldata; - double wx, wy; - - gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), - (double)x, (double)y, &wx, &wy); - - oldata = gtk_object_get_data(GTK_OBJECT(mdisp), "outline-data"); - if (oldata == NULL) - oldata = drag_enter(mdisp, context); - if (oldata == NULL) - return FALSE; - - wx += oldata->xoffset; - wy += oldata->yoffset - mdisp->vcp->vheight/2; - - if (wx < 0) wx = 0; - if (wy < 0) wy = 0; - - canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy); - - return TRUE; - - ->>function drag_leave -static void -GtkWidget *widget; -GdkDragContext *context; -guint time; -gpointer user_data; +MelysView *mview; +struct element *elem; +int nthing; >>description -This gets called when the drag leaves our window and also -at the end of the drag. -So its a good place to tidy up in. +Deal with dropping an element onto us. +The nthing parameter is the track to drop onto. >>code - MelysTrackDisplay *mdisp = user_data; - - gtk_object_remove_data(GTK_OBJECT(mdisp), "outline-data"); - - ->>function drag_data_received -static void -GtkWidget *widget; The destination widget -GdkDragContext *context; The drag context -gint wx; The drop point in window coords (I think) -gint wy; The drop point -GtkSelectionData *data; Data from the other side -guint info; The type of drag -guint time; Time of event -gpointer user_data; User data, probably not used - ->>description -This routine is called when a signal arrives on the destination -widget to say that data has actually been received. - ->>code - MelysTrackDisplay *mdisp; - struct drag_element_data *dragdata; - struct drag_element_data *dp; - struct partElement *newpart; struct trackElement *track; - ticktime_t t; - int drop_track; - int drop_tick; - int track_start = 0; - int tick_start = 0; - int minoff = 0; - int snapadj; - gboolean needrm = FALSE; - int x, y; - double dx, dy; - int len; - int i; - - mdisp = MELYS_TRACK_DISPLAY(user_data); - - /* We are given window coordinate, so convert to world coords */ - gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), - wx, wy, &dx, &dy); - x = (int)dx; - y = (int)dy; - - dprintf(2, "data received len %d %p, at %d,%d", - data->length, *(char **)data->data,x, y); - - drop_track = y_to_track(mdisp, y); - drop_tick = x_to_tick(mdisp, x); - - - len = data->length / sizeof(struct drag_element_data); - dragdata = (struct drag_element_data *)data->data; - - /* - * Do a first pass through the elements. We must either do - * them all or do none of them. If the user has droped a set - * of parts such that one of them would be before the start - * of the canvas then we must offset them all by the exact amount - * to keep all parts on the canvas. - */ - for (i = 0; i < len; i++) { - dp = dragdata+i; - if (dp->element->type != MD_TYPE_PART) - goto error; - - /* Check and adjust for droping before the beginning */ - if (dp->thing_offset + drop_track < 0) - track_start = MIN(track_start, dp->thing_offset + drop_track); - - /* Check and adjust for droping before the beginning */ - if (dp->tick_offset + drop_tick < 0) - tick_start = MIN(tick_start, dp->tick_offset + drop_tick); - - minoff = MIN(minoff, dp->tick_offset); - } - - drop_tick -= tick_start; - - snapadj = md_snap_tick(md_get_tempomap(mdisp->mdroot), minoff + drop_tick, mdisp->snap) - (minoff + drop_tick); - - md_undo_begin_set(MD_UNDO(mdisp->mdroot)); - - for (i = 0; i < len; i++) { - int tn; - - dp = dragdata + i; - - switch (context->action) { - case GDK_ACTION_MOVE: - newpart = MD_PART(dp->element); - - MD_REF(newpart); - md_remove(dp->con, dp->element); - - needrm = TRUE; - break; - - case GDK_ACTION_COPY: - newpart = MD_PART(md_copy(dp->element)); - MD_REF(newpart); - break; - - default: - newpart = NULL; - g_assert_not_reached(); - } - - tn = drop_track + dp->thing_offset - track_start; + struct rootElement *root; - /* Make sure that the track exists and create it if not */ - md_ensure_track(mdisp->mdroot, tn); - track = md_track_nth(mdisp->mdroot, tn); + root = MD_ROOT(mview->viewcon); + if (MD_TYPE(elem) == MD_TYPE_PART) { + md_ensure_track(root, nthing); + track = md_track_nth(MD_ROOT(mview->viewcon), nthing); + md_add_sort(MD_CONTAINER(track), elem); + } else + return FALSE; - t = snapadj + drop_tick + dp->tick_offset; - g_assert(t >= 0); - - /* - * The new part should have its time and devchan set to - * the new values. It is then added to the track. - */ - md_change_time(MD_ELEMENT(newpart), t); - md_set_devchan(MD_ELEMENT(newpart), MD_DEVCHAN(track)); - md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart)); - - MD_UNREF(newpart); - - md_clear_data(MD_ELEMENT(newpart)); - update_part_item(mdisp, track, newpart); - } - - gtk_drag_finish(context, TRUE, needrm, time); - md_undo_end_set(MD_UNDO(mdisp->mdroot)); - md_shrink(mdisp->mdroot); - - build_sel_list(mdisp); - - if (mdisp->posline) - gnome_canvas_item_raise_to_top((GnomeCanvasItem *)mdisp->posline); - song_view_update(mdisp->song); - return; - - error: - gtk_drag_finish(context, FALSE, FALSE, time); - - ->>function drag_end -static void -GtkWidget *widget; -GdkDragContext *drag_context; -gpointer user_data; - ->>code - MelysTrackDisplay *mdisp = user_data; - - gtk_object_remove_data(GTK_OBJECT(mdisp), "drag-element-data"); - build_sel_list(mdisp); - ->>function outline_data_free -static void -gpointer data; - ->>code - struct outline_data *od = data; - - gtk_object_destroy(GTK_OBJECT(od->group)); - g_free(od); + return TRUE; diff -rNu melys-0.1.6/widgets/melysview.c melys-0.1.7/widgets/melysview.c --- melys-0.1.6/widgets/melysview.c Mon Nov 29 10:48:15 1999 +++ melys-0.1.7/widgets/melysview.c Mon Nov 29 15:35:05 1999 @@ -212,9 +212,6 @@ mview->canvas = GTK_WIDGET(canvas); gtk_widget_ref(mview->canvas); - /* Create the pop up menu */ - //mview->menu = gnome_popup_menu_new(displaymenu); - mview->posline = (GtkWidget *)gnome_canvas_item_new( gnome_canvas_root(canvas), GNOME_TYPE_CANVAS_LINE, @@ -537,7 +534,8 @@ * do not change state as the popup menu takes * control and we never see a button release. */ - //gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); + if (mview->menu) + gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); break; } } diff -rNu melys-0.1.6/widgets/melysview.m melys-0.1.7/widgets/melysview.m --- melys-0.1.6/widgets/melysview.m Sun Nov 28 16:14:23 1999 +++ melys-0.1.7/widgets/melysview.m Mon Nov 29 15:31:55 1999 @@ -84,7 +84,7 @@ GtkWidget *canvas; /* The canvas that the subclass will place items on */ GtkWidget *ruler; /* A ruler that can be used */ GtkWidget *posline; /* Song position pointer */ - //GtkWidget *menu; /* The item context menu */ + GtkWidget *menu; /* The item context menu */ /* For the posline */ void *points; @@ -268,9 +268,6 @@ mview->canvas = GTK_WIDGET(canvas); gtk_widget_ref(mview->canvas); - /* Create the pop up menu */ - //mview->menu = gnome_popup_menu_new(displaymenu); - mview->posline = (GtkWidget *)gnome_canvas_item_new( gnome_canvas_root(canvas), GNOME_TYPE_CANVAS_LINE, @@ -605,7 +602,8 @@ * do not change state as the popup menu takes * control and we never see a button release. */ - //gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); + if (mview->menu) + gnome_popup_menu_do_popup(mview->menu, NULL, NULL, event, mview); break; }