gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-06 22:04:12 +01:00
Code Issues Projects Releases Wiki Activity

- Fixed Window Maker to compile with xinerama disabled.

Browse Source 
- Replaced --disable-xinerama with --enable-xinerama in configure
  (xinerama needs to be enabled when Window Maker is build because
   it's no longer enabled by default)
This commit is contained in:
dan
2002-12-02 03:44:10 +00:00
parent 00638fa5d3
commit 39d250888e
3 changed files with 115 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -526,10 +526,10 @@ fi
dnl XINERAMA support
dnl ================
xinerama=yes
xinerama=no
AC_ARG_ENABLE(xinerama,
[ --disable-xinerama disable XInerama extension support],
xinerama=$enableval, xinerama=yes)
[ --enable-xinerama enable Xinerama extension support],
xinerama=$enableval, xinerama=no)
if test "$xinerama" = yes; then
AC_CHECK_LIB(Xinerama, XineramaQueryScreens, [XLIBS="-lXinerama $XLIBS"

34
src/xinerama.c
View File

@@ -35,18 +35,20 @@
#include <X11/extensions/Xinerama.h>
#endif
void wInitXinerama(WScreen *scr)
void
wInitXinerama(WScreen *scr)
{
scr->xine_screens = 0;
scr->xine_count = 0;
scr->xine_primary_head = 0;
#ifdef XINERAMA
scr->xine_screens = XineramaQueryScreens(dpy, &scr->xine_count);
#else
scr->xine_count = 0;
#endif
scr->xine_primary_head = 0;
}
int wGetRectPlacementInfo(WScreen *scr, WMRect rect, int *flags)
int
wGetRectPlacementInfo(WScreen *scr, WMRect rect, int *flags)
{
int best;
unsigned long area, totalArea;
@@ -111,8 +113,10 @@ int wGetRectPlacementInfo(WScreen *scr, WMRect rect, int *flags)
/* get the head that covers most of the rectangle */
int wGetHeadForRect(WScreen *scr, WMRect rect)
int
wGetHeadForRect(WScreen *scr, WMRect rect)
{
#ifdef XINERAMA
int best;
unsigned long area;
int i;
@@ -127,7 +131,6 @@ int wGetHeadForRect(WScreen *scr, WMRect rect)
best = -1;
area = 0;
#ifdef XINERAMA
for (i = 0; i < scr->xine_count; i++) {
unsigned long a;
@@ -156,7 +159,8 @@ int wGetHeadForRect(WScreen *scr, WMRect rect)
}
int wGetHeadForWindow(WWindow *wwin)
int
wGetHeadForWindow(WWindow *wwin)
{
WMRect rect;
@@ -209,7 +213,8 @@ int wGetHeadForPoint(WScreen *scr, WMPoint point, int *flags)
int wGetHeadForPoint(WScreen *scr, WMPoint point)
int
wGetHeadForPoint(WScreen *scr, WMPoint point)
{
#ifdef XINERAMA
int i;
@@ -226,7 +231,8 @@ int wGetHeadForPoint(WScreen *scr, WMPoint point)
}
int wGetHeadForPointerLocation(WScreen *scr)
int
wGetHeadForPointerLocation(WScreen *scr)
{
WMPoint point;
Window bla;
@@ -256,7 +262,7 @@ wGetRectForHead(WScreen *scr, int head)
rect.pos.x = scr->xine_screens[head].x_org;
rect.pos.y = scr->xine_screens[head].y_org;
rect.size.width = scr->xine_screens[head].width;
rect.size.height = scr->xine_screens[head].height;
rect.size.height = scr->xine_screens[head].height;
} else
#endif /* XINERAMA */
{
@@ -271,7 +277,8 @@ wGetRectForHead(WScreen *scr, int head)
WArea wGetUsableAreaForHead(WScreen *scr, int head, WArea *totalAreaPtr)
WArea
wGetUsableAreaForHead(WScreen *scr, int head, WArea *totalAreaPtr)
{
WArea totalArea, usableArea = scr->totalUsableArea;
WMRect rect = wGetRectForHead(scr, head);
@@ -292,7 +299,8 @@ WArea wGetUsableAreaForHead(WScreen *scr, int head, WArea *totalAreaPtr)
}
WMPoint wGetPointToCenterRectInHead(WScreen *scr, int head, int width, int height)
WMPoint
wGetPointToCenterRectInHead(WScreen *scr, int head, int width, int height)
{
WMPoint p;
WMRect rect = wGetRectForHead(scr, head);

157
util/wmsetbg.c
View File

@@ -25,7 +25,6 @@
/*
* TODO: rewrite, too dirty
*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -70,7 +69,7 @@ int scrX, scrY;
#ifdef XINERAMA
XineramaScreenInfo *xine_screens;
int xine_count;
int xine_count;
#endif
Bool smooth = False;
@@ -125,82 +124,86 @@ loadImage(RContext *rc, char *file)
}
void applyImage( RContext * rc, BackgroundTexture *texture, RImage *image, char type, int x, int y, int width, int height) {
static void
applyImage(RContext *rc, BackgroundTexture *texture, RImage *image, char type,
int x, int y, int width, int height)
{
int w, h;
Bool fimage = False;
switch( toupper(type)) {
case 'S':
case 'M':
if ( type == 'S') {
w = width;
h = height;
} else {
if ( image->width*height > image->height*width) {
w = width;
h = (width*image->height) / image->width;
} else {
w = (height*image->width) / image->height;
h = height;
}
}
switch (toupper(type)) {
case 'S':
case 'M':
if (type == 'S') {
w = width;
h = height;
} else {
if (image->width*height > image->height*width) {
w = width;
h = (width*image->height) / image->width;
} else {
w = (height*image->width) / image->height;
h = height;
}
}
if ( w != image->width || h != image->height) {
RImage * simage;
if (w != image->width || h != image->height) {
RImage * simage;
if ( smooth) {
simage = RSmoothScaleImage( image, w, h);
} else {
simage = RScaleImage( image, w, h);
}
if (smooth) {
simage = RSmoothScaleImage(image, w, h);
} else {
simage = RScaleImage(image, w, h);
}
if ( !simage) {
wwarning( "could not scale image:%s", RMessageForError(RErrorCode));
return;
}
fimage = True;
image = simage;
}
if (!simage) {
wwarning("could not scale image:%s", RMessageForError(RErrorCode));
return;
}
fimage = True;
image = simage;
}
/* fall through */
case 'C':
{
Pixmap pixmap;
/* fall through */
case 'C':
{
Pixmap pixmap;
if ( !RConvertImage(rc, image, &pixmap)) {
wwarning( "could not convert texture:%s", RMessageForError(RErrorCode));
return;
}
if (!RConvertImage(rc, image, &pixmap)) {
wwarning("could not convert texture:%s", RMessageForError(RErrorCode));
return;
}
if ( image->width != width || image->height != height) {
int sx, sy, w, h;
if (image->width != width || image->height != height) {
int sx, sy, w, h;
if ( image->height < height) {
h = image->height;
y += (height - h) / 2;
sy = 0;
} else {
sy = (image->height - height) / 2;
h = height;
}
if ( image->width < width) {
w = image->width;
x += (width - w) / 2;
sx = 0;
} else {
sx = (image->width - width) / 2;
w = width;
}
if (image->height < height) {
h = image->height;
y += (height - h) / 2;
sy = 0;
} else {
sy = (image->height - height) / 2;
h = height;
}
if (image->width < width) {
w = image->width;
x += (width - w) / 2;
sx = 0;
} else {
sx = (image->width - width) / 2;
w = width;
}
XCopyArea(dpy, pixmap, texture->pixmap, DefaultGC(dpy, scr), sx, sy, w, h, x, y);
} else
XCopyArea(dpy, pixmap, texture->pixmap, DefaultGC(dpy, scr), 0, 0, width, height, x, y);
XCopyArea(dpy, pixmap, texture->pixmap, DefaultGC(dpy, scr), sx, sy, w, h, x, y);
} else
XCopyArea(dpy, pixmap, texture->pixmap, DefaultGC(dpy, scr), 0, 0, width, height, x, y);
XFreePixmap(dpy, pixmap);
if ( fimage) RReleaseImage( image);
}
break;
XFreePixmap(dpy, pixmap);
if (fimage) {
RReleaseImage( image);
}
}
break;
}
}
@@ -589,17 +592,21 @@ parseTexture(RContext *rc, char *text)
texture->width = scrWidth;
texture->height = scrHeight;
if ( xine_count) {
int i;
for ( i=0; i<xine_count; ++i) {
applyImage( rc, texture, image, type[0],
xine_screens[i].x_org, xine_screens[i].y_org,
xine_screens[i].width, xine_screens[i].height);
#ifdef XINERAMA
if (xine_count) {
int i;
for (i=0; i<xine_count; ++i) {
applyImage(rc, texture, image, type[0],
xine_screens[i].x_org, xine_screens[i].y_org,
xine_screens[i].width, xine_screens[i].height);
}
} else {
applyImage( rc, texture, image, type[0], 0, 0, scrWidth, scrHeight);
}
RReleaseImage( image);
applyImage(rc, texture, image, type[0], 0, 0, scrWidth, scrHeight);
}
#else
applyImage(rc, texture, image, type[0], 0, 0, scrWidth, scrHeight);
#endif
RReleaseImage(image);
}
break;
#endif