X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fx11%2Fwmmon%2Fdebian.patch;h=ace5ae8a5bd6bddf67550a2653809ec025dbb7d6;hp=7197c34468893c388efb5d374ff5007c35740087;hb=19813891fbe232c43c28c601baabc931cfb4d34e;hpb=1b91eff691e77e2e1308f7286717844a0bf8028b diff --git a/packages/x11/wmmon/debian.patch b/packages/x11/wmmon/debian.patch index 7197c34..ace5ae8 100644 --- a/packages/x11/wmmon/debian.patch +++ b/packages/x11/wmmon/debian.patch @@ -80,10 +80,12 @@ + */ --- wmmon-1.0b2.orig/wmmon/wmmon.c +++ wmmon-1.0b2/wmmon/wmmon.c -@@ -28,6 +28,10 @@ +@@ -28,6 +28,12 @@ Changes: ---- ++ 15/05/2004 (Simon Law, sfllaw@debian.org) ++ * Support disabling of mode-cycling + 23/10/2003 (Simon Law, sfllaw@debian.org) + * Eliminated exploitable static buffers + * Added -geometry support. @@ -91,7 +93,7 @@ 18/05/1998 (Antoine Nulle, warp@xs4all.nl) * MEM/SWAP/UPTIME only updated when visible * Using global file descriptors to reduce file -@@ -65,6 +69,7 @@ +@@ -65,6 +71,7 @@ * First Working Version */ @@ -99,12 +101,13 @@ #include #include #include -@@ -100,31 +105,27 @@ +@@ -100,31 +107,28 @@ /* Global Variables */ /********************/ -char *ProgName; int stat_current = 0; /* now global */ ++int mode_cycling = 1; /* Allow mode-cycling */ FILE *fp_meminfo; FILE *fp_stat; FILE *fp_loadavg; @@ -134,7 +137,7 @@ for (i=1; i= nexttime) { nexttime+=10; @@ -278,7 +283,16 @@ for (i=0; i= 0) { ++ if (but_stat == i && but_stat >= 0 && mode_cycling) { + switch (but_stat) { + case 0: + switch (Event.xbutton.button) { +@@ -430,7 +460,6 @@ } case 1: stat_current++; @@ -286,7 +300,7 @@ if (stat_current == stat_online) stat_current = 0; -@@ -499,43 +522,80 @@ +@@ -499,43 +528,80 @@ void update_stat_mem(stat_dev *st, stat_dev *st2) { @@ -391,7 +405,7 @@ } /*******************************************************************************\ -@@ -545,11 +605,11 @@ +@@ -545,11 +611,11 @@ void get_statistics(char *devname, long *is, long *ds, long *idle) { int i; @@ -405,7 +419,7 @@ *is = 0; *ds = 0; -@@ -557,9 +617,9 @@ +@@ -557,9 +623,9 @@ if (!strncmp(devname, "cpu", 3)) { fseek(fp_stat, 0, SEEK_SET); @@ -418,7 +432,7 @@ /* 1..3, 4 == idle, we don't want idle! */ for (i=0; i<3; i++) { p = strtok(NULL, tokens); -@@ -577,17 +637,35 @@ +@@ -577,17 +643,35 @@ if (!strncmp(devname, "i/o", 3)) { fseek(fp_stat, 0, SEEK_SET); @@ -458,7 +472,7 @@ } } -@@ -715,16 +793,16 @@ +@@ -715,16 +799,17 @@ |* usage *| \*******************************************************************************/ @@ -478,6 +492,7 @@ + printf("\n"); + printf(" -display DISPLAY contact the DISPLAY X server\n"); + printf(" -geometry GEOMETRY position the clock at GEOMETRY\n"); ++ printf(" -l locked view - cannot cycle modes\n"); + printf(" -i start in Disk I/O mode\n"); + printf(" -s start in System Info mode\n"); + printf(" -h display this help and exit\n"); @@ -485,7 +500,7 @@ } /*******************************************************************************\ -@@ -733,7 +811,7 @@ +@@ -733,7 +818,7 @@ void printversion(void) { @@ -498,7 +513,7 @@ + */ --- wmmon-1.0b2.orig/wmmon/wmmon.1 +++ wmmon-1.0b2/wmmon/wmmon.1 -@@ -0,0 +1,185 @@ +@@ -0,0 +1,192 @@ +'\" t +.\" Man page for wmmon +.\" Copyright (c) 2003 Software in the Public Interest, Inc. @@ -541,20 +556,20 @@ +.IP \(bu 4 +a realtime CPU stress meter; +.IP \(bu -+an auto\-scaled average system load meter, like ++an auto-scaled average system load meter, like +.B xload +and +.BR wmavgload ; +.IP \(bu +a realtime disk I/O stress meter; +.IP \(bu -+auto\-scaled disk I/O load meter; ++auto-scaled disk I/O load meter; +.IP \(bu +realtime memory and swap usage meters; +.IP \(bu +a display for system uptime; +.IP \(bu -+three user\-defined commands to launch. ++three user-defined commands to launch. + +.SH OPTIONS + @@ -569,13 +584,20 @@ +.IR X(7x) . + +.TP ++.BR \-l ++Lock the mode, so that it cannot be cycled by clicking on the upper-left ++widget. You can use this to open multiple copies of ++.BR WMMon , ++each set to a different mode. ++ ++.TP +.BR \-i -+start in disk I/O mode, which displays instantaneous disk usage and ++Start in disk I/O mode, which displays instantaneous disk usage and +average disk load. + +.TP +.BR \-s -+start in system information mode, which displays memory usage, swap usage, ++Start in system information mode, which displays memory usage, swap usage, +and uptime. + +.TP @@ -590,12 +612,12 @@ +The +.B WMMon +display can be cycled between CPU, disk I/O, and system -+information displays by clicking on the upper\-left widget. This ++information displays by clicking on the upper-left widget. This +displays CPU information by default. + +WMMon can also be used to launch programs. You may click either left, -+middle, or right mouse buttons in the average\-load section of the -+window. The pre\-configured program will be launched according to the ++middle, or right mouse buttons in the average-load section of the ++window. The pre-configured program will be launched according to the +mouse button clicked. (see +.B CONFIGURATION FILE +below.) @@ -611,7 +633,7 @@ + +Window Maker users should drag and drop the +.B WMMon -+window on the Dock. Then, right\-click on the border of the window and ++window on the Dock. Then, right-click on the border of the window and +select \*(lqSettings...\*(rq. Check \*(lqStart when Window Maker +is started\*(rq. + @@ -634,7 +656,7 @@ +.SH "CONFIGURATION FILE" + +.B WMMon -+can launch three user\-defined commands, triggered by left, middle and ++can launch three user-defined commands, triggered by left, middle and +right mouse button clicks. You can define the commands to launch in +.I $HOME/.wmmonrc +