Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity
9b1a89e617
conky/src/common.h

165 lines
5.7 KiB
C
Raw Normal View History

Update modelines and stuff.
2010-01-07 03:45:19 +00:00
/* -*- 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/>.
*
Make -d switch work again -d was broken because fork-to-background was done after the update thread creation, so the threads ended up in the wrong process. This delays the thread creation until after the fork.
2009-09-22 16:19:08 +00:00
*/
add emacs indentation variables to source files in line with current vim settings
2009-07-28 21:44:22 +00:00
here comes the big header include rewrite Some statics are now defined by configure.ac.in, conky.h got a lot smaller, which I see as a positive sign. This patch should not change any functionality, just change what's defined where. Some features I did/could not test are probably broken, also compiling for any other OS surely won't complete now. Though I think fixing these problems is as easy as including some missing headers. I've done compile checks with the following configure options: ./configure --enable-eve --enable-rss --enable-smapi --enable-wlan --enable-debug --enable-testing So what needs to be tested is: - audacious - BMPx - xmms2 - nvidia
2008-12-15 21:40:24 +00:00
#ifndef _COMMON_H
#define _COMMON_H
#include <stdio.h>
Build fix patch This patch fixes build errors on some platforms due to missing includes.
2008-12-23 03:59:42 +00:00
#include <stdlib.h>
#include <string.h>
here comes the big header include rewrite Some statics are now defined by configure.ac.in, conky.h got a lot smaller, which I see as a positive sign. This patch should not change any functionality, just change what's defined where. Some features I did/could not test are probably broken, also compiling for any other OS surely won't complete now. Though I think fixing these problems is as easy as including some missing headers. I've done compile checks with the following configure options: ./configure --enable-eve --enable-rss --enable-smapi --enable-wlan --enable-debug --enable-testing So what needs to be tested is: - audacious - BMPx - xmms2 - nvidia
2008-12-15 21:40:24 +00:00
#include <sys/socket.h>
move loadavg and loadgraph code to common.c
2009-10-25 12:49:10 +00:00
#include "text_object.h"
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
#ifdef __cplusplus
extern "C" {
#endif
C++ conversions WIP. Currently stuck on an issue with g++ and using '%lli' with printf/scanf.
2010-01-04 17:06:14 +00:00
void print_to_bytes(struct text_object *, char *, int);
#ifdef __cplusplus
}
#endif
rework the update machinery to use callbacks Besides improving performance when updating stuff, we ideally have no text object specific code in update_stuff() anymore (aside some leftovers). The macros in construct_text_object() have gotten a bit crazier than they were before: * using CALLBACK(&func) instead of an INFO_* parameter to OBJ() will make it add the given callback to the list of callbacks to be iterated over at each update interval. * BEWARE: the above assumes function pointer values to be > 0! * This implicitly fixes a bug in the code: passing 0 as INFO_* value led to selecting INFO_MAIL (1 << 0 == 1). * Now it would select INFO_CPU (== 0), which got unused and therefore is not a problem at all (the 0 value should be unused in enums anyway). This needs some more work, then we should be able to drop the whole INFO_* enum. Then CALLBACK() can die again and with it goes the ugly casting stuff done to distinguish callbacks from INFO_* values.
2009-09-06 22:14:54 +00:00
void add_update_callback(void (*func)(void));
void free_update_callbacks(void);
Make -d switch work again -d was broken because fork-to-background was done after the update thread creation, so the threads ended up in the wrong process. This delays the thread creation until after the fork.
2009-09-22 16:19:08 +00:00
void start_update_threading(void);
Fix bug with SF id 2808272 (tail and head) To fix this bug the tail and head code was rewritten, everything should still work except tailing a FIFO instead of a normal head.
2009-07-21 21:41:47 +00:00
void strfold(char *start, int count);
if_mounted: convert to callbacks.iftest
2009-11-16 22:30:53 +00:00
int check_mount(struct text_object *);
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
void prepare_update(void);
void update_uptime(void);
void update_meminfo(void);
void update_net_stats(void);
void update_cpu_usage(void);
void update_total_processes(void);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
void update_uname(void);
Added support for $threads and fixed $processes on Linux
2009-11-07 17:14:04 +00:00
void update_threads(void);
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
void update_running_processes(void);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
void update_stuff(void);
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
char get_freq(char *, size_t, const char *, int, unsigned int);
voltage: outsource printing code
2009-11-12 23:24:54 +00:00
void print_voltage_mv(struct text_object *, char *, int);
void print_voltage_v(struct text_object *, char *, int);
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
void update_load_average(void);
void update_top(void);
void free_all_processes(void);
struct process *get_first_process(void);
void get_cpu_count(void);
here comes the big header include rewrite Some statics are now defined by configure.ac.in, conky.h got a lot smaller, which I see as a positive sign. This patch should not change any functionality, just change what's defined where. Some features I did/could not test are probably broken, also compiling for any other OS surely won't complete now. Though I think fixing these problems is as easy as including some missing headers. I've done compile checks with the following configure options: ./configure --enable-eve --enable-rss --enable-smapi --enable-wlan --enable-debug --enable-testing So what needs to be tested is: - audacious - BMPx - xmms2 - nvidia
2008-12-15 21:40:24 +00:00
double get_time(void);
Allow ~/... and $HOME/... paths for more stuff.
2009-05-25 04:33:47 +00:00
/* Converts '~/...' paths to '/home/blah/...' assumes that 'dest' is at least
* DEFAULT_TEXT_BUFFER_SIZE. It's similar to variable_substitute, except only
* cheques for $HOME and ~/ in path */
void to_real_path(char *dest, const char *source);
Let $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7c4a4a4f04aa0a414901f01f0d7d198 ), and fix memory bug when to_real_path is used in init_tailhead
2009-07-22 20:08:31 +00:00
FILE *open_file(const char *file, int *reported);
int open_fifo(const char *file, int *reported);
here comes the big header include rewrite Some statics are now defined by configure.ac.in, conky.h got a lot smaller, which I see as a positive sign. This patch should not change any functionality, just change what's defined where. Some features I did/could not test are probably broken, also compiling for any other OS surely won't complete now. Though I think fixing these problems is as easy as including some missing headers. I've done compile checks with the following configure options: ./configure --enable-eve --enable-rss --enable-smapi --enable-wlan --enable-debug --enable-testing So what needs to be tested is: - audacious - BMPx - xmms2 - nvidia
2008-12-15 21:40:24 +00:00
void variable_substitute(const char *s, char *dest, unsigned int n);
void format_seconds(char *buf, unsigned int n, long t);
void format_seconds_short(char *buf, unsigned int n, long t);
Patch to fix rounding error with CPU values.
2009-05-18 05:30:10 +00:00
int round_to_int_temp(float);
unsigned int round_to_int(float);
here comes the big header include rewrite Some statics are now defined by configure.ac.in, conky.h got a lot smaller, which I see as a positive sign. This patch should not change any functionality, just change what's defined where. Some features I did/could not test are probably broken, also compiling for any other OS surely won't complete now. Though I think fixing these problems is as easy as including some missing headers. I've done compile checks with the following configure options: ./configure --enable-eve --enable-rss --enable-smapi --enable-wlan --enable-debug --enable-testing So what needs to be tested is: - audacious - BMPx - xmms2 - nvidia
2008-12-15 21:40:24 +00:00
extern int no_buffers;
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
int open_acpi_temperature(const char *name);
double get_acpi_temperature(int fd);
Add optional argument to $acpiacadapter The exact location of the state information seems hardware dependent, so this adds the option to specify it manually. (linux only)
2010-01-24 14:34:03 +00:00
void get_acpi_ac_adapter(char *p_client_buffer, size_t client_buffer_size, const char *adapter);
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
void get_acpi_fan(char *, size_t);
void get_battery_stuff(char *buf, unsigned int n, const char *bat, int item);
int get_battery_perct(const char *bat);
convert get_battery_perct_bar to double
2009-12-04 00:17:47 +00:00
double get_battery_perct_bar(struct text_object *);
Patch to add $battery_short variable.
2009-02-18 04:49:45 +00:00
void get_battery_short_status(char *buf, unsigned int n, const char *bat);
Split conky.h into several smaller header files In order to do this correctly: Removed duplicate includes Fixed mpd functions to accept mpd_s instead of information Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants) git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
move loadavg and loadgraph code to common.c
2009-10-25 12:49:10 +00:00
void scan_loadavg_arg(struct text_object *, const char *);
void print_loadavg(struct text_object *, char *, int);
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
move loadavg and loadgraph code to common.c
2009-10-25 12:49:10 +00:00
void scan_loadgraph_arg(struct text_object *, const char *);
convert loadgraphval to double
2009-12-04 00:49:31 +00:00
double loadgraphval(struct text_object *);
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
move loadavg and loadgraph code to common.c
2009-10-25 12:49:10 +00:00
convert cpu to callbacks.percentage
2009-11-25 00:30:21 +00:00
uint8_t cpu_percentage(struct text_object *);
convert cpu_barval to double
2009-12-04 00:19:07 +00:00
double cpu_barval(struct text_object *);
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
void print_mem(struct text_object *, char *, int);
void print_memeasyfree(struct text_object *, char *, int);
void print_memfree(struct text_object *, char *, int);
void print_memmax(struct text_object *, char *, int);
void print_swap(struct text_object *, char *, int);
void print_swapfree(struct text_object *, char *, int);
void print_swapmax(struct text_object *, char *, int);
convert memperc to callbacks.percentage
2009-11-25 00:33:13 +00:00
uint8_t mem_percentage(struct text_object *);
convert mem_barval to double
2009-12-04 00:22:36 +00:00
double mem_barval(struct text_object *);
convert swapperc to callbacks.percentage
2009-11-25 00:34:54 +00:00
uint8_t swap_percentage(struct text_object *);
convert swap_barval to double
2009-12-04 00:25:41 +00:00
double swap_barval(struct text_object *);
convert cpubar to callbacks.barval
2009-11-22 17:02:56 +00:00
convert kernel and machine to callbacks.print
2009-11-25 23:12:44 +00:00
void print_kernel(struct text_object *, char *, int);
void print_machine(struct text_object *, char *, int);
convert nodename to callbacks.print
2009-11-25 23:22:25 +00:00
void print_nodename(struct text_object *, char *, int);
convert sysname to callbacks.print
2009-11-25 23:29:50 +00:00
void print_sysname(struct text_object *, char *, int);
convert kernel and machine to callbacks.print
2009-11-25 23:12:44 +00:00
convert uptime objects to callbacks.print
2009-11-25 23:34:01 +00:00
void print_uptime(struct text_object *, char *, int);
void print_uptime_short(struct text_object *, char *, int);
convert processes and threads objects to callbacks.print
2009-11-26 00:06:53 +00:00
void print_processes(struct text_object *, char *, int);
void print_running_processes(struct text_object *, char *, int);
void print_running_threads(struct text_object *, char *, int);
void print_threads(struct text_object *, char *, int);
convert buffers and cached to callbacks.print
2009-11-26 00:10:19 +00:00
void print_buffers(struct text_object *, char *, int);
void print_cached(struct text_object *, char *, int);
convert eval to callbacks.print
2009-11-26 00:15:33 +00:00
void print_evaluate(struct text_object *, char *, int);
convert some ifblock objects to callbacks.iftest
2009-11-26 00:30:58 +00:00
int if_empty_iftest(struct text_object *);
int if_existing_iftest(struct text_object *);
int if_running_iftest(struct text_object *);
convert acpitemp to callbacks.{print,free}
2009-11-26 00:38:53 +00:00
#ifndef __OpenBSD__
void print_acpitemp(struct text_object *, char *, int);
void free_acpitemp(struct text_object *);
#endif /* !__OpenBSD__ */
convert freq and freq_g to callbacks.print
2009-11-26 00:42:54 +00:00
void print_freq(struct text_object *, char *, int);
void print_freq_g(struct text_object *, char *, int);
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
#ifndef __OpenBSD__
void print_acpifan(struct text_object *, char *, int);
void print_acpiacadapter(struct text_object *, char *, int);
void print_battery(struct text_object *, char *, int);
void print_battery_time(struct text_object *, char *, int);
uint8_t battery_percentage(struct text_object *);
void print_battery_short(struct text_object *, char *, int);
#endif /* !__OpenBSD__ */
convert blink to callbacks.print
2009-11-29 11:56:09 +00:00
void print_blink(struct text_object *, char *, int);
convert $include to callbacks.print
2009-11-29 11:59:04 +00:00
void print_include(struct text_object *, char *, int);
convert to_bytes to callbacks.print
2009-11-29 11:47:11 +00:00
convert $updates to callbacks.print
2009-11-29 18:48:24 +00:00
void print_updates(struct text_object *, char *, int);
convert if_updatenr to callbacks.iftest
2009-11-29 18:50:59 +00:00
int updatenr_iftest(struct text_object *);
convert $updates to callbacks.print
2009-11-29 18:48:24 +00:00
here comes the big header include rewrite Some statics are now defined by configure.ac.in, conky.h got a lot smaller, which I see as a positive sign. This patch should not change any functionality, just change what's defined where. Some features I did/could not test are probably broken, also compiling for any other OS surely won't complete now. Though I think fixing these problems is as easy as including some missing headers. I've done compile checks with the following configure options: ./configure --enable-eve --enable-rss --enable-smapi --enable-wlan --enable-debug --enable-testing So what needs to be tested is: - audacious - BMPx - xmms2 - nvidia
2008-12-15 21:40:24 +00:00
#endif /* _COMMON_H */
Copy Permalink