/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
PangoLayout *layout;
const gchar *str = "Abcdef";
- g_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
+ cm_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
layout = gtk_widget_create_pango_layout(widget, str);
- g_return_val_if_fail(layout, FALSE);
+ cm_return_val_if_fail(layout, FALSE);
pango_layout_get_pixel_size(layout, width, height);
if (width)
*width = *width / g_utf8_strlen(str, -1);
PangoFontDescription *font_desc;
gint size;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->style != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(gtk_widget_get_style(widget) != NULL);
if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
font_desc = pango_font_description_from_string(NORMAL_FONT);
void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
{
- g_return_if_fail(color != NULL);
+ cm_return_if_fail(color != NULL);
color->pixel = 0L;
color->red = (int) (((gdouble)((rgbvalue & 0xff0000) >> 16) / 255.0) * 65535.0);
color->blue = (int) (((gdouble) (rgbvalue & 0x0000ff) / 255.0) * 65535.0);
}
+#define CL(x) (((gulong) (x) >> (gulong) 8) & 0xFFUL)
+#define RGB_FROM_GDK_COLOR(c) \
+ ((CL(c->red) << (gulong) 16) | \
+ (CL(c->green) << (gulong) 8) | \
+ (CL(c->blue)))
+
+gint gtkut_convert_gdk_color_to_int(GdkColor *color)
+{
+ return RGB_FROM_GDK_COLOR(color);
+}
+
void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
{
- g_return_if_fail(bbox != NULL);
+ cm_return_if_fail(bbox != NULL);
*help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
- GTK_WIDGET_SET_FLAGS(*help_btn, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*help_btn, TRUE);
gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);
gtk_button_box_set_child_secondary(GTK_BUTTON_BOX (bbox),
*help_btn, TRUE);
GtkWidget **button2, const gchar *label2,
GtkWidget **button3, const gchar *label3)
{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
+ cm_return_if_fail(bbox != NULL);
+ cm_return_if_fail(button1 != NULL);
gtkut_stock_button_set_create(bbox, button1, label1,
button2, label2, button3, label3);
GtkWidget **button2, const gchar *label2,
GtkWidget **button3, const gchar *label3)
{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
+ cm_return_if_fail(bbox != NULL);
+ cm_return_if_fail(button1 != NULL);
*bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(*bbox), 5);
*button1 = gtk_button_new_from_stock(label1);
- GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*button1, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
gtk_widget_show(*button1);
if (button2) {
*button2 = gtk_button_new_from_stock(label2);
- GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*button2, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
gtk_widget_show(*button2);
}
if (button3) {
*button3 = gtk_button_new_from_stock(label3);
- GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*button3, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
gtk_widget_show(*button3);
}
GtkWidget **button2, const gchar *label2, const gchar *text2,
GtkWidget **button3, const gchar *label3, const gchar *text3)
{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
+ cm_return_if_fail(bbox != NULL);
+ cm_return_if_fail(button1 != NULL);
*bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
*button1 = gtk_button_new_with_mnemonic(text1);
gtk_button_set_image(GTK_BUTTON(*button1),
gtk_image_new_from_stock(label1, GTK_ICON_SIZE_BUTTON));
- GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*button1, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
gtk_widget_show(*button1);
*button2 = gtk_button_new_with_mnemonic(text2);
gtk_button_set_image(GTK_BUTTON(*button2),
gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
- GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*button2, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
gtk_widget_show(*button2);
}
*button3 = gtk_button_new_with_mnemonic(text3);
gtk_button_set_image(GTK_BUTTON(*button3),
gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
- GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+ gtkut_widget_set_can_default(*button3, TRUE);
gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
gtk_widget_show(*button3);
}
gint row;
GtkVisibility row_visibility, prev_row_visibility, next_row_visibility;
- g_return_if_fail(ctree != NULL);
- g_return_if_fail(node != NULL);
+ cm_return_if_fail(ctree != NULL);
+ cm_return_if_fail(node != NULL);
row = (_row != -1 ? _row : g_list_position(clist->row_list, (GList *)node));
gint gtkut_ctree_get_nth_from_node(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
- g_return_val_if_fail(ctree != NULL, -1);
- g_return_val_if_fail(node != NULL, -1);
+ cm_return_val_if_fail(ctree != NULL, -1);
+ cm_return_val_if_fail(node != NULL, -1);
return g_list_position(GTK_CMCLIST(ctree)->row_list, (GList *)node);
}
gboolean gtkut_ctree_node_is_parent(GtkCMCTreeNode *parent, GtkCMCTreeNode *node)
{
GtkCMCTreeNode *tmp;
- g_return_val_if_fail(node != NULL, FALSE);
- g_return_val_if_fail(parent != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(parent != NULL, FALSE);
tmp = node;
while (tmp) {
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n",
+ g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
error->message);
g_error_free(error);
}
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+ g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
+ error->message);
g_error_free(error);
}
if (!wcs || items_written <= 0) return FALSE;
GtkTextIter start_iter, end_iter;
gboolean found;
- g_return_val_if_fail(GTK_IS_TEXT_VIEW(textview), NULL);
+ cm_return_val_if_fail(GTK_IS_TEXT_VIEW(textview), NULL);
buffer = gtk_text_view_get_buffer(textview);
found = gtk_text_buffer_get_selection_bounds(buffer,
{
GtkTextBuffer *buffer;
GtkTextIter iter;
+ GtkTextMark *mark;
- g_return_if_fail(text != NULL);
+ cm_return_if_fail(text != NULL);
buffer = gtk_text_view_get_buffer(text);
gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
gtk_text_buffer_place_cursor(buffer, &iter);
- gtk_text_view_scroll_to_iter(text, &iter, 0.0, FALSE, 0.0, 0.0);
+ mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, TRUE);
+ gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
}
gboolean gtkut_text_view_search_string(GtkTextView *text, const gchar *str,
GtkTextMark *mark;
gint len;
- g_return_val_if_fail(text != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(text != NULL, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
buffer = gtk_text_view_get_buffer(text);
len = g_utf8_strlen(str, -1);
- g_return_val_if_fail(len >= 0, FALSE);
+ cm_return_val_if_fail(len >= 0, FALSE);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
GtkTextMark *mark;
gint len;
- g_return_val_if_fail(text != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(text != NULL, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
buffer = gtk_text_view_get_buffer(text);
len = g_utf8_strlen(str, -1);
- g_return_val_if_fail(len >= 0, FALSE);
+ cm_return_val_if_fail(len >= 0, FALSE);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
void gtkut_window_popup(GtkWidget *window)
{
+ GdkWindow *gdkwin;
gint x, y, sx, sy, new_x, new_y;
- g_return_if_fail(window != NULL);
- g_return_if_fail(window->window != NULL);
+ gdkwin = gtk_widget_get_window(window);
+
+ cm_return_if_fail(window != NULL);
+ cm_return_if_fail(gdkwin != NULL);
sx = gdk_screen_width();
sy = gdk_screen_height();
- gdk_window_get_origin(window->window, &x, &y);
+ gdk_window_get_origin(gdkwin, &x, &y);
new_x = x % sx; if (new_x < 0) new_x = 0;
new_y = y % sy; if (new_y < 0) new_y = 0;
if (new_x != x || new_y != y)
- gdk_window_move(window->window, new_x, new_y);
+ gdk_window_move(gdkwin, new_x, new_y);
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE);
-#if GTK_CHECK_VERSION(2,8,0)
gtk_window_present_with_time(GTK_WINDOW(window), time(NULL));
-#else
- gtk_window_present(GTK_WINDOW(window));
-#endif
}
void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
{
+ GdkWindow *gdkwin;
gint x, y;
gint sx, sy;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->window != NULL);
+ gdkwin = gtk_widget_get_window(widget);
+
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(gdkwin != NULL);
sx = gdk_screen_width();
sy = gdk_screen_height();
/* gdk_window_get_root_origin ever return *rootwindow*'s position */
- gdk_window_get_root_origin(widget->window, &x, &y);
+ gdk_window_get_root_origin(gdkwin, &x, &y);
x %= sx; if (x < 0) x = 0;
y %= sy; if (y < 0) y = 0;
void gtkut_widget_draw_now(GtkWidget *widget)
{
- if (widget && GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_DRAWABLE(widget))
- gdk_window_process_updates(widget->window, FALSE);
+ if (widget && gtk_widget_get_visible(widget) && gtk_widget_is_drawable(widget))
+ gdk_window_process_updates(gtk_widget_get_window(widget), FALSE);
}
static void gtkut_clist_bindings_add(GtkWidget *clist)
binding_set = gtk_binding_set_by_class
(GTK_CMCLIST_GET_CLASS(clist));
- gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_n, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
G_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal(binding_set, GDK_p, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_p, GDK_CONTROL_MASK,
"scroll_vertical", 2,
G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
G_TYPE_FLOAT, 0.0);
GtkWidget *clist;
clist = gtk_cmclist_new(1);
- g_object_ref(GTK_OBJECT(clist));
- g_object_ref_sink(GTK_OBJECT(clist));
+ g_object_ref(G_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+ g_object_ref_sink (G_OBJECT(clist));
+#else
+ gtk_object_ref (G_OBJECT(clist));
+ gtk_object_sink (G_OBJECT(clist));
+#endif
gtkut_clist_bindings_add(clist);
- g_object_unref(GTK_OBJECT(clist));
+ g_object_unref(G_OBJECT(clist));
clist = gtk_cmctree_new(1, 0);
- g_object_ref(GTK_OBJECT(clist));
- g_object_ref_sink(GTK_OBJECT(clist));
+ g_object_ref(G_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+ g_object_ref_sink (G_OBJECT(clist));
+#else
+ gtk_object_ref (G_OBJECT(clist));
+ gtk_object_sink (G_OBJECT(clist));
+#endif
gtkut_clist_bindings_add(clist);
- g_object_unref(GTK_OBJECT(clist));
+ g_object_unref(G_OBJECT(clist));
clist = gtk_sctree_new_with_titles(1, 0, NULL);
- g_object_ref(GTK_OBJECT(clist));
- g_object_ref_sink(GTK_OBJECT(clist));
+ g_object_ref(G_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+ g_object_ref_sink (G_OBJECT(clist));
+#else
+ gtk_object_ref (G_OBJECT(clist));
+ gtk_object_sink (G_OBJECT(clist));
+#endif
gtkut_clist_bindings_add(clist);
- g_object_unref(GTK_OBJECT(clist));
+ g_object_unref(G_OBJECT(clist));
}
void gtkut_widget_set_app_icon(GtkWidget *widget)
{
-#include "pixmaps/claws-mail.xpm"
- static GdkPixmap *sylpheedclawsxpm;
- static GdkBitmap *sylpheedclawsxpmmask;
-
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->window != NULL);
- if (!sylpheedclawsxpm) {
- PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
- claws_mail_xpm);
- }
- gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
+ static GList *icon_list = NULL;
+
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
+ if (!icon_list) {
+ GdkPixbuf *icon = NULL, *big_icon = NULL;
+ stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
+ stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_LOGO, &big_icon);
+ if (icon)
+ icon_list = g_list_append(icon_list, icon);
+ if (big_icon)
+ icon_list = g_list_append(icon_list, big_icon);
+ }
+ if (icon_list)
+ gtk_window_set_icon_list(GTK_WINDOW(widget), icon_list);
}
void gtkut_widget_set_composer_icon(GtkWidget *widget)
{
- static GdkPixmap *xpm;
- static GdkBitmap *bmp;
-
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->window != NULL);
- if (!xpm) {
- stock_pixmap_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &xpm, &bmp);
+ static GList *icon_list = NULL;
+
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
+ if (!icon_list) {
+ GdkPixbuf *icon = NULL, *big_icon = NULL;
+ stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
+ stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE_LOGO, &big_icon);
+ if (icon)
+ icon_list = g_list_append(icon_list, icon);
+ if (big_icon)
+ icon_list = g_list_append(icon_list, big_icon);
}
- gdk_window_set_icon(widget->window, NULL, xpm, bmp);
+ if (icon_list)
+ gtk_window_set_icon_list(GTK_WINDOW(widget), icon_list);
}
static gboolean move_bar = FALSE;
PrefsAccount *account;
gchar *name;
- g_return_val_if_fail(ac_list != NULL, NULL);
+ cm_return_val_if_fail(ac_list != NULL, NULL);
optmenu = gtkut_sc_combobox_create(NULL, FALSE);
menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
GList *child_list = NULL;
GList *c;
- g_return_val_if_fail(parent, NULL);
+ cm_return_val_if_fail(parent, NULL);
/* Get children list and see which has the focus. */
child_list = gtk_container_get_children(parent);
for (c = child_list; c != NULL; c = g_list_next(c)) {
if (c->data && GTK_IS_WIDGET(c->data)) {
- if (GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(c->data))) {
+ if (gtk_widget_has_focus(GTK_WIDGET(c->data))) {
result = GTK_WIDGET(c->data);
break;
}
{
static gchar *xpm_xface[XPM_XFACE_HEIGHT];
static gboolean xpm_xface_init = TRUE;
- GdkPixmap *pixmap;
- GdkBitmap *mask;
gchar xface[2048];
strncpy(xface, o_xface, sizeof(xface));
create_xpm_from_xface(xpm_xface, xface);
- pixmap = gdk_pixmap_create_from_xpm_d
- (window, &mask,
- background, xpm_xface);
return gtk_image_new_from_pixbuf(
gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
}
if ((gdk_pixbuf_get_width(pixbuf) != 48) || (gdk_pixbuf_get_height(pixbuf) != 48)) {
g_object_unref(pixbuf);
- g_warning("wrong_size");
+ g_warning("wrong_size\n");
return NULL;
}
static void link_btn_enter(GtkButton *button, gpointer data)
{
+ GdkWindow *gdkwin;
GtkWidget *window = (GtkWidget *)data;
+ gdkwin = gtk_widget_get_window(window);
+
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
- if (window && window->window)
- gdk_window_set_cursor(window->window, hand_cursor);
+ if (window && gdkwin)
+ gdk_window_set_cursor(gdkwin, hand_cursor);
gtk_button_set_relief(button, GTK_RELIEF_NONE);
gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
static void link_btn_leave(GtkButton *button, gpointer data)
{
+ GdkWindow *gdkwin;
GtkWidget *window = (GtkWidget *)data;
- if (window && window->window)
- gdk_window_set_cursor(window->window, NULL);
+ gdkwin = gtk_widget_get_window(window);
+
+ if (window && gdkwin)
+ gdk_window_set_cursor(gdkwin, NULL);
gtk_button_set_relief(button, GTK_RELIEF_NONE);
gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
{
GtkWidget *btn;
GtkWidget *btn_label;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GdkColormap *cmap;
- GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
gboolean success[2];
+#endif
+ GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
gchar *local_url = NULL;
if (!url)
return NULL;
btn = gtk_button_new_with_label(label?label:url);
gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE);
- btn_label = GTK_BIN(btn)->child;
- cmap = gdk_drawable_get_colormap(window->window);
+ btn_label = gtk_bin_get_child(GTK_BIN((btn)));
+#if !GTK_CHECK_VERSION(3, 0, 0)
+ cmap = gdk_drawable_get_colormap(gtk_widget_get_window(window));
gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
if (success[0] == TRUE && success[1] == TRUE) {
+#endif
GtkStyle *style;
gtk_widget_ensure_style(btn_label);
style = gtk_style_copy
style->fg[GTK_STATE_ACTIVE] = uri_color[1];
style->fg[GTK_STATE_PRELIGHT] = uri_color[0];
gtk_widget_set_style(btn_label, style);
+#if !GTK_CHECK_VERSION(3, 0, 0)
} else
- g_warning("about_create(): color allocation failed.\n");
+ g_warning("color allocation failed\n");
+#endif
g_signal_connect(G_OBJECT(btn), "enter",
G_CALLBACK(link_btn_enter), window);
{
gchar *txt = NULL;
- g_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
if( eventbox != NULL )
gtk_container_add(GTK_CONTAINER(eventbox), combobox);
-#if GTK_CHECK_VERSION(2,6,0)
gtk_combo_box_set_focus_on_click(GTK_COMBO_BOX(combobox), focus_on_click);
-#endif
gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combobox),
(GtkTreeViewRowSeparatorFunc)_combobox_separator_func, NULL, NULL);
}
for (i = step; i <= change_value; i += step) {
- vadj->value = old_value + (up ? -i : i);
+ gtk_adjustment_set_value(vadj, old_value + (up ? -i : i));
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
}
- vadj->value = last_value;
+ gtk_adjustment_set_value(vadj, last_value);
g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
gtk_widget_queue_draw(widget);
gfloat old_value;
gfloat last_value;
+ page_incr = gtk_adjustment_get_page_increment(vadj);
if (prefs_common.scroll_halfpage)
- page_incr = vadj->page_increment / 2;
- else
- page_incr = vadj->page_increment;
+ page_incr /= 2;
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- old_value = vadj->value;
- last_value = vadj->value + page_incr;
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ last_value = old_value + page_incr;
last_value = MIN(last_value, upper);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
} else
return FALSE;
} else {
- if (vadj->value > 0.0) {
- old_value = vadj->value;
- last_value = vadj->value - page_incr;
+ if (old_value > 0.0) {
+ last_value = old_value - page_incr;
last_value = MAX(last_value, 0.0);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
{
gfloat upper;
gfloat page_incr;
+ gfloat old_value;
if (prefs_common.enable_smooth_scroll)
return gtkutils_smooth_scroll_page(widget, vadj, up);
+ page_incr = gtk_adjustment_get_page_increment(vadj);
if (prefs_common.scroll_halfpage)
- page_incr = vadj->page_increment / 2;
- else
- page_incr = vadj->page_increment;
+ page_incr /= 2;
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- vadj->value += page_incr;
- vadj->value = MIN(vadj->value, upper);
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ old_value += page_incr;
+ old_value = MIN(old_value, upper);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
} else
return FALSE;
} else {
- if (vadj->value > 0.0) {
- vadj->value -= page_incr;
- vadj->value = MAX(vadj->value, 0.0);
+ if (old_value > 0.0) {
+ old_value -= page_incr;
+ old_value = MAX(old_value, 0.0);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
} else
gfloat old_value;
gfloat last_value;
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- old_value = vadj->value;
- last_value = vadj->value + vadj->step_increment;
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ last_value = old_value + gtk_adjustment_get_step_increment(vadj);
last_value = MIN(last_value, upper);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
prefs_common.scroll_step);
}
} else {
- if (vadj->value > 0.0) {
- old_value = vadj->value;
- last_value = vadj->value - vadj->step_increment;
+ if (old_value > 0.0) {
+ last_value = old_value - gtk_adjustment_get_step_increment(vadj);
last_value = MAX(last_value, 0.0);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
void gtkutils_scroll_one_line(GtkWidget *widget, GtkAdjustment *vadj, gboolean up)
{
gfloat upper;
+ gfloat old_value;
if (prefs_common.enable_smooth_scroll) {
gtkutils_smooth_scroll_one_line(widget, vadj, up);
return;
}
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- vadj->value += vadj->step_increment;
- vadj->value = MIN(vadj->value, upper);
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ old_value += gtk_adjustment_get_step_increment(vadj);
+ old_value = MIN(old_value, upper);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
}
} else {
- if (vadj->value > 0.0) {
- vadj->value -= vadj->step_increment;
- vadj->value = MAX(vadj->value, 0.0);
+ if (old_value > 0.0) {
+ old_value -= gtk_adjustment_get_step_increment(vadj);
+ old_value = MAX(old_value, 0.0);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
}
gboolean valid;
gint count;
- g_return_val_if_fail(model != NULL, FALSE);
- g_return_val_if_fail(iter != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(iter != NULL, FALSE);
if (text == NULL || *text == '\0')
return FALSE;
{
gint count;
- g_return_val_if_fail(model != NULL, FALSE);
- g_return_val_if_fail(iter != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(iter != NULL, FALSE);
count = gtk_tree_model_iter_n_children(model, NULL);
GtkUIManager *gtkut_create_ui_manager(void)
{
- g_return_val_if_fail(gui_manager == NULL, gui_manager);
+ cm_return_val_if_fail(gui_manager == NULL, gui_manager);
return (gui_manager = gtk_ui_manager_new());
}
return gui_manager;
}
+typedef struct _ClawsIOClosure ClawsIOClosure;
+
+struct _ClawsIOClosure
+{
+ ClawsIOFunc function;
+ GIOCondition condition;
+ GDestroyNotify notify;
+ gpointer data;
+};
+
+static gboolean
+claws_io_invoke (GIOChannel *source,
+ GIOCondition condition,
+ gpointer data)
+{
+ ClawsIOClosure *closure = data;
+ int fd;
+#ifndef G_OS_WIN32
+ fd = g_io_channel_unix_get_fd (source);
+#else
+ fd = g_io_channel_win32_get_fd (source);
+#endif
+ if (closure->condition & condition)
+ closure->function (closure->data, fd, condition);
+
+ return TRUE;
+}
+
+static void
+claws_io_destroy (gpointer data)
+{
+ ClawsIOClosure *closure = data;
+
+ if (closure->notify)
+ closure->notify (closure->data);
+
+ g_free (closure);
+}
+
+gint
+claws_input_add (gint source,
+ GIOCondition condition,
+ ClawsIOFunc function,
+ gpointer data,
+ gboolean is_sock)
+{
+ guint result;
+ ClawsIOClosure *closure = g_new (ClawsIOClosure, 1);
+ GIOChannel *channel;
+
+ closure->function = function;
+ closure->condition = condition;
+ closure->notify = NULL;
+ closure->data = data;
+
+#ifndef G_OS_WIN32
+ channel = g_io_channel_unix_new (source);
+#else
+ if (is_sock)
+ channel = g_io_channel_win32_new_socket(source);
+ else
+ channel = g_io_channel_win32_new_fd(source);
+#endif
+ result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, condition,
+ claws_io_invoke,
+ closure, claws_io_destroy);
+ g_io_channel_unref (channel);
+
+ return result;
+}
+
+void gtkut_widget_set_mapped(GtkWidget *widget, gboolean mapped)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_mapped(widget, mapped);
+#else
+ if (mapped)
+ GTK_WIDGET_SET_FLAGS(widget, GTK_MAPPED);
+ else
+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED);
+#endif
+}
+
+void gtkut_widget_set_realized(GtkWidget *widget, gboolean realized)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_realized(widget, realized);
+#else
+ if (realized)
+ GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+ else
+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_REALIZED);
+#endif
+}
+
+void gtkut_widget_set_can_default(GtkWidget *widget, gboolean can_default)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_can_default(widget, can_default);
+#else
+ if (can_default)
+ GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT);
+ else
+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT);
+#endif
+}
+
+void gtkut_widget_set_receives_default(GtkWidget *widget, gboolean receives_default)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_receives_default(widget, receives_default);
+#else
+ if (receives_default)
+ GTK_WIDGET_SET_FLAGS(widget, GTK_RECEIVES_DEFAULT);
+ else
+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_RECEIVES_DEFAULT);
+#endif
+}
+
+void gtkut_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_can_focus(widget, can_focus);
+#else
+ if (can_focus)
+ GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
+ else
+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS);
+#endif
+}
+
+void gtkut_widget_set_has_window(GtkWidget *widget, gboolean has_window)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_has_window(widget, has_window);
+#else
+ if (has_window) /* Inverted logic there */
+ GTK_WIDGET_UNSET_FLAGS(widget, GTK_NO_WINDOW);
+ else
+ GTK_WIDGET_SET_FLAGS(widget, GTK_NO_WINDOW);
+#endif
+}
+
+/**
+ * Load a pixbuf fitting inside the specified size. EXIF orientation is
+ * respected if available.
+ *
+ * @param[in] filename the file to load
+ * @param[in] box_width the max width (-1 for no resize)
+ * @param[in] box_height the max height (-1 for no resize)
+ * @param[out] error the possible load error
+ *
+ * @return a GdkPixbuf
+ */
+GdkPixbuf *claws_load_pixbuf_fitting(GdkPixbuf *src_pixbuf, int box_width,
+ int box_height)
+{
+ gint w, h, orientation, angle;
+ gint avail_width, avail_height;
+ gboolean flip_horiz, flip_vert;
+ const gchar *orient_str;
+ GdkPixbuf *pixbuf, *t_pixbuf;
+
+ pixbuf = src_pixbuf;
+
+ if (pixbuf == NULL)
+ return NULL;
+
+ angle = 0;
+ flip_horiz = flip_vert = FALSE;
+
+ /* EXIF orientation */
+ orient_str = gdk_pixbuf_get_option(pixbuf, "orientation");
+ if (orient_str != NULL && *orient_str != '\0') {
+ orientation = atoi(orient_str);
+ switch(orientation) {
+ /* See EXIF standard for different values */
+ case 1: break;
+ case 2: flip_horiz = 1;
+ break;
+ case 3: angle = 180;
+ break;
+ case 4: flip_vert = 1;
+ break;
+ case 5: angle = 90;
+ flip_horiz = 1;
+ break;
+ case 6: angle = 270;
+ break;
+ case 7: angle = 90;
+ flip_vert = 1;
+ break;
+ case 8: angle = 90;
+ break;
+ }
+ }
+
+ w = gdk_pixbuf_get_width(pixbuf);
+ h = gdk_pixbuf_get_height(pixbuf);
+
+ if (angle == 90 || angle == 270) {
+ avail_height = box_width;
+ avail_width = box_height;
+ } else {
+ avail_width = box_width;
+ avail_height = box_height;
+ }
+
+ /* Scale first */
+ if (box_width != -1 && box_height != -1 && avail_width - 100 > 0) {
+ if (w > avail_width) {
+ h = (avail_width * h) / w;
+ w = avail_width;
+ }
+ if (h > avail_height) {
+ w = (avail_height * w) / h;
+ h = avail_height;
+ }
+ t_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
+ w, h, GDK_INTERP_BILINEAR);
+ g_object_unref(pixbuf);
+ pixbuf = t_pixbuf;
+ }
+
+ /* Rotate if needed */
+ if (angle != 0) {
+ t_pixbuf = gdk_pixbuf_rotate_simple(pixbuf, angle);
+ g_object_unref(pixbuf);
+ pixbuf = t_pixbuf;
+ }
+
+ /* Flip horizontally if needed */
+ if (flip_horiz) {
+ t_pixbuf = gdk_pixbuf_flip(pixbuf, TRUE);
+ g_object_unref(pixbuf);
+ pixbuf = t_pixbuf;
+ }
+
+ /* Flip vertically if needed */
+ if (flip_vert) {
+ t_pixbuf = gdk_pixbuf_flip(pixbuf, FALSE);
+ g_object_unref(pixbuf);
+ pixbuf = t_pixbuf;
+ }
+
+ return pixbuf;
+}
projects / claws.git / blobdiff