gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-07 14:24:14 +01:00
Code Issues Projects Releases Wiki Activity

updated po files, fixed some bugs

Browse Source
This commit is contained in:
kojima
1999-09-16 03:01:14 +00:00
parent 3c04618278
commit ac4053478a
47 changed files with 9008 additions and 4166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/Makefile.am
View File

@@ -10,12 +10,12 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
wkdemenu.pl
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
@HEADER_SEARCH_PATH@
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
wdwrite_LDADD = $(liblist)
wxcopy_LDADD = @XLFLAGS@ @XLIBS@

8
util/Makefile.in
View File

@@ -57,12 +57,10 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CC = @CC@
CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
DLLTOOL = @DLLTOOL@
GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@
@@ -77,7 +75,6 @@ MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -101,7 +98,8 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c wkdemenu.pl
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
liblist = @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
@@ -190,7 +188,7 @@ DIST_COMMON = README Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
TAR = gtar
GZIP_ENV = --best
SOURCES = $(wxcopy_SOURCES) $(wxpaste_SOURCES) $(wdwrite_SOURCES) $(getstyle_SOURCES) $(setstyle_SOURCES) $(seticons_SOURCES) $(geticonset_SOURCES) $(wmsetbg_SOURCES)
OBJECTS = $(wxcopy_OBJECTS) $(wxpaste_OBJECTS) $(wdwrite_OBJECTS) $(getstyle_OBJECTS) $(setstyle_OBJECTS) $(seticons_OBJECTS) $(geticonset_OBJECTS) $(wmsetbg_OBJECTS)

30
util/wmsetbg.c
View File

@@ -51,7 +51,7 @@
#include <proplist.h>
#define PROG_VERSION "wmsetbg (Window Maker) 2.3"
#define PROG_VERSION "wmsetbg (Window Maker) 2.5"
#define WORKSPACE_COUNT (MAX_WORKSPACES+1)
@@ -350,6 +350,8 @@ parseTexture(RContext *rc, char *text)
RImage *image = NULL;
int w, h;
int iwidth, iheight;
RColor rcolor;
GETSTRORGOTO(val, tmp, 1, error);
/*
@@ -374,12 +376,18 @@ parseTexture(RContext *rc, char *text)
goto error;
}
if (!XAllocColor(dpy, DefaultColormap(dpy, scr), &color)) {
RColor rcolor;
rcolor.red = color.red >> 8;
rcolor.green = color.green >> 8;
rcolor.blue = color.blue >> 8;
RGetClosestXColor(rc, &rcolor, &color);
} else {
rcolor.red = 0;
rcolor.green = 0;
rcolor.blue = 0;
}
/* for images with a transparent color */
if (image->data[3]) {
RCombineImageWithColor(image, &rcolor);
}
switch (toupper(type[0])) {
@@ -842,8 +850,9 @@ setPixmapProperty(Pixmap pixmap)
void
changeTexture(BackgroundTexture *texture)
{
if (!texture)
if (!texture) {
return;
}
if (texture->solid) {
XSetWindowBackground(dpy, root, texture->color.pixel);
@@ -958,10 +967,11 @@ helperLoop(RContext *rc)
#ifdef DEBUG
printf("change texture %i\n", workspace);
#endif
if (!textures[workspace])
if (!textures[workspace]) {
changeTexture(textures[0]);
else
} else {
changeTexture(textures[workspace]);
}
break;
case 'P':
@@ -1350,9 +1360,13 @@ main(int argc, char **argv)
PixmapPath = getPixmapPath(domain);
if (!smooth) {
proplist_t val;
#if 0 /* some problem with Alpha... TODO: check if its right */
val = PLGetDictionaryEntry(domain,
PLMakeString("SmoothWorkspaceBack"));
#else
val = getValueForKey(domain, "SmoothWorkspaceBack");
#endif
if (val && PLIsString(val) && strcasecmp(PLGetString(val), "YES")==0)
smooth = True;
}
@@ -1408,7 +1422,7 @@ main(int argc, char **argv)
changeTexture(tex);
else {
/* always update domain */
changeTextureForWorkspace(domain, texture, workspace-1);
changeTextureForWorkspace(domain, texture, workspace);
}
}