updating docs, syntax highlighting, code formatting
authorBrenden Matthews <brenden1@rty.ca>
Tue, 6 May 2008 21:44:23 +0000 (21:44 +0000)
committerBrenden Matthews <brenden1@rty.ca>
Tue, 6 May 2008 21:44:23 +0000 (21:44 +0000)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1118 7f574dfc-610e-0410-a909-a81674777703

doc/variables.xml
extras/nano/conky.nanorc
extras/vim/syntax/conkyrc.vim
src/conky.c

index fe25c98..29da227 100644 (file)
                        <option>net</option>
                </term>
                <listitem>
-                       Download speed in kilobytes
+                       Download speed in KiB
                        <para></para></listitem>
        </varlistentry>
 
                        <option>net</option>
                </term>
                <listitem>
-                       Download speed in kilobytes with one decimal
+                       Download speed in KiB with one decimal
                        <para></para></listitem>
        </varlistentry>
 
                        <option>net</option>
                </term>
                <listitem>
-                       Upload speed in kilobytes
+                       Upload speed in KiB
                        <para></para></listitem>
        </varlistentry>
 
                        <option>net</option>
                </term>
                <listitem>
-                       Upload speed in kilobytes with one decimal
+                       Upload speed in KiB with one decimal
                        <para></para></listitem>
        </varlistentry>
 
index 559e58a..b432121 100644 (file)
@@ -6,13 +6,15 @@
 syntax "conky" "(\.*conkyrc.*$|conky.conf)"
 
 ## Configuration items
-color green "\<(alignment|background|border_margin|border_width|cpu_avg_samples|default_color|default_shade_color|default_outline_color|double_buffer|draw_borders|draw_graph_borders|draw_shades|draw_outline|font|gap_x|gap_y|imap|mail_spool|max_port_monitor_connections|max_specials|max_user_text|maximum_width|minimum_size|mpd_host|mpd_port|mpd_password|music_player_interval|net_avg_samples|no_buffers|out_to_console|override_utf8_locale|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|show_graph_scale|stippled_borders|total_run_times|update_interval|uppercase|use_spacer|use_xft|xftalpha|xftfont)\>"
+color green "\<(alignment|background|background|show_graph_scale|border_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|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|use_spacer|use_xft|font|xftalpha|xftfont|use_xft|gap_x|gap_y|mail_spool|minimum_size|maximum_width|no_buffers|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|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|undecorated|yes)\>"
 
 ## Variables
-color brightblue "\<(acpiacadapter|acpifan|acpitemp|acpitempf|addr|adt746xcpu|adt746xfan|align|alignr|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_time|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|color|colour|cpu|cpubar|cpugraph|diskio|diskiograph|downspeed|downspeedf|downspeedgraph|else|entropy_avail|entropy_bar|entropy_poolsize|exec|execbar|execgraph|execi|execibar|execigraph|font|freq|freq_dyn|freq_dyn_g|freq_g|fs_bar|fs_free|fs_free_perc|fs_size|fs_used|goto|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_cpu_tempf|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|if_existing|if_running|if_mounted|kernel|linkstatus|loadavg|loadgraph|machine|mails|mem|membar|memmax|memperc|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_smart|mpd_status|mpd_title|mpd_vol|new_mails|nodename|offset|outlinecolor|platform|pre_exec|processes|running_processes|shadecolor|stippled_hr|swap|swapbar|swapmax|swapperc|sysname|tab|tail|tcp_portmon|texeci|time|top|top_mem|totaldown|totalup|tztime|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|voffset|voltage_mv|voltage_v|wireless_essid|wireless_mode|wireless_bitrate|wireless_ap|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_link_bar|xmms2_artist|xmms2_album|xmms2_title|xmms2_genre|xmms2_comment|xmms2_url|xmms2_tracknr|xmms2_bitrate|xmms2_id|xmms2_duration|xmms2_elapsed|xmms2_size|xmms2_percent|xmms2_status|xmms2_bar|xmms2_smart|xmms2_date|xmms2_timesplayed|xmms2_playlist)\>"
+color brightblue "\<(acpitemp|acpitempf|freq|freq_g|voltage_mv|voltage_v|wireless_essid|wireless_mode|wireless_bitrate|wireless_ap|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_link_bar|freq_dyn|freq_dyn_g|adt746xcpu|adt746xfan|acpifan|acpiacadapter|battery|battery_time|battery_percent|battery_bar|buffers|cached|cpu|cpubar|cpugraph|loadgraph|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|conky_version|conky_build_date|conky_build_arch|disk_protect|i8k_version|i8k_bios|i8k_serial|i8k_cpu_temp|i8k_cpu_tempf|i8k_left_fan_status|i8k_right_fan_status|i8k_left_fan_rpm|i8k_right_fan_rpm|i8k_ac_status|i8k_buttons_status|ibm_fan|ibm_temps|ibm_volume|ibm_brightness|if_up|if_gw|gw_iface|gw_ip|laptop_mode|pb_battery|obsd_sensors_temp|obsd_sensors_fan|obsd_sensors_volt|obsd_vendor|obsd_product|font|diskio|diskio_write|diskio_read|diskiograph|diskiograph_read|diskiograph_write|downspeed|downspeedf|downspeedgraph|else|endif|addr|addrs|image|exec|execp|execbar|execgraph|execibar|execigraph|execi|execpi|texeci|imap_unseen|imap_messages|pop3_unseen|pop3_used|fs_bar|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_bar_free|fs_used_perc|loadavg|goto|tab|hr|nameserver|rss|hddtemp|offset|voffset|i2c|platform|hwmon|alignr|alignc|if_empty|if_existing|if_mounted|if_running|ioscheduler|kernel|machine|mem|memmax|memperc|membar|memgraph|mixer|mixerl|mixerr|mixerbar|mixerlbar|mixerrbar|mails|mboxscan|new_mails|nodename|outlinecolor|processes|running_processes|shadecolor|stippled_hr|swap|swapmax|swapperc|swapbar|sysname|time|utime|tztime|totaldown|totalup|updates|upspeed|upspeedf|upspeedgraph|uptime_short|uptime|user_names|user_terms|user_times|user_number|apm_adapter|apm_battery_life|apm_battery_time|mpd_title|mpd_artist|mpd_album|mpd_random|mpd_repeat|mpd_track|mpd_name|mpd_file|mpd_vol|mpd_bitrate|mpd_status|mpd_elapsed|mpd_length|mpd_percent|mpd_bar|mpd_smart|xmms2_artist|xmms2_album|xmms2_title|xmms2_genre|xmms2_comment|xmms2_url|xmms2_status|xmms2_date|xmms2_tracknr|xmms2_bitrate|xmms2_id|xmms2_size|xmms2_elapsed|xmms2_duration|xmms2_percent|xmms2_bar|xmms2_playlist|xmms2_timesplayed|xmms2_smart|audacious_status|audacious_title|audacious_length|audacious_length_seconds|audacious_position|audacious_position_seconds|audacious_bitrate|audacious_frequency|audacious_channels|audacious_filename|audacious_playlist_length|audacious_playlist_position|audacious_bar|bmpx_title|bmpx_artist|bmpx_album|bmpx_uri|bmpx_track|bmpx_bitrate|top|top_mem|tail|head|tcp_portmon|iconv_start|iconv_stop|entropy_avail|entropy_poolsize|entropy_bar|smapi|if_smapi_bat_installed|smapi_bat_perc|smapi_bat_bar)\>"
+
+
 color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 color brightred "^TEXT$"
-
-## Values
-color yellow "\<(above|below|bottom_left|bottom_right|desktop|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|undecorated|yes)\>"
index aa1c0ba..0a40211 100644 (file)
 " $Id$
 
 if exists("b:current_syntax")
-  finish
+       finish
 endif
 
 syn region ConkyrcComment start=/^\s*#/ end=/$/
 
 syn keyword ConkyrcSetting
-        \ alignment
-        \ background
-        \ border_margin
-        \ border_width
-        \ cpu_avg_samples
-        \ default_color
-        \ default_outline_color
-        \ default_shade_color
-        \ double_buffer
-        \ draw_borders
-        \ draw_graph_borders
-        \ draw_outline
-        \ draw_shades
-        \ font
-        \ gap_x
-        \ gap_y
-        \ imap
-        \ mail_spool
-        \ max_port_monitor_connections
-        \ max_specials
-        \ max_user_text
-        \ maximum_width
-        \ minimum_size
-        \ mpd_host
-        \ mpd_password
-        \ mpd_port
-        \ music_player_interval
-        \ net_avg_samples
-        \ no_buffers
-        \ out_to_console
-        \ override_utf8_locale
-        \ own_window
-        \ own_window_class
-        \ own_window_colour
-        \ own_window_hints
-        \ own_window_title
-        \ own_window_transparent
-        \ own_window_type
-        \ pad_percents
-        \ pop3
-        \ show_graph_scale
-        \ stippled_borders
-        \ total_run_times
-        \ update_interval
-        \ uppercase
-        \ use_spacer
-        \ use_xft
-        \ wm_class_name
-        \ xftalpha
-        \ xftfont
+                       \ alignment
+                       \ background
+                       \ background
+                       \ show_graph_scale
+                       \ border_margin
+                       \ border_width
+                       \ color0
+                       \ color1
+                       \ color2
+                       \ color3
+                       \ color4
+                       \ color5
+                       \ color6
+                       \ color7
+                       \ color8
+                       \ color9
+                       \ 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
+                       \ use_spacer
+                       \ use_xft
+                       \ font
+                       \ xftalpha
+                       \ xftfont
+                       \ use_xft
+                       \ gap_x
+                       \ gap_y
+                       \ mail_spool
+                       \ minimum_size
+                       \ maximum_width
+                       \ no_buffers
+                       \ 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
+                       \ text
+                       \ max_port_monitor_connections
 
 syn keyword ConkyrcConstant
-        \ above
-        \ below
-        \ bottom_left
-        \ bottom_right
-        \ bottom_middle
-        \ desktop
-        \ no
-        \ none
-        \ normal
-        \ override
-        \ skip_pager
-        \ skip_taskbar
-        \ sticky
-        \ top_left
-        \ top_right
-        \ top_middle
-        \ middle_left
-        \ middle_right
-        \ undecorated
-        \ yes
+                       \ above
+                       \ below
+                       \ bottom_left
+                       \ bottom_right
+                       \ bottom_middle
+                       \ desktop
+                       \ no
+                       \ none
+                       \ normal
+                       \ override
+                       \ skip_pager
+                       \ skip_taskbar
+                       \ sticky
+                       \ top_left
+                       \ top_right
+                       \ top_middle
+                       \ middle_left
+                       \ middle_right
+                       \ undecorated
+                       \ yes
 
 syn match ConkyrcNumber /\S\@<!\d\+\(\.\d\+\)\?\(\S\@!\|}\@=\)/
-      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
+                       \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
 syn match ConkyrcColour /\S\@<!#[a-fA-F0-9]\{6\}\(\S\@!\|}\@=\)/
-      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
+                       \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
 
 syn region ConkyrcText start=/^TEXT$/ end=/\%$/ contains=ConkyrcVar
 
@@ -100,176 +120,245 @@ syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcV
 syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName
 
 syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
-        \ acpiacadapter
-        \ acpifan
-        \ acpitemp
-        \ acpitempf
-        \ addr
-        \ adt746xcpu
-        \ adt746xfan
-        \ alignc
-        \ alignr
-        \ apm_adapter
-        \ apm_battery_life
-        \ apm_battery_time
-        \ audacious_bar
-        \ audacious_bitrate
-        \ audacious_channels
-        \ audacious_filename
-        \ audacious_frequency
-        \ audacious_length
-        \ audacious_length_seconds
-        \ audacious_playlist_length
-        \ audacious_playlist_position
-        \ audacious_position
-        \ audacious_position_seconds
-        \ audacious_status
-        \ audacious_title
-        \ battery
-        \ battery_time
-        \ bmpx_album
-        \ bmpx_artist
-        \ bmpx_bitrate
-        \ bmpx_title
-        \ bmpx_track
-        \ bmpx_uri
-        \ buffers
-        \ cached
-        \ color
-        \ colour
-        \ cpu
-        \ cpubar
-        \ cpugraph
-        \ diskio
-        \ diskiograph
-        \ downspeed
-        \ downspeedf
-        \ downspeedgraph
-        \ else
-        \ entropy_avail
-        \ entropy_bar
-        \ entropy_poolsize
-        \ exec
-        \ execbar
-        \ execgraph
-        \ execi
-        \ execibar
-        \ execigraph
-        \ execp
-        \ font
-        \ freq
-        \ freq_dyn
-        \ freq_dyn_g
-        \ freq_g
-        \ fs_bar
-        \ fs_free
-        \ fs_free_perc
-        \ fs_size
-        \ fs_used
-        \ goto
-        \ hddtemp
-        \ head
-        \ hr
-        \ hwmon
-        \ i2c
-        \ i8k_ac_status
-        \ i8k_bios
-        \ i8k_buttons_status
-        \ i8k_cpu_temp
-        \ i8k_cpu_tempf
-        \ i8k_left_fan_rpm
-        \ i8k_left_fan_status
-        \ i8k_right_fan_rpm
-        \ i8k_right_fan_status
-        \ i8k_serial
-        \ i8k_version
-        \ if_existing
-        \ if_mounted
-        \ if_running
-        \ kernel
-        \ linkstatus
-        \ loadavg
-        \ loadgraph
-        \ machine
-        \ mails
-        \ mem
-        \ membar
-        \ memmax
-        \ memperc
-        \ mpd_album
-        \ mpd_artist
-        \ mpd_bar
-        \ mpd_bitrate
-        \ mpd_elapsed
-        \ mpd_file
-        \ mpd_length
-        \ mpd_name
-        \ mpd_percent
-        \ mpd_smart
-        \ mpd_status
-        \ mpd_title
-        \ mpd_vol
-        \ new_mails
-        \ nodename
-        \ offset
-        \ outlinecolor
-        \ platform
-        \ pre_exec
-        \ processes
-        \ running_processes
-        \ shadecolor
-        \ stippled_hr
-        \ swap
-        \ swapbar
-        \ swapmax
-        \ swapperc
-        \ sysname
-        \ tab
-        \ tail
-        \ tcp_portmon
-        \ texeci
-        \ time
-        \ top
-        \ top_mem
-        \ totaldown
-        \ totalup
-        \ tztime
-        \ updates
-        \ upspeed
-        \ upspeedf
-        \ upspeedgraph
-        \ uptime
-        \ uptime_short
-        \ voffset
-        \ voltage_mv
-        \ voltage_v
-       \ wireless_essid
-       \ wireless_mode
-       \ wireless_bitrate
-       \ wireless_ap
-       \ wireless_link_qual
-       \ wireless_link_qual_max
-       \ wireless_link_qual_perc
-       \ wireless_link_bar
-        \ xmms2_artist
-        \ xmms2_album
-        \ xmms2_title
-        \ xmms2_genre
-        \ xmms2_comment
-        \ xmms2_url
-        \ xmms2_tracknr
-        \ xmms2_bitrate
-        \ xmms2_id
-        \ xmms2_duration
-        \ xmms2_elapsed
-        \ xmms2_date
-        \ xmms2_size
-        \ xmms2_percent
-        \ xmms2_status
-        \ xmms2_bar
-        \ xmms2_timesplayed
-        \ xmms2_playlist
-        \ xmms2_smart
+                       \ acpitemp
+                       \ acpitempf
+                       \ freq
+                       \ freq_g
+                       \ voltage_mv
+                       \ voltage_v
+                       \ wireless_essid
+                       \ wireless_mode
+                       \ wireless_bitrate
+                       \ wireless_ap
+                       \ wireless_link_qual
+                       \ wireless_link_qual_max
+                       \ wireless_link_qual_perc
+                       \ wireless_link_bar
+                       \ freq_dyn
+                       \ freq_dyn_g
+                       \ adt746xcpu
+                       \ adt746xfan
+                       \ acpifan
+                       \ acpiacadapter
+                       \ battery
+                       \ battery_time
+                       \ battery_percent
+                       \ battery_bar
+                       \ buffers
+                       \ cached
+                       \ cpu
+                       \ cpubar
+                       \ cpugraph
+                       \ loadgraph
+                       \ color
+                       \ color0
+                       \ color1
+                       \ color2
+                       \ color3
+                       \ color4
+                       \ color5
+                       \ color6
+                       \ color7
+                       \ color8
+                       \ color9
+                       \ conky_version
+                       \ conky_build_date
+                       \ conky_build_arch
+                       \ disk_protect
+                       \ i8k_version
+                       \ i8k_bios
+                       \ i8k_serial
+                       \ i8k_cpu_temp
+                       \ i8k_cpu_tempf
+                       \ i8k_left_fan_status
+                       \ i8k_right_fan_status
+                       \ i8k_left_fan_rpm
+                       \ i8k_right_fan_rpm
+                       \ i8k_ac_status
+                       \ i8k_buttons_status
+                       \ ibm_fan
+                       \ ibm_temps
+                       \ ibm_volume
+                       \ ibm_brightness
+                       \ if_up
+                       \ if_gw
+                       \ gw_iface
+                       \ gw_ip
+                       \ laptop_mode
+                       \ pb_battery
+                       \ obsd_sensors_temp
+                       \ obsd_sensors_fan
+                       \ obsd_sensors_volt
+                       \ obsd_vendor
+                       \ obsd_product
+                       \ font
+                       \ diskio
+                       \ diskio_write
+                       \ diskio_read
+                       \ diskiograph
+                       \ diskiograph_read
+                       \ diskiograph_write
+                       \ downspeed
+                       \ downspeedf
+                       \ downspeedgraph
+                       \ else
+                       \ endif
+                       \ addr
+                       \ addrs
+                       \ image
+                       \ exec
+                       \ execp
+                       \ execbar
+                       \ execgraph
+                       \ execibar
+                       \ execigraph
+                       \ execi
+                       \ execpi
+                       \ texeci
+                       \ imap_unseen
+                       \ imap_messages
+                       \ pop3_unseen
+                       \ pop3_used
+                       \ fs_bar
+                       \ fs_free
+                       \ fs_free_perc
+                       \ fs_size
+                       \ fs_type
+                       \ fs_used
+                       \ fs_bar_free
+                       \ fs_used_perc
+                       \ loadavg
+                       \ goto
+                       \ tab
+                       \ hr
+                       \ nameserver
+                       \ rss
+                       \ hddtemp
+                       \ offset
+                       \ voffset
+                       \ i2c
+                       \ platform
+                       \ hwmon
+                       \ alignr
+                       \ alignc
+                       \ if_empty
+                       \ if_existing
+                       \ if_mounted
+                       \ if_running
+                       \ ioscheduler
+                       \ kernel
+                       \ machine
+                       \ mem
+                       \ memmax
+                       \ memperc
+                       \ membar
+                       \ memgraph
+                       \ mixer
+                       \ mixerl
+                       \ mixerr
+                       \ mixerbar
+                       \ mixerlbar
+                       \ mixerrbar
+                       \ mails
+                       \ mboxscan
+                       \ new_mails
+                       \ nodename
+                       \ outlinecolor
+                       \ processes
+                       \ running_processes
+                       \ shadecolor
+                       \ stippled_hr
+                       \ swap
+                       \ swapmax
+                       \ swapperc
+                       \ swapbar
+                       \ sysname
+                       \ time
+                       \ utime
+                       \ tztime
+                       \ totaldown
+                       \ totalup
+                       \ updates
+                       \ upspeed
+                       \ upspeedf
+                       \ upspeedgraph
+                       \ uptime_short
+                       \ uptime
+                       \ user_names
+                       \ user_terms
+                       \ user_times
+                       \ user_number
+                       \ apm_adapter
+                       \ apm_battery_life
+                       \ apm_battery_time
+                       \ mpd_title
+                       \ mpd_artist
+                       \ mpd_album
+                       \ mpd_random
+                       \ mpd_repeat
+                       \ mpd_track
+                       \ mpd_name
+                       \ mpd_file
+                       \ mpd_vol
+                       \ mpd_bitrate
+                       \ mpd_status
+                       \ mpd_elapsed
+                       \ mpd_length
+                       \ mpd_percent
+                       \ mpd_bar
+                       \ mpd_smart
+                       \ xmms2_artist
+                       \ xmms2_album
+                       \ xmms2_title
+                       \ xmms2_genre
+                       \ xmms2_comment
+                       \ xmms2_url
+                       \ xmms2_status
+                       \ xmms2_date
+                       \ xmms2_tracknr
+                       \ xmms2_bitrate
+                       \ xmms2_id
+                       \ xmms2_size
+                       \ xmms2_elapsed
+                       \ xmms2_duration
+                       \ xmms2_percent
+                       \ xmms2_bar
+                       \ xmms2_playlist
+                       \ xmms2_timesplayed
+                       \ xmms2_smart
+                       \ audacious_status
+                       \ audacious_title
+                       \ audacious_length
+                       \ audacious_length_seconds
+                       \ audacious_position
+                       \ audacious_position_seconds
+                       \ audacious_bitrate
+                       \ audacious_frequency
+                       \ audacious_channels
+                       \ audacious_filename
+                       \ audacious_playlist_length
+                       \ audacious_playlist_position
+                       \ audacious_bar
+                       \ bmpx_title
+                       \ bmpx_artist
+                       \ bmpx_album
+                       \ bmpx_uri
+                       \ bmpx_track
+                       \ bmpx_bitrate
+                       \ top
+                       \ top_mem
+                       \ tail
+                       \ head
+                       \ tcp_portmon
+                       \ iconv_start
+                       \ iconv_stop
+                       \ entropy_avail
+                       \ entropy_poolsize
+                       \ entropy_bar
+                       \ smapi
+                       \ if_smapi_bat_installed
+                       \ smapi_bat_perc
+                       \ smapi_bat_bar
 
 hi def link ConkyrcComment   Comment
 hi def link ConkyrcSetting   Keyword
index b8b3b36..ea24049 100644 (file)
@@ -4675,15 +4675,14 @@ static void generate_text_internal(char *p, int p_max_size,
                                        obj->data.net->addr.sa_data[4] & 255,
                                        obj->data.net->addr.sa_data[5] & 255);
                        }
-
 #if defined(__linux__)
-           OBJ(addrs) {
-                                    if(NULL != obj->data.net->addrs && strlen(obj->data.net->addrs) > 2)
-                                    {
-                                        obj->data.net->addrs[strlen(obj->data.net->addrs) - 2] = 0; /* remove ", " from end of string */
-                                        strcpy(p, obj->data.net->addrs);
-                                    }
-                                    else
+                       OBJ(addrs) {
+                               if(NULL != obj->data.net->addrs && strlen(obj->data.net->addrs) > 2)
+                               {
+                                       obj->data.net->addrs[strlen(obj->data.net->addrs) - 2] = 0; /* remove ", " from end of string */
+                                       strcpy(p, obj->data.net->addrs);
+                               }
+                               else
                                         strcpy(p, "0.0.0.0");
            }
 #endif /* __linux__ */