xdbe replaced with more generic pixmap based buffering but there are 2 bugs:

[monky] / src / top.h

diff --git a/src/top.h b/src/top.h
index 06eddef..51bf936 100644 (file)
--- a/src/top.h
+++ b/src/top.h
@@ -1,4 +1,6 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -8,7 +10,7 @@
  *
  * Copyright (c) 2005 Adi Zaimi, Dan Piponi <dan@tanelorn.demon.co.uk>,
  *                                       Dave Clark <clarkd@skynet.ca>
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -39,6 +41,7 @@
  ******************************************/
 
 #include "conky.h"
+#include "text_object.h"
 #define CPU_THRESHHOLD 0       /* threshhold for the cpu diff to appear */
 #include <time.h>
 #include <dirent.h>
@@ -56,6 +59,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <sys/time.h>
 
 #include <regex.h>
@@ -70,6 +74,7 @@
 
 #define PROCFS_TEMPLATE "/proc/%d/stat"
 #define PROCFS_TEMPLATE_MEM "/proc/%d/statm"
+#define PROCFS_TEMPLATE_IO "/proc/%d/io"
 #define PROCFS_CMDLINE_TEMPLATE "/proc/%d/cmdline"
 #define MAX_SP 10      // number of elements to sort
 
@@ -80,7 +85,12 @@ enum top_field {
        TOP_MEM,
        TOP_TIME,
        TOP_MEM_RES,
-       TOP_MEM_VSIZE
+       TOP_MEM_VSIZE,
+#ifdef IOSTATS
+       TOP_READ_BYTES,
+       TOP_WRITE_BYTES,
+       TOP_IO_PERC
+#endif
 };
 
 /******************************************
@@ -103,10 +113,16 @@ struct process {
        unsigned long total_cpu_time;
        unsigned int vsize;
        unsigned int rss;
+#ifdef IOSTATS
+       unsigned long long read_bytes;
+       unsigned long long previous_read_bytes;
+       unsigned long long write_bytes;
+       unsigned long long previous_write_bytes;
+       float io_perc;
+#endif
        unsigned int time_stamp;
        unsigned int counted;
        unsigned int changed;
-       float totalmem;
 };
 
 struct sorted_process {
@@ -116,6 +132,21 @@ struct sorted_process {
 };
 
 /* Pointer to head of process list */
-void process_find_top(struct process **, struct process **);
+void process_find_top(struct process **, struct process **, struct process **
+#ifdef IOSTATS
+               , struct process **
+#endif
+               );
+
+/* lookup a program by it's name */
+struct process *get_process_by_name(const char *);
+
+int parse_top_args(const char *s, const char *arg, struct text_object *obj);
+void print_top(struct text_object *, char *, int);
+void free_top(struct text_object *, int);
+
+/* return zero on success, non-zero otherwise */
+int set_top_name_width(const char *);
+
 
 #endif /* _top_h_ */