Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: libsdl-org/SDL
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: jknockel/SDL
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 27, 2023

  1. Return xrandr-scaled display modes 

    XRandR supports applying transformations to an output's picture
including changes to scale. Such scaling is used by some desktop
environments under feature names such as "fractional scaling" to
accomodate HiDPI devices. Alternatively, such scaling can be enabled by
a command such as the following:

xrandr --output DP1 --scale 0.5x0.5 --filter nearest

XRandR scaling has no "HiDPI awareness" or other way for an application
to signal that it wants to work with physical display pixels, and so all
we do is scale SDL's returned display modes so that applications receive
the number of usable pixels that they expect.
    @jknockel
    jknockel committed May 27, 2023
    Copy the full SHA
    7891973 View commit details
Showing with 12 additions and 4 deletions.
  1. +11 −4 src/video/x11/SDL_x11modes.c
  2. +1 −0 src/video/x11/SDL_x11sym.h
15 changes: 11 additions & 4 deletions src/video/x11/SDL_x11modes.c
View file
Original file line number Diff line number Diff line change
@@ -397,19 +397,26 @@ static SDL_bool SetXRandRModeInfo(Display *display, XRRScreenResources *res, RRC
if (info->id == modeID) {
XRRCrtcInfo *crtcinfo;
Rotation rotation = 0;
XFixed scale_w = 0x10000, scale_h = 0x10000;
XRRCrtcTransformAttributes *attr;

crtcinfo = X11_XRRGetCrtcInfo(display, res, crtc);
if (crtcinfo) {
rotation = crtcinfo->rotation;
X11_XRRFreeCrtcInfo(crtcinfo);
}
if (X11_XRRGetCrtcTransform(display, crtc, &attr) && attr) {
scale_w = attr->currentTransform.matrix[0][0];
scale_h = attr->currentTransform.matrix[1][1];
X11_XFree(attr);
}

if (rotation & (XRANDR_ROTATION_LEFT | XRANDR_ROTATION_RIGHT)) {
mode->w = info->height;
mode->h = info->width;
mode->w = (info->height * scale_w + 0xffff) >> 16;
mode->h = (info->width * scale_h + 0xffff) >> 16;
} else {
mode->w = info->width;
mode->h = info->height;
mode->w = (info->width * scale_w + 0xffff) >> 16;
mode->h = (info->height * scale_h + 0xffff) >> 16;
}
mode->refresh_rate = CalculateXRandRRefreshRate(info);
((SDL_DisplayModeData *)mode->driverdata)->xrandr_mode = modeID;
1 change: 1 addition & 0 deletions src/video/x11/SDL_x11sym.h
View file
Original file line number Diff line number Diff line change
@@ -309,6 +309,7 @@ SDL_X11_SYM(XRRPropertyInfo*,XRRQueryOutputProperty,(Display *dpy,RROutput outpu
SDL_X11_SYM(int,XRRGetOutputProperty,(Display *dpy,RROutput output, Atom property, long offset, long length, Bool _delete, Bool pending, Atom req_type, Atom *actual_type, int *actual_format, unsigned long *nitems, unsigned long *bytes_after, unsigned char **prop),(dpy,output,property,offset,length, _delete, pending, req_type, actual_type, actual_format, nitems, bytes_after, prop),return)
SDL_X11_SYM(RROutput,XRRGetOutputPrimary,(Display *dpy,Window window),(dpy,window),return)
SDL_X11_SYM(void,XRRSelectInput,(Display *dpy, Window window, int mask),(dpy,window,mask),)
SDL_X11_SYM(Status,XRRGetCrtcTransform,(Display *dpy,RRCrtc crtc,XRRCrtcTransformAttributes **attributes),(dpy,crtc,attributes),return)
#endif

/* MIT-SCREEN-SAVER support */