First attempt to update code for GTK4

configure.ac

@@ -22,9 +22,9 @@ AM_PROG_LIBTOOL
 AM_SILENT_RULES([yes])
 
 # Library dependencies
-PKG_CHECK_MODULES(GLIB,     [glib-2.0 >= 2.16])
-PKG_CHECK_MODULES(GTK,      [gtk+-3.0 >= 3.0])
-PKG_CHECK_MODULES(CAIRO,    [cairo >= 1.8])
+PKG_CHECK_MODULES(GLIB,     [glib-2.0 >= 2.66])
+PKG_CHECK_MODULES(GTK,      [gtk4 >= 4.6])
+PKG_CHECK_MODULES(CAIRO,    [cairo >= 1.14])
 PKG_CHECK_MODULES(SOUP24,   [libsoup-2.4 >= 2.42])
 
 # The mapviewer demo also calls g_thread_init, so it needs to link against

examples/Makefile.am

@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 OSMGPSMAP_CFLAGS =          \
+    -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
     $(GLIB_CFLAGS)          \
     $(GTK_CFLAGS)           \
     $(CAIRO_CFLAGS)         \
@@ -13,7 +14,7 @@ OSMGPSMAP_LIBS =            \
     $(SOUP24_LIBS)
 
 ## Demo Application
-noinst_PROGRAMS = mapviewer polygon editable_track
+noinst_PROGRAMS = mapviewer polygon editable_track clickable_track editable_clickable_track
 
 mapviewer_SOURCES =         \
     mapviewer.c
@@ -62,6 +63,36 @@ editable_track_LDADD =           \
     $(GTHREAD_LIBS)         \
     $(top_builddir)/src/libosmgpsmap-1.0.la
 
+clickable_track_SOURCES =         \
+    clickable_track.c
+
+clickable_track_CFLAGS =          \
+    -I$(top_srcdir)/src     \
+    $(WARN_CFLAGS)          \
+    $(DISABLE_DEPRECATED)   \
+    $(OSMGPSMAP_CFLAGS)     \
+    $(GTHREAD_CFLAGS)
+
+clickable_track_LDADD =           \
+    $(OSMGPSMAP_LIBS)       \
+    $(GTHREAD_LIBS)         \
+    $(top_builddir)/src/libosmgpsmap-1.0.la
+
+editable_clickable_track_SOURCES =         \
+    editable_clickable_track.c
+
+editable_clickable_track_CFLAGS =          \
+    -I$(top_srcdir)/src     \
+    $(WARN_CFLAGS)          \
+    $(DISABLE_DEPRECATED)   \
+    $(OSMGPSMAP_CFLAGS)     \
+    $(GTHREAD_CFLAGS)
+
+editable_clickable_track_LDADD =           \
+    $(OSMGPSMAP_LIBS)       \
+    $(GTHREAD_LIBS)         \
+    $(top_builddir)/src/libosmgpsmap-1.0.la
+
 ## Misc
 EXTRA_DIST = poi.png mapviewer.ui mapviewer.js README
 

examples/clickable_track.c

@@ -0,0 +1,77 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+/* vim:set et sw=4 ts=4 cino=t0,(0: */
+/*
+ * clickable_track.c
+ * Copyright (C) Martijn Goedhart 2014 <[email protected]>
+ *
+ * This 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; version 2.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
+#include "osm-gps-map.h"
+#include "converter.h"
+
+void point_clicked(OsmGpsMapTrack *osmgpsmaptrack, OsmGpsMapPoint *point, gpointer user_data);
+
+void
+point_clicked(OsmGpsMapTrack *osmgpsmaptrack, OsmGpsMapPoint *point, gpointer user_data)
+{
+    printf("point at latitude: %.4f and longitude %.4f clicked\n", rad2deg(point->rlat), rad2deg(point->rlon));
+    osm_gps_map_track_set_highlight_point(osmgpsmaptrack, point);
+}
+
+int
+main (int argc, char *argv[])
+{
+    OsmGpsMap *map;
+    GtkWidget *window;
+
+    gtk_init(&argc, &argv);
+
+    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title(GTK_WINDOW(window), "Window");
+    g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
+
+    map = g_object_new(OSM_TYPE_GPS_MAP, NULL);
+    gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(map));
+
+    OsmGpsMapTrack* track = osm_gps_map_track_new();
+
+    OsmGpsMapPoint* p1, *p2, *p3, *p4;
+    p1 = osm_gps_map_point_new_radians(1.25663706, -0.488692191);
+    p2 = osm_gps_map_point_new_radians(1.06465084, -0.750491578);
+    p3 = osm_gps_map_point_new_radians(1.17245321, -0.685401453);
+    p4 = osm_gps_map_point_new_radians(1.04543154, -0.105454354);
+
+    osm_gps_map_track_add_point(track, p1);
+    osm_gps_map_track_add_point(track, p2);
+    osm_gps_map_track_add_point(track, p3);
+    osm_gps_map_track_add_point(track, p4);
+
+    osm_gps_map_point_free(p1);
+    osm_gps_map_point_free(p2);
+    osm_gps_map_point_free(p3);
+    osm_gps_map_point_free(p4);
+
+    g_object_set(track, "clickable", TRUE, NULL);
+    g_signal_connect(track, "point-clicked", G_CALLBACK(point_clicked), NULL);
+
+    osm_gps_map_track_add(map, track);
+
+    gtk_widget_show(GTK_WIDGET(map));
+    gtk_widget_show(window);
+
+    gtk_main();
+
+    return 0;
+}

examples/editable_clickable_track.c

@@ -0,0 +1,86 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+/* vim:set et sw=4 ts=4 cino=t0,(0: */
+/*
+ * clickable_track.c
+ * Copyright (C) Martijn Goedhart 2014 <[email protected]>
+ *
+ * This 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; version 2.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
+#include "osm-gps-map.h"
+#include "converter.h"
+
+void point_clicked(OsmGpsMapTrack *osmgpsmaptrack, OsmGpsMapPoint *point, gpointer user_data);
+void point_changed(OsmGpsMapTrack *osmgpsmaptrack, gpointer user_data);
+
+void
+point_clicked(OsmGpsMapTrack *osmgpsmaptrack, OsmGpsMapPoint *point, gpointer user_data)
+{
+    printf("point at latitude: %.4f and longitude %.4f clicked\n", rad2deg(point->rlat), rad2deg(point->rlon));
+    osm_gps_map_track_set_highlight_point(osmgpsmaptrack, point);
+}
+
+void
+point_changed(OsmGpsMapTrack *osmgpsmaptrack, gpointer user_data)
+{
+    printf("point has changed\n");
+}
+
+int
+main (int argc, char *argv[])
+{
+    OsmGpsMap *map;
+    GtkWidget *window;
+
+    gtk_init(&argc, &argv);
+
+    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title(GTK_WINDOW(window), "Window");
+    g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
+
+    map = g_object_new(OSM_TYPE_GPS_MAP, NULL);
+    gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(map));
+
+    OsmGpsMapTrack* track = osm_gps_map_track_new();
+
+    OsmGpsMapPoint* p1, *p2, *p3, *p4;
+    p1 = osm_gps_map_point_new_radians(1.25663706, -0.488692191);
+    p2 = osm_gps_map_point_new_radians(1.06465084, -0.750491578);
+    p3 = osm_gps_map_point_new_radians(1.17245321, -0.685401453);
+    p4 = osm_gps_map_point_new_radians(1.04543154, -0.105454354);
+
+    osm_gps_map_track_add_point(track, p1);
+    osm_gps_map_track_add_point(track, p2);
+    osm_gps_map_track_add_point(track, p3);
+    osm_gps_map_track_add_point(track, p4);
+
+    osm_gps_map_point_free(p1);
+    osm_gps_map_point_free(p2);
+    osm_gps_map_point_free(p3);
+    osm_gps_map_point_free(p4);
+
+    g_object_set(track, "clickable", TRUE, NULL);
+    g_object_set(track, "editable", TRUE, NULL);
+    g_signal_connect(track, "point-clicked", G_CALLBACK(point_clicked), NULL);
+    g_signal_connect(track, "point-changed", G_CALLBACK(point_changed), NULL);
+
+    osm_gps_map_track_add(map, track);
+
+    gtk_widget_show(GTK_WIDGET(map));
+    gtk_widget_show(window);
+
+    gtk_main();
+
+    return 0;
+}

osmgpsmap-1.0.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: Moving map widget using openstreet map data
 Version: @PACKAGE_VERSION@
-Requires: gtk+-3.0 libsoup-2.4 >= 2.42
+Requires: gtk+-4.0 libsoup-2.4 >= 2.42
 Libs: -L${libdir} -losmgpsmap-1.
 Cflags: -I${includedir}/osmgpsmap-1.2

src/Makefile.am

@@ -18,6 +18,7 @@ libosmgpsmap_1_0_la_CFLAGS =    \
     $(WARN_CFLAGS)          \
     $(DISABLE_DEPRECATED)   \
     $(OSMGPSMAP_CFLAGS)     \
+        -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
 	-DG_LOG_DOMAIN=\"OsmGpsMap\"
 
 if OS_WIN32
@@ -83,7 +84,7 @@ if HAVE_INTROSPECTION
 introspection_sources = $(sources_c) $(sources_public_h)
 
 OsmGpsMap-1.0.gir: libosmgpsmap-1.0.la
-OsmGpsMap_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
+OsmGpsMap_1_0_gir_INCLUDES = GObject-2.0 Gtk-4.0
 OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS) -I$(srcdir) -I$(builddir)
 OsmGpsMap_1_0_gir_LIBS = libosmgpsmap-1.0.la
 OsmGpsMap_1_0_gir_FILES = $(introspection_sources)

src/osm-gps-map-layer.c

@@ -66,8 +66,8 @@ osm_gps_map_layer_busy (OsmGpsMapLayer *self)
 }
 
 gboolean
-osm_gps_map_layer_button_press (OsmGpsMapLayer *self, OsmGpsMap *map, GdkEventButton *event)
+osm_gps_map_layer_button_press (OsmGpsMapLayer *self, OsmGpsMap *map, GtkGestureSingle *event, gint n_press, gdouble x, gdouble y, gpointer user_data)
 {
-	return OSM_GPS_MAP_LAYER_GET_INTERFACE (self)->button_press (self, map, event);
+	return OSM_GPS_MAP_LAYER_GET_INTERFACE (self)->button_press (self, map, event, n_press, x, y, user_data);
 }
 

src/osm-gps-map-layer.h

@@ -48,7 +48,7 @@ struct _OsmGpsMapLayerIface {
     void (*render) (OsmGpsMapLayer *self, OsmGpsMap *map);
     void (*draw) (OsmGpsMapLayer *self, OsmGpsMap *map, cairo_t *cr);
     gboolean (*busy) (OsmGpsMapLayer *self);
-    gboolean (*button_press) (OsmGpsMapLayer *self, OsmGpsMap *map, GdkEventButton *event);
+    gboolean (*button_press) (OsmGpsMapLayer *self, OsmGpsMap *map, GtkGestureSingle *event, gint n_press, gdouble x, gdouble y, gpointer user_data);
 };
 
 /**
@@ -99,14 +99,18 @@ gboolean    osm_gps_map_layer_busy              (OsmGpsMapLayer *self);
  * osm_gps_map_layer_button_press:
  * @self: (in): a #OsmGpsMapLayer object
  * @map: (in): a #OsmGpsMap widget
- * @event: (in): a #GdkEventButton event
+ * @event: (in): a GtkGestureSingle event
+ * @n_press: (in): How many touch/button presses happened with this one.
+ * @x: (in): The X coordinate, in widget allocation coordinates.
+ * @y: (in): The Y coordinate, in widget allocation coordinates.
+ * @user_data: (in): pointer to user data
  *
  * Handle button event
  *
  * Returns: whether even had been handled
  * Since: 0.6.0
  **/
-gboolean    osm_gps_map_layer_button_press      (OsmGpsMapLayer *self, OsmGpsMap *map, GdkEventButton *event);
+gboolean    osm_gps_map_layer_button_press      (OsmGpsMapLayer *self, OsmGpsMap *map, GtkGestureSingle *event, gint n_press, gdouble x, gdouble y, gpointer user_data);
 
 G_END_DECLS
 

src/osm-gps-map-osd.c

@@ -108,7 +108,7 @@ G_DEFINE_TYPE_WITH_CODE (OsmGpsMapOsd, osm_gps_map_osd, G_TYPE_OBJECT,
 static void                 osm_gps_map_osd_render       (OsmGpsMapLayer *osd, OsmGpsMap *map);
 static void                 osm_gps_map_osd_draw         (OsmGpsMapLayer *osd, OsmGpsMap *map, cairo_t *cr);
 static gboolean             osm_gps_map_osd_busy         (OsmGpsMapLayer *osd);
-static gboolean             osm_gps_map_osd_button_press (OsmGpsMapLayer *osd, OsmGpsMap *map, GdkEventButton *event);
+static gboolean             osm_gps_map_osd_button_press (OsmGpsMapLayer *osd, OsmGpsMap *map, GtkGestureSingle *event, gint n_press, gdouble x_axis, gdouble y_axis, gpointer user_data);
 
 static void                 scale_render                         (OsmGpsMapOsd *self, OsmGpsMap *map);
 static void                 scale_draw                           (OsmGpsMapOsd *self, GtkAllocation *allocation, cairo_t *cr);
@@ -538,23 +538,25 @@ osm_gps_map_osd_busy (OsmGpsMapLayer *osd)
 static gboolean
 osm_gps_map_osd_button_press (OsmGpsMapLayer *osd,
                                       OsmGpsMap *map,
-                                      GdkEventButton *event)
+                                      GtkGestureSingle *event, gint n_press, gdouble x_axis, gdouble y_axis, gpointer user_data)
 {
     gboolean handled = FALSE;
     OsdControlPress_t but = OSD_NONE;
     OsmGpsMapOsd *self;
     OsmGpsMapOsdPrivate *priv;
     GtkAllocation allocation;
+    guint state;
 
     g_return_val_if_fail(OSM_GPS_MAP_IS_OSD(osd), FALSE);
 
     self = OSM_GPS_MAP_OSD(osd);
     priv = self->priv;
+    state = gtk_gesture_single_get_current_button (event);
     gtk_widget_get_allocation(GTK_WIDGET(map), &allocation);
 
-    if ((event->button == 1) && (event->type == GDK_BUTTON_PRESS)) {
-        gint mx = event->x - priv->osd_x;
-        gint my = event->y - priv->osd_y;
+    if (state == 1) {
+        gint mx = (int)(x_axis) - priv->osd_x;
+        gint my = (int)(y_axis) - priv->osd_y;
 
         if(priv->osd_x < 0)
             mx -= (allocation.width - priv->osd_w);

src/osm-gps-map-polygon.c

@@ -29,6 +29,7 @@ enum
 	PROP_SHADED,
     PROP_EDITABLE,
     PROP_SHADE_ALPHA,
+    PROP_CLICKABLE,
     PROP_BREAKABLE
 };
 
@@ -38,6 +39,7 @@ struct _OsmGpsMapPolygonPrivate
 	gboolean visible;
     gboolean editable;
 	gboolean shaded;
+    gboolean clickable;
     gfloat shade_alpha;
     gboolean breakable;
 };
@@ -74,6 +76,9 @@ osm_gps_map_polygon_get_property (GObject    *object,
         case PROP_SHADE_ALPHA:
             g_value_set_float(value, priv->shade_alpha);
             break;
+	case PROP_CLICKABLE:
+            g_value_set_boolean(value, priv->clickable);
+            break;
         case PROP_BREAKABLE:
             g_value_set_boolean(value, priv->breakable);
             break;
@@ -107,6 +112,9 @@ osm_gps_map_polygon_set_property (GObject      *object,
         case PROP_SHADE_ALPHA:
             priv->shade_alpha = g_value_get_float(value);
             break;
+        case PROP_CLICKABLE:
+            priv->clickable = g_value_get_boolean(value);
+            break;
         case PROP_BREAKABLE:
             priv->breakable = g_value_get_boolean(value);
             break;
@@ -191,6 +199,13 @@ osm_gps_map_polygon_class_init (OsmGpsMapPolygonClass *klass)
                                                         TRUE,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
 
+    g_object_class_install_property (object_class,
+                                     PROP_CLICKABLE,
+                                     g_param_spec_boolean ("clickable",
+                                                           "clickable",
+                                                           "should this polygon be clickable",
+                                                           FALSE,
+                                                           G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
 }
 
 static void