{GDK_CONTROL_MASK, 'W', N_("Close window")},
{GDK_CONTROL_MASK, 'F', N_("Display Find search bar")},
{GDK_CONTROL_MASK, 'G', N_("Start search")},
- {0, GDK_KEY_Escape, N_("Exit fullscreen")},
- {0, GDK_KEY_Escape, N_("Hide Find search bar")},
- {0, GDK_KEY_equal, N_("Zoom in")},
- {0, GDK_KEY_plus, N_("Zoom in")},
- {0, GDK_KEY_minus, N_("Zoom out")},
- {0, GDK_KEY_Z, N_("Zoom 1:1")},
- {0, GDK_KEY_1, N_("Zoom 1:1")},
- {0, GDK_KEY_KP_Divide, N_("Zoom 1:1")},
- {0, '2', N_("Zoom 2:1")},
- {0, '3', N_("Zoom 3:1")},
- {0, '4', N_("Zoom 4:1")},
- {0, '7', N_("Zoom 1:4")},
- {0, '8', N_("Zoom 1:3")},
- {0, '9', N_("Zoom 1:2")},
- {0, 'F', N_("Full screen")},
- {0, 'V', N_("Full screen")},
- {0, GDK_KEY_F11, N_("Full screen")},
- {0, '/', N_("Display Find search bar")},
- {0, GDK_KEY_Left, N_("Scroll left")},
- {0, GDK_KEY_Right, N_("Scroll right")},
- {0, GDK_KEY_Up, N_("Scroll up")},
- {0, GDK_KEY_Down, N_("Scroll down")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Exit fullscreen")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Hide Find search bar")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_equal, N_("Zoom in")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_plus, N_("Zoom in")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_minus, N_("Zoom out")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Z, N_("Zoom 1:1")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_1, N_("Zoom 1:1")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_KP_Divide, N_("Zoom 1:1")},
+ {static_cast<GdkModifierType>(0), '2', N_("Zoom 2:1")},
+ {static_cast<GdkModifierType>(0), '3', N_("Zoom 3:1")},
+ {static_cast<GdkModifierType>(0), '4', N_("Zoom 4:1")},
+ {static_cast<GdkModifierType>(0), '7', N_("Zoom 1:4")},
+ {static_cast<GdkModifierType>(0), '8', N_("Zoom 1:3")},
+ {static_cast<GdkModifierType>(0), '9', N_("Zoom 1:2")},
+ {static_cast<GdkModifierType>(0), 'F', N_("Full screen")},
+ {static_cast<GdkModifierType>(0), 'V', N_("Full screen")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_F11, N_("Full screen")},
+ {static_cast<GdkModifierType>(0), '/', N_("Display Find search bar")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Left, N_("Scroll left")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Right, N_("Scroll right")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Up, N_("Scroll up")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Down, N_("Scroll down")},
{GDK_SHIFT_MASK, GDK_KEY_Left, N_("Scroll left faster")},
{GDK_SHIFT_MASK, GDK_KEY_Right, N_("Scroll right faster")},
{GDK_SHIFT_MASK, GDK_KEY_Up, N_("Scroll up faster")},
{GDK_SHIFT_MASK, GDK_KEY_Down, N_("Scroll down faster")},
- {0, GDK_KEY_Page_Up, N_("Scroll display half screen up")},
- {0, GDK_KEY_Page_Down, N_("Scroll display half screen down")},
- {0, GDK_KEY_Home, N_("Scroll display half screen left")},
- {0, GDK_KEY_End, N_("Scroll display half screen right")},
- {0, 0, NULL}
+ {static_cast<GdkModifierType>(0), GDK_KEY_Page_Up, N_("Scroll display half screen up")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Page_Down, N_("Scroll display half screen down")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Home, N_("Scroll display half screen left")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_End, N_("Scroll display half screen right")},
+ {static_cast<GdkModifierType>(0), 0, NULL}
};
/*
static void pan_queue_thumb_done_cb(ThumbLoader *tl, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
if (pw->queue_pi)
{
static void pan_queue_image_done_cb(ImageLoader *il, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
GdkPixbuf *rotated = NULL;
if (pw->queue_pi)
if (!pw->queue) return FALSE;
- pi = pw->queue->data;
+ pi = static_cast<PanItem *>(pw->queue->data);
pw->queue = g_list_remove(pw->queue, pi);
pw->queue_pi = pi;
static gboolean pan_window_request_tile_cb(PixbufRenderer *pr, gint x, gint y,
gint width, gint height, GdkPixbuf *pixbuf, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
GList *list;
GList *work;
gint i;
PanItem *pi;
gboolean queue = FALSE;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
pi->refcount++;
static void pan_window_dispose_tile_cb(PixbufRenderer *UNUSED(pr), gint x, gint y,
gint width, gint height, GdkPixbuf *UNUSED(pixbuf), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
GList *list;
GList *work;
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (pi->refcount > 0)
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (pi->fd &&
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (pi->fd &&
static gint pan_cache_sort_file_cb(gpointer a, gpointer b)
{
- PanCacheData *pca = a;
- PanCacheData *pcb = b;
+ PanCacheData *pca = static_cast<PanCacheData *>(a);
+ PanCacheData *pcb = static_cast<PanCacheData *>(b);
return filelist_sort_compare_filedata(pca->fd, pcb->fd);
}
GList *pan_cache_sort(GList *list, SortType method, gboolean ascend)
{
PanCacheData *pc;
- pc = work->data;
+ pc = static_cast<PanCacheData *>(work->data);
work = work->next;
cache_sim_data_free(pc->cd);
static void pan_cache_step_done_cb(CacheLoader *cl, gint UNUSED(error), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
if (pw->cache_list)
{
PanCacheData *pc;
- pc = pw->cache_list->data;
+ pc = static_cast<PanCacheData *>(pw->cache_list->data);
if (!pc->cd)
{
if (!pw->cache_todo) return TRUE;
- fd = pw->cache_todo->data;
+ fd = static_cast<FileData *>(pw->cache_todo->data);
pw->cache_todo = g_list_remove(pw->cache_todo, fd);
pc = g_new0(PanCacheData, 1);
cache_loader_free(pw->cache_cl);
load_mask = CACHE_LOADER_NONE;
- if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE) load_mask |= CACHE_LOADER_DIMENSIONS;
- if (pw->exif_date_enable) load_mask |= CACHE_LOADER_DATE;
+ if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE) load_mask = static_cast<CacheDataType>(load_mask | CACHE_LOADER_DIMENSIONS);
+ if (pw->exif_date_enable) load_mask = static_cast<CacheDataType>(load_mask | CACHE_LOADER_DATE);
pw->cache_cl = cache_loader_new(pc->fd, load_mask,
pan_cache_step_done_cb, pw);
return (pw->cache_cl == NULL);
FileData *fd;
GList *needle;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
needle = haystack;
{
PanCacheData *pc;
- pc = needle->data;
+ pc = static_cast<PanCacheData *>(needle->data);
if (pc->fd == fd)
{
if (pc->cd && pc->cd->have_date && pc->cd->date >= 0)
{
PanGrid *pg;
- pg = work->data;
+ pg = static_cast<PanGrid *>(work->data);
work = work->next;
g_list_free(pg->list);
PanItem *pi;
GList *grid;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
grid = pw->list_grid;
PanGrid *pg;
gint rx, ry, rw, rh;
- pg = grid->data;
+ pg = static_cast<PanGrid *>(grid->data);
grid = grid->next;
if (util_clip_region(pi->x, pi->y, pi->width, pi->height,
{
PanGrid *pg;
- pg = work->data;
+ pg = static_cast<PanGrid *>(work->data);
work = work->next;
pg->list = g_list_reverse(pg->list);
work = pw->list;
while (work)
{
- PanItem *pi = work->data;
+ PanItem *pi = (PanItem *)work->data;
work = work->next;
pan_item_free(pi);
PanItem *pi;
gint rx, ry, rw, rh;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (util_clip_region(x, y, width, height,
grid = pw->list_grid;
while (grid && !pg)
{
- pg = grid->data;
+ pg = static_cast<PanGrid *>(grid->data);
grid = grid->next;
if (x < pg->x || x + width > pg->x + pg->w ||
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (width < pi->x + pi->width) width = pi->x + pi->width;
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (width < pi->x + pi->width) width = pi->x + pi->width;
static gint pan_layout_update_idle_cb(gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
gint width;
gint height;
gint scroll_x;
if (pw->cache_todo)
{
pan_window_message(pw, _("Reading image data..."));
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
if (pw->cache_todo)
pw->cache_tick = 0;
}
- if (pan_cache_step(pw)) return TRUE;
+ if (pan_cache_step(pw)) return G_SOURCE_CONTINUE;
pw->idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
}
pan_window_message(pw, NULL);
pw->idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void pan_layout_update_idle(PanWindow *pw)
static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
PixbufRenderer *pr;
FileData *fd;
gboolean stop_signal = FALSE;
exif_list = bar_pane_exif_list();
while (exif_list)
{
- title = exif_list->data;
+ title = static_cast<gchar *>(exif_list->data);
exif_list = exif_list->next;
- key = exif_list->data;
+ key = static_cast<gchar *>(exif_list->data);
exif_list = exif_list->next;
text = metadata_read_string(fd, key, METADATA_FORMATTED);
static void button_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
PanItem *pi = NULL;
GtkWidget *menu;
gint rx, ry;
static void pan_fullscreen_stop_func(FullScreenData *UNUSED(fs), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pw->fs = NULL;
pw->imd = pw->imd_normal;
static void pan_window_image_zoom_cb(PixbufRenderer *UNUSED(pr), gdouble UNUSED(zoom), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
gchar *text;
text = image_zoom_get_as_text(pw->imd);
static void pan_window_image_scroll_notify_cb(PixbufRenderer *pr, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
GtkAdjustment *adj;
GdkRectangle rect;
gint width, height;
static void pan_window_scrollbar_h_value_cb(GtkRange *range, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
PixbufRenderer *pr;
gint x;
static void pan_window_scrollbar_v_value_cb(GtkRange *range, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
PixbufRenderer *pr;
gint y;
static void pan_window_layout_change_cb(GtkWidget *combo, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
- pw->layout = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+ pw->layout = static_cast<PanLayoutType>(gtk_combo_box_get_active(GTK_COMBO_BOX(combo)));
pan_layout_update(pw);
}
static void pan_window_layout_size_cb(GtkWidget *combo, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
- pw->size = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+ pw->size = static_cast<PanImageSize>(gtk_combo_box_get_active(GTK_COMBO_BOX(combo)));
pan_layout_update(pw);
}
static void pan_window_entry_activate_cb(const gchar *new_text, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
gchar *path;
path = remove_trailing_slash(new_text);
static gboolean pan_window_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pan_window_close(pw);
return TRUE;
G_CALLBACK(pan_window_image_scroll_notify_cb), pw);
gtk_table_attach(GTK_TABLE(table), pw->imd->widget, 0, 1, 0, 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
+ static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), 0, 0);
gtk_widget_show(GTK_WIDGET(pw->imd->widget));
pan_window_dnd_init(pw);
g_signal_connect(G_OBJECT(pw->scrollbar_h), "value_changed",
G_CALLBACK(pan_window_scrollbar_h_value_cb), pw);
gtk_table_attach(GTK_TABLE(table), pw->scrollbar_h, 0, 1, 1, 2,
- GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), static_cast<GtkAttachOptions>(0), 0, 0);
gtk_widget_show(pw->scrollbar_h);
pw->scrollbar_v = gtk_vscrollbar_new(NULL);
g_signal_connect(G_OBJECT(pw->scrollbar_v), "value_changed",
G_CALLBACK(pan_window_scrollbar_v_value_cb), pw);
gtk_table_attach(GTK_TABLE(table), pw->scrollbar_v, 1, 2, 0, 1,
- 0, GTK_FILL | GTK_EXPAND, 0, 0);
+ static_cast<GtkAttachOptions>(0), static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), 0, 0);
gtk_widget_show(pw->scrollbar_v);
/* find bar */
static void pan_warning_ok_cb(GenericDialog *gd, gpointer data)
{
- FileData *dir_fd = data;
+ FileData *dir_fd = (FileData *)data;
generic_dialog_close(gd);
static void pan_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_go_to_original_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = NULL;
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
if (!layout_valid(&lw)) return;
{
PanWindow *pw;
FileData *fd;
- const gchar *key = data;
+ const gchar *key = static_cast<const gchar *>(data);
- pw = submenu_item_get_data(widget);
+ pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
if (!pw) return;
fd = pan_menu_click_fd(pw);
static void pan_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
image_zoom_adjust(pw->imd, ZOOM_INCREMENT);
}
static void pan_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
image_zoom_adjust(pw->imd, -ZOOM_INCREMENT);
}
static void pan_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
image_zoom_set(pw->imd, 1.0);
}
static void pan_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_exif_date_toggle_cb(GtkWidget *widget, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pw->exif_date_enable = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
pan_layout_update(pw);
static void pan_info_toggle_exif_cb(GtkWidget *widget, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pw->info_includes_exif = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
/** @FIXME sync info now */
static void pan_info_toggle_image_cb(GtkWidget *widget, gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pw->info_image_size = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), INFO_IMAGE_SIZE_KEY));
/** @FIXME sync info now */
static void pan_fullscreen_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pan_fullscreen_toggle(pw, FALSE);
}
static void pan_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
pan_window_close(pw);
}
static void pan_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- GList *editmenu_fd_list = data;
+ GList *editmenu_fd_list = (GList *)data;
filelist_free(editmenu_fd_list);
}
static void pan_play_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
start_editor_from_file(options->image_l_click_video_editor, pw->click_pi->fd);
}
PanWindow *pw;
GList *selection_list = NULL;
- pw = submenu_item_get_data(widget);
+ pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
selection_list = g_list_append(selection_list, pan_menu_click_fd(pw));
pop_menu_collections(selection_list, data);
GtkSelectionData *selection_data, guint info,
guint UNUSED(time), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
if (gtk_drag_get_source_widget(context) == pw->imd->pr) return;
list = uri_filelist_from_gtk_selection_data(selection_data);
if (list && isdir(((FileData *)list->data)->path))
{
- FileData *fd = list->data;
+ FileData *fd = static_cast<FileData *>(list->data);
pan_layout_set_fd(pw, fd);
}
GtkSelectionData *selection_data, guint UNUSED(info),
guint UNUSED(time), gpointer data)
{
- PanWindow *pw = data;
+ PanWindow *pw = (PanWindow *)data;
FileData *fd;
fd = pan_menu_click_fd(pw);
gtk_drag_source_set(widget, GDK_BUTTON2_MASK,
dnd_file_drag_types, dnd_file_drag_types_count,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
g_signal_connect(G_OBJECT(widget), "drag_data_get",
G_CALLBACK(pan_window_set_dnd_data), pw);
gtk_drag_dest_set(widget,
- GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+ static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP),
dnd_file_drop_types, dnd_file_drop_types_count,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
g_signal_connect(G_OBJECT(widget), "drag_data_received",
G_CALLBACK(pan_window_get_dnd_data), pw);
}
projects / geeqie.git / blobdiff