Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Varrious fixes for errors found in fvwm3-output.log #922

Merged
merged 4 commits into from
Nov 7, 2023
Merged

Varrious fixes for errors found in fvwm3-output.log #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fde3fe4
Remove some additional Color commands that are no longer used.
somiaj Nov 7, 2023
234964c
Fix issue with fvwm-menu-desktop MiniIcon style.
somiaj Nov 7, 2023
0d05f05
Remove pan_frame debugging.
somiaj Nov 7, 2023
722af90
Double check icon exists in fvwm-menu-desktop
somiaj Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bin/fvwm-menu-desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ Standard output is a series Fvwm commands."""
if not style_id:
style_id = ent.getIcon()
if style_id and ent.getIcon():
sys.stdout.write('Style {} MiniIcon "{}"\n'.format(style_id, geticonfile(ent.getIcon())))
sys.stdout.write('Style "{}" MiniIcon "{}"\n'.format(style_id, geticonfile(ent.getIcon())))

sys.stdout.flush()
vprint("\nProcess took " + str(time.time()-timestamp) + " seconds")
Expand Down Expand Up @@ -715,9 +715,10 @@ def printmenu(name, icon, command):
iconfile = ''
if IconScaleTool.enable_icon:
iconfile = geticonfile(icon) or getdefaulticonfile(command) or icon
if not (iconfile == '' or iconfile == None):
if not (iconfile == '' or iconfile == None) and os.path.isfile(iconfile):
iconfile = '%'+iconfile+'%'
else:
iconfile = ''
sys.stderr.write("%s icon or default icon not found!\n")
printtext('+ "%s%s" %s' % (escapemenutext(name), iconfile, command))

Expand Down
28 changes: 0 additions & 28 deletions fvwm/builtins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2886,34 +2886,6 @@ void CMD_ModuleTimeout(F_CMD_ARGS)
return;
}

void CMD_HilightColor(F_CMD_ARGS)
{
char *fore;
char *back;

if (Scr.cur_decor && Scr.cur_decor != &Scr.DefaultDecor)
{
fvwm_debug(__func__,
"Decors do not support the HilightColor command"
" anymore. Please use"
" 'Style <stylename> HilightFore <forecolor>' and"
" 'Style <stylename> HilightBack <backcolor>' instead."
" Sorry for the inconvenience.");
return;
}
action = GetNextToken(action, &fore);
GetNextToken(action, &back);
if (fore && back)
{
xasprintf(&action, "* HilightFore %s, HilightBack %s", fore, back);
CMD_Style(F_PASS_ARGS);
}
free(fore);
free(back);

return;
}

void CMD_HilightColorset(F_CMD_ARGS)
{
char *newaction;
Expand Down
1 change: 0 additions & 1 deletion fvwm/commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ void CMD_GotoDesk(F_CMD_ARGS);
void CMD_GotoDeskAndPage(F_CMD_ARGS);
void CMD_GotoPage(F_CMD_ARGS);
void CMD_HideGeometryWindow(F_CMD_ARGS);
void CMD_HilightColor(F_CMD_ARGS);
void CMD_HilightColorset(F_CMD_ARGS);
void CMD_IconFont(F_CMD_ARGS);
void CMD_Iconify(F_CMD_ARGS);
Expand Down
2 changes: 0 additions & 2 deletions fvwm/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,8 +2338,6 @@ void HandleEnterNotify(const evh_args_t *ea)
int p = HandlePaging(
&e, edge_scroll, &junk, &delta,
True, True, False, Scr.ScrollDelay);
fvwm_debug(__func__, "handled paging for %s (%d)",
m->si->name, p);
somiaj marked this conversation as resolved.
Show resolved Hide resolved
return;
}
}
Expand Down
3 changes: 0 additions & 3 deletions fvwm/functable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,6 @@ const func_t func_table[] =
F_HIDEGEOMWINDOW, 0, 0),
/* - (obsolete, use GeometryWindow Hide instead) */

CMD_ENT("hilightcolor", CMD_HilightColor, F_HICOLOR, 0, 0),
/* - (obsolete, use Style * HighlightFore/Back) */

CMD_ENT("hilightcolorset", CMD_HilightColorset, F_HICOLORSET, 0, 0),
/* - (obsolete, use Style * HighlightColorset) */

Expand Down
2 changes: 0 additions & 2 deletions fvwm/fvwm3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,8 +1321,6 @@ static void SetRCDefaults(void)
{ "DefaultFont", "", "" },
{ DEFAULT_MENU_STYLE, "", "" },
{ "TitleStyle Centered -- Raised", "", "" },
{ "Style * Color lightgrey/dimgrey", "", "" },
{ "Style * HilightFore black, HilightBack grey", "", "" },
{ "AddToFunc LoadDefaultConfig", "", "" },
{ "+ I Read "FVWM_DATADIR"/default-config/config", "", "" },
{ "+ I StartFunction", "", "" },
Expand Down
7 changes: 1 addition & 6 deletions fvwm/virtual.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,12 +733,9 @@ int HandlePaging(
int mwidth, mheight;
int edge_thickness = m->virtual_scr.edge_thickness;

fvwm_debug(__func__, "ET (%s) is: %d", m->si->name, edge_thickness);

somiaj marked this conversation as resolved.
Show resolved Hide resolved
mwidth = monitor_get_all_widths();
mheight = monitor_get_all_heights();


delta->x = 0;
delta->y = 0;
if (!is_timestamp_valid && do_continue_previous)
Expand Down Expand Up @@ -1317,7 +1314,6 @@ void initPanFrames(struct monitor *ref)
}

/* Free panframes here for all monitors. */
fvwm_debug(__func__, "freeing panframes");
somiaj marked this conversation as resolved.
Show resolved Hide resolved
TAILQ_FOREACH(m, &monitor_q, entry) {
if (ref != NULL && m != ref)
continue;
Expand Down Expand Up @@ -1362,7 +1358,6 @@ void initPanFrames(struct monitor *ref)
checkPanFrames(m);
}
ref->virtual_scr.edge_thickness = saved_thickness;
fvwm_debug(__func__, "finished setting up per-monitor panframes");
somiaj marked this conversation as resolved.
Show resolved Hide resolved
}

Bool is_pan_frame(Window w)
Expand Down Expand Up @@ -3151,4 +3146,4 @@ void CMD_DesktopName(F_CMD_ARGS)

TAILQ_FOREACH(m, &monitor_q, entry)
apply_desktops_monitor(m);
}
}
Loading