bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added width marker for chat input and fixed linelength

Browse Source
This commit is contained in:
Michiel Broek
2006-02-06 14:23:35 +00:00
parent 8338e5fdaf
commit 807a6b8f5d
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mbsebbs/chat.c
View File

@@ -176,7 +176,7 @@ void clrtoeol(void)
*/
void Chat(char *username, char *channel)
{
int curpos = 0, stop = FALSE, data, rc;
int width, curpos = 0, stop = FALSE, data, rc;
unsigned char ch;
char sbuf[81], resp[128], *name, *mname;
static char buf[200];
@@ -220,19 +220,17 @@ void Chat(char *username, char *channel)
clear();
locate(1, 1);
colour(WHITE, BLUE);
clrtoeol();
snprintf(buf, 200, "%-*s", cols -1, " MBSE BBS Chat Server");
snprintf(buf, 200, "%-*s", cols, " MBSE BBS Chat Server");
mvprintw(1, 1, buf);
mname = xstrcpy(clencode(exitinfo.sUserName));
name = xstrcpy(clencode(exitinfo.Name));
width = cols - (strlen(name) + 3);
snprintf(buf, 200, "CCON,4,%d,%s,%s,0;", mypid, mname, name);
free(mname);
free(name);
// Syslog('c', "> %s", buf);
if (socket_send(buf) == 0) {
strncpy(buf, socket_receive(), sizeof(buf)-1);
// Syslog('c', "< %s", buf);
if (strncmp(buf, "200:1,", 6) == 0) {
Syslog('!', "Chatsever is not available");
colour(LIGHTRED, BLACK);
@@ -246,14 +244,15 @@ void Chat(char *username, char *channel)
locate(rows - 2, 1);
colour(WHITE, BLUE);
clrtoeol();
snprintf(buf, 200, "%-*s", cols -1, " Chat, type \"/EXIT\" to exit or \"/HELP\" for help");
snprintf(buf, 200, "%-*s", cols, " Chat, type \"/EXIT\" to exit or \"/HELP\" for help");
mvprintw(rows - 2, 1, buf);
colour(LIGHTGRAY, BLACK);
colour(WHITE, BLACK);
mvprintw(rows - 1, 1, ">");
mvprintw(rows - 1, width + 2, "<");
memset(&sbuf, 0, sizeof(sbuf));
memset(&rbuf, 0, sizeof(rbuf));
colour(LIGHTGRAY, BLACK);
/*
* If username and channelname are given, send the /nick and /join
@@ -268,7 +267,6 @@ void Chat(char *username, char *channel)
strcpy(buf, socket_receive());
}
// Syslog('c', "Start loop");
chatting = TRUE;
while (stop == FALSE) {
@@ -282,8 +280,6 @@ void Chat(char *username, char *channel)
if (socket_send(buf) == 0) {
strncpy(buf, socket_receive(), sizeof(buf)-1);
if (strncmp(buf, "100:2,", 6) == 0) {
// Syslog('c', "> CGET:1,%d;", mypid);
// Syslog('c', "< %s", buf);
strncpy(resp, strtok(buf, ":"), 10); /* Should be 100 */
strncpy(resp, strtok(NULL, ","), 5); /* Should be 2 */
strncpy(resp, strtok(NULL, ","), 5); /* 1= fatal, chat ended */
@@ -322,7 +318,7 @@ void Chat(char *username, char *channel)
/* if KEY_DEL isprint, do no output again */
} else if (isprint(ch) || traduce(&ch)) {
alarm_on();
if (curpos < 77) {
if (curpos < width) {
PUTCHAR(ch);
sbuf[curpos] = ch;
curpos++;
@@ -332,10 +328,8 @@ void Chat(char *username, char *channel)
} else if ((ch == '\r') && curpos) {
alarm_on();
snprintf(buf, 200, "CPUT:2,%d,%s;", mypid, clencode(sbuf));
// Syslog('c', "> %s", clencode(buf));
if (socket_send(buf) == 0) {
strcpy(buf, socket_receive());
// Syslog('c', "< %s", buf);
if (strncmp(buf, "100:2,", 6) == 0) {
strncpy(resp, strtok(buf, ":"), 10); /* Should be 100 */
strncpy(resp, strtok(NULL, ","), 5); /* Should be 2 */
@@ -353,7 +347,10 @@ void Chat(char *username, char *channel)
memset(&sbuf, 0, sizeof(sbuf));
locate(rows - 1, 2);
clrtoeol();
colour(WHITE, BLACK);
mvprintw(rows - 1, 1, ">");
mvprintw(rows - 1, width + 2, "<");
colour(LIGHTGRAY, BLACK);
}
}
chatting = FALSE;
@@ -367,8 +364,6 @@ void Chat(char *username, char *channel)
if (socket_send(buf) == 0) {
strncpy(buf, socket_receive(), sizeof(buf)-1);
if (strncmp(buf, "100:2,", 6) == 0) {
// Syslog('c', "> CGET:1,%d;", mypid);
// Syslog('c', "< %s", buf);
strncpy(resp, strtok(buf, ":"), 10); /* Should be 100 */
strncpy(resp, strtok(NULL, ","), 5); /* Should be 2 */
strncpy(resp, strtok(NULL, ","), 5); /* 1= fatal error */
@@ -404,10 +399,8 @@ void Chat(char *username, char *channel)
* Close server connection
*/
snprintf(buf, 200, "CCLO,1,%d;", mypid);
// Syslog('c', "> %s", buf);
if (socket_send(buf) == 0) {
strcpy(buf, socket_receive());
// Syslog('c', "< %s", buf);
}
sleep(2);
clear();

6
mbsebbs/input.c
View File

@@ -4,7 +4,7 @@
* Purpose ...............: Input functions, also for some utils.
*
*****************************************************************************
* Copyright (C) 1997-2005
* Copyright (C) 1997-2006
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -50,6 +50,10 @@ void CheckScreen(void)
struct winsize ws;
if (ioctl(1, TIOCGWINSZ, &ws) != -1 && (ws.ws_col > 0) && (ws.ws_row > 0)) {
if (ws.ws_col != 80)
ws.ws_col = 80;
if (ws.ws_row < 24)
ws.ws_row = 24;
if ((ws.ws_col != cols) || (ws.ws_row != rows)) {
cols = ws.ws_col;
rows = ws.ws_row;

8
mbsebbs/mbsebbs.c
View File

@@ -110,7 +110,7 @@ int main(int argc, char **argv)
if (getenv("LINES") != NULL) {
rows = atoi(getenv("LINES"));
} else {
Syslog('b', "Could net get screensize from environment too");
Syslog('b', "Could not get screensize from environment too");
}
/* use linux/vt.h + ioctl VT_RESIZE */
}
@@ -195,6 +195,12 @@ int main(int argc, char **argv)
poutCR(YELLOW, BLACK, temp);
pout(WHITE, BLACK, (char *)COPYRIGHT);
/*
* Use 80 wide screens
*/
if (cols > 80)
cols = 80;
/*
* Check and report screens that are too small
*/