README.adoc

@@ -28,8 +28,8 @@ The rest of this README will concern itself with externalities.
 
 Building and Running
 --------------------
-Build-only dependencies: CMake, pkg-config, gettext utilities, asciidoctor,
- librsvg (for the GUI), icoutils (for the GUI, when targetting Windows) +
+Build-only dependencies: CMake, pkg-config, asciidoctor, librsvg (for the GUI),
+ icoutils (for the GUI, when targetting Windows) +
 Runtime dependencies: ncursesw, zlib, ICU, termo (included), glib-2.0 >= 2.38,
  pango, xcb, xcb-xfixes (the latter two optional for the TUI),
  gtk+-3.0 (for the GUI)

src/stardict-view.c

@@ -223,7 +223,6 @@ struct _StardictView
 	gchar *matched;                     ///< Highlight common word part of this
 
 	gint top_offset;                    ///< Pixel offset into the entry
-	gdouble drag_last_offset;           ///< Last offset when dragging
 	// TODO: think about making it, e.g., a pair of (ViewEntry *, guint)
 	// NOTE: this is the index of a Pango paragraph (a virtual entity)
 	guint selected;                     ///< Offset to the selected definition
@@ -490,9 +489,8 @@ stardict_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 	{
 		// On GDK/Wayland, the mouse wheel will typically create 1.5 deltas,
 		// after dividing a 15 degree click angle from libinput by 10.
-		// (Noticed on Arch + Sway, cannot reproduce on Ubuntu 22.04.)
 		// On X11, as libinput(4) indicates, the delta will always be 1.0.
-		double delta = CLAMP (event->delta_y, -1, +1);
+		double delta = CLAMP(event->delta_y, -1, +1);
 		stardict_view_scroll (self, GTK_SCROLL_STEPS, 3 * delta);
 		return TRUE;
 	}
@@ -501,38 +499,6 @@ stardict_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 	}
 }
 
-static void
-on_drag_begin (GtkGestureDrag *drag, G_GNUC_UNUSED gdouble start_x,
-	G_GNUC_UNUSED gdouble start_y, gpointer user_data)
-{
-	GtkGesture *gesture = GTK_GESTURE (drag);
-	GdkEventSequence *sequence
-		= gtk_gesture_get_last_updated_sequence (gesture);
-
-	GdkModifierType state = 0;
-	const GdkEvent *last_event = gtk_gesture_get_last_event (gesture, sequence);
-	gdk_event_get_state (last_event, &state);
-	if (state & gtk_accelerator_get_default_mod_mask ())
-		gtk_gesture_set_sequence_state (gesture, sequence,
-			GTK_EVENT_SEQUENCE_DENIED);
-	else
-	{
-		gtk_gesture_set_sequence_state (gesture, sequence,
-			GTK_EVENT_SEQUENCE_CLAIMED);
-		STARDICT_VIEW (user_data)->drag_last_offset = 0;
-	}
-}
-
-static void
-on_drag_update (G_GNUC_UNUSED GtkGestureDrag *drag,
-	G_GNUC_UNUSED gdouble offset_x, gdouble offset_y, gpointer user_data)
-{
-	StardictView *self = STARDICT_VIEW (user_data);
-	self->top_offset += self->drag_last_offset - offset_y;
-	adjust_for_offset (self);
-	self->drag_last_offset = offset_y;
-}
-
 static void
 stardict_view_class_init (StardictViewClass *klass)
 {
@@ -556,15 +522,6 @@ stardict_view_class_init (StardictViewClass *klass)
 static void
 stardict_view_init (G_GNUC_UNUSED StardictView *self)
 {
-	GtkGesture *drag = gtk_gesture_drag_new (GTK_WIDGET (self));
-	gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (drag), TRUE);
-	gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (drag),
-		GTK_PHASE_BUBBLE);
-	g_object_set_data_full (G_OBJECT (self), "stardict-view-drag-gesture",
-		drag, g_object_unref);
-
-	g_signal_connect (drag, "drag-begin", G_CALLBACK (on_drag_begin), self);
-	g_signal_connect (drag, "drag-update", G_CALLBACK (on_drag_update), self);
 }
 
 // --- Public ------------------------------------------------------------------

src/tabfile.c

@@ -218,6 +218,6 @@ main (int argc, char *argv[])
 		fatal ("Error: failed to write the dictionary: %s\n", error->message);
 
 	generator_free (generator);
-	pclose (fsorted);
+	fclose (fsorted);
 	return 0;
 }