doc updates, others

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@13 7f574dfc-610e-0410-a909-a81674777703

diff --git a/README b/README
index 027da00..71dcaeb 100644 (file)
--- a/README
+++ b/README
@@ -95,8 +95,6 @@
    pad_percents          Pad percentages to this many decimals (0 = no        
                          padding)                                             
    stippled_borders      Border stippling (dashing) in pixels                 
-   top_sort_cpu          Set to yes to sort top output by cpu
-                         set to no to sort by mem usage
    total_run_times       Total number of times for Conky to update before
                          quitting.  Zero makes Conky run forever
    update_interval       Update interval in seconds                           
@@ -285,6 +283,8 @@
                                     The types are: "name", "pid", "cpu", and
                                     "mem".
                                     There can be a max of 10 processes listed.
+  top_mem           type, num       Same as top, except sorted by mem usage
+                                    instead of cpu
   totalup           net             Total upload, this one too, may overflow 
   updates                           Number of updates (for debugging)        
   upspeed           net             Upload speed in kilobytes                

diff --git a/conky.c b/conky.c
index a4520be..9fccfaa 100644 (file)
--- a/conky.c
+++ b/conky.c
@@ -162,7 +162,7 @@ static inline int calc_text_width(const char *s, unsigned int l)
 #ifdef XFT
        if (use_xft) {
                XGlyphInfo gi;
-               XftTextExtents8(display, xftfont, s, l, &gi);
+               XftTextExtentsUtf8(display, xftfont, s, l, &gi);
                return gi.xOff;
        } else
 #endif
@@ -529,7 +529,7 @@ struct text_object {
                        char *logfile;
                        double last_update;
                        float interval;
-                       char buffer[TEXT_BUFFER_SIZE*4];
+                       char buffer[TEXT_BUFFER_SIZE];
        } tail;
 
                struct {

diff --git a/conkyrc.sample b/conkyrc.sample
index 83dda90..c959b09 100644 (file)
--- a/conkyrc.sample
+++ b/conkyrc.sample
@@ -100,9 +100,6 @@ net_avg_samples 4
 # Add spaces to keep things from moving about?  This only affects certain objects.
 use_spacer no
 
-# Set to no to sort top output by mem usage instead of cpu
-top_sort_cpu yes
-
 #   mldonkey_hostname     Hostname for mldonkey stuff, defaults to localhost
 #   mldonkey_port         Mldonkey port, 4001 default
 #   mldonkey_login        Mldonkey login, default none
@@ -269,6 +266,8 @@ metar_station  CYBW
 #                                    The types are: "name", "pid", "cpu", and
 #                                    "mem".
 #                                    There can be a max of 10 processes listed.
+#  top_mem           type, num       Same as top, except sorted by mem usage
+#                                    instead of cpu
 #  totalup           net             Total upload, this one too, may overflow 
 #  updates                           Number of updates (for debugging)        
 #  upspeed           net             Upload speed in kilobytes                

diff --git a/linux.c b/linux.c
index 25daf4a..08f3ee3 100644 (file)
--- a/linux.c
+++ b/linux.c
@@ -27,8 +27,6 @@
 
 static struct sysinfo s_info;
 
-#define TEXT_BUFFER_SIZE (1024*4)
-
 static int show_nice_processes;
 
 void prepare_update()