projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Thanks to D H Becker for sending in an icon. I'd have liked to have
[u/mdw/putty]
/
unix
/
unix.h
diff --git
a/unix/unix.h
b/unix/unix.h
index
f12f576
..
cfc48f3
100644
(file)
--- a/
unix/unix.h
+++ b/
unix/unix.h
@@
-45,8
+45,8
@@
extern Backend pty_backend;
/* Simple wraparound timer function */
unsigned long getticks(void); /* based on gettimeofday(2) */
#define GETTICKCOUNT getticks
/* Simple wraparound timer function */
unsigned long getticks(void); /* based on gettimeofday(2) */
#define GETTICKCOUNT getticks
-#define TICKSPERSEC
1000000 /* gettimeofday returns micro
seconds */
-#define CURSORBLINK
45000
0 /* no standard way to set this */
+#define TICKSPERSEC
1000 /* we choose to use milli
seconds */
+#define CURSORBLINK
45
0 /* no standard way to set this */
#define WCHAR wchar_t
#define BYTE unsigned char
#define WCHAR wchar_t
#define BYTE unsigned char
@@
-60,7
+60,8
@@
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, Config *cfg, int midsession);
+int do_config_box(const char *title, Config *cfg,
+ int midsession, int protcfginfo);
void fatal_message_box(void *window, char *msg);
void about_box(void *window);
void *eventlogstuff_new(void);
void fatal_message_box(void *window, char *msg);
void about_box(void *window);
void *eventlogstuff_new(void);
@@
-95,7
+96,10
@@
void uxsel_input_remove(int id);
/* uxcfg.c */
struct controlbox;
/* uxcfg.c */
struct controlbox;
-void unix_setup_config_box(struct controlbox *b, int midsession, void *window);
+void unix_setup_config_box(struct controlbox *b, int midsession);
+
+/* gtkcfg.c */
+void gtk_setup_config_box(struct controlbox *b, int midsession, void *window);
/*
* In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value
/*
* In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value
@@
-111,20
+115,21
@@
void unix_setup_config_box(struct controlbox *b, int midsession, void *window);
#define strnicmp strncasecmp
#define stricmp strcasecmp
#define strnicmp strncasecmp
#define stricmp strcasecmp
-/* BSD-semantics version of signal() */
+/* BSD-semantics version of signal()
, and another helpful function
*/
void (*putty_signal(int sig, void (*func)(int)))(int);
void (*putty_signal(int sig, void (*func)(int)))(int);
+void block_signal(int sig, int block_it);
/*
* Exports from unicode.c.
*/
struct unicode_data;
/*
* Exports from unicode.c.
*/
struct unicode_data;
-int init_ucs(struct unicode_data *ucsdata,
-
char *line_codepag
e, int font_charset, int vtmode);
+int init_ucs(struct unicode_data *ucsdata,
char *line_codepage,
+
int utf8_overrid
e, int font_charset, int vtmode);
/*
* Spare function exported directly from uxnet.c.
*/
/*
* Spare function exported directly from uxnet.c.
*/
-
int sk_getxdmdata(void *sock, unsigned long *ip, int *port
);
+
void *sk_getxdmdata(void *sock, int *lenp
);
/*
* General helpful Unix stuff: more helpful version of the FD_SET
/*
* General helpful Unix stuff: more helpful version of the FD_SET