config: introduce quick-select-allow-editing

If false while quick-select is true, the left mouse button acts in the same
way as the right mouse button.

README.md

@@ -30,4 +30,4 @@ GPL-3.0-only
 
 See `LICENSE` for more information.
 
-Copyright © 2024 Kirill Primak
+Copyright © 2025 Kirill Primak

dulcepan.cfg

@@ -33,6 +33,10 @@ animation-duration = 0
 # or when a whole output is selected with a mouse button.
 quick-select = false
 
+# If true, dulcepan will allow editing the current selection if quick-select is
+# true. Has no effect if quick-select is false.
+quick-select-allow-editing = true
+
 # If true, dulcepan will remember selection between runs.
 # The state is stored at $XDG_CACHE_HOME/dulcepan.
 persistence = true

meson.build

@@ -1,7 +1,7 @@
 project(
   'dulcepan',
   'c',
-  version: '1.0.2',
+  version: '1.0.3',
   license: 'GPL-3.0-only',
   default_options: [
     'c_std=c11',

src/config.c

@@ -125,6 +125,7 @@ void dp_config_load(struct dp_state *state, const char *user_path) {
 		.animation_duration = 0,
 		.png_compression = 6,
 		.quick_select = false,
+		.quick_select_allow_editing = true,
 		.persistence = true,
 	};
 
@@ -243,6 +244,8 @@ void dp_config_load(struct dp_state *state, const char *user_path) {
 			load_int(value, line_idx, 0, 9, &config->png_compression);
 		} else if (strcmp(key, "quick-select") == 0) {
 			load_bool(value, line_idx, &config->quick_select);
+		} else if (strcmp(key, "quick-select-allow-editing") == 0) {
+			load_bool(value, line_idx, &config->quick_select_allow_editing);
 		} else if (strcmp(key, "persistence") == 0) {
 			load_bool(value, line_idx, &config->persistence);
 		} else if (strcmp(key, "quit-key") == 0) {

src/dulcepan.h

@@ -126,6 +126,14 @@ struct dp_selection {
 	int resize_edges;
 	// Resize anchor
 	double resize_x, resize_y;
+
+	// Used for toggling
+	struct {
+		// If not NULL, the current output has been selected via the dedicated
+		// action rather than by persistent state loading or manual resizing
+		struct dp_output *output;
+		double x, y, width, height;
+	} last_partial;
 };
 
 enum dp_file_format {
@@ -163,7 +171,10 @@ struct dp_config {
 	int animation_duration; // In milliseconds
 
 	int png_compression;
+
 	bool quick_select;
+	bool quick_select_allow_editing;
+
 	bool persistence;
 };
 
@@ -200,6 +211,8 @@ struct dp_state {
 	const char *output_path; // May be NULL
 	enum dp_file_format output_format;
 
+	bool allow_selection_editing;
+
 	bool show_cursors;
 
 	cairo_pattern_t *border_pattern;
@@ -232,7 +245,7 @@ void dp_select_stop_interactive(struct dp_selection *selection);
 void dp_select_notify_pointer_position(
 		struct dp_selection *selection, struct dp_output *output, double x, double y);
 
-void dp_select_whole(struct dp_selection *selection, struct dp_output *output);
+void dp_select_toggle_whole(struct dp_selection *selection, struct dp_output *output);
 
 void dp_save(struct dp_state *state);
 

src/main.c

@@ -176,7 +176,7 @@ static void help(const char *prog) {
 			"\n"
 			"Use the left or right mouse button to select a part of the output. A selection\n"
 			"can also be moved and resized with the left mouse button. Clicking the middle\n"
-			"mouse button selects the entire output.\n",
+			"mouse button toggles the selection of the entire output.\n",
 			prog);
 }
 
@@ -248,6 +248,9 @@ int main(int argc, char **argv) {
 	state.xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 
 	struct dp_config *config = &state.config;
+
+	state.allow_selection_editing = !config->quick_select || config->quick_select_allow_editing;
+
 	if (config->border_gradient != DP_BORDER_GRADIENT_NONE) {
 		state.border_pattern = cairo_pattern_create_linear(0, 0, 1, 0);
 		cairo_pattern_add_color_stop_rgba(state.border_pattern, 0, config->border_color[0],

src/seat.c

@@ -92,51 +92,55 @@ static const struct wl_keyboard_listener keyboard_listener = {
 	.modifiers = keyboard_handle_modifiers,
 };
 
-static enum wp_cursor_shape_device_v1_shape get_cursor_shape(struct dp_selection *selection) {
-	switch (selection->action) {
-	case DP_SELECTION_ACTION_NONE:
-		break;
-	case DP_SELECTION_ACTION_RESIZING:
-		if (selection->width == 0 || selection->height == 0) {
+static enum wp_cursor_shape_device_v1_shape get_cursor_shape(struct dp_state *state) {
+	if (state->allow_selection_editing) {
+		struct dp_selection *selection = &state->selection;
+		switch (selection->action) {
+		case DP_SELECTION_ACTION_NONE:
 			break;
-		}
-		switch (selection->resize_edges) {
-		case DP_EDGE_TOP:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_N_RESIZE;
-		case DP_EDGE_TOP | DP_EDGE_LEFT:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NW_RESIZE;
-		case DP_EDGE_TOP | DP_EDGE_RIGHT:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NE_RESIZE;
-		case DP_EDGE_BOTTOM:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_S_RESIZE;
-		case DP_EDGE_BOTTOM | DP_EDGE_LEFT:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_SW_RESIZE;
-		case DP_EDGE_BOTTOM | DP_EDGE_RIGHT:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_SE_RESIZE;
-		case DP_EDGE_LEFT:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_W_RESIZE;
-		case DP_EDGE_RIGHT:
-			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_E_RESIZE;
-		}
-		break;
-	case DP_SELECTION_ACTION_MOVING:
-		// XXX: this might have rounding issues but whatever
-		if (selection->x == 0 && selection->y == 0 &&
-				selection->width == selection->output->effective_width &&
-				selection->height == selection->output->effective_height) {
-			// Moving is impossible
+		case DP_SELECTION_ACTION_RESIZING:
+			if (selection->width == 0 || selection->height == 0) {
+				break;
+			}
+			switch (selection->resize_edges) {
+			case DP_EDGE_TOP:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_N_RESIZE;
+			case DP_EDGE_TOP | DP_EDGE_LEFT:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NW_RESIZE;
+			case DP_EDGE_TOP | DP_EDGE_RIGHT:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NE_RESIZE;
+			case DP_EDGE_BOTTOM:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_S_RESIZE;
+			case DP_EDGE_BOTTOM | DP_EDGE_LEFT:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_SW_RESIZE;
+			case DP_EDGE_BOTTOM | DP_EDGE_RIGHT:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_SE_RESIZE;
+			case DP_EDGE_LEFT:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_W_RESIZE;
+			case DP_EDGE_RIGHT:
+				return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_E_RESIZE;
+			}
 			break;
+		case DP_SELECTION_ACTION_MOVING:
+			// XXX: this might have rounding issues but whatever
+			if (selection->x == 0 && selection->y == 0 &&
+					selection->width == selection->output->effective_width &&
+					selection->height == selection->output->effective_height) {
+				// Moving is impossible
+				break;
+			}
+			return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_MOVE;
 		}
-		return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_MOVE;
 	}
+
 	// The default cursor
 	return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_CROSSHAIR;
 }
 
 static void update_cursor(struct dp_seat *seat) {
 	if (seat->cursor_shape_device != NULL) {
-		wp_cursor_shape_device_v1_set_shape(seat->cursor_shape_device, seat->pointer_serial,
-				get_cursor_shape(&seat->state->selection));
+		wp_cursor_shape_device_v1_set_shape(
+				seat->cursor_shape_device, seat->pointer_serial, get_cursor_shape(seat->state));
 	}
 }
 
@@ -182,7 +186,8 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uin
 
 	struct dp_selection *selection = &state->selection;
 	if (button_state != WL_POINTER_BUTTON_STATE_PRESSED) {
-		if (selection->width > 0 && selection->height > 0 && state->config.quick_select) {
+		if (selection->action == DP_SELECTION_ACTION_RESIZING && selection->width > 0 &&
+				selection->height > 0 && state->config.quick_select) {
 			state->status = DP_STATUS_SAVED;
 		}
 		dp_select_stop_interactive(selection);
@@ -196,14 +201,14 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uin
 	switch (button) {
 	case BTN_LEFT:
 	case BTN_RIGHT:
-		dp_select_start_interactive(
-				selection, seat->ptr_output, seat->ptr_x, seat->ptr_y, button == BTN_LEFT);
+		dp_select_start_interactive(selection, seat->ptr_output, seat->ptr_x, seat->ptr_y,
+				state->allow_selection_editing && button == BTN_LEFT);
 		update_cursor(seat);
 		break;
 	case BTN_MIDDLE:
-		dp_select_whole(selection, seat->ptr_output);
+		dp_select_toggle_whole(selection, seat->ptr_output);
 
-		// dp_select_whole() doesn't invalidate the interactive state, so do it manually
+		// Update the interaction state manually
 		dp_select_notify_pointer_position(selection, seat->ptr_output, seat->ptr_x, seat->ptr_y);
 		update_cursor(seat);
 

src/select.c

@@ -20,6 +20,24 @@ static void set_selected_output(struct dp_selection *selection, struct dp_output
 	}
 }
 
+static inline bool has_last_partial(struct dp_selection *selection) {
+	return selection->last_partial.output != NULL;
+}
+
+static inline void reset_last_partial(struct dp_selection *selection) {
+	selection->last_partial.output = NULL;
+}
+
+static bool has_partial(struct dp_selection *selection) {
+	struct dp_output *output = selection->output;
+	if (output == NULL) {
+		return false;
+	}
+
+	return selection->x != 0 || selection->y != 0 || selection->width != output->effective_width ||
+			selection->height != output->effective_height;
+}
+
 static void update_action(
 		struct dp_selection *selection, struct dp_output *output, double x, double y) {
 	if (output == selection->output) {
@@ -161,6 +179,8 @@ void dp_select_start_interactive(struct dp_selection *selection, struct dp_outpu
 	update_action(selection, output, x, y);
 	selection->action_active = true;
 
+	reset_last_partial(selection);
+
 	if (modify_existing) {
 		switch (selection->action) {
 		case DP_SELECTION_ACTION_NONE:
@@ -213,13 +233,35 @@ void dp_select_notify_pointer_position(
 	}
 }
 
-void dp_select_whole(struct dp_selection *selection, struct dp_output *output) {
-	set_selected_output(selection, output);
+void dp_select_toggle_whole(struct dp_selection *selection, struct dp_output *output) {
+	if (selection->output == output && has_last_partial(selection)) {
+		// Toggle the selection back to the last partial one
+		set_selected_output(selection, selection->last_partial.output);
 
-	selection->x = 0;
-	selection->y = 0;
-	selection->width = output->effective_width;
-	selection->height = output->effective_height;
+		selection->x = selection->last_partial.x;
+		selection->y = selection->last_partial.y;
+		selection->width = selection->last_partial.width;
+		selection->height = selection->last_partial.height;
 
-	dp_output_redraw(output);
+		reset_last_partial(selection);
+	} else {
+		// Don't save another whole output selection as partial
+		if (has_partial(selection) && !has_last_partial(selection)) {
+			selection->last_partial.output = selection->output;
+
+			selection->last_partial.x = selection->x;
+			selection->last_partial.y = selection->y;
+			selection->last_partial.width = selection->width;
+			selection->last_partial.height = selection->height;
+		}
+
+		set_selected_output(selection, output);
+
+		selection->x = 0;
+		selection->y = 0;
+		selection->width = output->effective_width;
+		selection->height = output->effective_height;
+	}
+
+	dp_output_redraw(selection->output);
 }