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

various bug fixes

Browse Source
This commit is contained in:
kojima
1999-04-18 21:08:00 +00:00
parent 674eb20ec4
commit 2effbfafde
13 changed files with 108 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/getstyle.c
View File

@@ -21,7 +21,7 @@
*/
#define PROG_VERSION "getstyle (Window Maker) 0.3"
#define PROG_VERSION "getstyle (Window Maker) 0.4"
@@ -182,7 +182,7 @@ abortar(char *reason)
if (ThemePath) {
printf("Removing unfinished theme pack\n");
sprintf(buffer, "/bin/rm -fr %s", ThemePath);
sprintf(buffer, "/bin/rm -fr \"%s\"", ThemePath);
if (system(buffer)!=0) {
printf("%s: could not execute command %s\n", ProgName, buffer);
@@ -420,7 +420,7 @@ copyFile(char *dir, char *file)
{
char buffer[4000];
sprintf(buffer, "/bin/cp %s %s", file, dir);
sprintf(buffer, "/bin/cp \"%s\" \"%s\"", file, dir);
if (system(buffer)!=0) {
printf("%s: could not copy file %s\n", ProgName, file);
}
@@ -460,7 +460,7 @@ makeThemePack(proplist_t style, char *themeName)
char *tmp;
tmp = wmalloc(strlen(themeDir)+20);
sprintf(tmp, "/bin/mkdir %s", themeDir);
sprintf(tmp, "/bin/mkdir \"%s\"", themeDir);
if (system(tmp)!=0) {
printf("%s: could not create directory %s. Probably there's already a theme with that name in this directory.\n", ProgName, themeDir);
exit(1);

75
util/setstyle.c
View File

@@ -2,7 +2,7 @@
*
* WindowMaker window manager
*
* Copyright (c) 1997, 1998 Alfredo K. Kojima
* Copyright (c) 1997, 1998, 1999 Alfredo K. Kojima
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
*/
#define PROG_VERSION "setstyle (Window Maker) 0.3"
#define PROG_VERSION "setstyle (Window Maker) 0.4"
#include <stdlib.h>
#include <stdio.h>
@@ -86,6 +86,36 @@ defaultsPathForDomain(char *domain)
}
void
hackPathInTexture(proplist_t texture, char *prefix)
{
proplist_t type;
char *t;
/* get texture type */
type = PLGetArrayElement(texture, 0);
t = PLGetString(type);
if (t && (strcasecmp(t, "tpixmap")==0
|| strcasecmp(t, "spixmap")==0
|| strcasecmp(t, "mpixmap")==0
|| strcasecmp(t, "cpixmap")==0
|| strcasecmp(t, "tvgradient")==0
|| strcasecmp(t, "thgradient")==0
|| strcasecmp(t, "tdgradient")==0)) {
proplist_t file;
char buffer[4018];
/* get pixmap file path */
file = PLGetArrayElement(texture, 1);
sprintf(buffer, "%s/%s", prefix, PLGetString(file));
/* replace path with full path */
PLRemoveArrayElement(texture, 1);
PLInsertArrayElement(texture, PLMakeString(buffer), 1);
}
}
void
hackPaths(proplist_t style, char *prefix)
{
@@ -101,26 +131,29 @@ hackPaths(proplist_t style, char *prefix)
key = PLGetArrayElement(keys, i);
value = PLGetDictionaryEntry(style, key);
if (value && PLIsArray(value) && PLGetNumberOfElements(value) > 2) {
proplist_t type;
char *t;
type = PLGetArrayElement(value, 0);
t = PLGetString(type);
if (t && (strcasecmp(t, "tpixmap")==0
|| strcasecmp(t, "spixmap")==0
|| strcasecmp(t, "mpixmap")==0
|| strcasecmp(t, "cpixmap")==0
|| strcasecmp(t, "tvgradient")==0
|| strcasecmp(t, "thgradient")==0
|| strcasecmp(t, "tdgradient")==0)) {
proplist_t file;
char buffer[4018];
if (!value)
continue;
if (strcasecmp(PLGetString(key), "WorkspaceSpecificBack")==0) {
if (PLIsArray(value)) {
int j;
proplist_t texture;
for (j = 0; j < PLGetNumberOfElements(value); j++) {
texture = PLGetArrayElement(value, j);
file = PLGetArrayElement(value, 1);
sprintf(buffer, "%s/%s", prefix, PLGetString(file));
PLRemoveArrayElement(value, 1);
PLInsertArrayElement(value, PLMakeString(buffer), 1);
if (texture && PLIsArray(texture)
&& PLGetNumberOfElements(texture) > 2) {
hackPathInTexture(texture, prefix);
}
}
}
} else {
if (PLIsArray(value) && PLGetNumberOfElements(value) > 2) {
hackPathInTexture(value, prefix);
}
}
}