mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-14 04:45:57 +01:00
changed indentation to use spaces only
This commit is contained in:
dan
288
WINGs/wmisc.c
288
WINGs/wmisc.c
@@ -7,18 +7,18 @@
|
||||
|
||||
void
|
||||
W_DrawRelief(W_Screen *scr, Drawable d, int x, int y, unsigned int width,
|
||||
unsigned int height, WMReliefType relief)
|
||||
unsigned int height, WMReliefType relief)
|
||||
{
|
||||
W_DrawReliefWithGC(scr, d, x, y, width, height, relief,
|
||||
WMColorGC(scr->black), WMColorGC(scr->darkGray),
|
||||
WMColorGC(scr->gray), WMColorGC(scr->white));
|
||||
WMColorGC(scr->black), WMColorGC(scr->darkGray),
|
||||
WMColorGC(scr->gray), WMColorGC(scr->white));
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
W_DrawReliefWithGC(W_Screen *scr, Drawable d, int x, int y, unsigned int width,
|
||||
unsigned int height, WMReliefType relief,
|
||||
GC black, GC dark, GC light, GC white)
|
||||
unsigned int height, WMReliefType relief,
|
||||
GC black, GC dark, GC light, GC white)
|
||||
{
|
||||
Display *dpy = scr->display;
|
||||
GC bgc;
|
||||
@@ -27,62 +27,62 @@ W_DrawReliefWithGC(W_Screen *scr, Drawable d, int x, int y, unsigned int width,
|
||||
GC dgc;
|
||||
|
||||
switch (relief) {
|
||||
case WRSimple:
|
||||
XDrawRectangle(dpy, d, black, x, y, width-1, height-1);
|
||||
return;
|
||||
case WRSimple:
|
||||
XDrawRectangle(dpy, d, black, x, y, width-1, height-1);
|
||||
return;
|
||||
|
||||
case WRRaised:
|
||||
bgc = black;
|
||||
dgc = dark;
|
||||
wgc = white;
|
||||
lgc = light;
|
||||
break;
|
||||
case WRRaised:
|
||||
bgc = black;
|
||||
dgc = dark;
|
||||
wgc = white;
|
||||
lgc = light;
|
||||
break;
|
||||
|
||||
case WRSunken:
|
||||
wgc = dark;
|
||||
lgc = black;
|
||||
bgc = white;
|
||||
dgc = light;
|
||||
break;
|
||||
case WRSunken:
|
||||
wgc = dark;
|
||||
lgc = black;
|
||||
bgc = white;
|
||||
dgc = light;
|
||||
break;
|
||||
|
||||
case WRPushed:
|
||||
lgc = wgc = black;
|
||||
dgc = bgc = white;
|
||||
break;
|
||||
case WRPushed:
|
||||
lgc = wgc = black;
|
||||
dgc = bgc = white;
|
||||
break;
|
||||
|
||||
case WRRidge:
|
||||
lgc = bgc = dark;
|
||||
dgc = wgc = white;
|
||||
break;
|
||||
case WRRidge:
|
||||
lgc = bgc = dark;
|
||||
dgc = wgc = white;
|
||||
break;
|
||||
|
||||
case WRGroove:
|
||||
wgc = dgc = dark;
|
||||
lgc = bgc = white;
|
||||
break;
|
||||
case WRGroove:
|
||||
wgc = dgc = dark;
|
||||
lgc = bgc = white;
|
||||
break;
|
||||
|
||||
default:
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
/* top left */
|
||||
XDrawLine(dpy, d, wgc, x, y, x+width-1, y);
|
||||
if (width > 2 && relief != WRRaised && relief!=WRPushed) {
|
||||
XDrawLine(dpy, d, lgc, x+1, y+1, x+width-3, y+1);
|
||||
XDrawLine(dpy, d, lgc, x+1, y+1, x+width-3, y+1);
|
||||
}
|
||||
|
||||
XDrawLine(dpy, d, wgc, x, y, x, y+height-1);
|
||||
if (height > 2 && relief != WRRaised && relief!=WRPushed) {
|
||||
XDrawLine(dpy, d, lgc, x+1, y+1, x+1, y+height-3);
|
||||
XDrawLine(dpy, d, lgc, x+1, y+1, x+1, y+height-3);
|
||||
}
|
||||
|
||||
/* bottom right */
|
||||
XDrawLine(dpy, d, bgc, x, y+height-1, x+width-1, y+height-1);
|
||||
if (width > 2 && relief!=WRPushed) {
|
||||
XDrawLine(dpy, d, dgc, x+1, y+height-2, x+width-2, y+height-2);
|
||||
XDrawLine(dpy, d, dgc, x+1, y+height-2, x+width-2, y+height-2);
|
||||
}
|
||||
|
||||
XDrawLine(dpy, d, bgc, x+width-1, y, x+width-1, y+height-1);
|
||||
if (height > 2 && relief!=WRPushed) {
|
||||
XDrawLine(dpy, d, dgc, x+width-2, y+1, x+width-2, y+height-2);
|
||||
XDrawLine(dpy, d, dgc, x+width-2, y+1, x+width-2, y+height-2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,29 +156,29 @@ fitText(char *text, WMFont *font, int width, int wrap)
|
||||
int w;
|
||||
|
||||
if (text[0]==0)
|
||||
return 0;
|
||||
return 0;
|
||||
|
||||
i = 0;
|
||||
if (wrap) {
|
||||
if (text[0]=='\n')
|
||||
return 0;
|
||||
if (text[0]=='\n')
|
||||
return 0;
|
||||
|
||||
do {
|
||||
i++;
|
||||
w = WMWidthOfString(font, text, i);
|
||||
} while (w < width && text[i]!='\n' && text[i]!=0);
|
||||
do {
|
||||
i++;
|
||||
w = WMWidthOfString(font, text, i);
|
||||
} while (w < width && text[i]!='\n' && text[i]!=0);
|
||||
|
||||
if (text[i]=='\n')
|
||||
return i;
|
||||
if (text[i]=='\n')
|
||||
return i;
|
||||
|
||||
/* keep words complete */
|
||||
if (!isspace(text[i])) {
|
||||
j = i;
|
||||
while (j>1 && !isspace(text[j]) && text[j]!=0)
|
||||
j--;
|
||||
if (j>1)
|
||||
i = j;
|
||||
}
|
||||
/* keep words complete */
|
||||
if (!isspace(text[i])) {
|
||||
j = i;
|
||||
while (j>1 && !isspace(text[j]) && text[j]!=0)
|
||||
j--;
|
||||
if (j>1)
|
||||
i = j;
|
||||
}
|
||||
} else {
|
||||
i = strcspn(text, "\n\r");
|
||||
}
|
||||
@@ -198,15 +198,15 @@ W_GetTextHeight(WMFont *font, char *text, int width, int wrap)
|
||||
|
||||
h = 0;
|
||||
while (length > 0) {
|
||||
count = fitText(ptr, font, width, wrap);
|
||||
count = fitText(ptr, font, width, wrap);
|
||||
|
||||
h += fheight;
|
||||
h += fheight;
|
||||
|
||||
if (isspace(ptr[count]))
|
||||
count++;
|
||||
if (isspace(ptr[count]))
|
||||
count++;
|
||||
|
||||
ptr += count;
|
||||
length -= count;
|
||||
ptr += count;
|
||||
length -= count;
|
||||
}
|
||||
return h;
|
||||
}
|
||||
@@ -214,8 +214,8 @@ W_GetTextHeight(WMFont *font, char *text, int width, int wrap)
|
||||
|
||||
void
|
||||
W_PaintText(W_View *view, Drawable d, WMFont *font, int x, int y,
|
||||
int width, WMAlignment alignment, WMColor *color,
|
||||
int wrap, char *text, int length)
|
||||
int width, WMAlignment alignment, WMColor *color,
|
||||
int wrap, char *text, int length)
|
||||
{
|
||||
char *ptr = text;
|
||||
int line_width;
|
||||
@@ -224,17 +224,17 @@ W_PaintText(W_View *view, Drawable d, WMFont *font, int x, int y,
|
||||
int fheight = WMFontHeight(font);
|
||||
|
||||
while (length > 0) {
|
||||
count = fitText(ptr, font, width, wrap);
|
||||
count = fitText(ptr, font, width, wrap);
|
||||
|
||||
line_width = WMWidthOfString(font, ptr, count);
|
||||
if (alignment==WALeft)
|
||||
line_x = x;
|
||||
else if (alignment==WARight)
|
||||
line_x = x + width - line_width;
|
||||
else
|
||||
line_x = x + (width - line_width) / 2;
|
||||
line_width = WMWidthOfString(font, ptr, count);
|
||||
if (alignment==WALeft)
|
||||
line_x = x;
|
||||
else if (alignment==WARight)
|
||||
line_x = x + width - line_width;
|
||||
else
|
||||
line_x = x + (width - line_width) / 2;
|
||||
|
||||
WMDrawString(view->screen, d, color, font, line_x, y, ptr, count);
|
||||
WMDrawString(view->screen, d, color, font, line_x, y, ptr, count);
|
||||
|
||||
if (wrap && ptr[count]!='\n')
|
||||
y += fheight;
|
||||
@@ -244,17 +244,17 @@ W_PaintText(W_View *view, Drawable d, WMFont *font, int x, int y,
|
||||
count++;
|
||||
}
|
||||
|
||||
ptr += count;
|
||||
length -= count;
|
||||
ptr += count;
|
||||
length -= count;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
W_PaintTextAndImage(W_View *view, int wrap, WMColor *textColor, W_Font *font,
|
||||
WMReliefType relief, char *text,
|
||||
WMAlignment alignment, W_Pixmap *image,
|
||||
WMImagePosition position, WMColor *backColor, int ofs)
|
||||
WMReliefType relief, char *text,
|
||||
WMAlignment alignment, W_Pixmap *image,
|
||||
WMImagePosition position, WMColor *backColor, int ofs)
|
||||
{
|
||||
W_Screen *screen = view->screen;
|
||||
int ix, iy;
|
||||
@@ -264,101 +264,101 @@ W_PaintTextAndImage(W_View *view, int wrap, WMColor *textColor, W_Font *font,
|
||||
|
||||
#ifdef DOUBLE_BUFFER
|
||||
d = XCreatePixmap(screen->display, view->window,
|
||||
view->size.width, view->size.height, screen->depth);
|
||||
view->size.width, view->size.height, screen->depth);
|
||||
#endif
|
||||
|
||||
/* background */
|
||||
if (backColor) {
|
||||
XFillRectangle(screen->display, d, WMColorGC(backColor),
|
||||
0, 0, view->size.width, view->size.height);
|
||||
XFillRectangle(screen->display, d, WMColorGC(backColor),
|
||||
0, 0, view->size.width, view->size.height);
|
||||
} else {
|
||||
#ifndef DOUBLE_BUFFER
|
||||
XClearWindow(screen->display, d);
|
||||
XClearWindow(screen->display, d);
|
||||
#else
|
||||
XSetForeground(screen->display, screen->copyGC,
|
||||
view->attribs.background_pixel);
|
||||
XFillRectangle(screen->display, d, screen->copyGC, 0, 0,
|
||||
view->size.width, view->size.height);
|
||||
XSetForeground(screen->display, screen->copyGC,
|
||||
view->attribs.background_pixel);
|
||||
XFillRectangle(screen->display, d, screen->copyGC, 0, 0,
|
||||
view->size.width, view->size.height);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
if (relief == WRFlat) {
|
||||
x = 0;
|
||||
y = 0;
|
||||
w = view->size.width;
|
||||
h = view->size.height;
|
||||
x = 0;
|
||||
y = 0;
|
||||
w = view->size.width;
|
||||
h = view->size.height;
|
||||
} else {
|
||||
x = 1;
|
||||
y = 1;
|
||||
w = view->size.width - 3;
|
||||
h = view->size.height - 3;
|
||||
x = 1;
|
||||
y = 1;
|
||||
w = view->size.width - 3;
|
||||
h = view->size.height - 3;
|
||||
}
|
||||
|
||||
/* calc. image alignment */
|
||||
if (position!=WIPNoImage && image!=NULL) {
|
||||
switch (position) {
|
||||
case WIPOverlaps:
|
||||
case WIPImageOnly:
|
||||
ix = (view->size.width - image->width) / 2;
|
||||
iy = (view->size.height - image->height) / 2;
|
||||
/*
|
||||
x = 2;
|
||||
y = 0;
|
||||
*/
|
||||
break;
|
||||
switch (position) {
|
||||
case WIPOverlaps:
|
||||
case WIPImageOnly:
|
||||
ix = (view->size.width - image->width) / 2;
|
||||
iy = (view->size.height - image->height) / 2;
|
||||
/*
|
||||
x = 2;
|
||||
y = 0;
|
||||
*/
|
||||
break;
|
||||
|
||||
case WIPLeft:
|
||||
ix = x;
|
||||
iy = y + (h - image->height) / 2;
|
||||
x = x + image->width + 5;
|
||||
y = 0;
|
||||
w -= image->width + 5;
|
||||
break;
|
||||
case WIPLeft:
|
||||
ix = x;
|
||||
iy = y + (h - image->height) / 2;
|
||||
x = x + image->width + 5;
|
||||
y = 0;
|
||||
w -= image->width + 5;
|
||||
break;
|
||||
|
||||
case WIPRight:
|
||||
ix = view->size.width - image->width - x;
|
||||
iy = y + (h - image->height) / 2;
|
||||
w -= image->width + 5;
|
||||
break;
|
||||
case WIPRight:
|
||||
ix = view->size.width - image->width - x;
|
||||
iy = y + (h - image->height) / 2;
|
||||
w -= image->width + 5;
|
||||
break;
|
||||
|
||||
case WIPBelow:
|
||||
ix = (view->size.width - image->width) / 2;
|
||||
iy = h - image->height;
|
||||
y = 0;
|
||||
h -= image->height;
|
||||
break;
|
||||
case WIPBelow:
|
||||
ix = (view->size.width - image->width) / 2;
|
||||
iy = h - image->height;
|
||||
y = 0;
|
||||
h -= image->height;
|
||||
break;
|
||||
|
||||
default:
|
||||
case WIPAbove:
|
||||
ix = (view->size.width - image->width) / 2;
|
||||
iy = y;
|
||||
y = image->height;
|
||||
h -= image->height;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
case WIPAbove:
|
||||
ix = (view->size.width - image->width) / 2;
|
||||
iy = y;
|
||||
y = image->height;
|
||||
h -= image->height;
|
||||
break;
|
||||
}
|
||||
|
||||
ix += ofs;
|
||||
iy += ofs;
|
||||
ix += ofs;
|
||||
iy += ofs;
|
||||
|
||||
XSetClipOrigin(screen->display, screen->clipGC, ix, iy);
|
||||
XSetClipMask(screen->display, screen->clipGC, image->mask);
|
||||
XSetClipOrigin(screen->display, screen->clipGC, ix, iy);
|
||||
XSetClipMask(screen->display, screen->clipGC, image->mask);
|
||||
|
||||
if (image->depth==1)
|
||||
XCopyPlane(screen->display, image->pixmap, d, screen->clipGC,
|
||||
0, 0, image->width, image->height, ix, iy, 1);
|
||||
else
|
||||
XCopyArea(screen->display, image->pixmap, d, screen->clipGC,
|
||||
0, 0, image->width, image->height, ix, iy);
|
||||
if (image->depth==1)
|
||||
XCopyPlane(screen->display, image->pixmap, d, screen->clipGC,
|
||||
0, 0, image->width, image->height, ix, iy, 1);
|
||||
else
|
||||
XCopyArea(screen->display, image->pixmap, d, screen->clipGC,
|
||||
0, 0, image->width, image->height, ix, iy);
|
||||
}
|
||||
|
||||
/* draw text */
|
||||
if (position != WIPImageOnly && text!=NULL) {
|
||||
int textHeight;
|
||||
int textHeight;
|
||||
|
||||
textHeight = W_GetTextHeight(font, text, w-8, wrap);
|
||||
W_PaintText(view, d, font, x+ofs+4, y+ofs + (h-textHeight)/2, w-8,
|
||||
alignment, textColor, wrap, text, strlen(text));
|
||||
textHeight = W_GetTextHeight(font, text, w-8, wrap);
|
||||
W_PaintText(view, d, font, x+ofs+4, y+ofs + (h-textHeight)/2, w-8,
|
||||
alignment, textColor, wrap, text, strlen(text));
|
||||
}
|
||||
|
||||
|
||||
@@ -367,7 +367,7 @@ W_PaintTextAndImage(W_View *view, int wrap, WMColor *textColor, W_Font *font,
|
||||
|
||||
#ifdef DOUBLE_BUFFER
|
||||
XCopyArea(screen->display, d, view->window, screen->copyGC, 0, 0,
|
||||
view->size.width, view->size.height, 0, 0);
|
||||
view->size.width, view->size.height, 0, 0);
|
||||
XFreePixmap(screen->display, d);
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user