public/gpu-screen-recorder-ui
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder-ui synced 2026-03-31 09:17:04 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve window selection (dont show selection when no window is selected)

Browse Source
This commit is contained in:
dec05eba
2026-02-15 18:22:10 +01:00
parent 1d96b73e1a
commit fde1b438df
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/RegionSelector.cpp
View File

@@ -68,7 +68,11 @@ namespace gsr {
(unsigned short)max_int(0, width - border_size*2), (unsigned short)max_int(0, border_size) (unsigned short)max_int(0, width - border_size*2), (unsigned short)max_int(0, border_size)
}, // Bottom }, // Bottom
}; };
XShapeCombineRectangles(dpy, window, ShapeBounding, 0, 0, rectangles, 4, ShapeSet, Unsorted);
if(width == 0 && height == 0)
XShapeCombineRectangles(dpy, window, ShapeBounding, 0, 0, rectangles, 0, ShapeSet, Unsorted);
else
XShapeCombineRectangles(dpy, window, ShapeBounding, 0, 0, rectangles, 4, ShapeSet, Unsorted);
XFlush(dpy); XFlush(dpy);
} }
@@ -98,7 +102,8 @@ namespace gsr {
height = abs(height); height = abs(height);
} }
XDrawRectangle(dpy, window, gc, x, y, width, height); if(width != 0 && height != 0)
XDrawRectangle(dpy, window, gc, x, y, width, height);
} }
static Window create_cursor_window(Display *dpy, int width, int height, XVisualInfo *vinfo, unsigned long background_pixel) { static Window create_cursor_window(Display *dpy, int width, int height, XVisualInfo *vinfo, unsigned long background_pixel) {
@@ -117,6 +122,13 @@ namespace gsr {
return window; return window;
} }
static void draw_rectangle_or_region(Display *dpy, Window window, GC region_gc, int region_border_size, bool is_wayland, mgl::vec2i pos, mgl::vec2i size) {
if(is_wayland)
draw_rectangle(dpy, window, region_gc, pos.x, pos.y, size.x, size.y);
else
set_region_rectangle(dpy, window, pos.x, pos.y, size.x, size.y, region_border_size);
}
static void draw_rectangle_around_selected_monitor(Display *dpy, Window window, GC region_gc, int region_border_size, bool is_wayland, const std::vector<Monitor> &monitors, mgl::vec2i cursor_pos) { static void draw_rectangle_around_selected_monitor(Display *dpy, Window window, GC region_gc, int region_border_size, bool is_wayland, const std::vector<Monitor> &monitors, mgl::vec2i cursor_pos) {
const Monitor *focused_monitor = nullptr; const Monitor *focused_monitor = nullptr;
for(const Monitor &monitor : monitors) { for(const Monitor &monitor : monitors) {
@@ -139,10 +151,7 @@ namespace gsr {
height = focused_monitor->size.y; height = focused_monitor->size.y;
} }
if(is_wayland) draw_rectangle_or_region(dpy, window, region_gc, region_border_size, is_wayland, mgl::vec2i(x, y), mgl::vec2i(width, height));
draw_rectangle(dpy, window, region_gc, x, y, width, height);
else
set_region_rectangle(dpy, window, x, y, width, height, region_border_size);
} }
static void update_cursor_window(Display *dpy, Window window, Window cursor_window, bool is_wayland, int cursor_x, int cursor_y, int cursor_window_size, int thickness, GC cursor_gc) { static void update_cursor_window(Display *dpy, Window window, Window cursor_window, bool is_wayland, int cursor_x, int cursor_y, int cursor_window_size, int thickness, GC cursor_gc) {
@@ -370,13 +379,8 @@ namespace gsr {
if(selection_type == SelectionType::WINDOW) { if(selection_type == SelectionType::WINDOW) {
focused_window = get_window_by_position(windows, cursor_pos); focused_window = get_window_by_position(windows, cursor_pos);
if(focused_window)
if(focused_window) { draw_rectangle_or_region(dpy, region_window, region_gc, region_border_size, is_wayland, focused_window->pos, focused_window->size);
if(is_wayland)
draw_rectangle(dpy, region_window, region_gc, focused_window->pos.x, focused_window->pos.y, focused_window->size.x, focused_window->size.y);
else
set_region_rectangle(dpy, region_window, focused_window->pos.x, focused_window->pos.y, focused_window->size.x, focused_window->size.y, region_border_size);
}
} else if(selection_type == SelectionType::REGION) { } else if(selection_type == SelectionType::REGION) {
draw_rectangle_around_selected_monitor(dpy, region_window, region_gc, region_border_size, is_wayland, monitors, cursor_pos); draw_rectangle_around_selected_monitor(dpy, region_window, region_gc, region_border_size, is_wayland, monitors, cursor_pos);
} }
@@ -591,20 +595,15 @@ namespace gsr {
region.size.y = device_event->root_y - region.pos.y; region.size.y = device_event->root_y - region.pos.y;
cursor_pos = region.pos + region.size; cursor_pos = region.pos + region.size;
if(is_wayland) draw_rectangle_or_region(dpy, region_window, region_gc, region_border_size, is_wayland, region.pos, region.size);
draw_rectangle(dpy, region_window, region_gc, region.pos.x, region.pos.y, region.size.x, region.size.y);
else
set_region_rectangle(dpy, region_window, region.pos.x, region.pos.y, region.size.x, region.size.y, region_border_size);
} else if(selection_type == SelectionType::WINDOW) { } else if(selection_type == SelectionType::WINDOW) {
cursor_pos = { (int)device_event->root_x, (int)device_event->root_y }; cursor_pos = { (int)device_event->root_x, (int)device_event->root_y };
focused_window = get_window_by_position(windows, cursor_pos); focused_window = get_window_by_position(windows, cursor_pos);
if(focused_window) { if(focused_window)
if(is_wayland) draw_rectangle_or_region(dpy, region_window, region_gc, region_border_size, is_wayland, focused_window->pos, focused_window->size);
draw_rectangle(dpy, region_window, region_gc, focused_window->pos.x, focused_window->pos.y, focused_window->size.x, focused_window->size.y); else
else draw_rectangle_or_region(dpy, region_window, region_gc, region_border_size, is_wayland, mgl::vec2i(0, 0), mgl::vec2i(0, 0));
set_region_rectangle(dpy, region_window, focused_window->pos.x, focused_window->pos.y, focused_window->size.x, focused_window->size.y, region_border_size);
}
} else if(selection_type == SelectionType::REGION) { } else if(selection_type == SelectionType::REGION) {
cursor_pos = { (int)device_event->root_x, (int)device_event->root_y }; cursor_pos = { (int)device_event->root_x, (int)device_event->root_y };
draw_rectangle_around_selected_monitor(dpy, region_window, region_gc, region_border_size, is_wayland, monitors, cursor_pos); draw_rectangle_around_selected_monitor(dpy, region_window, region_gc, region_border_size, is_wayland, monitors, cursor_pos);