diff --git a/ChangeLog b/ChangeLog index fc134965..259572c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2009-05-07 * Fix occasional cpubar segfaults + * Added top_name_width config option 2009-05-05 * Added some completely pointless OpenMP optimizations(?) diff --git a/README b/README index 618a8f2c..9b14d7eb 100644 --- a/README +++ b/README @@ -197,6 +197,10 @@ conky(1) conky(1) The number of samples to average for disk I/O monitoring. + top_name_width + Width for $top name value (defaults to 15 characters). + + top_cpu_separate If true, cpu in top will show usage of one processor's power. If false, cpu in top will show the usage of all processors' power @@ -274,11 +278,11 @@ conky(1) conky(1) imap Default global IMAP server. Arguments are: "host user pass [-i - interval] [-f folder] [-p port] [-e command] [-r retries]". De‐ - fault port is 143, default folder is 'INBOX', default interval - is 5 minutes, and default number of retries before giving up is - 5. If the password is supplied as '*', you will be prompted to - enter the password when Conky starts. + interval (in seconds)] [-f folder] [-p port] [-e command] [-r + retries]". Default port is 143, default folder is 'INBOX', de‐ + fault interval is 5 minutes, and default number of retries be‐ + fore giving up is 5. If the password is supplied as '*', you + will be prompted to enter the password when Conky starts. mail_spool @@ -416,10 +420,11 @@ conky(1) conky(1) pop3 Default global POP3 server. Arguments are: "host user pass [-i - interval] [-p port] [-e command] [-r retries]". Default port is - 110, default interval is 5 minutes, and default number of re‐ - tries before giving up is 5. If the password is supplied as '*', - you will be prompted to enter the password when Conky starts. + interval (in seconds)] [-p port] [-e command] [-r retries]". De‐ + fault port is 110, default interval is 5 minutes, and default + number of retries before giving up is 5. If the password is sup‐ + plied as '*', you will be prompted to enter the password when + Conky starts. short_units @@ -440,14 +445,14 @@ conky(1) conky(1) temperature_unit - Desired output unit of all objects displaying a temperature. - Parameters are either "fahrenheit" or "celsius". The default + Desired output unit of all objects displaying a temperature. + Parameters are either "fahrenheit" or "celsius". The default unit is degree Celsius. templateN Define a template for later use inside TEXT segments. Substitute - N by a digit between 0 and 9, inclusively. The value of the + N by a digit between 0 and 9, inclusively. The value of the variable is being inserted into the stuff below TEXT at the cor‐ responding position, but before some substitutions are applied: @@ -458,7 +463,7 @@ conky(1) conky(1) total_run_times - Total number of times for Conky to update before quitting. Zero + Total number of times for Conky to update before quitting. Zero makes Conky run forever @@ -473,8 +478,8 @@ conky(1) conky(1) use_spacer Adds spaces around certain objects to stop them from moving oth‐ er things around. Arguments are left, right, and none (default). - The old true/false values are deprecated and default to - right/none respectively. Note that this only helps if you are + The old true/false values are deprecated and default to + right/none respectively. Note that this only helps if you are using a mono font, such as Bitstream Vera Sans Mono. @@ -490,24 +495,24 @@ conky(1) conky(1) Xft font to use. - TEXT After this begins text to be formatted on screen. Backslash (\) - escapes newlines in the text section. This can be useful for - cleaning up config files where conky is used to pipe input to + TEXT After this begins text to be formatted on screen. Backslash (\) + escapes newlines in the text section. This can be useful for + cleaning up config files where conky is used to pipe input to dzen2. VARIABLES - Colors are parsed using XParsecolor(), there might be a list of them: - /usr/share/X11/rgb.txt. Also, ⟨http://sedition.com/perl/rgb.html⟩. + Colors are parsed using XParsecolor(), there might be a list of them: + /usr/share/X11/rgb.txt. Also, ⟨http://sedition.com/perl/rgb.html⟩. Color can be also in #rrggbb format (hex). addr interface - IP address for an interface, or "No Address" if no address is + IP address for an interface, or "No Address" if no address is assigned. addrs interface - IP addresses for an interface (if one - works like addr). Linux + IP addresses for an interface (if one - works like addr). Linux only. @@ -548,7 +553,7 @@ conky(1) conky(1) apm_battery_time - Display remaining APM battery life in hh:mm:ss or "unknown" if + Display remaining APM battery life in hh:mm:ss or "unknown" if AC adapterstatus is on-line or charging (FreeBSD only) @@ -609,16 +614,16 @@ conky(1) conky(1) battery (num) - Battery status and remaining percentage capacity of ACPI or APM - battery. ACPI battery number can be given as argument (default + Battery status and remaining percentage capacity of ACPI or APM + battery. ACPI battery number can be given as argument (default is BAT0). battery_short (num) - Battery status and remaining percentage capacity of ACPI or APM - battery. ACPI battery number can be given as argument (default - is BAT0). This mode display a short status, which means that C - is displayed instead of charging and D is displayed instead of + Battery status and remaining percentage capacity of ACPI or APM + battery. ACPI battery number can be given as argument (default + is BAT0). This mode display a short status, which means that C + is displayed instead of charging and D is displayed instead of discharging. @@ -633,7 +638,7 @@ conky(1) conky(1) battery_time (num) - Battery charge/discharge time remaining of ACPI battery. ACPI + Battery charge/discharge time remaining of ACPI battery. ACPI battery number can be given as argument (default is BAT0). @@ -672,13 +677,13 @@ conky(1) conky(1) Change drawing color to color - colorN Change drawing color to colorN configuration option, where N is + colorN Change drawing color to colorN configuration option, where N is a digit between 0 and 9, inclusively. combine var1 var2 - Places the lines of var2 to the right of the lines of var1 - seperated by the chars that are put between var1 and var2. For + Places the lines of var2 to the right of the lines of var1 + seperated by the chars that are put between var1 and var2. For example: ${combine ${head /proc/cpuinfo 2} - ${head /proc/memin‐ fo 1}} gives as output "cpuinfo_line1 - meminfo_line1" on line 1 and "cpuinfo_line2 -" on line 2. $combine vars can also be nest‐ @@ -698,26 +703,26 @@ conky(1) conky(1) cpu (cpuN) - CPU usage in percents. For SMP machines, the CPU number can be - provided as an argument. ${cpu cpu0} is the total usage, and + CPU usage in percents. For SMP machines, the CPU number can be + provided as an argument. ${cpu cpu0} is the total usage, and ${cpu cpuX} (X >= 1) are individual CPUs. cpubar (cpuN) (height),(width) - Bar that shows CPU usage, height is bar's height in pixels. See + Bar that shows CPU usage, height is bar's height in pixels. See $cpu for more info on SMP. cpugauge (cpuN) (height),(width) - Elliptical gauge that shows CPU usage, height and width are - gauge's vertical and horizontal axis respectively. See $cpu for + Elliptical gauge that shows CPU usage, height and width are + gauge's vertical and horizontal axis respectively. See $cpu for more info on SMP. - cpugraph (cpuN) ("normal"|"log") (height),(width) (gradient colour 1) + cpugraph (cpuN) ("normal"|"log") (height),(width) (gradient colour 1) (gradient colour 2) (scale) - CPU usage graph, with optional colours in hex, minus the #. See - $cpu for more info on SMP. Uses a logarithmic scale (to see + CPU usage graph, with optional colours in hex, minus the #. See + $cpu for more info on SMP. Uses a logarithmic scale (to see small numbers) when you use "log" instead of "normal". @@ -728,7 +733,7 @@ conky(1) conky(1) diskiograph ("normal"|"log") (height),(width) (gradient colour 1) (gra‐ dient colour 2) (scale) (device) - Disk IO graph, colours defined in hex, minus the #. If scale is + Disk IO graph, colours defined in hex, minus the #. If scale is non-zero, it becomes the scale for the graph. Uses a logarithmic scale (to see small numbers) when you use "log" instead of "nor‐ mal". @@ -738,11 +743,11 @@ conky(1) conky(1) Displays current disk IO for reads. Device as in diskio. - diskiograph_read ("normal"|"log") (height),(width) (gradient colour 1) + diskiograph_read ("normal"|"log") (height),(width) (gradient colour 1) (gradient colour 2) (scale) (device) Disk IO graph for reads, colours defined in hex, minus the #. If scale is non-zero, it becomes the scale for the graph. Device as - in diskio. Uses a logarithmic scale (to see small numbers) when + in diskio. Uses a logarithmic scale (to see small numbers) when you use "log" instead of "normal". @@ -752,9 +757,9 @@ conky(1) conky(1) diskiograph_write ("normal"|"log") (height),(width) (gradient colour 1) (gradient colour 2) (scale) (device) - Disk IO graph for writes, colours defined in hex, minus the #. + Disk IO graph for writes, colours defined in hex, minus the #. If scale is non-zero, it becomes the scale for the graph. Device - as in diskio. Uses a logarithmic scale (to see small numbers) + as in diskio. Uses a logarithmic scale (to see small numbers) when you use "log" instead of "normal". @@ -771,11 +776,11 @@ conky(1) conky(1) Download speed in KiB with one decimal - downspeedgraph ("normal"|"log") (height),(width) (gradient colour 1) + downspeedgraph ("normal"|"log") (height),(width) (gradient colour 1) (gradient colour 2) (scale) (net) - Download speed graph, colours defined in hex, minus the #. If - scale is non-zero, it becomes the scale for the graph. Uses a - logarithmic scale (to see small numbers) when you use "log" in‐ + Download speed graph, colours defined in hex, minus the #. If + scale is non-zero, it becomes the scale for the graph. Uses a + logarithmic scale (to see small numbers) when you use "log" in‐ stead of "normal". @@ -796,40 +801,40 @@ conky(1) conky(1) eval string Evalutates given string according to the rules of TEXT interpre‐ - tation, i.e. parsing any contained text object specifications - into their output, any occuring '$$' into a single '$' and so + tation, i.e. parsing any contained text object specifications + into their output, any occuring '$$' into a single '$' and so on. The output is then being parsed again. exec command Executes a shell command and displays the output in conky. warn‐ - ing: this takes a lot more resources than other variables. I'd + ing: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch. execbar command - Same as exec, except if the first value return is a value be‐ - tween 0-100, it will use that number for a bar. The size for + Same as exec, except if the first value return is a value be‐ + tween 0-100, it will use that number for a bar. The size for bars can be controlled via the default_bar_size config setting. execgauge command - Same as exec, except if the first value returned is a value be‐ - tween 0-100, it will use that number for a gauge. The size for - gauges can be controlled via the default_gauge_size config set‐ + Same as exec, except if the first value returned is a value be‐ + tween 0-100, it will use that number for a gauge. The size for + gauges can be controlled via the default_gauge_size config set‐ ting. execgraph ("normal"|"log") (height),(width) (gradient colour 1) (gradi‐ ent colour 2) (scale) command Same as execbar, but graphs values. Uses a logaritmic scale when - the log option is given (to see small numbers). Values still - have to be between 0 and 100. The size for graphs can be con‐ + the log option is given (to see small numbers). Values still + have to be between 0 and 100. The size for graphs can be con‐ trolled via the default_graph_size config setting. execi interval command - Same as exec but with specific interval. Interval can't be less + Same as exec but with specific interval. Interval can't be less than update_interval in configuration. See also $texeci @@ -847,14 +852,14 @@ conky(1) conky(1) execp command Executes a shell command and displays the output in conky. warn‐ - ing: this takes a lot more resources than other variables. I'd + ing: this takes a lot more resources than other variables. I'd recommend coding wanted behaviour in C and posting a patch. This - differs from $exec in that it parses the output of the command, - so you can insert things like ${color red}hi!${color} in your - script and have it correctly parsed by Conky. Caveats: Conky - parses and evaluates the output of $execp every time Conky + differs from $exec in that it parses the output of the command, + so you can insert things like ${color red}hi!${color} in your + script and have it correctly parsed by Conky. Caveats: Conky + parses and evaluates the output of $execp every time Conky loops, and then destroys all the objects. If you try to use any‐ - thing like $execi within an $execp statement, it will function‐ + thing like $execi within an $execp statement, it will function‐ ally run at the same interval that the $execp statement runs, as it is created and destroyed at every interval. @@ -862,34 +867,34 @@ conky(1) conky(1) execpi interval command Same as execp but with specific interval. Interval can't be less than update_interval in configuration. Note that the output from - the $execpi command is still parsed and evaluated at every in‐ + the $execpi command is still parsed and evaluated at every in‐ terval. font (font) - Specify a different font. This new font will apply to the cur‐ - rent line and everything following. You can use a $font with no - arguments to change back to the default font (much like with + Specify a different font. This new font will apply to the cur‐ + rent line and everything following. You can use a $font with no + arguments to change back to the default font (much like with $color) freq (n) - Returns CPU #n's frequency in MHz. CPUs are counted from 1. If + Returns CPU #n's frequency in MHz. CPUs are counted from 1. If omitted, the parameter defaults to 1. freq_g (n) - Returns CPU #n's frequency in GHz. CPUs are counted from 1. If + Returns CPU #n's frequency in GHz. CPUs are counted from 1. If omitted, the parameter defaults to 1. fs_bar (height),(width) fs - Bar that shows how much space is used on a file system. height + Bar that shows how much space is used on a file system. height is the height in pixels. fs is any file on that file system. fs_bar_free (height),(width) fs - Bar that shows how much space is free on a file system. height + Bar that shows how much space is free on a file system. height is the height in pixels. fs is any file on that file system. @@ -921,23 +926,23 @@ conky(1) conky(1) gw_iface - Displays the default route's interface or "multiple"/"none" ac‐ + Displays the default route's interface or "multiple"/"none" ac‐ cordingly. - gw_ip Displays the default gateway's IP or "multiple"/"none" accord‐ + gw_ip Displays the default gateway's IP or "multiple"/"none" accord‐ ingly. hddtemp dev, (host,(port)) - Displays temperature of a selected hard disk drive as reported - by the hddtemp daemon running on host:port. Default host is + Displays temperature of a selected hard disk drive as reported + by the hddtemp daemon running on host:port. Default host is 127.0.0.1, default port is 7634. head logfile lines (interval) - Displays first N lines of supplied text text file. If interval - is not supplied, Conky assumes 2x Conky's interval. Max of 30 + Displays first N lines of supplied text text file. If interval + is not supplied, Conky assumes 2x Conky's interval. Max of 30 lines can be displayed, or until the text buffer is filled. @@ -946,15 +951,15 @@ conky(1) conky(1) hwmon (dev) type n - Hwmon sensor from sysfs (Linux 2.6). Parameter dev may be omit‐ - ted if you have only one hwmon device. Parameter type is either + Hwmon sensor from sysfs (Linux 2.6). Parameter dev may be omit‐ + ted if you have only one hwmon device. Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' meaning - temperature. Parameter n is number of the sensor. See + temperature. Parameter n is number of the sensor. See /sys/class/hwmon/ on your local computer. iconv_start codeset_from codeset_to - Convert text from one codeset to another using GNU iconv. Needs + Convert text from one codeset to another using GNU iconv. Needs to be stopped with iconv_stop. @@ -963,70 +968,70 @@ conky(1) conky(1) i2c (dev) type n - I2C sensor from sysfs (Linux 2.6). Parameter dev may be omitted - if you have only one I2C device. Parameter type is either 'in' + I2C sensor from sysfs (Linux 2.6). Parameter dev may be omitted + if you have only one I2C device. Parameter type is either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' meaning tem‐ - perature. Parameter n is number of the sensor. See + perature. Parameter n is number of the sensor. See /sys/bus/i2c/devices/ on your local computer. i8k_ac_status - If running the i8k kernel driver for Inspiron laptops, displays - whether ac power is on, as listed in /proc/i8k (translated to - human-readable). Beware that this is by default not enabled by + If running the i8k kernel driver for Inspiron laptops, displays + whether ac power is on, as listed in /proc/i8k (translated to + human-readable). Beware that this is by default not enabled by i8k itself. i8k_bios - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the bios version as listed in /proc/i8k. i8k_buttons_status - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the volume buttons status as listed in /proc/i8k. i8k_cpu_temp - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the cpu temperature in Celsius, as reported by /proc/i8k. i8k_left_fan_rpm - If running the i8k kernel driver for Inspiron laptops, displays - the left fan's rate of rotation, in revolutions per minute as + If running the i8k kernel driver for Inspiron laptops, displays + the left fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order. i8k_left_fan_status - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the left fan status as listed in /proc/i8k (translated to human- - readable). Beware, some laptops i8k reports these fans in re‐ + readable). Beware, some laptops i8k reports these fans in re‐ verse order. i8k_right_fan_rpm - If running the i8k kernel driver for Inspiron laptops, displays - the right fan's rate of rotation, in revolutions per minute as + If running the i8k kernel driver for Inspiron laptops, displays + the right fan's rate of rotation, in revolutions per minute as listed in /proc/i8k. Beware, some laptops i8k reports these fans in reverse order. i8k_right_fan_status - If running the i8k kernel driver for Inspiron laptops, displays - the right fan status as listed in /proc/i8k (translated to hu‐ - man-readable). Beware, some laptops i8k reports these fans in + If running the i8k kernel driver for Inspiron laptops, displays + the right fan status as listed in /proc/i8k (translated to hu‐ + man-readable). Beware, some laptops i8k reports these fans in reverse order. i8k_serial - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays your laptop serial number as listed in /proc/i8k. i8k_version - If running the i8k kernel driver for Inspiron laptops, displays + If running the i8k kernel driver for Inspiron laptops, displays the version formatting of /proc/i8k. @@ -1035,13 +1040,13 @@ conky(1) conky(1) ibm_temps N - If running the IBM ACPI, displays the temperatures from the IBM + If running the IBM ACPI, displays the temperatures from the IBM temperature sensors (N=0..7) Sensor 0 is on the CPU, 3 is on the GPU. ibm_volume - If running the IBM ACPI, displays the "master" volume, con‐ + If running the IBM ACPI, displays the "master" volume, con‐ trolled by the volume keys (0-14). @@ -1051,14 +1056,14 @@ conky(1) conky(1) if_empty (var) - if conky variable VAR is empty, display everything between + if conky variable VAR is empty, display everything between $if_empty and the matching $endif if_existing file (string) - if FILE exists, display everything between if_existing and the - matching $endif. The optional second paramater checks for FILE - containing the specified string and prints everything between + if FILE exists, display everything between if_existing and the + matching $endif. The optional second paramater checks for FILE + containing the specified string and prints everything between $if_existing and the matching $endif. @@ -1067,11 +1072,11 @@ conky(1) conky(1) if_match expression - Evaluates the given boolean expression, printing everything be‐ + Evaluates the given boolean expression, printing everything be‐ tween $if_match and the matching $endif depending on whether the - evaluation returns true or not. Valid expressions consist of a - left side, an operator and a right side. Left and right sides - are being parsed for contained text objects before evaluation. + evaluation returns true or not. Valid expressions consist of a + left side, an operator and a right side. Left and right sides + are being parsed for contained text objects before evaluation. Recognised left and right side types are: double: argument consists of only digits and a single dot. @@ -1083,13 +1088,13 @@ conky(1) conky(1) if_mixer_mute (mixer) - If mixer exists, display everything between $if_mixer_mute and + If mixer exists, display everything between $if_mixer_mute and the matching $endif. If no mixer is specified, "Master" is used. if_running (process) - if PROCESS is running, display everything $if_running and the - matching $endif. This uses the ``pidof'' command, so the -x + if PROCESS is running, display everything $if_running and the + matching $endif. This uses the ``pidof'' command, so the -x switch is also supported. @@ -1099,8 +1104,8 @@ conky(1) conky(1) if_smapi_bat_installed (INDEX) - when using smapi, if the battery with index INDEX is installed, - display everything between $if_smapi_bat_installed and the + when using smapi, if the battery with index INDEX is installed, + display everything between $if_smapi_bat_installed and the matching $endif @@ -1110,36 +1115,38 @@ conky(1) conky(1) if_updatenr (updatenr) - If it's the UPDATENR-th time that conky updates, display every‐ + If it's the UPDATENR-th time that conky updates, display every‐ thing between $if_updatenr and the matching $endif. The counter - resets when the highest UPDATENR is reached. Example : + resets when the highest UPDATENR is reached. Example : "{$if_updatenr 1}foo$endif{$if_updatenr 2}bar$endif{$if_updatenr - 4}$endif" shows foo 25% of the time followed by bar 25% of the + 4}$endif" shows foo 25% of the time followed by bar 25% of the time followed by nothing the other half of the time. imap_messages (args) Displays the number of messages in your global IMAP inbox by de‐ - fault. You can define individual IMAP inboxes seperately by + fault. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass - [-i interval] [-p port] [-e command] [-r retries]". Default port - is 143, default interval is 5 minutes, and default number of re‐ - tries before giving up is 5. If the password is supplied as '*', - you will be prompted to enter the password when Conky starts. + [-i interval (in seconds)] [-f folder] [-p port] [-e command] + [-r retries]". Default port is 143, default folder is 'INBOX', + default interval is 5 minutes, and default number of retries be‐ + fore giving up is 5. If the password is supplied as '*', you + will be prompted to enter the password when Conky starts. imap_unseen (args) Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass - [-i interval] [-p port] [-e command] [-r retries]". Default port - is 143, default interval is 5 minutes, and default number of re‐ - tries before giving up is 5. If the password is supplied as '*', - you will be prompted to enter the password when Conky starts. + [-i interval (in seconds)] [-f folder] [-p port] [-e command] + [-r retries]". Default port is 143, default folder is 'INBOX', + default interval is 5 minutes, and default number of retries be‐ + fore giving up is 5. If the password is supplied as '*', you + will be prompted to enter the password when Conky starts. ioscheduler disk - Prints the current ioscheduler used for the given disk name + Prints the current ioscheduler used for the given disk name (i.e. e.g. "hda" or "sdb") @@ -1157,8 +1164,8 @@ conky(1) conky(1) loadgraph ("normal"|"log") (height),(width) (gradient colour 1) (gradi‐ ent colour 2) (scale) - Load1 average graph, similar to xload, with optional colours in - hex, minus the #. Uses a logarithmic scale (to see small num‐ + Load1 average graph, similar to xload, with optional colours in + hex, minus the #. Uses a logarithmic scale (to see small num‐ bers) when you use "log" instead of "normal". @@ -1171,9 +1178,9 @@ conky(1) conky(1) mails (mailbox) (interval) - Mail count in the specified mailbox or your mail spool if not. - Both mbox and maildir type mailboxes are supported. You can use - a program like fetchmail to get mails from some server using + Mail count in the specified mailbox or your mail spool if not. + Both mbox and maildir type mailboxes are supported. You can use + a program like fetchmail to get mails from some server using your favourite protocol. See also new_mails. @@ -1183,32 +1190,32 @@ conky(1) conky(1) seen_mails (maildir) (interval) - Number of mails marked as seen in the specified mailbox or mail - spool if not. Only maildir type mailboxes are supported, mbox + Number of mails marked as seen in the specified mailbox or mail + spool if not. Only maildir type mailboxes are supported, mbox type will return -1. unseen_mails (maildir) (interval) - Number of new or unseen mails in the specified mailbox or mail - spool if not. Only maildir type mailboxes are supported, mbox + Number of new or unseen mails in the specified mailbox or mail + spool if not. Only maildir type mailboxes are supported, mbox type will return -1. flagged_mails (maildir) (interval) - Number of mails marked as flagged in the specified mailbox or - mail spool if not. Only maildir type mailboxes are supported, + Number of mails marked as flagged in the specified mailbox or + mail spool if not. Only maildir type mailboxes are supported, mbox type will return -1. unflagged_mails (maildir) (interval) - Number of mails not marked as flagged in the specified mailbox + Number of mails not marked as flagged in the specified mailbox or mail spool if not. Only maildir type mailboxes are supported, mbox type will return -1. forwarded_mails (maildir) (interval) - Number of mails marked as forwarded in the specified mailbox or - mail spool if not. Only maildir type mailboxes are supported, + Number of mails marked as forwarded in the specified mailbox or + mail spool if not. Only maildir type mailboxes are supported, mbox type will return -1. @@ -1219,33 +1226,33 @@ conky(1) conky(1) replied_mails (maildir) (interval) - Number of mails marked as replied in the specified mailbox or - mail spool if not. Only maildir type mailboxes are supported, + Number of mails marked as replied in the specified mailbox or + mail spool if not. Only maildir type mailboxes are supported, mbox type will return -1. unreplied_mails (maildir) (interval) - Number of mails not marked as replied in the specified mailbox + Number of mails not marked as replied in the specified mailbox or mail spool if not. Only maildir type mailboxes are supported, mbox type will return -1. draft_mails (maildir) (interval) Number of mails marked as draft in the specified mailbox or mail - spool if not. Only maildir type mailboxes are supported, mbox + spool if not. Only maildir type mailboxes are supported, mbox type will return -1. trashed_mails (maildir) (interval) - Number of mails marked as trashed in the specified mailbox or - mail spool if not. Only maildir type mailboxes are supported, + Number of mails marked as trashed in the specified mailbox or + mail spool if not. Only maildir type mailboxes are supported, mbox type will return -1. mboxscan (-n number of messages to print) (-fw from width) (-sw subject width) mbox - Print a summary of recent messages in an mbox format mailbox. - mbox parameter is the filename of the mailbox (can be encapsu‐ + Print a summary of recent messages in an mbox format mailbox. + mbox parameter is the filename of the mailbox (can be encapsu‐ lated using '"', ie. ${mboxscan -n 10 "/home/brenden/some box"} @@ -1260,14 +1267,14 @@ conky(1) conky(1) Gauge that shows amount of memory in use (see cpugauge) - memgraph ("normal"|"log") (height),(width) (gradient colour 1) (gradi‐ + memgraph ("normal"|"log") (height),(width) (gradient colour 1) (gradi‐ ent colour 2) (scale) - Memory usage graph. Uses a logarithmic scale (to see small num‐ + Memory usage graph. Uses a logarithmic scale (to see small num‐ bers) when you use "log" instead of "normal". memeasyfree - Amount of free memory including the memory that is very easily + Amount of free memory including the memory that is very easily freed (buffers/cache) @@ -1283,39 +1290,39 @@ conky(1) conky(1) mixer (device) - Prints the mixer value as reported by the OS. Default mixer is - "vol", but you can specify one of the following optional argu‐ + Prints the mixer value as reported by the OS. Default mixer is + "vol", but you can specify one of the following optional argu‐ ments: "vol", "bass", "treble", "synth", "pcm", "speaker", - "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", + "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", "line1", "line2", "line3", "dig1", "dig2", "dig3", "phin", "phout", "video", "radio", "monitor". Refer to the definition of - SOUND_DEVICE_NAMES in (on Linux), (on Linux), (on OpenBSD), or to find the exact op‐ tions available on your system. mixerbar (device) - Displays mixer value in a bar as reported by the OS. See docs + Displays mixer value in a bar as reported by the OS. See docs for $mixer for details on arguments. mixerr (device) - Prints the right channel mixer value as reported by the OS. See + Prints the right channel mixer value as reported by the OS. See docs for $mixer for details on arguments. mixerrbar (device) - Displays the right channel mixer value in a bar as reported by + Displays the right channel mixer value in a bar as reported by the OS. See docs for $mixer for details on arguments. mixerl (device) - Prints the left channel mixer value as reported by the OS. See + Prints the left channel mixer value as reported by the OS. See docs for $mixer for details on arguments. mixerlbar (device) - Displays the left channel mixer value in a bar as reported by + Displays the left channel mixer value in a bar as reported by the OS. See docs for $mixer for details on arguments. @@ -1437,12 +1444,12 @@ conky(1) conky(1) if_mpd_playing - if mpd is playing or paused, display everything between + if mpd is playing or paused, display everything between $if_mpd_playing and the matching $endif nameserver (index) - Print a nameserver from /etc/resolv.conf. Index starts at and + Print a nameserver from /etc/resolv.conf. Index starts at and defaults to 0. @@ -1451,8 +1458,8 @@ conky(1) conky(1) nvidia threshold temp ambient gpufreq memfreq imagequality - Nvidia graficcard support for the XNVCtrl library. Each option - can be shortened to the least significant part. Temperatures + Nvidia graficcard support for the XNVCtrl library. Each option + can be shortened to the least significant part. Temperatures are printed as float, all other values as integer. threshold: the thresholdtemperature at which the gpu slows down @@ -1470,25 +1477,25 @@ conky(1) conky(1) pb_battery item If running on Apple powerbook/ibook, display information on bat‐ - tery status. The item parameter specifies, what information to + tery status. The item parameter specifies, what information to display. Exactly one item must be specified. Valid items are: status: Display if battery is fully charged, charging, discharg‐ ing or absent (running on AC) - percent: Display charge of battery in percent, if charging or - discharging. Nothing will be displayed, if battery is fully + percent: Display charge of battery in percent, if charging or + discharging. Nothing will be displayed, if battery is fully charged or absent. time: Display the time remaining until the battery will be fully - charged or discharged at current rate. Nothing is displayed, if - battery is absent or if it's present but fully charged and not + charged or discharged at current rate. Nothing is displayed, if + battery is absent or if it's present but fully charged and not discharging. platform (dev) type n - Platform sensor from sysfs (Linux 2.6). Parameter dev may be - omitted if you have only one platform device. Platform type is - either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' - meaning temperature. Parameter n is number of the sensor. See + Platform sensor from sysfs (Linux 2.6). Parameter dev may be + omitted if you have only one platform device. Platform type is + either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp' + meaning temperature. Parameter n is number of the sensor. See /sys/bus/platform/devices/ on your local computer. @@ -1496,21 +1503,22 @@ conky(1) conky(1) Displays the number of unseen messages in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass - [-i interval] [-p port] [-e command] [-r retries]". Default port - is 110, default interval is 5 minutes, and default number of re‐ - tries before giving up is 5. If the password is supplied as '*', - you will be prompted to enter the password when Conky starts. + [-i interval (in seconds)] [-p port] [-e command] [-r retries]". + Default port is 110, default interval is 5 minutes, and default + number of retries before giving up is 5. If the password is sup‐ + plied as '*', you will be prompted to enter the password when + Conky starts. pop3_used (args) Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: - "host user pass [-i interval] [-p port] [-e command] [-r re‐ - tries]". Default port is 110, default interval is 5 minutes, and - default number of retries before giving up is 5. If the password - is supplied as '*', you will be prompted to enter the password - when Conky starts. + "host user pass [-i interval (in seconds)] [-p port] [-e com‐ + mand] [-r retries]". Default port is 110, default interval is 5 + minutes, and default number of retries before giving up is 5. If + the password is supplied as '*', you will be prompted to enter + the password when Conky starts. pre_exec shell command diff --git a/doc/config_settings.xml b/doc/config_settings.xml index 4d46c0b4..840a9537 100644 --- a/doc/config_settings.xml +++ b/doc/config_settings.xml @@ -55,6 +55,13 @@ + + + + Width for $top name value (defaults to 15 characters). + + + @@ -172,7 +179,7 @@ - Default global IMAP server. Arguments are: "host user pass [-i interval] [-f folder] [-p port] [-e command] [-r retries]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. + Default global IMAP server. Arguments are: "host user pass [-i interval (in seconds)] [-f folder] [-p port] [-e command] [-r retries]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. @@ -394,7 +401,7 @@ - Default global POP3 server. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. + Default global POP3 server. Arguments are: "host user pass [-i interval (in seconds)] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. diff --git a/doc/variables.xml b/doc/variables.xml index 85d033db..c6c009fd 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -1198,7 +1198,7 @@ - Displays the number of messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 143, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. + Displays the number of messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval (in seconds)] [-f folder] [-p port] [-e command] [-r retries]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. @@ -1208,7 +1208,7 @@ - Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 143, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. + Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval (in seconds)] [-f folder] [-p port] [-e command] [-r retries]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. @@ -1957,7 +1957,7 @@ - Displays the number of unseen messages in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. + Displays the number of unseen messages in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval (in seconds)] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. @@ -1968,7 +1968,7 @@ - Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. + Displays the amount of space (in MiB, 2^20) used in your global POP3 inbox by default. You can define individual POP3 inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval (in seconds)] [-p port] [-e command] [-r retries]". Default port is 110, default interval is 5 minutes, and default number of retries before giving up is 5. If the password is supplied as '*', you will be prompted to enter the password when Conky starts. diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc index 3ee15a60..ed4920ef 100644 --- a/extras/nano/conky.nanorc +++ b/extras/nano/conky.nanorc @@ -5,7 +5,7 @@ syntax "conky" "(\.*conkyrc.*$|conky.conf)" ## Configuration items -color green "\<(alias|alignment|background|show_graph_range|show_graph_scale|border_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|default_bar_size|default_gauge_size|default_graph_size|default_color|default_shade_color|default_shadecolor|default_outline_color|default_outlinecolor|imap|pop3|mpd_host|mpd_port|mpd_password|music_player_interval|sensor_device|cpu_avg_samples|net_avg_samples|double_buffer|override_utf8_locale|draw_borders|draw_graph_borders|draw_shades|draw_outline|out_to_console|out_to_stderr|out_to_x|extra_newline|overwrite_file|append_file|use_spacer|use_xft|font|xftalpha|xftfont|use_xft|gap_x|gap_y|mail_spool|minimum_size|maximum_width|no_buffers|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|top_cpu_separate|short_units|pad_percents|own_window|own_window_class|own_window_title|own_window_transparent|own_window_colour|own_window_hints|own_window_type|stippled_borders|temp1|temp2|update_interval|total_run_times|uppercase|max_specials|max_user_text|text_buffer_size|max_port_monitor_connections)\>" +color green "\<(alias|alignment|background|show_graph_range|show_graph_scale|border_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|default_bar_size|default_gauge_size|default_graph_size|default_color|default_shade_color|default_shadecolor|default_outline_color|default_outlinecolor|imap|pop3|mpd_host|mpd_port|mpd_password|music_player_interval|sensor_device|cpu_avg_samples|net_avg_samples|double_buffer|override_utf8_locale|draw_borders|draw_graph_borders|draw_shades|draw_outline|out_to_console|out_to_stderr|out_to_x|extra_newline|overwrite_file|append_file|use_spacer|use_xft|font|xftalpha|xftfont|use_xft|gap_x|gap_y|mail_spool|minimum_size|maximum_width|no_buffers|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|top_name_width|top_cpu_separate|short_units|pad_percents|own_window|own_window_class|own_window_title|own_window_transparent|own_window_colour|own_window_hints|own_window_type|stippled_borders|temp1|temp2|update_interval|total_run_times|uppercase|max_specials|max_user_text|text_buffer_size|max_port_monitor_connections)\>" ## Configuration item constants color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|undecorated|yes)\>" diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim index 8702ea73..c43f4e43 100644 --- a/extras/vim/syntax/conkyrc.vim +++ b/extras/vim/syntax/conkyrc.vim @@ -70,6 +70,7 @@ syn keyword ConkyrcSetting \ minimum_size \ maximum_width \ no_buffers + \ top_name_width \ top_cpu_separate \ short_units \ pad_percents diff --git a/src/conky.c b/src/conky.c index 03594430..e9748059 100644 --- a/src/conky.c +++ b/src/conky.c @@ -131,6 +131,7 @@ enum { RIGHT_SPACER } use_spacer; int top_cpu, top_mem, top_time; +static unsigned int top_name_width = 15; int output_methods; enum x_initialiser_state x_initialised = NO; static volatile int g_signal_pending; @@ -4676,7 +4677,7 @@ static void generate_text_internal(char *p, int p_max_size, switch (obj->data.top.type) { case TOP_NAME: - snprintf(p, 16, "%-15s", + snprintf(p, top_name_width + 1, "%-*s", top_name_width, needed[obj->data.top.num]->name); break; case TOP_CPU: @@ -7122,6 +7123,18 @@ static void load_config_file(const char *f) CONF("no_buffers") { no_buffers = string_to_bool(value); } + CONF("top_name_width") { + if (value) { + if (sscanf(value, "%u", &top_name_width) != 1) { + CONF_ERR; + } + } else { + CONF_ERR; + } + if (top_name_width >= max_user_text) { + top_name_width = max_user_text - 1; + } + } CONF("top_cpu_separate") { cpu_separate = string_to_bool(value); }