qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ssh-askpass Xinerama aware. Patch from reyk@. Thanks.

Browse Source
This commit is contained in:
matthieu 2007-01-07 14:04:46 +00:00
parent b74d45e96f
commit 3d14ea0ed8
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ssh-askpass/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2006/12/02 16:28:48 matthieu Exp $
# $OpenBSD: Makefile,v 1.5 2007/01/07 14:04:46 matthieu Exp $
.include <bsd.own.mk>
X11BASE?= /usr/X11R6
@ -12,7 +12,7 @@ DATE= February 14, 2001
APP_DEFAULTS= $(CLASS)-default.ad
CPPFLAGS+= -I${X11BASE}/include -I.
LDADD+= -L${X11BASE}/lib -lXt -lSM -lICE -lX11 -lXau -lXdmcp
LDADD+= -L${X11BASE}/lib -lXt -lSM -lICE -lX11 -lXau -lXdmcp -lXinerama
CLEANFILES+= ${CLASS}.ad ${CLASS}_ad.h ssh-askpass.1

27
app/ssh-askpass/x11-ssh-askpass.c
View File

@ -55,6 +55,7 @@
#include <X11/Intrinsic.h>
#include <X11/Shell.h>
#include <X11/Xos.h>
#include <X11/extensions/Xinerama.h>
#include "dynlist.h"
#include "drawing.h"
#include "resources.h"
@ -569,7 +570,7 @@ void createDialog(AppInfo *app)
/* Make sure the indicators can all fit on the screen.
* 80% of the screen width seems fine.
*/
Dimension maxWidth = (WidthOfScreen(app->screen) * 8 / 10);
Dimension maxWidth = (app->screen_width * 8 / 10);
Dimension extraSpace = ((2 * d->w3.horizontalSpacing) +
(2 * d->w3.shadowThickness));
@ -690,8 +691,8 @@ void createDialog(AppInfo *app)
calcButtonLabelPosition(&(d->okButton));
calcButtonLabelPosition(&(d->cancelButton));
d->w3.w.x = (WidthOfScreen(app->screen) - d->w3.w.width) / 2;
d->w3.w.y = (HeightOfScreen(app->screen) - d->w3.w.height) / 3;
d->w3.w.x = (app->screen_width - d->w3.w.width) / 2;
d->w3.w.y = (app->screen_height - d->w3.w.height) / 3;
app->dialog = d;
}
@ -1437,6 +1438,8 @@ int main(int argc, char **argv)
{
AppInfo app;
XEvent event;
XineramaScreenInfo *screens;
int nscreens, i;
memset(&app, 0, sizeof(app));
@ -1485,10 +1488,24 @@ int main(int argc, char **argv)
}
}
app.screen_width = WidthOfScreen(app.screen);
app.screen_height = HeightOfScreen(app.screen);
if (XineramaIsActive(app.dpy) &&
(screens = XineramaQueryScreens(app.dpy, &nscreens)) != NULL) {
for (i = 0; i < nscreens; i++) {
if (!screens[i].width || !screens[i].height)
continue;
app.screen_width = screens[i].width;
app.screen_height = screens[i].height;
break;
}
XFree(screens);
}
app.xResolution =
WidthOfScreen(app.screen) * 1000 / WidthMMOfScreen(app.screen);
app.screen_width * 1000 / WidthMMOfScreen(app.screen);
app.yResolution =
HeightOfScreen(app.screen) * 1000 / HeightMMOfScreen(app.screen);
app.screen_height * 1000 / HeightMMOfScreen(app.screen);
createDialog(&app);
createGCs(&app);

2
app/ssh-askpass/x11-ssh-askpass.h
View File

@ -157,6 +157,8 @@ typedef struct
Display *dpy;
Screen *screen;
long screen_width;
long screen_height;
Window rootWindow;
Pixel black;
Pixel white;