/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire 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 2 of the License, or
+ * 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,
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* pr.c: Output to players
- *
+ *
* Known contributors to this file:
- * Dave Pare, 1986, 1989
+ * Dave Pare, 1986, 1989
* Steve McClure, 1998-2000
+ * Ron Koenderink, 2005
+ * Markus Armbruster, 2005-2011
*/
/*
#include <config.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
#include <stdarg.h>
-#include "proto.h"
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
+#include <stdlib.h>
+#include "com.h"
#include "empio.h"
#include "file.h"
-#include "com.h"
-#include "tel.h"
-#include "server.h"
+#include "journal.h"
+#include "misc.h"
+#include "nat.h"
+#include "player.h"
+#include "proto.h"
#include "prototypes.h"
+#include "server.h"
+#include "tel.h"
+#include "xy.h"
static void pr_player(struct player *pl, int id, char *buf);
static void upr_player(struct player *pl, int id, char *buf);
upr_player(player, C_DATA, buf);
else
/* normal text and user text are identical */
- pr_player(player, C_DATA, buf);
+ pr_player(player, C_DATA, buf);
}
/*
* arguments. It is assumed to be already user text. Plain ASCII and
* text received from the same player are fine, for anything else the
* caller has to deal with output filtering.
- * If a partial line with different id is buffered, terminate it with
- * a newline first.
+ * If a partial line is buffered, terminate it with a newline first.
*/
void
pr_id(struct player *p, int id, char *format, ...)
if (p->curid >= 0) {
io_puts(p->iop, "\n");
+ journal_output(p, p->curid, "\n");
p->curid = -1;
}
va_start(ap, format);
if (!(pl->flags & PF_UTF8))
copy_utf8_to_ascii_no_funny(buf, buf);
pr_player(pl, C_FLASH, buf);
- io_output(pl->iop, IO_NOWAIT);
+ io_output(pl->iop, 0);
}
/*
(void)vsprintf(buf, format, ap);
va_end(ap);
pr_player(pl, C_INFORM, buf);
- io_output(pl->iop, IO_NOWAIT);
+ io_output(pl->iop, 0);
}
/*
* Send C_FLASH text to everyone.
* Format text to send using printf-style FORMAT and optional
* arguments. It is assumed to be plain ASCII.
+ * Prefix text it with a header suitable for broadcast from deity.
* Initiate an output queue flush, but do not wait for it to complete.
*/
void
pr_wall(char *format, ...)
{
+ time_t now;
+ struct tm *tm;
char buf[4096]; /* UTF-8 */
+ int n;
struct player *p;
va_list ap;
+ time(&now);
+ tm = localtime(&now);
+ n = sprintf(buf, "BROADCAST from %s @ %02d:%02d: ",
+ getnatp(0)->nat_cnam, tm->tm_hour, tm->tm_min);
+
va_start(ap, format);
- (void)vsprintf(buf, format, ap);
+ (void)vsprintf(buf + n, format, ap);
va_end(ap);
- for (p = player_next(0); p; p = player_next(p)) {
+ for (p = player_next(NULL); p; p = player_next(p)) {
if (p->state != PS_PLAYING)
continue;
pr_player(p, C_FLASH, buf);
- io_output(p->iop, IO_NOWAIT);
+ io_output(p->iop, 0);
}
}
char *bp;
int len;
+ journal_output(pl, id, buf);
+
bp = buf;
while (*bp != '\0') {
if (pl->curid != -1 && pl->curid != id) {
p = strchr(bp, '\n');
if (p != NULL) {
len = (p - bp) + 1;
- if ((pl->command && (pl->command->c_flags & C_MOD)) ||
- (player != pl))
- io_write(pl->iop, bp, len, IO_NOWAIT);
- else
- io_write(pl->iop, bp, len, IO_WAIT);
+ io_write(pl->iop, bp, len);
bp += len;
pl->curid = -1;
} else {
bp += len;
}
}
+
+ if (player == pl) {
+ while (io_output_if_queue_long(pl->iop,
+ pl->may_sleep == PLAYER_SLEEP_FREELY) > 0)
+ ;
+ }
}
/*
char printbuf[2];
char ch;
+ journal_output(pl, id, buf);
+
printbuf[0] = '\0';
printbuf[1] = '\0';
}
}
if (ch == '\n') {
- if ((pl->command && (pl->command->c_flags & C_MOD)) ||
- (player != pl))
- io_write(pl->iop, &ch, 1, IO_NOWAIT);
- else
- io_write(pl->iop, &ch, 1, IO_WAIT);
+ io_write(pl->iop, &ch, 1);
pl->curid = -1;
} else {
printbuf[0] = ch;
io_puts(pl->iop, printbuf);
}
}
+
+ if (player == pl) {
+ while (io_output_if_queue_long(pl->iop,
+ pl->may_sleep == PLAYER_SLEEP_FREELY) > 0)
+ ;
+ }
}
/*
/*
* Send script execute request FILE to the current player.
- * REDIR is UTF-8, but non-ASCII characters can occur only if the
+ * FILE is UTF-8, but non-ASCII characters can occur only if the
* player sent them. Therefore, it is also user text.
*/
void
{
int r;
- /*
- * Each prompt must consume one line of input. recvclient()
- * doesn't do that while player->aborted.
- */
- CANT_HAPPEN(player->aborted);
+ if (CANT_HAPPEN(!prompt))
+ prompt = "? ";
pr_id(player, C_FLUSH, "%s\n", prompt);
if ((r = recvclient(buf, size)) < 0)
{
int r;
- /* See prmptrd() */
- CANT_HAPPEN(player->aborted);
+ if (CANT_HAPPEN(!prompt))
+ prompt = "? ";
pr_id(player, C_FLUSH, "%s\n", prompt);
if ((r = recvclient(buf, size)) < 0)
}
/*
- * Print coordinates X, Y for COUNTRY.
+ * Print coordinates X, Y.
* FORMAT must be a printf-style format string that converts exactly
* two int values.
*/
void
-prxy(char *format, coord x, coord y, natid country)
+prxy(char *format, coord x, coord y)
{
- char buf[255];
struct natstr *np;
- np = getnatp(country);
- sprintf(buf, format, xrel(np, x), yrel(np, y));
- pr(buf);
-}
-
-/*
- * Print to country CN similar to printf().
- * Use printf-style FORMAT with the optional arguments.
- * Output is buffered until a newline arrives.
- * If CN is the current player and we're not in the update, print just
- * like pr(). Else print into a bulletin.
- * Because printing like pr() requires normal text, and bulletins
- * require user text, only plain ASCII is allowed.
- */
-void
-PR(int cn, char *format, ...)
-{
- /* XXX should really do this on a per-nation basis */
- static char longline[MAXNOC][512];
- int newline;
- va_list ap;
- char buf[1024];
-
- va_start(ap, format);
- (void)vsprintf(buf, format, ap);
- va_end(ap);
- newline = strrchr(buf, '\n') ? 1 : 0;
- strcat(longline[cn], buf);
- if (newline) {
- if (update_pending || (cn && cn != player->cnum))
- typed_wu(0, cn, longline[cn], TEL_BULLETIN);
- else
- pr_player(player, C_DATA, longline[cn]);
- longline[cn][0] = '\0';
- }
-}
-
-/*
- * Print the current time in ctime() format to country CN.
- * If CN is the current player and we're not in the update, print just
- * like prdate(). Else print into a bulletin.
- */
-void
-PRdate(natid cn)
-{
- time_t now;
-
- (void)time(&now);
- PR(cn, ctime(&now));
+ np = getnatp(player->cnum);
+ pr(format, xrel(np, x), yrel(np, y));
}
/*
}
/*
- * Print to country CN similar to printf().
- * Use printf-style FORMAT with the optional arguments.
- * If CN is the current player and we're not in the update, print just
- * like pr(). Else print into a bulletin.
+ * Print complete lines to country CN similar to printf().
+ * Use printf-style FORMAT with the optional arguments. FORMAT must
+ * end with '\n'.
+ * If CN is zero, don't print anything.
+ * Else, if CN is the current player and we're not in the update,
+ * print just like pr(). Else print into a bulletin.
* Because printing like pr() requires normal text, and bulletins
* require user text, only plain ASCII is allowed.
*/
char buf[4096];
va_list ap;
+ CANT_HAPPEN(!format[0] || format[strlen(format) - 1] != '\n');
+ if (!cn)
+ return;
va_start(ap, format);
(void)vsprintf(buf, format, ap);
va_end(ap);
- if (cn) {
- if (update_pending || cn != player->cnum)
- typed_wu(0, cn, buf, TEL_BULLETIN);
- else
- pr_player(player, C_DATA, buf);
- }
+ if (update_running || cn != player->cnum)
+ wu(0, cn, "%s", buf);
+ else
+ pr_player(player, C_DATA, buf);
}
/*
if ((ch < 0x20 && ch != '\t' && ch != '\n') || ch == 0x7f)
; /* ignore funny control */
else if (ch > 0x7f)
- *p++ = '?'; /* replace non-ASCII */
+ *p++ = '?'; /* replace non-ASCII */
else
*p++ = ch;
}
; /* ignore funny control */
else if (ch > 0x7f) {
*p++ = '?'; /* replace non-ASCII */
- while ((*src++ & 0xc0) == 0x80) ;
+ while ((*src & 0xc0) == 0x80)
+ src++;
} else
*p++ = ch;
}
{
int i = 0;
- while (n && s[i])
- {
+ while (n && s[i]) {
if ((s[i++] & 0xc0) == 0xc0)
- while ((s[i] & 0xc0) == 0x80)
+ while ((s[i] & 0xc0) == 0x80)
i++;
- --n;
+ --n;
}
return i;
}
projects / empserver / blobdiff