aboutsummaryrefslogtreecommitdiff
path: root/src/hyper
diff options
context:
space:
mode:
Diffstat (limited to 'src/hyper')
-rw-r--r--src/hyper/addfile.c2
-rw-r--r--src/hyper/ex2ht.c2
-rw-r--r--src/hyper/extent2.c2
-rw-r--r--src/hyper/htadd.c3
-rw-r--r--src/hyper/htinp.c2
-rw-r--r--src/hyper/htsearch.cc3
-rw-r--r--src/hyper/hyper.c2
-rw-r--r--src/hyper/hyper.h6
-rw-r--r--src/hyper/initx.c2
-rw-r--r--src/hyper/lex.c8
-rw-r--r--src/hyper/node.h2
-rw-r--r--src/hyper/parse-types.c2
-rw-r--r--src/hyper/parse.c2
-rw-r--r--src/hyper/spadbuf.c4
-rw-r--r--src/hyper/spadint.c2
-rw-r--r--src/hyper/titlebar.c2
16 files changed, 39 insertions, 7 deletions
diff --git a/src/hyper/addfile.c b/src/hyper/addfile.c
index 1e6c6b9b..3671b2a5 100644
--- a/src/hyper/addfile.c
+++ b/src/hyper/addfile.c
@@ -46,6 +46,8 @@
#include "sockio.h"
#include "addfile.h"
+/* FIXME: Remove this kludge */
+using namespace OpenAxiom;
static int build_ht_filename(char*, char*, char*);
diff --git a/src/hyper/ex2ht.c b/src/hyper/ex2ht.c
index a109339a..bbb1db14 100644
--- a/src/hyper/ex2ht.c
+++ b/src/hyper/ex2ht.c
@@ -50,6 +50,8 @@
#include "cfuns.h"
+using namespace OpenAxiom;
+
#define MaxLineLength 512
#define MaxFiles 100
diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c
index 56c37777..8a57cd0b 100644
--- a/src/hyper/extent2.c
+++ b/src/hyper/extent2.c
@@ -50,6 +50,8 @@
#include "titlebar.h"
#include "cfuns.h"
+using namespace OpenAxiom;
+
static void center_nodes(TextNode * begin_node , TextNode * end_node);
static int input_string_width(TextNode * node);
static int punctuation_width(TextNode * node);
diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c
index b4dc6121..89d8626a 100644
--- a/src/hyper/htadd.c
+++ b/src/hyper/htadd.c
@@ -52,6 +52,9 @@
#include "addfile.h"
#include "node.h"
+/* FIXME: Remove this kludge */
+using namespace OpenAxiom;
+
static void add_file(char*, char*, int);
static void add_new_pages(FILE*, FILE*, char*, char*);
static int build_db_filename(short, char*, char*);
diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c
index b2065b8e..12964bc4 100644
--- a/src/hyper/htinp.c
+++ b/src/hyper/htinp.c
@@ -48,6 +48,8 @@
#include "cfuns.h"
#include "sockio.h"
+using namespace OpenAxiom;
+
extern char **input_file_list;
extern int input_file_count;
extern int make_patch_files;
diff --git a/src/hyper/htsearch.cc b/src/hyper/htsearch.cc
index d67c6074..ef89a298 100644
--- a/src/hyper/htsearch.cc
+++ b/src/hyper/htsearch.cc
@@ -50,6 +50,9 @@
#include <iostream>
#include "cfuns.h"
+// FIXME: Remove kludge
+using namespace OpenAxiom;
+
// Path to the directory containing the hyperdoc pages.
static std::string htpagedir;
diff --git a/src/hyper/hyper.c b/src/hyper/hyper.c
index 969a9a03..e88f63f0 100644
--- a/src/hyper/hyper.c
+++ b/src/hyper/hyper.c
@@ -63,6 +63,8 @@
#include "sockio.h"
#include "parse.h"
+using namespace OpenAxiom;
+
static void init_hash(void);
static void make_server_connections(void);
static void check_arguments(void);
diff --git a/src/hyper/hyper.h b/src/hyper/hyper.h
index 2abecbaf..c4956a5f 100644
--- a/src/hyper/hyper.h
+++ b/src/hyper/hyper.h
@@ -114,7 +114,7 @@ extern HyperDocPage * issue_server_command(HyperLink * link);
extern HyperDocPage * issue_unixlink(TextNode * node);
extern char * print_to_string(TextNode * command);
extern void issue_spadcommand(HyperDocPage * page , TextNode * command , int immediate , int type);
-extern openaxiom_sio * accept_menu_connection(openaxiom_sio * server_sock);
+extern OpenAxiom::openaxiom_sio * accept_menu_connection(OpenAxiom::openaxiom_sio * server_sock);
extern char * print_to_string1(TextNode * command , int * sizeBuf);
extern int issue_serverpaste(TextNode * command);
extern void issue_unixcommand(TextNode * node);
@@ -173,8 +173,8 @@ extern int gSwitch_to_mono;
extern unsigned long * spadColors;
extern int gIsEndOfOutput;
extern HDWindow *gWindow;
-extern openaxiom_sio *session_server;
-extern openaxiom_sio *spad_socket;
+extern OpenAxiom::openaxiom_sio *session_server;
+extern OpenAxiom::openaxiom_sio *spad_socket;
extern HashTable gFileHashTable;
extern HashTable gImageHashTable; /* A global hash table for images */
extern openaxiom_cursor gNormalCursor; /* The normal mouse cursor. */
diff --git a/src/hyper/initx.c b/src/hyper/initx.c
index c4d212dd..8f072dbd 100644
--- a/src/hyper/initx.c
+++ b/src/hyper/initx.c
@@ -73,6 +73,8 @@ extern int gethostname(char *, int );
#include "mouse11.bitmap"
#include "mouse11.mask"
+using namespace OpenAxiom;
+
static void get_GCs(HDWindow * window);
static int get_border_properties(void);
static int get_color(const char* , const char* , int, Colormap*);
diff --git a/src/hyper/lex.c b/src/hyper/lex.c
index 1b828a08..aa3e4c91 100644
--- a/src/hyper/lex.c
+++ b/src/hyper/lex.c
@@ -66,8 +66,6 @@
#include "debug.h"
#include "sockio.h"
-int useAscii;
-
#define PARSER 1
#include "halloc.h"
@@ -75,10 +73,16 @@ int useAscii;
#include "node.h"
#include "cfuns.h"
+using namespace OpenAxiom;
+
static int get_char1(void );
static void spad_error_handler(void );
static int keyword_type(void );
+
+
+int useAscii;
+
extern int gTtFontIs850;
extern HDWindow *gWindow;
diff --git a/src/hyper/node.h b/src/hyper/node.h
index 38204487..575d4229 100644
--- a/src/hyper/node.h
+++ b/src/hyper/node.h
@@ -265,7 +265,7 @@ typedef struct HyperDocPage {
TextNode *header; /* formatted version of page */
TextNode *scrolling; /* Top of scrolling region */
TextNode *footer; /* top of non-scrolling region at bottom */
- openaxiom_sio *sock; /* socket connection for spad buffer */
+ OpenAxiom::openaxiom_sio *sock; /* socket connection for spad buffer */
HashTable *fLinkHashTable; /* active link hash table */
ButtonList *s_button_list; /* active buttons on page */
ButtonList *button_list; /* active buttons on page */
diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c
index 9f0ddeaf..a548347a 100644
--- a/src/hyper/parse-types.c
+++ b/src/hyper/parse-types.c
@@ -52,6 +52,8 @@
#include "extent.h"
#include "cfuns.h"
+using namespace OpenAxiom;
+
static void parse_condnode(void );
static void parse_hasreturnto(void );
diff --git a/src/hyper/parse.c b/src/hyper/parse.c
index 5ef50baf..69527334 100644
--- a/src/hyper/parse.c
+++ b/src/hyper/parse.c
@@ -48,6 +48,8 @@
#include "scrollbar.h"
#include "titlebar.h"
+using namespace OpenAxiom;
+
static void end_a_page(void );
static HyperDocPage * format_page(UnloadedPage * ulpage);
static void parse_page(HyperDocPage * page);
diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c
index 02f0ebad..e173b86f 100644
--- a/src/hyper/spadbuf.c
+++ b/src/hyper/spadbuf.c
@@ -60,6 +60,8 @@
#include "cursor.h"
#include "fnct_key.h"
+using namespace OpenAxiom;
+
static void spadbuf_inter_handler(int);
static void spadbuf_function_chars(void);
static void interp_io(void);
@@ -137,7 +139,7 @@ interp_io(void)
return;
}
if (FD_ISSET(session_sock->socket, &rd)) {
- len = sread(session_sock, (openaxiom_byte*) buf, 1024, "stdio");
+ len = sread(session_sock, byte_address(buf), 1024, "stdio");
if (len == -1)
return;
else {
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index f872baf8..20d1b2a2 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -48,6 +48,8 @@
#include "sockio.h"
#include "cfuns.h"
+using namespace OpenAxiom;
+
static void start_user_buffer(HyperDocPage * page);
static void clear_execution_marks(HashTable * depend_hash);
static void issue_dependent_commands(HyperDocPage * page , TextNode * command , int type);
diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c
index 90dfabf4..6cf37472 100644
--- a/src/hyper/titlebar.c
+++ b/src/hyper/titlebar.c
@@ -54,6 +54,8 @@
#include "cfuns.h"
#include "parse-types.h"
+using namespace OpenAxiom;
+
static void readTitleBarImages(void);
extern int y_off; /* y offset for scrolling regions */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 04:31:10 +0000