Skip to content

Commit

Permalink
Merge branch 'icewm-1-4-BRANCH'
Browse files Browse the repository at this point in the history
  • Loading branch information
gijsbers committed Oct 2, 2023
2 parents 8bd5d4d + bb673f5 commit 5fa4e90
Show file tree
Hide file tree
Showing 15 changed files with 293 additions and 158 deletions.
1 change: 1 addition & 0 deletions man/icesh.pod
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,7 @@ Let icewm refresh the desktop background.
=item B<guievents>

Monitor the B<ICEWM_GUI_EVENT> property and report all changes.
Hit C<Ctrl+C> to abort this and continue with the next command.

=item B<delay> [I<time>]

Expand Down
8 changes: 4 additions & 4 deletions man/icewm-menu.pod
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ L<xde-menu(1)>, L<xdgmenumaker(1)>.

=head2 FORMAT

The format of the file contains one of the following line syntax:
The file contains lines with the following syntax:

=over

Expand Down Expand Up @@ -58,8 +58,8 @@ them at this point in the menu.

=item B<menuprog> [B<">]I<title>[B<">] I<icon> I<program> I<options>

Specifies a program that will print sub-menu items on standard output
and will be collected and placed in the sub-menu at this point.
Specifies a program that will print sub-menu items on standard output,
which will be collected and placed in the sub-menu at this point.

=item B<menuprogreload> [B<">]I<title>[B<">] I<icon> I<timeout>
I<program> I<options>
Expand Down Expand Up @@ -116,7 +116,7 @@ file that will be run in response to selecting the menu item.
When used with the B<menuprog> keyword, the I<program> must print on
standard output the contents of the menu and is used for dynamic menus.

I<options> is the options and arguments passed to the I<program>
I<options> are the options and arguments passed to the I<program>
verbatim.

=item I<filename>
Expand Down
6 changes: 5 additions & 1 deletion man/icewm-preferences.pod
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,11 @@ Show windows from all workspaces on task bar.

=item B<TaskBarShowWindowIcons>=1

Show icons of windows on the task bar.
Show icons of windows on task buttons of the task bar.

=item B<TaskBarShowWindowTitles>=1

Show titles of windows on task buttons of the task bar.

=item B<TaskBarShowStartMenu>=1

Expand Down
1 change: 1 addition & 0 deletions man/icewm-winoptions.pod
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ the application:
appTakesFocus: {1|0} let application take focus.
doNotCover: {1|0} limits workspace if sticky.
doNotFocus: {1|0} do not focus.
doNotManage: {1|0} do not manage.
forcedClose: {1|0} no close confirmation dialog.
fullKeys: {1|0} don't install icewm key bindings.
ignoreNoFocusHint: {1|0} focus even when no-input is set.
Expand Down
23 changes: 17 additions & 6 deletions man/icewmbg.pod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

=head2 SYNOPSIS

B<icewmbg> [I<OPTIONS>]
B<icewmbg> [I<OPTIONS>] [I<ARGUMENTS>]

=head2 DESCRIPTION

Expand Down Expand Up @@ -36,7 +36,7 @@ conclude that it can safely exit after setting the desktop background,
to free its system memory. If the screen size changes, icewm will then
attempt to restart icewmbg, preferably via icewm-session.

=head2 OPTIONS
=head2 ARGUMENTS

=head2 SPECIFIC OPTIONS

Expand All @@ -52,6 +52,10 @@ or they may start with a tilde or environment variable.

=over

=item B<-f>, B<--fork>

Fork into the background and detach from the terminal.

=item B<-p>, B<--replace>

Replace an existing B<icewmbg>. If there is a running B<icewmbg>,
Expand Down Expand Up @@ -128,6 +132,10 @@ This overrules the C<CycleBackgroundsPeriod> preference.
Redirect all output to I<FILE>.
A leading tilde or environment variable is expanded.

=item B<--postpreferences>

Print a list of all preference values that B<icewmbg> will use.

=back

=head2 GENERAL OPTIONS
Expand Down Expand Up @@ -159,10 +167,13 @@ Use a slow synchronous mode to communicate with the I<X11> server.

Report on some of the activities.

=back

=head2 FILES

Additional arguments, which either are a path or which have an image
extension, are assumed to be background image files or directories.

=back

=head2 PREFERENCES

By default B<icewmbg> loads settings from the L<icewm(1)>
Expand Down Expand Up @@ -215,11 +226,11 @@ What happens for their combination is given by the following table:

# For four unique desktop backgrounds for four workspaces do:

icewmbg -p -i image0,image1,image2,image3 &
icewmbg -f -p -i image0,image1,image2,image3

# Or create a directory with the four images and do:

icewmbg -p -i /path/to/directory &
icewmbg -f -p -i /path/to/directory

# The images should have proper image filename extensions.

Expand Down
1 change: 1 addition & 0 deletions man/icewmhint.pod
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ advanced features are as follows:
appTakesFocus let application take focus.
doNotCover limits workspace if sticky.
doNotFocus do not focus.
doNotManage do not manage.
forcedClose no close dialog.
fullKeys provided more keys.
ignoreNoFocusHint focus even no-input.
Expand Down
Loading

0 comments on commit 5fa4e90

Please sign in to comment.