7e07d61857
There is a bug that when the -screen option is used to specify a monitor for the screen window to be located on, but no explicit size is specified (and the -multiplemonitors option isn't specified), the screen window size is always constrained to fit the work area of the primary monitor (rather than the work area of the specified monitor) This gives incorrect results if you want a screen the same size as your non-primary monitor (e.g. by using -screen 0 @2) and your non-primary monitor is larger than your primary monitor. (This can be worked around by specifying -multiplemonitors and an explicit screen size the same size as the monitor (e.g. -multiplemonitors -screen 0 1600x1200@2)) Fix to use work area for the monitor specified for the screen, rather than the primary monitor work area (unless -multiplemonitors is used, in which case we continue to use the virtual desktop work area instead) Also fix the adjustment for an autohide taskbar, so that it is only done if the taskbar is on the same monitor as the screen (or -multiplemonitors is used) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/*
|
|
|
|
Copyright 1993, 1998 The Open Group
|
|
Copyright (C) Colin Harrison 2005-2008
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
the above copyright notice appear in all copies and that both that
|
|
copyright notice and this permission notice appear in supporting
|
|
documentation.
|
|
|
|
The above copyright notice and this permission notice shall be included
|
|
in all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
Except as contained in this notice, the name of The Open Group shall
|
|
not be used in advertising or otherwise to promote the sale, use or
|
|
other dealings in this Software without prior written authorization
|
|
from The Open Group.
|
|
|
|
*/
|
|
|
|
#include "win.h"
|
|
#include "winmonitors.h"
|
|
|
|
/*
|
|
* getMonitorInfo - callback function used to return information from the enumeration of monitors attached
|
|
*/
|
|
|
|
static
|
|
wBOOL CALLBACK
|
|
getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data)
|
|
{
|
|
struct GetMonitorInfoData *data = (struct GetMonitorInfoData *) _data;
|
|
|
|
// only get data for monitor number specified in <data>
|
|
data->monitorNum++;
|
|
if (data->monitorNum == data->requestedMonitor) {
|
|
data->bMonitorSpecifiedExists = TRUE;
|
|
data->monitorOffsetX = rect->left;
|
|
data->monitorOffsetY = rect->top;
|
|
data->monitorHeight = rect->bottom - rect->top;
|
|
data->monitorWidth = rect->right - rect->left;
|
|
data->monitorHandle = hMonitor;
|
|
return FALSE;
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
Bool
|
|
QueryMonitor(int index, struct GetMonitorInfoData *data)
|
|
{
|
|
/* prepare data */
|
|
if (data == NULL)
|
|
return FALSE;
|
|
memset(data, 0, sizeof(*data));
|
|
data->requestedMonitor = index;
|
|
|
|
/* query information */
|
|
return EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
|
|
}
|