Skip to content

Commit

Permalink
Prefer 'that' over 'which' when restrictive.
Browse files Browse the repository at this point in the history
  • Loading branch information
gijsbers committed Aug 19, 2023
1 parent 7fbd3db commit 2c8244e
Show file tree
Hide file tree
Showing 15 changed files with 78 additions and 81 deletions.
42 changes: 21 additions & 21 deletions man/icesh.pod
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ B<icesh> provides two types of commands:
These are listed in the section "MANAGER ACTIONS" below.
They are easy to use, because they don't require to select one
or more windows. For example, C<icesh restart> will restart
icewm and C<icesh clients> lists the applications which
icewm and C<icesh clients> lists the applications that
are managed by icewm.

=item 2. Commands which operate on a selection of windows:
=item 2. Commands that operate on a selection of windows:

See the section C<WINDOW ACTIONS> below. For example, C<icesh close>
is a request to close a window, but which window? Now icesh
Expand All @@ -47,13 +47,13 @@ This selection of windows can be reduced by C<FILTER OPTIONS>.
These remove unwanted windows from the current selection.
Multiple filter options can be given. For example,
C<icesh -c xterm -W this close> will close only those xterms
which are shown on the current workspace. The xterms on other
that are shown on the current workspace. The xterms on other
workspaces are filtered out by the C<-W this> filter option.

=back

There is no limit to the number of commands, selections, filters
and actions which you can give to a single icesh command.
and actions that you can give to a single icesh command.
They are processed and evaluated one by one from left to right.
This makes icesh a small declarative programming language.
Have a look at some examples near the end of this document.
Expand All @@ -80,14 +80,14 @@ Selects all client windows of the window manager.

=item B<-f>, B<-focus>, B<+f>, B<+focus>

Selects the application window which is currently focused.
Selects the application window that is currently focused.
The option with minus sign replaces the existing selection with
the focused window. With a plus sign the focused window is added to
an existing selection.

=item B<+g>, B<+group>

Extend the current selection with client windows which
Extend the current selection with client windows that
belong to the same application window group.

=item B<-r>, B<-root>, B<+r>, B<+root>
Expand All @@ -99,12 +99,12 @@ an existing selection.

=item B<-s>, B<-shown>

Selects all client windows which are on the current workspace.
Selects all client windows that are on the current workspace.

=item B<-t>, B<-top>

Selects all toplevel windows from the display unconditionally.
This includes windows which have never been mapped and windows
This includes windows that have never been mapped and windows
with the override redirect bit set to evade management.

=item B<-w>, B<-window>, B<+w>, B<+window> I<WINDOW_ID>
Expand All @@ -117,7 +117,7 @@ With a plus sign the window is added to an existing selection.

=item B<-x>, B<-xembed>

Selects all windows which are embedded using the I<XEMBED> protocol.
Selects all windows that are embedded using the I<XEMBED> protocol.

=item B<+c>, B<+class> I<CLASS>

Expand All @@ -136,7 +136,7 @@ selected set of windows.

=item B<-D>, B<-Dockapps>

Selects all Dockapp applications which are managed by icewm.
Selects all Dockapp applications that are managed by icewm.

=item B<+P>, B<+Pid>

Expand Down Expand Up @@ -188,12 +188,12 @@ to I<PID> are selected.

=item B<-u>, B<-unmapped>

Filter clients and keep those which are currently not viewable.
Filter clients and keep those that are currently not viewable.
These are hidden, minimized, rolled-up, or on another workspace.

=item B<-v>, B<-viewable>

Filter clients and keep only those which are currently viewable.
Filter clients and keep only those that are currently viewable.
These clients are mapped on the current workspace.

=item B<-G>, B<-Gravity> I<GRAVITY>
Expand All @@ -211,7 +211,7 @@ an exclamation mark then the filtering is inverted.

=item B<-N>, B<-Netstate> I<STATE>

Filters clients by I<EWMH window state>. Clients which have at
Filters clients by I<EWMH window state>. Clients that have at
least an EWMH window state of I<STATE> are selected. This state
refers to details like B<MINIZED> or B<MAXIMIZED>. See EXPRESSIONS
below. If I<STATE> starts with an exclamation mark then the filtering
Expand All @@ -220,15 +220,15 @@ in I<STATE>.

=item B<-P>, B<-Property> I<PROP[=value]>

Filters clients by property. Clients which have a property I<PROP>
Filters clients by property. Clients that have a property I<PROP>
are selected. If the optional I<value> is given, the match succeeds
only if I<PROP> is a string, window, cardinal, or atom, with a value
equal to I<value>. The filtering is inverted if I<PROP> starts with
an exclamation mark.

=item B<-R>, B<-Role> I<ROLE>

Filters clients by WM_WINDOW_ROLE. Clients which have a WM_WINDOW_ROLE
Filters clients by WM_WINDOW_ROLE. Clients that have a WM_WINDOW_ROLE
property value equal to I<ROLE> are selected. The filtering is inverted
if I<ROLE> starts with an exclamation mark.

Expand All @@ -243,7 +243,7 @@ inverted.
=item B<-X>, B<-Xinerama> I<MONITOR>

Limit clients by I<RandR>/I<Xinerama> monitor. Only operate on
clients which are displayed on I<MONITOR>, where I<MONITOR> can
clients that are displayed on I<MONITOR>, where I<MONITOR> can
be C<All> for all monitors, C<this> for the monitor where the
active window is displayed, or a monitor number starting from zero.
See the output of C<randr> or C<xinerama> below.
Expand Down Expand Up @@ -603,7 +603,7 @@ is given, then disable or enable the override redirect status.

=item B<tabto> I<label>

Move the windows as tabs to a frame which has C<frame> label I<label>.
Move the windows as tabs to a frame that has C<frame> label I<label>.
Such a frame is created if needed.

=item B<untab>
Expand Down Expand Up @@ -726,11 +726,11 @@ List all toplevel windows, their titles and geometries.

=item B<systray>

List applications which are managed by the IceWM system tray.
List applications that are managed by the IceWM system tray.

=item B<xembed>

List application windows which are embedded using the I<XEMBED> protocol.
List application windows that are embedded using the I<XEMBED> protocol.
This is another way to discover system tray applications.

=item B<logout>
Expand Down Expand Up @@ -985,8 +985,8 @@ Here is a different solution using conditionals.

icesh -f if -P _NET_FRAME_EXTENTS=0 then bordered else borderless

Here is a conditional to either toggle the visibility of a roxterm,
which has a WM_ROLE value of C<special>, or start it with B<runonce>.
Here is a conditional to either toggle the visibility of a roxterm
that has a WM_ROLE value of C<special> or start it with B<runonce>.

icesh if -c roxterm.Roxterm -R special then \
if -v then hide \
Expand Down
5 changes: 2 additions & 3 deletions man/icesound.pod
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ B<icesound> [I<OPTIONS>]
The L<icewm(1)> window manager generates so-called GUI events in
response to interesting actions, like opening or closing of application
windows, switching of workspace, etc. GUI events are a property of the
X root window. L<icewm(1)> changes this property whenever a new GUI
X root window. L<icewm(1)> updates this property whenever a new GUI
event occurs. Interested applications can listen for changes to this
property. There are nearly twenty GUI events defined.

B<icesound> is an application, which is one of the L<icewm(1)>
applications, which responds to these GUI events by playing audio files.
B<icesound> responds to these GUI events by playing audio files.
These sound files are F<.wav> files located in a F<sounds> sub-directory
in one of the L<icewm(1)> configuration directories.

Expand Down
2 changes: 1 addition & 1 deletion man/icewm-env.pod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ to all other processes, including L<icewm(1)>, via their environment.

Each line is subjected to POSIX shell expansion by L<wordexp(3)>.
Comment lines starting by a hash-sign (C<#>) are ignored.
L<icewm-session(1)> will load those expanded lines which contain a name,
L<icewm-session(1)> will load those expanded lines that contain a name,
followed by an equals sign, followed by the value (which may be empty).

The word B<unset> begins a line with names to be removed from the
Expand Down
4 changes: 2 additions & 2 deletions man/icewm-menu-xrandr.pod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ B<icewm-menu-xrandr>
=head2 DESCRIPTION

B<icewm-menu-xrandr> is a helper to manage multi-screen configurations
in a semi-automated way. It is a regular icewm menu generator which dynamically
in a semi-automated way. It is a regular icewm menu generator that
detects the available xrandr screens (i.e. connected monitors) and
creates menu entries that call the xrandr command to setup this
configuration.
Expand Down Expand Up @@ -51,7 +51,7 @@ creation.

=item B<--xrandr command>

Replacement for I<xrandr> command which should deliver equivalent data
Replacement for I<xrandr> command that should deliver equivalent data
and accept the same options as I<xrandr>.

=item B<--activate combo-name>
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-menu.pod
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ These are literal string keywords.

=item [B<">]I<title>[B<">]

This is the I<title> string associated with the menu item which is
This is the I<title> string associated with the menu item that is
displayed in the menu. When the I<title> contains spaces, the title
must be surrounded by double quotes (C<>).

Expand Down
16 changes: 8 additions & 8 deletions man/icewm-preferences.pod
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
=head2 DESCRIPTION

Contains general settings like paths, colors and fonts, but also options
to control the B<icewm> focus behaviour and the applets which are
to control the B<icewm> focus behaviour and the applets that are
started in the task bar. The B<icewm> installation will provide a
default F<preferences> file, which can be copied to the B<icewm> user
default F<preferences> file, that can be copied to the B<icewm> user
configuration directory and modified.

=head2 FORMAT
Expand Down Expand Up @@ -54,7 +54,7 @@ Splash image on startup (IceWM.jpg)
=item B<Trace>=""

Enable tracing for the given list of modules.
Modules which are traceable include B<conf, font, icon, prog, systray>.
Modules that are traceable include B<conf, font, icon, prog, systray>.

=item B<ClickToFocus>=1

Expand Down Expand Up @@ -159,7 +159,7 @@ Turning this off allows the titlebar to cover the width of the screen.

=item B<CenterMaximizedWindows>=0

Center maximized windows which can't fit the screen (like terminals).
Center maximized windows that can't fit the screen (like terminals).

=item B<HideBordersMaximized>=0

Expand Down Expand Up @@ -567,7 +567,7 @@ Place workspace pager on top row when using dual-height taskbar.

=item B<TaskBarWorkspacesLimit>=""

Limit the number of taskbar workspaces buttons which are shown on the
Limit the number of taskbar workspaces buttons that are shown on the
workspaces pane of the taskbar. If the numeric value has a C<p> suffix
then the limitation is in pixels. A C<%> suffix limits by percentage of
desktop width. By default a C<B> suffix is assumed for number of buttons.
Expand Down Expand Up @@ -659,15 +659,15 @@ or C<%40> for the at sign. For example:

=item B<NetworkStatusDevice>="eth0 wlan0"

Network device for which to show status.
Network devices for which to show status.

=item B<TimeFormat>="%X"

The clock time format. See the strftime manpage for the meaning of all
the percent options. It is possible to define multiple clocks for
different time zones in a single I<TimeFormat>. A new clock is defined
by the beginning of the string, and by each time zone specification
which starts with C<TZ=...>, followed by a space. For example,
that starts with C<TZ=...>, followed by a space. For example,
B<TimeFormat>=C<%X TZ=Asia/Aden %T TZ=Asia/Baku %T> defines 3 clocks.

=item B<TimeFormatAlt>=""
Expand Down Expand Up @@ -729,7 +729,7 @@ Primary screen for xinerama (taskbar, ...).
A comma-separated list of keyboard layouts.
A layout may be enclosed in double quotes.
Each layout is a name with optional arguments,
which is to be parsed by the C<setxkbmap> program.
that is to be parsed by the C<setxkbmap> program.
To support changing keyboard layouts, the
C<setxkbmap> program must be installed.
The first in the list is the default layout.
Expand Down
4 changes: 2 additions & 2 deletions man/icewm-prefoverride.pod
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

=head2 DESCRIPTION

Settings which override the settings from a theme. Some of the B<icewm>
configuration options from the preferences file which control the
Settings that override the settings from a theme. Some of the B<icewm>
configuration options from the preferences file that control the
look-and-feel may be overridden by the theme, if the theme designer
thinks this is desirable. However, this F<prefoverride> file will again
override this for a few specific options of your choosing. It is safe
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-programs.pod
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ These are literal string keywords.

=item [B<">]I<title>[B<">]

This is the I<title> string associated with the menu item which is
This is the I<title> string associated with the menu item that is
displayed in the menu. When the I<title> contains spaces, the title
must be surrounded by double quotes (C<">), although the I<title> may
always be surrounded by double quotes if preferred.
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-session.pod
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ starting a terminal, or abort execution of icewm-session.

=item B<ICEWM_OPTIONS>

A space separated list of options which will be added to the command
A space separated list of options that will be added to the command
line invocation of F<icewm>. This can be set in the F<env> file.

=back
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-set-gnomewm.pod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ B<icewm-set-gnomewm> [I<OPTIONS>]

=head2 DESCRIPTION

B<icewm-set-gnomewm> is a helper script which instruments GNOME to
B<icewm-set-gnomewm> is a helper script that instruments GNOME to
replace its own WM with icewm.

=head2 OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-startup.pod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

The F<startup> file contains commands to be executed on B<icewm> startup.
This is an executable script. Typically the commands tweak X11 settings
and launch some applications which always need to be active.
and launch some applications that always need to be active.
It is run by L<icewm-session(1)> when B<icewm> starts.

=head2 EXAMPLES
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-toolbar.pod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ After one or more spaces follows a name, which is displayed in a tool
tip whenever the mouse cursor hovers over the toolbar icon. This name
may be a double quoted string. Then follows the bare name of the icon
to use without extensions. This icon will be shown in the toolbar. The
last component is a shell command line which will be executed whenever
last component is a shell command line that will be executed whenever
the user presses the icon in the toolbar. For example, the following
line in toolbar will create a button with tool tip C<Mozilla Firefox>
with the F<firefox> icon which launches L<firefox(1)> when clicked:
Expand Down
2 changes: 1 addition & 1 deletion man/icewm-winoptions.pod
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ input focus to I<Chrome> pop-ups and asks to close them immediately.
google-chrome.pop-up.startMinimized: 1

IceWM places dockapps in a container automatically, but for those
which fail to comply with the protocol it can also be emulated.
that fail to comply with the protocol it can also be emulated.
An emulated dockapp should appear on all workspaces, have
no decorations, and always be visible in a fixed location.

Expand Down
Loading

0 comments on commit 2c8244e

Please sign in to comment.