Merge branch 't/gui_improvements'
authorAndre Noll <maan@systemlinux.org>
Fri, 7 Jun 2013 19:34:51 +0000 (21:34 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 7 Jun 2013 19:38:17 +0000 (21:38 +0200)
Was cooking for more than one month.

bf1831 string: Speed up xvasprintf().
bcc083 string: Add discard feature for for_each_line().
e3868d string: Simplify return value of for_each_line().
d1f0f0 string: Simplify for_each_line().
23b121 string: Clean up for_each_line() and related functions.
6256ed string: Replace the for_each_line_modes enum by a bitmap.
14e689 gui: Don't sleep before executing the status command.
e90c6c gui: Speed up add_spaces().
20e2c6 gui: Rename do_exit().
ef0508 gui: Remove superfluous cmd_died.
d7562b gui: Check stdin for readability.
a44fa6 gui: Discard overlong input lines.

Conflicts:
gui.c

1  2 
NEWS
configure.ac
gui.c
string.c
string.h

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,11 -2,6 +2,12 @@@
  0.?.? (to be announced) "spectral gravity"
  ------------------------------------------
  
 +      - UTF8 support for para_gui and the mp3 audio format handler.
 +      - Scheduler improvements and fixes.
 +      - The obsolete gettimeofday() function has been replaced
 +        by clock_gettime() on systems which support it.
++      - Speed and usability improvements for para_gui.
 +
  -----------------------------------------
  0.4.12 (2012-12-20) "volatile relativity"
  -----------------------------------------
diff --cc configure.ac
Simple merge
diff --cc gui.c
--- 1/gui.c
--- 2/gui.c
+++ b/gui.c
@@@ -10,7 -10,7 +10,8 @@@
  #include <signal.h>
  #include <sys/types.h>
  #include <curses.h>
 +#include <locale.h>
+ #include <sys/time.h>
  
  #include "gui.cmdline.h"
  #include "para.h"
diff --cc string.c
Simple merge
diff --cc string.h
Simple merge