gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 08:07:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Headers/x11/XGServer.h: monitorsCount ivar was added to hold

Browse source 
`monitors` array items.
* Source/x11/XGServerWindow.m: use `monitorsCount` instead of local
  variable `count` or ScreenCount() value.
* ChangeLog: update to the latest changes.
Mark methods where usage of X Screen as parameter is correct and where isn't.
This commit is contained in:
Sergii Stoian 2020-01-30 01:27:11 +02:00
parent 7ebd2468b1
commit 62bef72ac0
3 changed files with 51 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2020-01-26 Sergii Stoian <stoyan255@gmail.com>
* Headers/x11/XGServer.h: new structure `MonitorDevice` and ivar
`monitors`for holding cache of monitor's parameters (depth, resolution,
frame). New ivar `monitorsCount` - holds number of items in `monitors` for
RandR or X11 screen count otherwise.
* Source/x11/XGServerWindow.m (screenList): new method for RandR mode -
enumerates monitors and caches their parameters. Returns array of monitors'
indices to get access to monitors` items.
(boundsForScreen:): use cached `frame` parameter of specified monitor.
Use `monitorsCount` instead of ScreenCount().
* Source/x11/XGServer.m (dealloc): free `monitors` if it was used.
2020-01-26 Sergii Stoian <stoyan255@gmail.com>
* Source/x11/XGServerWindow.m (boundsForScreen:): use `screen` variable

1
Headers/x11/XGServer.h
View file

@ -69,6 +69,7 @@ typedef struct MonitorDevice {
int randrEventBase;
int randrErrorBase;
MonitorDevice *monitors;
unsigned monitorsCount;
}
+ (Display*) currentXDisplay;

74
Source/x11/XGServerWindow.m
View file

@ -4373,10 +4373,7 @@ xgps_cursor_image(Display *xdpy, Drawable draw, const unsigned char *data,
}
/*******************************************************************************
* Screens
*
* X Display - connection to X11 server
* X Screen - dedicated device(s)
* Screens, monitors
*******************************************************************************/
static NSWindowDepth
@ -4416,34 +4413,32 @@ _computeDepth(int class, int bpp)
return depth;
}
// This method assumes that we deal with one X11 screen - `defScreen`.
// Basically it means that we have DISPLAY variable set to `:0.0`.
// Computer may have one or more monitor devices attached. X11 screen is a sum of
// visble content of all monitors.
//
// Multiple X screens is not supported because it's outdated and practically
// never used.
//
// Returned value is an array of connected monitor devices' indices.
/* This method assumes that we deal with one X11 screen - `defScreen`.
Basically it means that we have DISPLAY variable set to `:0.0`.
AppKit and X11 use the same term "screen" with different meaning:
AppKit Screen - single mintor/display device.
X11 Screen - its a plane where X Server can draw on.
XRandR - Xorg extension that halps to manipulate monitors layout providing
X11 Screen. */
#ifdef HAVE_XRANDR
- (NSArray *)screenList
{
NSMutableArray *screens;
int count, i;
int i;
XRRScreenResources *screen_res;
XRROutputInfo *output_info;
XRRCrtcInfo *crtc_info;
screen_res = XRRGetScreenResources(dpy, RootWindow(dpy, defScreen));
count = screen_res->noutput;
monitorsCount = screen_res->noutput;
screens = [NSMutableArray arrayWithCapacity: count];
screens = [NSMutableArray arrayWithCapacity: monitorsCount];
if (monitors != NULL) {
NSZoneFree([self zone], monitors);
}
monitors = NSZoneMalloc([self zone], count * sizeof(MonitorDevice));
monitors = NSZoneMalloc([self zone], monitorsCount * sizeof(MonitorDevice));
for (i = 0; i < count; i++)
for (i = 0; i < monitorsCount; i++)
{
output_info = XRRGetOutputInfo(dpy, screen_res, screen_res->outputs[i]);
if (output_info->crtc)
@ -4465,26 +4460,29 @@ _computeDepth(int class, int bpp)
return screens;
}
#else // HAVE_XRANDR
// Returns array of screen numbers
- (NSArray *)screenList
{
/* I guess screen numbers are in order starting from zero, but we
put the main screen first */
int i;
int count = ScreenCount(dpy);
NSMutableArray *screens = [NSMutableArray arrayWithCapacity: count];
if (count > 0)
[screens addObject: [NSNumber numberWithInt: defScreen]];
for (i = 0; i < count; i++)
{
if (i != defScreen)
[screens addObject: [NSNumber numberWithInt: i]];
}
return screens;
int i;
NSMutableArray *screens;
monitorsCount = ScreenCount(dpy);
screens = [NSMutableArray arrayWithCapacity: monitorsCount];
if (monitorsCount > 0)
{
/* I guess screen numbers are in order starting from zero, but we
put the main screen first */
[screens addObject: [NSNumber numberWithInt: defScreen]];
}
for (i = 0; i < count; i++)
{
if (i != defScreen)
[screens addObject: [NSNumber numberWithInt: i]];
}
return screens;
}
#endif
- (NSWindowDepth) windowDepthForScreen: (int) screen_num // X Screen
- (NSWindowDepth) windowDepthForScreen: (int) screen_num // X Screen - OK
{
Screen *screen;
int class = 0, bpp = 0;
@ -4501,7 +4499,7 @@ _computeDepth(int class, int bpp)
return _computeDepth(class, bpp);
}
- (const NSWindowDepth *) availableDepthsForScreen: (int) screen_num // X Screen
- (const NSWindowDepth *) availableDepthsForScreen: (int) screen_num // X Screen - OK
{
Screen *screen;
int class = 0;
@ -4535,7 +4533,7 @@ _computeDepth(int class, int bpp)
return depths;
}
- (NSSize) resolutionForScreen: (int)screen_num // X Screen
- (NSSize) resolutionForScreen: (int)screen_num // X Screen - !OK
{
// NOTE:
// -gui now trusts the return value of resolutionForScreen:,
@ -4572,7 +4570,7 @@ _computeDepth(int class, int bpp)
{
NSRect boundsRect = NSZeroRect;
if (screen < 0 || screen >= ScreenCount(dpy))
if (screen < 0 || screen >= monitorsCount)
{
NSLog(@"Invalidparam: no screen %d", screen);
return NSZeroRect;
@ -4580,7 +4578,9 @@ _computeDepth(int class, int bpp)
#ifdef HAVE_XRANDR
if (monitors != NULL)
boundsRect = monitors[screen].frame;
{
boundsRect = monitors[screen].frame;
}
#else
boundsRect = NSMakeRect(0, 0, DisplayWidth(dpy, screen),
DisplayHeight(dpy, screen));