Uses custom hash/equals functions so that we can actually fetch equivalent FileDatas...

[geeqie.git] / src / ui_tree_edit.c

diff --git a/src/ui_tree_edit.c b/src/ui_tree_edit.c
index afb5686..464a0ad 100644 (file)
--- a/src/ui_tree_edit.c
+++ b/src/ui_tree_edit.c
@@ -1,13 +1,22 @@
 /*
- * (SLIK) SimpLIstic sKin functions
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -487,6 +496,7 @@ gint tree_path_to_row(GtkTreePath *tpath)
 void shift_color(GdkColor *src, gshort val, gint direction)
 {
        gshort cs;
+       static gshort COLOR_MAX = 0xffff;
 
        if (val == -1)
                {
@@ -496,11 +506,11 @@ void shift_color(GdkColor *src, gshort val, gint direction)
                {
                val = CLAMP(val, 1, 100);
                }
-       cs = 0xffff / 100 * val;
+       cs = COLOR_MAX / 100 * val;
 
        /* up or down ? */
        if (direction < 0 ||
-           (direction == 0 &&((gint)src->red + (gint)src->green + (gint)src->blue) / 3 > 0xffff / 2))
+           (direction == 0 &&((gint)src->red + (gint)src->green + (gint)src->blue) / 3 > COLOR_MAX / 2))
                {
                src->red = MAX(0 , src->red - cs);
                src->green = MAX(0 , src->green - cs);
@@ -508,9 +518,9 @@ void shift_color(GdkColor *src, gshort val, gint direction)
                }
        else
                {
-               src->red = MIN(0xffff, src->red + cs);
-               src->green = MIN(0xffff, src->green + cs);
-               src->blue = MIN(0xffff, src->blue + cs);
+               src->red = MIN(COLOR_MAX, src->red + cs);
+               src->green = MIN(COLOR_MAX, src->green + cs);
+               src->blue = MIN(COLOR_MAX, src->blue + cs);
                }
 }
 
@@ -566,6 +576,10 @@ static gboolean widget_auto_scroll_cb(gpointer data)
        gint x, y;
        gint w, h;
        gint amt = 0;
+#if GTK_CHECK_VERSION(3,0,0)
+       GdkDeviceManager *device_manager;
+       GdkDevice *device;
+#endif
 
        if (sd->max_step < sd->region_size)
                {
@@ -573,7 +587,13 @@ static gboolean widget_auto_scroll_cb(gpointer data)
                }
 
        window = gtk_widget_get_window(sd->widget);
+#if GTK_CHECK_VERSION(3,0,0)
+       device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
+       device = gdk_device_manager_get_client_pointer(device_manager);
+       gdk_window_get_device_position(window, device, &x, &y, NULL);
+#else
        gdk_window_get_pointer(window, &x, &y, NULL);
+#endif
        w = gdk_window_get_width(window);
        h = gdk_window_get_height(window);