Introduced wrapper macros snew(), snewn() and sresize() for the

[sgt/putty] / unix / unix.h

diff --git a/unix/unix.h b/unix/unix.h
index a1b155a..b003ac7 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -1,8 +1,18 @@
 #ifndef PUTTY_UNIX_H
 #define PUTTY_UNIX_H
 
+#include <stdio.h>                    /* for FILENAME_MAX */
 #include "charset.h"
 
+struct Filename {
+    char path[FILENAME_MAX];
+};
+#define f_open(filename, mode) ( fopen((filename).path, (mode)) )
+
+struct FontSpec {
+    char name[256];
+};
+
 typedef void *Context;                 /* FIXME: probably needs changing */
 
 extern Backend pty_backend;
@@ -14,6 +24,12 @@ extern Backend pty_backend;
 #define MULTICLICK_ONLY_EVENT 0
 
 /*
+ * Under GTK, there is no context help available.
+ */
+#define HELPCTX(x) P(NULL)
+#define FILTER_KEY_FILES NULL          /* FIXME */
+
+/*
  * Under X, selection data must not be NUL-terminated.
  */
 #define SELECTION_NUL_TERMINATED 0
@@ -37,9 +53,10 @@ GLOBAL void *logctx;
 /* Things pty.c needs from pterm.c */
 char *get_x_display(void *frontend);
 int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
+long get_windowid(void *frontend);
 
 /* Things uxstore.c needs from pterm.c */
-char *x_get_default(char *key);
+char *x_get_default(const char *key);
 
 /* Things uxstore.c provides to pterm.c */
 void provide_xrm_string(char *string);
@@ -49,6 +66,10 @@ int select_result(int fd, int event);
 int first_socket(int *state, int *rwx);
 int next_socket(int *state, int *rwx);
 
+/* uxcfg.c */
+struct controlbox;
+void unix_setup_config_box(struct controlbox *b, int midsession);
+
 /*
  * In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value
  * which causes mb_to_wc and wc_to_mb to call _libc_ rather than
@@ -69,7 +90,9 @@ void (*putty_signal(int sig, void (*func)(int)))(int);
 /*
  * Exports from unicode.c.
  */
-int init_ucs(char *line_codepage, int font_charset);
+struct unicode_data;
+int init_ucs(struct unicode_data *ucsdata,
+            char *line_codepage, int font_charset);
 
 /*
  * Spare function exported directly from uxnet.c.