From: Andre Noll <maan@systemlinux.org>
Date: Fri, 7 Jun 2013 19:34:51 +0000 (+0200)
Subject: Merge branch 't/gui_improvements'
X-Git-Tag: v0.4.13~33
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1775d4d4147730e79e48aa941aee88580b8beb08

Merge branch 't/gui_improvements'

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
---

1775d4d4147730e79e48aa941aee88580b8beb08
diff --cc NEWS
index 56f84753,f323df1d..a93fb2e3
--- a/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 gui.c
index 631e7cc5,85d77c9e..096beb93
--- a/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"