#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <lttv/processTrace.h>
-#include <lttv/gtktraceset.h>
+#include <lttv/lttv.h>
+#include <lttv/tracecontext.h>
+#include <lttvwindow/lttvwindow.h>
+#include <lttv/state.h>
#include <lttv/hook.h>
#include "drawing.h"
+#include "eventhooks.h"
#include "cfv.h"
#include "cfv-private.h"
-#include "eventhooks.h"
#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
+
+GdkColor drawing_colors[NUM_COLORS] =
+{ /* Pixel, R, G, B */
+ { 0, 0, 0, 0 }, /* COL_BLACK */
+ { 0, 0xFFFF, 0xFFFF, 0xFFFF }, /* COL_WHITE */
+ { 0, 0x0fff, 0xffff, 0xfffF }, /* COL_WAIT_FORK : pale blue */
+ { 0, 0xffff, 0xffff, 0x0000 }, /* COL_WAIT_CPU : yeallow */
+ { 0, 0xffff, 0x0000, 0xffff }, /* COL_ZOMBIE : purple */
+ { 0, 0xffff, 0x0000, 0x0000 }, /* COL_WAIT : red */
+ { 0, 0x0000, 0xffff, 0x0000 } /* COL_RUN : green */
+};
+
+
+
/*****************************************************************************
* drawing functions *
*****************************************************************************/
motion_notify_ruler(GtkWidget *widget, GdkEventMotion *event, gpointer user_data);
-//FIXME Colors will need to be dynamic. Graphic context part not done so far.
-typedef enum
-{
- RED,
- GREEN,
- BLUE,
- WHITE,
- BLACK
-
-} ControlFlowColors;
-
-/* Vector of unallocated colors */
-static GdkColor CF_Colors [] =
-{
- { 0, 0xffff, 0x0000, 0x0000 }, // RED
- { 0, 0x0000, 0xffff, 0x0000 }, // GREEN
- { 0, 0x0000, 0x0000, 0xffff }, // BLUE
- { 0, 0xffff, 0xffff, 0xffff }, // WHITE
- { 0, 0x0000, 0x0000, 0x0000 } // BLACK
-};
-
-
/* Function responsible for updating the exposed area.
- * It must call processTrace() to ask for this update.
+ * It must do an events request to the lttvwindow API to ask for this update.
* Note : this function cannot clear the background, because it may
* erase drawing already present (SAFETY).
*/
{
if(width < 0) return ;
if(height < 0) return ;
- ControlFlowData *control_flow_data =
- (ControlFlowData*)g_object_get_data(
- G_OBJECT(
- drawing->drawing_area),
- "control_flow_data");
- LttTime start, end;
- LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
- control_flow_data->time_window.start_time);
+ if(drawing->gc == NULL) {
+ drawing->gc = gdk_gc_new(drawing->drawing_area->window);
+ gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc);
+ }
- g_critical("req : window_end : %u, %u", window_end.tv_sec,
- window_end.tv_nsec);
- g_critical("req : time width : %u, %u", control_flow_data->time_window.time_width.tv_sec,
- control_flow_data->time_window.time_width.tv_nsec);
- g_critical("x is : %i, x+width is : %i", x, x+width);
+ TimeWindow time_window =
+ lttvwindow_get_time_window(drawing->control_flow_data->tab);
+
+ ControlFlowData *control_flow_data = drawing->control_flow_data;
+ Tab *tab = control_flow_data->tab;
+ // (ControlFlowData*)g_object_get_data(
+ // G_OBJECT(drawing->drawing_area), "control_flow_data");
+
+ LttTime start, time_end;
+ LttTime window_end = ltt_time_add(time_window.time_width,
+ time_window.start_time);
+
+ g_debug("req : window start_time : %u, %u", time_window.start_time.tv_sec,
+ time_window.start_time.tv_nsec);
- convert_pixels_to_time(drawing->drawing_area->allocation.width, x,
- &control_flow_data->time_window.start_time,
- &window_end,
+ g_debug("req : window time width : %u, %u", time_window.time_width.tv_sec,
+ time_window.time_width.tv_nsec);
+
+ g_debug("req : window_end : %u, %u", window_end.tv_sec,
+ window_end.tv_nsec);
+
+ g_debug("x is : %i, x+width is : %i", x, x+width);
+
+ convert_pixels_to_time(drawing->width, x,
+ time_window.start_time,
+ window_end,
&start);
- convert_pixels_to_time(drawing->drawing_area->allocation.width, x + width,
- &control_flow_data->time_window.start_time,
- &window_end,
- &end);
-
- LttvTracesetContext * tsc =
- get_traceset_context(control_flow_data->mw);
- LttvTracesetState * tss =
- LTTV_TRACESET_STATE(tsc);
-
- //send_test_process(
- //guicontrolflow_get_process_list(drawing->control_flow_data),
- //drawing);
- //send_test_drawing(
- //guicontrolflow_get_process_list(drawing->control_flow_data),
- //drawing, *pixmap, x, y, width, height);
-
- // Let's call processTrace() !!
- EventRequest event_request; // Variable freed at the end of the function.
- event_request.control_flow_data = control_flow_data;
- event_request.time_begin = start;
- event_request.time_end = end;
- event_request.x_begin = x;
- event_request.x_end = x+width;
-
- g_critical("req : start : %u, %u", event_request.time_begin.tv_sec,
- event_request.time_begin.tv_nsec);
-
- g_critical("req : end : %u, %u", event_request.time_end.tv_sec,
- event_request.time_end.tv_nsec);
+ convert_pixels_to_time(drawing->width, x+width,
+ time_window.start_time,
+ window_end,
+ &time_end);
+ EventsRequest *events_request = g_new(EventsRequest, 1);
+ // Create the hooks
LttvHooks *event = lttv_hooks_new();
- LttvHooks *after_event = lttv_hooks_new();
- LttvHooks *after_traceset = lttv_hooks_new();
- lttv_hooks_add(after_traceset, after_data_request, &event_request);
- lttv_hooks_add(event, draw_event_hook, &event_request);
- //Modified by xiangxiu: state update hooks are added by the main window
- //state_add_event_hooks_api(control_flow_data->mw);
- lttv_hooks_add(after_event, draw_after_hook, &event_request);
-
- //lttv_process_traceset_seek_time(tsc, start);
- lttv_state_traceset_seek_time_closest(tss, start);
- // FIXME : would like to place the after_traceset hook after the traceset,
- // but the traceset context state is not valid anymore.
- lttv_traceset_context_add_hooks(tsc,
- // NULL, after_traceset, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, after_traceset, NULL, event, after_event);
- lttv_process_traceset(tsc, end, G_MAXULONG);
- //after_data_request((void*)&event_request,(void*)tsc);
- lttv_traceset_context_remove_hooks(tsc,
- //NULL, after_traceset, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, after_traceset, NULL, event, after_event);
- //Modified by xiangxiu: state update hooks are removed by the main window
- //state_remove_event_hooks_api(control_flow_data->mw);
-
- lttv_hooks_destroy(after_traceset);
- lttv_hooks_destroy(event);
- lttv_hooks_destroy(after_event);
+ LttvHooks *before_chunk_traceset = lttv_hooks_new();
+ LttvHooks *after_chunk_traceset = lttv_hooks_new();
+ LttvHooks *before_request_hook = lttv_hooks_new();
+ LttvHooks *after_request_hook = lttv_hooks_new();
+
+ lttv_hooks_add(before_chunk_traceset,
+ before_chunk,
+ events_request,
+ LTTV_PRIO_DEFAULT);
+
+ lttv_hooks_add(after_chunk_traceset,
+ after_chunk,
+ events_request,
+ LTTV_PRIO_DEFAULT);
+
+ lttv_hooks_add(before_request_hook,
+ before_request,
+ events_request,
+ LTTV_PRIO_DEFAULT);
+
+ lttv_hooks_add(after_request_hook,
+ after_request,
+ events_request,
+ LTTV_PRIO_DEFAULT);
+
+ /* FIXME : hooks are registered global instead of by ID.
+ * This is due to the lack of granularity of main window's events requests.
+ * Should be fixed for gain of performance.
+ */
+ lttv_hooks_add(event,
+ before_schedchange_hook,
+ events_request,
+ LTTV_PRIO_STATE-5);
+ lttv_hooks_add(event,
+ after_schedchange_hook,
+ events_request,
+ LTTV_PRIO_STATE+5);
+#if 0
+ lttv_hooks_add(event,
+ before_execmode_hook,
+ events_request,
+ LTTV_PRIO_STATE-5);
+ lttv_hooks_add(event,
+ after_execmode_hook,
+ events_request,
+ LTTV_PRIO_STATE+5);
+#endif //0
+ lttv_hooks_add(event,
+ after_fork_hook,
+ events_request,
+ LTTV_PRIO_STATE+5);
+
+ // Fill the events request
+ events_request->owner = control_flow_data;
+ events_request->viewer_data = control_flow_data;
+ events_request->servicing = FALSE;
+ events_request->start_time = start;
+ events_request->start_position = NULL;
+ events_request->stop_flag = FALSE;
+ events_request->end_time = time_end;
+ events_request->num_events = G_MAXUINT;
+ events_request->end_position = NULL;
+ events_request->before_chunk_traceset = before_chunk_traceset;
+ events_request->before_chunk_trace = NULL;
+ events_request->before_chunk_tracefile = NULL;
+ events_request->event = event;
+ events_request->event_by_id = NULL;
+ events_request->after_chunk_tracefile = NULL;
+ events_request->after_chunk_trace = NULL;
+ events_request->after_chunk_traceset = after_chunk_traceset;
+ events_request->before_request = before_request_hook;
+ events_request->after_request = after_request_hook;
+
+ g_debug("req : start : %u, %u", start.tv_sec,
+ start.tv_nsec);
+
+ g_debug("req : end : %u, %u", time_end.tv_sec,
+ time_end.tv_nsec);
+
+ lttvwindow_events_request_remove_all(tab,
+ control_flow_data);
+ lttvwindow_events_request(tab, events_request);
+}
+
+
+static void set_last_start(gpointer key, gpointer value, gpointer user_data)
+{
+ ProcessInfo *process_info = (ProcessInfo*)key;
+ HashedProcessData *hashed_process_data = (HashedProcessData*)value;
+ guint x = (guint)user_data;
+
+ hashed_process_data->x = x;
+
+ return;
+}
+
+void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState *tss)
+{
+ g_debug("Begin of data request");
+ ControlFlowData *cfd = events_request->viewer_data;
+ LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+ TimeWindow time_window =
+ lttvwindow_get_time_window(cfd->tab);
+ LttTime end_time = ltt_time_add(time_window.start_time,
+ time_window.time_width);
+ guint width = cfd->drawing->width;
+ guint x=0;
+
+ cfd->drawing->last_start = events_request->start_time;
+
+ convert_time_to_pixels(
+ time_window.start_time,
+ end_time,
+ events_request->start_time,
+ width,
+ &x);
+
+ g_hash_table_foreach(cfd->process_list->process_hash, set_last_start,
+ (gpointer)x);
+}
+
+void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
+{
+ g_debug("Begin of chunk");
+ ControlFlowData *cfd = events_request->viewer_data;
+ LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+ LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
+ //cfd->drawing->last_start = LTT_TIME_MIN(current_time,
+ // events_request->end_time);
+}
+
+
+void drawing_request_expose(EventsRequest *events_request,
+ LttvTracesetState *tss,
+ LttTime end_time)
+{
+ gint x, x_end, width;
+
+ ControlFlowData *cfd = events_request->viewer_data;
+ LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+ Drawing_t *drawing = cfd->drawing;
+
+ TimeWindow time_window =
+ lttvwindow_get_time_window(cfd->tab);
+
+ g_debug("request expose");
+ LttTime window_end = ltt_time_add(time_window.time_width,
+ time_window.start_time);
+#if 0
+ convert_time_to_pixels(
+ time_window.start_time,
+ window_end,
+ cfd->drawing->last_start,
+ drawing->width,
+ &x);
+
+#endif //0
+ convert_time_to_pixels(
+ time_window.start_time,
+ window_end,
+ end_time,
+ drawing->width,
+ &x_end);
+ x = drawing->damage_begin;
+ // x_end = drawing->damage_end;
+ width = x_end - x;
+
+ drawing->damage_begin = x+width;
+ //drawing->damage_end = drawing->width;
+
+ /* ask for the buffer to be redrawn */
+
+ //gtk_widget_queue_draw_area ( drawing->drawing_area,
+ // 0, 0,
+ // drawing->width, drawing->height);
+
+ /* FIXME
+ * will need more precise pixel_to_time and time_to_pixel conversion
+ * functions to redraw only the needed area. */
+ gtk_widget_queue_draw_area ( drawing->drawing_area,
+ x, 0,
+ width, drawing->height);
+
}
-
+
+
/* Callbacks */
/* Create a new backing pixmap of the appropriate size */
/* As the scaling will always change, it's of no use to copy old
* pixmap.
+ *
+ * Only change the size if width changes. The height is specified and changed
+ * when process ID are added or removed from the process list.
*/
static gboolean
configure_event( GtkWidget *widget, GdkEventConfigure *event,
* has updated the time interval before this configure gets
* executed.
*/
- get_time_window(drawing->control_flow_data->mw,
- &drawing->control_flow_data->time_window);
+ //lttvwindow_get_time_window(drawing->control_flow_data->mw,
+ // &drawing->control_flow_data->time_window);
/* New pixmap, size of the configure event */
//GdkPixmap *pixmap = gdk_pixmap_new(widget->window,
// widget->allocation.height + SAFETY,
// -1);
- g_critical("drawing configure event");
- g_critical("New draw size : %i by %i",widget->allocation.width, widget->allocation.height);
+ if(widget->allocation.width != drawing->width) {
+ g_debug("drawing configure event");
+ g_debug("New alloc draw size : %i by %i",widget->allocation.width,
+ widget->allocation.height);
- if (drawing->pixmap)
- gdk_pixmap_unref(drawing->pixmap);
+ if (drawing->pixmap)
+ gdk_pixmap_unref(drawing->pixmap);
- /* If no old pixmap present */
- //if(drawing->pixmap == NULL)
- {
- drawing->pixmap = gdk_pixmap_new(
- widget->window,
- widget->allocation.width + SAFETY,
- widget->allocation.height + SAFETY,
+ drawing->width = widget->allocation.width;
+ //drawing->height = widget->allocation.height;
+
+ drawing->pixmap = gdk_pixmap_new(widget->window,
+ drawing->width + SAFETY,
+ drawing->height,
+ -1);
//ProcessList_get_height
// (GuiControlFlow_get_process_list(drawing->control_flow_data)),
- -1);
- drawing->width = widget->allocation.width;
- drawing->height = widget->allocation.height;
// Clear the image
widget->style->black_gc,
TRUE,
0, 0,
- widget->allocation.width+SAFETY,
- widget->allocation.height+SAFETY);
+ drawing->width+SAFETY,
+ drawing->height);
//g_info("init data request");
/* Initial data request */
+ /* no, do initial data request in the expose event */
// Do not need to ask for data of 1 pixel : not synchronized with
// main window time at this moment.
- drawing_data_request(drawing, &drawing->pixmap, 0, 0,
- widget->allocation.width,
- widget->allocation.height);
+ //drawing_data_request(drawing, &drawing->pixmap, 0, 0,
+ // widget->allocation.width,
+ // widget->allocation.height);
- drawing->width = widget->allocation.width;
- drawing->height = widget->allocation.height;
-
- return TRUE;
-
-
-
+ //drawing->width = widget->allocation.width;
+ //drawing->height = widget->allocation.height;
+
+ drawing->damage_begin = 0;
+ drawing->damage_end = widget->allocation.width;
+
+ if(drawing->damage_begin < drawing->damage_end)
+ {
+ drawing_data_request(drawing,
+ &drawing->pixmap,
+ drawing->damage_begin,
+ 0,
+ drawing->damage_end - drawing->damage_begin,
+ drawing->height);
+ }
}
-#ifdef NOTUSE
-// /* Draw empty background */
-// gdk_draw_rectangle (pixmap,
-// widget->style->black_gc,
-// TRUE,
-// 0, 0,
-// widget->allocation.width,
-// widget->allocation.height);
-
- /* Copy old data to new pixmap */
- gdk_draw_drawable (pixmap,
- widget->style->black_gc,
- drawing->pixmap,
- 0, 0,
- 0, 0,
- -1, -1);
-
- if (drawing->pixmap)
- gdk_pixmap_unref(drawing->pixmap);
-
- drawing->pixmap = pixmap;
-
- // Clear the bottom part of the image (SAFETY)
- gdk_draw_rectangle (pixmap,
- widget->style->black_gc,
- TRUE,
- 0, drawing->height+SAFETY,
- drawing->width+SAFETY, // do not overlap
- (widget->allocation.height) - drawing->height);
-
- // Clear the right part of the image (SAFETY)
- gdk_draw_rectangle (pixmap,
- widget->style->black_gc,
- TRUE,
- drawing->width+SAFETY, 0,
- (widget->allocation.width) - drawing->width, // do not overlap
- drawing->height+SAFETY);
-
- /* Clear the backgound for data request, but not SAFETY */
- gdk_draw_rectangle (pixmap,
- drawing->drawing_area->style->black_gc,
- TRUE,
- drawing->width + SAFETY, 0,
- widget->allocation.width - drawing->width, // do not overlap
- widget->allocation.height+SAFETY);
-
- /* Request data for missing space */
- g_info("missing data request");
- drawing_data_request(drawing, &pixmap, drawing->width, 0,
- widget->allocation.width - drawing->width,
- widget->allocation.height);
-
- drawing->width = widget->allocation.width;
- drawing->height = widget->allocation.height;
-
return TRUE;
-#endif //NOTUSE
}
expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
{
Drawing_t *drawing = (Drawing_t*)user_data;
+
ControlFlowData *control_flow_data =
(ControlFlowData*)g_object_get_data(
G_OBJECT(widget),
"control_flow_data");
- g_critical("drawing expose event");
-
- guint x=0;
- LttTime* current_time =
- guicontrolflow_get_current_time(control_flow_data);
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+ LttTime current_time =
+ lttvwindow_get_current_time(control_flow_data->tab);
- LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
- control_flow_data->time_window.start_time);
+ guint cursor_x=0;
- convert_time_to_pixels(
- control_flow_data->time_window.start_time,
- window_end,
- *current_time,
- widget->allocation.width,
- &x);
-
+ LttTime window_end = ltt_time_add(time_window.time_width,
+ time_window.start_time);
+
+
+ /* update the screen from the pixmap buffer */
gdk_draw_pixmap(widget->window,
widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
drawing->pixmap,
event->area.x, event->area.y,
event->area.width, event->area.height);
- if(x >= event->area.x && x <= event->area.x+event->area.width)
+
+ if(ltt_time_compare(time_window.start_time, current_time) <= 0 &&
+ ltt_time_compare(window_end, current_time) >= 0)
{
- gint8 dash_list[] = { 1, 2 };
- GdkGC *gc = gdk_gc_new(control_flow_data->drawing->pixmap);
- gdk_gc_copy(gc, widget->style->white_gc);
- gdk_gc_set_line_attributes(gc,
- 1,
- GDK_LINE_ON_OFF_DASH,
- GDK_CAP_BUTT,
- GDK_JOIN_MITER);
- gdk_gc_set_dashes(gc,
- 0,
- dash_list,
- 2);
+ /* Draw the dotted lines */
+ convert_time_to_pixels(
+ time_window.start_time,
+ window_end,
+ current_time,
+ drawing->width,
+ &cursor_x);
+
+
+ if(drawing->dotted_gc == NULL) {
+
+ drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window);
+ gdk_gc_copy(drawing->dotted_gc, widget->style->white_gc);
+
+ gint8 dash_list[] = { 1, 2 };
+ gdk_gc_set_line_attributes(drawing->dotted_gc,
+ 1,
+ GDK_LINE_ON_OFF_DASH,
+ GDK_CAP_BUTT,
+ GDK_JOIN_MITER);
+ gdk_gc_set_dashes(drawing->dotted_gc,
+ 0,
+ dash_list,
+ 2);
+ }
+
drawing_draw_line(NULL, widget->window,
- x, event->area.y,
- x, event->area.y+event->area.height,
- gc);
- gdk_gc_unref(gc);
+ cursor_x, 0,
+ cursor_x, drawing->height,
+ drawing->dotted_gc);
}
return FALSE;
}
+static gboolean
+after_expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
+{
+ //g_assert(0);
+ g_debug("AFTER EXPOSE");
+
+ return FALSE;
+
+
+}
+
+
/* mouse click */
static gboolean
button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data )
G_OBJECT(widget),
"control_flow_data");
Drawing_t *drawing = control_flow_data->drawing;
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
-
- g_critical("click");
+ g_debug("click");
if(event->button == 1)
{
LttTime time;
- LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
- control_flow_data->time_window.start_time);
+ LttTime window_end = ltt_time_add(time_window.time_width,
+ time_window.start_time);
/* left mouse button click */
- g_critical("x click is : %f", event->x);
+ g_debug("x click is : %f", event->x);
- convert_pixels_to_time(widget->allocation.width, (guint)event->x,
- &control_flow_data->time_window.start_time,
- &window_end,
+ convert_pixels_to_time(drawing->width, (guint)event->x,
+ time_window.start_time,
+ window_end,
&time);
- set_current_time(control_flow_data->mw, &time);
+ lttvwindow_report_current_time(control_flow_data->tab, time);
}
-
+
return FALSE;
}
+static gboolean
+scrollbar_size_allocate(GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer user_data)
+{
+ Drawing_t *drawing = (Drawing_t*)user_data;
+
+ gtk_widget_set_size_request(drawing->padding, allocation->width, -1);
+ //gtk_widget_queue_resize(drawing->padding);
+ //gtk_widget_queue_resize(drawing->ruler);
+ gtk_container_check_resize(GTK_CONTAINER(drawing->ruler_hbox));
+ return 0;
+}
drawing->control_flow_data = control_flow_data;
drawing->vbox = gtk_vbox_new(FALSE, 1);
+
+
+ drawing->ruler_hbox = gtk_hbox_new(FALSE, 1);
drawing->ruler = gtk_drawing_area_new ();
- gtk_widget_set_size_request(drawing->ruler, -1, 27);
+ //gtk_widget_set_size_request(drawing->ruler, -1, 27);
+
+ drawing->padding = gtk_drawing_area_new ();
+ //gtk_widget_set_size_request(drawing->padding, -1, 27);
+ gtk_box_pack_start(GTK_BOX(drawing->ruler_hbox), drawing->ruler,
+ TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(drawing->ruler_hbox), drawing->padding,
+ FALSE, FALSE, 0);
- drawing->drawing_area = gtk_drawing_area_new ();
- gtk_box_pack_start(GTK_BOX(drawing->vbox), drawing->ruler,
+
+ drawing->drawing_area = gtk_drawing_area_new ();
+
+ drawing->gc = NULL;
+
+ drawing->hbox = gtk_hbox_new(FALSE, 1);
+ drawing->viewport = gtk_viewport_new(NULL, control_flow_data->v_adjust);
+ drawing->scrollbar = gtk_vscrollbar_new(control_flow_data->v_adjust);
+ gtk_box_pack_start(GTK_BOX(drawing->hbox), drawing->viewport,
+ TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(drawing->hbox), drawing->scrollbar,
+ FALSE, FALSE, 0);
+
+ //drawing->scrolled_window =
+ // gtk_scrolled_window_new (NULL,
+ // control_flow_data->v_adjust);
+
+ //gtk_scrolled_window_set_policy(
+ // GTK_SCROLLED_WINDOW(drawing->scrolled_window),
+ // GTK_POLICY_NEVER,
+ // GTK_POLICY_AUTOMATIC);
+
+ gtk_container_add(GTK_CONTAINER(drawing->viewport),
+ drawing->drawing_area);
+ //gtk_scrolled_window_add_with_viewport(
+ // GTK_SCROLLED_WINDOW(drawing->scrolled_window),
+ // drawing->drawing_area);
+
+ gtk_box_pack_start(GTK_BOX(drawing->vbox), drawing->ruler_hbox,
FALSE, FALSE, 0);
- gtk_box_pack_end(GTK_BOX(drawing->vbox), drawing->drawing_area,
+ gtk_box_pack_end(GTK_BOX(drawing->vbox), drawing->hbox,
TRUE, TRUE, 0);
drawing->pango_layout =
gtk_widget_create_pango_layout(drawing->drawing_area, NULL);
+
+ drawing->dotted_gc = NULL;
+
+ drawing->height = 1;
+ drawing->width = 1;
+ drawing->depth = 0;
+
+ drawing->damage_begin = 0;
+ drawing->damage_end = 0;
//gtk_widget_set_size_request(drawing->drawing_area->window, 50, 50);
g_object_set_data_full(
// drawing->drawing_area->allocation.height,
// -1);
- gtk_widget_add_events(drawing->drawing_area, GDK_BUTTON_PRESS_MASK);
-
g_signal_connect (G_OBJECT(drawing->drawing_area),
"configure_event",
G_CALLBACK (configure_event),
(gpointer)drawing);
+ g_signal_connect (G_OBJECT(drawing->scrollbar),
+ "size-allocate",
+ G_CALLBACK(scrollbar_size_allocate),
+ (gpointer)drawing);
+
+
+
g_signal_connect (G_OBJECT(drawing->drawing_area),
"expose_event",
G_CALLBACK (expose_event),
(gpointer)drawing);
+ g_signal_connect_after (G_OBJECT(drawing->drawing_area),
+ "expose_event",
+ G_CALLBACK (after_expose_event),
+ (gpointer)drawing);
+
g_signal_connect (G_OBJECT(drawing->drawing_area),
"button-press-event",
G_CALLBACK (button_press_event),
(gpointer)drawing);
gtk_widget_show(drawing->ruler);
+ gtk_widget_show(drawing->padding);
+ gtk_widget_show(drawing->ruler_hbox);
+
gtk_widget_show(drawing->drawing_area);
-
+ //gtk_widget_show(drawing->scrolled_window);
+ gtk_widget_show(drawing->viewport);
+ gtk_widget_show(drawing->scrollbar);
+ gtk_widget_show(drawing->hbox);
+
return drawing;
}
void drawing_destroy(Drawing_t *drawing)
{
-
+ g_info("drawing_destroy %p", drawing);
// Do not unref here, Drawing_t destroyed by it's widget.
//g_object_unref( G_OBJECT(drawing->drawing_area));
-
+ if(drawing->gc != NULL)
+ gdk_gc_unref(drawing->gc);
+
g_free(drawing->pango_layout);
+ if(!drawing->dotted_gc) gdk_gc_unref(drawing->dotted_gc);
g_free(drawing);
+ g_info("drawing_destroy end");
}
GtkWidget *drawing_get_drawing_area(Drawing_t *drawing)
*
* Convert from window pixel and time interval to an absolute time.
*/
+//FIXME : could need ceil and floor versions of this function
void convert_pixels_to_time(
gint width,
guint x,
- LttTime *window_time_begin,
- LttTime *window_time_end,
+ LttTime window_time_begin,
+ LttTime window_time_end,
LttTime *time)
{
LttTime window_time_interval;
- window_time_interval = ltt_time_sub(*window_time_end,
- *window_time_begin);
+ window_time_interval = ltt_time_sub(window_time_end,
+ window_time_begin);
*time = ltt_time_mul(window_time_interval, (x/(float)width));
- *time = ltt_time_add(*window_time_begin, *time);
+ *time = ltt_time_add(window_time_begin, *time);
}
-
+//FIXME : could need ceil and floor versions of this function
void convert_time_to_pixels(
LttTime window_time_begin,
guint *x)
{
LttTime window_time_interval;
- float interval_float, time_float;
+ double interval_double, time_double;
+
+ g_assert(ltt_time_compare(window_time_begin, time) <= 0 &&
+ ltt_time_compare(window_time_end, time) >= 0);
window_time_interval = ltt_time_sub(window_time_end,window_time_begin);
time = ltt_time_sub(time, window_time_begin);
- interval_float = ltt_time_to_double(window_time_interval);
- time_float = ltt_time_to_double(time);
+ /* LttTime to double conversions here should really be under 4000 hours.. */
+ interval_double = ltt_time_to_double(window_time_interval);
+ time_double = ltt_time_to_double(time);
- *x = (guint)(time_float/interval_float * width);
+ *x = (guint)(time_double/interval_double * width);
}
-void drawing_refresh ( Drawing_t *drawing,
- guint x, guint y,
- guint width, guint height)
-{
- g_info("Drawing.c : drawing_refresh %u, %u, %u, %u", x, y, width, height);
- GdkRectangle update_rect;
-
- gdk_draw_drawable(
- drawing->drawing_area->window,
- drawing->drawing_area->
- style->fg_gc[GTK_WIDGET_STATE (drawing->drawing_area)],
- GDK_DRAWABLE(drawing->pixmap),
- x, y,
- x, y,
- width, height);
-
- update_rect.x = 0 ;
- update_rect.y = 0 ;
- update_rect.width = drawing->width;
- update_rect.height = drawing->height ;
- gtk_widget_draw( drawing->drawing_area, &update_rect);
-
-}
-
-
void drawing_draw_line( Drawing_t *drawing,
GdkPixmap *pixmap,
guint x1, guint y1,
x1, y1, x2, y2);
}
+void drawing_clear(Drawing_t *drawing)
+{
+ if (drawing->pixmap)
+ gdk_pixmap_unref(drawing->pixmap);
-
-
-void drawing_resize(Drawing_t *drawing, guint h, guint w)
-{
- drawing->height = h ;
- drawing->width = w ;
-
- gtk_widget_set_size_request ( drawing->drawing_area,
- drawing->width,
- drawing->height);
-
+ drawing->height = 1;
+ /* Allocate a new pixmap with new height */
+ drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window,
+ drawing->width + SAFETY,
+ drawing->height,
+ -1);
+
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ drawing->height);
+ gtk_widget_queue_resize_no_redraw(drawing->drawing_area);
+ /* ask for the buffer to be redrawn */
+ gtk_widget_queue_draw_area ( drawing->drawing_area,
+ 0, 0,
+ drawing->width, drawing->height);
}
/* Allocate a new pixmap with new height */
GdkPixmap *pixmap = gdk_pixmap_new(drawing->drawing_area->window,
drawing->width + SAFETY,
- drawing->height + height + SAFETY,
+ drawing->height + height,
-1);
/* Copy the high region */
drawing->pixmap,
0, y,
0, y + height,
- drawing->width+SAFETY, drawing->height - y + SAFETY);
-
-
+ drawing->width+SAFETY, drawing->height - y);
if (drawing->pixmap)
drawing->pixmap = pixmap;
- drawing->height+=height;
-
- /* Rectangle to update, from new drawing dimensions */
- //update_rect.x = 0 ;
- //update_rect.y = y ;
- //update_rect.width = drawing->width;
- //update_rect.height = drawing->height - y ;
- //gtk_widget_draw( drawing->drawing_area, &update_rect);
+ if(drawing->height==1) drawing->height = height;
+ else drawing->height += height;
+
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ drawing->height);
+ gtk_widget_queue_resize_no_redraw(drawing->drawing_area);
+
+ /* ask for the buffer to be redrawn */
+ gtk_widget_queue_draw_area ( drawing->drawing_area,
+ 0, y,
+ drawing->width, drawing->height-y);
}
guint y,
guint height)
{
- //GdkRectangle update_rect;
-
- /* Allocate a new pixmap with new height */
- GdkPixmap *pixmap = gdk_pixmap_new(
- drawing->drawing_area->window,
- drawing->width + SAFETY,
- drawing->height - height + SAFETY,
- -1);
-
- /* Copy the high region */
- gdk_draw_drawable (pixmap,
- drawing->drawing_area->style->black_gc,
- drawing->pixmap,
- 0, 0,
- 0, 0,
- drawing->width + SAFETY, y);
-
+ GdkPixmap *pixmap;
+ if(drawing->height == height) {
+ pixmap = gdk_pixmap_new(
+ drawing->drawing_area->window,
+ drawing->width + SAFETY,
+ 1,
+ -1);
+ drawing->height=1;
+ } else {
+ /* Allocate a new pixmap with new height */
+ pixmap = gdk_pixmap_new(
+ drawing->drawing_area->window,
+ drawing->width + SAFETY,
+ drawing->height - height,
+ -1);
+
+ /* Copy the high region */
+ gdk_draw_drawable (pixmap,
+ drawing->drawing_area->style->black_gc,
+ drawing->pixmap,
+ 0, 0,
+ 0, 0,
+ drawing->width + SAFETY, y);
- /* Copy up the bottom of the region */
- gdk_draw_drawable (pixmap,
- drawing->drawing_area->style->black_gc,
- drawing->pixmap,
- 0, y + height,
- 0, y,
- drawing->width, drawing->height - y - height + SAFETY);
+ /* Copy up the bottom of the region */
+ gdk_draw_drawable (pixmap,
+ drawing->drawing_area->style->black_gc,
+ drawing->pixmap,
+ 0, y + height,
+ 0, y,
+ drawing->width, drawing->height - y - height);
+ drawing->height-=height;
+ }
if (drawing->pixmap)
gdk_pixmap_unref(drawing->pixmap);
drawing->pixmap = pixmap;
- drawing->height-=height;
-
- /* Rectangle to update, from new drawing dimensions */
- //update_rect.x = 0 ;
- //update_rect.y = y ;
- //update_rect.width = drawing->width;
- //update_rect.height = drawing->height - y ;
- //gtk_widget_draw( drawing->drawing_area, &update_rect);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ drawing->height);
+ gtk_widget_queue_resize_no_redraw(drawing->drawing_area);
+ /* ask for the buffer to be redrawn */
+ gtk_widget_queue_draw_area ( drawing->drawing_area,
+ 0, y,
+ drawing->width, MAX(drawing->height-y, 1));
}
void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window)
expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
{
Drawing_t *drawing = (Drawing_t*)user_data;
-
+ TimeWindow time_window = lttvwindow_get_time_window(drawing->control_flow_data->tab);
gchar text[255];
PangoContext *context;
GdkColor background = { 0, 0xffff, 0xffff, 0xffff };
LttTime window_end =
- ltt_time_add(drawing->control_flow_data->time_window.time_width,
- drawing->control_flow_data->time_window.start_time);
+ ltt_time_add(time_window.time_width,
+ time_window.start_time);
LttTime half_width =
- ltt_time_div(drawing->control_flow_data->time_window.time_width,2.0);
+ ltt_time_div(time_window.time_width,2.0);
LttTime window_middle =
ltt_time_add(half_width,
- drawing->control_flow_data->time_window.start_time);
- g_critical("ruler expose event");
+ time_window.start_time);
+ g_debug("ruler expose event");
gdk_draw_rectangle (drawing->ruler->window,
drawing->ruler->style->white_gc,
snprintf(text, 255, "%lus\n%luns",
- drawing->control_flow_data->time_window.start_time.tv_sec,
- drawing->control_flow_data->time_window.start_time.tv_nsec);
+ time_window.start_time.tv_sec,
+ time_window.start_time.tv_nsec);
layout = gtk_widget_create_pango_layout(drawing->drawing_area, NULL);
static gboolean
motion_notify_ruler(GtkWidget *widget, GdkEventMotion *event, gpointer user_data)
{
- //g_critical("motion");
+ //g_debug("motion");
//eventually follow mouse and show time here
}