andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix NS port screen geometry report (bug#76051)

Browse source 
* src/nsfns.m (Fns_display_monitor_attributes_list): Fix the arithmetic
to calculate the origin of the visible frame.
This commit is contained in:
Alan Third 2025-05-26 20:27:39 +01:00
parent 9cc5f1c697
commit 50e3bce315
1 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/nsfns.m
View file

@ -2692,41 +2692,28 @@ Internal use only, use `display-monitor-attributes-list' instead. */)
struct MonitorInfo *m = &monitors[i];
NSRect fr = [s frame];
NSRect vfr = [s visibleFrame];
short y, vy;
#ifdef NS_IMPL_COCOA
NSDictionary *dict = [s deviceDescription];
NSNumber *nid = [dict objectForKey:@"NSScreenNumber"];
CGDirectDisplayID did = [nid unsignedIntValue];
#endif
/* The primary display is always the first in the array. */
if (i == 0)
{
primary_display_height = fr.size.height;
y = (short) fr.origin.y;
vy = (short) vfr.origin.y;
}
else
{
/* Flip y coordinate as NS screen coordinates originate from
the bottom. */
y = (short) (primary_display_height - fr.size.height - fr.origin.y);
vy = (short) (primary_display_height -
vfr.size.height - vfr.origin.y);
}
primary_display_height = fr.size.height;
/* Flip y coordinate as NS screen coordinates originate from
the bottom. */
m->geom.x = (short) fr.origin.x;
m->geom.y = y;
m->geom.y = (short) (primary_display_height - NSMaxY(fr));
m->geom.width = (unsigned short) fr.size.width;
m->geom.height = (unsigned short) fr.size.height;
/* The work area excludes the menu bar and the dock. */
m->work.x = (short) vfr.origin.x;
/* y is flipped on NS, so vy - y are pixels missing at the
bottom, and fr.size.height - vfr.size.height are pixels
missing in total.
Pixels missing at top are fr.size.height - vfr.size.height -
vy + y. work.y is then pixels missing at top + y. */
m->work.y = (short) (fr.size.height - vfr.size.height) - vy + y + y;
m->work.y = (short) (primary_display_height - NSMaxY(vfr));
m->work.width = (unsigned short) vfr.size.width;
m->work.height = (unsigned short) vfr.size.height;