mirror of
https://github.com/Llewellynvdm/conky.git
synced 2025-01-28 01:28:30 +00:00
Add support for $ical
This commit is contained in:
parent
b4bcc0814f
commit
a13c56a7a5
@ -149,4 +149,6 @@ endif(BUILD_WEATHER_XOAP)
|
|||||||
|
|
||||||
option(BUILD_APCUPSD "Enable APCUPSD support" true)
|
option(BUILD_APCUPSD "Enable APCUPSD support" true)
|
||||||
|
|
||||||
|
option(BUILD_ICAL "Enable if you want iCalendar (RFC 5545) support" true)
|
||||||
|
|
||||||
option(BUILD_ICONV "Enable iconv support" false)
|
option(BUILD_ICONV "Enable iconv support" false)
|
||||||
|
@ -66,6 +66,10 @@ if(BUILD_MATH)
|
|||||||
set(conky_libs ${conky_libs} -lm)
|
set(conky_libs ${conky_libs} -lm)
|
||||||
endif(BUILD_MATH)
|
endif(BUILD_MATH)
|
||||||
|
|
||||||
|
if(BUILD_ICAL)
|
||||||
|
set(conky_libs ${conky_libs} -lical)
|
||||||
|
endif(BUILD_ICAL)
|
||||||
|
|
||||||
if(BUILD_BUILTIN_CONFIG)
|
if(BUILD_BUILTIN_CONFIG)
|
||||||
check_function_exists(fopencookie HAVE_FOPENCOOKIE)
|
check_function_exists(fopencookie HAVE_FOPENCOOKIE)
|
||||||
check_function_exists(funopen HAVE_FUNOPEN)
|
check_function_exists(funopen HAVE_FUNOPEN)
|
||||||
|
@ -87,6 +87,8 @@
|
|||||||
|
|
||||||
#cmakedefine BUILD_WLAN 1
|
#cmakedefine BUILD_WLAN 1
|
||||||
|
|
||||||
|
#cmakedefine BUILD_ICAL 1
|
||||||
|
|
||||||
#cmakedefine BUILD_ICONV 1
|
#cmakedefine BUILD_ICONV 1
|
||||||
|
|
||||||
#cmakedefine BUILD_LUA_CAIRO 1
|
#cmakedefine BUILD_LUA_CAIRO 1
|
||||||
|
@ -1537,6 +1537,20 @@
|
|||||||
volume, controlled by the volume keys (0-14).
|
volume, controlled by the volume keys (0-14).
|
||||||
<para /></listitem>
|
<para /></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<command>
|
||||||
|
<option>ical</option>
|
||||||
|
</command>
|
||||||
|
<option>number file</option>
|
||||||
|
</term>
|
||||||
|
<listitem>Shows title of event number 'number' in the ical (RFC 5545) file
|
||||||
|
'file'. The events are first ordered by starting time, events that started
|
||||||
|
in the past are ignored. The events that are shown are the VEVENTS, the
|
||||||
|
title that is shown is the SUMMARY and the starting time used for sorting
|
||||||
|
is DTSTART .
|
||||||
|
<para /></listitem>
|
||||||
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>
|
<term>
|
||||||
<command>
|
<command>
|
||||||
|
@ -11,7 +11,7 @@ color green "\<(alignment|append_file|background|border_inner_margin|border_oute
|
|||||||
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|middle_middle|undecorated|yes)\>"
|
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|middle_middle|undecorated|yes)\>"
|
||||||
|
|
||||||
## Variables
|
## Variables
|
||||||
color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|include|ioscheduler|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|pre_exec|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\>"
|
color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|ical|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|include|ioscheduler|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|pre_exec|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\>"
|
||||||
|
|
||||||
color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
|
color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
|
||||||
color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
|
color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
|
||||||
|
@ -50,7 +50,7 @@ syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcV
|
|||||||
|
|
||||||
syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName
|
syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName
|
||||||
|
|
||||||
syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite acpiacadapter acpifan acpitemp addr addrs alignc alignr apcupsd apcupsd_cable apcupsd_charge apcupsd_lastxfer apcupsd_linev apcupsd_load apcupsd_loadbar apcupsd_loadgauge apcupsd_loadgraph apcupsd_model apcupsd_name apcupsd_status apcupsd_temp apcupsd_timeleft apcupsd_upsmode apm_adapter apm_battery_life apm_battery_time audacious_bar audacious_bitrate audacious_channels audacious_filename audacious_frequency audacious_length audacious_length_seconds audacious_main_volume audacious_playlist_length audacious_playlist_position audacious_position audacious_position_seconds audacious_status audacious_title battery battery_bar battery_percent battery_short battery_time blink bmpx_album bmpx_artist bmpx_bitrate bmpx_title bmpx_track bmpx_uri buffers cached cmdline_to_pid color color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 combine conky_build_arch conky_build_date conky_version cpu cpubar cpugauge cpugraph curl desktop desktop_name desktop_number disk_protect diskio diskio_read diskio_write diskiograph diskiograph_read diskiograph_write distribution downspeed downspeedf downspeedgraph draft_mails else endif entropy_avail entropy_bar entropy_perc entropy_poolsize eval eve exec execbar execgauge execgraph execi execibar execigauge execigraph execp execpi flagged_mails font format_time forwarded_mails freq freq_g fs_bar fs_bar_free fs_free fs_free_perc fs_size fs_type fs_used fs_used_perc goto gw_iface gw_ip hddtemp head hr hwmon i2c i8k_ac_status i8k_bios i8k_buttons_status i8k_cpu_temp i8k_left_fan_rpm i8k_left_fan_status i8k_right_fan_rpm i8k_right_fan_status i8k_serial i8k_version ibm_brightness ibm_fan ibm_temps ibm_volume iconv_start iconv_stop if_empty if_existing if_gw if_match if_mixer_mute if_mounted if_mpd_playing if_running if_smapi_bat_installed if_up if_updatenr if_xmms2_connected image imap_messages imap_unseen include ioscheduler kernel laptop_mode lines loadavg loadgraph lua lua_bar lua_gauge lua_graph lua_parse machine mails mboxscan mem memwithbuffers membar memwithbuffersbar memeasyfree memfree memgauge memgraph memmax memperc mixer mixerbar mixerl mixerlbar mixerr mixerrbar moc_album moc_artist moc_bitrate moc_curtime moc_file moc_rate moc_song moc_state moc_timeleft moc_title moc_totaltime monitor monitor_number mpd_album mpd_artist mpd_bar mpd_bitrate mpd_elapsed mpd_file mpd_length mpd_name mpd_percent mpd_random mpd_repeat mpd_smart mpd_status mpd_title mpd_track mpd_vol mysql nameserver new_mails nodename nodename_short no_update nvidia obsd_product obsd_sensors_fan obsd_sensors_temp obsd_sensors_volt obsd_vendor offset outlinecolor pb_battery pid_chroot pid_cmdline pid_cwd pid_environ pid_environ_list pid_exe pid_nice pid_openfiles pid_parent pid_priority pid_state pid_state_short pid_stderr pid_stdin pid_stdout pid_threads pid_thread_list pid_time_kernelmode pid_time_usermode pid_time pid_uid pid_euid pid_suid pid_fsuid pid_gid pid_egid pid_sgid pid_fsgid pid_read pid_vmpeak pid_vmsize pid_vmlck pid_vmhwm pid_vmrss pid_vmdata pid_vmstk pid_vmexe pid_vmlib pid_vmpte pid_write platform pop3_unseen pop3_used pre_exec processes read_tcp read_udp replied_mails rss running_processes running_threads scroll seen_mails shadecolor smapi smapi_bat_bar smapi_bat_perc smapi_bat_power smapi_bat_temp sony_fanspeed stippled_hr stock swap swapbar swapfree swapmax swapperc sysname tab tail tcp_ping tcp_portmon template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 texeci texecpi threads time to_bytes top top_io top_mem top_time totaldown totalup trashed_mails tztime gid_name uid_name unflagged_mails unforwarded_mails unreplied_mails unseen_mails updates upspeed upspeedf upspeedgraph uptime uptime_short user_names user_number user_terms user_times user_time utime voffset voltage_mv voltage_v weather wireless_ap wireless_bitrate wireless_essid wireless_link_bar wireless_link_qual wireless_link_qual_max wireless_link_qual_perc wireless_mode words xmms2_album xmms2_artist xmms2_bar xmms2_bitrate xmms2_comment xmms2_date xmms2_duration xmms2_elapsed xmms2_genre xmms2_id xmms2_percent xmms2_playlist xmms2_size xmms2_smart xmms2_status xmms2_timesplayed xmms2_title xmms2_tracknr xmms2_url
|
syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite acpiacadapter acpifan acpitemp addr addrs alignc alignr apcupsd apcupsd_cable apcupsd_charge apcupsd_lastxfer apcupsd_linev apcupsd_load apcupsd_loadbar apcupsd_loadgauge apcupsd_loadgraph apcupsd_model apcupsd_name apcupsd_status apcupsd_temp apcupsd_timeleft apcupsd_upsmode apm_adapter apm_battery_life apm_battery_time audacious_bar audacious_bitrate audacious_channels audacious_filename audacious_frequency audacious_length audacious_length_seconds audacious_main_volume audacious_playlist_length audacious_playlist_position audacious_position audacious_position_seconds audacious_status audacious_title battery battery_bar battery_percent battery_short battery_time blink bmpx_album bmpx_artist bmpx_bitrate bmpx_title bmpx_track bmpx_uri buffers cached cmdline_to_pid color color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 combine conky_build_arch conky_build_date conky_version cpu cpubar cpugauge cpugraph curl desktop desktop_name desktop_number disk_protect diskio diskio_read diskio_write diskiograph diskiograph_read diskiograph_write distribution downspeed downspeedf downspeedgraph draft_mails else endif entropy_avail entropy_bar entropy_perc entropy_poolsize eval eve exec execbar execgauge execgraph execi execibar execigauge execigraph execp execpi flagged_mails font format_time forwarded_mails freq freq_g fs_bar fs_bar_free fs_free fs_free_perc fs_size fs_type fs_used fs_used_perc goto gw_iface gw_ip hddtemp head hr hwmon i2c i8k_ac_status i8k_bios i8k_buttons_status i8k_cpu_temp i8k_left_fan_rpm i8k_left_fan_status i8k_right_fan_rpm i8k_right_fan_status i8k_serial i8k_version ibm_brightness ibm_fan ibm_temps ibm_volume ical iconv_start iconv_stop if_empty if_existing if_gw if_match if_mixer_mute if_mounted if_mpd_playing if_running if_smapi_bat_installed if_up if_updatenr if_xmms2_connected image imap_messages imap_unseen include ioscheduler kernel laptop_mode lines loadavg loadgraph lua lua_bar lua_gauge lua_graph lua_parse machine mails mboxscan mem memwithbuffers membar memwithbuffersbar memeasyfree memfree memgauge memgraph memmax memperc mixer mixerbar mixerl mixerlbar mixerr mixerrbar moc_album moc_artist moc_bitrate moc_curtime moc_file moc_rate moc_song moc_state moc_timeleft moc_title moc_totaltime monitor monitor_number mpd_album mpd_artist mpd_bar mpd_bitrate mpd_elapsed mpd_file mpd_length mpd_name mpd_percent mpd_random mpd_repeat mpd_smart mpd_status mpd_title mpd_track mpd_vol mysql nameserver new_mails nodename nodename_short no_update nvidia obsd_product obsd_sensors_fan obsd_sensors_temp obsd_sensors_volt obsd_vendor offset outlinecolor pb_battery pid_chroot pid_cmdline pid_cwd pid_environ pid_environ_list pid_exe pid_nice pid_openfiles pid_parent pid_priority pid_state pid_state_short pid_stderr pid_stdin pid_stdout pid_threads pid_thread_list pid_time_kernelmode pid_time_usermode pid_time pid_uid pid_euid pid_suid pid_fsuid pid_gid pid_egid pid_sgid pid_fsgid pid_read pid_vmpeak pid_vmsize pid_vmlck pid_vmhwm pid_vmrss pid_vmdata pid_vmstk pid_vmexe pid_vmlib pid_vmpte pid_write platform pop3_unseen pop3_used pre_exec processes read_tcp read_udp replied_mails rss running_processes running_threads scroll seen_mails shadecolor smapi smapi_bat_bar smapi_bat_perc smapi_bat_power smapi_bat_temp sony_fanspeed stippled_hr stock swap swapbar swapfree swapmax swapperc sysname tab tail tcp_ping tcp_portmon template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 texeci texecpi threads time to_bytes top top_io top_mem top_time totaldown totalup trashed_mails tztime gid_name uid_name unflagged_mails unforwarded_mails unreplied_mails unseen_mails updates upspeed upspeedf upspeedgraph uptime uptime_short user_names user_number user_terms user_times user_time utime voffset voltage_mv voltage_v weather wireless_ap wireless_bitrate wireless_essid wireless_link_bar wireless_link_qual wireless_link_qual_max wireless_link_qual_perc wireless_mode words xmms2_album xmms2_artist xmms2_bar xmms2_bitrate xmms2_comment xmms2_date xmms2_duration xmms2_elapsed xmms2_genre xmms2_id xmms2_percent xmms2_playlist xmms2_size xmms2_smart xmms2_status xmms2_timesplayed xmms2_title xmms2_tracknr xmms2_url
|
||||||
|
|
||||||
hi def link ConkyrcComment Comment
|
hi def link ConkyrcComment Comment
|
||||||
hi def link ConkyrcSetting Keyword
|
hi def link ConkyrcSetting Keyword
|
||||||
|
@ -165,6 +165,11 @@ if(BUILD_APCUPSD)
|
|||||||
set(optional_sources ${optional_sources} ${apcupsd})
|
set(optional_sources ${optional_sources} ${apcupsd})
|
||||||
endif(BUILD_APCUPSD)
|
endif(BUILD_APCUPSD)
|
||||||
|
|
||||||
|
if(BUILD_ICAL)
|
||||||
|
set(ical ical.cc)
|
||||||
|
set(optional_sources ${optional_sources} ${ical})
|
||||||
|
endif(BUILD_ICAL)
|
||||||
|
|
||||||
if(BUILD_ICONV)
|
if(BUILD_ICONV)
|
||||||
set(iconv iconv_tools.cc)
|
set(iconv iconv_tools.cc)
|
||||||
set(optional_sources ${optional_sources} ${iconv})
|
set(optional_sources ${optional_sources} ${iconv})
|
||||||
|
@ -45,6 +45,9 @@
|
|||||||
#ifdef BUILD_MYSQL
|
#ifdef BUILD_MYSQL
|
||||||
#include "mysql.h"
|
#include "mysql.h"
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef BUILD_ICAL
|
||||||
|
#include "ical.h"
|
||||||
|
#endif
|
||||||
#ifdef BUILD_X11
|
#ifdef BUILD_X11
|
||||||
#include "fonts.h"
|
#include "fonts.h"
|
||||||
#endif
|
#endif
|
||||||
@ -1215,6 +1218,12 @@ struct text_object *construct_text_object(char *s, const char *arg, long
|
|||||||
scan_tztime(obj, arg);
|
scan_tztime(obj, arg);
|
||||||
obj->callbacks.print = &print_tztime;
|
obj->callbacks.print = &print_tztime;
|
||||||
obj->callbacks.free = &free_tztime;
|
obj->callbacks.free = &free_tztime;
|
||||||
|
#ifdef BUILD_ICAL
|
||||||
|
END OBJ_ARG(ical, 0, "ical requires arguments")
|
||||||
|
parse_ical_args(obj, arg, free_at_crash, s);
|
||||||
|
obj->callbacks.print = &print_ical;
|
||||||
|
obj->callbacks.free = &free_ical;
|
||||||
|
#endif
|
||||||
#ifdef BUILD_ICONV
|
#ifdef BUILD_ICONV
|
||||||
END OBJ_ARG(iconv_start, 0, "Iconv requires arguments")
|
END OBJ_ARG(iconv_start, 0, "Iconv requires arguments")
|
||||||
init_iconv_start(obj, free_at_crash, arg);
|
init_iconv_start(obj, free_at_crash, arg);
|
||||||
|
163
src/ical.cc
Normal file
163
src/ical.cc
Normal file
@ -0,0 +1,163 @@
|
|||||||
|
/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
|
||||||
|
* vim: ts=4 sw=4 noet ai cindent syntax=cpp
|
||||||
|
*
|
||||||
|
* Conky, a system monitor, based on torsmo
|
||||||
|
*
|
||||||
|
* Please see COPYING for details
|
||||||
|
*
|
||||||
|
* Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
|
||||||
|
* (see AUTHORS)
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <libical/ical.h>
|
||||||
|
#include "logging.h"
|
||||||
|
|
||||||
|
struct ical_event {
|
||||||
|
icaltimetype start;
|
||||||
|
icalcomponent *event;
|
||||||
|
ical_event *next, *prev;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct obj_ical {
|
||||||
|
struct ical_event *list;
|
||||||
|
icalcomponent *comps;
|
||||||
|
icalparser *parser;
|
||||||
|
unsigned int num;
|
||||||
|
};
|
||||||
|
|
||||||
|
char* read_stream(char *s, size_t size, void *d) {
|
||||||
|
return fgets(s, size, (FILE*) d);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev) {
|
||||||
|
struct ical_event *ev_new, *ev_cur;
|
||||||
|
icaltimetype start;
|
||||||
|
|
||||||
|
start = icalcomponent_get_dtstart(new_ev);
|
||||||
|
if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) return NULL;
|
||||||
|
ev_new = (struct ical_event *) malloc(sizeof(struct ical_event));
|
||||||
|
memset(ev_new, 0, sizeof(struct ical_event));
|
||||||
|
ev_new->event = new_ev;
|
||||||
|
ev_new->start = start;
|
||||||
|
if(listend) { //list already contains events
|
||||||
|
ev_cur = listend;
|
||||||
|
while(icaltime_compare(ev_new->start, ev_cur->start) <= 0) {
|
||||||
|
if( ! ev_cur->prev) { //ev_new starts first
|
||||||
|
ev_new->next = ev_cur;
|
||||||
|
ev_cur->prev = ev_new;
|
||||||
|
return listend;
|
||||||
|
}
|
||||||
|
ev_cur = ev_cur->prev;
|
||||||
|
}
|
||||||
|
if(ev_cur == listend) { //ev_new starts last
|
||||||
|
ev_cur->next = ev_new;
|
||||||
|
ev_new->prev = ev_cur;
|
||||||
|
return ev_new;
|
||||||
|
}
|
||||||
|
//ev_new somewhere in the middle
|
||||||
|
ev_new->prev = ev_cur;
|
||||||
|
ev_new->next = ev_cur->next;
|
||||||
|
ev_cur->next->prev = ev_new;
|
||||||
|
ev_cur->next = ev_new;
|
||||||
|
return listend;
|
||||||
|
}
|
||||||
|
return ev_new;
|
||||||
|
}
|
||||||
|
|
||||||
|
void parse_ical_args(struct text_object *obj, const char* arg, void *free_at_crash, void *free_at_crash2) {
|
||||||
|
char *filename = strdup(arg);
|
||||||
|
FILE *file;
|
||||||
|
icalparser *parser;
|
||||||
|
icalcomponent *allc, *curc;
|
||||||
|
struct ical_event *ll_start, *ll_end;
|
||||||
|
struct obj_ical *opaque;
|
||||||
|
unsigned int num;
|
||||||
|
|
||||||
|
if(sscanf(arg , "%d %s", &num, filename) != 2) {
|
||||||
|
free(filename);
|
||||||
|
free(obj);
|
||||||
|
CRIT_ERR(free_at_crash, free_at_crash2, "wrong number of arguments for $ical");
|
||||||
|
}
|
||||||
|
file = fopen(filename, "r");
|
||||||
|
if( ! file) {
|
||||||
|
free(obj);
|
||||||
|
free(free_at_crash);
|
||||||
|
CRIT_ERR(filename, free_at_crash2, "Can't read file %s", filename);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
free(filename);
|
||||||
|
parser = icalparser_new();
|
||||||
|
icalparser_set_gen_data(parser, file);
|
||||||
|
allc = icalparser_parse(parser, read_stream);
|
||||||
|
fclose(file);
|
||||||
|
curc = icalcomponent_get_first_component(allc, ICAL_VEVENT_COMPONENT);
|
||||||
|
if(!curc) {
|
||||||
|
icalparser_free(parser);
|
||||||
|
NORM_ERR("No ical events available");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ll_start = add_event(NULL, curc);
|
||||||
|
if(ll_start) {
|
||||||
|
ll_end = ll_start;
|
||||||
|
}
|
||||||
|
while(1) {
|
||||||
|
curc = icalcomponent_get_next_component(allc, ICAL_VEVENT_COMPONENT);
|
||||||
|
if(!curc) break;
|
||||||
|
ll_end = add_event(ll_end, curc);
|
||||||
|
if( ! ll_start) { //first component was not added
|
||||||
|
ll_start = ll_end;
|
||||||
|
}else if( ll_start->prev ) {
|
||||||
|
ll_start = ll_start->prev;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
opaque = (struct obj_ical *) malloc(sizeof(struct obj_ical));
|
||||||
|
opaque->list = ll_start;
|
||||||
|
opaque->parser = parser;
|
||||||
|
opaque->comps = allc;
|
||||||
|
opaque->num = num;
|
||||||
|
obj->data.opaque = opaque;
|
||||||
|
}
|
||||||
|
|
||||||
|
void print_ical(struct text_object *obj, char *p, int p_max_size) {
|
||||||
|
struct obj_ical *ical_obj = (struct obj_ical *) obj->data.opaque;
|
||||||
|
struct ical_event *ll_current = ical_obj->list;
|
||||||
|
|
||||||
|
unsigned int i=1;
|
||||||
|
while(1) {
|
||||||
|
if( ! ll_current) return;
|
||||||
|
if(i > ical_obj->num) return;
|
||||||
|
if(i == ical_obj->num) break;
|
||||||
|
if(i < ical_obj->num) {
|
||||||
|
ll_current = ll_current->next;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
snprintf(p, p_max_size, "%s", icalproperty_get_summary(icalcomponent_get_first_property(ll_current->event, ICAL_SUMMARY_PROPERTY)));
|
||||||
|
}
|
||||||
|
|
||||||
|
void free_ical(struct text_object *obj) {
|
||||||
|
struct obj_ical *ical_free_me = (struct obj_ical *) obj->data.opaque;
|
||||||
|
icalcomponent_free(ical_free_me->comps);
|
||||||
|
icalparser_free(ical_free_me->parser);
|
||||||
|
while(ical_free_me->list) {
|
||||||
|
if(ical_free_me->list->next) {
|
||||||
|
ical_free_me->list = ical_free_me->list->next;
|
||||||
|
free_and_zero(ical_free_me->list->prev);
|
||||||
|
} else free_and_zero(ical_free_me->list);
|
||||||
|
}
|
||||||
|
free(obj->data.opaque);
|
||||||
|
}
|
33
src/ical.h
Normal file
33
src/ical.h
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
|
||||||
|
* vim: ts=4 sw=4 noet ai cindent syntax=cpp
|
||||||
|
*
|
||||||
|
* Conky, a system monitor, based on torsmo
|
||||||
|
*
|
||||||
|
* Please see COPYING for details
|
||||||
|
*
|
||||||
|
* Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
|
||||||
|
* (see AUTHORS)
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ICAL_H_
|
||||||
|
#define ICAL_H_
|
||||||
|
|
||||||
|
void parse_ical_args(struct text_object *, const char*, void*, void*);
|
||||||
|
void print_ical(struct text_object *, char *, int);
|
||||||
|
void free_ical(struct text_object *);
|
||||||
|
|
||||||
|
#endif /*ICAL_H_*/
|
@ -30,6 +30,7 @@
|
|||||||
#ifndef _LOGGING_H
|
#ifndef _LOGGING_H
|
||||||
#define _LOGGING_H
|
#define _LOGGING_H
|
||||||
|
|
||||||
|
#include "conky.h"
|
||||||
#include "mail.h"
|
#include "mail.h"
|
||||||
|
|
||||||
void clean_up(void *memtofree1, void* memtofree2);
|
void clean_up(void *memtofree1, void* memtofree2);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user