aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2026-02-14 02:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

frect

Browse Source
This commit is contained in:
Romain Vimont
2026-01-24 19:52:58 +01:00
parent 665fce0707
commit 2f54970f60
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/input_manager.c
View File

@@ -892,7 +892,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
int32_t x = event->x;
int32_t y = event->y;
sc_screen_hidpi_scale_coords(im->screen, &x, &y);
SDL_Rect *r = &im->screen->rect;
SDL_FRect *r = &im->screen->rect;
bool outside = x < r->x || x >= r->x + r->w
|| y < r->y || y >= r->y + r->h;
if (outside) {

44
app/src/screen.c
View File

@@ -145,7 +145,7 @@ sc_screen_is_relative_mode(struct sc_screen *screen) {
static void
compute_rect(struct sc_size render_size, struct sc_size content_size,
bool can_upscale, SDL_Rect *rect) {
bool can_upscale, SDL_FRect *rect) {
if (is_optimal_size(render_size, content_size)) {
rect->x = 0;
rect->y = 0;
@@ -157,8 +157,8 @@ compute_rect(struct sc_size render_size, struct sc_size content_size,
if (!can_upscale && content_size.width <= render_size.width
&& content_size.height <= render_size.height) {
// Center without upscaling
rect->x = (render_size.width - content_size.width) / 2;
rect->y = (render_size.height - content_size.height) / 2;
rect->x = (render_size.width - content_size.width) / 2.f;
rect->y = (render_size.height - content_size.height) / 2.f;
rect->w = content_size.width;
rect->h = content_size.height;
return;
@@ -169,15 +169,15 @@ compute_rect(struct sc_size render_size, struct sc_size content_size,
if (keep_width) {
rect->x = 0;
rect->w = render_size.width;
rect->h = render_size.width * content_size.height
/ content_size.width;
rect->y = (render_size.height - rect->h) / 2;
rect->h = (float) render_size.width * content_size.height
/ content_size.width;
rect->y = (render_size.height - rect->h) / 2.f;
} else {
rect->y = 0;
rect->h = render_size.height;
rect->w = render_size.height * content_size.width
/ content_size.height;
rect->x = (render_size.width - rect->w) / 2;
rect->w = (float) render_size.height * content_size.width
/ content_size.height;
rect->x = (render_size.width - rect->w) / 2.f;
}
}
@@ -206,7 +206,7 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
SDL_Renderer *renderer = screen->renderer;
sc_sdl_render_clear(renderer);
SDL_Rect *geometry = &screen->rect;
SDL_FRect *geometry = &screen->rect;
enum sc_orientation orientation = screen->orientation;
SDL_Texture *texture = sc_display_get_current_texture(&screen->display);
@@ -216,31 +216,27 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
bool ok;
if (orientation == SC_ORIENTATION_0) {
SDL_FRect frect;
SDL_FRect *fgeometry = NULL;
if (geometry) {
SDL_RectToFRect(geometry, &frect);
fgeometry = &frect;
}
ok = SDL_RenderTexture(renderer, texture, NULL, fgeometry);
ok = SDL_RenderTexture(renderer, texture, NULL, geometry);
} else {
unsigned cw_rotation = sc_orientation_get_rotation(orientation);
double angle = 90 * cw_rotation;
SDL_FRect frect;
const SDL_FRect *dstrect = NULL;
SDL_FRect rect;
if (sc_orientation_is_swap(orientation)) {
frect.x = geometry->x + (geometry->w - geometry->h) / 2.f;
frect.y = geometry->y + (geometry->h - geometry->w) / 2.f;
frect.w = geometry->h;
frect.h = geometry->w;
rect.x = geometry->x + (geometry->w - geometry->h) / 2.f;
rect.y = geometry->y + (geometry->h - geometry->w) / 2.f;
rect.w = geometry->h;
rect.h = geometry->w;
dstrect = &rect;
} else {
SDL_RectToFRect(geometry, &frect);
dstrect = geometry;
}
SDL_FlipMode flip = sc_orientation_is_mirror(orientation)
? SDL_FLIP_HORIZONTAL : 0;
ok = SDL_RenderTextureRotated(renderer, texture, NULL, &frect, angle,
ok = SDL_RenderTextureRotated(renderer, texture, NULL, dstrect, angle,
NULL, flip);
}

2
app/src/screen.h
View File

@@ -61,7 +61,7 @@ struct sc_screen {
// client orientation
enum sc_orientation orientation;
// rectangle of the content (excluding black borders)
struct SDL_Rect rect;
struct SDL_FRect rect;
bool has_frame;
bool has_video_window;