fix ctrl/shift detect on win

Author: jcupitt

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## master
 
+- fix ctrl/shift detect on windows
+
 ## 9.0.6 2025/04/16
 
 - fix perspective distort

TODO

@@ -1,3 +1,10 @@
+- toolkit menu: return to home by default, have a temp "pin in place" toggle
+  at the top right to stop it
+
+        - pin in place disables if you click "back"
+
+- ctrl-drag / ctrl-click to make region / mark does not work on windows
+
 - fix scRGB with alpha
 
 - "reset" in display bar resets the position of scale/offset widgets, but does

src/graphicview.c

@@ -69,9 +69,9 @@ graphicview_pressed(GtkGestureClick *gesture,
 	if (n_press == 1) {
 		Rowview *rowview = graphicview_rowview(graphicview);
 		Row *row = ROW(VOBJECT(rowview)->iobject);
-		guint state = get_modifiers(GTK_EVENT_CONTROLLER(gesture));
+	    Workspace *ws = row->ws;
 
-		row_select_modifier(row, state);
+		row_select_modifier(row, ws->modifiers);
 	}
 	else {
 		Model *model = MODEL(VOBJECT(graphicview)->iobject);

src/gtk/workspaceview.ui

@@ -109,6 +109,15 @@
                       </object>
                     </child>
 
+                    <child>
+                      <object class="GtkEventControllerKey">
+                        <signal name="key-pressed"
+                                handler="workspaceview_key_pressed"/>
+                        <signal name="key-released"
+                                handler="workspaceview_key_released"/>
+                      </object>
+                    </child>
+
                   </object>
                 </child>
 

src/gtkutil.c

@@ -279,17 +279,6 @@ get_dpi(void)
 	return 72;
 }
 
-guint
-get_modifiers(GtkEventController *controller)
-{
-	GdkDevice *mouse_device =
-		gtk_event_controller_get_current_event_device(controller);
-	GdkSeat *seat = gdk_device_get_seat(mouse_device);
-	GdkDevice *keyboard_device = gdk_seat_get_keyboard(seat);
-
-	return gdk_device_get_modifier_state(keyboard_device);
-}
-
 static void
 alert_yesno_cb(GObject *source_object,
 	GAsyncResult *result, gpointer user_data)

src/gtkutil.h

@@ -85,7 +85,6 @@ void action_radio(GSimpleAction *action,
 	GVariant *parameter, gpointer user_data);
 
 int get_dpi(void);
-guint get_modifiers(GtkEventController *controller);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(cairo_t, cairo_destroy)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(cairo_surface_t, cairo_surface_destroy)

src/imageui.c

@@ -128,6 +128,15 @@ struct _Imageui {
 	gint64 last_frame_time;
 
 	gboolean should_animate;
+
+	/* We need to detect ctrl-click and shift-click for region create and
+	 * resize.
+	 *
+	 * Windows doesn't seem to support device polling, so we record ctrl and
+	 * shift state here in the keyboard handler.
+	 */
+	guint modifiers;
+
 };
 
 G_DEFINE_TYPE(Imageui, imageui, GTK_TYPE_WIDGET);
@@ -820,6 +829,16 @@ imageui_key_pressed(GtkEventControllerKey *self,
 	handled = FALSE;
 
 	switch (keyval) {
+	case GDK_KEY_Control_L:
+	case GDK_KEY_Control_R:
+		imageui->modifiers |= GDK_CONTROL_MASK;
+		break;
+
+	case GDK_KEY_Shift_L:
+	case GDK_KEY_Shift_R:
+		imageui->modifiers |= GDK_SHIFT_MASK;
+		break;
+
 	case GDK_KEY_plus:
 		imageui_magin(imageui);
 		handled = TRUE;
@@ -940,6 +959,16 @@ imageui_key_released(GtkEventControllerKey *self,
 	handled = FALSE;
 
 	switch (keyval) {
+	case GDK_KEY_Control_L:
+	case GDK_KEY_Control_R:
+		imageui->modifiers &= ~GDK_CONTROL_MASK;
+		break;
+
+	case GDK_KEY_Shift_L:
+	case GDK_KEY_Shift_R:
+		imageui->modifiers &= ~GDK_SHIFT_MASK;
+		break;
+
 	case GDK_KEY_i:
 	case GDK_KEY_o:
 		imageui->zoom_rate = 1.0;
@@ -977,7 +1006,6 @@ imageui_drag_begin(GtkEventControllerMotion *self,
 {
 	Imageui *imageui = IMAGEUI(user_data);
 
-	guint modifiers;
 	Regionview *regionview;
 
 #ifdef DEBUG_VERBOSE
@@ -987,7 +1015,6 @@ imageui_drag_begin(GtkEventControllerMotion *self,
 
 	switch (imageui->state) {
 	case IMAGEUI_WAIT:
-		modifiers = get_modifiers(GTK_EVENT_CONTROLLER(self));
 		regionview = imageui_find_regionview(imageui, start_x, start_y);
 
 		if (regionview) {
@@ -997,7 +1024,7 @@ imageui_drag_begin(GtkEventControllerMotion *self,
 			g_object_ref(regionview);
 			regionview->start_area = regionview->our_area;
 		}
-		else if (modifiers & GDK_CONTROL_MASK) {
+		else if (imageui->modifiers & GDK_CONTROL_MASK) {
 			imageui->state = IMAGEUI_CREATE;
 			double left;
 			double top;
@@ -1039,7 +1066,6 @@ imageui_drag_update(GtkEventControllerMotion *self,
 {
 	Imageui *imageui = IMAGEUI(user_data);
 	double zoom = imageui_get_zoom(imageui);
-	guint modifiers = get_modifiers(GTK_EVENT_CONTROLLER(self));
 
 #ifdef DEBUG_VERBOSE
 	printf("imageui_drag_update: offset_x = %g, offset_y = %g\n",
@@ -1054,7 +1080,7 @@ imageui_drag_update(GtkEventControllerMotion *self,
 		break;
 
 	case IMAGEUI_SELECT:
-		regionview_resize(imageui->grabbed, modifiers,
+		regionview_resize(imageui->grabbed, imageui->modifiers,
 			imageui->tilesource->display_width,
 			imageui->tilesource->display_height,
 			offset_x / zoom,
@@ -1065,7 +1091,7 @@ imageui_drag_update(GtkEventControllerMotion *self,
 		break;
 
 	case IMAGEUI_CREATE:
-		regionview_resize(imageui->floating, modifiers,
+		regionview_resize(imageui->floating, imageui->modifiers,
 			imageui->tilesource->display_width,
 			imageui->tilesource->display_height,
 			offset_x / zoom,

src/rowview.c

@@ -284,6 +284,7 @@ rowview_pressed(GtkGestureClick *gesture,
 	guint n_press, double x, double y, Rowview *rview)
 {
 	Row *row = ROW(VOBJECT(rview)->iobject);
+	Workspace *ws = row->ws;
 
 	if (n_press == 1) {
 		if (row->err &&
@@ -292,10 +293,7 @@ rowview_pressed(GtkGestureClick *gesture,
 			// click on a row with an error displays the error
 			workspace_set_show_error(row->ws, TRUE);
 
-		// select handling ... do this for rows with errors too
-		guint state = get_modifiers(GTK_EVENT_CONTROLLER(gesture));
-
-		row_select_modifier(row, state);
+		row_select_modifier(row, ws->modifiers);
 	}
 	else
 		rowview_edit(rview);

src/workspace.h

@@ -103,6 +103,14 @@ struct _Workspace {
 	 */
 	gboolean needs_layout;
 	gboolean in_dispose;
+
+	/* We need to detect ctrl-click and shift-click for row toggle select and
+	 * extend select.
+	 *
+	 * Windows doesn't seem to support device polling, so we record ctrl and
+	 * shift state here in the keyboard handler.
+	 */
+	guint modifiers;
 };
 
 typedef struct _WorkspaceClass {

src/workspaceview.c

@@ -1247,6 +1247,69 @@ workspaceview_error_close_clicked(GtkButton *button, void *user_data)
 	workspace_set_show_error(ws, FALSE);
 }
 
+static gboolean
+workspaceview_key_pressed(GtkEventControllerKey *self,
+	guint keyval, guint keycode, GdkModifierType state, gpointer user_data)
+{
+	Workspaceview *wview = WORKSPACEVIEW(user_data);
+	Workspace *ws = WORKSPACE(VOBJECT(wview)->iobject);
+
+	gboolean handled;
+
+#ifdef DEBUG_VERBOSE
+#endif /*DEBUG_VERBOSE*/
+	printf("workspaceview_key_pressed: keyval = %d, state = %d\n",
+		keyval, state);
+
+	handled = FALSE;
+
+	switch (keyval) {
+	case GDK_KEY_Control_L:
+	case GDK_KEY_Control_R:
+		ws->modifiers |= GDK_CONTROL_MASK;
+		break;
+
+	case GDK_KEY_Shift_L:
+	case GDK_KEY_Shift_R:
+		ws->modifiers |= GDK_SHIFT_MASK;
+		break;
+
+	default:
+		break;
+	}
+
+	return handled;
+}
+
+static gboolean
+workspaceview_key_released(GtkEventControllerKey *self,
+	guint keyval, guint keycode, GdkModifierType state, gpointer user_data)
+{
+	Workspaceview *wview = WORKSPACEVIEW(user_data);
+	Workspace *ws = WORKSPACE(VOBJECT(wview)->iobject);
+
+	gboolean handled;
+
+	handled = FALSE;
+
+	switch (keyval) {
+	case GDK_KEY_Control_L:
+	case GDK_KEY_Control_R:
+		ws->modifiers &= ~GDK_CONTROL_MASK;
+		break;
+
+	case GDK_KEY_Shift_L:
+	case GDK_KEY_Shift_R:
+		ws->modifiers &= ~GDK_SHIFT_MASK;
+		break;
+
+	default:
+		break;
+	}
+
+	return handled;
+}
+
 static void
 workspaceview_class_init(WorkspaceviewClass *class)
 {
@@ -1273,6 +1336,8 @@ workspaceview_class_init(WorkspaceviewClass *class)
 	BIND_CALLBACK(workspaceview_drag_update);
 	BIND_CALLBACK(workspaceview_drag_end);
 	BIND_CALLBACK(workspaceview_error_close_clicked);
+	BIND_CALLBACK(workspaceview_key_pressed);
+	BIND_CALLBACK(workspaceview_key_released);
 
 	object_class->dispose = workspaceview_dispose;