diff options
Diffstat (limited to 'src/hyper')
35 files changed, 108 insertions, 91 deletions
diff --git a/src/hyper/ReadBitmap.c b/src/hyper/ReadBitmap.c index 7eb09303..578c8e3c 100644 --- a/src/hyper/ReadBitmap.c +++ b/src/hyper/ReadBitmap.c @@ -1,41 +1,44 @@ /* -Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of The Numerical Algorithms Group Ltd. nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. + All rights reserved. + Copyright (C) 2007-2008, Gabriel Dos Reis. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + - Neither the name of The Numerical Algorithms Group Ltd. nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define _READBITMAP_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "hyper.h" #include "all_hyper_proto.H1" diff --git a/src/hyper/addfile.c b/src/hyper/addfile.c index c7df3f1a..2eef5664 100644 --- a/src/hyper/addfile.c +++ b/src/hyper/addfile.c @@ -34,9 +34,10 @@ */ #define _ADDFILE_C -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "hyper.h" #include "addfile.h" diff --git a/src/hyper/cond.c b/src/hyper/cond.c index c619d9e0..d60e7a82 100644 --- a/src/hyper/cond.c +++ b/src/hyper/cond.c @@ -42,13 +42,14 @@ ****************************************************************************/ #define _COND_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "hyper.h" #include "all_hyper_proto.H1" -#include "sockio-c.H1" +#include "sockio.h" void diff --git a/src/hyper/debug.c b/src/hyper/debug.c index 98c7d3c8..2b0d1836 100644 --- a/src/hyper/debug.c +++ b/src/hyper/debug.c @@ -35,7 +35,7 @@ #define _DEBUG_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #ifdef free diff --git a/src/hyper/dialog.c b/src/hyper/dialog.c index f955e783..a65b3ae8 100644 --- a/src/hyper/dialog.c +++ b/src/hyper/dialog.c @@ -42,9 +42,10 @@ ****************************************************************************/ #define _DIALOG_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "hyper.h" #include "keyin.h" #include "display.h" diff --git a/src/hyper/display.c b/src/hyper/display.c index 9ffe6c96..7e9d364a 100644 --- a/src/hyper/display.c +++ b/src/hyper/display.c @@ -50,11 +50,12 @@ * use the value of page->y_off as an offset into the scrolling * region to compute what is actually to be displayed on the page. */ + #define _DISPLAY_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "extent.h" #include "hyper.h" diff --git a/src/hyper/event.c b/src/hyper/event.c index 5066fc1e..1813576e 100644 --- a/src/hyper/event.c +++ b/src/hyper/event.c @@ -35,10 +35,10 @@ #define _EVENT_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "hyper.h" #include <X11/X.h> @@ -64,7 +64,7 @@ #include "group.h" #include "all_hyper_proto.H1" -#include "sockio-c.H1" +#include "sockio.h" jmp_buf env; Window gActiveWindow; diff --git a/src/hyper/ex2ht.c b/src/hyper/ex2ht.c index e09106bb..0d21673e 100644 --- a/src/hyper/ex2ht.c +++ b/src/hyper/ex2ht.c @@ -38,7 +38,7 @@ #define _EX2HT_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/hyper/extent1.c b/src/hyper/extent1.c index a18dbfd8..2c89944e 100644 --- a/src/hyper/extent1.c +++ b/src/hyper/extent1.c @@ -42,10 +42,11 @@ ****************************************************************************/ #define _EXTENT1_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "extent.h" #include "hyper.h" #include "group.h" diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c index 5a7a6848..40ed44a6 100644 --- a/src/hyper/extent2.c +++ b/src/hyper/extent2.c @@ -40,12 +40,13 @@ * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993. * ****************************************************************************/ + #define _EXTENT2_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "extent.h" #include "group.h" #include "titlebar.h" diff --git a/src/hyper/form-ext.c b/src/hyper/form-ext.c index f33babfd..db817355 100644 --- a/src/hyper/form-ext.c +++ b/src/hyper/form-ext.c @@ -35,9 +35,10 @@ #define _FORM_EXT_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "extent.h" #include "group.h" #include "scrollbar.h" diff --git a/src/hyper/group.c b/src/hyper/group.c index 700ba42e..de347b7e 100644 --- a/src/hyper/group.c +++ b/src/hyper/group.c @@ -40,11 +40,12 @@ * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993. * ****************************************************************************/ + #define _GROUP_C -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "group.h" #include "initx.h" diff --git a/src/hyper/halloc.c b/src/hyper/halloc.c index 2c923850..acdfb87e 100644 --- a/src/hyper/halloc.c +++ b/src/hyper/halloc.c @@ -35,7 +35,7 @@ #define _HALLOC_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/hyper/hash.c b/src/hyper/hash.c index 515c935c..a9a6c00e 100644 --- a/src/hyper/hash.c +++ b/src/hyper/hash.c @@ -35,7 +35,7 @@ #define _HASH_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <stdio.h> diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c index 02ec8f84..36595751 100644 --- a/src/hyper/htadd.c +++ b/src/hyper/htadd.c @@ -38,7 +38,8 @@ #define _HTADD_C #include "axiom-c-macros.h" -#include "useproto.h" + +#include "sockio.h" #include "hyper.h" #include <sys/stat.h> #include <errno.h> diff --git a/src/hyper/hterror.c b/src/hyper/hterror.c index 8cd1e665..f5831f83 100644 --- a/src/hyper/hterror.c +++ b/src/hyper/hterror.c @@ -37,9 +37,10 @@ #define HTERROR #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" #include "lex.h" #include "parse.h" diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c index 30d975ad..5c129de8 100644 --- a/src/hyper/htinp.c +++ b/src/hyper/htinp.c @@ -35,20 +35,21 @@ #define _HTINP_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <sys/stat.h> #include <sys/signal.h> #include <setjmp.h> +#include "sockio.h" #include "hyper.h" #include "group.h" #include "parse.h" #include "bsdsignal.h" #include "all_hyper_proto.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "bsdsignal.H1" extern char **input_file_list; diff --git a/src/hyper/hyper.c b/src/hyper/hyper.c index 627c3ca3..1b71b76e 100644 --- a/src/hyper/hyper.c +++ b/src/hyper/hyper.c @@ -42,11 +42,12 @@ /* #define DEBUG 1 */ /* Include all the needed include files */ + #define _HYPER_C -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "hyper.h" #include <sys/signal.h> @@ -62,7 +63,7 @@ #include "bsdsignal.h" #include "all_hyper_proto.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "bsdsignal.H1" /* * Here is a flag used to tell me whether I made a good connection to the diff --git a/src/hyper/initx.c b/src/hyper/initx.c index b2f85e59..7565e54c 100644 --- a/src/hyper/initx.c +++ b/src/hyper/initx.c @@ -45,9 +45,9 @@ #define _INITX_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "initx.h" #include <unistd.h> diff --git a/src/hyper/input.c b/src/hyper/input.c index 725b9ace..36901184 100644 --- a/src/hyper/input.c +++ b/src/hyper/input.c @@ -35,9 +35,9 @@ #define _INPUT_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "hyper.h" #include "all_hyper_proto.H1" diff --git a/src/hyper/item.c b/src/hyper/item.c index 18311ec8..8ba00b43 100644 --- a/src/hyper/item.c +++ b/src/hyper/item.c @@ -34,7 +34,7 @@ */ #include "axiom-c-macros.h" -#include "useproto.h" +#include "sockio.h" #define _ITEM_C #include "debug.h" #include "extent.h" diff --git a/src/hyper/keyin.c b/src/hyper/keyin.c index b6d2004e..27639c14 100644 --- a/src/hyper/keyin.c +++ b/src/hyper/keyin.c @@ -42,10 +42,10 @@ ****************************************************************************/ #define _KEYIN_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "hyper.h" #include "keyin.h" #include "event.h" diff --git a/src/hyper/lex.c b/src/hyper/lex.c index 6b4bf6d5..67de1459 100644 --- a/src/hyper/lex.c +++ b/src/hyper/lex.c @@ -58,8 +58,9 @@ */ #define _LEX_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" +#include "sockio.h" int useAscii; @@ -70,7 +71,7 @@ int useAscii; #include "lex.h" #include "all_hyper_proto.H1" -#include "sockio-c.H1" +#include "sockio.h" #include <ctype.h> diff --git a/src/hyper/macro.c b/src/hyper/macro.c index 80bd3dc6..7d681c78 100644 --- a/src/hyper/macro.c +++ b/src/hyper/macro.c @@ -35,9 +35,9 @@ #define _MACRO_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "parse.h" #include "hyper.h" diff --git a/src/hyper/mem.c b/src/hyper/mem.c index 6f2cb646..e38e90ca 100644 --- a/src/hyper/mem.c +++ b/src/hyper/mem.c @@ -41,10 +41,10 @@ * ****************************************************************************/ #define _MEM_C -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "hyper.h" #include "group.h" #include "event.h" diff --git a/src/hyper/parse-aux.c b/src/hyper/parse-aux.c index 09972872..b8938693 100644 --- a/src/hyper/parse-aux.c +++ b/src/hyper/parse-aux.c @@ -35,9 +35,9 @@ #include "axiom-c-macros.h" #define _PARSE_AUX_C -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "parse.h" #include "addfile.h" #include "lex.h" diff --git a/src/hyper/parse-input.c b/src/hyper/parse-input.c index bdaee8da..961fe623 100644 --- a/src/hyper/parse-input.c +++ b/src/hyper/parse-input.c @@ -42,9 +42,9 @@ RadioBox. ****/ -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "parse.h" #include "lex.h" #include "hyper.h" diff --git a/src/hyper/parse-paste.c b/src/hyper/parse-paste.c index 3cd35b1f..264c773b 100644 --- a/src/hyper/parse-paste.c +++ b/src/hyper/parse-paste.c @@ -42,10 +42,10 @@ ****************************************************************************/ #define _PARSE_PASTE_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "parse.h" #include "hyper.h" #include "display.h" diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c index 047423e9..2e42a205 100644 --- a/src/hyper/parse-types.c +++ b/src/hyper/parse-types.c @@ -42,9 +42,9 @@ ****************************************************************************/ #define _PARSE_TYPES_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "parse.h" #include "parse-types.h" #include "hyper.h" diff --git a/src/hyper/parse.c b/src/hyper/parse.c index 92703cc6..f2282270 100644 --- a/src/hyper/parse.c +++ b/src/hyper/parse.c @@ -34,9 +34,9 @@ */ #define _PARSE_C -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "parse.h" #include "parse-paste.h" #include "parse-types.h" diff --git a/src/hyper/scrollbar.c b/src/hyper/scrollbar.c index 734054aa..ae0a92a8 100644 --- a/src/hyper/scrollbar.c +++ b/src/hyper/scrollbar.c @@ -42,9 +42,9 @@ ****************************************************************************/ #define _SCROLLBAR_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "extent.h" #include "display.h" #include "group.h" diff --git a/src/hyper/show-types.c b/src/hyper/show-types.c index 50413414..0d355c38 100644 --- a/src/hyper/show-types.c +++ b/src/hyper/show-types.c @@ -42,10 +42,10 @@ ****************************************************************************/ #define _SHOW_TYPES_C #include "axiom-c-macros.h" -#include "useproto.h" -#include "debug.h" +#include "debug.h" +#include "sockio.h" #include "hyper.h" #include "display.h" #include "extent.h" diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c index 46f6dbd4..42b3f482 100644 --- a/src/hyper/spadbuf.c +++ b/src/hyper/spadbuf.c @@ -35,7 +35,7 @@ #define _SPADBUF_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <termios.h> @@ -52,12 +52,13 @@ #endif #include "bsdsignal.h" +#include "sockio.h" #include "edible.h" #include "com.h" #include "spadbuf.H1" #include "bsdsignal.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "edin.H1" #include "wct.H1" #include "prt.H1" diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c index eb90c2fa..da149b8d 100644 --- a/src/hyper/spadint.c +++ b/src/hyper/spadint.c @@ -38,17 +38,17 @@ /* Communication interface for external AXIOM buffers */ #define _SPADINT_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <signal.h> - +#include "sockio.h" #include "hyper.h" #include "parse.h" #include "bsdsignal.h" #include "all_hyper_proto.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "bsdsignal.H1" diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c index 51ff3696..e3ea0f56 100644 --- a/src/hyper/titlebar.c +++ b/src/hyper/titlebar.c @@ -42,11 +42,11 @@ ****************************************************************************/ #define _TITLEBAR_C #include "axiom-c-macros.h" -#include "useproto.h" + #include "debug.h" #include <stdlib.h> - +#include "sockio.h" #include "titlebar.h" #include "display.h" #include "group.h" |