mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-02 22:25:48 +01:00
- made deiconification not automatically focus window in sloppy focus
- fixed crash with DisableMiniwindows and icon pixmap changes - fixed crash when changing icon of window without WM_CLASS - added IAmAnnoyingAndDontWantWorkspaceNameDisplay - added hysteresys for offscreen menu scrollback - fixed bug with IgnoreFocusClick - fixed crash with windows with width == 1 (Alban Hertroys <dalroi@wit401310.student.utwente.nl>) - added SHEXEC command - fixed resizebarback for SHADOW_RESIZEBAR ( jim knoble jmknoble@pobox.com)
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
*/
|
||||
|
||||
|
||||
#define PROG_VERSION "setstyle (Window Maker) 0.4"
|
||||
#define PROG_VERSION "setstyle (Window Maker) 0.5"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#include "../src/wconfig.h"
|
||||
|
||||
#define MAX_OPTIONS 128
|
||||
|
||||
char *FontOptions[] = {
|
||||
"IconTitleFont",
|
||||
@@ -344,13 +345,13 @@ print_help()
|
||||
printf("Usage: %s [OPTIONS] FILE\n", ProgName);
|
||||
puts("Reads style/theme configuration from FILE and updates Window Maker.");
|
||||
puts("");
|
||||
puts(" --no-fonts ignore font related options");
|
||||
puts(" --help display this help and exit");
|
||||
puts(" --version output version information and exit");
|
||||
puts(" --no-fonts ignore font related options");
|
||||
puts(" --ignore <option> ignore changes in the specified option");
|
||||
puts(" --help display this help and exit");
|
||||
puts(" --version output version information and exit");
|
||||
}
|
||||
|
||||
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
@@ -359,6 +360,8 @@ main(int argc, char **argv)
|
||||
char *file = NULL;
|
||||
struct stat statbuf;
|
||||
int i;
|
||||
int ignoreCount = 0;
|
||||
char *ignoreList[MAX_OPTIONS];
|
||||
|
||||
dpy = XOpenDisplay("");
|
||||
|
||||
@@ -371,7 +374,15 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (strcmp("--no-fonts", argv[i])==0) {
|
||||
if (strcmp("--ignore", argv[i])==0) {
|
||||
i++;
|
||||
if (i == argc) {
|
||||
printf("%s: missing argument for option --ignore", ProgName);
|
||||
exit(1);
|
||||
}
|
||||
ignoreList[ignoreCount++] = argv[i];
|
||||
|
||||
} else if (strcmp("--no-fonts", argv[i])==0) {
|
||||
ignoreFonts = 1;
|
||||
} else if (strcmp("--version", argv[i])==0) {
|
||||
puts(PROG_VERSION);
|
||||
@@ -461,6 +472,12 @@ main(int argc, char **argv)
|
||||
|
||||
hackStyle(style);
|
||||
|
||||
if (ignoreCount > 0) {
|
||||
for (i = 0; i < ignoreCount; i++) {
|
||||
PLRemoveDictionaryEntry(style, PLMakeString(ignoreList[i]));
|
||||
}
|
||||
}
|
||||
|
||||
PLMergeDictionaries(prop, style);
|
||||
|
||||
PLSave(prop, YES);
|
||||
|
||||
@@ -610,20 +610,20 @@ parseTexture(RContext *rc, char *text)
|
||||
|
||||
handle = dlopen(lib, RTLD_LAZY);
|
||||
if (!handle) {
|
||||
wwarning(_("could not find library %s"), lib);
|
||||
wwarning("could not find library %s", lib);
|
||||
goto function_cleanup;
|
||||
}
|
||||
|
||||
initFunc = dlsym(handle, "initWindowMaker");
|
||||
if (!initFunc) {
|
||||
wwarning(_("could not initialize library %s"), lib);
|
||||
wwarning("could not initialize library %s", lib);
|
||||
goto function_cleanup;
|
||||
}
|
||||
initFunc(dpy, DefaultColormap(dpy, scr));
|
||||
|
||||
mainFunc = dlsym(handle, func);
|
||||
if (!mainFunc) {
|
||||
wwarning(_("could not find function %s::%s"), lib, func);
|
||||
wwarning("could not find function %s::%s", lib, func);
|
||||
goto function_cleanup;
|
||||
}
|
||||
image = mainFunc(argc, argv, scrWidth, scrHeight, 0);
|
||||
|
||||
Reference in New Issue
Block a user