X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Funix.h;h=cf297db3d90bbd8173d366f6513b0ba90bee4112;hb=095072fa46b2d7b8beafaddb2f873d2f500a1e10;hp=f603eb51803437cdec830bd50e1630eb3f5d0bf3;hpb=5133d2a133671a9236afc710cfe3da80e4c39363;p=PuTTY.git diff --git a/unix/unix.h b/unix/unix.h index f603eb51..cf297db3 100644 --- a/unix/unix.h +++ b/unix/unix.h @@ -11,6 +11,7 @@ #include /* Dynamic library loading */ #endif /* NO_LIBDL */ #include "charset.h" +#include /* for mode_t */ #ifdef OSX_GTK /* @@ -29,6 +30,17 @@ #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 { @@ -74,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 */ @@ -94,11 +106,25 @@ 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 */ 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); -int frontend_is_utf8(void *frontend); /* Things gtkdlg.c needs from pterm.c */ void *get_window(void *frontend); /* void * to avoid depending on gtk.h */ @@ -116,7 +142,7 @@ 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, ...); + const char *msg, int minwid, int selectable, ...); #endif /* Things pterm.c needs from {ptermm,uxputty}.c */ @@ -182,6 +208,7 @@ 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.