X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FDrawing.c;h=3bd8629edfb883aed07677e5bc8ab283dc2cf277;hb=14963be07f6a9c7c2db0d988f557b870ebd5dead;hp=7a116cb933adfb997066d49ccaf73782ba5ddb78;hpb=ba90bc77f7ef2ffc59cc08b6234c61274cdd4396;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
index 7a116cb9..3bd8629e 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
@@ -56,8 +56,8 @@ void drawing_data_request(Drawing_t *Drawing,
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(
-                    Drawing->Drawing_Area_V),
-                "Control_Flow_Data");
+                    Drawing->drawing_area),
+                "control_flow_data");
 
   LttTime start, end;
   LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
@@ -71,12 +71,12 @@ void drawing_data_request(Drawing_t *Drawing,
   
   g_critical("x is : %i, x+width is : %i", x, x+width);
 
-  convert_pixels_to_time(Drawing->Drawing_Area_V->allocation.width, x,
+  convert_pixels_to_time(Drawing->drawing_area->allocation.width, x,
         &control_flow_data->time_window.start_time,
         &window_end,
         &start);
 
-  convert_pixels_to_time(Drawing->Drawing_Area_V->allocation.width, x + width,
+  convert_pixels_to_time(Drawing->drawing_area->allocation.width, x + width,
         &control_flow_data->time_window.start_time,
         &window_end,
         &end);
@@ -85,15 +85,15 @@ void drawing_data_request(Drawing_t *Drawing,
         get_traceset_context(control_flow_data->mw);
   
     //send_test_process(
-  //guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
+  //guicontrolflow_get_process_list(Drawing->control_flow_data),
   //Drawing);
   //send_test_drawing(
-  //guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
+  //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.control_flow_data = control_flow_data;
   event_request.time_begin = start;
   event_request.time_end = end;
   event_request.x_begin = x;
@@ -156,8 +156,8 @@ 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);
+  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,
@@ -180,7 +180,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
     widget->allocation.width + SAFETY,
     widget->allocation.height + SAFETY,
     //ProcessList_get_height
-    // (GuiControlFlow_get_process_list(Drawing->Control_Flow_Data)),
+    // (GuiControlFlow_get_process_list(Drawing->control_flow_data)),
     -1);
     Drawing->width = widget->allocation.width;
     Drawing->height = widget->allocation.height;
@@ -252,7 +252,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
 
   /* Clear the backgound for data request, but not SAFETY */
   gdk_draw_rectangle (Pixmap,
-          Drawing->Drawing_Area_V->style->white_gc,
+          Drawing->drawing_area->style->white_gc,
           TRUE,
           Drawing->width + SAFETY, 0,
           widget->allocation.width - Drawing->width,  // do not overlap
@@ -280,7 +280,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
-                "Control_Flow_Data");
+                "control_flow_data");
 
   g_critical("drawing expose event");
   
@@ -326,7 +326,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
   ControlFlowData *control_flow_data =
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
-                "Control_Flow_Data");
+                "control_flow_data");
   Drawing_t *Drawing = control_flow_data->Drawing;
 
 
@@ -357,59 +357,59 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
 
 
 
-Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data)
+Drawing_t *drawing_construct(ControlFlowData *control_flow_data)
 {
   Drawing_t *Drawing = g_new(Drawing_t, 1);
     
-  Drawing->Drawing_Area_V = gtk_drawing_area_new ();
-  Drawing->Control_Flow_Data = Control_Flow_Data;
+  Drawing->drawing_area = gtk_drawing_area_new ();
+  Drawing->control_flow_data = control_flow_data;
 
   Drawing->pango_layout =
-    gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, NULL);
+    gtk_widget_create_pango_layout(Drawing->drawing_area, NULL);
   
-  //gtk_widget_set_size_request(Drawing->Drawing_Area_V->window, 50, 50);
+  //gtk_widget_set_size_request(Drawing->drawing_area->window, 50, 50);
   g_object_set_data_full(
-      G_OBJECT(Drawing->Drawing_Area_V),
+      G_OBJECT(Drawing->drawing_area),
       "Link_Drawing_Data",
       Drawing,
       (GDestroyNotify)drawing_destroy);
 
-  //gtk_widget_modify_bg( Drawing->Drawing_Area_V,
+  //gtk_widget_modify_bg( Drawing->drawing_area,
   //      GTK_STATE_NORMAL,
   //      &CF_Colors[BLACK]);
   
-  //gdk_window_get_geometry(Drawing->Drawing_Area_V->window,
+  //gdk_window_get_geometry(Drawing->drawing_area->window,
   //    NULL, NULL,
   //    &(Drawing->width),
   //    &(Drawing->height),
   //    -1);
   
   //Drawing->Pixmap = gdk_pixmap_new(
-  //    Drawing->Drawing_Area_V->window,
+  //    Drawing->drawing_area->window,
   //    Drawing->width,
   //    Drawing->height,
   //    Drawing->depth);
   
   Drawing->Pixmap = NULL;
 
-//  Drawing->Pixmap = gdk_pixmap_new(Drawing->Drawing_Area_V->window,
-//        Drawing->Drawing_Area_V->allocation.width,
-//        Drawing->Drawing_Area_V->allocation.height,
+//  Drawing->Pixmap = gdk_pixmap_new(Drawing->drawing_area->window,
+//        Drawing->drawing_area->allocation.width,
+//        Drawing->drawing_area->allocation.height,
 //        -1);
 
-  gtk_widget_add_events(Drawing->Drawing_Area_V, GDK_BUTTON_PRESS_MASK);
+  gtk_widget_add_events(Drawing->drawing_area, GDK_BUTTON_PRESS_MASK);
   
-  g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
+  g_signal_connect (G_OBJECT(Drawing->drawing_area),
         "configure_event",
         G_CALLBACK (configure_event),
         (gpointer)Drawing);
   
-  g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
+  g_signal_connect (G_OBJECT(Drawing->drawing_area),
         "expose_event",
         G_CALLBACK (expose_event),
         (gpointer)Drawing);
 
-  g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
+  g_signal_connect (G_OBJECT(Drawing->drawing_area),
         "button-press-event",
         G_CALLBACK (button_press_event),
         (gpointer)Drawing);
@@ -422,7 +422,7 @@ void drawing_destroy(Drawing_t *Drawing)
 {
 
   // Do not unref here, Drawing_t destroyed by it's widget.
-  //g_object_unref( G_OBJECT(Drawing->Drawing_Area_V));
+  //g_object_unref( G_OBJECT(Drawing->drawing_area));
     
   g_free(Drawing->pango_layout);
   g_free(Drawing);
@@ -430,7 +430,7 @@ void drawing_destroy(Drawing_t *Drawing)
 
 GtkWidget *drawing_get_widget(Drawing_t *Drawing)
 {
-  return Drawing->Drawing_Area_V;
+  return Drawing->drawing_area;
 }
 
 /* convert_pixels_to_time
@@ -483,9 +483,9 @@ void drawing_refresh (  Drawing_t *Drawing,
   GdkRectangle update_rect;
 
   gdk_draw_drawable(
-    Drawing->Drawing_Area_V->window,
-    Drawing->Drawing_Area_V->
-     style->fg_gc[GTK_WIDGET_STATE (Drawing->Drawing_Area_V)],
+    Drawing->drawing_area->window,
+    Drawing->drawing_area->
+     style->fg_gc[GTK_WIDGET_STATE (Drawing->drawing_area)],
     GDK_DRAWABLE(Drawing->Pixmap),
     x, y,
     x, y,
@@ -495,7 +495,7 @@ void drawing_refresh (  Drawing_t *Drawing,
   update_rect.y = 0 ;
   update_rect.width = Drawing->width;
   update_rect.height = Drawing->height ;
-  gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
+  gtk_widget_draw( Drawing->drawing_area, &update_rect);
 
 }
 
@@ -519,7 +519,7 @@ void drawing_resize(Drawing_t *Drawing, guint h, guint w)
   Drawing->height = h ;
   Drawing->width = w ;
 
-  gtk_widget_set_size_request ( Drawing->Drawing_Area_V,
+  gtk_widget_set_size_request ( Drawing->drawing_area,
           Drawing->width,
           Drawing->height);
   
@@ -536,14 +536,14 @@ void drawing_insert_square(Drawing_t *Drawing,
   //GdkRectangle update_rect;
 
   /* Allocate a new pixmap with new height */
-  GdkPixmap *Pixmap = gdk_pixmap_new(Drawing->Drawing_Area_V->window,
+  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_V->style->black_gc,
+    Drawing->drawing_area->style->black_gc,
     Drawing->Pixmap,
     0, 0,
     0, 0,
@@ -554,7 +554,7 @@ void drawing_insert_square(Drawing_t *Drawing,
 
   /* add an empty square */
   gdk_draw_rectangle (Pixmap,
-    Drawing->Drawing_Area_V->style->white_gc,
+    Drawing->drawing_area->style->white_gc,
     TRUE,
     0, y,
     Drawing->width + SAFETY,  // do not overlap
@@ -564,7 +564,7 @@ void drawing_insert_square(Drawing_t *Drawing,
 
   /* copy the bottom of the region */
   gdk_draw_drawable (Pixmap,
-    Drawing->Drawing_Area_V->style->black_gc,
+    Drawing->drawing_area->style->black_gc,
     Drawing->Pixmap,
     0, y,
     0, y + height,
@@ -585,7 +585,7 @@ void drawing_insert_square(Drawing_t *Drawing,
   //update_rect.y = y ;
   //update_rect.width = Drawing->width;
   //update_rect.height = Drawing->height - y ;
-  //gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
+  //gtk_widget_draw( Drawing->drawing_area, &update_rect);
 }
 
 
@@ -598,14 +598,14 @@ void drawing_remove_square(Drawing_t *Drawing,
   
   /* Allocate a new pixmap with new height */
   GdkPixmap *Pixmap = gdk_pixmap_new(
-      Drawing->Drawing_Area_V->window,
+      Drawing->drawing_area->window,
       Drawing->width + SAFETY,
       Drawing->height - height + SAFETY,
       -1);
   
   /* Copy the high region */
   gdk_draw_drawable (Pixmap,
-    Drawing->Drawing_Area_V->style->black_gc,
+    Drawing->drawing_area->style->black_gc,
     Drawing->Pixmap,
     0, 0,
     0, 0,
@@ -615,7 +615,7 @@ void drawing_remove_square(Drawing_t *Drawing,
 
   /* Copy up the bottom of the region */
   gdk_draw_drawable (Pixmap,
-    Drawing->Drawing_Area_V->style->black_gc,
+    Drawing->drawing_area->style->black_gc,
     Drawing->Pixmap,
     0, y + height,
     0, y,
@@ -634,7 +634,7 @@ void drawing_remove_square(Drawing_t *Drawing,
   //update_rect.y = y ;
   //update_rect.width = Drawing->width;
   //update_rect.height = Drawing->height - y ;
-  //gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect);
+  //gtk_widget_draw( Drawing->drawing_area, &update_rect);
 }