mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-09 23:34:14 +01:00
updated translations and image files for WINGs, bug fixes in WINGs
font handling, bug fixes in wmaker and wraster
This commit is contained in:
@@ -1726,8 +1726,8 @@ wArrangeIcons(WScreen *scr, Bool arrangeAll)
|
||||
while (wwin && wwin->prev)
|
||||
wwin = wwin->prev;
|
||||
|
||||
while (wwin) {
|
||||
if (wwin->icon && wwin->flags.miniaturized &&/*!wwin->flags.hidden &&*/
|
||||
while (wwin) {
|
||||
if (wwin->icon && wwin->flags.miniaturized && !wwin->flags.hidden &&
|
||||
(wwin->frame->workspace==scr->current_workspace ||
|
||||
IS_OMNIPRESENT(wwin) || wPreferences.sticky_icons)) {
|
||||
|
||||
|
||||
@@ -2115,6 +2115,9 @@ getFont(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr,
|
||||
val = PLGetString(value);
|
||||
|
||||
font = WMCreateFont(scr->wmscreen, val);
|
||||
if (!font)
|
||||
font = WMCreateFont(scr->wmscreen, "fixed");
|
||||
|
||||
if (!font) {
|
||||
wfatal(_("could not load any usable font!!!"));
|
||||
exit(1);
|
||||
|
||||
@@ -83,17 +83,14 @@ iconPosition(WCoreWindow *wcore, int sx1, int sy1, int sx2, int sy2,
|
||||
(((WIcon*)parent)->owner->frame->workspace == workspace
|
||||
|| IS_OMNIPRESENT(((WIcon*)parent)->owner)
|
||||
|| wPreferences.sticky_icons)
|
||||
&& ((WIcon*)parent)->mapped
|
||||
&& (!((WIcon*)parent)->owner->flags.hidden
|
||||
|| wcore->screen_ptr->flags.startup)) {
|
||||
&& ((WIcon*)parent)->mapped) {
|
||||
|
||||
*retX = ((WIcon*)parent)->owner->icon_x;
|
||||
*retY = ((WIcon*)parent)->owner->icon_y;
|
||||
|
||||
ok = 1;
|
||||
} else if (wcore->descriptor.parent_type == WCLASS_WINDOW
|
||||
&& (((WWindow*)parent)->flags.icon_moved
|
||||
|| ((WWindow*)parent)->flags.hidden)
|
||||
&& ((WWindow*)parent)->flags.icon_moved
|
||||
&& (((WWindow*)parent)->frame->workspace == workspace
|
||||
|| IS_OMNIPRESENT((WWindow*)parent)
|
||||
|| wPreferences.sticky_icons)) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* resources.c - manage X resources (fonts, colors etc)
|
||||
/* resources.c - manage X resources (colors etc)
|
||||
*
|
||||
* Window Maker window manager
|
||||
*
|
||||
|
||||
@@ -302,7 +302,7 @@ handleSig(int sig)
|
||||
if (already_crashed) {
|
||||
wfatal(_("crashed while trying to do some post-crash cleanup. Aborting immediatelly."));
|
||||
signal(sig, SIG_DFL);
|
||||
raise(sig);
|
||||
kill(getpid(), sig);
|
||||
return;
|
||||
}
|
||||
already_crashed = 1;
|
||||
@@ -328,7 +328,7 @@ handleSig(int sig)
|
||||
|
||||
if (crashAction == WMAbort) {
|
||||
signal(sig, SIG_DFL);
|
||||
raise(sig);
|
||||
kill(getpid(), sig);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -351,7 +351,7 @@ handleSig(int sig)
|
||||
#endif /* !NO_EMERGENCY_AUTORESTART */
|
||||
|
||||
signal(sig, SIG_DFL);
|
||||
raise(sig);
|
||||
kill(getpid(), sig);
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
@@ -120,7 +120,8 @@ wWorkspaceNew(WScreen *scr)
|
||||
list[i] = scr->workspaces[i];
|
||||
}
|
||||
list[i] = wspace;
|
||||
free(scr->workspaces);
|
||||
if (scr->workspaces)
|
||||
free(scr->workspaces);
|
||||
scr->workspaces = list;
|
||||
|
||||
wWorkspaceMenuUpdate(scr, scr->workspace_menu);
|
||||
@@ -517,11 +518,14 @@ wWorkspaceForceChange(WScreen *scr, int workspace)
|
||||
if (!wPreferences.sticky_icons) {
|
||||
XUnmapWindow(dpy, tmp->icon->core->window);
|
||||
tmp->icon->mapped = 0;
|
||||
} else {
|
||||
}
|
||||
#if 0
|
||||
else {
|
||||
tmp->icon->mapped = 1;
|
||||
/* Why is this here? -Alfredo */
|
||||
XMapWindow(dpy, tmp->icon->core->window);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
/* update current workspace of omnipresent windows */
|
||||
if (IS_OMNIPRESENT(tmp)) {
|
||||
|
||||
Reference in New Issue
Block a user