X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Funix.h;h=cf297db3d90bbd8173d366f6513b0ba90bee4112;hb=095072fa46b2d7b8beafaddb2f873d2f500a1e10;hp=feef0fbac9fffcbc1ef44731b3828534054a4438;hpb=aba05b7180b39ee51d72b1da867303c002188f2c;p=PuTTY.git diff --git a/unix/unix.h b/unix/unix.h index feef0fba..cf297db3 100644 --- a/unix/unix.h +++ b/unix/unix.h @@ -11,6 +11,37 @@ #include /* Dynamic library loading */ #endif /* NO_LIBDL */ #include "charset.h" +#include /* for mode_t */ + +#ifdef OSX_GTK +/* + * Assorted tweaks to various parts of the GTK front end which all + * need to be enabled when compiling on OS X. Because I might need the + * same tweaks on other systems in future, I don't want to + * conditionalise all of them on OSX_GTK directly, so instead, each + * one has its own name and we enable them all centrally here if + * OSX_GTK is defined at configure time. + */ +#define NOT_X_WINDOWS /* of course, all the X11 stuff should be disabled */ +#define NO_PTY_PRE_INIT /* OS X gets very huffy if we try to set[ug]id */ +#define SET_NONBLOCK_VIA_OPENPT /* work around missing fcntl functionality */ +#define OSX_META_KEY_CONFIG /* two possible Meta keys to choose from */ +/* this potential one of the Meta keys needs manual handling */ +#define META_MANUAL_MASK (GDK_MOD1_MASK) +#define JUST_USE_GTK_CLIPBOARD_UTF8 /* low-level gdk_selection_* fails */ +#define DEFAULT_CLIPBOARD GDK_SELECTION_CLIPBOARD /* OS X has no PRIMARY */ + +#define BUILDINFO_PLATFORM "OS X (GTK)" + +#elif defined NOT_X_WINDOWS + +#define BUILDINFO_PLATFORM "Unix (pure GTK)" + +#else + +#define BUILDINFO_PLATFORM "Unix (GTK + X11)" + +#endif struct Filename { char *path; @@ -24,11 +55,10 @@ struct FontSpec *fontspec_new(const char *name); typedef void *Context; /* FIXME: probably needs changing */ -typedef int OSSocket; -#define OSSOCKET_DEFINED /* stop network.h using its default */ - extern Backend pty_backend; +#define BROKEN_PIPE_ERROR_CODE EPIPE /* used in sshshare.c */ + typedef uint32_t uint32; /* C99: uint32_t defined in stdint.h */ #define PUTTY_UINT32_DEFINED @@ -56,7 +86,7 @@ typedef uint32_t uint32; /* C99: uint32_t defined in stdint.h */ #define SEL_NL { 10 } /* Simple wraparound timer function */ -unsigned long getticks(void); /* based on gettimeofday(2) */ +unsigned long getticks(void); #define GETTICKCOUNT getticks #define TICKSPERSEC 1000 /* we choose to use milliseconds */ #define CURSORBLINK 450 /* no standard way to set this */ @@ -76,27 +106,48 @@ unsigned long getticks(void); /* based on gettimeofday(2) */ */ #define FLAG_STDERR_TTY 0x1000 +/* The per-session frontend structure managed by gtkwin.c */ +struct gui_data; +struct gui_data *new_session_window(Conf *conf, const char *geometry_string); + +/* Defined in gtkmain.c */ +void launch_duplicate_session(Conf *conf); +void launch_new_session(void); +void launch_saved_session(const char *str); +#ifdef MAY_REFER_TO_GTK_IN_HEADERS +GtkWidget *make_gtk_toplevel_window(void *frontend); +#endif + +/* Defined in gtkcomm.c */ +void gtkcomm_setup(void); + /* Things pty.c needs from pterm.c */ -char *get_x_display(void *frontend); +const 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 gtkdlg.c needs from pterm.c */ void *get_window(void *frontend); /* void * to avoid depending on gtk.h */ +void post_main(void); /* called after any subsidiary gtk_main() */ /* Things pterm.c needs from gtkdlg.c */ int do_config_box(const char *title, Conf *conf, int midsession, int protcfginfo); -void fatal_message_box(void *window, char *msg); +void fatal_message_box(void *window, const char *msg); +void nonfatal_message_box(void *window, const char *msg); void about_box(void *window); void *eventlogstuff_new(void); 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, const char *title, + const char *msg, int minwid, int selectable, ...); +#endif /* Things pterm.c needs from {ptermm,uxputty}.c */ char *make_default_wintitle(char *hostname); -int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch); +int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch); /* pterm.c needs this special function in xkeysym.c */ int keysym_to_unicode(int keysym); @@ -114,6 +165,7 @@ void premsg(struct termios *); void postmsg(struct termios *); /* The interface used by uxsel.c */ +typedef struct uxsel_id uxsel_id; void uxsel_init(void); typedef int (*uxsel_callback_fn)(int fd, int event); void uxsel_set(int fd, int rwx, uxsel_callback_fn callback); @@ -122,8 +174,8 @@ int select_result(int fd, int event); int first_fd(int *state, int *rwx); int next_fd(int *state, int *rwx); /* The following are expected to be provided _to_ uxsel.c by the frontend */ -int uxsel_input_add(int fd, int rwx); /* returns an id */ -void uxsel_input_remove(int id); +uxsel_id *uxsel_input_add(int fd, int rwx); /* returns an id */ +void uxsel_input_remove(uxsel_id *id); /* uxcfg.c */ struct controlbox; @@ -151,7 +203,12 @@ void (*putty_signal(int sig, void (*func)(int)))(int); void block_signal(int sig, int block_it); /* uxmisc.c */ -int cloexec(int); +void cloexec(int); +void noncloexec(int); +int nonblock(int); +int no_nonblock(int); +char *make_dir_and_check_ours(const char *dirname); +char *make_dir_path(const char *path, mode_t mode); /* * Exports from unicode.c. @@ -165,13 +222,6 @@ int init_ucs(struct unicode_data *ucsdata, char *line_codepage, */ 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. @@ -186,4 +236,18 @@ void frontend_net_error_pending(void); */ extern Backend serial_backend; +/* + * uxpeer.c, wrapping getsockopt(SO_PEERCRED). + */ +int so_peercred(int fd, int *pid, int *uid, int *gid); + +/* + * Default font setting, which can vary depending on NOT_X_WINDOWS. + */ +#ifdef NOT_X_WINDOWS +#define DEFAULT_GTK_FONT "client:Monospace 12" +#else +#define DEFAULT_GTK_FONT "server:fixed" +#endif + #endif