Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Shift key only while resizing current selection #132

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable Shift key only while resizing current selection #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/slurp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ struct slurp_state {
bool display_dimensions;
bool single_point;
bool restrict_selection;
bool resizing_selection;
struct wl_list boxes; // slurp_box::link
bool fixed_aspect_ratio;
double aspect_ratio; // h / w
Expand Down
12 changes: 10 additions & 2 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ static void handle_active_selection_motion(struct slurp_seat *seat, struct slurp
return;
}

seat->state->resizing_selection = true;

int32_t anchor_x = current_selection->anchor_x;
int32_t anchor_y = current_selection->anchor_y;
int32_t dist_x = current_selection->x - anchor_x;
Expand Down Expand Up @@ -226,6 +228,7 @@ static void handle_selection_end(struct slurp_seat *seat,
if (current_selection->has_selection) {
state->result = current_selection->selection;
}
state->resizing_selection = false;
state->running = false;
}

Expand Down Expand Up @@ -319,7 +322,9 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
case XKB_KEY_Shift_R:
if (!state->fixed_aspect_ratio) {
state->aspect_ratio = 1;
recompute_selection(seat);
if (state->resizing_selection) {
recompute_selection(seat);
}
}
break;
}
Expand All @@ -330,7 +335,9 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
state->edit_anchor = false;
} else if (!state->fixed_aspect_ratio && (keysym == XKB_KEY_Shift_L || keysym == XKB_KEY_Shift_R)) {
state->aspect_ratio = 0;
recompute_selection(seat);
if (state->resizing_selection) {
recompute_selection(seat);
}
}
break;
}
Expand Down Expand Up @@ -835,6 +842,7 @@ int main(int argc, char *argv[]) {
.border_weight = 2,
.display_dimensions = false,
.restrict_selection = false,
.resizing_selection = false,
.fixed_aspect_ratio = false,
.aspect_ratio = 0,
.font_family = FONT_FAMILY
Expand Down