DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
DEPLIBS = DepDtClientLibs
-LOCAL_LIBRARIES = DtClientLibs
-SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
+LOCAL_LIBRARIES = DtClientLibs -lDtXinerama
+SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs -lXinerama
#if defined(HPArchitecture)
EXTRA_DEFINES = -D_HPUX_SOURCE
WmMenu.c WmProperty.c WmProtocol.c \
WmResCvt.c WmResParse.c WmResource.c \
WmSignal.c WmWinConf.c WmWinInfo.c \
- WmWinList.c WmWinState.c version.c
+ WmWinList.c WmWinState.c version.c \
+ WmMultihead.c
SRCSDT = \
Button.c Callback.c Clock.c \
WmMenu.o WmProperty.o WmProtocol.o \
WmResCvt.o WmResParse.o WmResource.o \
WmSignal.o WmWinConf.o WmWinInfo.o \
- WmWinList.o WmWinState.o version.o
+ WmWinList.o WmWinState.o version.o \
+ WmMultiHead.o
OBJSDT = \
Button.o Callback.o Clock.o \
--- /dev/null
+/*
+ * Copyright (c) 2016 Matthew R. Trower
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 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
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+ * Included Files:
+ */
+#include <DtXinerama.h>
+
+#include "WmMultiHead.h"
+
+/*
+ * Global Variables
+ */
+DtXineramaInfo_t *DtXI = NULL;/* Xinerama data is static for life of X server */
+
+\f
+/*************************************<->*************************************
+ *
+ * GetHeadInfo (pcd)
+ *
+ *
+ * Description:
+ * -----------
+ * Search for the head containing target client.
+ *
+ *
+ * Inputs:
+ * ------
+ *
+ *
+ * Outputs:
+ * -------
+ * Return = head metrics on success, NULL on failure.
+ * menuWidget, and menuButtons members.
+ *
+ *
+ * Comments:
+ * --------
+ *
+ * Can fail if:
+ *
+ * - MultiHead(eg. Xinerama) is not active
+ * - Client does not fall within any existing head
+ * - malloc error
+ * - pcd is NULL
+ *
+ *************************************<->***********************************/
+WmHeadInfo_t *GetHeadInfo(const ClientData *pcd) {
+ WmHeadInfo_t *WmHI = NULL;
+
+ if (!DtXI)
+ DtXI = _DtXineramaInit(DISPLAY);
+
+ if (!pcd || !DtXI)
+ return NULL;
+
+ if (!(WmHI = (WmHeadInfo_t *)malloc(sizeof(WmHeadInfo_t)))) {
+#ifdef DEBUG
+ fprintf(stderr, "(dtwm) _GetScreenInfo: malloc failed\n");
+#endif
+
+ free(DtXI);
+ return NULL;
+ }
+
+ /*
+ * TODO
+ *
+ * DtXineramaInfo_t uses unsigned ints
+ * XineramaScreenInfo uses shorts(?)
+ * ClientData uses ints
+ * FrameToClient and friends use a mixture (!)
+ *
+ * Explicit casting would shut the compiler up, but wouldn't change the
+ * fundamental fact that we can't agree on coordinate types.
+ */
+ int idx = 0;
+ while (_DtXineramaGetScreen(DtXI, idx++,
+ &WmHI->width, &WmHI->height, &WmHI->x_org, &WmHI->y_org)) {
+
+ if (pcd->clientX >= WmHI->x_org &&
+ pcd->clientY >= WmHI->y_org &&
+ pcd->clientX <= WmHI->x_org + WmHI->width &&
+ pcd->clientY <= WmHI->y_org + WmHI->height)
+
+ return WmHI;
+ }
+
+ /* No valid screen */
+ return NULL;
+}
--- /dev/null
+/*
+ * Copyright (c) 2016 Matthew R. Trower
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 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
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#ifndef _WmMultiHead_h
+#define _WmMultiHead_h
+
+#include "WmGlobal.h"
+
+typedef struct _WmHeadInfo {
+ int x_org;
+ int y_org;
+ unsigned int width;
+ unsigned int height;
+} WmHeadInfo_t, *WmHeadInfoPtr_t;
+
+WmHeadInfo_t *GetHeadInfo(const ClientData *pcd);
+
+#endif _WmMultiHead_h
#include "WmPresence.h"
#endif /* WSM */
#include "WmXSMP.h"
+#include "WmMultiHead.h"
#ifdef PANELIST
static void AdjustSlideOutGeometry (ClientData *pCD);
Boolean placed = False;
int frameWidth;
int frameHeight;
+ int screenX;
+ int screenY;
int screenWidth;
int screenHeight;
int borderWidth = 0;
Boolean offScreenX;
Boolean offScreenY;
+ WmHeadInfo_t *WmHI = NULL;
if (!clientPlacementInitialized)
frameWidth = pCD->clientWidth + (2 * pCD->clientOffset.x);
frameHeight = pCD->clientHeight + pCD->clientOffset.y + pCD->clientOffset.x;
- screenWidth = DisplayWidth (DISPLAY, SCREEN_FOR_CLIENT(pCD));
- screenHeight = DisplayHeight (DISPLAY, SCREEN_FOR_CLIENT(pCD));
+
+ if (WmHI = GetHeadInfo(wmGD.keyboardFocus)) {
+ /* Use Head metrics for placeable area */
+ screenX = WmHI->x_org;
+ screenY = WmHI->y_org;
+ screenWidth = WmHI->width;
+ screenHeight = WmHI->height;
+
+ free(WmHI);
+ } else {
+ /* Use X Screen metrics for placeable area */
+ screenX = 0;
+ screenY = 0;
+ screenWidth = DisplayWidth (DISPLAY, SCREEN_FOR_CLIENT(pCD));
+ screenHeight = DisplayHeight (DISPLAY, SCREEN_FOR_CLIENT(pCD));
+ }
while (!placed)
{
* The window has been placed, now update the placement information.
*/
- pCD->clientX = clientPlacementX;
- pCD->clientY = clientPlacementY;
+ pCD->clientX = clientPlacementX + screenX;
+ pCD->clientY = clientPlacementY + screenY;
clientPlacementX += clientPlacementOffset;
if (clientPlacementX >= screenWidth)
*/
#include "WmCDecor.h"
+#include "WmCDInfo.h"
#include "WmFunction.h"
#include "WmIDecor.h"
#include "WmIPlace.h"
* Function Declarations:
*/
+#include "WmMultiHead.h"
#include "WmWinState.h"
#ifdef PANELIST
static void SlideWindowOut (ClientData *pCD);
void ConfigureNewState (ClientData *pcd)
{
+ WmHeadInfo_t *WmHI = NULL;
+
if (pcd->maxConfig)
{
pcd->maxConfig = FALSE;
}
else
{
+ /*
+ * Update client config to reflect underlying head, if MultiHead is active
+ */
+ if (WmHI = GetHeadInfo(pcd)) {
+ FrameToClient(pcd, &WmHI->x_org, &WmHI->y_org,
+ &WmHI->width, &WmHI->height);
+ pcd->maxX = WmHI->x_org;
+ pcd->maxY = WmHI->y_org;
+ pcd->maxWidth = WmHI->width;
+ pcd->maxHeight = WmHI->height;
+ }
+
XResizeWindow (DISPLAY, pcd->client,
(unsigned int) pcd->maxWidth,
(unsigned int) pcd->maxHeight);
projects / oweals / cde.git / commitdiff