Thread: [Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[298] fvwm/components/scripts

FVWM-Crystal aims to create an easy to use and powerful desktop.

Status: Beta

Brought to you by: dominique_libre, harnir

fvwm-crystal-commits

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[298] fvwm/components/scripts

From: <dom...@us...> - 2013-04-25 12:55:56

Revision: 298
          http://sourceforge.net/p/fvwm-crystal/code/298
Author:   dominique_libre
Date:     2013-04-25 12:55:47 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
components/scripts/FvwmScript-CpuTemp: updated to work with /sys

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-CpuTemp

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-04-25 11:32:42 UTC (rev 297)
+++ ChangeLog	2013-04-25 12:55:47 UTC (rev 298)
@@ -8,6 +8,7 @@
   Makefile: added bin/fvwm-crystal.videomodeswicth* installation;
   installation of the Session and desktop file.
   recipes/Default with ACPI: fixed forgotten infostore variable
+  components/scripts/FvwmScript-CpuTemp: updated to work with /sys
 
 Mercredi 24 Avril 2013 Dominique Michel
   functions/Icon-Launcher: cleanup; fix icon style to work with Icon-Thumbnails

Modified: fvwm/components/scripts/FvwmScript-CpuTemp
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuTemp	2013-04-25 11:32:42 UTC (rev 297)
+++ fvwm/components/scripts/FvwmScript-CpuTemp	2013-04-25 12:55:47 UTC (rev 298)
@@ -10,7 +10,7 @@
 Init
 Begin
   Set $temp_prev = 1
-  Set $temp = (GetOutput {cat /proc/acpi/thermal_zone/TH*/temperature} 1 2)
+  Set $temp = (GetOutput {sed 's:...$::' </sys/class/hwmon/hwmon0/temp1_input} 1 1)
   Set $tmp = $temp °C
   ChangeTitle 1 $tmp
 End
@@ -19,7 +19,7 @@
 Begin 
  If (RemainderOfDiv (GetTime) 2)==0 Then
  Begin
-  Set $temp = (GetOutput {cat /proc/acpi/thermal_zone/TH*/temperature} 1 2) 
+  Set $temp = (GetOutput {sed 's:...$::' </sys/class/hwmon/hwmon0/temp1_input} 1 1) 
   Set $tmp = $temp °C
 
   If $temp==$temp_prev Then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[603] fvwm/components/scripts

From: <dom...@us...> - 2014-02-15 11:32:35

Revision: 603
          http://sourceforge.net/p/fvwm-crystal/code/603
Author:   dominique_libre
Date:     2014-02-15 11:32:33 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
scripts/FvwmScript-AcpiBatt: changed the checks from /proc to /sys; patch from Debian

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-AcpiBatt

Modified: ChangeLog
===================================================================
--- ChangeLog	2014-02-15 11:28:05 UTC (rev 602)
+++ ChangeLog	2014-02-15 11:32:33 UTC (rev 603)
@@ -3,6 +3,8 @@
 Samedi 15 février 2015 Dominique Michel
   recipes/Default with ACPI: fix for height and scripts colorset on the
   bottom bar; fix for warning with IconMan-Icons.
+  scripts/FvwmScript-AcpiBatt: changed the checks from /proc to /sys; patch
+  from Debian.
 
 Vendredi 14 février 2014 Dominique Michel
   scripts/launch: Increased delay to bring Xephyr in fullscreen.

Modified: fvwm/components/scripts/FvwmScript-AcpiBatt
===================================================================
--- fvwm/components/scripts/FvwmScript-AcpiBatt	2014-02-15 11:28:05 UTC (rev 602)
+++ fvwm/components/scripts/FvwmScript-AcpiBatt	2014-02-15 11:32:33 UTC (rev 603)
@@ -9,15 +9,15 @@
 
 Init
 Begin
-  Set $last = (GetOutput {cat /proc/acpi/battery/BAT?/info} 3 4)
-  Set $remaining = (GetOutput {cat /proc/acpi/battery/BAT?/state} 5 3)
-  Set $acstate = (GetOutput {cat /proc/acpi/ac_adapter/AC*/state} 1 2)
-  Set $batt = (Mult 100 $remaining)
-  Set $batt = (Div $batt $last)
+  Set $last = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_full} 1 -1)
+  Set $remaining = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_now} 1 -1)
+  Set $acstate = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/status} 1 -1)
+  Set $batt = (Div $last 100)
+  Set $batt = (Div $remaining $batt)
   Set $batt = $batt %
   Set $batt_prev = -1
 
-  If $acstate==off-line Then
+  If $acstate==Discharging Then
     Set $batt = * $batt 
   ChangeTitle 1 $batt
 End
@@ -33,12 +33,12 @@
    Else
    Begin
 
-    Set $last = (GetOutput {cat /proc/acpi/battery/BAT?/info} 3 4)
-    Set $remaining = (GetOutput {cat /proc/acpi/battery/BAT?/state} 5 3)
-    Set $batt = (Mult 100 $remaining)
-    Set $batt = (Div $batt $last)
+    Set $last = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_full} 1 -1)
+    Set $remaining = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_now} 1 -1)
+    Set $batt = (Div $last 100)
+    Set $batt = (Div $remaining $batt)
     Set $batt_prev = $batt
-    Set $acstate = (GetOutput {cat /proc/acpi/ac_adapter/AC*/state} 1 2)
+    Set $acstate = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/status} 1 -1)
 
     If $batt>99 Then
       ChangeColorset 1 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[709] fvwm/components/scripts

From: <dom...@us...> - 2015-09-24 14:23:03

Revision: 709
          http://sourceforge.net/p/fvwm-crystal/code/709
Author:   dominique_libre
Date:     2015-09-24 14:23:00 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
components/scripts/FvwmScrpt-AcpiBatt: use the new way to get the ACPI battery status, thanks to Jorge Sampayo

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-AcpiBatt

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-09-24 13:54:25 UTC (rev 708)
+++ ChangeLog	2015-09-24 14:23:00 UTC (rev 709)
@@ -3,6 +3,10 @@
 Version 3.4.0
 -------------
 
+Jeudi 24 septembre 2015
+  components/scripts/FvwmScrpt-AcpiBatt: use the new way to get the ACPI battery status,
+  thanks to Jorge Sampayo.
+
 Mercredi 23 septembre 2015
   functions/Fullscreen: Automatic full screened applications:
   add a delay for Firefox, needed because Firefox think it now better than the

Modified: fvwm/components/scripts/FvwmScript-AcpiBatt
===================================================================
--- fvwm/components/scripts/FvwmScript-AcpiBatt	2015-09-24 13:54:25 UTC (rev 708)
+++ fvwm/components/scripts/FvwmScript-AcpiBatt	2015-09-24 14:23:00 UTC (rev 709)
@@ -1,6 +1,9 @@
 #
 # LiNiO <li...@wo...> - 2005.01.15
 # 2005.08.12 - je¶li warto¶æ siê nie zmieni³a, nie wy¶wietla jej ponownie - usuniêcie efektu "migotania"
+# 2015.09.23 - Jorge Sampayo (jds...@gm...), change the function to
+# the new way to get the acpi battery status:
+# http://askubuntu.com/questions/69556/how-to-check-battery-status-using-terminal
 
 WindowTitle {FvwmScript-AcpiBatt}
 WindowSize 48 24
@@ -9,13 +12,11 @@
 
 Init
 Begin
-  Set $last = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_full} 1 -1)
-  Set $remaining = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_now} 1 -1)
-  Set $acstate = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/status} 1 -1)
-  Set $batt = (Div $last 100)
-  Set $batt = (Div $remaining $batt)
+  Set $acstate = (GetOutput {cat /sys/class/power_supply/BAT0/status} 1 -1)
+  Set $batt = (GetOutput {cat /sys/class/power_supply/BAT0/capacity} 1 -1)
+
+  Set $batt_prev = -1
   Set $batt = $batt %
-  Set $batt_prev = -1
 
   If $acstate==Discharging Then
     Set $batt = * $batt 
@@ -23,7 +24,7 @@
 End
 
 PeriodicTasks
-Begin 
+Begin
  If (RemainderOfDiv (GetTime) 30)==0 Then
  Begin
    If $batt==$batt_prev Then
@@ -32,13 +33,9 @@
    End
    Else
    Begin
-
-    Set $last = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_full} 1 -1)
-    Set $remaining = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/energy_now} 1 -1)
-    Set $batt = (Div $last 100)
-    Set $batt = (Div $remaining $batt)
+    Set $batt = (GetOutput {cat /sys/class/power_supply/BAT0/capacity} 1 -1)
+    Set $acstate = (GetOutput {cat /sys/class/power_supply/BAT0/status} 1 -1)
     Set $batt_prev = $batt
-    Set $acstate = (GetOutput {cat /sys/bus/acpi/drivers/battery/*/power_supply/BAT*/status} 1 -1)
 
     If $batt>99 Then
       ChangeColorset 1 1
@@ -55,7 +52,7 @@
           If $batt>24 Then
             ChangeForeColor 1 {#FF8800}
           Else
-  	  Begin
+	    Begin
             If $batt>12 Then
               ChangeForeColor 1 {#FF4400}
             Else
@@ -64,15 +61,14 @@
           End
         End
       End
-    
+
       Set $batt = $batt %
 
-      If $acstate==off-line Then
-        Set $batt = * $batt 
+      If $acstate==Discharging Then
+        Set $batt = * $batt
 
       ChangeTitle 1 $batt
     End
-
   End
 End
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[720] fvwm/components/scripts

From: <dom...@us...> - 2015-10-02 15:16:05

Revision: 720
          http://sourceforge.net/p/fvwm-crystal/code/720
Author:   dominique_libre
Date:     2015-10-02 15:16:03 +0000 (Fri, 02 Oct 2015)
Log Message:
-----------
Use the new colorsets instead of static colors into the fvwm script applets

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-AcpiBatt
    fvwm/components/scripts/FvwmScript-Clock
    fvwm/components/scripts/FvwmScript-Clock-24h
    fvwm/components/scripts/FvwmScript-Clock-24h-small_date
    fvwm/components/scripts/FvwmScript-Clock-small
    fvwm/components/scripts/FvwmScript-Clock-small_date
    fvwm/components/scripts/FvwmScript-CpuFreq
    fvwm/components/scripts/FvwmScript-CpuFreq-small
    fvwm/components/scripts/FvwmScript-CpuTemp

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-10-02 13:20:57 UTC (rev 719)
+++ ChangeLog	2015-10-02 15:16:03 UTC (rev 720)
@@ -5,6 +5,7 @@
 
 Vendredi 2 octobre 2015
   colorsets/RedDesktop.cs: typo fix
+  scripts/FvwmScript-*: Use the new colorsets instead of static colors.
 
 Jeudi 1 octobre 2015
   functions/Fullscreen: Auto FS: add condition to not put if full screen the transient windows.

Modified: fvwm/components/scripts/FvwmScript-AcpiBatt
===================================================================
--- fvwm/components/scripts/FvwmScript-AcpiBatt	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-AcpiBatt	2015-10-02 15:16:03 UTC (rev 720)
@@ -4,7 +4,11 @@
 # 2015.09.23 - Jorge Sampayo (jds...@gm...), change the function to
 # the new way to get the acpi battery status:
 # http://askubuntu.com/questions/69556/how-to-check-battery-status-using-terminal
+#
+# o 2015.10.02 - Use new colorsets instead of statically changing the colors
+#   Dominique Michel <dom...@gm...>
 
+
 WindowTitle {FvwmScript-AcpiBatt}
 WindowSize 48 24
 Font "xft:Tahoma:pixelsize=12:Bold"
@@ -43,25 +47,25 @@
     Else
       Begin
       If $batt>74 Then
-        # dark blue
+        # dark blue #0000ff
         ChangeColorset 1 13
       Else
         Begin
         If $batt>49 Then
-          # greeen
+          # green #00ff00
           ChangeColorset 1 14
         Else
           Begin
           If $batt>24 Then
-            # yellow
+            # yellow #ffff00
             ChangeColorset 1 15
           Else
 	    Begin
             If $batt>12 Then
-              # orange
+              # orange #ff4400
               ChangeColorset 1 16
             Else
-              # red
+              # red #ff0000
               ChangeColorset 1 17
             End
           End
@@ -92,3 +96,4 @@
  Begin
  End
 End
+

Modified: fvwm/components/scripts/FvwmScript-Clock
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-Clock	2015-10-02 15:16:03 UTC (rev 720)
@@ -6,11 +6,15 @@
 #   12h clock and 24h clock. Initially, the clock will be set according
 #   to the current locale
 #   Michael Stilkerich <ms...@mi...> - 2006.05.16
+#
+# o 2015.10.02 - Use same colorset than the AcpiBatt applet
+#   Dominique Michel <dom...@gm...>
 
+
 WindowTitle {FvwmScript-Clock}
 WindowSize  60 22
 Font "xft:Verdana:pixelsize=15:Bold"
-Colorset 1
+Colorset 12
 
 Init
 Begin
@@ -62,7 +66,7 @@
  Type ItemDraw
  Flags NoReliefString
  Title {}
- Colorset 1
+ Colorset 12
 Main
  Case message of
   SingleClic :
@@ -113,3 +117,4 @@
     ChangeTitle  1 $tmp
   End
 End
+

Modified: fvwm/components/scripts/FvwmScript-Clock-24h
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-Clock-24h	2015-10-02 15:16:03 UTC (rev 720)
@@ -8,7 +8,7 @@
 WindowTitle {FvwmScript-Clock}
 WindowSize  60 22
 Font		"xft:Tahoma:pixelsize=16:Bold"
-Colorset 1
+Colorset 12
 
 Init
  Begin
@@ -44,7 +44,7 @@
  Type ItemDraw
  Flags NoReliefString
  Title {}
- Colorset 1
+ Colorset 12
 Main
  Case message of
   SingleClic :
@@ -64,3 +64,4 @@
     ChangeTitle  1 $tmp
   End
 End
+

Modified: fvwm/components/scripts/FvwmScript-Clock-24h-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h-small_date	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-Clock-24h-small_date	2015-10-02 15:16:03 UTC (rev 720)
@@ -3,7 +3,7 @@
 WindowTitle {FvwmScript-Clock}
 WindowSize  114 20
 Font		"xft:Tahoma:pixelsize=12:Bold"
-Colorset 1
+Colorset 12
 
 Init
  Begin
@@ -37,10 +37,11 @@
  Type ItemDraw
  Flags NoReliefString
  Title {}
- Colorset 1
+ Colorset 12
 Main
  Case message of
   SingleClic :
   Begin
   End
 End
+

Modified: fvwm/components/scripts/FvwmScript-Clock-small
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-Clock-small	2015-10-02 15:16:03 UTC (rev 720)
@@ -6,11 +6,14 @@
 #   12h clock and 24h clock. Initially, the clock will be set according
 #   to the current locale
 #   Michael Stilkerich <ms...@mi...> - 2006.05.16
+#
+# o 2015.10.02 - Use same colorset than the AcpiBatt applet
+#   Dominique Michel <dom...@gm...>
 
 WindowTitle {FvwmScript-Clock}
 WindowSize  60 22
 Font "xft:Verdana:pixelsize=11:Bold"
-Colorset 1
+Colorset 12
 
 Init
 Begin
@@ -62,7 +65,7 @@
  Type ItemDraw
  Flags NoReliefString
  Title {}
- Colorset 1
+ Colorset 12
 Main
  Case message of
   SingleClic :
@@ -113,3 +116,4 @@
     ChangeTitle  1 $tmp
   End
 End
+

Modified: fvwm/components/scripts/FvwmScript-Clock-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small_date	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-Clock-small_date	2015-10-02 15:16:03 UTC (rev 720)
@@ -1,7 +1,7 @@
 WindowTitle {FvwmScript-Clock-small_date}
 WindowSize  114 20
 Font		"xft:Verdana:pixelsize=12:Bold"
-Colorset 1
+Colorset 12
 
 Init
  Begin
@@ -32,7 +32,7 @@
  Type ItemDraw
  Flags NoReliefString
  Title {}
- Colorset 1
+ Colorset 12
 Main
  Case message of
   SingleClic :
@@ -50,3 +50,4 @@
   ChangeTitle  1 (GetOutput $timecmd 1 -1)
   End
 End
+

Modified: fvwm/components/scripts/FvwmScript-CpuFreq
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuFreq	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-CpuFreq	2015-10-02 15:16:03 UTC (rev 720)
@@ -6,11 +6,14 @@
 # 2006.05.15 - fall back to /proc/cpuinfo which is present on every linux
 #         system in case cpufreq is not available
 #         Michael Stilkerich <ms...@mi...>
+#
+# o 2015.10.02 - Use same colorset than the AcpiBatt applet
+#   Dominique Michel <dom...@gm...>
 
 WindowTitle {FvwmScript-CpuFreq}
 WindowSize 72 24
 Font "xft:Tahoma:pixelsize=12:Bold"
-Colorset 1
+Colorset 12
 
 Init
 Begin
@@ -70,25 +73,25 @@
     End
   
     If $freqp>74 Then
-      ChangeForeColor 1 {#FF0000}
+      ChangeColorset 1 17
     Else
     Begin
       If $freqp>43 Then
-        ChangeForeColor 1 {#FF4400}
+        ChangeColorset 1 16
       Else
       Begin
         If $freqp>22 Then
-          ChangeForeColor 1 {#FF8800}
+          ChangeColorset 1 15
         Else
         Begin
           If $freqp>11 Then
-            ChangeForeColor 1 {#FFBB00}
+            ChangeColorset 1 14
           Else
           Begin
             If $freqp>1 Then
-              ChangeForeColor 1 {#FFFF00}
-            Else
-              ChangeColorset 1 1
+              ChangeColorset 1 13
+	    Else
+              ChangeColorset 1 12
           End
         End
       End
@@ -105,7 +108,7 @@
 Type ItemDraw
 Flags NoReliefString
 Title {}
-Colorset 1
+Colorset 12
 Main
 Case message of
  SingleClic :

Modified: fvwm/components/scripts/FvwmScript-CpuFreq-small
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuFreq-small	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-CpuFreq-small	2015-10-02 15:16:03 UTC (rev 720)
@@ -7,11 +7,14 @@
 # 2006.05.15 - fall back to /proc/cpuinfo which is present on every linux
 #         system in case cpufreq is not available
 #         Michael Stilkerich <ms...@mi...>
+#
+# o 2015.10.02 - Use same colorset than the AcpiBatt applet
+#   Dominique Michel <dom...@gm...>
 
 WindowTitle {FvwmScript-CpuFreq}
 WindowSize 60 24
 Font "xft:Tahoma:pixelsize=10:Bold"
-Colorset 1
+Colorset 12
 
 Init
 Begin
@@ -71,25 +74,25 @@
     End
   
     If $freqp>74 Then
-      ChangeForeColor 1 {#FF0000}
+      ChangeColorset 1 17
     Else
     Begin
       If $freqp>43 Then
-        ChangeForeColor 1 {#FF4400}
+        ChangeColorset 1 16
       Else
       Begin
         If $freqp>22 Then
-          ChangeForeColor 1 {#FF8800}
+          ChangeColorset 1 15
         Else
         Begin
           If $freqp>11 Then
-            ChangeForeColor 1 {#FFBB00}
+            ChangeColorset 1 14
           Else
           Begin
             If $freqp>1 Then
-              ChangeForeColor 1 {#FFFF00}
+              ChangeColorset 1 13
             Else
-              ChangeColorset 1 1
+              ChangeColorset 1 12
           End
         End
       End
@@ -106,7 +109,7 @@
 Type ItemDraw
 Flags NoReliefString
 Title {}
-Colorset 1
+Colorset 12
 Main
 Case message of
  SingleClic :

Modified: fvwm/components/scripts/FvwmScript-CpuTemp
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuTemp	2015-10-02 13:20:57 UTC (rev 719)
+++ fvwm/components/scripts/FvwmScript-CpuTemp	2015-10-02 15:16:03 UTC (rev 720)
@@ -1,11 +1,14 @@
 #
 # LiNiO <li...@wo...> - 2005.01.15
 # 2005.08.12 - je¶li warto¶æ siê nie zmieni³a, nie wy¶wietla jej ponownie - usuniêcie efektu "migotania"
+#
+# o 2015.10.02 - Use same colorset than the AcpiBatt applet
+#   Dominique Michel <dom...@gm...>
 
 WindowTitle {FvwmScript-CpuTemp}
 WindowSize 48 24
 Font "xft:Tahoma:pixelsize=12:Bold"
-Colorset 1
+Colorset 12
 
 Init
 Begin
@@ -30,25 +33,25 @@
   Begin
 
     If $temp>89 Then
-      ChangeForeColor 1 {#FF0000}
+      ChangeColorset 1 17
     Else
       Begin
       If $temp>79 Then
-        ChangeForeColor 1 {#FF4400}
+        ChangeColorset 1 16
       Else
         Begin
         If $temp>69 Then
-          ChangeForeColor 1 {#FF8800}
+          ChangeColorset 1 15
         Else
           Begin
           If $temp>59 Then
-            ChangeForeColor 1 {#FFBB00}
+            ChangeColorset 1 14
           Else
   	  Begin
             If $temp>49 Then
-              ChangeForeColor 1 {#FFFF00}
+              ChangeColorset 1 13
             Else
-              ChangeColorset 1 1
+              ChangeColorset 1 12
             End
           End
         End
@@ -67,7 +70,7 @@
 Type ItemDraw
 Flags NoReliefString
 Title {}
-Colorset 1
+Colorset 12
 Main
 Case message of
  SingleClic :

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[721] fvwm/components/scripts

From: <dom...@us...> - 2015-10-02 15:22:36

Revision: 721
          http://sourceforge.net/p/fvwm-crystal/code/721
Author:   dominique_libre
Date:     2015-10-02 15:22:34 +0000 (Fri, 02 Oct 2015)
Log Message:
-----------
components/scripts/FvwmScript-Clock-24h*, FvwmScript-Clock-small_date: remove outdated files

Modified Paths:
--------------
    ChangeLog

Removed Paths:
-------------
    fvwm/components/scripts/FvwmScript-Clock-24h
    fvwm/components/scripts/FvwmScript-Clock-24h-small_date
    fvwm/components/scripts/FvwmScript-Clock-small_date

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-10-02 15:16:03 UTC (rev 720)
+++ ChangeLog	2015-10-02 15:22:34 UTC (rev 721)
@@ -6,6 +6,7 @@
 Vendredi 2 octobre 2015
   colorsets/RedDesktop.cs: typo fix
   scripts/FvwmScript-*: Use the new colorsets instead of static colors.
+- components/scripts/FvwmScript-Clock-24h*, FvwmScript-Clock-small_date: removed outdated files.
 
 Jeudi 1 octobre 2015
   functions/Fullscreen: Auto FS: add condition to not put if full screen the transient windows.

Deleted: fvwm/components/scripts/FvwmScript-Clock-24h
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h	2015-10-02 15:16:03 UTC (rev 720)
+++ fvwm/components/scripts/FvwmScript-Clock-24h	2015-10-02 15:22:34 UTC (rev 721)
@@ -1,67 +0,0 @@
-# This script is obsolete, will be removed in FVWM-Crystal 3.0.5
-#
-# o Support for temporary switch for display date/time after click on widget
-#   LiNiO <li...@wo...> - 2005.01.16
-#
-
-
-WindowTitle {FvwmScript-Clock}
-WindowSize  60 22
-Font		"xft:Tahoma:pixelsize=16:Bold"
-Colorset 12
-
-Init
- Begin
-   Set $display= time
-
-# 24-hour clock
-  Set $tmp = (GetOutput {exec date "+%R"} 1 -1)
-# 12-hour clock
-#  Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
-
-  ChangeTitle 1 $tmp
-End
-
-PeriodicTasks
- Begin 
-  If (RemainderOfDiv (GetTime) 60)==0 Then
-  Begin
-
-# 24 hour clock
-    Set $tmp = (GetOutput {exec date "+%R"} 1 -1)
-# 12-hour clock
-#    Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
-
-    ChangeFont 1 {xft:Tahoma:pixelsize=16:Bold}
-    ChangeTitle  1 $tmp
-  End
-End
-
-Widget 1
-Property
- Position 0 -3
- Size 60 22
- Type ItemDraw
- Flags NoReliefString
- Title {}
- Colorset 12
-Main
- Case message of
-  SingleClic :
-  Begin
-    If $display=={time} Then
-    Begin
-      Set $display= date
-      ChangeFont 1 {xft:Tahoma:pixelsize=16:Bold}
-      Set $tmp = (GetOutput {exec date "+%d/%m"} 1 -1)
-    End
-    Else
-    Begin
-      Set $display= time
-      ChangeFont 1 {xft:Tahoma:pixelsize=16:Bold}
-      Set $tmp = (GetOutput {exec date "+%R"} 1 -1)
-    End
-    ChangeTitle  1 $tmp
-  End
-End
-

Deleted: fvwm/components/scripts/FvwmScript-Clock-24h-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h-small_date	2015-10-02 15:16:03 UTC (rev 720)
+++ fvwm/components/scripts/FvwmScript-Clock-24h-small_date	2015-10-02 15:22:34 UTC (rev 721)
@@ -1,47 +0,0 @@
-# This script is obsolete, will be removed in FVWM-Crystal 3.0.5
-
-WindowTitle {FvwmScript-Clock}
-WindowSize  114 20
-Font		"xft:Tahoma:pixelsize=12:Bold"
-Colorset 12
-
-Init
- Begin
-
-# 24-hour clock
-  Set $tmp = (GetOutput {exec date "+%a %e, %R"} 1 -1)
-# 12-hour clock
-#  Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
-
-  ChangeTitle 1 $tmp
-End
-
-PeriodicTasks
- Begin 
-  If (RemainderOfDiv (GetTime) 60)==0 Then
-  Begin
-
-# 24 hour clock
-    Set $tmp = (GetOutput {exec date "+%a %e, %R"} 1 -1)
-# 12-hour clock
-#    Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
-
-    ChangeTitle  1 $tmp
-  End
-End
-
-Widget 1
-Property
- Position 0 -3
- Size 114 20
- Type ItemDraw
- Flags NoReliefString
- Title {}
- Colorset 12
-Main
- Case message of
-  SingleClic :
-  Begin
-  End
-End
-

Deleted: fvwm/components/scripts/FvwmScript-Clock-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small_date	2015-10-02 15:16:03 UTC (rev 720)
+++ fvwm/components/scripts/FvwmScript-Clock-small_date	2015-10-02 15:22:34 UTC (rev 721)
@@ -1,53 +0,0 @@
-WindowTitle {FvwmScript-Clock-small_date}
-WindowSize  114 20
-Font		"xft:Verdana:pixelsize=12:Bold"
-Colorset 12
-
-Init
- Begin
-  If (GetOutput {date "+%p"} 1 -1)=={} Then
-  Begin
-    Set $mode={24}
-    Set $timecmd={date "+%a %e, %R"}
-  End
-  Else
-  Begin
-    Set $mode={12}
-    Set $timecmd={LC_TIME=C date "+%a %e, %I:%M %p"}
-  End
-
-  ChangeTitle 1 (GetOutput $timecmd 1 -1)
-End
-
-PeriodicTasks
- Begin 
-  If (RemainderOfDiv (GetTime) 60)==0 Then
-    ChangeTitle  1 (GetOutput $timecmd 1 -1)
-End
-
-Widget 1
-Property
- Position 0 -3
- Size 114 20
- Type ItemDraw
- Flags NoReliefString
- Title {}
- Colorset 12
-Main
- Case message of
-  SingleClic :
-  Begin
-  If $mode=={24} Then
-  Begin
-    Set $mode={12}
-    Set $timecmd={LC_TIME=C date "+%a %e, %I:%M %p"}
-  End
-  Else
-  Begin
-    Set $mode={24}
-    Set $timecmd={date "+%a %e, %R"}
-  End
-  ChangeTitle  1 (GetOutput $timecmd 1 -1)
-  End
-End
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1048] fvwm/components/scripts

From: <dom...@us...> - 2020-11-29 22:39:31

Revision: 1048
          http://sourceforge.net/p/fvwm-crystal/code/1048
Author:   dominique_libre
Date:     2020-11-29 22:39:25 +0000 (Sun, 29 Nov 2020)
Log Message:
-----------
FvwmScript-CpuTemp: fix temperature reading path

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-CpuTemp

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-10-07 00:02:29 UTC (rev 1047)
+++ ChangeLog	2020-11-29 22:39:25 UTC (rev 1048)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+dimanche 29 novembre 2020
+  fvwm/components/scripts/FvwmScript-CpuTemp: fix temperature reading path.
+
 Version 3.6.7
 -------------
 

Modified: fvwm/components/scripts/FvwmScript-CpuTemp
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuTemp	2020-10-07 00:02:29 UTC (rev 1047)
+++ fvwm/components/scripts/FvwmScript-CpuTemp	2020-11-29 22:39:25 UTC (rev 1048)
@@ -15,7 +15,7 @@
 Init
 Begin
   Set $temp_prev = 1
-  Set $temp = (GetOutput {sed 's:...$::' </sys/class/hwmon/hwmon0/temp1_input} 1 1)
+  Set $temp = (GetOutput {for i in /sys/class/hwmon/hwmon*/temp1_input; do sed 's:...$::' <$i; break; done} 1 1)
   Set $degree = (Gettext {°C})
   Set $tmp = $temp $degree
   ChangeTitle 1 $tmp
@@ -25,7 +25,7 @@
 Begin 
  If (RemainderOfDiv (GetTime) 2)==0 Then
  Begin
-  Set $temp = (GetOutput {sed 's:...$::' </sys/class/hwmon/hwmon0/temp1_input} 1 1) 
+  Set $temp = (GetOutput {for i in /sys/class/hwmon/hwmon*/temp1_input; do sed 's:...$::' <$i; break; done} 1 1) 
   Set $degree = (Gettext {°C})
   Set $tmp = $temp $degree
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[851] fvwm/components/scripts

From: <dom...@us...> - 2016-01-05 15:16:49

Revision: 851
          http://sourceforge.net/p/fvwm-crystal/code/851
Author:   dominique_libre
Date:     2016-01-05 15:16:46 +0000 (Tue, 05 Jan 2016)
Log Message:
-----------
reverted commit 721

Modified Paths:
--------------
    ChangeLog

Added Paths:
-----------
    fvwm/components/scripts/FvwmScript-Clock-24h
    fvwm/components/scripts/FvwmScript-Clock-24h-small_date
    fvwm/components/scripts/FvwmScript-Clock-small_date

Modified: ChangeLog
===================================================================
--- ChangeLog	2016-01-02 13:19:03 UTC (rev 850)
+++ ChangeLog	2016-01-05 15:16:46 UTC (rev 851)
@@ -1,5 +1,12 @@
 ChangeLog for FVWM-Crystal
 
+Version 3.4.1
+-------------
+
+mardi 5 janvier 2016
++ components/scripts/FvwmScript-Clock-24h, FvwmScript-Clock-24h-small_date, FvwmScript-Clock-small_date:
+  reverted commit 721
+
 Version 3.4.0
 -------------
 

Added: fvwm/components/scripts/FvwmScript-Clock-24h
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h	                        (rev 0)
+++ fvwm/components/scripts/FvwmScript-Clock-24h	2016-01-05 15:16:46 UTC (rev 851)
@@ -0,0 +1,64 @@
+# o Support for temporary switch for display date/time after click on widget
+#   LiNiO <li...@wo...> - 2005.01.16
+#
+
+
+WindowTitle {FvwmScript-Clock}
+WindowSize  60 22
+Font		"xft:Tahoma:pixelsize=16:Bold"
+Colorset 12
+
+Init
+ Begin
+   Set $display= time
+
+# 24-hour clock
+  Set $tmp = (GetOutput {exec date "+%R"} 1 -1)
+# 12-hour clock
+#  Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
+
+  ChangeTitle 1 $tmp
+End
+
+PeriodicTasks
+ Begin 
+  If (RemainderOfDiv (GetTime) 60)==0 Then
+  Begin
+
+# 24 hour clock
+    Set $tmp = (GetOutput {exec date "+%R"} 1 -1)
+# 12-hour clock
+#    Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
+
+    ChangeFont 1 {xft:Tahoma:pixelsize=16:Bold}
+    ChangeTitle  1 $tmp
+  End
+End
+
+Widget 1
+Property
+ Position 0 -3
+ Size 60 22
+ Type ItemDraw
+ Flags NoReliefString
+ Title {}
+ Colorset 12
+Main
+ Case message of
+  SingleClic :
+  Begin
+    If $display=={time} Then
+    Begin
+      Set $display= date
+      ChangeFont 1 {xft:Tahoma:pixelsize=16:Bold}
+      Set $tmp = (GetOutput {exec date "+%d/%m"} 1 -1)
+    End
+    Else
+    Begin
+      Set $display= time
+      ChangeFont 1 {xft:Tahoma:pixelsize=16:Bold}
+      Set $tmp = (GetOutput {exec date "+%R"} 1 -1)
+    End
+    ChangeTitle  1 $tmp
+  End
+End

Added: fvwm/components/scripts/FvwmScript-Clock-24h-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h-small_date	                        (rev 0)
+++ fvwm/components/scripts/FvwmScript-Clock-24h-small_date	2016-01-05 15:16:46 UTC (rev 851)
@@ -0,0 +1,44 @@
+WindowTitle {FvwmScript-Clock}
+WindowSize  114 20
+Font		"xft:Tahoma:pixelsize=12:Bold"
+Colorset 12
+
+Init
+ Begin
+
+# 24-hour clock
+  Set $tmp = (GetOutput {exec date "+%a %e, %R"} 1 -1)
+# 12-hour clock
+#  Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
+
+  ChangeTitle 1 $tmp
+End
+
+PeriodicTasks
+ Begin 
+  If (RemainderOfDiv (GetTime) 60)==0 Then
+  Begin
+
+# 24 hour clock
+    Set $tmp = (GetOutput {exec date "+%a %e, %R"} 1 -1)
+# 12-hour clock
+#    Set $tmp = (GetOutput {exec date "+%I:%M"} 1 -1)
+
+    ChangeTitle  1 $tmp
+  End
+End
+
+Widget 1
+Property
+ Position 0 -3
+ Size 114 20
+ Type ItemDraw
+ Flags NoReliefString
+ Title {}
+ Colorset 12
+Main
+ Case message of
+  SingleClic :
+  Begin
+  End
+End

Added: fvwm/components/scripts/FvwmScript-Clock-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small_date	                        (rev 0)
+++ fvwm/components/scripts/FvwmScript-Clock-small_date	2016-01-05 15:16:46 UTC (rev 851)
@@ -0,0 +1,52 @@
+WindowTitle {FvwmScript-Clock-small_date}
+WindowSize  114 20
+Font		"xft:Verdana:pixelsize=12:Bold"
+Colorset 12
+
+Init
+ Begin
+  If (GetOutput {date "+%p"} 1 -1)=={} Then
+  Begin
+    Set $mode={24}
+    Set $timecmd={date "+%a %e, %R"}
+  End
+  Else
+  Begin
+    Set $mode={12}
+    Set $timecmd={LC_TIME=C date "+%a %e, %I:%M %p"}
+  End
+
+  ChangeTitle 1 (GetOutput $timecmd 1 -1)
+End
+
+PeriodicTasks
+ Begin 
+  If (RemainderOfDiv (GetTime) 60)==0 Then
+    ChangeTitle  1 (GetOutput $timecmd 1 -1)
+End
+
+Widget 1
+Property
+ Position 0 -3
+ Size 114 20
+ Type ItemDraw
+ Flags NoReliefString
+ Title {}
+ Colorset 12
+Main
+ Case message of
+  SingleClic :
+  Begin
+  If $mode=={24} Then
+  Begin
+    Set $mode={12}
+    Set $timecmd={LC_TIME=C date "+%a %e, %I:%M %p"}
+  End
+  Else
+  Begin
+    Set $mode={24}
+    Set $timecmd={date "+%a %e, %R"}
+  End
+  ChangeTitle  1 (GetOutput $timecmd 1 -1)
+  End
+End

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.