diff --git a/src/conio/ansi_cio.c b/src/conio/ansi_cio.c index 7b20616d3b13bf2447e309b7f38e473453da2556..8d02f354bc5f6c8fa05e3a63f2db898da32f3d91 100644 --- a/src/conio/ansi_cio.c +++ b/src/conio/ansi_cio.c @@ -1,5 +1,3 @@ -/* $Id: ansi_cio.c,v 1.86 2020/04/13 18:36:21 deuce Exp $ */ - /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * @@ -13,21 +11,9 @@ * See the GNU Lesser General Public License for more details: lgpl.txt or * * http://www.fsf.org/copyleft/lesser.html * * * - * Anonymous FTP access to the most recent released source is available at * - * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net * - * * - * Anonymous CVS access to the development source and modification history * - * is available at cvs.synchro.net:/cvsroot/sbbs, example: * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login * - * (just hit return, no password is necessary) * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src * - * * * For Synchronet coding style and modification guidelines, see * * http://www.synchro.net/source.html * * * - * You are encouraged to submit any modifications (preferably in Unix diff * - * format) via e-mail to mods@synchro.net * - * * * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/ @@ -182,8 +168,8 @@ static tODKeySequence ODaKeySequences[] = {"\033[V", ANSI_KEY_PGUP}, {"\033[U", ANSI_KEY_PGDN}, {"\033[@", ANSI_KEY_INSERT}, - - + + /* PROCOMM-specific control sequences (non-keypad alternatives). */ {"\033OA", ANSI_KEY_UP}, {"\033OB", ANSI_KEY_DOWN}, diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c index 46ef814114376498ca72ccd61531082060490bb5..cdd7e69f66a5c0569fb67fb1c00fb22f3820c993 100644 --- a/src/conio/ciolib.c +++ b/src/conio/ciolib.c @@ -1,5 +1,3 @@ -/* $Id: ciolib.c,v 1.204 2020/07/18 18:15:28 rswindell Exp $ */ - /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * @@ -13,21 +11,9 @@ * See the GNU Lesser General Public License for more details: lgpl.txt or * * http://www.fsf.org/copyleft/lesser.html * * * - * Anonymous FTP access to the most recent released source is available at * - * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net * - * * - * Anonymous CVS access to the development source and modification history * - * is available at cvs.synchro.net:/cvsroot/sbbs, example: * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login * - * (just hit return, no password is necessary) * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src * - * * * For Synchronet coding style and modification guidelines, see * * http://www.synchro.net/source.html * * * - * You are encouraged to submit any modifications (preferably in Unix diff * - * format) via e-mail to mods@synchro.net * - * * * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/ diff --git a/src/conio/cterm.c b/src/conio/cterm.c index 0ad12b17e53b0f9d0e9d85a043ba8699549d5800..b730d29b15b19114880f68af439c031bbaee13ad 100644 --- a/src/conio/cterm.c +++ b/src/conio/cterm.c @@ -1,5 +1,3 @@ -/* $Id: cterm.c,v 1.313 2020/06/27 00:04:45 deuce Exp $ */ - /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * @@ -13,21 +11,9 @@ * See the GNU Lesser General Public License for more details: lgpl.txt or * * http://www.fsf.org/copyleft/lesser.html * * * - * Anonymous FTP access to the most recent released source is available at * - * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net * - * * - * Anonymous CVS access to the development source and modification history * - * is available at cvs.synchro.net:/cvsroot/sbbs, example: * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login * - * (just hit return, no password is necessary) * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src * - * * * For Synchronet coding style and modification guidelines, see * * http://www.synchro.net/source.html * * * - * You are encouraged to submit any modifications (preferably in Unix diff * - * format) via e-mail to mods@synchro.net * - * * * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/ @@ -677,7 +663,7 @@ scr_maxy(struct cterminal *cterm, enum cterm_coordinates coord) #define CURR_MAXY ((cterm->extattr & CTERM_EXTATTR_ORIGINMODE) ? TERM_MAXY : ABS_MAXY) static void -coord_conv_xy(struct cterminal *cterm, enum cterm_coordinates from_coord, +coord_conv_xy(struct cterminal *cterm, enum cterm_coordinates from_coord, enum cterm_coordinates to_coord, int *x, int *y) { if (from_coord == to_coord) @@ -3367,7 +3353,7 @@ static void do_ansi(struct cterminal *cterm, char *retbuf, size_t retsize, int * delete_tabstop(cterm, seq->param_int[0]); } } - /* + /* * END OF STANDARD CONTROL FUNCTIONS * AFTER THIS IS ALL PRIVATE EXTENSIONS */ @@ -3475,9 +3461,9 @@ static void do_ansi(struct cterminal *cterm, char *retbuf, size_t retsize, int * (seq->param_int[2] <= seq->param_int[4]) && (seq->param_int[3] <= seq->param_int[5]) && (pix = getpixels( - (seq->param_int[3] - 1 + cterm->x - 1)*vparams[vmode].charwidth, - (seq->param_int[2] - 1 + cterm->y - 1)*vparams[vmode].charheight, - (seq->param_int[5] + cterm->x - 1)*vparams[vmode].charwidth - 1, + (seq->param_int[3] - 1 + cterm->x - 1)*vparams[vmode].charwidth, + (seq->param_int[2] - 1 + cterm->y - 1)*vparams[vmode].charheight, + (seq->param_int[5] + cterm->x - 1)*vparams[vmode].charwidth - 1, (seq->param_int[4] + cterm->y - 1)*vparams[vmode].charheight - 1, true)) != NULL) { crc = crc16((void *)pix->pixels, sizeof(pix->pixels[0])*pix->width*pix->height); good = 1; @@ -4009,7 +3995,7 @@ static void do_ansi(struct cterminal *cterm, char *retbuf, size_t retsize, int * break; case 'o': /* ToDo? Define Area Qualification */ break; - /* + /* * END OF STANDARD CONTROL FUNCTIONS * AFTER THIS IS ALL PRIVATE EXTENSIONS */ @@ -4944,7 +4930,7 @@ CIOLIBEXPORT char* cterm_write(struct cterminal * cterm, const void *vbuf, int b palette[i] += palette_offset; set_modepalette(palette); } - + /* Deedle up the fonts */ orig_fonts[0] = getfont(1); orig_fonts[1] = getfont(2); @@ -5054,7 +5040,7 @@ CIOLIBEXPORT char* cterm_write(struct cterminal * cterm, const void *vbuf, int b break; case CTERM_STRING_SOS: /* Anything but SOS or ST (ESC X or ESC \) */ - if ((ch[0] == 'X' || ch[0] == '\\') && + if ((ch[0] == 'X' || ch[0] == '\\') && cterm->strbuf && cterm->strbuflen && cterm->strbuf[cterm->strbuflen-1] == '\x1b') { cterm->strbuflen--; diff --git a/src/conio/curs_cio.c b/src/conio/curs_cio.c index defb58e3d3874f7ca01a91b69e4edeed212c24d1..a7e16930e1711fed9956e45b2d7d004990617647 100644 --- a/src/conio/curs_cio.c +++ b/src/conio/curs_cio.c @@ -1,5 +1,3 @@ -/* $Id: curs_cio.c,v 1.60 2020/06/27 00:04:45 deuce Exp $ */ - /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * @@ -13,21 +11,9 @@ * See the GNU Lesser General Public License for more details: lgpl.txt or * * http://www.fsf.org/copyleft/lesser.html * * * - * Anonymous FTP access to the most recent released source is available at * - * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net * - * * - * Anonymous CVS access to the development source and modification history * - * is available at cvs.synchro.net:/cvsroot/sbbs, example: * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login * - * (just hit return, no password is necessary) * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src * - * * * For Synchronet coding style and modification guidelines, see * * http://www.synchro.net/source.html * * * - * You are encouraged to submit any modifications (preferably in Unix diff * - * format) via e-mail to mods@synchro.net * - * * * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/ diff --git a/src/conio/mouse.c b/src/conio/mouse.c index 85b52046a8464e87a385c251b6240d4ebe68cf2d..6a21046fa0e4552371f8fbced9080d7001a46a6f 100644 --- a/src/conio/mouse.c +++ b/src/conio/mouse.c @@ -1,5 +1,3 @@ -/* $Id: mouse.c,v 1.48 2020/06/27 00:04:45 deuce Exp $ */ - /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * @@ -13,21 +11,9 @@ * See the GNU Lesser General Public License for more details: lgpl.txt or * * http://www.fsf.org/copyleft/lesser.html * * * - * Anonymous FTP access to the most recent released source is available at * - * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net * - * * - * Anonymous CVS access to the development source and modification history * - * is available at cvs.synchro.net:/cvsroot/sbbs, example: * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login * - * (just hit return, no password is necessary) * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src * - * * * For Synchronet coding style and modification guidelines, see * * http://www.synchro.net/source.html * * * - * You are encouraged to submit any modifications (preferably in Unix diff * - * format) via e-mail to mods@synchro.net * - * * * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/ @@ -492,8 +478,8 @@ void ciolib_mouse_thread(void *data) } for(but=1;but<=5;but++) { - if(state.button_state[but-1]!=MOUSE_NOSTATE - && state.button_state[but-1]!=MOUSE_DRAGSTARTED + if(state.button_state[but-1]!=MOUSE_NOSTATE + && state.button_state[but-1]!=MOUSE_DRAGSTARTED && state.timeout[but-1]!=0 && (timeout_button==0 || state.timeout[but-1]<ttime)) { ttime=state.timeout[but-1]; diff --git a/src/conio/x_cio.c b/src/conio/x_cio.c index ce6c7dcf402944a69049b1db6d52b2f9fd6d9bc1..4c9c38151aab62f982a05df1238028074d69dd0e 100644 --- a/src/conio/x_cio.c +++ b/src/conio/x_cio.c @@ -1,5 +1,3 @@ -/* $Id: x_cio.c,v 1.56 2020/05/07 20:26:51 deuce Exp $ */ - /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * @@ -13,21 +11,9 @@ * See the GNU Lesser General Public License for more details: lgpl.txt or * * http://www.fsf.org/copyleft/lesser.html * * * - * Anonymous FTP access to the most recent released source is available at * - * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net * - * * - * Anonymous CVS access to the development source and modification history * - * is available at cvs.synchro.net:/cvsroot/sbbs, example: * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login * - * (just hit return, no password is necessary) * - * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src * - * * * For Synchronet coding style and modification guidelines, see * * http://www.synchro.net/source.html * * * - * You are encouraged to submit any modifications (preferably in Unix diff * - * format) via e-mail to mods@synchro.net * - * * * Note: If this box doesn't appear square, then you need to fix your tabs. * ****************************************************************************/