1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-17 06:35:47 +01:00

more dnd changes

window cycling stuff
finnish pot files
This commit is contained in:
kojima
2000-04-07 22:47:04 +00:00
parent 6b93946309
commit caa86529a9
21 changed files with 1327 additions and 1113 deletions

View File

@@ -8,6 +8,17 @@
void
W_DrawRelief(W_Screen *scr, Drawable d, int x, int y, unsigned int width,
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));
}
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)
{
Display *dpy = scr->display;
GC bgc;
@@ -17,37 +28,36 @@ W_DrawRelief(W_Screen *scr, Drawable d, int x, int y, unsigned int width,
switch (relief) {
case WRSimple:
XDrawRectangle(dpy, d, WMColorGC(scr->black), x, y, width-1, height-1);
XDrawRectangle(dpy, d, black, x, y, width-1, height-1);
return;
break;
case WRRaised:
bgc = WMColorGC(scr->black);
dgc = WMColorGC(scr->darkGray);
wgc = WMColorGC(scr->white);
lgc = WMColorGC(scr->gray);
bgc = black;
dgc = dark;
wgc = white;
lgc = light;
break;
case WRSunken:
wgc = WMColorGC(scr->darkGray);
lgc = WMColorGC(scr->black);
bgc = WMColorGC(scr->white);
dgc = WMColorGC(scr->gray);
wgc = dark;
lgc = black;
bgc = white;
dgc = light;
break;
case WRPushed:
lgc = wgc = WMColorGC(scr->black);
dgc = bgc = WMColorGC(scr->white);
lgc = wgc = black;
dgc = bgc = white;
break;
case WRRidge:
lgc = bgc = WMColorGC(scr->darkGray);
dgc = wgc = WMColorGC(scr->white);
lgc = bgc = dark;
dgc = wgc = white;
break;
case WRGroove:
wgc = dgc = WMColorGC(scr->darkGray);
lgc = bgc = WMColorGC(scr->white);
wgc = dgc = dark;
lgc = bgc = white;
break;
default:
@@ -77,6 +87,8 @@ W_DrawRelief(W_Screen *scr, Drawable d, int x, int y, unsigned int width,
}
static int
fitText(char *text, WMFont *font, int width, int wrap)
{