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

…-4-BRANCH
Code7R · Dec 28, 2023 · 467f07b · 467f07b
2 parents b921aae + 7c432f9
commit 467f07b
Show file tree

Hide file tree

Showing 75 changed files with 4,261 additions and 4,137 deletions.
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -55,6 +55,8 @@ nobase_dist_pkgdata_DATA = \
 	icons/gnome_16x16.xpm \
 	icons/help_16x16.xpm \
 	icons/help_32x32.xpm \
+	icons/hibernate_16x16.xpm \
+	icons/hibernate_32x32.xpm \
 	icons/icewm_16x16.png \
 	icons/icewm_32x32.png \
 	icons/java_16x16.xpm \

diff --git a/lib/icons/hibernate_16x16.xpm b/lib/icons/hibernate_16x16.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char *hibernate_16x16_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 22 1 ",
+"  c None",
+". c #00369C",
+"X c #00369D",
+"o c #00379D",
+"O c #043A9F",
+"+ c #093FA3",
+"@ c #093FA4",
+"# c #0A40A4",
+"$ c #0C42A5",
+"% c #1C50B0",
+"& c #2B5EBB",
+"* c #2F61BE",
+"= c #3A6BC5",
+"- c #4A79D1",
+"; c #4C7BD2",
+": c #4D7BD2",
+"> c #4D7CD3",
+", c #5381D7",
+"< c #5684D9",
+"1 c #5785D9",
+"2 c #5785DA",
+"3 c #5885DA",
+/* pixels */
+"       <<       ",
+"       <<       ",
+"    <  <<  <    ",
+"   <<  <<  <<   ",
+"  <<<  <<  <<<  ",
+"  <<<  <<  <<<  ",
+" <<<   <,   >>; ",
+" <<3   =%   @@# ",
+" <-*   +X   XXX ",
+" &$X        XXX ",
+"  XXX      XXX  ",
+"  XXXX    XXXX  ",
+"   XXXXXXXXXX   ",
+"    XXXXXXXX    ",
+"      XXXX      ",
+"                "
+};
diff --git a/lib/icons/hibernate_32x32.xpm b/lib/icons/hibernate_32x32.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * hibernate_32x32_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #5684D9",
+"+	c #00379D",
+"              ....              ",
+"              ....              ",
+"              ....              ",
+"              ....              ",
+"        ..    ....    ..        ",
+"        ..    ....    ..        ",
+"      ....    ....    ....      ",
+"      ....    ....    ....      ",
+"    ......    ....    ......    ",
+"    ......    ....    ......    ",
+"    ......    ....    ......    ",
+"    ......    ....    ......    ",
+"  ......      ....      ......  ",
+"  ......      ....      ......  ",
+"  ......      ...+      ++++++  ",
+"  ......      .+++      ++++++  ",
+"  ......      ++++      ++++++  ",
+"  ....++      ++++      ++++++  ",
+"  ..++++                ++++++  ",
+"  ++++++                ++++++  ",
+"    ++++++            ++++++    ",
+"    ++++++            ++++++    ",
+"    ++++++++        ++++++++    ",
+"    ++++++++        ++++++++    ",
+"      ++++++++++++++++++++      ",
+"      ++++++++++++++++++++      ",
+"        ++++++++++++++++        ",
+"        ++++++++++++++++        ",
+"            ++++++++            ",
+"            ++++++++            ",
+"                                ",
+"                                "};
diff --git a/man/icewm-preferences.pod b/man/icewm-preferences.pod
@@ -1036,21 +1036,21 @@ Command to start logout.
 
 Command to cancel logout.
 
-=item B<ShutdownCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl poweroff || loginctl poweroff; } ||:""
+=item B<ShutdownCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl poweroff || loginctl poweroff; }""
 
 Command to shutdown the system.
 
-=item B<RebootCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl reboot || loginctl reboot; } ||:""
+=item B<RebootCommand>="/bin/sh -c "{ test -e /run/systemd/system && systemctl reboot || loginctl reboot; }""
 
 Command to reboot the system.
 
 =item B<SuspendCommand>="test -e /run/systemd/system && systemctl suspend || loginctl suspend"
 
-Command to hibernate the system.
+Command to send the system to standby mode
 
-=item B<SuspendCommand>="test -e /run/systemd/system && systemctl suspend || loginctl suspend"
+=item B<SuspendCommand>="test -e /run/systemd/system && systemctl hibernate || loginctl hibernate"
 
-Command to send the system to standby mode
+Command to hibernate the system.
 
 =item B<CPUStatusCommand>="xterm -name top -title Process\ Status -e top"