Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into icewm-1…
Browse files Browse the repository at this point in the history
…-4-BRANCH
  • Loading branch information
gijsbers committed May 20, 2024
2 parents 803f822 + 32a5fc4 commit 1fb1513
Show file tree
Hide file tree
Showing 90 changed files with 6,308 additions and 5,560 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[icewm -- read me first file. 2022-11-02]: #
[icewm -- read me first file. 2024-03-25]: #

Ice Window Manager (IceWM)
==========================
Expand All @@ -19,7 +19,7 @@ list, and various other GitHub forks.
Release
-------

This is the `icewm-3.2.0` package, released 2022-11-02. This release, and
This is the `icewm-3.4.7` package, released 2024-03-25. This release, and
the latest version, can be obtained from [GitHub][1], using a command such as:

$> git clone https://github.com/bbidulock/icewm.git
Expand Down Expand Up @@ -158,9 +158,9 @@ pull requests that get accepted, I will just give to push access to save time.
Translations
------------

You can provide translations by patching `.po` files and issuing pull requests,
or you can use the [openSUSE weblate tool][11]. There are two XDG files,
[icewm.desktop][17] and [icewm-session.desktop][18] than may need manual
You can provide translations by using the [openSUSE weblate tool][11].
There are two XDG files,
[icewm.desktop][17] and [icewm-session.desktop][18] which may need manual
translations. If you have difficulties using the tools, just send me the updated
`.po` file or a patch to apply.

Expand All @@ -175,22 +175,22 @@ translations. If you have difficulties using the tools, just send me the update
[8]: https://github.com/ice-wm/icewm/blob/master/BUGS
[9]: https://github.com/ice-wm/icewm/blob/master/COPYING
[10]: https://github.com/
[11]: https://l10n.opensuse.org/
[11]: https://l10n.opensuse.org/projects/icewm/icewm-1-4-branch/
[12]: https://sourceforge.net/projects/icewm/
[13]: https://ice-wm.org/
[14]: https://ice-wm.org/FAQ/
[15]: https://github.com/ice-wm/icewm/blob/master/doc/icewm.adoc
[15]: https://ice-wm.org/manual/
[16]: https://github.com/bbidulock/bbkeys/
[17]: https://github.com/ice-wm/icewm/blob/master/lib/icewm.desktop
[18]: https://github.com/ice-wm/icewm/blob/master/lib/icewm-session.desktop
[19]: https://github.com/ice-wm/icewm/blob/master/INSTALL-cmakebuild.md
[20]: https://github.com/ice-wm/xde-menu/
[21]: https://github.com/ice-wm/icewm/blob/master/man/icesound.pod
[22]: https://github.com/ice-wm/icewm/blob/master/man/icewmbg.pod
[23]: https://github.com/ice-wm/icewm/blob/master/man/icewmhint.pod
[24]: https://github.com/ice-wm/icewm/blob/master/man/icewm-menu-fdo.pod
[25]: https://github.com/ice-wm/icewm/blob/master/man/icesh.pod
[26]: https://github.com/ice-wm/icewm/blob/master/man/icewm.pod
[27]: https://github.com/ice-wm/icewm/blob/master/man/icewm-session.pod
[21]: https://ice-wm.org/man/icesound
[22]: https://ice-wm.org/man/icewmbg
[23]: https://ice-wm.org/man/icewmhint
[24]: https://ice-wm.org/man/icewm-menu-fdo
[25]: https://ice-wm.org/man/icesh
[26]: https://ice-wm.org/man/icewm
[27]: https://ice-wm.org/man/icewm-session

[ vim: set ft=markdown sw=4 tw=80 nocin nosi fo+=tcqlorn spell: ]: #
16 changes: 8 additions & 8 deletions README.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,18 @@ translations. If you have difficulties using the tools, just send me the update
[12]: https://sourceforge.net/projects/icewm/
[13]: https://ice-wm.org/
[14]: https://ice-wm.org/FAQ/
[15]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/doc/icewm.adoc
[15]: https://ice-wm.org/manual/
[16]: https://github.com/bbidulock/bbkeys/
[17]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/lib/icewm.desktop
[18]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/lib/icewm-session.desktop
[19]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/INSTALL-cmakebuild.md
[20]: https://github.com/bbidulock/xde-menu/
[21]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icesound.pod
[22]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icewmbg.pod
[23]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icewmhint.pod
[24]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icewm-menu-fdo.pod
[25]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icesh.pod
[26]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icewm.pod
[27]: https://github.com/ice-wm/@PACKAGE@/blob/@BRANCH@/man/icewm-session.pod
[21]: https://ice-wm.org/man/icesound
[22]: https://ice-wm.org/man/icewmbg
[23]: https://ice-wm.org/man/icewmhint
[24]: https://ice-wm.org/man/icewm-menu-fdo
[25]: https://ice-wm.org/man/icesh
[26]: https://ice-wm.org/man/icewm
[27]: https://ice-wm.org/man/icewm-session

[ vim: set ft=markdown sw=4 tw=80 nocin nosi fo+=tcqlorn spell: ]: #
5 changes: 3 additions & 2 deletions man/icesh.pod
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Minimize the window.

=item B<restore>

Restore the window to normal.
Restore the window to normal and clear urgency.

=item B<hide>

Expand Down Expand Up @@ -385,7 +385,7 @@ Show the window on just one workspace.

=item B<urgent>

Set the urgent flag to flash the task button.
Set the urgency flag to flash the task button.

=item B<resize> I<WIDTH> I<HEIGHT>

Expand Down Expand Up @@ -772,6 +772,7 @@ Let icewm execute the C<HibernateCommand>.
=item B<winoptions>

Let icewm reload the C<winoptions>.
This only affects new windows.

=item B<keys>

Expand Down
5 changes: 3 additions & 2 deletions man/icewm-menu-fdo.pod
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ B<glib2-dev> package dependency.

=head2 SEE ALSO

L<Desktop Entry Specification>,
L<Desktop Menu Specification>,
L<Base Directory Specification|https://www.freedesktop.org/wiki/Specifications/basedir-spec/>,
L<Desktop Entry Specification|https://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/>,
L<Desktop Menu Specification|https://www.freedesktop.org/wiki/Specifications/menu-spec/>,
L<icewm(1)>,
L<icewm-menu(5)>,
L<icewm-preferences(5)>,
Expand Down
101 changes: 80 additions & 21 deletions man/icewm.pod
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ it to search for configuration files.
B<icewm> will search all the configuration directories for theme files
and print a list of all found themes.

=item B<-i>, B<--install>=I<THEME>

Install I<THEME> from icewm-extra and exit. When I<THEME> is I<list>,
print a listing of available themes to install.

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

This gives a long list of all the internal B<icewm> options with their
Expand Down Expand Up @@ -516,19 +521,74 @@ also be changed by bringing the drag icon to the screen edge.

=head2 ADDRESS BAR

If B<EnableAddressBar>=1 then B<KeySysAddressBar>=C<Alt+Ctrl+Space>
activates the address bar in the task bar.
If B<ShowAddressBar>=1 it is always shown. This is a command-line in
the task bar where a shell command can be typed.
Pressing C<Enter> will execute the command.
B<AddressBarCommand>=C</bin/sh> will be used to execute the command.
On C<Control+Enter> the command is executed in a terminal
The task bar contains a command-line prompt called the address bar,
if B<EnableAddressBar>=1. It is always shown when B<ShowAddressBar>=1,
otherwise it is activated by B<KeySysAddressBar>=C<Alt+Ctrl+Space>.
In it a shell command can be typed, which is executed by the
B<AddressBarCommand>=C</bin/sh> when pressing C<Enter>.
On C<Control+Enter> this command is executed in a new terminal
as given by B<TerminalCommand>.
The address bar maintains a history that is navigable by the I<Up>
and I<Down> keys.
It supports command completion using C<Tab> or C<Ctrl+I>.
A rich set of editing operations is supported,
including cut-/copy-/paste-operations.

Commands are executed relative to the working directory of icewm.
This can be shown by executing C<pwd>. It can be changed using the C<cd>
command. Without argument it defaults to the home directory. With one
argument it is changed. This argument is expanded when it starts with a
dollar or tilde. When it is equal to C<->, it reverts to the previous
directory.

The address bar has a history that is navigable by I<Up> and I<Down>.
It supports file completion using C<Tab> or C<Ctrl+I>, cut/copy/paste
and these editing operations:

=over

=item Ctrl+a: select all

=item Ctrl+backslash: deselect all

=item Ctrl+u: delete selected or to line start

=item Ctrl+v: paste selected

=item Ctrl+w: delete selected or previous word

=item Ctrl+x: cut selection

=item Ctrl+c: copy selection

=item Ctrl+i: completion

=item Ctrl+Left: back a word

=item Ctrl+Right: forward a word

=item Ctrl+Shift+Backspace: delete to beginning

=item Ctrl+Shift+Delete: delete to end

=item Ctrl+Delete: delete word

=item Ctrl+Backspace: delete previous word

=item Shift+Delete: cut selection

=item Shift+Insert: paste selected

=item Tab: completion

=item Left: move cursor left

=item Right: move cursor right

=item Home: move cursor to line start

=item End: move cursor to line end

=item Delete: delete next character

=item Backspace: delete previous character

=back

=head2 WINDOW LIST

Expand Down Expand Up @@ -666,7 +726,7 @@ To control keyboard layouts on the task bar, define in F<preferences>
the option B<KeyboardLayouts> to a comma-separated list of your
preferred keyboard layouts. For example:

KeyboardLayouts="de","fr","jp"
KeyboardLayouts = "de", "fr", "jp"

A keyboard layout can simply be a name. Usually this is a two-letter
country code. See the directory F</usr/share/X11/xkb/symbols> for
Expand Down Expand Up @@ -1385,14 +1445,13 @@ in the XPM image is the sensitive point for the mouse pointer.

=item F<icons>

Contains icons that are used to identify applications. Usually these
files are in the XPM format, but the PNG and SVG image formats are also
supported. The names of icon files may follow a specific naming
pattern, like F<app_32x32.xpm>. They start with a base name, usually
this is just a single word. Then follows an underscore, followed by a
size specification in the format C<SIZExSIZE>. This is followed by a
dot and the file extension, where the extension denotes the icon image
format. Common sizes are 16, 32 and 48 for small, large and huge icons.
Contains icons for applications and keyboard layouts. These can be in
XPM, PNG or SVG format. The filename of an I<application icon> may
follow a specific naming pattern, like F<app_32x32.xpm>. They start
with a base name, which usually is just a single word. Then follows
an underscore, followed by a size specification, as in C<SIZExSIZE>.
This is followed by a dot and the file extension, where the extension
denotes the icon image format. Common sizes are 16, 32 and 48.
This depends on the respective C<IconSize> preferences options.

=item F<ledclock>
Expand Down
Loading

0 comments on commit 1fb1513

Please sign in to comment.