Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into icewm-1-4-BRANCH

Author: gijsbers

man/icesh.pod

@@ -663,6 +663,76 @@ Sort the list of windows from topmost to bottom-most.
 
 Reverse the order of the list of windows.
 
+=item B<switchmenu>
+
+Output the list as a menu for icewm's QuickSwitch. This action is to be
+used in a B<switchkey> directive in the C<keys> file.
+
+=item B<print> I<format>
+
+For each window in the selection, print a line according to I<format>.
+Here common backslash-escapes are recognized as well as the following
+percent formatting options:
+
+=over
+
+=item B<%>
+
+A literal percent sign.
+
+=item B<h>
+
+The window height.
+
+=item B<w>
+
+The window width.
+
+=item B<x>
+
+The window x-position.
+
+=item B<y>
+
+The window y-position.
+
+=item B<g>
+
+The window geometry.
+
+=item B<i>
+
+The window identifying handle.
+
+=item B<o>
+
+An icon name.
+
+=item B<p>
+
+The process-ID of the window application.
+
+=item B<c>
+
+The WM_CLASS property of the window.
+
+=item B<m>
+
+The WM_CLIENT_MACHINE property of the window.
+
+=item B<t>
+
+The window title.
+
+=item B<W>
+
+The current workspace of the window.
+
+=back
+
+Each percent format option may start with a minus sign for
+left-alignment and have a numeric field width.
+
 =back
 
 =head2 MANAGER ACTIONS

man/icewm-keys.pod

@@ -143,6 +143,9 @@ Following is the example F<keys> file that ships with L<icewm(1)>:
     # display and select monitor setup configurations
     switchkey "Super+p" icewm-menu-xrandr
 
+    # display and select from all terminals
+    switchkey "Super+q"     icesh -Z switchmenu
+
 Following shows how to add mouse button bindings on the root window to
 change the current workspace rolling the mouse wheel on the desktop:
 

man/icewm-menu.pod

@@ -15,59 +15,60 @@
 =head2 DESCRIPTION
 
 The F<menu> file is responsible for configuring most of the L<icewm(1)>
-root menu and start menu.
+root menu and the start menu.
 
-A menu of applications; usually customized by the user.  B<icewm>
-provides the L<icewm-menu-fdo(1)> program to generate a default menu.
-Similar programs are L<xdg_menu(1)>, L<mmaker(1)> (MenuMaker),
-L<xde-menu(1)>, L<xdgmenumaker(1)>.
+A menu that gives access to applications; usually customized by the user.
+The L<icewm-menu-fdo(1)> program generates a default menu
+that contains most of the systems desktop applications.
+Similar programs are L<xdg_menu(1)>, L<mmaker(1)>,
+L<xde-menu(1)> and L<xdgmenumaker(1)>.
 
 =head2 FORMAT
 
 The file contains lines with the following syntax:
 
 =over
 
-=item B<prog> [B<">]I<title>[B<">] I<icon> I<program> I<options>
+=item B<prog> B<">I<title>B<"> I<icon> I<program> I<options>
 
 Specifies a program to execute when the menu item is selected.
 
-=item B<restart> [B<">]I<title>[B<">] I<icon> I<program> I<options>
+=item B<restart> B<">I<title>B<"> I<icon> I<program> I<options>
 
 Specifies a program to replace the window manager when the menu item is
 selected.  This is for launching other window managers from within
 L<icewm(1)>.
 
-=item B<runonce> [B<">]I<title>[B<">] I<icon> B<">[I<name>][B<.>I<class>]B<"> I<program> I<options>
+=item B<runonce> B<">I<title>B<"> I<icon> B<">[I<name>][B<.>I<class>]B<"> I<program> I<options>
 
 Specifies a program to execute when the menu item is selected; however,
 if a window of the specified I<name> and I<class> is present,
 the program will not be run again.
 
-=item B<menu> [B<">]I<title>[B<">] I<icon> B<{>
+=item B<menu> B<">I<title>B<"> I<icon> B<{>
  # contained items
  B<}>
 
 Specifies a sub-menu.  The lines that appear between the braces can be
 any menu item described here.
 
-=item B<menufile> [B<">]I<title>[B<">] I<icon> [B<">]I<filename>[B<">]
+=item B<menufile> B<">I<title>B<"> I<icon> B<">I<filename>B<">
 
 Specifies a file from which to collect sub-menu items (lines) and place
 them at this point in the menu.
 
-=item B<menuprog> [B<">]I<title>[B<">] I<icon> I<program> I<options>
+=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,
 which will be collected and placed in the sub-menu at this point.
 
-=item B<menuprogreload> [B<">]I<title>[B<">] I<icon> I<timeout>
+=item B<menuprogreload> B<">I<title>B<"> I<icon> I<timeout>
 I<program> I<options>
 
 Similar to B<menuprog>, but after at least I<timeout> seconds
 the menu is regenerated.
 
-=item B<include> [B<">]I<filename>[B<">]
+=item B<include> B<">I<filename>B<">
 
 Read additional entries from the file I<filename>
 
@@ -90,7 +91,7 @@ B<menuprog>, B<menuprogreload>, B<include>, B<includeprog>, B<separator>
 
 These are literal string keywords.
 
-=item [B<">]I<title>[B<">]
+=item B<">I<title>B<">
 
 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

man/icewm-programs.pod

@@ -25,46 +25,46 @@ The format of the file contains one of the following line syntax:
 
 =over
 
-=item B<prog> [B<">]I<title>[B<">] I<icon> I<program> I<options>
+=item B<prog> B<">I<title>B<"> I<icon> I<program> I<options>
 
 Specifies a program to execute when the menu item is selected.
 
-=item B<restart> [B<">]I<title>[B<">] I<icon> I<program> I<options>
+=item B<restart> B<">I<title>B<"> I<icon> I<program> I<options>
 
 Specifies a program to replace the window manager when the menu item is
 selected.  This is for launching other window managers from within
 L<icewm(1)>.
 
-=item B<runonce> [B<">]I<title>[B<">] I<icon> B<">[I<name>][B<.>I<class>]B<"> I<program> I<options>
+=item B<runonce> B<">I<title>B<"> I<icon> B<">[I<name>][B<.>I<class>]B<"> I<program> I<options>
 
 Specifies a program to execute when the menu item is selected; however,
 if a window of the specified I<name> and I<class> is present,
 the program will not be run again.
 
-=item B<menu> [B<">]I<title>[B<">] I<icon> B<{>
+=item B<menu> B<">I<title>B<"> I<icon> B<{>
  # contained items
  B<}>
 
 Specifies a sub-menu.  The lines that appear between the braces can be
 any menu item described here.
 
-=item B<menufile> [B<">]I<title>[B<">] I<icon> [B<">]I<filename>[B<">]
+=item B<menufile> B<">I<title>B<"> I<icon> B<">I<filename>B<">
 
 Specifies a file from which to collect sub-menu items (lines) and place
 them at this point in the menu.
 
-=item B<menuprog> [B<">]I<title>[B<">] I<icon> I<program> I<options>
+=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.
 
-=item B<menuprogreload> [B<">]I<title>[B<">] I<icon> I<timeout>
+=item B<menuprogreload> B<">I<title>B<"> I<icon> I<timeout>
 I<program> I<options>
 
 Similar to B<menuprog>, but after at least I<timeout> seconds
 the menu is regenerated.
 
-=item B<include> [B<">]I<filename>[B<">]
+=item B<include> B<">I<filename>B<">
 
 Read additional entries from the file I<filename>
 
@@ -87,12 +87,11 @@ B<menuprog>, B<menuprogreload>, B<include>, B<includeprog>, B<separator>
 
 These are literal string keywords.
 
-=item [B<">]I<title>[B<">]
+=item B<">I<title>B<">
 
 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.
+must be surrounded by double quotes (C<">).
 
 =item I<icon>
 
@@ -109,7 +108,8 @@ B<runonce> keyword.
 
 =item I<program> I<options>
 
-I<program> is the name of the executable or full path to the executable file that will
+I<program> is the name of the executable or full path to the executable
+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.

man/icewm-winoptions.pod

@@ -187,20 +187,20 @@ Feature options enable/disable (1/0) additional features of the window.
 The normal default for all options is disabled (0) unless overridden by
 the application:
 
-  allWorkspaces:            {1|0}  on all workspaces.
-  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.
+  allWorkspaces:            {1|0}  show it on all workspaces.
+  appTakesFocus:            {1|0}  let the application take focus.
+  doNotCover:               {1|0}  don't place other windows over it.
+  doNotFocus:               {1|0}  do not give it focus.
+  doNotManage:              {1|0}  do not manage at all.
   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.
   ignorePagerPreview:       {1|0}  do not show in pager preview.
   ignorePositionHint:       {1|0}  always let icewm place the window.
-  ignoreQuickSwitch:        {1|0}  not on quick switch.
-  ignoreTaskBar:            {1|0}  not on task bar.
+  ignoreQuickSwitch:        {1|0}  not on the quick switch.
+  ignoreTaskBar:            {1|0}  not on the task bar.
   ignoreUrgentHint:         {1|0}  ignore urgent hints.
-  ignoreWinList:            {1|0}  not on window list.
+  ignoreWinList:            {1|0}  not on the window list.
   ignoreActivationMessages: {1|0}  only user can focus window.
   ignoreOverrideRedirect:   {1|0}  ignore the override redirect flag.
   noFocusOnAppRaise:        {1|0}  no automatic focus on raise.

man/icewm.pod

@@ -257,13 +257,15 @@ that is running on the current workspace, or all workspaces if
 C<TaskBarShowAllWindows=1>.  Each task button shows the
 application icon and the application title.  The active application is
 indicated by a pressed button.  This is the application that has input
-focus.  Pressing another button activates that application: it is
-brought to the foreground and receives input focus.  Other mouse
-controlled activities on the window buttons are: dragging window buttons
-with the left mouse button to rearrange the order, closing the application
-window with C<Alt> + middle button, lowering the application window with
-C<Ctrl> + middle button, or bringing the application window to the current
-workspace with C<Shift> + middle button if C<TaskBarShowAllWindows=1>.
+focus.  Clicking another button activates that application: it is
+brought to the foreground and receives input focus.  Clicking the button
+of an active application minimizes it.  To minimize an inactive application,
+click its button while C<Ctrl> is down.
+
+The window buttons can be dragged with the left mouse button to rearrange
+their order. A window can be closed with C<Alt> + middle button, lowered
+with C<Ctrl> + middle button, or brought to the current workspace with
+C<Shift> + middle button when C<TaskBarShowAllWindows=1>.
 
 If there are not many application buttons then a stretch of plain task
 bar is visible.  Clicking on it with the right mouse button gives the
@@ -433,6 +435,12 @@ or above most others. Icewm menus appear in the I<Menu> layer and the
 I<Fullscreen> layer is reserved for windows in the fullscreen mode. The
 default layer for each application can be set with a I<winoption>.
 
+Windows placed in the I<Dock> layer can be set to be always visible by
+setting the C<LimitByDockLayer> preference to 1. Then other windows are
+preferably not placed over such windows, unless they have explicit
+positioning information to do so. Maximized windows also don't overlap
+with these I<DockLayer> windows. The I<DoNotCover> winoption is similar.
+
 =head2 DOCKED APPLICATIONS
 
 Icewm has native support for L<Window Maker dockapps|https://dockapps.net>.

src/atasks.cc

@@ -748,7 +748,9 @@ void TaskButton::handleButton(const XButtonEvent& button) {
         if (button.button == Button1 && selected == 2 && fActive) {
             if (fMenu) {
             }
-            else if (getFrame()->focused() && getFrame()->visibleNow() &&
+            else if (getFrame()->visibleNow() && (getFrame()->focused() ||
+                    (getFrame()->isFullscreen() && taskBarFullscreenAutoShow)) &&
+                     getFrame()->canMinimize() && !getFrame()->isMinimized() &&
                 (!getFrame()->canRaise(true) || (button.state & ControlMask)))
             {
                 getFrame()->wmMinimize();

src/base.h

@@ -114,6 +114,7 @@ char *newstr(char const *str, int len);
 char *newstr(char const *str, char const *delim);
 char *cstrJoin(char const *str, ...);
 
+void foldspaces(char* str);
 char* demangle(const char* str);
 unsigned long strhash(const char* str);
 

src/decorate.cc

@@ -58,9 +58,6 @@ void YFrameWindow::updateMenu() {
     windowMenu->checkCommand(actionHide, isHidden());
     windowMenu->checkCommand(actionRollup, isRollup());
     windowMenu->checkCommand(actionOccupyAllOrCurrent, isAllWorkspaces());
-#if DO_NOT_COVER_OLD
-    windowMenu->checkCommand(actionDoNotCover, doNotCover());
-#endif
     updateSubmenus();
 }