Pixmap to pixmap name change

[lttv.git] / ltt / branches / poly / lttv / modules / guiControlFlow / Drawing.c

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
index 9242cbe15e5ae84dc48c20aad69b114fa2c41f32..8c34ba859b49a3181bb6261b7c4c17cec4b13018 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
@@ -46,7 +46,7 @@ static GdkColor CF_Colors [] =
  * erase drawing already present (SAFETY).
  */
 void drawing_data_request(Drawing_t *Drawing,
-      GdkPixmap **Pixmap,
+      GdkPixmap **pixmap,
       gint x, gint y,
       gint width,
       gint height)
@@ -56,44 +56,44 @@ 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,
-                        control_flow_data->Time_Window.start_time);
+  LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
+                        control_flow_data->time_window.start_time);
 
   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("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);
 
-  convert_pixels_to_time(Drawing->Drawing_Area_V->allocation.width, x,
-        &control_flow_data->Time_Window.start_time,
+  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,
-        &control_flow_data->Time_Window.start_time,
+  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->Parent_Window);
+        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),
-  //Drawing, *Pixmap, x, y, width, height);
+  //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;
@@ -111,7 +111,7 @@ void drawing_data_request(Drawing_t *Drawing,
   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->Parent_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);
@@ -128,7 +128,7 @@ void drawing_data_request(Drawing_t *Drawing,
       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->Parent_Window);
+  //state_remove_event_hooks_api(control_flow_data->mw);
 
   lttv_hooks_destroy(after_traceset);
   lttv_hooks_destroy(event);
@@ -156,11 +156,11 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
    * has updated the time interval before this configure gets
    * executed.
    */
-  get_time_window(Drawing->Control_Flow_Data->Parent_Window,
-        &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,
+  /* New pixmap, size of the configure event */
+  //GdkPixmap *pixmap = gdk_pixmap_new(widget->window,
   //      widget->allocation.width + SAFETY,
   //      widget->allocation.height + SAFETY,
   //      -1);
@@ -169,25 +169,25 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
   g_critical("New 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)
+  /* If no old pixmap present */
+  //if(Drawing->pixmap == NULL)
   {
-    Drawing->Pixmap = gdk_pixmap_new(
+    Drawing->pixmap = gdk_pixmap_new(
     widget->window,
     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;
     
 
     // Clear the image
-    gdk_draw_rectangle (Drawing->Pixmap,
+    gdk_draw_rectangle (Drawing->pixmap,
           widget->style->white_gc,
           TRUE,
           0, 0,
@@ -200,7 +200,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
     /* Initial data request */
     // 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,
+    drawing_data_request(Drawing, &Drawing->pixmap, 0, 0,
         widget->allocation.width,
         widget->allocation.height);
                           
@@ -214,7 +214,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
   }
 #ifdef NOTUSE
 //  /* Draw empty background */ 
-//  gdk_draw_rectangle (Pixmap,
+//  gdk_draw_rectangle (pixmap,
 //          widget->style->black_gc,
 //          TRUE,
 //          0, 0,
@@ -222,20 +222,20 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
 //          widget->allocation.height);
   
   /* Copy old data to new pixmap */
-  gdk_draw_drawable (Pixmap,
+  gdk_draw_drawable (pixmap,
     widget->style->white_gc,
-    Drawing->Pixmap,
+    Drawing->pixmap,
     0, 0,
     0, 0,
     -1, -1);
     
-  if (Drawing->Pixmap)
-    gdk_pixmap_unref(Drawing->Pixmap);
+  if (Drawing->pixmap)
+    gdk_pixmap_unref(Drawing->pixmap);
 
-  Drawing->Pixmap = Pixmap;
+  Drawing->pixmap = pixmap;
     
   // Clear the bottom part of the image (SAFETY)
-  gdk_draw_rectangle (Pixmap,
+  gdk_draw_rectangle (pixmap,
           widget->style->white_gc,
           TRUE,
           0, Drawing->height+SAFETY,
@@ -243,7 +243,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
           (widget->allocation.height) - Drawing->height);
 
   // Clear the right part of the image (SAFETY)
-  gdk_draw_rectangle (Pixmap,
+  gdk_draw_rectangle (pixmap,
           widget->style->white_gc,
           TRUE,
           Drawing->width+SAFETY, 0,
@@ -251,8 +251,8 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
           Drawing->height+SAFETY);
 
   /* Clear the backgound for data request, but not SAFETY */
-  gdk_draw_rectangle (Pixmap,
-          Drawing->Drawing_Area_V->style->white_gc,
+  gdk_draw_rectangle (pixmap,
+          Drawing->drawing_area->style->white_gc,
           TRUE,
           Drawing->width + SAFETY, 0,
           widget->allocation.width - Drawing->width,  // do not overlap
@@ -260,7 +260,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
 
   /* Request data for missing space */
   g_info("missing data request");
-  drawing_data_request(Drawing, &Pixmap, Drawing->width, 0,
+  drawing_data_request(Drawing, &pixmap, Drawing->width, 0,
       widget->allocation.width - Drawing->width,
       widget->allocation.height);
                           
@@ -280,34 +280,34 @@ 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");
   
   guint x=0;
-  LttTime* Current_Time = 
+  LttTime* current_time = 
       guicontrolflow_get_current_time(control_flow_data);
 
-  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(control_flow_data->time_window.time_width,
+                      control_flow_data->time_window.start_time);
 
   convert_time_to_pixels(
-        control_flow_data->Time_Window.start_time,
+        control_flow_data->time_window.start_time,
         window_end,
-        *Current_Time,
+        *current_time,
         widget->allocation.width,
         &x);
   
   gdk_draw_pixmap(widget->window,
       widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-      Drawing->Pixmap,
+      Drawing->pixmap,
       event->area.x, event->area.y,
       event->area.x, event->area.y,
       event->area.width, event->area.height);
 
   if(x >= event->area.x && x <= event->area.x+event->area.width)
   {
-    GdkGC *gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+    GdkGC *gc = gdk_gc_new(control_flow_data->Drawing->pixmap);
     gdk_gc_copy(gc, widget->style->black_gc);
     
     drawing_draw_line(NULL, widget->window,
@@ -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;
 
 
@@ -335,19 +335,19 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data
   {
     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(control_flow_data->time_window.time_width,
+                        control_flow_data->time_window.start_time);
 
 
     /* left mouse button click */
     g_critical("x click is : %f", event->x);
 
     convert_pixels_to_time(widget->allocation.width, (guint)event->x,
-        &control_flow_data->Time_Window.start_time,
+        &control_flow_data->time_window.start_time,
         &window_end,
         &time);
 
-    set_current_time(control_flow_data->Parent_Window, &time);
+    set_current_time(control_flow_data->mw, &time);
 
   }
   
@@ -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->pixmap = gdk_pixmap_new(
+  //    Drawing->drawing_area->window,
   //    Drawing->width,
   //    Drawing->height,
   //    Drawing->depth);
   
-  Drawing->Pixmap = NULL;
+  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,10 +483,10 @@ 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)],
-    GDK_DRAWABLE(Drawing->Pixmap),
+    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);
@@ -495,18 +495,18 @@ 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);
 
 }
 
 
 void drawing_draw_line( Drawing_t *Drawing,
-      GdkPixmap *Pixmap,
+      GdkPixmap *pixmap,
       guint x1, guint y1,
       guint x2, guint y2,
       GdkGC *GC)
 {
-  gdk_draw_line (Pixmap,
+  gdk_draw_line (pixmap,
       GC,
       x1, y1, x2, y2);
 }
@@ -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,15 +536,15 @@ 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->Pixmap,
+  gdk_draw_drawable (pixmap,
+    Drawing->drawing_area->style->black_gc,
+    Drawing->pixmap,
     0, 0,
     0, 0,
     Drawing->width + SAFETY, y);
@@ -553,8 +553,8 @@ void drawing_insert_square(Drawing_t *Drawing,
 
 
   /* add an empty square */
-  gdk_draw_rectangle (Pixmap,
-    Drawing->Drawing_Area_V->style->white_gc,
+  gdk_draw_rectangle (pixmap,
+    Drawing->drawing_area->style->white_gc,
     TRUE,
     0, y,
     Drawing->width + SAFETY,  // do not overlap
@@ -563,9 +563,9 @@ 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->Pixmap,
+  gdk_draw_drawable (pixmap,
+    Drawing->drawing_area->style->black_gc,
+    Drawing->pixmap,
     0, y,
     0, y + height,
     Drawing->width+SAFETY, Drawing->height - y + SAFETY);
@@ -573,10 +573,10 @@ void drawing_insert_square(Drawing_t *Drawing,
 
 
 
-  if (Drawing->Pixmap)
-    gdk_pixmap_unref(Drawing->Pixmap);
+  if (Drawing->pixmap)
+    gdk_pixmap_unref(Drawing->pixmap);
 
-  Drawing->Pixmap = Pixmap;
+  Drawing->pixmap = pixmap;
   
   Drawing->height+=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);
 }
 
 
@@ -597,16 +597,16 @@ void drawing_remove_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->Pixmap,
+  gdk_draw_drawable (pixmap,
+    Drawing->drawing_area->style->black_gc,
+    Drawing->pixmap,
     0, 0,
     0, 0,
     Drawing->width + SAFETY, y);
@@ -614,18 +614,18 @@ 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->Pixmap,
+  gdk_draw_drawable (pixmap,
+    Drawing->drawing_area->style->black_gc,
+    Drawing->pixmap,
     0, y + height,
     0, y,
     Drawing->width, Drawing->height - y - height + SAFETY);
 
 
-  if (Drawing->Pixmap)
-    gdk_pixmap_unref(Drawing->Pixmap);
+  if (Drawing->pixmap)
+    gdk_pixmap_unref(Drawing->pixmap);
 
-  Drawing->Pixmap = Pixmap;
+  Drawing->pixmap = pixmap;
   
   Drawing->height-=height;
   
@@ -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);
 }