diff -rauN asmem-1.9.orig_/alphabet.xpm asmem-1.9_korseby/alphabet.xpm --- asmem-1.9.orig_/alphabet.xpm 1999-03-07 00:46:50.000000000 +0100 +++ asmem-1.9_korseby/alphabet.xpm 2004-09-11 15:54:20.000000000 +0200 @@ -3,10 +3,10 @@ /* width height num_colors chars_per_pixel */ " 72 9 4 1", /* colors */ -". c #303030", -"# c #20b2ae", -"a c #202020", -"c c #107d79", +". c #2E3346", +"# c #8492B5", +"a c #8392B4", +"c c #394466", /* pixels */ "........................................................................", ".c##c..aac.c##c.c##c.caac.c##c.c##c.c##c.c##c.c##c..aa..#....a..........", diff -rauN asmem-1.9.orig_/asmem.c asmem-1.9_korseby/asmem.c --- asmem-1.9.orig_/asmem.c 2001-10-21 21:53:23.000000000 +0200 +++ asmem-1.9_korseby/asmem.c 2004-09-11 15:55:07.000000000 +0200 @@ -42,12 +42,12 @@ pushed_in = 1; safecopy(display_name, "", 50); safecopy(mainGeometry, "", 50); - safecopy(state.bgcolor, "#303030", 50); - safecopy(state.fgcolor, "#20b2aa", 50); - safecopy(state.memory_color, "#4141d7", 50); - safecopy(state.buffer_color, "#aa80aa", 50); - safecopy(state.cache_color, "#bebebe", 50); - safecopy(state.swap_color, "#ffa649", 50); + safecopy(state.bgcolor, "#2e334e", 50); + safecopy(state.fgcolor, "#8492b5", 50); + safecopy(state.memory_color, "#8492b5", 50); + safecopy(state.buffer_color, "#50586b", 50); + safecopy(state.cache_color, "#657087", 50); + safecopy(state.swap_color, "#8492b5", 50); } /* print the usage for the tool */ diff -rauN asmem-1.9.orig_/asmem_x.c asmem-1.9_korseby/asmem_x.c --- asmem-1.9.orig_/asmem_x.c 1999-12-16 23:39:05.000000000 +0100 +++ asmem-1.9_korseby/asmem_x.c 2004-09-11 16:06:26.000000000 +0200 @@ -17,10 +17,12 @@ #include #include #include +#include #include "x_color.h" #include "read_mem.h" #include "background.xpm" +#include "background.xbm" #include "alphabet.xpm" #include "state.h" @@ -477,6 +479,7 @@ int result; int x_negative = 0; int y_negative = 0; + Pixmap pixmask; mainDisplay = XOpenDisplay(display_name); if ( ! mainDisplay ) { @@ -498,23 +501,23 @@ if (pushed_in) { sprintf(bgpixmap_color[0], ". c %s", - DarkenCharColor(state.bgcolor, 1.6, mainDisplay, Root)); + DarkenCharColor(state.bgcolor, 0.6, mainDisplay, Root)); sprintf(bgpixmap_color[1], "c c %s", state.bgcolor); sprintf(bgpixmap_color[2], "q c %s", - LightenCharColor(state.bgcolor, 2.8, mainDisplay, Root)); + LightenCharColor(state.bgcolor, 1.8, mainDisplay, Root)); } else { sprintf(bgpixmap_color[2], "q c %s", - DarkenCharColor(state.bgcolor, 1.2, mainDisplay, Root)); + DarkenCharColor(state.bgcolor, 0.2, mainDisplay, Root)); sprintf(bgpixmap_color[1], "c c %s", state.bgcolor); sprintf(bgpixmap_color[0], ". c %s", - LightenCharColor(state.bgcolor, 2.5, mainDisplay, Root)); + LightenCharColor(state.bgcolor, 1.5, mainDisplay, Root)); } for (tmp = 0; tmp < 4; ++tmp) background[tmp+1] = bgpixmap_color[tmp]; @@ -666,6 +669,18 @@ iconWindow, /* window */ backgroundXpm.pixmap /* background_pixmap */ ); + + pixmask = XCreateBitmapFromData( + mainDisplay, + Root, + background_bits, + SizeHints.width, + SizeHints.height + ); + + XShapeCombineMask(mainDisplay, mainWindow, ShapeBounding, 0, 0, pixmask, ShapeSet); + XShapeCombineMask(mainDisplay, iconWindow, ShapeBounding, 0, 0, pixmask, ShapeSet); + status = XStringListToTextProperty(&app_name, 1, &title); XSetWMName(mainDisplay, mainWindow, &title); diff -rauN asmem-1.9.orig_/background.xbm asmem-1.9_korseby/background.xbm --- asmem-1.9.orig_/background.xbm 1970-01-01 01:00:00.000000000 +0100 +++ asmem-1.9_korseby/background.xbm 2004-09-09 23:22:34.000000000 +0200 @@ -0,0 +1,36 @@ +/* Erzeugt mit Gimp */ +#define background_width 54 +#define background_height 54 +static unsigned char background_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f }; diff -rauN asmem-1.9.orig_/background.xpm asmem-1.9_korseby/background.xpm --- asmem-1.9.orig_/background.xpm 1999-03-07 01:20:39.000000000 +0100 +++ asmem-1.9_korseby/background.xpm 2002-02-24 14:24:05.000000000 +0100 @@ -3,10 +3,10 @@ /* width height num_colors chars_per_pixel */ " 54 54 4 1", /* colors */ -". c #202020", -"c c #303030", -"q c #888c88", -"# c #20b2ae", +". c #212533", +"c c #2E3346", +"q c #4C5263", +"# c #8492B5", /* pixels */ ".....................................................q", ".ccccccccccccccccccccccccccccccccccccccccccccccccccccq",