X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Funix.h;h=f603eb51803437cdec830bd50e1630eb3f5d0bf3;hb=5133d2a133671a9236afc710cfe3da80e4c39363;hp=e0e771393e53cfdecf579f5581fadbe9fcd09432;hpb=0b5a0c4da1f40fee351be1ae4494ef36ce1bef11;p=PuTTY.git

diff --git a/unix/unix.h b/unix/unix.h
index e0e77139..f603eb51 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -24,6 +24,11 @@
 #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 */
 #endif
 
 struct Filename {
@@ -40,6 +45,8 @@ typedef void *Context;                 /* FIXME: probably needs changing */
 
 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
 
@@ -91,6 +98,7 @@ unsigned long getticks(void);	       /* based on gettimeofday(2) */
 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 */
@@ -109,7 +117,6 @@ int reallyclose(void *frontend);
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 int messagebox(GtkWidget *parentwin, const char *title,
                const char *msg, int minwid, ...);
-int string_width(const char *text);
 #endif
 
 /* Things pterm.c needs from {ptermm,uxputty}.c */
@@ -151,13 +158,6 @@ void unix_setup_config_box(struct controlbox *b, int midsession, int protocol);
 /* gtkcfg.c */
 void gtk_setup_config_box(struct controlbox *b, int midsession, void *window);
 
-/* General GTK helper functions, which could be in any source file and
- * it doesn't really matter */
-void get_label_text_dimensions(const char *text, int *width, int *height);
-#ifdef MAY_REFER_TO_GTK_IN_HEADERS
-void align_label_left(GtkLabel *label);
-#endif
-
 /*
  * 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