/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
* Parts of this file:
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* Parts of this file from gtk/gtkctree.c and gtk/gtkclist.c:
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
#include "gtksctree.h"
#include "claws-marshal.h"
-#include "stock_pixmap.h"
#include "prefs_common.h"
#include "utils.h"
+#include "gtkutils.h"
-#define CLIST_UNFROZEN(clist) (((GtkCList*) (clist))->freeze_count == 0)
+#define CLIST_UNFROZEN(clist) (((GtkCMCList*) (clist))->freeze_count == 0)
#define CLIST_REFRESH(clist) G_STMT_START { \
if (CLIST_UNFROZEN (clist)) \
- GTK_CLIST_GET_CLASS (clist)->refresh ((GtkCList*) (clist)); \
+ GTK_CMCLIST_GET_CLASS (clist)->refresh ((GtkCMCList*) (clist)); \
} G_STMT_END
#define CELL_SPACING 1
#define CLIST_OPTIMUM_SIZE 64
LAST_SIGNAL
};
-static GdkPixmap *emptyxpm = NULL;
-static GdkBitmap *emptyxpmmask = NULL;
-
static void gtk_sctree_class_init (GtkSCTreeClass *class);
static void gtk_sctree_init (GtkSCTree *sctree);
gint x, gint y, GtkSelectionData *data,
guint info, guint time);
-static void gtk_sctree_clear (GtkCList *clist);
-static void gtk_sctree_real_unselect_all (GtkCList *clist);
-static void gtk_sctree_collapse (GtkCTree *ctree, GtkCTreeNode *node);
+static void gtk_sctree_clear (GtkCMCList *clist);
+static void gtk_sctree_real_unselect_all (GtkCMCList *clist);
-static void stree_sort (GtkCTree *ctree, GtkCTreeNode *node, gpointer data);
-void gtk_sctree_sort_node (GtkCTree *ctree, GtkCTreeNode *node);
-void gtk_sctree_sort_recursive (GtkCTree *ctree, GtkCTreeNode *node);
-
-static void gtk_sctree_link (GtkCTree *ctree,
- GtkCTreeNode *node,
- GtkCTreeNode *parent,
- GtkCTreeNode *sibling,
+static void stree_sort (GtkCMCTree *ctree, GtkCMCTreeNode *node, gpointer data);
+void gtk_sctree_sort_node (GtkCMCTree *ctree, GtkCMCTreeNode *node);
+void gtk_sctree_sort_recursive (GtkCMCTree *ctree, GtkCMCTreeNode *node);
+
+static void gtk_sctree_link (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
+ GtkCMCTreeNode *parent,
+ GtkCMCTreeNode *sibling,
gboolean update_focus_row);
-static void gtk_sctree_unlink (GtkCTree *ctree,
- GtkCTreeNode *node,
+static void gtk_sctree_unlink (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gboolean update_focus_row);
-static void stree_update_level (GtkCTree *ctree,
- GtkCTreeNode *node,
+static void stree_update_level (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data);
-static GtkCTreeNode * gtk_sctree_last_visible (GtkCTree *ctree,
- GtkCTreeNode *node);
-static void gtk_sctree_real_tree_expand (GtkCTree *ctree,
- GtkCTreeNode *node);
+static GtkCMCTreeNode * gtk_sctree_last_visible (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node);
+static void gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node);
+static void gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node);
static void
-sreal_tree_move (GtkCTree *ctree,
- GtkCTreeNode *node,
- GtkCTreeNode *new_parent,
- GtkCTreeNode *new_sibling);
+sreal_tree_move (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
+ GtkCMCTreeNode *new_parent,
+ GtkCMCTreeNode *new_sibling);
-static GtkCTreeClass *parent_class;
+static GtkCMCTreeClass *parent_class;
static guint sctree_signals[LAST_SIGNAL];
(GInstanceInitFunc) gtk_sctree_init,
};
- sctree_type = g_type_register_static (GTK_TYPE_CTREE, "GtkSCTree", &sctree_info, (GTypeFlags)0);
+ sctree_type = g_type_register_static (GTK_TYPE_CMCTREE, "GtkSCTree", &sctree_info, (GTypeFlags)0);
}
return sctree_type;
}
-static gint
-gtk_sctree_draw_cell_pixmap (GdkWindow *window,
- GdkRectangle *clip_rectangle,
- GdkGC *fg_gc,
- GdkPixmap *pixmap,
- GdkBitmap *mask,
- gint x,
- gint y,
- gint width,
- gint height)
-{
- gint xsrc = 0;
- gint ysrc = 0;
-
- if (mask)
- {
- gdk_gc_set_clip_mask (fg_gc, mask);
- gdk_gc_set_clip_origin (fg_gc, x, y);
- }
- if (x < clip_rectangle->x)
- {
- xsrc = clip_rectangle->x - x;
- width -= xsrc;
- x = clip_rectangle->x;
- }
- if (x + width > clip_rectangle->x + clip_rectangle->width)
- width = clip_rectangle->x + clip_rectangle->width - x;
-
- if (y < clip_rectangle->y)
- {
- ysrc = clip_rectangle->y - y;
- height -= ysrc;
- y = clip_rectangle->y;
- }
- if (y + height > clip_rectangle->y + clip_rectangle->height)
- height = clip_rectangle->y + clip_rectangle->height - y;
-
- if (width > 0 && height > 0)
- gdk_draw_pixmap (window, fg_gc, pixmap, xsrc, ysrc, x, y, width, height);
-
- if (mask)
- {
- gdk_gc_set_clip_rectangle (fg_gc, NULL);
- gdk_gc_set_clip_origin (fg_gc, 0, 0);
- }
-
- return x + MAX (width, 0);
-}
-
static void
-gtk_sctree_get_cell_style (GtkCList *clist,
- GtkCListRow *clist_row,
- gint state,
- gint row,
- gint column,
- GtkStyle **style,
- GdkGC **fg_gc,
- GdkGC **bg_gc)
-{
- gint fg_state;
-
- if ((state == GTK_STATE_NORMAL) &&
- (GTK_WIDGET (clist)->state == GTK_STATE_INSENSITIVE))
- fg_state = GTK_STATE_INSENSITIVE;
- else
- fg_state = state;
-
- if (clist_row->cell[column].style)
- {
- if (style)
- *style = clist_row->cell[column].style;
- if (fg_gc)
- *fg_gc = clist_row->cell[column].style->fg_gc[fg_state];
- if (bg_gc) {
- if (state == GTK_STATE_SELECTED)
- *bg_gc = clist_row->cell[column].style->bg_gc[state];
- }
- }
- else if (clist_row->style)
- {
- if (style)
- *style = clist_row->style;
- if (fg_gc)
- *fg_gc = clist_row->style->fg_gc[fg_state];
- if (bg_gc) {
- if (state == GTK_STATE_SELECTED)
- *bg_gc = clist_row->style->bg_gc[state];
- else
- *bg_gc = clist_row->bg_set ?
- clist->bg_gc : clist_row->style->base_gc[state];
- }
- }
- else
- {
- if (style)
- *style = GTK_WIDGET (clist)->style;
- if (fg_gc)
- *fg_gc = GTK_WIDGET (clist)->style->fg_gc[fg_state];
- if (bg_gc) {
- if (state == GTK_STATE_SELECTED)
- *bg_gc = GTK_WIDGET (clist)->style->bg_gc[state];
- else
- *bg_gc = GTK_WIDGET (clist)->style->base_gc[state];
- }
-
- if (state != GTK_STATE_SELECTED)
- {
- if (fg_gc && clist_row->fg_set)
- *fg_gc = clist->fg_gc;
- if (bg_gc && clist_row->bg_set)
- *bg_gc = clist->bg_gc;
- }
- }
-}
-
-static gint
-gtk_sctree_draw_expander (GtkCTree *ctree,
- GtkCTreeRow *ctree_row,
- GtkStyle *style,
- GdkRectangle *clip_rectangle,
- gint x)
-{
- GtkCList *clist;
- GdkPoint points[3];
- gint justification_factor;
- gint y;
-
- if (ctree->expander_style == GTK_CTREE_EXPANDER_NONE)
- return x;
-
- clist = GTK_CLIST (ctree);
- if (clist->column[ctree->tree_column].justification == GTK_JUSTIFY_RIGHT)
- justification_factor = -1;
- else
- justification_factor = 1;
- if (!GTK_CLIST_ROW_HEIGHT_SET(GTK_CLIST(clist)))
- y = (clip_rectangle->y + (clip_rectangle->height - PM_SIZE) / 2 -
- (clip_rectangle->height + 1) % 2);
- else
- y = (clip_rectangle->y + (clip_rectangle->height/2 - PM_SIZE) / 2 -
- (clip_rectangle->height/2 + 1) % 2);
-
- if (!ctree_row->children)
- {
- switch (ctree->expander_style)
- {
- case GTK_CTREE_EXPANDER_NONE:
- return x;
- case GTK_CTREE_EXPANDER_TRIANGLE:
- return x + justification_factor * (PM_SIZE + 3);
- case GTK_CTREE_EXPANDER_SQUARE:
- case GTK_CTREE_EXPANDER_CIRCULAR:
- return x + justification_factor * (PM_SIZE + 1);
- }
- }
-
- gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], clip_rectangle);
- gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], clip_rectangle);
-
- switch (ctree->expander_style)
- {
- case GTK_CTREE_EXPANDER_NONE:
- break;
- case GTK_CTREE_EXPANDER_TRIANGLE:
- if (ctree_row->expanded)
- {
- points[0].x = x;
- points[0].y = y + (PM_SIZE + 2) / 6;
- points[1].x = points[0].x + justification_factor * (PM_SIZE + 2);
- points[1].y = points[0].y;
- points[2].x = (points[0].x +
- justification_factor * (PM_SIZE + 2) / 2);
- points[2].y = y + 2 * (PM_SIZE + 2) / 3;
- }
- else
- {
- points[0].x = x + justification_factor * ((PM_SIZE + 2) / 6 + 2);
- points[0].y = y - 1;
- points[1].x = points[0].x;
- points[1].y = points[0].y + (PM_SIZE + 2);
- points[2].x = (points[0].x +
- justification_factor * (2 * (PM_SIZE + 2) / 3 - 1));
- points[2].y = points[0].y + (PM_SIZE + 2) / 2;
- }
-
- gdk_draw_polygon (clist->clist_window, style->base_gc[GTK_STATE_NORMAL],
- TRUE, points, 3);
- gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL],
- FALSE, points, 3);
-
- x += justification_factor * (PM_SIZE + 3);
- break;
- case GTK_CTREE_EXPANDER_SQUARE:
- case GTK_CTREE_EXPANDER_CIRCULAR:
- if (justification_factor == -1)
- x += justification_factor * (PM_SIZE + 1);
-
- if (ctree->expander_style == GTK_CTREE_EXPANDER_CIRCULAR)
- {
- gdk_draw_arc (clist->clist_window, style->base_gc[GTK_STATE_NORMAL],
- TRUE, x, y, PM_SIZE, PM_SIZE, 0, 360 * 64);
- gdk_draw_arc (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL],
- FALSE, x, y, PM_SIZE, PM_SIZE, 0, 360 * 64);
- }
- else
- {
- gdk_draw_rectangle (clist->clist_window,
- style->base_gc[GTK_STATE_NORMAL], TRUE,
- x, y, PM_SIZE, PM_SIZE);
- gdk_draw_rectangle (clist->clist_window,
- style->fg_gc[GTK_STATE_NORMAL], FALSE,
- x, y, PM_SIZE, PM_SIZE);
- }
-
- gdk_draw_line (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL],
- x + 2, y + PM_SIZE / 2, x + PM_SIZE - 2, y + PM_SIZE / 2);
-
- if (!ctree_row->expanded)
- gdk_draw_line (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL],
- x + PM_SIZE / 2, y + 2,
- x + PM_SIZE / 2, y + PM_SIZE - 2);
-
- if (justification_factor == 1)
- x += justification_factor * (PM_SIZE + 1);
- break;
- }
-
- gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], NULL);
- gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], NULL);
-
- return x;
-}
-
-static gint
-gtk_sctree_draw_lines (GtkCTree *ctree,
- GtkCTreeRow *ctree_row,
- gint row,
- gint column,
- gint state,
- GdkRectangle *clip_rectangle,
- GdkRectangle *cell_rectangle,
- GdkRectangle *crect,
- GdkRectangle *area,
- GtkStyle *style)
+gtk_sctree_change_focus_row_expansion (GtkCMCTree *ctree,
+ GtkCMCTreeExpansionType action)
{
- GtkCList *clist;
- GtkCTreeNode *node;
- GtkCTreeNode *parent;
- GdkRectangle tree_rectangle;
- GdkRectangle tc_rectangle;
- GdkGC *bg_gc;
- gint offset;
- gint offset_x;
- gint offset_y;
- gint xcenter;
- gint ycenter;
- gint next_level;
- gint column_right;
- gint column_left;
- gint justify_right;
- gint justification_factor;
-
- clist = GTK_CLIST (ctree);
- ycenter = clip_rectangle->y + (clip_rectangle->height / 2);
- justify_right = (clist->column[column].justification == GTK_JUSTIFY_RIGHT);
-
- if (justify_right)
- {
- offset = (clip_rectangle->x + clip_rectangle->width - 1 -
- ctree->tree_indent * (ctree_row->level - 1));
- justification_factor = -1;
- }
- else
- {
- offset = clip_rectangle->x + ctree->tree_indent * (ctree_row->level - 1);
- justification_factor = 1;
- }
+ GtkCMCList *clist;
+ GtkCMCTreeNode *node;
- switch (ctree->line_style)
- {
- case GTK_CTREE_LINES_NONE:
- break;
- case GTK_CTREE_LINES_TABBED:
- xcenter = offset + justification_factor * TAB_SIZE;
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
- column_right = (COLUMN_LEFT_XPIXEL (clist, ctree->tree_column) +
- clist->column[ctree->tree_column].area.width +
- COLUMN_INSET);
- column_left = (COLUMN_LEFT_XPIXEL (clist, ctree->tree_column) -
- COLUMN_INSET - CELL_SPACING);
-
- if (area)
- {
- tree_rectangle.y = crect->y;
- tree_rectangle.height = crect->height;
-
- if (justify_right)
- {
- tree_rectangle.x = xcenter;
- tree_rectangle.width = column_right - xcenter;
- }
- else
- {
- tree_rectangle.x = column_left;
- tree_rectangle.width = xcenter - column_left;
- }
-
- if (!gdk_rectangle_intersect (area, &tree_rectangle, &tc_rectangle))
- {
- offset += justification_factor * 3;
- break;
- }
- }
-
- gdk_gc_set_clip_rectangle (ctree->lines_gc, crect);
-
- next_level = ctree_row->level;
-
- if (!ctree_row->sibling || (ctree_row->children && ctree_row->expanded))
- {
- node = gtk_ctree_find_node_ptr (ctree, ctree_row);
- if (GTK_CTREE_NODE_NEXT (node))
- next_level = GTK_CTREE_ROW (GTK_CTREE_NODE_NEXT (node))->level;
- else
- next_level = 0;
- }
-
- if (ctree->tree_indent > 0)
- {
- node = ctree_row->parent;
- while (node)
- {
- xcenter -= (justification_factor * ctree->tree_indent);
-
- if ((justify_right && xcenter < column_left) ||
- (!justify_right && xcenter > column_right))
- {
- node = GTK_CTREE_ROW (node)->parent;
- continue;
- }
-
- tree_rectangle.y = cell_rectangle->y;
- tree_rectangle.height = cell_rectangle->height;
- if (justify_right)
- {
- tree_rectangle.x = MAX (xcenter - ctree->tree_indent + 1,
- column_left);
- tree_rectangle.width = MIN (xcenter - column_left,
- ctree->tree_indent);
- }
- else
- {
- tree_rectangle.x = xcenter;
- tree_rectangle.width = MIN (column_right - xcenter,
- ctree->tree_indent);
- }
-
- if (!area || gdk_rectangle_intersect (area, &tree_rectangle,
- &tc_rectangle))
- {
- gtk_sctree_get_cell_style (clist, >K_CTREE_ROW (node)->row,
- state, row, column, NULL, NULL, &bg_gc);
-
- if (bg_gc == clist->bg_gc)
- gdk_gc_set_foreground
- (clist->bg_gc, >K_CTREE_ROW (node)->row.background);
-
- if (!area)
- gdk_draw_rectangle (clist->clist_window, bg_gc, TRUE,
- tree_rectangle.x,
- tree_rectangle.y,
- tree_rectangle.width,
- tree_rectangle.height);
- else
- gdk_draw_rectangle (clist->clist_window, bg_gc, TRUE,
- tc_rectangle.x,
- tc_rectangle.y,
- tc_rectangle.width,
- tc_rectangle.height);
- }
- if (next_level > GTK_CTREE_ROW (node)->level)
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- xcenter, crect->y,
- xcenter, crect->y + crect->height);
- else
- {
- gint width;
-
- offset_x = MIN (ctree->tree_indent, 2 * TAB_SIZE);
- width = offset_x / 2 + offset_x % 2;
-
- parent = GTK_CTREE_ROW (node)->parent;
-
- tree_rectangle.y = ycenter;
- tree_rectangle.height = (cell_rectangle->y - ycenter +
- cell_rectangle->height);
-
- if (justify_right)
- {
- tree_rectangle.x = MAX(xcenter + 1 - width, column_left);
- tree_rectangle.width = MIN (xcenter + 1 - column_left,
- width);
- }
- else
- {
- tree_rectangle.x = xcenter;
- tree_rectangle.width = MIN (column_right - xcenter,
- width);
- }
-
- if (!area ||
- gdk_rectangle_intersect (area, &tree_rectangle,
- &tc_rectangle))
- {
- if (parent)
- {
- gtk_sctree_get_cell_style (clist, >K_CTREE_ROW (parent)->row,
- state, row, column, NULL, NULL, &bg_gc);
- if (bg_gc == clist->bg_gc)
- gdk_gc_set_foreground
- (clist->bg_gc,
- >K_CTREE_ROW (parent)->row.background);
- }
- else if (state == GTK_STATE_SELECTED)
- bg_gc = style->base_gc[state];
- else
- bg_gc = GTK_WIDGET (clist)->style->base_gc[state];
-
- if (!area)
- gdk_draw_rectangle (clist->clist_window, bg_gc, TRUE,
- tree_rectangle.x,
- tree_rectangle.y,
- tree_rectangle.width,
- tree_rectangle.height);
- else
- gdk_draw_rectangle (clist->clist_window,
- bg_gc, TRUE,
- tc_rectangle.x,
- tc_rectangle.y,
- tc_rectangle.width,
- tc_rectangle.height);
- }
-
- gtk_sctree_get_cell_style (clist, >K_CTREE_ROW (node)->row,
- state, row, column, NULL, NULL, &bg_gc);
- if (bg_gc == clist->bg_gc)
- gdk_gc_set_foreground
- (clist->bg_gc, >K_CTREE_ROW (node)->row.background);
-
- gdk_gc_set_clip_rectangle (bg_gc, crect);
- gdk_draw_arc (clist->clist_window, bg_gc, TRUE,
- xcenter - (justify_right * offset_x),
- cell_rectangle->y,
- offset_x, clist->row_height,
- (180 + (justify_right * 90)) * 64, 90 * 64);
- gdk_gc_set_clip_rectangle (bg_gc, NULL);
-
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- xcenter, cell_rectangle->y, xcenter, ycenter);
-
- if (justify_right)
- gdk_draw_arc (clist->clist_window, ctree->lines_gc, FALSE,
- xcenter - offset_x, cell_rectangle->y,
- offset_x, clist->row_height,
- 270 * 64, 90 * 64);
- else
- gdk_draw_arc (clist->clist_window, ctree->lines_gc, FALSE,
- xcenter, cell_rectangle->y,
- offset_x, clist->row_height,
- 180 * 64, 90 * 64);
- }
- node = GTK_CTREE_ROW (node)->parent;
- }
- }
-
- if (state != GTK_STATE_SELECTED)
- {
- tree_rectangle.y = clip_rectangle->y;
- tree_rectangle.height = clip_rectangle->height;
- tree_rectangle.width = COLUMN_INSET + CELL_SPACING +
- MIN (clist->column[ctree->tree_column].area.width + COLUMN_INSET,
- TAB_SIZE);
-
- if (justify_right)
- tree_rectangle.x = MAX (xcenter + 1, column_left);
- else
- tree_rectangle.x = column_left;
-
- if (!area)
- gdk_draw_rectangle (clist->clist_window,
- GTK_WIDGET
- (ctree)->style->base_gc[GTK_STATE_NORMAL],
- TRUE,
- tree_rectangle.x,
- tree_rectangle.y,
- tree_rectangle.width,
- tree_rectangle.height);
- else if (gdk_rectangle_intersect (area, &tree_rectangle,
- &tc_rectangle))
- gdk_draw_rectangle (clist->clist_window,
- GTK_WIDGET
- (ctree)->style->base_gc[GTK_STATE_NORMAL],
- TRUE,
- tc_rectangle.x,
- tc_rectangle.y,
- tc_rectangle.width,
- tc_rectangle.height);
- }
-
- xcenter = offset + (justification_factor * ctree->tree_indent / 2);
-
- gtk_sctree_get_cell_style (clist, &ctree_row->row, state, row, column, NULL, NULL,
- &bg_gc);
- if (bg_gc == clist->bg_gc)
- gdk_gc_set_foreground (clist->bg_gc, &ctree_row->row.background);
-
- gdk_gc_set_clip_rectangle (bg_gc, crect);
- if (ctree_row->is_leaf)
- {
- GdkPoint points[6];
-
- points[0].x = offset + justification_factor * TAB_SIZE;
- points[0].y = cell_rectangle->y;
-
- points[1].x = points[0].x - justification_factor * 4;
- points[1].y = points[0].y;
-
- points[2].x = points[1].x - justification_factor * 2;
- points[2].y = points[1].y + 3;
-
- points[3].x = points[2].x;
- points[3].y = points[2].y + clist->row_height - 5;
-
- points[4].x = points[3].x + justification_factor * 2;
- points[4].y = points[3].y + 3;
-
- points[5].x = points[4].x + justification_factor * 4;
- points[5].y = points[4].y;
-
- gdk_draw_polygon (clist->clist_window, bg_gc, TRUE, points, 6);
- gdk_draw_lines (clist->clist_window, ctree->lines_gc, points, 6);
- }
- else
- {
- gdk_draw_arc (clist->clist_window, bg_gc, TRUE,
- offset - (justify_right * 2 * TAB_SIZE),
- cell_rectangle->y,
- 2 * TAB_SIZE, clist->row_height,
- (90 + (180 * justify_right)) * 64, 180 * 64);
- gdk_draw_arc (clist->clist_window, ctree->lines_gc, FALSE,
- offset - (justify_right * 2 * TAB_SIZE),
- cell_rectangle->y,
- 2 * TAB_SIZE, clist->row_height,
- (90 + (180 * justify_right)) * 64, 180 * 64);
- }
- gdk_gc_set_clip_rectangle (bg_gc, NULL);
- gdk_gc_set_clip_rectangle (ctree->lines_gc, NULL);
-
- offset += justification_factor * 3;
- break;
- default:
- xcenter = offset + justification_factor * PM_SIZE / 2;
-
- if (area)
- {
- tree_rectangle.y = crect->y;
- tree_rectangle.height = crect->height;
-
- if (justify_right)
- {
- tree_rectangle.x = xcenter - PM_SIZE / 2 - 2;
- tree_rectangle.width = (clip_rectangle->x +
- clip_rectangle->width -tree_rectangle.x);
- }
- else
- {
- tree_rectangle.x = clip_rectangle->x + PM_SIZE / 2;
- tree_rectangle.width = (xcenter + PM_SIZE / 2 + 2 -
- clip_rectangle->x);
- }
-
- if (!gdk_rectangle_intersect (area, &tree_rectangle, &tc_rectangle))
- break;
- }
-
- offset_x = 1;
- offset_y = 0;
- if (ctree->line_style == GTK_CTREE_LINES_DOTTED)
- {
- offset_x += abs((clip_rectangle->x + clist->hoffset) % 2);
- offset_y = abs((cell_rectangle->y + clist->voffset) % 2);
- }
-
- clip_rectangle->y--;
- clip_rectangle->height++;
- gdk_gc_set_clip_rectangle (ctree->lines_gc, clip_rectangle);
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- xcenter,
- (ctree->show_stub || clist->row_list->data != ctree_row) ?
- cell_rectangle->y + offset_y : ycenter,
- xcenter,
- (ctree_row->sibling) ? crect->y +crect->height : ycenter);
-
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- xcenter + (justification_factor * offset_x), ycenter,
- xcenter + (justification_factor * (PM_SIZE / 2 + 2)),
- ycenter);
-
- node = ctree_row->parent;
- while (node)
- {
- xcenter -= (justification_factor * ctree->tree_indent);
-
- if (GTK_CTREE_ROW (node)->sibling)
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- xcenter, cell_rectangle->y + offset_y,
- xcenter, crect->y + crect->height);
- node = GTK_CTREE_ROW (node)->parent;
- }
- gdk_gc_set_clip_rectangle (ctree->lines_gc, NULL);
- clip_rectangle->y++;
- clip_rectangle->height--;
- break;
- }
- return offset;
-}
-
-static gboolean filter_fg (PangoAttribute *attribute, gpointer data)
-{
- const PangoAttrClass *klass = attribute->klass;
- if (klass->type == PANGO_ATTR_FOREGROUND)
- return TRUE;
-
- return FALSE;
-}
-
-static PangoLayout *
-sc_gtk_clist_create_cell_layout (GtkCList *clist,
- GtkCListRow *clist_row,
- gint column)
-{
- PangoLayout *layout;
- GtkStyle *style;
- GtkCell *cell;
- gchar *text;
-
- gtk_sctree_get_cell_style (clist, clist_row, GTK_STATE_NORMAL, 0, column, &style,
- NULL, NULL);
-
-
- cell = &clist_row->cell[column];
- switch (cell->type)
- {
- case GTK_CELL_TEXT:
- case GTK_CELL_PIXTEXT:
- text = ((cell->type == GTK_CELL_PIXTEXT) ?
- GTK_CELL_PIXTEXT (*cell)->text :
- GTK_CELL_TEXT (*cell)->text);
-
- if (!text)
- return NULL;
-
- if (!GTK_SCTREE(clist)->use_markup[column]) {
- layout = gtk_widget_create_pango_layout (GTK_WIDGET (clist),
- ((cell->type == GTK_CELL_PIXTEXT) ?
- GTK_CELL_PIXTEXT (*cell)->text :
- GTK_CELL_TEXT (*cell)->text));
- pango_layout_set_font_description (layout, style->font_desc);
- } else {
- PangoContext *context = gtk_widget_get_pango_context (GTK_WIDGET(clist));
- layout = pango_layout_new (context);
- pango_layout_set_markup (layout, text, -1);
- pango_layout_set_font_description (layout, style->font_desc);
- if (clist_row->state == GTK_STATE_SELECTED) {
- /* for selected row, we should remove any forced foreground color
- * or it looks like shit */
- PangoAttrList *list = pango_layout_get_attributes(layout);
- PangoAttrList *rem = pango_attr_list_filter(list, filter_fg, NULL);
- if (rem)
- pango_attr_list_unref(rem);
- }
- }
-
- return layout;
-
- default:
- return NULL;
- }
-}
-
-static void
-gtk_sctree_draw_row (GtkCList *clist,
- GdkRectangle *area,
- gint row,
- GtkCListRow *clist_row)
-{
- GtkWidget *widget;
- GtkCTree *ctree;
- GdkRectangle *rect;
- GdkRectangle *crect;
- GdkRectangle row_rectangle;
- GdkRectangle cell_rectangle;
- GdkRectangle clip_rectangle;
- GdkRectangle intersect_rectangle;
- gint last_column;
- gint column_left = 0;
- gint column_right = 0;
- gint offset = 0;
- gint state;
- gint i;
- static GdkColor greybg={0, 0, 0, 0};
- static gboolean color_change = TRUE;
-
- if (greybg.pixel == 0 &&
- greybg.red == 0 &&
- greybg.green == 0 &&
- greybg.blue == 0) {
- GdkColor normalbg = {0, 0xffff, 0xffff, 0xffff};
- if (GTK_WIDGET (clist)->style) {
- normalbg = GTK_WIDGET (clist)->style->base[GTK_STATE_NORMAL];
- }
- if (normalbg.red > 0x8888 && normalbg.green > 0x8888 && normalbg.blue > 0x8888) {
- greybg.pixel = normalbg.pixel;
- greybg.red = normalbg.red - prefs_common.stripes_color_offset;
- greybg.green = normalbg.green - prefs_common.stripes_color_offset;
- greybg.blue = normalbg.blue - prefs_common.stripes_color_offset;
- } else if (normalbg.red < 0x8888 && normalbg.green < 0x8888 && normalbg.blue < 0x8888) {
- greybg.pixel = normalbg.pixel;
- greybg.red = normalbg.red + prefs_common.stripes_color_offset;
- greybg.green = normalbg.green + prefs_common.stripes_color_offset;
- greybg.blue = normalbg.blue + prefs_common.stripes_color_offset;
- } else {
- color_change = FALSE;
- }
- }
-
- g_return_if_fail (clist != NULL);
-
- /* bail now if we arn't drawable yet */
- if (!GTK_WIDGET_DRAWABLE (clist) || row < 0 || row >= clist->rows)
- return;
-
- widget = GTK_WIDGET (clist);
- ctree = GTK_CTREE (clist);
-
- /* if the function is passed the pointer to the row instead of null,
- * it avoids this expensive lookup */
- if (!clist_row)
- clist_row = (g_list_nth (clist->row_list, row))->data;
-
- /* rectangle of the entire row */
- row_rectangle.x = 0;
- row_rectangle.y = ROW_TOP_YPIXEL (clist, row);
- row_rectangle.width = clist->clist_window_width;
- row_rectangle.height = clist->row_height;
-
- /* rectangle of the cell spacing above the row */
- cell_rectangle.x = 0;
- cell_rectangle.y = row_rectangle.y - CELL_SPACING;
- cell_rectangle.width = row_rectangle.width;
- cell_rectangle.height = CELL_SPACING;
-
- /* rectangle used to clip drawing operations, its y and height
- * positions only need to be set once, so we set them once here.
- * the x and width are set withing the drawing loop below once per
- * column */
- clip_rectangle.y = row_rectangle.y;
- clip_rectangle.height = row_rectangle.height;
-
- if (prefs_common.use_stripes_everywhere && GTK_SCTREE(ctree)->show_stripes
- && color_change && row % 2) {
- clist_row->background = greybg;
- clist_row->bg_set = TRUE;
- } else {
- clist_row->bg_set = FALSE;
- }
- if (clist_row->state == GTK_STATE_NORMAL)
- {
- if (clist_row->fg_set)
- gdk_gc_set_foreground (clist->fg_gc, &clist_row->foreground);
- if (clist_row->bg_set)
- gdk_gc_set_rgb_fg_color (clist->bg_gc, &clist_row->background);
- }
-
- state = clist_row->state;
-
- gdk_gc_set_foreground (ctree->lines_gc,
- &widget->style->fg[clist_row->state]);
-
- /* draw the cell borders */
- if (area)
- {
- rect = &intersect_rectangle;
- crect = &intersect_rectangle;
-
- if (gdk_rectangle_intersect (area, &cell_rectangle, crect))
- gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
- crect->x, crect->y, crect->width, crect->height);
- }
- else
- {
- rect = &clip_rectangle;
- crect = &cell_rectangle;
-
- gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
- crect->x, crect->y, crect->width, crect->height);
- }
-
- /* horizontal black lines */
- if (ctree->line_style == GTK_CTREE_LINES_TABBED)
- {
-
- column_right = (COLUMN_LEFT_XPIXEL (clist, ctree->tree_column) +
- clist->column[ctree->tree_column].area.width +
- COLUMN_INSET);
- column_left = (COLUMN_LEFT_XPIXEL (clist, ctree->tree_column) -
- COLUMN_INSET - (ctree->tree_column != 0) * CELL_SPACING);
-
- switch (clist->column[ctree->tree_column].justification)
- {
- case GTK_JUSTIFY_CENTER:
- case GTK_JUSTIFY_FILL:
- case GTK_JUSTIFY_LEFT:
- offset = (column_left + ctree->tree_indent *
- (((GtkCTreeRow *)clist_row)->level - 1));
-
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- MIN (offset + TAB_SIZE, column_right),
- cell_rectangle.y,
- clist->clist_window_width, cell_rectangle.y);
- break;
- case GTK_JUSTIFY_RIGHT:
- offset = (column_right - 1 - ctree->tree_indent *
- (((GtkCTreeRow *)clist_row)->level - 1));
-
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- -1, cell_rectangle.y,
- MAX (offset - TAB_SIZE, column_left),
- cell_rectangle.y);
- break;
- }
- }
-
- /* the last row has to clear its bottom cell spacing too */
- if (clist_row == clist->row_list_end->data)
- {
- cell_rectangle.y += clist->row_height + CELL_SPACING;
-
- if (!area || gdk_rectangle_intersect (area, &cell_rectangle, crect))
- {
- gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
- crect->x, crect->y, crect->width, crect->height);
-
- /* horizontal black lines */
- if (ctree->line_style == GTK_CTREE_LINES_TABBED)
- {
- switch (clist->column[ctree->tree_column].justification)
- {
- case GTK_JUSTIFY_CENTER:
- case GTK_JUSTIFY_FILL:
- case GTK_JUSTIFY_LEFT:
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- MIN (column_left + TAB_SIZE + COLUMN_INSET +
- (((GtkCTreeRow *)clist_row)->level > 1) *
- MIN (ctree->tree_indent / 2, TAB_SIZE),
- column_right),
- cell_rectangle.y,
- clist->clist_window_width, cell_rectangle.y);
- break;
- case GTK_JUSTIFY_RIGHT:
- gdk_draw_line (clist->clist_window, ctree->lines_gc,
- -1, cell_rectangle.y,
- MAX (column_right - TAB_SIZE - 1 -
- COLUMN_INSET -
- (((GtkCTreeRow *)clist_row)->level > 1) *
- MIN (ctree->tree_indent / 2, TAB_SIZE),
- column_left - 1), cell_rectangle.y);
- break;
- }
- }
- }
- }
-
- for (last_column = clist->columns - 1;
- last_column >= 0 && !clist->column[last_column].visible; last_column--)
- ;
-
- /* iterate and draw all the columns (row cells) and draw their contents */
- for (i = 0; i < clist->columns; i++)
- {
- GtkStyle *style;
- GdkGC *fg_gc;
- GdkGC *bg_gc;
- PangoLayout *layout = NULL;
- PangoRectangle logical_rect;
-
- gint width;
- gint height;
- gint pixmap_width;
- gint string_width;
- gint old_offset;
-
- if (!clist->column[i].visible)
- continue;
-
- gtk_sctree_get_cell_style (clist, clist_row, state, row, i, &style, &fg_gc, &bg_gc);
-
- /* calculate clipping region */
- clip_rectangle.x = clist->column[i].area.x + clist->hoffset;
- clip_rectangle.width = clist->column[i].area.width;
-
- cell_rectangle.x = clip_rectangle.x - COLUMN_INSET - CELL_SPACING;
- cell_rectangle.width = (clip_rectangle.width + 2 * COLUMN_INSET +
- (1 + (i == last_column)) * CELL_SPACING);
- cell_rectangle.y = clip_rectangle.y;
- cell_rectangle.height = clip_rectangle.height;
-
- string_width = 0;
- pixmap_width = 0;
-
- if (area && !gdk_rectangle_intersect (area, &cell_rectangle,
- &intersect_rectangle))
- {
- if (i != ctree->tree_column)
- continue;
- }
- else
- {
- gdk_draw_rectangle (clist->clist_window, bg_gc, TRUE,
- crect->x, crect->y, crect->width, crect->height);
-
-
- layout = sc_gtk_clist_create_cell_layout (clist, clist_row, i);
- if (layout)
- {
- pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
- width = logical_rect.width;
- }
- else
- width = 0;
-
- switch (clist_row->cell[i].type)
- {
- case GTK_CELL_PIXMAP:
- gdk_window_get_size
- (GTK_CELL_PIXMAP (clist_row->cell[i])->pixmap, &pixmap_width,
- &height);
- width += pixmap_width;
- break;
- case GTK_CELL_PIXTEXT:
- if (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
- {
- gdk_window_get_size
- (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap,
- &pixmap_width, &height);
- width += pixmap_width;
- }
-
- if (GTK_CELL_PIXTEXT (clist_row->cell[i])->text &&
- GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
- width += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
-
- if (i == ctree->tree_column)
- width += (ctree->tree_indent *
- ((GtkCTreeRow *)clist_row)->level);
- break;
- default:
- break;
- }
-
- switch (clist->column[i].justification)
- {
- case GTK_JUSTIFY_LEFT:
- offset = clip_rectangle.x + clist_row->cell[i].horizontal;
- break;
- case GTK_JUSTIFY_RIGHT:
- offset = (clip_rectangle.x + clist_row->cell[i].horizontal +
- clip_rectangle.width - width);
- break;
- case GTK_JUSTIFY_CENTER:
- case GTK_JUSTIFY_FILL:
- offset = (clip_rectangle.x + clist_row->cell[i].horizontal +
- (clip_rectangle.width / 2) - (width / 2));
- break;
- };
-
- if (i != ctree->tree_column)
- {
- int start_y = (clip_rectangle.height - height) / 2;
- if (GTK_CLIST_ROW_HEIGHT_SET(GTK_CLIST(clist)))
- start_y = (clip_rectangle.height/2 - height) / 2;
-
- offset += clist_row->cell[i].horizontal;
- switch (clist_row->cell[i].type)
- {
- case GTK_CELL_PIXMAP:
- gtk_sctree_draw_cell_pixmap
- (clist->clist_window, &clip_rectangle, fg_gc,
- GTK_CELL_PIXMAP (clist_row->cell[i])->pixmap,
- GTK_CELL_PIXMAP (clist_row->cell[i])->mask,
- offset,
- clip_rectangle.y + clist_row->cell[i].vertical +
- start_y,
- pixmap_width, height);
- break;
- case GTK_CELL_PIXTEXT:
- offset = gtk_sctree_draw_cell_pixmap
- (clist->clist_window, &clip_rectangle, fg_gc,
- GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap,
- GTK_CELL_PIXTEXT (clist_row->cell[i])->mask,
- offset,
- clip_rectangle.y + clist_row->cell[i].vertical +
- start_y,
- pixmap_width, height);
- offset += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
-
- /* Fall through */
- case GTK_CELL_TEXT:
- if (layout)
- {
- gint row_center_offset = (clist->row_height - logical_rect.height) / 2;
-
- gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle);
- gdk_draw_layout (clist->clist_window, fg_gc,
- offset,
- row_rectangle.y + row_center_offset + clist_row->cell[i].vertical,
- layout);
- gdk_gc_set_clip_rectangle (fg_gc, NULL);
- g_object_unref (G_OBJECT (layout));
- }
- break;
- default:
- break;
- }
- continue;
- }
- }
-
- if (bg_gc == clist->bg_gc)
- gdk_gc_set_background (ctree->lines_gc, &clist_row->background);
-
- /* draw ctree->tree_column */
- cell_rectangle.y -= CELL_SPACING;
- cell_rectangle.height += CELL_SPACING;
-
- if (area && !gdk_rectangle_intersect (area, &cell_rectangle,
- &intersect_rectangle))
- {
- if (layout)
- g_object_unref (G_OBJECT (layout));
- continue;
- }
-
- /* draw lines */
- offset = gtk_sctree_draw_lines (ctree, (GtkCTreeRow *)clist_row, row, i,
- state, &clip_rectangle, &cell_rectangle,
- crect, area, style);
-
- /* draw expander */
- offset = gtk_sctree_draw_expander (ctree, (GtkCTreeRow *)clist_row,
- style, &clip_rectangle, offset);
-
- if (clist->column[i].justification == GTK_JUSTIFY_RIGHT)
- offset -= ctree->tree_spacing;
- else
- offset += ctree->tree_spacing;
-
- if (clist->column[i].justification == GTK_JUSTIFY_RIGHT)
- offset -= (pixmap_width + clist_row->cell[i].horizontal);
- else
- offset += clist_row->cell[i].horizontal;
-
- old_offset = offset;
- offset = gtk_sctree_draw_cell_pixmap (clist->clist_window, &clip_rectangle, fg_gc,
- GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap,
- GTK_CELL_PIXTEXT (clist_row->cell[i])->mask,
- offset,
- clip_rectangle.y + clist_row->cell[i].vertical
- + (clip_rectangle.height - height) / 2,
- pixmap_width, height);
-
- if (layout)
- {
- gint row_center_offset = (clist->row_height - logical_rect.height) / 2;
-
- if (clist->column[i].justification == GTK_JUSTIFY_RIGHT)
- {
- offset = (old_offset - string_width);
- if (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
- offset -= GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
- }
- else
- {
- if (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
- offset += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
- }
-
- gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle);
- gdk_draw_layout (clist->clist_window, fg_gc,
- offset,
- row_rectangle.y + row_center_offset + clist_row->cell[i].vertical,
- layout);
-
- g_object_unref (G_OBJECT (layout));
- }
- gdk_gc_set_clip_rectangle (fg_gc, NULL);
- }
-
- /* draw focus rectangle */
- if (clist->focus_row == row &&
- GTK_WIDGET_CAN_FOCUS (widget) && GTK_WIDGET_HAS_FOCUS (widget))
- {
- if (!area)
- gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
- row_rectangle.x, row_rectangle.y,
- row_rectangle.width - 1, row_rectangle.height - 1);
- else if (gdk_rectangle_intersect (area, &row_rectangle,
- &intersect_rectangle))
- {
- gdk_gc_set_clip_rectangle (clist->xor_gc, &intersect_rectangle);
- gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
- row_rectangle.x, row_rectangle.y,
- row_rectangle.width - 1,
- row_rectangle.height - 1);
- gdk_gc_set_clip_rectangle (clist->xor_gc, NULL);
- }
- }
-}
-
-static void
-gtk_sctree_change_focus_row_expansion (GtkCTree *ctree,
- GtkCTreeExpansionType action)
-{
- GtkCList *clist;
- GtkCTreeNode *node;
-
- g_return_if_fail (GTK_IS_CTREE (ctree));
-
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (ctree))) &&
- GTK_WIDGET_HAS_GRAB (ctree))
+ gtk_widget_has_grab (GTK_WIDGET(ctree)))
return;
if (!(node =
- GTK_CTREE_NODE (g_list_nth (clist->row_list, clist->focus_row))) ||
- GTK_CTREE_ROW (node)->is_leaf || !(GTK_CTREE_ROW (node)->children))
+ GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row))) ||
+ GTK_CMCTREE_ROW (node)->is_leaf || !(GTK_CMCTREE_ROW (node)->children))
return;
switch (action)
{
- case GTK_CTREE_EXPANSION_EXPAND:
+ case GTK_CMCTREE_EXPANSION_EXPAND:
if (GTK_SCTREE(ctree)->always_expand_recursively)
- gtk_ctree_expand_recursive (ctree, node);
+ gtk_cmctree_expand_recursive (ctree, node);
else
- gtk_ctree_expand (ctree, node);
+ gtk_cmctree_expand (ctree, node);
break;
- case GTK_CTREE_EXPANSION_EXPAND_RECURSIVE:
- gtk_ctree_expand_recursive (ctree, node);
+ case GTK_CMCTREE_EXPANSION_EXPAND_RECURSIVE:
+ gtk_cmctree_expand_recursive (ctree, node);
break;
- case GTK_CTREE_EXPANSION_COLLAPSE:
- gtk_ctree_collapse (ctree, node);
+ case GTK_CMCTREE_EXPANSION_COLLAPSE:
+ gtk_cmctree_collapse (ctree, node);
break;
- case GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE:
- gtk_ctree_collapse_recursive (ctree, node);
+ case GTK_CMCTREE_EXPANSION_COLLAPSE_RECURSIVE:
+ gtk_cmctree_collapse_recursive (ctree, node);
break;
- case GTK_CTREE_EXPANSION_TOGGLE:
+ case GTK_CMCTREE_EXPANSION_TOGGLE:
if (GTK_SCTREE(ctree)->always_expand_recursively)
- gtk_ctree_toggle_expansion_recursive (ctree, node);
+ gtk_cmctree_toggle_expansion_recursive (ctree, node);
else
- gtk_ctree_toggle_expansion (ctree, node);
+ gtk_cmctree_toggle_expansion (ctree, node);
break;
- case GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE:
- gtk_ctree_toggle_expansion_recursive (ctree, node);
+ case GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE:
+ gtk_cmctree_toggle_expansion_recursive (ctree, node);
break;
}
}
gtk_sctree_class_init (GtkSCTreeClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkCListClass *clist_class;
- GtkCTreeClass *ctree_class;
+ GtkCMCListClass *clist_class;
+ GtkCMCTreeClass *ctree_class;
- object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
- clist_class = (GtkCListClass *) klass;
- ctree_class = (GtkCTreeClass *) klass;
+ clist_class = (GtkCMCListClass *) klass;
+ ctree_class = (GtkCMCTreeClass *) klass;
- parent_class = gtk_type_class (gtk_ctree_get_type ());
+ parent_class = g_type_class_peek (gtk_cmctree_get_type ());
sctree_signals[ROW_POPUP_MENU] =
g_signal_new ("row_popup_menu",
/* gtk_object_class_add_signals (object_class, sctree_signals, LAST_SIGNAL); */
clist_class->clear = gtk_sctree_clear;
- clist_class->draw_row = gtk_sctree_draw_row;
clist_class->unselect_all = gtk_sctree_real_unselect_all;
- ctree_class->tree_collapse = gtk_sctree_collapse;
+ ctree_class->tree_collapse = gtk_sctree_real_tree_collapse;
ctree_class->tree_expand = gtk_sctree_real_tree_expand;
ctree_class->tree_move = sreal_tree_move;
ctree_class->change_focus_row_expansion = gtk_sctree_change_focus_row_expansion;
{
sctree->anchor_row = NULL;
- /* GtkCTree does not specify pointer motion by default */
+ /* GtkCMCTree does not specify pointer motion by default */
gtk_widget_add_events (GTK_WIDGET (sctree), GDK_POINTER_MOTION_MASK);
gtk_widget_add_events (GTK_WIDGET (sctree), GDK_POINTER_MOTION_MASK);
}
static gboolean
row_is_selected(GtkSCTree *sctree, gint row)
{
- GtkCListRow *clist_row;
- clist_row = g_list_nth (GTK_CLIST(sctree)->row_list, row)->data;
+ GtkCMCListRow *clist_row;
+ clist_row = g_list_nth (GTK_CMCLIST(sctree)->row_list, row)->data;
return clist_row ? clist_row->state == GTK_STATE_SELECTED : FALSE;
}
GList *node;
if (sctree->anchor_row == NULL) {
prev_row = row;
- sctree->anchor_row = gtk_ctree_node_nth(GTK_CTREE(sctree), row);
+ sctree->anchor_row = gtk_cmctree_node_nth(GTK_CMCTREE(sctree), row);
} else
- prev_row = g_list_position(GTK_CLIST(sctree)->row_list,
+ prev_row = g_list_position(GTK_CMCLIST(sctree)->row_list,
(GList *)sctree->anchor_row);
if (row < prev_row) {
min = row;
max = prev_row;
- GTK_CLIST(sctree)->focus_row = max;
+ GTK_CMCLIST(sctree)->focus_row = min;
} else {
min = prev_row;
max = row;
}
if (max - min > 10)
- gtk_clist_freeze(GTK_CLIST(sctree));
+ gtk_cmclist_freeze(GTK_CMCLIST(sctree));
- node = g_list_nth((GTK_CLIST(sctree))->row_list, min);
+ node = g_list_nth((GTK_CMCLIST(sctree))->row_list, min);
for (i = min; i < max; i++) {
- if (node && GTK_CTREE_ROW (node)->row.selectable) {
+ if (node && GTK_CMCTREE_ROW (node)->row.selectable) {
g_signal_emit_by_name(G_OBJECT(sctree), "tree_select_row",
node, -1);
}
node = node->next;
}
if (max - min > 10)
- gtk_clist_thaw(GTK_CLIST(sctree));
+ gtk_cmclist_thaw(GTK_CMCLIST(sctree));
sctree->selecting_range--;
- gtk_clist_select_row (GTK_CLIST (sctree), max, -1);
+ gtk_cmclist_select_row (GTK_CMCLIST (sctree), max, -1);
}
/* Handles row selection according to the specified modifier state */
-/* in certain cases, we arrive here from a function knowing the GtkCTreeNode, and having
+/* in certain cases, we arrive here from a function knowing the GtkCMCTreeNode, and having
* already slowly found row using g_list_position. In which case, _node will be non-NULL
* to avoid this function having to slowly find it with g_list_nth. */
static void
-select_row (GtkSCTree *sctree, gint row, gint col, guint state, GtkCTreeNode *_node)
+select_row (GtkSCTree *sctree, gint row, gint col, guint state, GtkCMCTreeNode *_node)
{
gboolean range, additive;
- g_return_if_fail (sctree != NULL);
- g_return_if_fail (GTK_IS_SCTREE (sctree));
+ cm_return_if_fail (sctree != NULL);
+ cm_return_if_fail (GTK_IS_SCTREE (sctree));
range = ((state & GDK_SHIFT_MASK) != 0) &&
- (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
- (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
+ (GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
+ (GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
additive = ((state & GDK_CONTROL_MASK) != 0) &&
- (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
- (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
+ (GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
+ (GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
if (!range && !additive && sctree->force_additive_sel)
additive = TRUE;
- GTK_CLIST(sctree)->focus_row = row;
+ GTK_CMCLIST(sctree)->focus_row = row;
if (!additive) {
- gtk_clist_unselect_all (GTK_CLIST (sctree));
+ gtk_cmclist_unselect_all (GTK_CMCLIST (sctree));
}
if (!range) {
- GtkCTreeNode *node;
+ GtkCMCTreeNode *node;
- node = _node ? _node : gtk_ctree_node_nth (GTK_CTREE(sctree), row);
+ node = _node ? _node : gtk_cmctree_node_nth (GTK_CMCTREE(sctree), row);
/*No need to manage overlapped list*/
if (additive) {
if (row_is_selected(sctree, row))
- gtk_clist_unselect_row (GTK_CLIST (sctree), row, col);
+ gtk_cmclist_unselect_row (GTK_CMCLIST (sctree), row, col);
else
g_signal_emit_by_name
(G_OBJECT (sctree),
static gboolean
sctree_is_hot_spot (GtkSCTree *sctree,
- GtkCTreeNode *node,
+ GtkCMCTreeNode *node,
gint row,
gint x,
gint y)
{
- GtkCTreeRow *tree_row;
- GtkCList *clist;
- GtkCTree *ctree;
- GtkCellPixText *cell;
+ GtkCMCTreeRow *tree_row;
+ GtkCMCList *clist;
+ GtkCMCTree *ctree;
gint xl, xmax;
gint yu;
+ gint hotspot_size;
- g_return_val_if_fail (GTK_IS_SCTREE (sctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (sctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
- clist = GTK_CLIST (sctree);
- ctree = GTK_CTREE (sctree);
+ clist = GTK_CMCLIST (sctree);
+ ctree = GTK_CMCTREE (sctree);
if (!clist->column[ctree->tree_column].visible ||
- ctree->expander_style == GTK_CTREE_EXPANDER_NONE)
+ ctree->expander_style == GTK_CMCTREE_EXPANDER_NONE)
return FALSE;
- tree_row = GTK_CTREE_ROW (node);
+ tree_row = GTK_CMCTREE_ROW (node);
+ if (!tree_row->children)
+ return FALSE;
- cell = GTK_CELL_PIXTEXT (tree_row->row.cell[ctree->tree_column]);
+ hotspot_size = clist->row_height-2;
+ if (hotspot_size > clist->column[ctree->tree_column].area.width - 2)
+ hotspot_size = clist->column[ctree->tree_column].area.width - 2;
- if (!GTK_CLIST_ROW_HEIGHT_SET(GTK_CLIST(clist)))
- yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height - PM_SIZE) / 2 -
+ if (!GTK_CMCLIST_ROW_HEIGHT_SET(GTK_CMCLIST(clist)))
+ yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height - hotspot_size) / 2 -
(clist->row_height - 1) % 2);
else
- yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height/2 - PM_SIZE) / 2 -
+ yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height/2 - hotspot_size) / 2 -
(clist->row_height/2 - 1) % 2);
#ifndef GENERIC_UMPC
if (clist->column[ctree->tree_column].justification == GTK_JUSTIFY_RIGHT)
- xl = (clist->column[ctree->tree_column].area.x +
+ xl = clist->column[ctree->tree_column].area.x +
clist->column[ctree->tree_column].area.width - 1 + clist->hoffset -
- (tree_row->level - 1) * ctree->tree_indent - PM_SIZE -
- (ctree->line_style == GTK_CTREE_LINES_TABBED) * 3);
+ (tree_row->level - 1) * ctree->tree_indent - hotspot_size;
else
- xl = (clist->column[ctree->tree_column].area.x + clist->hoffset +
- (tree_row->level - 1) * ctree->tree_indent +
- (ctree->line_style == GTK_CTREE_LINES_TABBED) * 3);
+ xl = clist->column[ctree->tree_column].area.x + clist->hoffset +
+ (tree_row->level - 1) * ctree->tree_indent;
- xmax = xl + PM_SIZE;
+ xmax = xl + hotspot_size;
#else
if (clist->column[ctree->tree_column].justification == GTK_JUSTIFY_RIGHT) {
- xl = (clist->column[ctree->tree_column].area.x +
+ xl = clist->column[ctree->tree_column].area.x +
clist->column[ctree->tree_column].area.width - 1 + clist->hoffset -
- (tree_row->level - 1) * ctree->tree_indent - PM_SIZE -
- (ctree->line_style == GTK_CTREE_LINES_TABBED) * 3);
- xmax = xl + PM_SIZE;
+ (tree_row->level - 1) * ctree->tree_indent - hotspot_size;
+ xmax = xl + hotspot_size;
} else if (ctree->tree_column == 0) {
- xl = (clist->column[ctree->tree_column].area.x + clist->hoffset +
- (ctree->line_style == GTK_CTREE_LINES_TABBED) * 3);
- xmax = (clist->column[ctree->tree_column].area.x + clist->hoffset +
+ xl = clist->column[ctree->tree_column].area.x + clist->hoffset;
+ xmax = clist->column[ctree->tree_column].area.x + clist->hoffset +
(tree_row->level - 1) * ctree->tree_indent +
- (ctree->line_style == GTK_CTREE_LINES_TABBED) * 3) +
- PM_SIZE;
+ hotspot_size;
} else {
- xl = (clist->column[ctree->tree_column].area.x + clist->hoffset +
- (tree_row->level - 1) * ctree->tree_indent +
- (ctree->line_style == GTK_CTREE_LINES_TABBED) * 3);
- xmax = xl + PM_SIZE;
+ xl = clist->column[ctree->tree_column].area.x + clist->hoffset +
+ (tree_row->level - 1) * ctree->tree_indent;
+ xmax = xl + hotspot_size;
}
#endif
- return (x >= xl && x <= xmax && y >= yu && y <= yu + PM_SIZE);
+ return (x >= xl && x <= xmax && y >= yu && y <= yu + hotspot_size);
}
gboolean
gint x,
gint y)
{
- GtkCTreeNode *node;
+ GtkCMCTreeNode *node;
gint column;
gint row;
- g_return_val_if_fail (GTK_IS_SCTREE (ctree), FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (ctree), FALSE);
- if (gtk_clist_get_selection_info (GTK_CLIST (ctree), x, y, &row, &column))
- if ((node = GTK_CTREE_NODE(g_list_nth (GTK_CLIST (ctree)->row_list, row))))
+ if (gtk_cmclist_get_selection_info (GTK_CMCLIST (ctree), x, y, &row, &column))
+ if ((node = GTK_CMCTREE_NODE(g_list_nth (GTK_CMCLIST (ctree)->row_list, row))))
return sctree_is_hot_spot (ctree, node, row, x, y);
return FALSE;
}
-/* Our handler for button_press events. We override all of GtkCList's broken
+/* Our handler for button_press events. We override all of GtkCMCList's broken
* behavior.
*/
static gint
gtk_sctree_button_press (GtkWidget *widget, GdkEventButton *event)
{
GtkSCTree *sctree;
- GtkCList *clist;
+ GtkCMCList *clist;
gboolean on_row;
gint row;
gint col;
gint retval;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (widget != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
sctree = GTK_SCTREE (widget);
- clist = GTK_CLIST (widget);
+ clist = GTK_CMCLIST (widget);
retval = FALSE;
if (event->window != clist->clist_window)
return (* GTK_WIDGET_CLASS (parent_class)->button_press_event) (widget, event);
- on_row = gtk_clist_get_selection_info (clist, event->x, event->y, &row, &col);
+ on_row = gtk_cmclist_get_selection_info (clist, event->x, event->y, &row, &col);
- if (on_row && !GTK_WIDGET_HAS_FOCUS(widget))
+ if (on_row && !gtk_widget_has_focus(widget))
gtk_widget_grab_focus (widget);
if (gtk_sctree_is_hot_spot (GTK_SCTREE(sctree), event->x, event->y)) {
- GtkCTreeNode *node = gtk_ctree_node_nth(GTK_CTREE(sctree), row);
- if (GTK_CTREE_ROW (node)->expanded)
- gtk_ctree_collapse(GTK_CTREE(sctree), node);
+ GtkCMCTreeNode *node = gtk_cmctree_node_nth(GTK_CMCTREE(sctree), row);
+ if (GTK_CMCTREE_ROW (node)->expanded)
+ gtk_cmctree_collapse(GTK_CMCTREE(sctree), node);
else if (GTK_SCTREE(sctree)->always_expand_recursively)
- gtk_ctree_expand_recursive (GTK_CTREE(sctree), node);
+ gtk_cmctree_expand_recursive (GTK_CMCTREE(sctree), node);
else
- gtk_ctree_expand(GTK_CTREE(sctree), node);
+ gtk_cmctree_expand(GTK_CMCTREE(sctree), node);
return TRUE;
}
select_row (sctree, row, col, event->state, NULL);
}
} else {
- gtk_clist_unselect_all (clist);
+ gtk_cmclist_unselect_all (clist);
}
retval = TRUE;
sctree_signals[ROW_POPUP_MENU],
0, event);
} else {
- gtk_clist_unselect_all(clist);
+ gtk_cmclist_unselect_all(clist);
g_signal_emit (G_OBJECT (sctree),
sctree_signals[EMPTY_POPUP_MENU],
0, event);
return retval;
}
-/* Our handler for button_release events. We override all of GtkCList's broken
+/* Our handler for button_release events. We override all of GtkCMCList's broken
* behavior.
*/
static gint
gtk_sctree_button_release (GtkWidget *widget, GdkEventButton *event)
{
GtkSCTree *sctree;
- GtkCList *clist;
+ GtkCMCList *clist;
gint on_row;
gint row, col;
gint retval;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (widget != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
sctree = GTK_SCTREE (widget);
- clist = GTK_CLIST (widget);
+ clist = GTK_CMCLIST (widget);
retval = FALSE;
if (event->window != clist->clist_window)
return (* GTK_WIDGET_CLASS (parent_class)->button_release_event) (widget, event);
- on_row = gtk_clist_get_selection_info (clist, event->x, event->y, &row, &col);
+ on_row = gtk_cmclist_get_selection_info (clist, event->x, event->y, &row, &col);
if (!(event->button == 1 || event->button == 2))
return FALSE;
return retval;
}
-/* Our handler for motion_notify events. We override all of GtkCList's broken
+/* Our handler for motion_notify events. We override all of GtkCMCList's broken
* behavior.
*/
static gint
gtk_sctree_motion (GtkWidget *widget, GdkEventMotion *event)
{
GtkSCTree *sctree;
- GtkCList *clist;
+ GtkCMCList *clist;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (widget != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
sctree = GTK_SCTREE (widget);
- clist = GTK_CLIST (widget);
+ clist = GTK_CMCLIST (widget);
if (event->window != clist->clist_window)
return (* GTK_WIDGET_CLASS (parent_class)->motion_notify_event) (widget, event);
* to null.
*/
static void
-gtk_sctree_clear (GtkCList *clist)
+gtk_sctree_clear (GtkCMCList *clist)
{
GtkSCTree *sctree;
- g_return_if_fail (clist != NULL);
- g_return_if_fail (GTK_IS_SCTREE (clist));
+ cm_return_if_fail (clist != NULL);
+ cm_return_if_fail (GTK_IS_SCTREE (clist));
sctree = GTK_SCTREE (clist);
sctree->anchor_row = NULL;
- if (((GtkCListClass *)parent_class)->clear)
- (* ((GtkCListClass *)parent_class)->clear) (clist);
+ if (((GtkCMCListClass *)parent_class)->clear)
+ (* ((GtkCMCListClass *)parent_class)->clear) (clist);
}
static void
-gtk_sctree_real_unselect_all (GtkCList *clist)
+gtk_sctree_real_unselect_all (GtkCMCList *clist)
{
GtkSCTree *sctree;
gboolean should_freeze = FALSE;
- g_return_if_fail (clist != NULL);
- g_return_if_fail (GTK_IS_SCTREE (clist));
+ cm_return_if_fail (clist != NULL);
+ cm_return_if_fail (GTK_IS_SCTREE (clist));
sctree = GTK_SCTREE (clist);
- if (sc_g_list_bigger(GTK_CLIST(sctree)->selection, 10)) {
+ if (sc_g_list_bigger(GTK_CMCLIST(sctree)->selection, 10)) {
should_freeze = TRUE;
sctree->selecting_range++;
- gtk_clist_freeze (GTK_CLIST (sctree));
+ gtk_cmclist_freeze (GTK_CMCLIST (sctree));
}
- if (((GtkCListClass *)parent_class)->unselect_all)
- (* ((GtkCListClass *)parent_class)->unselect_all) (clist);
+ if (((GtkCMCListClass *)parent_class)->unselect_all)
+ (* ((GtkCMCListClass *)parent_class)->unselect_all) (clist);
if (should_freeze) {
- gtk_clist_thaw (GTK_CLIST (sctree));
+ gtk_cmclist_thaw (GTK_CMCLIST (sctree));
sctree->selecting_range--;
}
}
-/* Our handler for the change_focus_row_expansion signal of the ctree.
- We have to set the anchor to parent visible node.
- */
+static void
+gtk_sctree_column_auto_resize (GtkCMCList *clist,
+ GtkCMCListRow *clist_row,
+ gint column,
+ gint old_width)
+{
+ /* resize column if needed for auto_resize */
+ GtkRequisition requisition;
+
+ if (!clist->column[column].auto_resize ||
+ GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
+ return;
+
+ if (clist_row)
+ GTK_CMCLIST_GET_CLASS (clist)->cell_size_request (clist, clist_row,
+ column, &requisition);
+ else
+ requisition.width = 0;
+
+ if (requisition.width > clist->column[column].width)
+ gtk_cmclist_set_column_width (clist, column, requisition.width);
+ else if (requisition.width < old_width &&
+ old_width == clist->column[column].width)
+ {
+ GList *list;
+ GtkRequisition button_req;
+ gint new_width;
+
+ /* run a "gtk_cmclist_optimal_column_width" but break, if
+ * the column doesn't shrink */
+ if (GTK_CMCLIST_SHOW_TITLES (clist) && clist->column[column].button)
+ {
+ gtk_widget_get_requisition (clist->column[column].button, &button_req);
+ new_width = (button_req.width -
+ (CELL_SPACING + (2 * COLUMN_INSET)));
+ }
+ else
+ new_width = 0;
+
+ for (list = clist->row_list; list; list = list->next)
+ {
+ GTK_CMCLIST_GET_CLASS (clist)->cell_size_request
+ (clist, GTK_CMCLIST_ROW (list), column, &requisition);
+ new_width = MAX (new_width, requisition.width);
+ if (new_width == clist->column[column].width)
+ break;
+ }
+ if (new_width < clist->column[column].width)
+ gtk_cmclist_set_column_width (clist, column, new_width);
+ }
+}
+
+static void
+gtk_sctree_auto_resize_columns (GtkCMCList *clist)
+{
+ gint i;
+
+ if (GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
+ return;
+
+ for (i = 0; i < clist->columns; i++)
+ gtk_sctree_column_auto_resize (clist, NULL, i, clist->column[i].width);
+}
+
static void
-gtk_sctree_collapse (GtkCTree *ctree, GtkCTreeNode *node)
+gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node)
{
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_SCTREE (ctree));
+ GtkCMCList *clist;
+ GtkCMCTreeNode *work;
+ GtkRequisition requisition;
+ gboolean visible;
+ gint level;
+
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+
+ if (!node || !GTK_CMCTREE_ROW (node)->expanded ||
+ GTK_CMCTREE_ROW (node)->is_leaf)
+ return;
+
+ clist = GTK_CMCLIST (ctree);
+
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+
+ GTK_CMCTREE_ROW (node)->expanded = FALSE;
+ level = GTK_CMCTREE_ROW (node)->level;
+
+ visible = gtk_cmctree_is_viewable (ctree, node);
+ /* get cell width if tree_column is auto resized */
+ if (visible && clist->column[ctree->tree_column].auto_resize &&
+ !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
+ GTK_CMCLIST_GET_CLASS (clist)->cell_size_request
+ (clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column, &requisition);
+
+ /* unref/unset opened pixbuf */
+ if (GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf)
+ {
+ g_object_unref
+ (GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf);
+
+ GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf = NULL;
+ }
+
+ /* set/ref closed pixbuf */
+ if (GTK_CMCTREE_ROW (node)->pixbuf_closed)
+ {
+ GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
+ g_object_ref (GTK_CMCTREE_ROW (node)->pixbuf_closed);
+ }
+
+ work = GTK_CMCTREE_ROW (node)->children;
+ if (work)
+ {
+ gint tmp = 0;
+ gint row;
+ GList *list;
+
+ while (work && GTK_CMCTREE_ROW (work)->level > level)
+ {
+ work = GTK_CMCTREE_NODE_NEXT (work);
+ tmp++;
+ }
+
+ if (work)
+ {
+ list = (GList *)node;
+ list->next = (GList *)work;
+ list = (GList *)GTK_CMCTREE_NODE_PREV (work);
+ list->next = NULL;
+ list = (GList *)work;
+ list->prev = (GList *)node;
+ }
+ else
+ {
+ list = (GList *)node;
+ list->next = NULL;
+ clist->row_list_end = (GList *)node;
+ }
- (* parent_class->tree_collapse) (ctree, node);
- GTK_SCTREE(ctree)->anchor_row =
- gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->focus_row);
+ if (visible)
+ {
+ /* resize auto_resize columns if needed */
+ gtk_sctree_auto_resize_columns (clist);
+
+ if (!GTK_SCTREE(clist)->sorting) {
+ row = g_list_position (clist->row_list, (GList *)node);
+ if (row < clist->focus_row)
+ clist->focus_row -= tmp;
+ }
+ clist->rows -= tmp;
+ CLIST_REFRESH (clist);
+ }
+ }
+ else if (visible && clist->column[ctree->tree_column].auto_resize &&
+ !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
+ /* resize tree_column if needed */
+ gtk_sctree_column_auto_resize (clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column,
+ requisition.width);
+
}
+
GtkWidget *gtk_sctree_new_with_titles (gint columns, gint tree_column,
gchar *titles[])
{
GtkWidget *widget;
- g_return_val_if_fail (columns > 0, NULL);
- g_return_val_if_fail (tree_column >= 0, NULL);
-
+ cm_return_val_if_fail (columns > 0, NULL);
+ cm_return_val_if_fail (tree_column >= 0, NULL);
+
+ if (tree_column >= columns) {
+ g_warning("Wrong tree column");
+ tree_column = 0;
+ print_backtrace();
+ }
+
widget = gtk_widget_new (TYPE_GTK_SCTREE,
"n_columns", columns,
"tree_column", tree_column,
NULL);
if (titles) {
- GtkCList *clist = GTK_CLIST (widget);
+ GtkCMCList *clist = GTK_CMCLIST (widget);
guint i;
for (i = 0; i < columns; i++)
- gtk_clist_set_column_title (clist, i, titles[i]);
- gtk_clist_column_titles_show (clist);
+ gtk_cmclist_set_column_title (clist, i, titles[i]);
+ gtk_cmclist_column_titles_show (clist);
}
GTK_SCTREE(widget)->show_stripes = TRUE;
gint columns = 0;
GValue value = { 0 };
- g_return_if_fail(GTK_IS_SCTREE(sctree));
+ cm_return_if_fail(GTK_IS_SCTREE(sctree));
g_value_init (&value, G_TYPE_INT);
g_object_get_property (G_OBJECT (sctree), "n-columns", &value);
columns = g_value_get_int (&value);
g_value_unset (&value);
- g_return_if_fail(column < columns);
+ cm_return_if_fail(column < columns);
sctree->use_markup[column] = markup;
}
-void gtk_sctree_select (GtkSCTree *sctree, GtkCTreeNode *node)
+void gtk_sctree_select (GtkSCTree *sctree, GtkCMCTreeNode *node)
{
select_row(sctree,
- g_list_position(GTK_CLIST(sctree)->row_list, (GList *)node),
+ g_list_position(GTK_CMCLIST(sctree)->row_list, (GList *)node),
-1, 0, node);
}
-void gtk_sctree_select_with_state (GtkSCTree *sctree, GtkCTreeNode *node, int state)
+void gtk_sctree_select_with_state (GtkSCTree *sctree, GtkCMCTreeNode *node, int state)
{
select_row(sctree,
- g_list_position(GTK_CLIST(sctree)->row_list, (GList *)node),
+ g_list_position(GTK_CMCLIST(sctree)->row_list, (GList *)node),
-1, state, node);
}
void gtk_sctree_unselect_all (GtkSCTree *sctree)
{
- gtk_clist_unselect_all(GTK_CLIST(sctree));
+ gtk_cmclist_unselect_all(GTK_CMCLIST(sctree));
sctree->anchor_row = NULL;
}
-void gtk_sctree_set_anchor_row (GtkSCTree *sctree, GtkCTreeNode *node)
+void gtk_sctree_set_anchor_row (GtkSCTree *sctree, GtkCMCTreeNode *node)
{
sctree->anchor_row = node;
}
-void gtk_sctree_remove_node (GtkSCTree *sctree, GtkCTreeNode *node)
+void gtk_sctree_remove_node (GtkSCTree *sctree, GtkCMCTreeNode *node)
{
if (sctree->anchor_row == node)
sctree->anchor_row = NULL;
- gtk_ctree_remove_node(GTK_CTREE(sctree), node);
+ gtk_cmctree_remove_node(GTK_CMCTREE(sctree), node);
}
void gtk_sctree_set_stripes(GtkSCTree *sctree, gboolean show_stripes)
* Tree sorting functions *
***********************************************************/
-static void sink(GtkCList *clist, GPtrArray *numbers, gint root, gint bottom)
+static void sink(GtkCMCList *clist, GPtrArray *numbers, gint root, gint bottom)
{
gint j, k ;
- GtkCTreeNode *temp;
+ GtkCMCTreeNode *temp;
j = 2 * root;
k = j + 1;
/* find the maximum element of numbers[root],
numbers[2*root] and numbers[2*root+1] */
if (j <= bottom) {
- if (clist->compare( clist, GTK_CTREE_ROW (g_ptr_array_index(numbers, root)),
- GTK_CTREE_ROW(g_ptr_array_index( numbers, j))) >= 0)
+ if (clist->compare( clist, GTK_CMCTREE_ROW (g_ptr_array_index(numbers, root)),
+ GTK_CMCTREE_ROW(g_ptr_array_index( numbers, j))) >= 0)
j = root;
if (k <= bottom)
- if (clist->compare( clist, GTK_CTREE_ROW (g_ptr_array_index(numbers, k)),
- GTK_CTREE_ROW (g_ptr_array_index( numbers, j))) > 0)
+ if (clist->compare( clist, GTK_CMCTREE_ROW (g_ptr_array_index(numbers, k)),
+ GTK_CMCTREE_ROW (g_ptr_array_index( numbers, j))) > 0)
j = k;
/* if numbers[root] wasn't the maximum element then
sink again */
}
}
-static void heap_sort(GtkCList *clist, GPtrArray *numbers, gint array_size)
+static void heap_sort(GtkCMCList *clist, GPtrArray *numbers, gint array_size)
{
gint i;
- GtkCTreeNode *temp;
+ GtkCMCTreeNode *temp;
/* build the Heap */
for (i = (array_size / 2); i >= 1; i--)
}
static void
-stree_sort (GtkCTree *ctree,
- GtkCTreeNode *node,
+stree_sort (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data)
{
- GtkCTreeNode *list_start, *work, *next;
+ GtkCMCTreeNode *list_start, *work, *next;
GPtrArray *row_array, *viewable_array;
- GtkCList *clist;
+ GtkCMCList *clist;
gint i;
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
if (node)
- work = GTK_CTREE_ROW (node)->children;
+ work = GTK_CMCTREE_ROW (node)->children;
else
- work = GTK_CTREE_NODE (clist->row_list);
+ work = GTK_CMCTREE_NODE (clist->row_list);
row_array = g_ptr_array_new();
viewable_array = g_ptr_array_new();
while (work) {
/* add all rows to row_array */
g_ptr_array_add( row_array, work);
- if (GTK_CTREE_ROW (work)->parent && gtk_ctree_is_viewable( ctree, work))
- g_ptr_array_add( viewable_array, GTK_CTREE_ROW (work)->parent);
- next = GTK_CTREE_ROW (work)->sibling;
+ if (GTK_CMCTREE_ROW (work)->parent && gtk_cmctree_is_viewable( ctree, work))
+ g_ptr_array_add( viewable_array, GTK_CMCTREE_ROW (work)->parent);
+ next = GTK_CMCTREE_ROW (work)->sibling;
gtk_sctree_unlink( ctree, work, FALSE);
work = next;
}
heap_sort( clist, row_array, (row_array->len)-1);
if (node)
- list_start = GTK_CTREE_ROW (node)->children;
+ list_start = GTK_CMCTREE_ROW (node)->children;
else
- list_start = GTK_CTREE_NODE (clist->row_list);
+ list_start = GTK_CMCTREE_NODE (clist->row_list);
if (clist->sort_type == GTK_SORT_ASCENDING) {
for (i=(row_array->len)-1; i>=1; i--) {
}
for (i=0; i<viewable_array->len; i++) {
- gtk_ctree_expand( ctree, g_ptr_array_index( viewable_array, i));
+ gtk_cmctree_expand( ctree, g_ptr_array_index( viewable_array, i));
}
}
}
void
-gtk_sctree_sort_recursive (GtkCTree *ctree,
- GtkCTreeNode *node)
+gtk_sctree_sort_recursive (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node)
{
- GtkCList *clist;
- GtkCTreeNode *focus_node = NULL;
+ GtkCMCList *clist;
+ GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_CTREE (ctree));
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
- gtk_clist_freeze (clist);
+ gtk_cmclist_freeze (clist);
- if (clist->selection_mode == GTK_SELECTION_EXTENDED) {
- GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+ if (clist->selection_mode == GTK_SELECTION_MULTIPLE) {
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_unselection = NULL;
}
- if (!node || (node && gtk_ctree_is_viewable (ctree, node)))
- focus_node = GTK_CTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
+ if (!node || (node && gtk_cmctree_is_viewable (ctree, node)))
+ focus_node = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
GTK_SCTREE(ctree)->sorting = TRUE;
- gtk_ctree_post_recursive (ctree, node, GTK_CTREE_FUNC (stree_sort), NULL);
+ gtk_cmctree_post_recursive (ctree, node, GTK_CMCTREE_FUNC (stree_sort), NULL);
if (!node)
stree_sort (ctree, NULL, NULL);
clist->undo_anchor = clist->focus_row;
}
- gtk_clist_thaw (clist);
+ gtk_cmclist_thaw (clist);
}
void
-gtk_sctree_sort_node (GtkCTree *ctree,
- GtkCTreeNode *node)
+gtk_sctree_sort_node (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node)
{
- GtkCList *clist;
- GtkCTreeNode *focus_node = NULL;
+ GtkCMCList *clist;
+ GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_CTREE (ctree));
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
- gtk_clist_freeze (clist);
+ gtk_cmclist_freeze (clist);
- if (clist->selection_mode == GTK_SELECTION_EXTENDED) {
- GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+ if (clist->selection_mode == GTK_SELECTION_MULTIPLE) {
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_unselection = NULL;
}
- if (!node || (node && gtk_ctree_is_viewable (ctree, node)))
- focus_node = GTK_CTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
+ if (!node || (node && gtk_cmctree_is_viewable (ctree, node)))
+ focus_node = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
GTK_SCTREE(ctree)->sorting = TRUE;
clist->undo_anchor = clist->focus_row;
}
- gtk_clist_thaw (clist);
+ gtk_cmclist_thaw (clist);
}
/************************************************************************/
static void
-gtk_sctree_unlink (GtkCTree *ctree,
- GtkCTreeNode *node,
+gtk_sctree_unlink (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gboolean update_focus_row)
{
- GtkCList *clist;
+ GtkCMCList *clist;
gint rows;
gint level;
gint visible;
- GtkCTreeNode *work;
- GtkCTreeNode *parent;
+ GtkCMCTreeNode *work;
+ GtkCMCTreeNode *parent;
GList *list;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_CTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
- if (update_focus_row && clist->selection_mode == GTK_SELECTION_EXTENDED) {
- GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+ if (update_focus_row && clist->selection_mode == GTK_SELECTION_MULTIPLE) {
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_unselection = NULL;
}
- visible = gtk_ctree_is_viewable (ctree, node);
+ visible = gtk_cmctree_is_viewable (ctree, node);
/* clist->row_list_end unlinked ? */
- if (visible && (GTK_CTREE_NODE_NEXT (node) == NULL ||
- (GTK_CTREE_ROW (node)->children && gtk_ctree_is_ancestor (ctree, node,
- GTK_CTREE_NODE (clist->row_list_end)))))
- clist->row_list_end = (GList *) (GTK_CTREE_NODE_PREV (node));
+ if (visible && (GTK_CMCTREE_NODE_NEXT (node) == NULL ||
+ (GTK_CMCTREE_ROW (node)->children && gtk_cmctree_is_ancestor (ctree, node,
+ GTK_CMCTREE_NODE (clist->row_list_end)))))
+ clist->row_list_end = (GList *) (GTK_CMCTREE_NODE_PREV (node));
/* update list */
rows = 0;
- level = GTK_CTREE_ROW (node)->level;
- work = GTK_CTREE_NODE_NEXT (node);
- while (work && GTK_CTREE_ROW (work)->level > level) {
- work = GTK_CTREE_NODE_NEXT (work);
+ level = GTK_CMCTREE_ROW (node)->level;
+ work = GTK_CMCTREE_NODE_NEXT (node);
+ while (work && GTK_CMCTREE_ROW (work)->level > level) {
+ work = GTK_CMCTREE_NODE_NEXT (work);
rows++;
}
if (pos + rows < clist->focus_row)
clist->focus_row -= (rows + 1);
else if (pos <= clist->focus_row) {
- if (!GTK_CTREE_ROW (node)->sibling)
+ if (!GTK_CMCTREE_ROW (node)->sibling)
clist->focus_row = MAX (pos - 1, 0);
else
clist->focus_row = pos;
}
if (work) {
- list = (GList *)GTK_CTREE_NODE_PREV (work);
+ list = (GList *)GTK_CMCTREE_NODE_PREV (work);
list->next = NULL;
list = (GList *)work;
- list->prev = (GList *)GTK_CTREE_NODE_PREV (node);
+ list->prev = (GList *)GTK_CMCTREE_NODE_PREV (node);
}
- if (GTK_CTREE_NODE_PREV (node) &&
- GTK_CTREE_NODE_NEXT (GTK_CTREE_NODE_PREV (node)) == node) {
- list = (GList *)GTK_CTREE_NODE_PREV (node);
+ if (GTK_CMCTREE_NODE_PREV (node) &&
+ GTK_CMCTREE_NODE_NEXT (GTK_CMCTREE_NODE_PREV (node)) == node) {
+ list = (GList *)GTK_CMCTREE_NODE_PREV (node);
list->next = (GList *)work;
}
/* update tree */
- parent = GTK_CTREE_ROW (node)->parent;
+ parent = GTK_CMCTREE_ROW (node)->parent;
if (parent) {
- if (GTK_CTREE_ROW (parent)->children == node) {
- GTK_CTREE_ROW (parent)->children = GTK_CTREE_ROW (node)->sibling;
+ if (GTK_CMCTREE_ROW (parent)->children == node) {
+ GTK_CMCTREE_ROW (parent)->children = GTK_CMCTREE_ROW (node)->sibling;
}
else {
- GtkCTreeNode *sibling;
+ GtkCMCTreeNode *sibling;
- sibling = GTK_CTREE_ROW (parent)->children;
- while (GTK_CTREE_ROW (sibling)->sibling != node)
- sibling = GTK_CTREE_ROW (sibling)->sibling;
- GTK_CTREE_ROW (sibling)->sibling = GTK_CTREE_ROW (node)->sibling;
+ sibling = GTK_CMCTREE_ROW (parent)->children;
+ while (GTK_CMCTREE_ROW (sibling)->sibling != node)
+ sibling = GTK_CMCTREE_ROW (sibling)->sibling;
+ GTK_CMCTREE_ROW (sibling)->sibling = GTK_CMCTREE_ROW (node)->sibling;
}
}
else {
if (clist->row_list == (GList *)node)
- clist->row_list = (GList *) (GTK_CTREE_ROW (node)->sibling);
+ clist->row_list = (GList *) (GTK_CMCTREE_ROW (node)->sibling);
else {
- GtkCTreeNode *sibling;
+ GtkCMCTreeNode *sibling;
- sibling = GTK_CTREE_NODE (clist->row_list);
- while (GTK_CTREE_ROW (sibling)->sibling != node)
- sibling = GTK_CTREE_ROW (sibling)->sibling;
- GTK_CTREE_ROW (sibling)->sibling = GTK_CTREE_ROW (node)->sibling;
+ sibling = GTK_CMCTREE_NODE (clist->row_list);
+ while (GTK_CMCTREE_ROW (sibling)->sibling != node)
+ sibling = GTK_CMCTREE_ROW (sibling)->sibling;
+ GTK_CMCTREE_ROW (sibling)->sibling = GTK_CMCTREE_ROW (node)->sibling;
}
}
}
static void
-gtk_sctree_link (GtkCTree *ctree,
- GtkCTreeNode *node,
- GtkCTreeNode *parent,
- GtkCTreeNode *sibling,
+gtk_sctree_link (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
+ GtkCMCTreeNode *parent,
+ GtkCMCTreeNode *sibling,
gboolean update_focus_row)
{
- GtkCList *clist;
+ GtkCMCList *clist;
GList *list_end;
GList *list;
GList *work;
gint rows = 0;
if (sibling)
- g_return_if_fail (GTK_CTREE_ROW (sibling)->parent == parent);
- g_return_if_fail (node != NULL);
- g_return_if_fail (node != sibling);
- g_return_if_fail (node != parent);
+ cm_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (node != sibling);
+ cm_return_if_fail (node != parent);
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
- if (update_focus_row && clist->selection_mode == GTK_SELECTION_EXTENDED) {
- GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+ if (update_focus_row && clist->selection_mode == GTK_SELECTION_MULTIPLE) {
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
list_end = list_end->next)
rows++;
- GTK_CTREE_ROW (node)->parent = parent;
- GTK_CTREE_ROW (node)->sibling = sibling;
+ GTK_CMCTREE_ROW (node)->parent = parent;
+ GTK_CMCTREE_ROW (node)->sibling = sibling;
- if (!parent || (parent && (gtk_ctree_is_viewable (ctree, parent) &&
- GTK_CTREE_ROW (parent)->expanded))) {
+ if (!parent || (parent && (gtk_cmctree_is_viewable (ctree, parent) &&
+ GTK_CMCTREE_ROW (parent)->expanded))) {
visible = TRUE;
clist->rows += rows;
}
if (parent)
- work = (GList *)(GTK_CTREE_ROW (parent)->children);
+ work = (GList *)(GTK_CMCTREE_ROW (parent)->children);
else
work = clist->row_list;
if (sibling) {
if (work != (GList *)sibling) {
- while (GTK_CTREE_ROW (work)->sibling != sibling)
- work = (GList *)(GTK_CTREE_ROW (work)->sibling);
- GTK_CTREE_ROW (work)->sibling = node;
+ while (GTK_CMCTREE_ROW (work)->sibling != sibling)
+ work = (GList *)(GTK_CMCTREE_ROW (work)->sibling);
+ GTK_CMCTREE_ROW (work)->sibling = node;
}
- if (sibling == GTK_CTREE_NODE (clist->row_list))
+ if (sibling == GTK_CMCTREE_NODE (clist->row_list))
clist->row_list = (GList *) node;
- if (GTK_CTREE_NODE_PREV (sibling) &&
- GTK_CTREE_NODE_NEXT (GTK_CTREE_NODE_PREV (sibling)) == sibling) {
- list = (GList *)GTK_CTREE_NODE_PREV (sibling);
+ if (GTK_CMCTREE_NODE_PREV (sibling) &&
+ GTK_CMCTREE_NODE_NEXT (GTK_CMCTREE_NODE_PREV (sibling)) == sibling) {
+ list = (GList *)GTK_CMCTREE_NODE_PREV (sibling);
list->next = (GList *)node;
}
list = (GList *)node;
- list->prev = (GList *)GTK_CTREE_NODE_PREV (sibling);
+ list->prev = (GList *)GTK_CMCTREE_NODE_PREV (sibling);
list_end->next = (GList *)sibling;
list = (GList *)sibling;
list->prev = list_end;
- if (parent && GTK_CTREE_ROW (parent)->children == sibling)
- GTK_CTREE_ROW (parent)->children = node;
+ if (parent && GTK_CMCTREE_ROW (parent)->children == sibling)
+ GTK_CMCTREE_ROW (parent)->children = node;
}
else {
if (work) {
/* find sibling */
- while (GTK_CTREE_ROW (work)->sibling)
- work = (GList *)(GTK_CTREE_ROW (work)->sibling);
- GTK_CTREE_ROW (work)->sibling = node;
+ while (GTK_CMCTREE_ROW (work)->sibling)
+ work = (GList *)(GTK_CMCTREE_ROW (work)->sibling);
+ GTK_CMCTREE_ROW (work)->sibling = node;
/* find last visible child of sibling */
work = (GList *) gtk_sctree_last_visible (ctree,
- GTK_CTREE_NODE (work));
+ GTK_CMCTREE_NODE (work));
list_end->next = work->next;
if (work->next)
- list = work->next->prev = list_end;
+ work->next->prev = list_end;
work->next = (GList *)node;
list = (GList *)node;
list->prev = work;
}
else {
if (parent) {
- GTK_CTREE_ROW (parent)->children = node;
+ GTK_CMCTREE_ROW (parent)->children = node;
list = (GList *)node;
list->prev = (GList *)parent;
- if (GTK_CTREE_ROW (parent)->expanded) {
- list_end->next = (GList *)GTK_CTREE_NODE_NEXT (parent);
- if (GTK_CTREE_NODE_NEXT(parent)) {
- list = (GList *)GTK_CTREE_NODE_NEXT (parent);
+ if (GTK_CMCTREE_ROW (parent)->expanded) {
+ list_end->next = (GList *)GTK_CMCTREE_NODE_NEXT (parent);
+ if (GTK_CMCTREE_NODE_NEXT(parent)) {
+ list = (GList *)GTK_CMCTREE_NODE_NEXT (parent);
list->prev = list_end;
}
list = (GList *)parent;
}
}
- gtk_ctree_pre_recursive (ctree, node, stree_update_level, NULL);
+ gtk_cmctree_pre_recursive (ctree, node, stree_update_level, NULL);
if (clist->row_list_end == NULL ||
clist->row_list_end->next == (GList *)node)
}
static void
-stree_update_level (GtkCTree *ctree,
- GtkCTreeNode *node,
+stree_update_level (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data)
{
if (!node)
return;
- if (GTK_CTREE_ROW (node)->parent)
- GTK_CTREE_ROW (node)->level =
- GTK_CTREE_ROW (GTK_CTREE_ROW (node)->parent)->level + 1;
+ if (GTK_CMCTREE_ROW (node)->parent)
+ GTK_CMCTREE_ROW (node)->level =
+ GTK_CMCTREE_ROW (GTK_CMCTREE_ROW (node)->parent)->level + 1;
else
- GTK_CTREE_ROW (node)->level = 1;
+ GTK_CMCTREE_ROW (node)->level = 1;
}
-static GtkCTreeNode *
-gtk_sctree_last_visible (GtkCTree *ctree,
- GtkCTreeNode *node)
+static GtkCMCTreeNode *
+gtk_sctree_last_visible (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node)
{
- GtkCTreeNode *work;
+ GtkCMCTreeNode *work;
if (!node)
return NULL;
- work = GTK_CTREE_ROW (node)->children;
+ work = GTK_CMCTREE_ROW (node)->children;
- if (!work || !GTK_CTREE_ROW (node)->expanded)
+ if (!work || !GTK_CMCTREE_ROW (node)->expanded)
return node;
- while (GTK_CTREE_ROW (work)->sibling)
- work = GTK_CTREE_ROW (work)->sibling;
+ while (GTK_CMCTREE_ROW (work)->sibling)
+ work = GTK_CMCTREE_ROW (work)->sibling;
return gtk_sctree_last_visible (ctree, work);
}
-/* this wrapper simply replaces NULL pixmaps
- * with a transparent, 1x1 pixmap. This works
- * around a memory problem deep inside gtk,
- * revealed by valgrind.
- */
-/*GtkCTreeNode* gtk_sctree_insert_node (GtkCTree *ctree,
- GtkCTreeNode *parent,
- GtkCTreeNode *sibling,
- gchar *text[],
- guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
- gboolean is_leaf,
- gboolean expanded)
-{
- if (!emptyxpm) {
- stock_pixmap_gdk(GTK_WIDGET(ctree), STOCK_PIXMAP_EMPTY,
- &emptyxpm, &emptyxpmmask);
- }
- if (!pixmap_closed) {
- pixmap_closed = emptyxpm;
- mask_closed = emptyxpmmask;
- }
- if (!pixmap_opened) {
- pixmap_opened = emptyxpm;
- mask_opened = emptyxpmmask;
- }
- return gtk_ctree_insert_node(ctree, parent, sibling, text,spacing,
- pixmap_closed, mask_closed, pixmap_opened, mask_opened,
- is_leaf, expanded);
-}*/
-
static void
-sset_node_info (GtkCTree *ctree,
- GtkCTreeNode *node,
+sset_node_info (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
+ GdkPixbuf *pixbuf_closed,
+ GdkPixbuf *pixbuf_opened,
gboolean is_leaf,
gboolean expanded)
{
- if (GTK_CTREE_ROW (node)->pixmap_opened)
+ if (GTK_CMCTREE_ROW (node)->pixbuf_opened)
{
- gdk_pixmap_unref (GTK_CTREE_ROW (node)->pixmap_opened);
- if (GTK_CTREE_ROW (node)->mask_opened)
- gdk_bitmap_unref (GTK_CTREE_ROW (node)->mask_opened);
+ g_object_unref (GTK_CMCTREE_ROW (node)->pixbuf_opened);
}
- if (GTK_CTREE_ROW (node)->pixmap_closed)
+ if (GTK_CMCTREE_ROW (node)->pixbuf_closed)
{
- gdk_pixmap_unref (GTK_CTREE_ROW (node)->pixmap_closed);
- if (GTK_CTREE_ROW (node)->mask_closed)
- gdk_bitmap_unref (GTK_CTREE_ROW (node)->mask_closed);
+ g_object_unref (GTK_CMCTREE_ROW (node)->pixbuf_closed);
}
- GTK_CTREE_ROW (node)->pixmap_opened = NULL;
- GTK_CTREE_ROW (node)->mask_opened = NULL;
- GTK_CTREE_ROW (node)->pixmap_closed = NULL;
- GTK_CTREE_ROW (node)->mask_closed = NULL;
+ GTK_CMCTREE_ROW (node)->pixbuf_opened = NULL;
+ GTK_CMCTREE_ROW (node)->pixbuf_closed = NULL;
- if (pixmap_closed)
+ if (pixbuf_closed)
{
- GTK_CTREE_ROW (node)->pixmap_closed = gdk_pixmap_ref (pixmap_closed);
- if (mask_closed)
- GTK_CTREE_ROW (node)->mask_closed = gdk_bitmap_ref (mask_closed);
+ GTK_CMCTREE_ROW (node)->pixbuf_closed = g_object_ref (pixbuf_closed);
}
- if (pixmap_opened)
+ if (pixbuf_opened)
{
- GTK_CTREE_ROW (node)->pixmap_opened = gdk_pixmap_ref (pixmap_opened);
- if (mask_opened)
- GTK_CTREE_ROW (node)->mask_opened = gdk_bitmap_ref (mask_opened);
+ GTK_CMCTREE_ROW (node)->pixbuf_opened = g_object_ref (pixbuf_opened);
}
- GTK_CTREE_ROW (node)->is_leaf = is_leaf;
- GTK_CTREE_ROW (node)->expanded = (is_leaf) ? FALSE : expanded;
+ GTK_CMCTREE_ROW (node)->is_leaf = is_leaf;
+ GTK_CMCTREE_ROW (node)->expanded = (is_leaf) ? FALSE : expanded;
- if (GTK_CTREE_ROW (node)->expanded)
- gtk_ctree_node_set_pixtext (ctree, node, ctree->tree_column,
- text, spacing, pixmap_opened, mask_opened);
+ if (GTK_CMCTREE_ROW (node)->expanded)
+ gtk_cmctree_node_set_pixtext (ctree, node, ctree->tree_column,
+ text, spacing, pixbuf_opened);
else
- gtk_ctree_node_set_pixtext (ctree, node, ctree->tree_column,
- text, spacing, pixmap_closed, mask_closed);
+ gtk_cmctree_node_set_pixtext (ctree, node, ctree->tree_column,
+ text, spacing, pixbuf_closed);
}
-static void
-stree_draw_node (GtkCTree *ctree,
- GtkCTreeNode *node)
-{
- GtkCList *clist;
-
- clist = GTK_CLIST (ctree);
-
- if (CLIST_UNFROZEN (clist) && gtk_ctree_is_viewable (ctree, node))
- {
- GtkCTreeNode *work;
- gint num = 0;
-
- work = GTK_CTREE_NODE (clist->row_list);
- while (work && work != node)
- {
- work = GTK_CTREE_NODE_NEXT (work);
- num++;
- }
- if (work && gtk_clist_row_is_visible (clist, num) != GTK_VISIBILITY_NONE)
- GTK_CLIST_GET_CLASS (clist)->draw_row
- (clist, NULL, num, GTK_CLIST_ROW ((GList *) node));
- }
-}
-
-/* this wrapper simply replaces NULL pixmaps
- * with a transparent, 1x1 pixmap. This works
- * around a memory problem deep inside gtk,
- * revealed by valgrind.
- */
-void gtk_sctree_set_node_info (GtkCTree *ctree,
- GtkCTreeNode *node,
- const gchar *text,
- guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
- gboolean is_leaf,
- gboolean expanded)
+static GtkCMCTreeRow *
+srow_new (GtkCMCTree *ctree)
{
- gboolean old_leaf;
- gboolean old_expanded;
- GtkCTreeNode *work;
-
- if (!emptyxpm) {
- stock_pixmap_gdk(GTK_WIDGET(ctree), STOCK_PIXMAP_EMPTY,
- &emptyxpm, &emptyxpmmask);
- }
- if (!pixmap_closed) {
- pixmap_closed = emptyxpm;
- mask_closed = emptyxpmmask;
- }
- if (!pixmap_opened) {
- pixmap_opened = emptyxpm;
- mask_opened = emptyxpmmask;
- }
-
- if (!GTK_IS_CTREE (ctree) || !node) return;
-
- old_leaf = GTK_CTREE_ROW (node)->is_leaf;
- old_expanded = GTK_CTREE_ROW (node)->expanded;
-
- if (is_leaf && (work = GTK_CTREE_ROW (node)->children) != NULL)
- {
- GtkCTreeNode *ptr;
-
- while (work)
- {
- ptr = work;
- work = GTK_CTREE_ROW (work)->sibling;
- gtk_ctree_remove_node (ctree, ptr);
- }
- }
-
- sset_node_info (ctree, node, text, spacing, pixmap_closed, mask_closed,
- pixmap_opened, mask_opened, is_leaf, expanded);
-
- if (!is_leaf && !old_leaf)
- {
- GTK_CTREE_ROW (node)->expanded = old_expanded;
- if (expanded && !old_expanded)
- gtk_ctree_expand (ctree, node);
- else if (!expanded && old_expanded)
- gtk_ctree_collapse (ctree, node);
- }
-
- GTK_CTREE_ROW (node)->expanded = (is_leaf) ? FALSE : expanded;
-
- stree_draw_node (ctree, node);
-}
-
-static GtkCTreeRow *
-srow_new (GtkCTree *ctree)
-{
- GtkCList *clist;
- GtkCTreeRow *ctree_row;
+ GtkCMCList *clist;
+ GtkCMCTreeRow *ctree_row;
int i;
- clist = GTK_CLIST (ctree);
-#if GTK_CHECK_VERSION(2,9,0)
- ctree_row = g_slice_new (GtkCTreeRow);
- ctree_row->row.cell = g_slice_alloc (sizeof (GtkCell) * clist->columns);
-#else
- ctree_row = g_chunk_new (GtkCTreeRow, (GMemChunk *)clist->row_mem_chunk);
- ctree_row->row.cell = g_chunk_new (GtkCell, (GMemChunk *)clist->cell_mem_chunk);
-#endif
+ clist = GTK_CMCLIST (ctree);
+ ctree_row = g_slice_new (GtkCMCTreeRow);
+ ctree_row->row.cell = g_slice_alloc (sizeof (GtkCMCell) * clist->columns);
for (i = 0; i < clist->columns; i++)
{
- ctree_row->row.cell[i].type = GTK_CELL_EMPTY;
+ ctree_row->row.cell[i].type = GTK_CMCELL_EMPTY;
ctree_row->row.cell[i].vertical = 0;
ctree_row->row.cell[i].horizontal = 0;
ctree_row->row.cell[i].style = NULL;
}
- GTK_CELL_PIXTEXT (ctree_row->row.cell[ctree->tree_column])->text = NULL;
+ GTK_CMCELL_PIXTEXT (ctree_row->row.cell[ctree->tree_column])->text = NULL;
ctree_row->row.fg_set = FALSE;
ctree_row->row.bg_set = FALSE;
ctree_row->parent = NULL;
ctree_row->sibling = NULL;
ctree_row->children = NULL;
- ctree_row->pixmap_closed = NULL;
- ctree_row->mask_closed = NULL;
- ctree_row->pixmap_opened = NULL;
- ctree_row->mask_opened = NULL;
+ ctree_row->pixbuf_closed = NULL;
+ ctree_row->pixbuf_opened = NULL;
return ctree_row;
}
static void
-srow_delete (GtkCTree *ctree,
- GtkCTreeRow *ctree_row)
+srow_delete (GtkCMCTree *ctree,
+ GtkCMCTreeRow *ctree_row)
{
- GtkCList *clist;
+ GtkCMCList *clist;
gint i;
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
for (i = 0; i < clist->columns; i++)
{
- GTK_CLIST_GET_CLASS (clist)->set_cell_contents
- (clist, &(ctree_row->row), i, GTK_CELL_EMPTY, NULL, 0, NULL, NULL);
+ GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
+ (clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
if (ctree_row->row.cell[i].style)
{
- if (GTK_WIDGET_REALIZED (ctree))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (ctree_row->row.cell[i].style);
g_object_unref (ctree_row->row.cell[i].style);
}
if (ctree_row->row.style)
{
- if (GTK_WIDGET_REALIZED (ctree))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (ctree_row->row.style);
g_object_unref (ctree_row->row.style);
}
- if (ctree_row->pixmap_closed)
+ if (ctree_row->pixbuf_closed)
{
- gdk_pixmap_unref (ctree_row->pixmap_closed);
- if (ctree_row->mask_closed)
- gdk_bitmap_unref (ctree_row->mask_closed);
+ g_object_unref (ctree_row->pixbuf_closed);
}
- if (ctree_row->pixmap_opened)
+ if (ctree_row->pixbuf_opened)
{
- gdk_pixmap_unref (ctree_row->pixmap_opened);
- if (ctree_row->mask_opened)
- gdk_bitmap_unref (ctree_row->mask_opened);
+ g_object_unref (ctree_row->pixbuf_opened);
}
if (ctree_row->row.destroy)
{
- GtkDestroyNotify dnotify = ctree_row->row.destroy;
+ GDestroyNotify dnotify = ctree_row->row.destroy;
gpointer ddata = ctree_row->row.data;
ctree_row->row.destroy = NULL;
dnotify (ddata);
}
-#if GTK_CHECK_VERSION(2,9,0)
- g_slice_free1 (sizeof (GtkCell) * clist->columns, ctree_row->row.cell);
- g_slice_free (GtkCTreeRow, ctree_row);
-#else
- g_mem_chunk_free ((GMemChunk *)clist->cell_mem_chunk, ctree_row->row.cell);
- g_mem_chunk_free ((GMemChunk *)clist->row_mem_chunk, ctree_row);
-#endif
+ g_slice_free1 (sizeof (GtkCMCell) * clist->columns, ctree_row->row.cell);
+ g_slice_free (GtkCMCTreeRow, ctree_row);
}
static void
-stree_delete_row (GtkCTree *ctree,
- GtkCTreeNode *node,
+stree_delete_row (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data)
{
- srow_delete (ctree, GTK_CTREE_ROW (node));
+ srow_delete (ctree, GTK_CMCTREE_ROW (node));
g_list_free_1 ((GList *)node);
}
-static void
-gtk_sctree_column_auto_resize (GtkCList *clist,
- GtkCListRow *clist_row,
- gint column,
- gint old_width)
-{
- /* resize column if needed for auto_resize */
- GtkRequisition requisition;
-
- if (!clist->column[column].auto_resize ||
- GTK_CLIST_AUTO_RESIZE_BLOCKED (clist))
- return;
-
- if (clist_row)
- GTK_CLIST_GET_CLASS (clist)->cell_size_request (clist, clist_row,
- column, &requisition);
- else
- requisition.width = 0;
-
- if (requisition.width > clist->column[column].width)
- gtk_clist_set_column_width (clist, column, requisition.width);
- else if (requisition.width < old_width &&
- old_width == clist->column[column].width)
- {
- GList *list;
- gint new_width;
-
- /* run a "gtk_clist_optimal_column_width" but break, if
- * the column doesn't shrink */
- if (GTK_CLIST_SHOW_TITLES (clist) && clist->column[column].button)
- new_width = (clist->column[column].button->requisition.width -
- (CELL_SPACING + (2 * COLUMN_INSET)));
- else
- new_width = 0;
-
- for (list = clist->row_list; list; list = list->next)
- {
- GTK_CLIST_GET_CLASS (clist)->cell_size_request
- (clist, GTK_CLIST_ROW (list), column, &requisition);
- new_width = MAX (new_width, requisition.width);
- if (new_width == clist->column[column].width)
- break;
- }
- if (new_width < clist->column[column].width)
- gtk_clist_set_column_width (clist, column, new_width);
- }
-}
-
-
static void
-gtk_sctree_real_tree_expand (GtkCTree *ctree,
- GtkCTreeNode *node)
+gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node)
{
- GtkCList *clist;
- GtkCTreeNode *work;
+ GtkCMCList *clist;
+ GtkCMCTreeNode *work;
GtkRequisition requisition;
gboolean visible;
- gint level;
- g_return_if_fail (GTK_IS_CTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
- if (!node || GTK_CTREE_ROW (node)->expanded || GTK_CTREE_ROW (node)->is_leaf)
+ if (!node || GTK_CMCTREE_ROW (node)->expanded || GTK_CMCTREE_ROW (node)->is_leaf)
return;
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
- GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
- GTK_CTREE_ROW (node)->expanded = TRUE;
- level = GTK_CTREE_ROW (node)->level;
+ GTK_CMCTREE_ROW (node)->expanded = TRUE;
- visible = gtk_ctree_is_viewable (ctree, node);
+ visible = gtk_cmctree_is_viewable (ctree, node);
/* get cell width if tree_column is auto resized */
if (visible && clist->column[ctree->tree_column].auto_resize &&
- !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist))
- GTK_CLIST_GET_CLASS (clist)->cell_size_request
- (clist, >K_CTREE_ROW (node)->row, ctree->tree_column, &requisition);
+ !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
+ GTK_CMCLIST_GET_CLASS (clist)->cell_size_request
+ (clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column, &requisition);
- /* unref/unset closed pixmap */
- if (GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap)
+ /* unref/unset closed pixbuf */
+ if (GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf)
{
- gdk_pixmap_unref
- (GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap);
-
- GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap = NULL;
+ g_object_unref
+ (GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf);
- if (GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->mask)
- {
- gdk_pixmap_unref
- (GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->mask);
- GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->mask = NULL;
- }
+ GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf = NULL;
}
- /* set/ref opened pixmap */
- if (GTK_CTREE_ROW (node)->pixmap_opened)
+ /* set/ref opened pixbuf */
+ if (GTK_CMCTREE_ROW (node)->pixbuf_opened)
{
- GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap =
- gdk_pixmap_ref (GTK_CTREE_ROW (node)->pixmap_opened);
-
- if (GTK_CTREE_ROW (node)->mask_opened)
- GTK_CELL_PIXTEXT
- (GTK_CTREE_ROW (node)->row.cell[ctree->tree_column])->mask =
- gdk_pixmap_ref (GTK_CTREE_ROW (node)->mask_opened);
+ GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
+ g_object_ref (GTK_CMCTREE_ROW (node)->pixbuf_opened);
}
- work = GTK_CTREE_ROW (node)->children;
+ work = GTK_CMCTREE_ROW (node)->children;
if (work)
{
GList *list = (GList *)work;
gint row;
gint i;
- if (visible && !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist))
+ if (visible && !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
{
cell_width = g_new0 (gint, clist->columns);
if (clist->column[ctree->tree_column].auto_resize)
for (i = 0; i < clist->columns; i++)
if (clist->column[i].auto_resize)
{
- GTK_CLIST_GET_CLASS (clist)->cell_size_request
- (clist, >K_CTREE_ROW (work)->row, i, &requisition);
+ GTK_CMCLIST_GET_CLASS (clist)->cell_size_request
+ (clist, >K_CMCTREE_ROW (work)->row, i, &requisition);
cell_width[i] = MAX (requisition.width, cell_width[i]);
}
list = (GList *)work;
- work = GTK_CTREE_NODE_NEXT (work);
+ work = GTK_CMCTREE_NODE_NEXT (work);
tmp++;
}
}
while (work)
{
list = (GList *)work;
- work = GTK_CTREE_NODE_NEXT (work);
+ work = GTK_CMCTREE_NODE_NEXT (work);
tmp++;
}
- list->next = (GList *)GTK_CTREE_NODE_NEXT (node);
+ list->next = (GList *)GTK_CMCTREE_NODE_NEXT (node);
- if (GTK_CTREE_NODE_NEXT (node))
+ if (GTK_CMCTREE_NODE_NEXT (node))
{
GList *tmp_list;
if (clist->row_list_end == list)
clist->row_list_end = g_list_last(list);
- tmp_list = (GList *)GTK_CTREE_NODE_NEXT (node);
+ tmp_list = (GList *)GTK_CMCTREE_NODE_NEXT (node);
tmp_list->prev = list;
}
else
clist->row_list_end = list;
list = (GList *)node;
- list->next = (GList *)(GTK_CTREE_ROW (node)->children);
+ list->next = (GList *)(GTK_CMCTREE_ROW (node)->children);
- if (visible)
+ if (visible && !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
{
/* resize auto_resize columns if needed */
for (i = 0; i < clist->columns; i++)
if (clist->column[i].auto_resize &&
cell_width[i] > clist->column[i].width)
- gtk_clist_set_column_width (clist, i, cell_width[i]);
+ gtk_cmclist_set_column_width (clist, i, cell_width[i]);
g_free (cell_width);
if (!GTK_SCTREE(ctree)->sorting) {
}
else if (visible && clist->column[ctree->tree_column].auto_resize)
/* resize tree_column if needed */
- gtk_sctree_column_auto_resize (clist, >K_CTREE_ROW (node)->row, ctree->tree_column,
+ gtk_sctree_column_auto_resize (clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column,
requisition.width);
}
-GtkCTreeNode *
-gtk_sctree_insert_node (GtkCTree *ctree,
- GtkCTreeNode *parent,
- GtkCTreeNode *sibling,
+GtkCMCTreeNode *
+gtk_sctree_insert_node (GtkCMCTree *ctree,
+ GtkCMCTreeNode *parent,
+ GtkCMCTreeNode *sibling,
gchar *text[],
guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
+ GdkPixbuf *pixbuf_closed,
+ GdkPixbuf *pixbuf_opened,
gboolean is_leaf,
gboolean expanded)
{
- GtkCList *clist;
- GtkCTreeRow *new_row;
- GtkCTreeNode *node;
+ GtkCMCList *clist;
+ GtkCMCTreeRow *new_row;
+ GtkCMCTreeNode *node;
GList *list;
gint i;
- if (!emptyxpm) {
- stock_pixmap_gdk(GTK_WIDGET(ctree), STOCK_PIXMAP_EMPTY,
- &emptyxpm, &emptyxpmmask);
- }
- if (!pixmap_closed) {
- pixmap_closed = emptyxpm;
- mask_closed = emptyxpmmask;
- }
- if (!pixmap_opened) {
- pixmap_opened = emptyxpm;
- mask_opened = emptyxpmmask;
- }
- g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if (sibling)
- g_return_val_if_fail (GTK_CTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
- if (parent && GTK_CTREE_ROW (parent)->is_leaf)
+ if (parent && GTK_CMCTREE_ROW (parent)->is_leaf)
return NULL;
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
/* create the row */
new_row = srow_new (ctree);
list = g_list_alloc ();
list->data = new_row;
- node = GTK_CTREE_NODE (list);
+ node = GTK_CMCTREE_NODE (list);
if (text)
for (i = 0; i < clist->columns; i++)
if (text[i] && i != ctree->tree_column)
- GTK_CLIST_GET_CLASS (clist)->set_cell_contents
- (clist, &(new_row->row), i, GTK_CELL_TEXT, text[i], 0, NULL, NULL);
+ GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
+ (clist, &(new_row->row), i, GTK_CMCELL_TEXT, text[i], 0, NULL);
sset_node_info (ctree, node, text ?
- text[ctree->tree_column] : NULL, spacing, pixmap_closed,
- mask_closed, pixmap_opened, mask_opened, is_leaf, expanded);
+ text[ctree->tree_column] : NULL, spacing, pixbuf_closed,
+ pixbuf_opened, is_leaf, expanded);
/* sorted insertion */
- if (GTK_CLIST_AUTO_SORT (clist))
+ if (GTK_CMCLIST_AUTO_SORT (clist))
{
if (parent)
- sibling = GTK_CTREE_ROW (parent)->children;
+ sibling = GTK_CMCTREE_ROW (parent)->children;
else
- sibling = GTK_CTREE_NODE (clist->row_list);
+ sibling = GTK_CMCTREE_NODE (clist->row_list);
while (sibling && clist->compare
- (clist, GTK_CTREE_ROW (node), GTK_CTREE_ROW (sibling)) > 0)
- sibling = GTK_CTREE_ROW (sibling)->sibling;
+ (clist, GTK_CMCTREE_ROW (node), GTK_CMCTREE_ROW (sibling)) > 0)
+ sibling = GTK_CMCTREE_ROW (sibling)->sibling;
}
gtk_sctree_link (ctree, node, parent, sibling, FALSE);
- if (text && !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist) &&
- gtk_ctree_is_viewable (ctree, node))
+ if (text && !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist) &&
+ gtk_cmctree_is_viewable (ctree, node))
{
for (i = 0; i < clist->columns; i++)
if (clist->column[i].auto_resize)
return node;
}
-GtkCTreeNode *
-gtk_sctree_insert_gnode (GtkCTree *ctree,
- GtkCTreeNode *parent,
- GtkCTreeNode *sibling,
+GtkCMCTreeNode *
+gtk_sctree_insert_gnode (GtkCMCTree *ctree,
+ GtkCMCTreeNode *parent,
+ GtkCMCTreeNode *sibling,
GNode *gnode,
- GtkCTreeGNodeFunc func,
+ GtkCMCTreeGNodeFunc func,
gpointer data)
{
- GtkCList *clist;
- GtkCTreeNode *cnode = NULL;
- GtkCTreeNode *child = NULL;
- GtkCTreeNode *new_child;
+ GtkCMCList *clist;
+ GtkCMCTreeNode *cnode = NULL;
+ GtkCMCTreeNode *child = NULL;
+ GtkCMCTreeNode *new_child;
GList *list;
GNode *work;
guint depth = 1;
- g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
- g_return_val_if_fail (gnode != NULL, NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (gnode != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
- g_return_val_if_fail (GTK_CTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
if (parent)
- depth = GTK_CTREE_ROW (parent)->level + 1;
+ depth = GTK_CMCTREE_ROW (parent)->level + 1;
list = g_list_alloc ();
list->data = srow_new (ctree);
- cnode = GTK_CTREE_NODE (list);
+ cnode = GTK_CMCTREE_NODE (list);
- gtk_clist_freeze (clist);
+ gtk_cmclist_freeze (clist);
- sset_node_info (ctree, cnode, "", 0, NULL, NULL, NULL, NULL, TRUE, FALSE);
+ sset_node_info (ctree, cnode, "", 0, NULL, NULL, TRUE, FALSE);
if (!func (ctree, depth, gnode, cnode, data))
{
stree_delete_row (ctree, cnode, NULL);
- gtk_clist_thaw (clist);
+ gtk_cmclist_thaw (clist);
return NULL;
}
- if (GTK_CLIST_AUTO_SORT (clist))
+ if (GTK_CMCLIST_AUTO_SORT (clist))
{
if (parent)
- sibling = GTK_CTREE_ROW (parent)->children;
+ sibling = GTK_CMCTREE_ROW (parent)->children;
else
- sibling = GTK_CTREE_NODE (clist->row_list);
+ sibling = GTK_CMCTREE_NODE (clist->row_list);
while (sibling && clist->compare
- (clist, GTK_CTREE_ROW (cnode), GTK_CTREE_ROW (sibling)) > 0)
- sibling = GTK_CTREE_ROW (sibling)->sibling;
+ (clist, GTK_CMCTREE_ROW (cnode), GTK_CMCTREE_ROW (sibling)) > 0)
+ sibling = GTK_CMCTREE_ROW (sibling)->sibling;
}
gtk_sctree_link (ctree, cnode, parent, sibling, FALSE);
child = new_child;
}
- gtk_clist_thaw (clist);
+ gtk_cmclist_thaw (clist);
return cnode;
}
static void
-sreal_tree_move (GtkCTree *ctree,
- GtkCTreeNode *node,
- GtkCTreeNode *new_parent,
- GtkCTreeNode *new_sibling)
+sreal_tree_move (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
+ GtkCMCTreeNode *new_parent,
+ GtkCMCTreeNode *new_sibling)
{
- GtkCList *clist;
- GtkCTreeNode *work;
+ GtkCMCList *clist;
+ GtkCMCTreeNode *work;
gboolean visible = FALSE;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (node != NULL);
- g_return_if_fail (!new_sibling ||
- GTK_CTREE_ROW (new_sibling)->parent == new_parent);
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (!new_sibling ||
+ GTK_CMCTREE_ROW (new_sibling)->parent == new_parent);
- if (new_parent && GTK_CTREE_ROW (new_parent)->is_leaf)
+ if (new_parent && GTK_CMCTREE_ROW (new_parent)->is_leaf)
return;
/* new_parent != child of child */
- for (work = new_parent; work; work = GTK_CTREE_ROW (work)->parent)
+ for (work = new_parent; work; work = GTK_CMCTREE_ROW (work)->parent)
if (work == node)
return;
- clist = GTK_CLIST (ctree);
+ clist = GTK_CMCLIST (ctree);
- visible = gtk_ctree_is_viewable (ctree, node);
+ visible = gtk_cmctree_is_viewable (ctree, node);
if (clist->selection_mode == GTK_SELECTION_MULTIPLE)
{
- GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
+ GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_unselection = NULL;
}
- if (GTK_CLIST_AUTO_SORT (clist))
+ if (GTK_CMCLIST_AUTO_SORT (clist))
{
- if (new_parent == GTK_CTREE_ROW (node)->parent)
+ if (new_parent == GTK_CMCTREE_ROW (node)->parent)
return;
if (new_parent)
- new_sibling = GTK_CTREE_ROW (new_parent)->children;
+ new_sibling = GTK_CMCTREE_ROW (new_parent)->children;
else
- new_sibling = GTK_CTREE_NODE (clist->row_list);
+ new_sibling = GTK_CMCTREE_NODE (clist->row_list);
while (new_sibling && clist->compare
- (clist, GTK_CTREE_ROW (node), GTK_CTREE_ROW (new_sibling)) > 0)
- new_sibling = GTK_CTREE_ROW (new_sibling)->sibling;
+ (clist, GTK_CMCTREE_ROW (node), GTK_CMCTREE_ROW (new_sibling)) > 0)
+ new_sibling = GTK_CMCTREE_ROW (new_sibling)->sibling;
}
- if (new_parent == GTK_CTREE_ROW (node)->parent &&
- new_sibling == GTK_CTREE_ROW (node)->sibling)
+ if (new_parent == GTK_CMCTREE_ROW (node)->parent &&
+ new_sibling == GTK_CMCTREE_ROW (node)->sibling)
return;
- gtk_clist_freeze (clist);
+ gtk_cmclist_freeze (clist);
work = NULL;
- if (!GTK_SCTREE(ctree)->sorting && gtk_ctree_is_viewable (ctree, node))
- work = GTK_CTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
+ if (!GTK_SCTREE(ctree)->sorting && gtk_cmctree_is_viewable (ctree, node))
+ work = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
gtk_sctree_unlink (ctree, node, FALSE);
gtk_sctree_link (ctree, node, new_parent, new_sibling, FALSE);
if (!GTK_SCTREE(ctree)->sorting && work)
{
- while (work && !gtk_ctree_is_viewable (ctree, work))
- work = GTK_CTREE_ROW (work)->parent;
+ while (work && !gtk_cmctree_is_viewable (ctree, work))
+ work = GTK_CMCTREE_ROW (work)->parent;
clist->focus_row = g_list_position (clist->row_list, (GList *)work);
clist->undo_anchor = clist->focus_row;
}
if (clist->column[ctree->tree_column].auto_resize &&
- !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist) &&
- (visible || gtk_ctree_is_viewable (ctree, node)))
- gtk_clist_set_column_width
+ !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist) &&
+ (visible || gtk_cmctree_is_viewable (ctree, node)))
+ gtk_cmclist_set_column_width
(clist, ctree->tree_column,
- gtk_clist_optimal_column_width (clist, ctree->tree_column));
+ gtk_cmclist_optimal_column_width (clist, ctree->tree_column));
- gtk_clist_thaw (clist);
+ gtk_cmclist_thaw (clist);
}
void gtk_sctree_set_column_tooltip (GtkSCTree *sctree,
int column,
const gchar *tip)
{
-#if !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *tips;
- if (!sctree->tips)
- sctree->tips = gtk_tooltips_new();
- tips = sctree->tips;
-#endif
-
- CLAWS_SET_TIP(GTK_CLIST(sctree)->column[column].button,
+ CLAWS_SET_TIP(GTK_CMCLIST(sctree)->column[column].button,
tip);
}
projects / claws.git / blobdiff