external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Add basic Xinerama support via new lib/DtXinerama

Browse source 
This adds a basic library and support to dtsession and dtlogin to
support Xinerama/Twinview, where multimple monitors are used to make
up an X11 screen.

The main goal here is to draw dialogs and such centered on a monitor,
rather than spread out over multiple monitors.

Might need to add sorting - as on my test system, what I would
consider monitor 0, appears to actually be monitor 1.  So a sort might
need to be added to sort the screens according to increasing x and y
offsets so it make sense to a user.

Also, this library is built statically and not documented.  Maybe it
could be 'filled' out and refactored/redesigned in the futre if need
be and suppoerted.

It is enabled via a define, CDE_USEXINERAMA in site.def.  It's a very
simple lib, so I do not expect any issues with the BSD's - it should
build and work fine, assuming your X server has the XINERAMA
extension, which I think pretty much all of them do at this point.
This commit is contained in:
Jon Trulson 2013-03-26 19:49:50 -06:00
parent 208c1e4999
commit af7ba55f78
19 changed files with 477 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

59
cde/programs/dtsession/SmUI.c
View file

@ -86,6 +86,10 @@
#include "SmHelp.h"
#include "SmGlobals.h"
#ifdef USE_XINERAMA
#include <DtXinerama.h>
#endif
typedef enum {
ConfirmationNone,
ConfirmationOK,
@ -1340,6 +1344,7 @@ DialogUp(
int i;
Dimension width, height;
Position x, y;
unsigned int dpwidth, dpheight, xorg, yorg; /* JET - Xinerama */
/*
* Get the size of the dialog box - then compute its position
@ -1349,9 +1354,30 @@ DialogUp(
XtSetArg(uiArgs[i], XmNheight, &height);i++;
XtGetValues(w, uiArgs, i);
x = (DisplayWidth(smGD.display, smGD.screen) / 2) - (width / 2);
y = (DisplayHeight(smGD.display, smGD.screen) / 2) - (height / 2);
/* JET - get xinerama info */
#ifdef USE_XINERAMA
/* use the 'prefered' screen */
if (!_DtXineramaGetScreen(smGD.DtXineramaInfo,
smRes.xineramaPreferredScreen,
&dpwidth, &dpheight, &xorg, &yorg))
{ /* no joy here either - setup for normal */
dpwidth = DisplayWidth(smGD.display, smGD.screen);
dpheight = DisplayHeight(smGD.display, smGD.screen);
xorg = yorg = 0;
}
#else /* no Xinerama */
dpwidth = DisplayWidth(smGD.display, smGD.screen);
dpheight = DisplayHeight(smGD.display, smGD.screen);
xorg = yorg = 0;
#endif
x = (dpwidth / 2) - (width / 2);
y = (dpheight / 2) - (height / 2);
/* add the x/y origins for Xinerama */
x += xorg;
y += yorg;
i = 0;
XtSetArg(uiArgs[i], XmNx, x);i++;
XtSetArg(uiArgs[i], XmNy, y);i++;
@ -1484,6 +1510,7 @@ LockDialogUp(
register int i;
Dimension width, height; /* size values returned by XtGetValues */
Dimension shadowThickness;/* size values returned by XtGetValues */
unsigned int dpwidth, dpheight, xorg, yorg; /* JET - xinerama */
struct
{ /* position, size of widgets (pixels) */
@ -1497,6 +1524,23 @@ LockDialogUp(
int x1, y1; /* general position variables */
int index;
/* JET - get xinerama info */
#ifdef USE_XINERAMA
/* use the prefered screen */
if (!_DtXineramaGetScreen(smGD.DtXineramaInfo,
smRes.xineramaPreferredScreen,
&dpwidth, &dpheight, &xorg, &yorg))
{ /* no joy here either - setup for normal */
dpwidth = DisplayWidth(smGD.display, smGD.screen);
dpheight = DisplayHeight(smGD.display, smGD.screen);
xorg = yorg = 0;
}
#else /* no Xinerama */
dpwidth = DisplayWidth(smGD.display, smGD.screen);
dpheight = DisplayHeight(smGD.display, smGD.screen);
xorg = yorg = 0;
#endif
/*
* The partial cover has widgets of index 0 - the cover has
* index 1
@ -1522,14 +1566,15 @@ LockDialogUp(
mw.shadow = shadowThickness;
mw.width = width;
mw.height = height;
mw.x = (DisplayWidth(smGD.display, smGD.screen) - mw.width)/2;
mw.y = (DisplayHeight(smGD.display, smGD.screen) - mw.height)/2;
mw.x = (dpwidth - mw.width)/2;
mw.y = (dpheight - mw.height)/2;
if ( mw.x < 0 ) mw.x = 0;
if ( mw.y < 0 ) mw.y = 0;
x1 = mw.x;
y1 = mw.y;
/* adjust origins if using Xinerama */
x1 = mw.x + xorg;
y1 = mw.y + yorg;
i = 0;