#include "epan/filesystem.h"
#include "../util.h"
-#include "../color.h"
#include "../simple_dialog.h"
#include "../alert_box.h"
#include <wsutil/file_util.h>
#include "gtk/dlg_utils.h"
#include "gtk/main.h"
#include "gtk/graph_analysis.h"
-#include "../image/voip_select.xpm"
+
+#include "gtk/old-gtk-compat.h"
+
#include "../image/voip_bg.xpm"
/****************************************************************************/
user_data->dlg.needs_redraw=TRUE;
user_data->dlg.draw_area_time=NULL;
user_data->dlg.draw_area=NULL;
+ user_data->dlg.draw_area_comments=NULL;
+#if GTK_CHECK_VERSION(2,22,0)
+ user_data->dlg.surface_main=NULL;
+ user_data->dlg.surface_time=NULL;
+ user_data->dlg.surface_comments=NULL;
+#else
user_data->dlg.pixmap_main=NULL;
user_data->dlg.pixmap_time=NULL;
- user_data->dlg.draw_area_comments=NULL;
user_data->dlg.pixmap_comments=NULL;
+#endif
user_data->dlg.v_scrollbar=NULL;
user_data->dlg.v_scrollbar_adjustment=NULL;
user_data->dlg.hpane=NULL;
- user_data->dlg.pixmap_width = 350;
- user_data->dlg.pixmap_height=400;
+ user_data->dlg.surface_width = 350;
+ user_data->dlg.surface_width=400;
user_data->dlg.first_node=0;
user_data->dlg.first_item=0;
user_data->dlg.left_x_border=0;
#define HEIGHT_ARROW 6
/****************************************************************************/
-static void draw_arrow(GdkDrawable *pixmap, GdkGC *gc, gint x, gint y, gboolean direction)
+#if GTK_CHECK_VERSION(2,22,0)
+static void draw_arrow(cairo_surface_t *surface, GdkColor *color, gint x, gint y, gboolean arrow_type)
{
- GdkPoint arrow_point[3];
+ cairo_t *cr;
- arrow_point[0].x = x;
- arrow_point[0].y = y-HEIGHT_ARROW/2;
- if (direction == RIGHT_ARROW)
- arrow_point[1].x = x+WIDTH_ARROW;
- else
- arrow_point[1].x = x-WIDTH_ARROW;
- arrow_point[1].y = y;
- arrow_point[2].x = x;
- arrow_point[2].y = y+HEIGHT_ARROW/2;;
+ cr = cairo_create (surface);
+ gdk_cairo_set_source_color (cr, color);
+ if (arrow_type == LEFT_ARROW)
+ {
+ cairo_move_to (cr, x + WIDTH_ARROW, y);
+ cairo_line_to (cr, x + WIDTH_ARROW, y + HEIGHT_ARROW);
+ cairo_line_to (cr, x, y + HEIGHT_ARROW / 2.);
+ }
+ else if (arrow_type == RIGHT_ARROW)
+ {
+ cairo_move_to (cr, x, y);
+ cairo_line_to (cr, x + WIDTH_ARROW, y + HEIGHT_ARROW / 2.);
+ cairo_line_to (cr, x, y + HEIGHT_ARROW);
+ }
+ cairo_close_path (cr);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
+}
+#else
+static void draw_arrow(GdkDrawable *pixmap, GdkColor *color, gint x, gint y, gboolean arrow_type)
+{
+ cairo_t *cr;
if (GDK_IS_DRAWABLE(pixmap)) {
- gdk_draw_polygon(pixmap, gc, TRUE, arrow_point, 3);
+ cr = gdk_cairo_create (pixmap);
+ gdk_cairo_set_source_color (cr, color);
+ if (arrow_type == LEFT_ARROW)
+ {
+ cairo_move_to (cr, x + WIDTH_ARROW, y);
+ cairo_line_to (cr, x + WIDTH_ARROW, y + HEIGHT_ARROW);
+ cairo_line_to (cr, x, y + HEIGHT_ARROW / 2.);
+ }
+ else if (arrow_type == RIGHT_ARROW)
+ {
+ cairo_move_to (cr, x, y);
+ cairo_line_to (cr, x + WIDTH_ARROW, y + HEIGHT_ARROW / 2.);
+ cairo_line_to (cr, x, y + HEIGHT_ARROW);
+ }
+ cairo_close_path (cr);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
}
}
+#endif
/****************************************************************************/
/* Adds trailing characters to complete the requested length. */
guint32 bottom_y_border;
graph_analysis_item_t *gai;
- GdkGC *frame_fg_color;
- GdkGC *frame_bg_color;
- GdkGC *div_line_color;
- GdkGC *column_header_gc;
-
PangoLayout *layout;
PangoLayout *middle_layout;
PangoLayout *small_layout;
guint32 draw_width, draw_height;
char label_string[MAX_COMMENT];
GList *list;
+ cairo_t *cr;
- GtkAllocation draw_area_time_alloc, draw_area_alloc, draw_area_comments_alloc;
- GtkStyle *draw_area_time_style, *draw_area_style, *draw_area_comments_style;
- /* new variables */
+ GdkColor *color_p, *bg_color_p;
+ GdkColor black_color = {0, 0, 0, 0};
+ GdkColor white_color = {0, 0xffff, 0xffff, 0xffff};
+ /* gray and soft gray colors */
+ GdkColor grey_color0 = {0, 0x64ff, 0x64ff, 0x64ff};
+ GdkColor grey_color1 = {0, 0x25ff, 0x25ff, 0x25ff};
+
+ /* the first color is blue to highlight the selected item */
+ static GdkColor background_color[MAX_NUM_COL_CONV+1] = {
+ {0, 0x00FF, 0x00FF, 0xFFFF},
+ {0, 0x90FF, 0xEEFF, 0x90FF},
+ {0, 0xFFFF, 0xA0FF, 0x7AFF},
+ {0, 0xFFFF, 0xB6FF, 0xC1FF},
+ {0, 0xFAFF, 0xFAFF, 0xD2FF},
+ {0, 0xFFFF, 0xFFFF, 0x33FF},
+ {0, 0x66FF, 0xCDFF, 0xAAFF},
+ {0, 0xE0FF, 0xFFFF, 0xFFFF},
+ {0, 0xB0FF, 0xC4FF, 0xDEFF},
+ {0, 0x87FF, 0xCEFF, 0xFAFF},
+ {0, 0xD3FF, 0xD3FF, 0xD3FF}
+ };
+
+ /* XXX can't we just set the background color ? */
+ GdkPixbuf *bg_pixbuf = gdk_pixbuf_new_from_xpm_data(voip_bg_xpm);
+
+ /* Dashed line pattern */
+ static const double dashed1[] = {5.0, 4.0};
+ static int len1 = sizeof(dashed1) / sizeof(dashed1[0]);
+
+ GtkAllocation draw_area_time_alloc, draw_area_alloc, draw_area_comments_alloc;
if(!user_data->dlg.needs_redraw){
return;
}
user_data->dlg.needs_redraw=FALSE;
- column_header_gc = gdk_gc_new(user_data->dlg.pixmap_time);
- gdk_gc_set_fill(column_header_gc,GDK_TILED);
- gdk_gc_set_tile(column_header_gc, gdk_pixmap_create_from_xpm_d(user_data->dlg.pixmap_time,NULL,NULL,(gchar **)voip_bg_xpm));
-
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_get_allocation(user_data->dlg.draw_area_time, &draw_area_time_alloc);
gtk_widget_get_allocation(user_data->dlg.draw_area, &draw_area_alloc);
gtk_widget_get_allocation(user_data->dlg.draw_area_comments, &draw_area_comments_alloc);
+
+ /* Clear out old plot */
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_time);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width,draw_area_time_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+
+ cr = cairo_create (user_data->dlg.surface_main);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_rectangle (cr, 0, 0, draw_area_alloc.width,draw_area_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+
+ cr = cairo_create (user_data->dlg.surface_comments);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width,draw_area_comments_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+
#else
- draw_area_time_alloc = user_data->dlg.draw_area_time->allocation;
- draw_area_alloc = user_data->dlg.draw_area->allocation;
- draw_area_comments_alloc = user_data->dlg.draw_area_comments->allocation;
-#endif
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_time);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width,draw_area_time_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
- draw_area_time_style = gtk_widget_get_style(user_data->dlg.draw_area_time);
- draw_area_style = gtk_widget_get_style(user_data->dlg.draw_area);
- draw_area_comments_style = gtk_widget_get_style(user_data->dlg.draw_area_comments);
-
- /* Clear out old plt */
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) )
- gdk_draw_rectangle(user_data->dlg.pixmap_time,
- draw_area_time_style->white_gc,
- TRUE,
- 0, 0,
- draw_area_time_alloc.width,
- draw_area_time_alloc.height);
-
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) )
- gdk_draw_rectangle(user_data->dlg.pixmap_main,
- draw_area_style->white_gc,
- TRUE,
- 0, 0,
- draw_area_alloc.width,
- draw_area_alloc.height);
-
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) )
- gdk_draw_rectangle(user_data->dlg.pixmap_comments,
- draw_area_style->white_gc,
- TRUE,
- 0, 0,
- draw_area_comments_alloc.width,
- draw_area_comments_alloc.height);
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_rectangle (cr, 0, 0, draw_area_alloc.width,draw_area_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_comments);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width,draw_area_comments_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
+#endif
/* Calculate the y border */
top_y_border=TOP_Y_BORDER; /* to display the node address */
bottom_y_border=BOTTOM_Y_BORDER;
user_data->dlg.left_x_border = left_x_border;
right_x_border=0;
- draw_width=user_data->dlg.pixmap_width-right_x_border-left_x_border;
+ draw_width=user_data->dlg.surface_width-right_x_border-left_x_border;
+#if GTK_CHECK_VERSION(2,22,0)
/* Paint time title background */
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) )
- gdk_draw_rectangle(user_data->dlg.pixmap_time,
- column_header_gc,
- TRUE, /* TRUE if the rectangle should be filled.*/
- 0, /* the x coordinate of the left edge of the rectangle.*/
- 0, /* the y coordinate of the top edge of the rectangle. */
- draw_area_time_alloc.width, /* the width of the rectangle. */
- top_y_border); /* the height of the rectangle. */
+ cr = cairo_create (user_data->dlg.surface_time);
+ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+
/* Paint main title background */
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) )
- gdk_draw_rectangle(user_data->dlg.pixmap_main,
- column_header_gc,
- TRUE,
- 0,
- 0,
- draw_area_alloc.width,
- top_y_border);
+ cr = cairo_create (user_data->dlg.surface_main);
+ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+ cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+
/* Paint main comment background */
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) )
- gdk_draw_rectangle(user_data->dlg.pixmap_comments,
- column_header_gc,
- TRUE,
- 0,
- 0,
- draw_area_comments_alloc.width,
- top_y_border);
+ cr = cairo_create (user_data->dlg.surface_comments);
+ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+#else
+ /* Paint time title background */
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_time);
+ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
+ /* Paint main title background */
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+ cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
+ /* Paint main comment background */
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_comments);
+ gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
+ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
+
+#endif
/* Draw the word "Time" on top of time column */
g_snprintf(label_string, label_width, "%s", " Time");
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &label_width, &label_height);
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_time);
+ cairo_move_to (cr, left_x_border, top_y_border/2-label_height/2);
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_time)) {
- gdk_draw_layout(user_data->dlg.pixmap_time,
- draw_area_time_style->black_gc,
- left_x_border,
- top_y_border/2-label_height/2,
- layout);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_time);
+ cairo_move_to (cr, left_x_border, top_y_border/2-label_height/2);
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
}
-
+#endif
/* Draw the word "Comment" on top of comment column */
g_snprintf(label_string, label_width, "%s", "Comment");
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &label_width, &label_height);
- if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments)) {
- gdk_draw_layout(user_data->dlg.pixmap_comments,
- draw_area_comments_style->black_gc,
- MAX_COMMENT/2-label_width/2,
- top_y_border/2-label_height/2,
- layout);
- }
-
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_comments);
+ cairo_move_to (cr, MAX_COMMENT/2-label_width/2, top_y_border/2-((i&1)?0:label_height));
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
+#endif
/* Paint the background items */
for (current_item=0; current_item<display_items; current_item++){
/*select the color. if it is the selected item select blue color */
if ( current_item+first_item == user_data->dlg.selected_item ) {
- gdk_gc_set_ts_origin(user_data->dlg.bg_gc[0],left_x_border,top_y_border+current_item*ITEM_HEIGHT);
- frame_bg_color = user_data->dlg.bg_gc[0];
+ bg_color_p = &background_color[0]; /* blue */
} else {
- frame_bg_color = user_data->dlg.bg_gc[1+user_data->dlg.items[current_item].conv_num%MAX_NUM_COL_CONV];
+ bg_color_p = &background_color[1+user_data->dlg.items[current_item].conv_num%MAX_NUM_COL_CONV];
}
-
+#if GTK_CHECK_VERSION(2,22,0)
/* Paint background */
+ cr = cairo_create (user_data->dlg.surface_main);
+ gdk_cairo_set_source_color (cr, bg_color_p);
+ cairo_rectangle (cr, left_x_border, top_y_border+current_item*ITEM_HEIGHT, draw_width, ITEM_HEIGHT);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main)) {
- gdk_draw_rectangle(user_data->dlg.pixmap_main,
- frame_bg_color,
- TRUE,
- left_x_border,
- top_y_border+current_item*ITEM_HEIGHT,
- draw_width,
- ITEM_HEIGHT);
+ /* Paint background */
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ gdk_cairo_set_source_color (cr, bg_color_p);
+ cairo_rectangle (cr, left_x_border, top_y_border+current_item*ITEM_HEIGHT, draw_width, ITEM_HEIGHT);
+ cairo_fill (cr);
+ cairo_destroy (cr);
}
+#endif
}
/* Draw the node names on top and the division lines */
for (i=0; i<user_data->num_nodes; i++){
g_strlcpy(label_string, get_addr_name(&(user_data->nodes[i])), NODE_WIDTH/5);
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &label_width, &label_height);
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_main);
+ cairo_move_to (cr, left_x_border+NODE_WIDTH/2-label_width/2+NODE_WIDTH*i, top_y_border/2-((i&1)?0:label_height));
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main)) {
- gdk_draw_layout(user_data->dlg.pixmap_main,
- draw_area_style->black_gc,
- left_x_border+NODE_WIDTH/2-label_width/2+NODE_WIDTH*i,
- top_y_border/2-((i&1)?0:label_height),
- layout);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ cairo_move_to (cr, left_x_border+NODE_WIDTH/2-label_width/2+NODE_WIDTH*i, top_y_border/2-((i&1)?0:label_height));
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
}
-
+#endif
+#if GTK_CHECK_VERSION(2,22,0)
+ /* draw the node division lines */
+ cr = cairo_create (user_data->dlg.surface_main);
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+ cairo_set_dash(cr, dashed1, len1, 0);
+ cairo_move_to(cr, left_x_border+NODE_WIDTH/2+NODE_WIDTH*i, top_y_border);
+ cairo_line_to(cr, (left_x_border+NODE_WIDTH/2+NODE_WIDTH*i),draw_area_alloc.height-bottom_y_border);
+ cairo_stroke(cr);
+ cairo_destroy(cr);
+#else
/* draw the node division lines */
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ) {
- gdk_draw_line(user_data->dlg.pixmap_main, user_data->dlg.div_line_gc[0],
- left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
- top_y_border,
- left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
- draw_area_alloc.height-bottom_y_border);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+ cairo_set_dash(cr, dashed1, len1, 0);
+ cairo_move_to(cr, left_x_border+NODE_WIDTH/2+NODE_WIDTH*i, top_y_border);
+ cairo_line_to(cr, (left_x_border+NODE_WIDTH/2+NODE_WIDTH*i),draw_area_alloc.height-bottom_y_border);
+ cairo_stroke(cr);
+ cairo_destroy(cr);
}
-
+#endif
}
/* Draw the items */
g_snprintf(label_string, MAX_LABEL, "%.3f", user_data->dlg.items[current_item].time);
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &label_width, &label_height);
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_time);
+ cairo_move_to (cr, 3, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2);
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
+ /*draw the comments */
+ g_snprintf(label_string, MAX_COMMENT, "%s", user_data->dlg.items[current_item].comment);
+ pango_layout_set_text(middle_layout, label_string, -1);
+ pango_layout_get_pixel_size(middle_layout, &label_width, &label_height);
+ cr = cairo_create (user_data->dlg.surface_comments);
+ cairo_move_to (cr, 2, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2);
+ pango_cairo_show_layout (cr, middle_layout);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_time)) {
- gdk_draw_layout(user_data->dlg.pixmap_time,
- draw_area_style->black_gc,
- 3,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2,
- layout);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_time);
+ cairo_move_to (cr, 3, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2);
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
}
-
/*draw the comments */
g_snprintf(label_string, MAX_COMMENT, "%s", user_data->dlg.items[current_item].comment);
pango_layout_set_text(middle_layout, label_string, -1);
pango_layout_get_pixel_size(middle_layout, &label_width, &label_height);
+#endif
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_comments);
+ cairo_move_to (cr, 2, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2);
+ pango_cairo_show_layout (cr, middle_layout);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments)) {
- gdk_draw_layout(user_data->dlg.pixmap_comments,
- draw_area_style->black_gc,
- 2,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2,
- middle_layout);
- }
- /* select colors */
- if ( current_item+first_item == user_data->dlg.selected_item ){
- frame_fg_color = draw_area_style->white_gc;
- div_line_color = user_data->dlg.div_line_gc[1];
- } else {
- frame_fg_color = draw_area_style->black_gc;
- div_line_color = user_data->dlg.div_line_gc[0];
+ cr = gdk_cairo_create (user_data->dlg.pixmap_comments);
+ cairo_move_to (cr, 2, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2);
+ pango_cairo_show_layout (cr, middle_layout);
+ cairo_destroy (cr);
+ cr = NULL;
}
+#endif
/* draw the arrow line */
start_arrow = left_x_border+(user_data->dlg.items[current_item].src_node)*NODE_WIDTH+NODE_WIDTH/2;
end_arrow = left_x_border+(user_data->dlg.items[current_item].dst_node)*NODE_WIDTH+NODE_WIDTH/2;
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_main);
+ if (user_data->dlg.items[current_item].line_style == 2) {
+ /* draw a line thick */
+ cairo_set_line_width (cr, 2.0);
+ }else{
+ cairo_set_line_width (cr, 1.0);
+ }
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ /* draw white line */
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ }else{
+ /* draw black line */
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ }
+ cairo_move_to(cr, start_arrow, (top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7)+0.5);
+ cairo_line_to(cr, end_arrow, (top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7)+0.5);
+ cairo_stroke(cr);
+ cairo_destroy(cr);
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ) {
- gdk_draw_line(user_data->dlg.pixmap_main, frame_fg_color,
- start_arrow,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7,
- end_arrow,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7);
-
- /* draw the additional line when line style is 2 pixels width */
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
if (user_data->dlg.items[current_item].line_style == 2) {
- gdk_draw_line(user_data->dlg.pixmap_main, frame_fg_color,
- start_arrow,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-6,
- end_arrow,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-6);
+ /* draw a line thick */
+ cairo_set_line_width (cr, 2.0);
+ }else{
+ cairo_set_line_width (cr, 1.0);
+ }
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ /* draw white line */
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ }else{
+ /* draw black line */
+ cairo_set_source_rgb (cr, 0, 0, 0);
}
+ cairo_move_to(cr, start_arrow, (top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7)+0.5);
+ cairo_line_to(cr, end_arrow, (top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7)+0.5);
+ cairo_stroke(cr);
+ cairo_destroy(cr);
+ }
+#endif
+ /* select colors */
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ color_p = &white_color;
+ } else {
+ color_p = &black_color;
}
-
/* draw the arrow */
+#if GTK_CHECK_VERSION(2,22,0)
if (start_arrow<end_arrow)
- draw_arrow(user_data->dlg.pixmap_main, frame_fg_color, end_arrow-WIDTH_ARROW,top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7, RIGHT_ARROW);
+ draw_arrow(user_data->dlg.surface_main, color_p, end_arrow-WIDTH_ARROW, (top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7)-(HEIGHT_ARROW/2), RIGHT_ARROW);
else
- draw_arrow(user_data->dlg.pixmap_main, frame_fg_color, end_arrow+WIDTH_ARROW,top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7, LEFT_ARROW);
-
+ draw_arrow(user_data->dlg.surface_main, color_p, end_arrow, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7-(HEIGHT_ARROW/2), LEFT_ARROW);
+#else
+ if (start_arrow<end_arrow)
+ draw_arrow(user_data->dlg.pixmap_main, color_p, end_arrow-WIDTH_ARROW, (top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7)-(HEIGHT_ARROW/2), RIGHT_ARROW);
+ else
+ draw_arrow(user_data->dlg.pixmap_main, color_p, end_arrow, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7-(HEIGHT_ARROW/2), LEFT_ARROW);
+#endif
/* draw the frame comment */
g_snprintf(label_string, MAX_LABEL, "%s", user_data->dlg.items[current_item].frame_label);
pango_layout_set_text(layout, label_string, -1);
if ((int)left_x_border > ((int)label_x-(int)label_width/2))
label_x = left_x_border + label_width/2;
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_main);
+ gdk_cairo_set_source_color (cr, color_p);
+ cairo_move_to (cr, label_x - label_width/2, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2-3);
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main)) {
- gdk_draw_layout(user_data->dlg.pixmap_main,
- frame_fg_color,
- label_x - label_width/2,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2-3,
- layout);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ gdk_cairo_set_source_color (cr, color_p);
+ cairo_move_to (cr, label_x - label_width/2, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2-3);
+ pango_cairo_show_layout (cr, layout);
+ cairo_destroy (cr);
+ cr = NULL;
}
-
+#endif
/* draw the source port number */
g_snprintf(label_string, MAX_LABEL, "(%i)", user_data->dlg.items[current_item].port_src);
pango_layout_set_text(small_layout, label_string, -1);
else {
src_port_x = start_arrow + 2;
}
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_main);
+ /* select color */
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ gdk_cairo_set_source_color (cr, &grey_color1);
+ } else {
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ }
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ cairo_move_to (cr, src_port_x, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2);
+ pango_cairo_show_layout (cr, small_layout);
+ cairo_destroy (cr);
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main)) {
- gdk_draw_layout(user_data->dlg.pixmap_main,
- div_line_color,
- src_port_x,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2,
- small_layout);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ /* select color */
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ gdk_cairo_set_source_color (cr, &grey_color1);
+ } else {
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ }
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ cairo_move_to (cr, src_port_x, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2);
+ pango_cairo_show_layout (cr, small_layout);
+ cairo_destroy (cr);
}
-
+#endif
/* draw the destination port number */
g_snprintf(label_string, MAX_LABEL, "(%i)", user_data->dlg.items[current_item].port_dst);
pango_layout_set_text(small_layout, label_string, -1);
else {
dst_port_x = end_arrow - label_width - 2;
}
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_main);
+ /* select color */
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ gdk_cairo_set_source_color (cr, &grey_color1);
+ } else {
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ }
+ cairo_move_to (cr, dst_port_x, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2);
+ pango_cairo_show_layout (cr, small_layout);
+ cairo_destroy (cr);
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main)) {
- gdk_draw_layout(user_data->dlg.pixmap_main,
- div_line_color,
- dst_port_x,
- top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2,
- small_layout);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ /* select color */
+ if ( current_item+first_item == user_data->dlg.selected_item ){
+ gdk_cairo_set_source_color (cr, &grey_color1);
+ } else {
+ gdk_cairo_set_source_color (cr, &grey_color0);
+ }
+ cairo_move_to (cr, dst_port_x, top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2);
+ pango_cairo_show_layout (cr, small_layout);
+ cairo_destroy (cr);
}
+#endif
/* draw the div line of the selected item with soft gray*/
if ( current_item+first_item == user_data->dlg.selected_item )
for (i=0; i<user_data->num_nodes; i++){
+#if GTK_CHECK_VERSION(2,22,0)
+ cr = cairo_create (user_data->dlg.surface_main);
+ gdk_cairo_set_source_color (cr, &grey_color1);
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+ cairo_set_dash(cr, dashed1, len1, 0);
+ cairo_move_to(cr, left_x_border+NODE_WIDTH/2+NODE_WIDTH*i, (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER);
+ cairo_line_to(cr, (left_x_border+NODE_WIDTH/2+NODE_WIDTH*i),(user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER+ITEM_HEIGHT);
+ cairo_stroke(cr);
+ cairo_destroy(cr);
+#else
if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ) {
- gdk_draw_line(user_data->dlg.pixmap_main, user_data->dlg.div_line_gc[1],
- left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
- (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER,
- left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
- (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER+ITEM_HEIGHT);
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ gdk_cairo_set_source_color (cr, &grey_color1);
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT);
+ cairo_set_dash(cr, dashed1, len1, 0);
+ cairo_move_to(cr, left_x_border+NODE_WIDTH/2+NODE_WIDTH*i, (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER);
+ cairo_line_to(cr, (left_x_border+NODE_WIDTH/2+NODE_WIDTH*i),(user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER+ITEM_HEIGHT);
+ cairo_stroke(cr);
+ cairo_destroy(cr);
}
+#endif
}
}
g_object_unref(G_OBJECT(layout));
/* refresh the draw areas */
-#if GTK_CHECK_VERSION(2,18,0)
- if (gtk_widget_is_drawable(user_data->dlg.draw_area_time) )
- gdk_draw_pixmap(gtk_widget_get_window(user_data->dlg.draw_area_time),
- draw_area_time_style->fg_gc[gtk_widget_get_state(user_data->dlg.draw_area_time)],
-
+ if (gtk_widget_is_drawable(user_data->dlg.draw_area_time) ){
+ cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area_time));
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_time, 0, 0);
#else
- if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_time->window) )
- gdk_draw_pixmap(user_data->dlg.draw_area_time->window,
- draw_area_time_style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area_time)],
-
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_time, 0, 0);
#endif
- user_data->dlg.pixmap_time,
- 0, 0,
- 0, 0,
- draw_area_time_alloc.width, draw_area_time_alloc.height);
+ cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, draw_area_time_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+ }
-#if GTK_CHECK_VERSION(2,18,0)
- if (gtk_widget_is_drawable(user_data->dlg.draw_area) )
- gdk_draw_pixmap(gtk_widget_get_window(user_data->dlg.draw_area),
- draw_area_style->fg_gc[gtk_widget_get_state(user_data->dlg.draw_area)],
+ if (gtk_widget_is_drawable(user_data->dlg.draw_area) ){
+ cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area));
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_main, 0, 0);
#else
- if (GDK_IS_DRAWABLE(user_data->dlg.draw_area->window) )
- gdk_draw_pixmap(user_data->dlg.draw_area->window,
- draw_area_style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area)],
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_main, 0, 0);
#endif
- user_data->dlg.pixmap_main,
- 0, 0,
- 0, 0,
- draw_area_alloc.width, draw_area_alloc.height);
+ cairo_rectangle (cr, 0, 0, draw_area_alloc.width, draw_area_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+ }
-#if GTK_CHECK_VERSION(2,18,0)
- if (gtk_widget_is_drawable(user_data->dlg.draw_area_comments) )
- gdk_draw_pixmap(gtk_widget_get_window(user_data->dlg.draw_area_comments),
- draw_area_comments_style->fg_gc[gtk_widget_get_state(user_data->dlg.draw_area_comments)],
+ if (gtk_widget_is_drawable(user_data->dlg.draw_area_comments) ){
+ cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area_comments));
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_comments, 0, 0);
#else
- if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_comments->window) )
- gdk_draw_pixmap(user_data->dlg.draw_area_comments->window,
- draw_area_comments_style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area_comments)],
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_comments, 0, 0);
#endif
- user_data->dlg.pixmap_comments,
- 0, 0,
- 0, 0,
- draw_area_comments_alloc.width, draw_area_comments_alloc.height);
+ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, draw_area_comments_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+ }
/* update the v_scrollbar */
-#if GTK_CHECK_VERSION(2,14,0)
gtk_adjustment_set_upper(user_data->dlg.v_scrollbar_adjustment, (gdouble) user_data->num_items-1);
gtk_adjustment_set_step_increment(user_data->dlg.v_scrollbar_adjustment, 1);
gtk_adjustment_set_page_increment(user_data->dlg.v_scrollbar_adjustment, (gdouble) (last_item-first_item));
gtk_adjustment_set_page_size(user_data->dlg.v_scrollbar_adjustment, (gdouble) (last_item-first_item));
gtk_adjustment_set_value(user_data->dlg.v_scrollbar_adjustment, (gdouble) first_item);
-#else
- user_data->dlg.v_scrollbar_adjustment->upper=(gfloat) user_data->num_items-1;
- user_data->dlg.v_scrollbar_adjustment->step_increment=1;
- user_data->dlg.v_scrollbar_adjustment->page_increment=(gfloat) (last_item-first_item);
- user_data->dlg.v_scrollbar_adjustment->page_size=(gfloat) (last_item-first_item);
- user_data->dlg.v_scrollbar_adjustment->value=(gfloat) first_item;
-#endif
gtk_adjustment_changed(user_data->dlg.v_scrollbar_adjustment);
gtk_adjustment_value_changed(user_data->dlg.v_scrollbar_adjustment);
user_data->dlg.first_item -= 3;
break;
case(GDK_SCROLL_DOWN):
-#if GTK_CHECK_VERSION(2,14,0)
if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1 == user_data->num_items)) return TRUE;
if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1) > (user_data->num_items-3))
user_data->dlg.first_item = user_data->num_items-(guint32)gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)-1;
-#else
- if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)) return TRUE;
- if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1) > (user_data->num_items-3))
- user_data->dlg.first_item = user_data->num_items-(guint32)user_data->dlg.v_scrollbar_adjustment->page_size-1;
-#endif
else
user_data->dlg.first_item += 3;
break;
if (event->keyval == GDK_Up){
if (user_data->dlg.selected_item == 0) return TRUE;
user_data->dlg.selected_item--;
-#if GTK_CHECK_VERSION(2,14,0)
if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)) )
-#else
- if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size) )
-#endif
user_data->dlg.first_item = user_data->dlg.selected_item;
/* Down arrow */
} else if (event->keyval == GDK_Down){
if (user_data->dlg.selected_item == user_data->num_items-1) return TRUE;
user_data->dlg.selected_item++;
-#if GTK_CHECK_VERSION(2,14,0)
if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)) )
user_data->dlg.first_item = (guint32)user_data->dlg.selected_item-(guint32)gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment);
-#else
- if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size) )
- user_data->dlg.first_item = (guint32)user_data->dlg.selected_item-(guint32)user_data->dlg.v_scrollbar_adjustment->page_size;
-#endif
-
} else if (event->keyval == GDK_Left){
if (user_data->dlg.first_node == 0) return TRUE;
user_data->dlg.first_node--;
return TRUE;
}
+#if GTK_CHECK_VERSION(3,0,0)
+/****************************************************************************/
+static gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
+{
+ graph_analysis_data_t *user_data = data;
+ GtkAllocation allocation;
+
+ gtk_widget_get_allocation (widget, &allocation);
+ cairo_set_source_surface (cr, user_data->dlg.surface_main, 0, 0);
+ cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
+ cairo_fill (cr);
+
+ return FALSE;
+}
+#else
/****************************************************************************/
static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
graph_analysis_data_t *user_data = data;
-#if GTK_CHECK_VERSION(2,18,0)
- GtkStyle *widget_style;
-#endif
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
-#if GTK_CHECK_VERSION(2,18,0)
- widget_style = gtk_widget_get_style(widget);
-
- if (gtk_widget_is_drawable(widget))
- gdk_draw_pixmap(gtk_widget_get_window(widget),
- widget_style->fg_gc[gtk_widget_get_state(widget)],
+ if (gtk_widget_is_drawable(widget)){
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_main, event->area.x, event->area.y);
#else
- if (GDK_IS_DRAWABLE(widget->window))
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_main, event->area.x, event->area.y);
#endif
- user_data->dlg.pixmap_main,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
+ }
return FALSE;
}
+#endif
+#if GTK_CHECK_VERSION(3,0,0)
/****************************************************************************/
-static gboolean expose_event_comments(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static gboolean draw_comments(GtkWidget *widget, cairo_t *cr, gpointer data)
{
graph_analysis_data_t *user_data = data;
-#if GTK_CHECK_VERSION(2,18,0)
- GtkStyle *widget_style;
-#endif
+ GtkAllocation allocation;
-#if GTK_CHECK_VERSION(2,18,0)
- widget_style = gtk_widget_get_style(widget);
+ gtk_widget_get_allocation (widget, &allocation);
+
+ cairo_set_source_surface (cr, user_data->dlg.surface_comments, 0, 0);
+ cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
+ cairo_fill (cr);
- if (gtk_widget_is_drawable(widget))
- gdk_draw_pixmap(gtk_widget_get_window(widget),
- widget_style->fg_gc[gtk_widget_get_state(widget)],
+
+ return FALSE;
+}
+#else
+/****************************************************************************/
+static gboolean expose_event_comments(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+ graph_analysis_data_t *user_data = data;
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
+
+ if (gtk_widget_is_drawable(widget)){
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_comments, event->area.x, event->area.y);
#else
- if (GDK_IS_DRAWABLE(widget->window))
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_comments, event->area.x, event->area.y);
#endif
- user_data->dlg.pixmap_comments,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
+ }
return FALSE;
}
+#endif
+#if GTK_CHECK_VERSION(3,0,0)
/****************************************************************************/
-static gboolean expose_event_time(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static gboolean draw_time(GtkWidget *widget, cairo_t *cr, gpointer data)
{
graph_analysis_data_t *user_data = data;
-#if GTK_CHECK_VERSION(2,18,0)
- GtkStyle *widget_style;
-#endif
+ GtkAllocation allocation;
-#if GTK_CHECK_VERSION(2,18,0)
- widget_style = gtk_widget_get_style(widget);
+ gtk_widget_get_allocation (widget, &allocation);
+
+ cairo_set_source_surface (cr, user_data->dlg.surface_time, 0, 0);
+ cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
+ cairo_fill (cr);
+
+ return FALSE;
+}
+#else
+/****************************************************************************/
+static gboolean expose_event_time(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+ graph_analysis_data_t *user_data = data;
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
- if (gtk_widget_is_drawable(widget) )
- gdk_draw_pixmap(gtk_widget_get_window(widget),
- widget_style->fg_gc[gtk_widget_get_state(widget)],
+ if (gtk_widget_is_drawable(widget) ){
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_time, event->area.x, event->area.y);
#else
- if (GDK_IS_DRAWABLE(widget->window) )
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_time, event->area.x, event->area.y);
#endif
- user_data->dlg.pixmap_time,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
+ }
return FALSE;
}
-
+#endif
/****************************************************************************/
static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
{
graph_analysis_data_t *user_data = data;
GtkAllocation widget_alloc;
- int i;
- GtkStyle *widget_style;
-
- /* gray and soft gray colors */
- static GdkColor color_div_line[2] = {
- {0, 0x64ff, 0x64ff, 0x64ff},
- {0, 0x25ff, 0x25ff, 0x25ff}
- /*{0, 0x7fff, 0x7fff, 0x7fff}*/
- };
-
- /* the first color is blue to highlight the selected item */
- static GdkColor col[MAX_NUM_COL_CONV+1] = {
- {0, 0x00FF, 0x00FF, 0xFFFF},
- {0, 0x90FF, 0xEEFF, 0x90FF},
- {0, 0xFFFF, 0xA0FF, 0x7AFF},
- {0, 0xFFFF, 0xB6FF, 0xC1FF},
- {0, 0xFAFF, 0xFAFF, 0xD2FF},
- {0, 0xFFFF, 0xFFFF, 0x33FF},
- {0, 0x66FF, 0xCDFF, 0xAAFF},
- {0, 0xE0FF, 0xFFFF, 0xFFFF},
- {0, 0xB0FF, 0xC4FF, 0xDEFF},
- {0, 0x87FF, 0xCEFF, 0xFAFF},
- {0, 0xD3FF, 0xD3FF, 0xD3FF}
- };
+ cairo_t *cr;
+#if GTK_CHECK_VERSION(2,22,0)
+ if(user_data->dlg.surface_main){
+ cairo_surface_destroy (user_data->dlg.surface_main);
+ user_data->dlg.surface_main=NULL;
+ }
+#else
if(user_data->dlg.pixmap_main){
g_object_unref(user_data->dlg.pixmap_main);
user_data->dlg.pixmap_main=NULL;
}
-
-#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_get_allocation(widget, &widget_alloc);
- widget_style = gtk_widget_get_style(widget);
-#else
- widget_alloc = widget->allocation;
- widget_style = widget->style;
#endif
+ gtk_widget_get_allocation(widget, &widget_alloc);
-#if GTK_CHECK_VERSION(2,14,0)
- user_data->dlg.pixmap_main=gdk_pixmap_new(gtk_widget_get_window(widget),
+#if GTK_CHECK_VERSION(2,22,0)
+ user_data->dlg.surface_main = gdk_window_create_similar_surface (gtk_widget_get_window(widget),
+ CAIRO_CONTENT_COLOR,
+ widget_alloc.width,
+ widget_alloc.height);
+
+ cr = cairo_create (user_data->dlg.surface_main);
+ cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
#else
- user_data->dlg.pixmap_main=gdk_pixmap_new(widget->window,
-#endif
+ user_data->dlg.pixmap_main=gdk_pixmap_new(gtk_widget_get_window(widget),
widget_alloc.width,
widget_alloc.height,
-1);
-
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) )
- gdk_draw_rectangle(user_data->dlg.pixmap_main,
- widget_style->white_gc,
- TRUE,
- 0, 0,
- widget_alloc.width,
- widget_alloc.height);
-
- /* create gc for division lines and set the line stype to dash */
- for (i=0; i<2; i++){
- user_data->dlg.div_line_gc[i]=gdk_gc_new(user_data->dlg.pixmap_main);
- gdk_gc_set_line_attributes(user_data->dlg.div_line_gc[i], 1, GDK_LINE_ON_OFF_DASH, 0, 0);
- gdk_gc_set_rgb_fg_color(user_data->dlg.div_line_gc[i], &color_div_line[i]);
- }
-
- /* create gcs for the background items */
- for (i=0; i<MAX_NUM_COL_CONV+1; i++){
- if (i==0) {
- user_data->dlg.pixmap_tile_select=gdk_pixmap_create_from_xpm_d(user_data->dlg.pixmap_main,NULL,NULL,(gchar **)voip_select_xpm);
- user_data->dlg.bg_gc[i]=gdk_gc_new(user_data->dlg.pixmap_tile_select);
- gdk_gc_set_fill(user_data->dlg.bg_gc[i], GDK_TILED);
- gdk_gc_set_tile(user_data->dlg.bg_gc[i], user_data->dlg.pixmap_tile_select);
- } else {
- user_data->dlg.bg_gc[i]=gdk_gc_new(user_data->dlg.pixmap_main);
- gdk_gc_set_rgb_fg_color(user_data->dlg.bg_gc[i], &col[i]);
- }
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_main);
+ cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
}
+#endif
dialog_graph_redraw(user_data);
{
graph_analysis_data_t *user_data = data;
GtkAllocation widget_alloc;
- GtkStyle *widget_style;
+ cairo_t *cr;
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_get_allocation(widget, &widget_alloc);
- widget_style = gtk_widget_get_style(widget);
-#else
- widget_alloc = widget->allocation;
- widget_style = widget->style;
-#endif
+#if GTK_CHECK_VERSION(2,22,0)
+ if(user_data->dlg.surface_comments){
+ cairo_surface_destroy (user_data->dlg.surface_comments);
+ user_data->dlg.surface_comments=NULL;
+ }
+#else
if(user_data->dlg.pixmap_comments){
g_object_unref(user_data->dlg.pixmap_comments);
user_data->dlg.pixmap_comments=NULL;
}
-
-#if GTK_CHECK_VERSION(2,14,0)
- user_data->dlg.pixmap_comments=gdk_pixmap_new(gtk_widget_get_window(widget),
-#else
- user_data->dlg.pixmap_comments=gdk_pixmap_new(widget->window,
#endif
+#if GTK_CHECK_VERSION(2,22,0)
+ user_data->dlg.surface_comments=gdk_window_create_similar_surface (gtk_widget_get_window(widget),
+ CAIRO_CONTENT_COLOR,
+ widget_alloc.width,
+ widget_alloc.height);
+
+ cr = cairo_create (user_data->dlg.surface_comments);
+ cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
+ user_data->dlg.pixmap_comments=gdk_pixmap_new(gtk_widget_get_window(widget),
widget_alloc.width,
widget_alloc.height,
-1);
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) )
- gdk_draw_rectangle(user_data->dlg.pixmap_comments,
- widget_style->white_gc,
- TRUE,
- 0, 0,
- widget_alloc.width,
- widget_alloc.height);
-
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_comments);
+ cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+ }
+#endif
dialog_graph_redraw(user_data);
return TRUE;
}
{
graph_analysis_data_t *user_data = data;
GtkAllocation widget_alloc;
- GtkStyle *widget_style;
+ cairo_t *cr;
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_get_allocation(widget, &widget_alloc);
- widget_style = gtk_widget_get_style(widget);
-#else
- widget_alloc = widget->allocation;
- widget_style = widget->style;
-#endif
+#if GTK_CHECK_VERSION(2,22,0)
+ if(user_data->dlg.surface_time){
+ cairo_surface_destroy (user_data->dlg.surface_main);
+ user_data->dlg.surface_main=NULL;
+ }
+#else
if(user_data->dlg.pixmap_time){
g_object_unref(user_data->dlg.pixmap_time);
user_data->dlg.pixmap_time=NULL;
}
-
-#if GTK_CHECK_VERSION(2,14,0)
- user_data->dlg.pixmap_time=gdk_pixmap_new(gtk_widget_get_window(widget),
-#else
- user_data->dlg.pixmap_time=gdk_pixmap_new(widget->window,
#endif
+#if GTK_CHECK_VERSION(2,22,0)
+ user_data->dlg.surface_time=gdk_window_create_similar_surface(gtk_widget_get_window(widget),
+ CAIRO_CONTENT_COLOR,
+ widget_alloc.width,
+ widget_alloc.height);
+
+ cr = cairo_create (user_data->dlg.surface_time);
+ cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+#else
+ user_data->dlg.pixmap_time=gdk_pixmap_new(gtk_widget_get_window(widget),
widget_alloc.width,
widget_alloc.height,
-1);
- if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) )
- gdk_draw_rectangle(user_data->dlg.pixmap_time,
- widget_style->white_gc,
- TRUE,
- 0, 0,
- widget_alloc.width,
- widget_alloc.height);
+ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ){
+ cr = gdk_cairo_create (user_data->dlg.pixmap_time);
+ cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height);
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ cr = NULL;
+ }
+#endif
dialog_graph_redraw(user_data);
}
/****************************************************************************/
-static gboolean pane_callback(GtkWidget *widget, GParamSpec *pspec _U_, gpointer data)
+static gboolean pane_callback(GtkWidget *widget _U_, GParamSpec *pspec _U_, gpointer data)
{
graph_analysis_data_t *user_data = data;
- GtkStyle *draw_area_comments_style;
GtkAllocation draw_area_comments_alloc;
+ cairo_t *cr;
- if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) > user_data->dlg.pixmap_width)
- gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), user_data->dlg.pixmap_width);
+ if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) > user_data->dlg.surface_width)
+ gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), user_data->dlg.surface_width);
else if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) < NODE_WIDTH*2)
gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), NODE_WIDTH*2);
/* repaint the comment area because when moving the pane position there are times that the expose_event_comments is not called */
-#if GTK_CHECK_VERSION(2,18,0)
gtk_widget_get_allocation(user_data->dlg.draw_area_comments, &draw_area_comments_alloc);
- draw_area_comments_style = gtk_widget_get_style(user_data->dlg.draw_area_comments);
-#else
- draw_area_comments_alloc = user_data->dlg.draw_area_comments->allocation;
- draw_area_comments_style = user_data->dlg.draw_area_comments->style;
-#endif
-
-#if GTK_CHECK_VERSION(2,18,0)
- if (gtk_widget_is_drawable(user_data->dlg.draw_area_comments))
- gdk_draw_pixmap(gtk_widget_get_window(user_data->dlg.draw_area_comments),
- draw_area_comments_style->fg_gc[gtk_widget_get_state(widget)],
+ if (gtk_widget_is_drawable(user_data->dlg.draw_area_comments)){
+ cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area_comments));
+#if GTK_CHECK_VERSION(2,22,0)
+ cairo_set_source_surface (cr, user_data->dlg.surface_comments, 0, 0);
#else
- if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_comments->window))
- gdk_draw_pixmap(user_data->dlg.draw_area_comments->window,
- draw_area_comments_style->fg_gc[GTK_WIDGET_STATE(widget)],
+ gdk_cairo_set_source_pixmap (cr, user_data->dlg.pixmap_comments, 0, 0);
#endif
- user_data->dlg.pixmap_comments,
- 0,0,
- 0,0,
- draw_area_comments_alloc.width,
- draw_area_comments_alloc.height);
+ cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, draw_area_comments_alloc.height);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
return TRUE;
}
{
graph_analysis_data_t *user_data = data;
-#if GTK_CHECK_VERSION(2,14,0)
if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1 == user_data->num_items)
&& (gtk_adjustment_get_value(user_data->dlg.v_scrollbar_adjustment) >= user_data->dlg.first_item ))
return;
return;
user_data->dlg.first_item = (guint32) gtk_adjustment_get_value(user_data->dlg.v_scrollbar_adjustment);
-#else
- if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)
- && (user_data->dlg.v_scrollbar_adjustment->value >= user_data->dlg.first_item ))
- return;
-
- if (user_data->dlg.first_item == user_data->dlg.v_scrollbar_adjustment->value)
- return;
-
- user_data->dlg.first_item = (guint32) user_data->dlg.v_scrollbar_adjustment->value;
-#endif
dialog_graph_redraw(user_data);
/* create "time" draw area */
user_data->dlg.draw_area_time=gtk_drawing_area_new();
- gtk_widget_set_size_request(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.surface_width);
frame_time = gtk_frame_new(NULL);
gtk_widget_show(frame_time);
gtk_container_add(GTK_CONTAINER(frame_time),user_data->dlg.draw_area_time);
/* create "comments" draw area */
user_data->dlg.draw_area_comments=gtk_drawing_area_new();
- gtk_widget_set_size_request(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.surface_width);
scroll_window_comments=gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_size_request(scroll_window_comments, (gint)(COMMENT_WIDTH/1.5), user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(scroll_window_comments, (gint)(COMMENT_WIDTH/1.5), user_data->dlg.surface_width);
/*
* Set the scrollbar policy for the horizontal and vertical scrollbars
* The policy determines when the scrollbar should appear
/* create main Graph draw area */
user_data->dlg.draw_area=gtk_drawing_area_new();
if (user_data->num_nodes < 2)
- user_data->dlg.pixmap_width = 2 * NODE_WIDTH;
+ user_data->dlg.surface_width = 2 * NODE_WIDTH;
else
- user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
- gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+ user_data->dlg.surface_width = user_data->num_nodes * NODE_WIDTH;
+ gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.surface_width, user_data->dlg.surface_width);
user_data->dlg.scroll_window=gtk_scrolled_window_new(NULL, NULL);
if ( user_data->num_nodes < 6)
- gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.surface_width);
else
- gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.surface_width);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window),
GTK_POLICY_ALWAYS,
gtk_widget_grab_focus(user_data->dlg.draw_area);
/* signals needed to handle backing pixmap */
+#if GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect(user_data->dlg.draw_area, "draw", G_CALLBACK(draw_area_draw), user_data);
+#else
g_signal_connect(user_data->dlg.draw_area, "expose_event", G_CALLBACK(expose_event), user_data);
+#endif
g_signal_connect(user_data->dlg.draw_area, "configure_event", G_CALLBACK(configure_event), user_data);
/* signals needed to handle backing pixmap comments */
+#if GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect(user_data->dlg.draw_area_comments, "draw", G_CALLBACK(draw_comments), user_data);
+#else
g_signal_connect(user_data->dlg.draw_area_comments, "expose_event", G_CALLBACK(expose_event_comments), user_data);
+#endif
g_signal_connect(user_data->dlg.draw_area_comments, "configure_event", G_CALLBACK(configure_event_comments), user_data);
/* signals needed to handle backing pixmap time */
+#if GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect(user_data->dlg.draw_area_time, "draw", G_CALLBACK(draw_time), user_data);
+#else
g_signal_connect(user_data->dlg.draw_area_time, "expose_event", G_CALLBACK(expose_event_time), user_data);
+#endif
g_signal_connect(user_data->dlg.draw_area_time, "configure_event", G_CALLBACK(configure_event_time), user_data);
gtk_widget_add_events (user_data->dlg.draw_area, GDK_BUTTON_PRESS_MASK);
G_CALLBACK(v_scrollbar_changed), user_data);
frame_box = gtk_frame_new(NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_get_preferred_size(user_data->dlg.v_scrollbar, &scroll_requisition, NULL);
+#else
gtk_widget_size_request(user_data->dlg.v_scrollbar, &scroll_requisition);
+#endif
gtk_widget_set_size_request(frame_box, 1, scroll_requisition.width+2);
gtk_frame_set_shadow_type(GTK_FRAME(frame_box), GTK_SHADOW_NONE);
gtk_widget_show(frame_box);
/* get nodes (each node is an address) */
get_nodes(user_data);
- user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
- gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+ user_data->dlg.surface_width = user_data->num_nodes * NODE_WIDTH;
+ gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.surface_width, user_data->dlg.surface_width);
if (user_data->num_nodes < 6)
- gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.surface_width);
else
- gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.surface_width);
/* redraw the graph */
dialog_graph_redraw(user_data);
/* get nodes (each node is an address) */
get_nodes(user_data);
- user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
- gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+ user_data->dlg.surface_width = user_data->num_nodes * NODE_WIDTH;
+ gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.surface_width, user_data->dlg.surface_width);
if (user_data->num_nodes < 6)
- gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.surface_width);
else
- gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
+ gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.surface_width);
/* redraw the graph */
git.samba.org / obnox / wireshark / wip.git / blobdiff