Cygwin/X: Move QueryMonitor() out of windprocarg.c
Move QueryMonitor() out of windprocarg.c into a new file, winmonitors.c, as we use to use it from other places as well Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Tested-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
73b02e9647
commit
46c5778853
|
@ -87,6 +87,7 @@ SRCS = InitInput.c \
|
||||||
winkeybd.c \
|
winkeybd.c \
|
||||||
winkeyhook.c \
|
winkeyhook.c \
|
||||||
winmisc.c \
|
winmisc.c \
|
||||||
|
winmonitors.c \
|
||||||
winmouse.c \
|
winmouse.c \
|
||||||
winmsg.c \
|
winmsg.c \
|
||||||
winmultiwindowclass.c \
|
winmultiwindowclass.c \
|
||||||
|
|
92
hw/xwin/winmonitors.c
Normal file
92
hw/xwin/winmonitors.c
Normal file
|
@ -0,0 +1,92 @@
|
||||||
|
/*
|
||||||
|
|
||||||
|
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;
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef wBOOL (*ENUMDISPLAYMONITORSPROC)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
|
||||||
|
ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;
|
||||||
|
|
||||||
|
wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);
|
||||||
|
|
||||||
|
Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
|
||||||
|
{
|
||||||
|
/* Load EnumDisplayMonitors from DLL */
|
||||||
|
HMODULE user32;
|
||||||
|
FARPROC func;
|
||||||
|
user32 = LoadLibrary("user32.dll");
|
||||||
|
if (user32 == NULL)
|
||||||
|
{
|
||||||
|
winW32Error(2, "Could not open user32.dll");
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
func = GetProcAddress(user32, "EnumDisplayMonitors");
|
||||||
|
if (func == NULL)
|
||||||
|
{
|
||||||
|
winW32Error(2, "Could not resolve EnumDisplayMonitors: ");
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
_EnumDisplayMonitors = (ENUMDISPLAYMONITORSPROC)func;
|
||||||
|
|
||||||
|
/* prepare data */
|
||||||
|
if (data == NULL)
|
||||||
|
return FALSE;
|
||||||
|
memset(data, 0, sizeof(*data));
|
||||||
|
data->requestedMonitor = index;
|
||||||
|
|
||||||
|
/* query information */
|
||||||
|
_EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
|
||||||
|
|
||||||
|
/* cleanup */
|
||||||
|
FreeLibrary(user32);
|
||||||
|
return TRUE;
|
||||||
|
}
|
14
hw/xwin/winmonitors.h
Normal file
14
hw/xwin/winmonitors.h
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
|
||||||
|
/* data returned for monitor information */
|
||||||
|
struct GetMonitorInfoData {
|
||||||
|
int requestedMonitor;
|
||||||
|
int monitorNum;
|
||||||
|
Bool bUserSpecifiedMonitor;
|
||||||
|
Bool bMonitorSpecifiedExists;
|
||||||
|
int monitorOffsetX;
|
||||||
|
int monitorOffsetY;
|
||||||
|
int monitorHeight;
|
||||||
|
int monitorWidth;
|
||||||
|
};
|
||||||
|
|
||||||
|
Bool QueryMonitor(int index, struct GetMonitorInfoData *data);
|
|
@ -35,6 +35,7 @@ from The Open Group.
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
#include "winconfig.h"
|
#include "winconfig.h"
|
||||||
#include "winmsg.h"
|
#include "winmsg.h"
|
||||||
|
#include "winmonitors.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* References to external symbols
|
* References to external symbols
|
||||||
|
@ -44,55 +45,6 @@ from The Open Group.
|
||||||
extern Bool g_fUnicodeClipboard;
|
extern Bool g_fUnicodeClipboard;
|
||||||
extern Bool g_fClipboard;
|
extern Bool g_fClipboard;
|
||||||
#endif
|
#endif
|
||||||
/* globals required by callback function for monitor information */
|
|
||||||
struct GetMonitorInfoData {
|
|
||||||
int requestedMonitor;
|
|
||||||
int monitorNum;
|
|
||||||
Bool bUserSpecifiedMonitor;
|
|
||||||
Bool bMonitorSpecifiedExists;
|
|
||||||
int monitorOffsetX;
|
|
||||||
int monitorOffsetY;
|
|
||||||
int monitorHeight;
|
|
||||||
int monitorWidth;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef wBOOL (*ENUMDISPLAYMONITORSPROC)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
|
|
||||||
ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;
|
|
||||||
|
|
||||||
wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);
|
|
||||||
|
|
||||||
static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
|
|
||||||
{
|
|
||||||
/* Load EnumDisplayMonitors from DLL */
|
|
||||||
HMODULE user32;
|
|
||||||
FARPROC func;
|
|
||||||
user32 = LoadLibrary("user32.dll");
|
|
||||||
if (user32 == NULL)
|
|
||||||
{
|
|
||||||
winW32Error(2, "Could not open user32.dll");
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
func = GetProcAddress(user32, "EnumDisplayMonitors");
|
|
||||||
if (func == NULL)
|
|
||||||
{
|
|
||||||
winW32Error(2, "Could not resolve EnumDisplayMonitors: ");
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
_EnumDisplayMonitors = (ENUMDISPLAYMONITORSPROC)func;
|
|
||||||
|
|
||||||
/* prepare data */
|
|
||||||
if (data == NULL)
|
|
||||||
return FALSE;
|
|
||||||
memset(data, 0, sizeof(*data));
|
|
||||||
data->requestedMonitor = index;
|
|
||||||
|
|
||||||
/* query information */
|
|
||||||
_EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
|
|
||||||
|
|
||||||
/* cleanup */
|
|
||||||
FreeLibrary(user32);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Function prototypes
|
* Function prototypes
|
||||||
|
@ -1220,24 +1172,3 @@ winLogVersionInfo (void)
|
||||||
ErrorF ("%s\n\n", BUILDERSTRING);
|
ErrorF ("%s\n\n", BUILDERSTRING);
|
||||||
ErrorF ("Contact: %s\n", BUILDERADDR);
|
ErrorF ("Contact: %s\n", BUILDERADDR);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* getMonitorInfo - callback function used to return information from the enumeration of monitors attached
|
|
||||||
*/
|
|
||||||
|
|
||||||
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;
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user