projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganise setup_fonts_ucs so that in case of error it does nothing
[u/mdw/putty]
/
unix
/
unix.h
diff --git
a/unix/unix.h
b/unix/unix.h
index
9de4e4a
..
91d0642
100644
(file)
--- a/
unix/unix.h
+++ b/
unix/unix.h
@@
-13,13
+13,14
@@
#include "charset.h"
struct Filename {
#include "charset.h"
struct Filename {
- char
path[FILENAME_MAX]
;
+ char
*path
;
};
};
-FILE *f_open(
struct Filename
, char const *, int);
+FILE *f_open(
const struct Filename *
, char const *, int);
struct FontSpec {
struct FontSpec {
- char
name[256];
+ char
*name; /* may be "" to indicate no selected font at all */
};
};
+struct FontSpec *fontspec_new(const char *name);
typedef void *Context; /* FIXME: probably needs changing */
typedef void *Context; /* FIXME: probably needs changing */
@@
-42,6
+43,7
@@
typedef uint32_t uint32; /* C99: uint32_t defined in stdint.h */
*/
#define HELPCTX(x) P(NULL)
#define FILTER_KEY_FILES NULL /* FIXME */
*/
#define HELPCTX(x) P(NULL)
#define FILTER_KEY_FILES NULL /* FIXME */
+#define FILTER_DYNLIB_FILES NULL /* FIXME */
/*
* Under X, selection data must not be NUL-terminated.
/*
* Under X, selection data must not be NUL-terminated.
@@
-58,11
+60,6
@@
unsigned long getticks(void); /* based on gettimeofday(2) */
#define GETTICKCOUNT getticks
#define TICKSPERSEC 1000 /* we choose to use milliseconds */
#define CURSORBLINK 450 /* no standard way to set this */
#define GETTICKCOUNT getticks
#define TICKSPERSEC 1000 /* we choose to use milliseconds */
#define CURSORBLINK 450 /* no standard way to set this */
-/* getticks() works using gettimeofday(), so it's vulnerable to system clock
- * changes causing chaos. Therefore, we provide a compensation mechanism. */
-#define TIMING_SYNC
-#define TIMING_SYNC_ANOW
-extern long tickcount_offset;
#define WCHAR wchar_t
#define BYTE unsigned char
#define WCHAR wchar_t
#define BYTE unsigned char
@@
-88,7
+85,7
@@
long get_windowid(void *frontend);
void *get_window(void *frontend); /* void * to avoid depending on gtk.h */
/* Things pterm.c needs from gtkdlg.c */
void *get_window(void *frontend); /* void * to avoid depending on gtk.h */
/* Things pterm.c needs from gtkdlg.c */
-int do_config_box(const char *title, Conf
ig *cfg
,
+int do_config_box(const char *title, Conf
*conf
,
int midsession, int protcfginfo);
void fatal_message_box(void *window, char *msg);
void about_box(void *window);
int midsession, int protcfginfo);
void fatal_message_box(void *window, char *msg);
void about_box(void *window);
@@
-96,10
+93,14
@@
void *eventlogstuff_new(void);
void showeventlog(void *estuff, void *parentwin);
void logevent_dlg(void *estuff, const char *string);
int reallyclose(void *frontend);
void showeventlog(void *estuff, void *parentwin);
void logevent_dlg(void *estuff, const char *string);
int reallyclose(void *frontend);
+#ifdef MAY_REFER_TO_GTK_IN_HEADERS
+int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...);
+int string_width(char *text);
+#endif
/* Things pterm.c needs from {ptermm,uxputty}.c */
char *make_default_wintitle(char *hostname);
/* Things pterm.c needs from {ptermm,uxputty}.c */
char *make_default_wintitle(char *hostname);
-int process_nonoption_arg(char *arg, Conf
ig *cfg
, int *allow_launch);
+int process_nonoption_arg(char *arg, Conf
*conf
, int *allow_launch);
/* pterm.c needs this special function in xkeysym.c */
int keysym_to_unicode(int keysym);
/* pterm.c needs this special function in xkeysym.c */
int keysym_to_unicode(int keysym);
@@
-169,6
+170,13
@@
int init_ucs(struct unicode_data *ucsdata, char *line_codepage,
void *sk_getxdmdata(void *sock, int *lenp);
/*
void *sk_getxdmdata(void *sock, int *lenp);
/*
+ * Function provided by front ends, and called by uxnet.c to indicate
+ * that net_pending_errors() would like to be called back when the
+ * front end has a spare moment and isn't deep in any other recursion.
+ */
+void frontend_net_error_pending(void);
+
+/*
* General helpful Unix stuff: more helpful version of the FD_SET
* macro, which also handles maxfd.
*/
* General helpful Unix stuff: more helpful version of the FD_SET
* macro, which also handles maxfd.
*/