KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When clicking in the margin/border area of a window map the click to the nearest cell in the window. Avoids selection with the mouse failing when starting the selection just outside the window.

Browse Source
This commit is contained in:
Kovid Goyal 2018-07-06 12:32:08 +05:30
parent b50f621e61
commit c8b1e76783
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changelog.rst
View File

@ -15,6 +15,10 @@ Changelog
- When dragging to select with the mouse "grab" the mouse so that if it strays - When dragging to select with the mouse "grab" the mouse so that if it strays
into neighboring windows, the selection is still updated (:pull:`624`) into neighboring windows, the selection is still updated (:pull:`624`)
- When clicking in the margin/border area of a window map the click to the
nearest cell in the window. Avoids selection with the mouse failing when
starting the selection just outside the window.
0.11.2 [2018-07-01] 0.11.2 [2018-07-01]
------------------------------ ------------------------------

30
kitty/mouse.c
View File

@ -119,6 +119,14 @@ contains_mouse(Window *w, OSWindow *os_window) {
return (w->visible && window_left(w, os_window) <= x && x <= window_right(w, os_window) && window_top(w, os_window) <= y && y <= window_bottom(w, os_window)); return (w->visible && window_left(w, os_window) <= x && x <= window_right(w, os_window) && window_top(w, os_window) <= y && y <= window_bottom(w, os_window));
} }
static inline double
distance_to_window(Window *w, OSWindow *os_window) {
double x = global_state.callback_os_window->mouse_x, y = global_state.callback_os_window->mouse_y;
double cx = (window_left(w, os_window) + window_right(w, os_window)) / 2.0;
double cy = (window_top(w, os_window) + window_bottom(w, os_window)) / 2.0;
return (x - cx) * (x - cx) + (y - cy) * (y - cy);
}
static bool clamp_to_window = false; static bool clamp_to_window = false;
static inline bool static inline bool
@ -414,7 +422,21 @@ window_for_event(unsigned int *window_idx, bool *in_tab_bar) {
} }
} }
return NULL; return NULL;
}
static inline Window*
closest_window_for_event(unsigned int *window_idx) {
Window *ans = NULL;
double closest_distance = UINT_MAX;
if (global_state.callback_os_window->num_tabs > 0) {
Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab;
for (unsigned int i = 0; i < t->num_windows; i++) {
Window *w = t->windows + i;
double d = distance_to_window(w, global_state.callback_os_window);
if (d < closest_distance) { ans = w; closest_distance = d; *window_idx = i; }
}
}
return ans;
} }
void void
@ -453,6 +475,14 @@ mouse_event(int button, int modifiers) {
handle_tab_bar_mouse(button, modifiers); handle_tab_bar_mouse(button, modifiers);
} else if(w) { } else if(w) {
handle_event(w, button, modifiers, window_idx); handle_event(w, button, modifiers, window_idx);
} else if (button == GLFW_MOUSE_BUTTON_LEFT && global_state.callback_os_window->mouse_button_pressed[button]) {
// initial click, clamp it to the closest window
w = closest_window_for_event(&window_idx);
if (w) {
clamp_to_window = true;
handle_event(w, button, modifiers, window_idx);
clamp_to_window = false;
}
} }
if (mouse_cursor_shape != old_cursor) { if (mouse_cursor_shape != old_cursor) {
set_mouse_cursor(mouse_cursor_shape); set_mouse_cursor(mouse_cursor_shape);