#include <X11/Xatom.h>
#endif
-#define CAT2(x,y) x ## y
-#define CAT(x,y) CAT2(x,y)
-#define ASSERT(x) enum {CAT(assertion_,__LINE__) = 1 / (x)}
-
-#if GTK_CHECK_VERSION(2,0,0)
-ASSERT(sizeof(long) <= sizeof(gsize));
-#define LONG_TO_GPOINTER(l) GSIZE_TO_POINTER(l)
-#define GPOINTER_TO_LONG(p) GPOINTER_TO_SIZE(p)
-#else /* Gtk 1.2 */
-ASSERT(sizeof(long) <= sizeof(gpointer));
-#define LONG_TO_GPOINTER(l) ((gpointer)(long)(l))
-#define GPOINTER_TO_LONG(p) ((long)(p))
-#endif
+#include "x11misc.h"
/* Colours come in two flavours: configurable, and xterm-extended. */
#define NEXTCOLOURS 240 /* 216 colour-cube plus 24 shades of grey */
GdkAtom compound_text_atom, utf8_string_atom;
-extern char **pty_argv; /* declared in pty.c */
-extern int use_pty_argv;
-
-/*
- * Timers are global across all sessions (even if we were handling
- * multiple sessions, which we aren't), so the current timer ID is
- * a global variable.
- */
-static guint timer_id = 0;
+struct clipboard_data_instance;
struct gui_data {
GtkWidget *window, *area, *sbar;
+ gboolean sbar_visible;
GtkBox *hbox;
GtkAdjustment *sbar_adjust;
GtkWidget *menu, *specialsmenu, *specialsitem1, *specialsitem2,
*restartitem;
GtkWidget *sessionsmenu;
#ifndef NO_BACKING_PIXMAPS
+ /*
+ * Server-side pixmap which we use to cache the terminal window's
+ * contents. When we draw text in the terminal, we draw it to this
+ * pixmap first, and then blit from there to the actual window;
+ * this way, X expose events can be handled with an absolute
+ * minimum of network traffic, by just sending a command to
+ * re-blit an appropriate rectangle from this pixmap.
+ */
GdkPixmap *pixmap;
#endif
+#ifdef DRAW_TEXT_CAIRO
+ /*
+ * If we're drawing using Cairo, we cache the same image on the
+ * client side in a Cairo surface.
+ *
+ * In GTK2+Cairo, this happens _as well_ as having the server-side
+ * pixmap cache above; in GTK3+Cairo, server-side pixmaps are
+ * deprecated, so we _just_ have this client-side cache. In the
+ * latter case that means we have to transmit a big wodge of
+ * bitmap data over the X connection on every expose event; but
+ * GTK3 apparently deliberately provides no way to avoid that
+ * inefficiency, and at least this way we don't _also_ have to
+ * redo any font rendering just because the window was temporarily
+ * covered.
+ */
+ cairo_surface_t *surface;
+#endif
#if GTK_CHECK_VERSION(2,0,0)
GtkIMContext *imc;
#endif
#if !GTK_CHECK_VERSION(3,0,0)
GdkColormap *colmap;
#endif
- wchar_t *pastein_data;
int direct_to_font;
+ wchar_t *pastein_data;
int pastein_data_len;
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+ GtkClipboard *clipboard;
+ struct clipboard_data_instance *current_cdi;
+#else
char *pasteout_data, *pasteout_data_ctext, *pasteout_data_utf8;
int pasteout_data_len, pasteout_data_ctext_len, pasteout_data_utf8_len;
+#endif
int font_width, font_height;
int width, height;
int ignore_sbar;
int mouseptr_visible;
int busy_status;
- guint toplevel_callback_idle_id;
- int idle_fn_scheduled, quit_fn_scheduled;
int alt_keycode;
int alt_digits;
char *wintitle;
struct unicode_data ucsdata;
Conf *conf;
void *eventlogstuff;
- char *progname, **gtkargvstart;
- int ngtkargs;
guint32 input_event_time; /* Timestamp of the most recent input event. */
int reconfiguring;
+#if GTK_CHECK_VERSION(3,4,0)
+ gdouble cumulative_scroll;
+#endif
/* Cached things out of conf that we refer to a lot */
int bold_style;
int window_border;
static int send_raw_mouse;
-static const char *app_name = "pterm";
-
static void start_backend(struct gui_data *inst);
static void exit_callback(void *vinst);
-char *x_get_default(const char *key)
-{
-#ifndef NOT_X_WINDOWS
- return XGetDefault(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
- app_name, key);
-#else
- return NULL;
-#endif
-}
-
void connection_fatal(void *frontend, const char *p, ...)
{
struct gui_data *inst = (struct gui_data *)frontend;
need_size = 1;
}
+ {
+ int backing_w = w * inst->font_width + 2*inst->window_border;
+ int backing_h = h * inst->font_height + 2*inst->window_border;
+
#ifndef NO_BACKING_PIXMAPS
- if (inst->pixmap) {
- gdk_pixmap_unref(inst->pixmap);
- inst->pixmap = NULL;
- }
+ if (inst->pixmap) {
+ gdk_pixmap_unref(inst->pixmap);
+ inst->pixmap = NULL;
+ }
+
+ inst->pixmap = gdk_pixmap_new(gtk_widget_get_window(widget),
+ backing_w, backing_h, -1);
+#endif
+
+#ifdef DRAW_TEXT_CAIRO
+ if (inst->surface) {
+ cairo_surface_destroy(inst->surface);
+ inst->surface = NULL;
+ }
- inst->pixmap = gdk_pixmap_new(gtk_widget_get_window(widget),
- (w * inst->font_width + 2*inst->window_border),
- (h * inst->font_height + 2*inst->window_border), -1);
+ inst->surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
+ backing_w, backing_h);
#endif
+ }
draw_backing_rect(inst);
{
struct gui_data *inst = (struct gui_data *)data;
- if (inst->term) {
- struct draw_ctx adctx, *dctx = &adctx;
+ /*
+ * GTK3 window redraw: we always expect Cairo to be enabled, so
+ * that inst->surface exists, and pixmaps to be disabled, so that
+ * inst->pixmap does not exist. Hence, we just blit from
+ * inst->surface to the window.
+ */
+ if (inst->surface) {
GdkRectangle dirtyrect;
- dctx->inst = inst;
- dctx->uctx.type = DRAWTYPE_CAIRO;
- dctx->uctx.u.cairo.widget = widget;
- dctx->uctx.u.cairo.cr = cr;
- cairo_setup_dctx(dctx);
-
gdk_cairo_get_clip_rectangle(cr, &dirtyrect);
- /*
- * As in window.c, we clear the 'immediately' flag in the
- * term_paint() call if the terminal has an update pending, in
- * case we're constrained within this event to only draw on
- * the exposed rectangle of the window. (Because if the whole
- * of a character cell needs a redraw due to a terminal
- * contents change, the last thing we want is to give it a
- * _partial_ redraw here due to system-imposed clipping, and
- * then have the next main terminal update believe it's been
- * redrawn in full.)
- *
- * I don't actually know if GTK draw events will constrain us
- * in this way, but it's best to be careful...
- */
- term_paint(inst->term, dctx,
- (dirtyrect.x - inst->window_border) / inst->font_width,
- (dirtyrect.y - inst->window_border) / inst->font_height,
- (dirtyrect.x + dirtyrect.width -
- inst->window_border) / inst->font_width,
- (dirtyrect.y + dirtyrect.height -
- inst->window_border) / inst->font_height,
- !inst->term->window_update_pending);
+ cairo_set_source_surface(cr, inst->surface, 0, 0);
+ cairo_rectangle(cr, dirtyrect.x, dirtyrect.y,
+ dirtyrect.width, dirtyrect.height);
+ cairo_fill(cr);
}
return TRUE;
#ifndef NO_BACKING_PIXMAPS
/*
- * Pass the exposed rectangle to terminal.c, which will call us
- * back to do the actual painting.
+ * Draw to the exposed part of the window from the server-side
+ * backing pixmap.
*/
if (inst->pixmap) {
gdk_draw_pixmap(gtk_widget_get_window(widget),
event->area.width, event->area.height);
}
#else
- if (inst->term) {
- Context ctx = get_ctx(inst);
- term_paint(inst->term, ctx,
- (event->area.x - inst->window_border) / inst->font_width,
- (event->area.y - inst->window_border) / inst->font_height,
- (event->area.x + event->area.width -
- inst->window_border) / inst->font_width,
- (event->area.y + event->area.height -
- inst->window_border) / inst->font_height,
- !inst->term->window_update_pending);
- free_ctx(ctx);
+ /*
+ * Failing that, draw from the client-side Cairo surface. (We
+ * should never be compiled in a context where we have _neither_
+ * inst->surface nor inst->pixmap.)
+ */
+ if (inst->surface) {
+ cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
+ cairo_set_source_surface(cr, inst->surface, 0, 0);
+ cairo_rectangle(cr, event->area.x, event->area.y,
+ event->area.width, event->area.height);
+ cairo_fill(cr);
+ cairo_destroy(cr);
}
#endif
#define KEY_PRESSED(k) \
(inst->keystate[(k) / 32] & (1 << ((k) % 32)))
+#ifdef KEY_EVENT_DIAGNOSTICS
+char *dup_keyval_name(guint keyval)
+{
+ const char *name = gdk_keyval_name(keyval);
+ if (name)
+ return dupstr(name);
+ else
+ return dupprintf("UNKNOWN[%u]", (unsigned)keyval);
+}
+#endif
+
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
output_charset = CS_ISO8859_1;
#ifdef KEY_EVENT_DIAGNOSTICS
- /*
- * Condition this mess in if you want to debug keyboard events as
- * they come in to this function (e.g. because some particular
- * port of GDK is producing an unexpected arrangement of
- * modifiers).
- */
-#define TRY(val, prefix, string) \
- if ((val) == prefix ## string) printf("%s", #string); else
-#define GIVE_UP(val) \
- printf("%d", (int)(val))
-#define TRY_MASK(val, prefix, string, suffix) \
- if ((val) & prefix ## string ## suffix) { \
- (val) &= ~ prefix ## string ## suffix; \
- printf("%s", #string); \
- if (val) printf("|"); \
+ {
+ char *type_string, *state_string, *keyval_string, *string_string;
+
+ type_string = (event->type == GDK_KEY_PRESS ? dupstr("PRESS") :
+ event->type == GDK_KEY_RELEASE ? dupstr("RELEASE") :
+ dupprintf("UNKNOWN[%d]", (int)event->type));
+
+ {
+ static const struct {
+ int mod_bit;
+ const char *name;
+ } mod_bits[] = {
+ {GDK_SHIFT_MASK, "SHIFT"},
+ {GDK_LOCK_MASK, "LOCK"},
+ {GDK_CONTROL_MASK, "CONTROL"},
+ {GDK_MOD1_MASK, "MOD1"},
+ {GDK_MOD2_MASK, "MOD2"},
+ {GDK_MOD3_MASK, "MOD3"},
+ {GDK_MOD4_MASK, "MOD4"},
+ {GDK_MOD5_MASK, "MOD5"},
+ {GDK_SUPER_MASK, "SUPER"},
+ {GDK_HYPER_MASK, "HYPER"},
+ {GDK_META_MASK, "META"},
+ };
+ int i;
+ int val = event->state;
+
+ state_string = dupstr("");
+
+ for (i = 0; i < lenof(mod_bits); i++) {
+ if (val & mod_bits[i].mod_bit) {
+ char *old = state_string;
+ state_string = dupcat(state_string,
+ state_string[0] ? "|" : "",
+ mod_bits[i].name,
+ (char *)NULL);
+ sfree(old);
+
+ val &= ~mod_bits[i].mod_bit;
+ }
+ }
+
+ if (val || !state_string[0]) {
+ char *old = state_string;
+ state_string = dupprintf("%s%s%d", state_string,
+ state_string[0] ? "|" : "", val);
+ sfree(old);
+ }
}
-#define GIVE_UP_MASK(val) \
- do \
- { \
- if ((val)) printf("%d", (int)(val)); \
- } while (0)
- printf("key_event: type=");
- TRY(event->type, GDK_KEY_, PRESS)
- TRY(event->type, GDK_KEY_, RELEASE)
- GIVE_UP(event->type);
- printf(" keyval=");
- TRY(event->keyval, GDK_KEY_, Alt_L)
- TRY(event->keyval, GDK_KEY_, Alt_R)
- TRY(event->keyval, GDK_KEY_, BackSpace)
- TRY(event->keyval, GDK_KEY_, Begin)
- TRY(event->keyval, GDK_KEY_, Break)
- TRY(event->keyval, GDK_KEY_, Delete)
- TRY(event->keyval, GDK_KEY_, Down)
- TRY(event->keyval, GDK_KEY_, End)
- TRY(event->keyval, GDK_KEY_, Escape)
- TRY(event->keyval, GDK_KEY_, F10)
- TRY(event->keyval, GDK_KEY_, F11)
- TRY(event->keyval, GDK_KEY_, F12)
- TRY(event->keyval, GDK_KEY_, F13)
- TRY(event->keyval, GDK_KEY_, F14)
- TRY(event->keyval, GDK_KEY_, F15)
- TRY(event->keyval, GDK_KEY_, F16)
- TRY(event->keyval, GDK_KEY_, F17)
- TRY(event->keyval, GDK_KEY_, F18)
- TRY(event->keyval, GDK_KEY_, F19)
- TRY(event->keyval, GDK_KEY_, F1)
- TRY(event->keyval, GDK_KEY_, F20)
- TRY(event->keyval, GDK_KEY_, F2)
- TRY(event->keyval, GDK_KEY_, F3)
- TRY(event->keyval, GDK_KEY_, F4)
- TRY(event->keyval, GDK_KEY_, F5)
- TRY(event->keyval, GDK_KEY_, F6)
- TRY(event->keyval, GDK_KEY_, F7)
- TRY(event->keyval, GDK_KEY_, F8)
- TRY(event->keyval, GDK_KEY_, F9)
- TRY(event->keyval, GDK_KEY_, Home)
- TRY(event->keyval, GDK_KEY_, Insert)
- TRY(event->keyval, GDK_KEY_, ISO_Left_Tab)
- TRY(event->keyval, GDK_KEY_, KP_0)
- TRY(event->keyval, GDK_KEY_, KP_1)
- TRY(event->keyval, GDK_KEY_, KP_2)
- TRY(event->keyval, GDK_KEY_, KP_3)
- TRY(event->keyval, GDK_KEY_, KP_4)
- TRY(event->keyval, GDK_KEY_, KP_5)
- TRY(event->keyval, GDK_KEY_, KP_6)
- TRY(event->keyval, GDK_KEY_, KP_7)
- TRY(event->keyval, GDK_KEY_, KP_8)
- TRY(event->keyval, GDK_KEY_, KP_9)
- TRY(event->keyval, GDK_KEY_, KP_Add)
- TRY(event->keyval, GDK_KEY_, KP_Begin)
- TRY(event->keyval, GDK_KEY_, KP_Decimal)
- TRY(event->keyval, GDK_KEY_, KP_Delete)
- TRY(event->keyval, GDK_KEY_, KP_Divide)
- TRY(event->keyval, GDK_KEY_, KP_Down)
- TRY(event->keyval, GDK_KEY_, KP_End)
- TRY(event->keyval, GDK_KEY_, KP_Enter)
- TRY(event->keyval, GDK_KEY_, KP_Home)
- TRY(event->keyval, GDK_KEY_, KP_Insert)
- TRY(event->keyval, GDK_KEY_, KP_Left)
- TRY(event->keyval, GDK_KEY_, KP_Multiply)
- TRY(event->keyval, GDK_KEY_, KP_Page_Down)
- TRY(event->keyval, GDK_KEY_, KP_Page_Up)
- TRY(event->keyval, GDK_KEY_, KP_Right)
- TRY(event->keyval, GDK_KEY_, KP_Subtract)
- TRY(event->keyval, GDK_KEY_, KP_Up)
- TRY(event->keyval, GDK_KEY_, Left)
- TRY(event->keyval, GDK_KEY_, Meta_L)
- TRY(event->keyval, GDK_KEY_, Meta_R)
- TRY(event->keyval, GDK_KEY_, Num_Lock)
- TRY(event->keyval, GDK_KEY_, Page_Down)
- TRY(event->keyval, GDK_KEY_, Page_Up)
- TRY(event->keyval, GDK_KEY_, Return)
- TRY(event->keyval, GDK_KEY_, Right)
- TRY(event->keyval, GDK_KEY_, Tab)
- TRY(event->keyval, GDK_KEY_, Up)
- TRY(event->keyval, GDK_KEY_, Shift_L)
- TRY(event->keyval, GDK_KEY_, Shift_R)
- TRY(event->keyval, GDK_KEY_, Control_L)
- TRY(event->keyval, GDK_KEY_, Control_R)
- TRY(event->keyval, GDK_KEY_, Caps_Lock)
- TRY(event->keyval, GDK_KEY_, Shift_Lock)
- TRY(event->keyval, GDK_KEY_, Super_L)
- TRY(event->keyval, GDK_KEY_, Super_R)
- TRY(event->keyval, GDK_KEY_, Hyper_L)
- TRY(event->keyval, GDK_KEY_, Hyper_R)
- GIVE_UP(event->keyval);
- printf(" state=");
- {
- int val = event->state;
- TRY_MASK(val, GDK_, SHIFT, _MASK)
- TRY_MASK(val, GDK_, LOCK, _MASK)
- TRY_MASK(val, GDK_, CONTROL, _MASK)
- TRY_MASK(val, GDK_, MOD1, _MASK)
- TRY_MASK(val, GDK_, MOD2, _MASK)
- TRY_MASK(val, GDK_, MOD3, _MASK)
- TRY_MASK(val, GDK_, MOD4, _MASK)
- TRY_MASK(val, GDK_, MOD5, _MASK)
- TRY_MASK(val, GDK_, SUPER, _MASK)
- TRY_MASK(val, GDK_, HYPER, _MASK)
- TRY_MASK(val, GDK_, META, _MASK)
- GIVE_UP_MASK(val);
+ keyval_string = dup_keyval_name(event->keyval);
+
+ string_string = dupstr("");
+ {
+ int i;
+ for (i = 0; event->string[i]; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%02x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)event->string[i] & 0xFF);
+ sfree(old);
+ }
+ }
+
+ debug(("key_event: type=%s keyval=%s state=%s "
+ "hardware_keycode=%d is_modifier=%s string=[%s]\n",
+ type_string, keyval_string, state_string,
+ (int)event->hardware_keycode,
+ event->is_modifier ? "TRUE" : "FALSE",
+ string_string));
+
+ sfree(type_string);
+ sfree(state_string);
+ sfree(keyval_string);
+ sfree(string_string);
}
- printf(" hardware_keycode=%d is_modifier=%s\n",
- (int)event->hardware_keycode, event->is_modifier ? "TRUE" : "FALSE");
#endif /* KEY_EVENT_DIAGNOSTICS */
/*
event->keyval == GDK_KEY_Alt_L ||
event->keyval == GDK_KEY_Alt_R) &&
inst->alt_keycode >= 0 && inst->alt_digits > 1) {
-#ifdef KEY_DEBUGGING
- printf("Alt key up, keycode = %d\n", inst->alt_keycode);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - modifier release terminates Alt+numberpad input, "
+ "keycode = %d\n", inst->alt_keycode));
#endif
/*
* FIXME: we might usefully try to do something clever here
goto done;
}
#if GTK_CHECK_VERSION(2,0,0)
- if (gtk_im_context_filter_keypress(inst->imc, event))
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - key release, passing to IM\n"));
+#endif
+ if (gtk_im_context_filter_keypress(inst->imc, event)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - key release accepted by IM\n"));
+#endif
return TRUE;
+ } else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - key release not accepted by IM\n"));
+#endif
+ }
#endif
}
if (event->type == GDK_KEY_PRESS) {
-#ifdef KEY_DEBUGGING
- {
- int i;
- printf("keypress: keyval = %04x, state = %08x; string =",
- event->keyval, event->state);
- for (i = 0; event->string[i]; i++)
- printf(" %02x", (unsigned char) event->string[i]);
- printf("\n");
- }
-#endif
-
- /*
- * NYI: Compose key (!!! requires Unicode faff before even trying)
- */
-
/*
* If Alt has just been pressed, we start potentially
* accumulating an Alt+numberpad code. We do this by
event->keyval == GDK_KEY_Meta_R ||
event->keyval == GDK_KEY_Alt_L ||
event->keyval == GDK_KEY_Alt_R)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - modifier press potentially begins Alt+numberpad "
+ "input\n"));
+#endif
inst->alt_keycode = -1;
inst->alt_digits = 0;
goto done; /* this generates nothing else */
if (digit < 0)
inst->alt_keycode = -2; /* it's invalid */
else {
-#ifdef KEY_DEBUGGING
- printf("Adding digit %d to keycode %d", digit,
- inst->alt_keycode);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ int old_keycode = inst->alt_keycode;
#endif
if (inst->alt_keycode == -1)
inst->alt_keycode = digit; /* one-digit code */
else
inst->alt_keycode = inst->alt_keycode * 10 + digit;
inst->alt_digits++;
-#ifdef KEY_DEBUGGING
- printf(" gives new code %d\n", inst->alt_keycode);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Alt+numberpad digit %d added to keycode %d"
+ " gives %d\n", digit, old_keycode, inst->alt_keycode));
#endif
/* Having used this digit, we now do nothing more with it. */
goto done;
*/
if (event->keyval == GDK_KEY_Page_Up &&
(event->state & GDK_SHIFT_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Shift-PgUp scroll\n"));
+#endif
term_scroll(inst->term, 0, -inst->height/2);
return TRUE;
}
if (event->keyval == GDK_KEY_Page_Up &&
(event->state & GDK_CONTROL_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Ctrl-PgUp scroll\n"));
+#endif
term_scroll(inst->term, 0, -1);
return TRUE;
}
if (event->keyval == GDK_KEY_Page_Down &&
(event->state & GDK_SHIFT_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Shift-PgDn scroll\n"));
+#endif
term_scroll(inst->term, 0, +inst->height/2);
return TRUE;
}
if (event->keyval == GDK_KEY_Page_Down &&
(event->state & GDK_CONTROL_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Ctrl-PgDn scroll\n"));
+#endif
term_scroll(inst->term, 0, +1);
return TRUE;
}
*/
if (event->keyval == GDK_KEY_Insert &&
(event->state & GDK_SHIFT_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Shift-Insert paste\n"));
+#endif
request_paste(inst);
return TRUE;
}
*/
output_charset = CS_ISO8859_1;
strncpy(output+1, event->string, lenof(output)-1);
-#else
+#else /* !GTK_CHECK_VERSION(2,0,0) */
/*
* Most things can now be passed to
* gtk_im_context_filter_keypress without breaking anything
event->keyval == GDK_KEY_KP_Page_Up)) {
/* nethack mode; do nothing */
} else {
- if (gtk_im_context_filter_keypress(inst->imc, event))
- return TRUE;
+ int try_filter = TRUE;
+
+#ifdef META_MANUAL_MASK
+ if (event->state & META_MANUAL_MASK & inst->meta_mod_mask) {
+ /*
+ * If this key event had a Meta modifier bit set which
+ * is also in META_MANUAL_MASK, that means passing
+ * such an event to the GtkIMContext will be unhelpful
+ * (it will eat the keystroke and turn it into
+ * something not what we wanted).
+ */
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Meta modifier requiring manual intervention, "
+ "suppressing IM filtering\n"));
+#endif
+ try_filter = FALSE;
+ }
+#endif
+
+ if (try_filter) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - general key press, passing to IM\n"));
+#endif
+ if (gtk_im_context_filter_keypress(inst->imc, event)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - key press accepted by IM\n"));
+#endif
+ return TRUE;
+ } else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - key press not accepted by IM\n"));
+#endif
+ }
+ }
}
/*
event->string, strlen(event->string),
widedata, lenof(widedata)-1);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ {
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = 0; i < wlen; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%04x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)widedata[i]);
+ sfree(old);
+ }
+ debug((" - string translated into Unicode = [%s]\n",
+ string_string));
+ sfree(string_string);
+ }
+#endif
+
wp = widedata;
ulen = charset_from_unicode(&wp, &wlen, output+1, lenof(output)-2,
CS_UTF8, NULL, NULL, 0);
+
+#ifdef KEY_EVENT_DIAGNOSTICS
+ {
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = 0; i < ulen; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%02x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)output[i+1] & 0xFF);
+ sfree(old);
+ }
+ debug((" - string translated into UTF-8 = [%s]\n",
+ string_string));
+ sfree(string_string);
+ }
+#endif
+
output[1+ulen] = '\0';
}
-#endif
+#endif /* !GTK_CHECK_VERSION(2,0,0) */
if (!output[1] &&
(ucsval = keysym_to_unicode(event->keyval)) >= 0) {
ucsoutput[0] = '\033';
ucsoutput[1] = ucsval;
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - keysym_to_unicode gave %04x\n",
+ (unsigned)ucsoutput[1]));
+#endif
use_ucsoutput = TRUE;
end = 2;
} else {
if (event->state & inst->meta_mod_mask) {
start = 0;
if (end == 1) end = 0;
+
+#ifdef META_MANUAL_MASK
+ if (event->state & META_MANUAL_MASK) {
+ /*
+ * Key events which have a META_MANUAL_MASK meta bit
+ * set may have a keyval reflecting that, e.g. on OS X
+ * the Option key acts as an AltGr-like modifier and
+ * causes different Unicode characters to be output.
+ *
+ * To work around this, we clear the dangerous
+ * modifier bit and retranslate from the hardware
+ * keycode as if the key had been pressed without that
+ * modifier. Then we prefix Esc to *that*.
+ */
+ guint new_keyval;
+ GdkModifierType consumed;
+ if (gdk_keymap_translate_keyboard_state
+ (gdk_keymap_get_for_display(gdk_display_get_default()),
+ event->hardware_keycode, event->state & ~META_MANUAL_MASK,
+ 0, &new_keyval, NULL, NULL, &consumed)) {
+ ucsoutput[0] = '\033';
+ ucsoutput[1] = gdk_keyval_to_unicode(new_keyval);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ {
+ char *keyval_name = dup_keyval_name(new_keyval);
+ debug((" - retranslation for manual Meta: "
+ "new keyval = %s, Unicode = %04x\n",
+ keyval_name, (unsigned)ucsoutput[1]));
+ sfree(keyval_name);
+ }
+#endif
+ use_ucsoutput = TRUE;
+ end = 2;
+ }
+ }
+#endif
} else
start = 1;
/* Control-` is the same as Control-\ (unless gtk has a better idea) */
if (!output[1] && event->keyval == '`' &&
(event->state & GDK_CONTROL_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Ctrl-` special case, translating as 1c\n"));
+#endif
output[1] = '\x1C';
use_ucsoutput = FALSE;
end = 2;
* The translations below are in line with X11 policy as far
* as I know. */
if ((event->state & GDK_CONTROL_MASK) && end == 2) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ int orig = output[1];
+#endif
+
if (output[1] >= '3' && output[1] <= '7') {
/* ^3,...,^7 map to 0x1B,...,0x1F */
output[1] += '\x1B' - '3';
- } else if (output[1] == '2') {
- /* ^2 is ^@, i.e. \0 */
+ } else if (output[1] == '2' || output[1] == ' ') {
+ /* ^2 and ^Space are both ^@, i.e. \0 */
output[1] = '\0';
} else if (output[1] == '8') {
/* ^8 is DEL */
output[1] &= 0x1F;
}
/* Anything else, e.g. '0', is unchanged. */
+
+#ifdef KEY_EVENT_DIAGNOSTICS
+ if (orig == output[1])
+ debug((" - manual Ctrl key handling did nothing\n"));
+ else
+ debug((" - manual Ctrl key handling: %02x -> %02x\n",
+ (unsigned)orig, (unsigned)output[1]));
+#endif
}
/* Control-Break sends a Break special to the backend */
if (event->keyval == GDK_KEY_Break &&
(event->state & GDK_CONTROL_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Ctrl-Break special case, sending TS_BRK\n"));
+#endif
if (inst->back)
inst->back->special(inst->backhandle, TS_BRK);
return TRUE;
/* We handle Return ourselves, because it needs to be flagged as
* special to ldisc. */
if (event->keyval == GDK_KEY_Return) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Return special case, translating as 0d + special\n"));
+#endif
output[1] = '\015';
use_ucsoutput = FALSE;
end = 2;
event->keyval == '@') &&
(event->state & (GDK_SHIFT_MASK |
GDK_CONTROL_MASK)) == GDK_CONTROL_MASK) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Ctrl-{space,2,@} special case, translating as 00\n"));
+#endif
output[1] = '\0';
use_ucsoutput = FALSE;
end = 2;
if (!output[1] && event->keyval == ' ' &&
(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) ==
(GDK_SHIFT_MASK | GDK_CONTROL_MASK)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Ctrl-Shift-space special case, translating as 00a0\n"));
+#endif
output[1] = '\240';
output_charset = CS_ISO8859_1;
use_ucsoutput = FALSE;
!(event->state & GDK_SHIFT_MASK)) {
output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ?
'\x7F' : '\x08';
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Backspace, translating as %02x\n",
+ (unsigned)output[1]));
+#endif
use_ucsoutput = FALSE;
end = 2;
special = TRUE;
(event->state & GDK_SHIFT_MASK)) {
output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ?
'\x08' : '\x7F';
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Shift-Backspace, translating as %02x\n",
+ (unsigned)output[1]));
+#endif
use_ucsoutput = FALSE;
end = 2;
special = TRUE;
if (event->keyval == GDK_KEY_ISO_Left_Tab ||
(event->keyval == GDK_KEY_Tab &&
(event->state & GDK_SHIFT_MASK))) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Shift-Tab, translating as ESC [ Z\n"));
+#endif
end = 1 + sprintf(output+1, "\033[Z");
use_ucsoutput = FALSE;
}
* (Curiously, at least one version of the MacOS 10.5 X server
* doesn't translate Tab for us. */
if (event->keyval == GDK_KEY_Tab && end <= 1) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Tab, translating as 09\n"));
+#endif
output[1] = '\t';
end = 2;
}
output[1] = keys[1];
else
output[1] = keys[0];
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Nethack-mode key"));
+#endif
use_ucsoutput = FALSE;
goto done;
}
} else
end = 1 + sprintf(output+1, "\033O%c", xkey);
use_ucsoutput = FALSE;
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Application keypad mode key"));
+#endif
goto done;
}
}
if (inst->term->vt52_mode && code > 0 && code <= 6) {
end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - VT52 mode small keypad key"));
+#endif
use_ucsoutput = FALSE;
goto done;
}
if (event->state & GDK_SHIFT_MASK) index += 12;
if (event->state & GDK_CONTROL_MASK) index += 24;
end = 1 + sprintf(output+1, "\x1B[%c", codes[index]);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - SCO mode function key"));
+#endif
use_ucsoutput = FALSE;
goto done;
}
} else {
end = 1 + sprintf(output+1, "\x1B[%c", codes[code-1]);
}
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - SCO mode small keypad key"));
+#endif
use_ucsoutput = FALSE;
goto done;
}
offt++;
if (code > 21)
offt++;
- if (inst->term->vt52_mode)
+ if (inst->term->vt52_mode) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - VT52 mode function key"));
+#endif
end = 1 + sprintf(output+1,
"\x1B%c", code + 'P' - 11 - offt);
- else
+ } else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - VT100+ mode function key"));
+#endif
end = 1 + sprintf(output+1,
"\x1BO%c", code + 'P' - 11 - offt);
+ }
use_ucsoutput = FALSE;
goto done;
}
if (funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - Linux mode F1-F5 function key"));
+#endif
use_ucsoutput = FALSE;
goto done;
}
if (funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
- if (inst->term->vt52_mode)
+ if (inst->term->vt52_mode) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - VT52 mode (overriding xterm) F1-F4 function"
+ " key"));
+#endif
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
- else
+ } else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - xterm mode F1-F4 function key"));
+#endif
end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
+ }
use_ucsoutput = FALSE;
goto done;
}
if ((code == 1 || code == 4) &&
conf_get_int(inst->conf, CONF_rxvt_homeend)) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - rxvt style Home/End"));
+#endif
end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw");
use_ucsoutput = FALSE;
goto done;
}
if (code) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - ordinary function key encoding"));
+#endif
end = 1 + sprintf(output+1, "\x1B[%d~", code);
use_ucsoutput = FALSE;
goto done;
if (xkey) {
end = 1 + format_arrow_key(output+1, inst->term, xkey,
event->state & GDK_CONTROL_MASK);
+#ifdef KEY_EVENT_DIAGNOSTICS
+ debug((" - arrow key"));
+#endif
use_ucsoutput = FALSE;
goto done;
}
done:
if (end-start > 0) {
-#ifdef KEY_DEBUGGING
- int i;
- printf("generating sequence:");
- for (i = start; i < end; i++)
- printf(" %02x", (unsigned char) output[i]);
- printf("\n");
-#endif
-
if (special) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = start; i < end; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%02x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)output[i] & 0xFF);
+ sfree(old);
+ }
+ debug((" - final output, special, generic encoding = [%s]\n",
+ charset_to_localenc(output_charset), string_string));
+ sfree(string_string);
+#endif
/*
* For special control characters, the character set
* should never matter.
ldisc_send(inst->ldisc, output+start, -2, 1);
} else if (!inst->direct_to_font) {
if (!use_ucsoutput) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = start; i < end; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%02x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)output[i] & 0xFF);
+ sfree(old);
+ }
+ debug((" - final output in %s = [%s]\n",
+ charset_to_localenc(output_charset), string_string));
+ sfree(string_string);
+#endif
if (inst->ldisc)
lpage_send(inst->ldisc, output_charset, output+start,
end-start, 1);
} else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = start; i < end; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%04x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)ucsoutput[i]);
+ sfree(old);
+ }
+ debug((" - final output in Unicode = [%s]\n",
+ string_string));
+ sfree(string_string);
+#endif
+
/*
* We generated our own Unicode key data from the
* keysym, so use that instead.
* In direct-to-font mode, we just send the string
* exactly as we received it.
*/
+#ifdef KEY_EVENT_DIAGNOSTICS
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = start; i < end; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%02x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)output[i] & 0xFF);
+ sfree(old);
+ }
+ debug((" - final output in direct-to-font encoding = [%s]\n",
+ string_string));
+ sfree(string_string);
+#endif
if (inst->ldisc)
ldisc_send(inst->ldisc, output+start, end-start, 1);
}
void input_method_commit_event(GtkIMContext *imc, gchar *str, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
+
+#ifdef KEY_EVENT_DIAGNOSTICS
+ char *string_string = dupstr("");
+ int i;
+
+ for (i = 0; str[i]; i++) {
+ char *old = string_string;
+ string_string = dupprintf("%s%s%02x", string_string,
+ string_string[0] ? " " : "",
+ (unsigned)str[i] & 0xFF);
+ sfree(old);
+ }
+ debug((" - IM commit event in UTF-8 = [%s]\n", string_string));
+ sfree(string_string);
+#endif
+
if (inst->ldisc)
lpage_send(inst->ldisc, CS_UTF8, str, strlen(str), 1);
show_mouseptr(inst, 0);
}
#endif
+#define SCROLL_INCREMENT_LINES 5
+
+#if GTK_CHECK_VERSION(3,4,0)
+gboolean scroll_internal(struct gui_data *inst, gdouble delta, guint state,
+ gdouble ex, gdouble ey)
+{
+ int shift, ctrl, alt, x, y, raw_mouse_mode;
+
+ show_mouseptr(inst, 1);
+
+ shift = state & GDK_SHIFT_MASK;
+ ctrl = state & GDK_CONTROL_MASK;
+ alt = state & inst->meta_mod_mask;
+
+ x = (ex - inst->window_border) / inst->font_width;
+ y = (ey - inst->window_border) / inst->font_height;
+
+ raw_mouse_mode =
+ send_raw_mouse && !(shift && conf_get_int(inst->conf,
+ CONF_mouse_override));
+
+ inst->cumulative_scroll += delta * SCROLL_INCREMENT_LINES;
+
+ if (!raw_mouse_mode) {
+ int scroll_lines = (int)inst->cumulative_scroll; /* rounds toward 0 */
+ if (scroll_lines) {
+ term_scroll(inst->term, 0, scroll_lines);
+ inst->cumulative_scroll -= scroll_lines;
+ }
+ return TRUE;
+ } else {
+ int scroll_events = (int)(inst->cumulative_scroll /
+ SCROLL_INCREMENT_LINES);
+ if (scroll_events) {
+ int button;
+
+ inst->cumulative_scroll -= scroll_events * SCROLL_INCREMENT_LINES;
+
+ if (scroll_events > 0) {
+ button = MBT_WHEEL_DOWN;
+ } else {
+ button = MBT_WHEEL_UP;
+ scroll_events = -scroll_events;
+ }
+
+ while (scroll_events-- > 0) {
+ term_mouse(inst->term, button, translate_button(button),
+ MA_CLICK, x, y, shift, ctrl, alt);
+ }
+ }
+ return TRUE;
+ }
+}
+#endif
+
gboolean button_internal(struct gui_data *inst, guint32 timestamp,
GdkEventType type, guint ebutton, guint state,
gdouble ex, gdouble ey)
if (!raw_mouse_mode) {
if (ebutton == 4 && type == GDK_BUTTON_PRESS) {
- term_scroll(inst->term, 0, -5);
+ term_scroll(inst->term, 0, -SCROLL_INCREMENT_LINES);
return TRUE;
}
if (ebutton == 5 && type == GDK_BUTTON_PRESS) {
- term_scroll(inst->term, 0, +5);
+ term_scroll(inst->term, 0, +SCROLL_INCREMENT_LINES);
return TRUE;
}
}
gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
- guint button;
+#if GTK_CHECK_VERSION(3,4,0)
+ gdouble dx, dy;
+ if (gdk_event_get_scroll_deltas((GdkEvent *)event, &dx, &dy)) {
+ return scroll_internal(inst, dy, event->state, event->x, event->y);
+ } else
+ return FALSE;
+#else
+ guint button;
if (event->direction == GDK_SCROLL_UP)
button = 4;
else if (event->direction == GDK_SCROLL_DOWN)
return button_internal(inst, event->time, GDK_BUTTON_PRESS,
button, event->state, event->x, event->y);
+#endif
}
#endif
}
}
-/*
- * Replacement code for the gtk_quit_add() function, which GTK2 - in
- * their unbounded wisdom - deprecated without providing any usable
- * replacement, and which we were using to ensure that our idle
- * function for toplevel callbacks was only run from the outermost
- * gtk_main().
- *
- * We maintain a global variable with a list of 'struct gui_data'
- * instances on which we should call inst_post_main() when a
- * subsidiary gtk_main() terminates; then we must make sure that all
- * our subsidiary calls to gtk_main() are followed by a call to
- * post_main().
- *
- * This is kind of overkill in the sense that at the time of writing
- * we don't actually ever run more than one 'struct gui_data' instance
- * in the same process, but we're _so nearly_ prepared to do that that
- * I want to remain futureproof against the possibility of doing so in
- * future.
- */
-struct post_main_context {
- struct post_main_context *next;
- struct gui_data *inst;
-};
-struct post_main_context *post_main_list_head = NULL;
-static void request_post_main(struct gui_data *inst)
-{
- struct post_main_context *node = snew(struct post_main_context);
- node->next = post_main_list_head;
- node->inst = inst;
- post_main_list_head = node;
-}
-static void inst_post_main(struct gui_data *inst);
-void post_main(void)
-{
- while (post_main_list_head) {
- struct post_main_context *node = post_main_list_head;
- post_main_list_head = node->next;
- inst_post_main(node->inst);
- sfree(node);
- }
-}
-
void notify_remote_exit(void *frontend)
{
struct gui_data *inst = (struct gui_data *)frontend;
queue_toplevel_callback(exit_callback, inst);
}
-static void notify_toplevel_callback(void *frontend);
-
-static void inst_post_main(struct gui_data *inst)
-{
- if (gtk_main_level() == 1) {
- notify_toplevel_callback(inst);
- inst->quit_fn_scheduled = FALSE;
- } else {
- /* Apparently we're _still_ more than one level deep in
- * gtk_main() instances, so we'll need another callback for
- * when we get out of the next one. */
- request_post_main(inst);
- }
-}
-
-static gint idle_toplevel_callback_func(gpointer data)
-{
- struct gui_data *inst = (struct gui_data *)data;
-
- if (gtk_main_level() > 1) {
- /*
- * We don't run the callbacks if we're in the middle of a
- * subsidiary gtk_main. Instead, ask for a callback when we
- * get back out of the subsidiary main loop (if we haven't
- * already arranged one), so we can reschedule ourself then.
- */
- if (!inst->quit_fn_scheduled) {
- request_post_main(inst);
- inst->quit_fn_scheduled = TRUE;
- }
- /*
- * And unschedule this idle function, since we've now done
- * everything we can until the innermost gtk_main has quit and
- * can reschedule us with a chance of actually taking action.
- */
- if (inst->idle_fn_scheduled) { /* double-check, just in case */
- g_source_remove(inst->toplevel_callback_idle_id);
- inst->idle_fn_scheduled = FALSE;
- }
- } else {
- run_toplevel_callbacks();
- }
-
- /*
- * If we've emptied our toplevel callback queue, unschedule
- * ourself. Otherwise, leave ourselves pending so we'll be called
- * again to deal with more callbacks after another round of the
- * event loop.
- */
- if (!toplevel_callback_pending() && inst->idle_fn_scheduled) {
- g_source_remove(inst->toplevel_callback_idle_id);
- inst->idle_fn_scheduled = FALSE;
- }
-
- return TRUE;
-}
-
-static void notify_toplevel_callback(void *frontend)
-{
- struct gui_data *inst = (struct gui_data *)frontend;
-
- if (!inst->idle_fn_scheduled) {
- inst->toplevel_callback_idle_id =
- g_idle_add(idle_toplevel_callback_func, inst);
- inst->idle_fn_scheduled = TRUE;
- }
-}
-
-static gint timer_trigger(gpointer data)
-{
- unsigned long now = GPOINTER_TO_LONG(data);
- unsigned long next, then;
- long ticks;
-
- /*
- * Destroy the timer we got here on.
- */
- if (timer_id) {
- g_source_remove(timer_id);
- timer_id = 0;
- }
-
- /*
- * run_timers() may cause a call to timer_change_notify, in which
- * case a new timer will already have been set up and left in
- * timer_id. If it hasn't, and run_timers reports that some timing
- * still needs to be done, we do it ourselves.
- */
- if (run_timers(now, &next) && !timer_id) {
- then = now;
- now = GETTICKCOUNT();
- if (now - then > next - then)
- ticks = 0;
- else
- ticks = next - now;
- timer_id = g_timeout_add(ticks, timer_trigger, LONG_TO_GPOINTER(next));
- }
-
- /*
- * Returning FALSE means 'don't call this timer again', which
- * _should_ be redundant given that we removed it above, but just
- * in case, return FALSE anyway.
- */
- return FALSE;
-}
-
-void timer_change_notify(unsigned long next)
-{
- long ticks;
-
- if (timer_id)
- g_source_remove(timer_id);
-
- ticks = next - GETTICKCOUNT();
- if (ticks <= 0)
- ticks = 1; /* just in case */
-
- timer_id = g_timeout_add(ticks, timer_trigger, LONG_TO_GPOINTER(next));
-}
-
-#if GTK_CHECK_VERSION(2,0,0)
-gboolean fd_input_func(GIOChannel *source, GIOCondition condition,
- gpointer data)
-{
- int sourcefd = g_io_channel_unix_get_fd(source);
- /*
- * We must process exceptional notifications before ordinary
- * readability ones, or we may go straight past the urgent
- * marker.
- */
- if (condition & G_IO_PRI)
- select_result(sourcefd, 4);
- if (condition & G_IO_IN)
- select_result(sourcefd, 1);
- if (condition & G_IO_OUT)
- select_result(sourcefd, 2);
-
- return TRUE;
-}
-#else
-void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
-{
- if (condition & GDK_INPUT_EXCEPTION)
- select_result(sourcefd, 4);
- if (condition & GDK_INPUT_READ)
- select_result(sourcefd, 1);
- if (condition & GDK_INPUT_WRITE)
- select_result(sourcefd, 2);
-}
-#endif
-
void destroy(GtkWidget *widget, gpointer data)
{
gtk_main_quit();
}
}
-/* Ensure that all the cut buffers exist - according to the ICCCM, we must
- * do this before we start using cut buffers.
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+
+/* ----------------------------------------------------------------------
+ * Clipboard handling, using the high-level GtkClipboard interface in
+ * as hands-off a way as possible. We write and read the clipboard as
+ * UTF-8 text, and let GTK deal with converting to any other text
+ * formats it feels like.
*/
-void init_cutbuffers()
+
+void init_clipboard(struct gui_data *inst)
{
-#ifndef NOT_X_WINDOWS
- unsigned char empty[] = "";
- Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(disp, GDK_ROOT_WINDOW(),
- XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);
-#endif
+ inst->clipboard = gtk_clipboard_get_for_display(gdk_display_get_default(),
+ DEFAULT_CLIPBOARD);
+}
+
+/*
+ * Because calling gtk_clipboard_set_with_data triggers a call to the
+ * clipboard_clear function from the last time, we need to arrange a
+ * way to distinguish a real call to clipboard_clear for the _new_
+ * instance of the clipboard data from the leftover call for the
+ * outgoing one. We do this by setting the user data field in our
+ * gtk_clipboard_set_with_data() call, instead of the obvious pointer
+ * to 'inst', to one of these.
+ */
+struct clipboard_data_instance {
+ struct gui_data *inst;
+ char *pasteout_data_utf8;
+ int pasteout_data_utf8_len;
+};
+
+static void clipboard_provide_data(GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ guint info, gpointer data)
+{
+ struct clipboard_data_instance *cdi =
+ (struct clipboard_data_instance *)data;
+ struct gui_data *inst = cdi->inst;
+
+ if (inst->current_cdi == cdi) {
+ gtk_selection_data_set_text(selection_data, cdi->pasteout_data_utf8,
+ cdi->pasteout_data_utf8_len);
+ }
+}
+
+static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
+{
+ struct clipboard_data_instance *cdi =
+ (struct clipboard_data_instance *)data;
+ struct gui_data *inst = cdi->inst;
+
+ if (inst->current_cdi == cdi) {
+ term_deselect(inst->term);
+ inst->current_cdi = NULL;
+ }
+ sfree(cdi->pasteout_data_utf8);
+ sfree(cdi);
+}
+
+void write_clip(void *frontend, wchar_t *data, int *attr, int len,
+ int must_deselect)
+{
+ struct gui_data *inst = (struct gui_data *)frontend;
+ struct clipboard_data_instance *cdi;
+
+ if (inst->direct_to_font) {
+ /* In this clipboard mode, we just can't paste if we're in
+ * direct-to-font mode. Fortunately, that shouldn't be
+ * important, because we'll only use this clipboard handling
+ * code on systems where that kind of font doesn't exist
+ * anyway. */
+ return;
+ }
+
+ cdi = snew(struct clipboard_data_instance);
+ cdi->inst = inst;
+ inst->current_cdi = cdi;
+ cdi->pasteout_data_utf8 = snewn(len*6, char);
+ {
+ const wchar_t *tmp = data;
+ int tmplen = len;
+ cdi->pasteout_data_utf8_len =
+ charset_from_unicode(&tmp, &tmplen, cdi->pasteout_data_utf8,
+ len*6, CS_UTF8, NULL, NULL, 0);
+ }
+
+ /*
+ * It would be nice to just call gtk_clipboard_set_text() in place
+ * of all of the faffing below. Unfortunately, that won't give me
+ * access to the clipboard-clear event, which we use to visually
+ * deselect text in the terminal.
+ */
+ {
+ GtkTargetList *targetlist;
+ GtkTargetEntry *targettable;
+ gint n_targets;
+
+ targetlist = gtk_target_list_new(NULL, 0);
+ gtk_target_list_add_text_targets(targetlist, 0);
+ targettable = gtk_target_table_new_from_list(targetlist, &n_targets);
+ gtk_clipboard_set_with_data(inst->clipboard, targettable, n_targets,
+ clipboard_provide_data, clipboard_clear,
+ cdi);
+ gtk_target_table_free(targettable, n_targets);
+ gtk_target_list_unref(targetlist);
+ }
}
+static void clipboard_text_received(GtkClipboard *clipboard,
+ const gchar *text, gpointer data)
+{
+ struct gui_data *inst = (struct gui_data *)data;
+ int length;
+
+ if (!text)
+ return;
+
+ length = strlen(text);
+
+ if (inst->pastein_data)
+ sfree(inst->pastein_data);
+
+ inst->pastein_data = snewn(length, wchar_t);
+ inst->pastein_data_len = mb_to_wc(CS_UTF8, 0, text, length,
+ inst->pastein_data, length);
+
+ term_do_paste(inst->term);
+}
+
+void request_paste(void *frontend)
+{
+ struct gui_data *inst = (struct gui_data *)frontend;
+ gtk_clipboard_request_text(inst->clipboard, clipboard_text_received, inst);
+}
+
+#else /* JUST_USE_GTK_CLIPBOARD_UTF8 */
+
+/* ----------------------------------------------------------------------
+ * Clipboard handling for X, using the low-level gtk_selection_*
+ * interface, handling conversions to fiddly things like compound text
+ * ourselves, and storing in X cut buffers too.
+ *
+ * This version of the clipboard code has to be kept around for GTK1,
+ * which doesn't have the higher-level GtkClipboard interface at all.
+ * And since it works on GTK2 and GTK3 too and has had a good few
+ * years of shakedown and bug fixing, we might as well keep using it
+ * where it's applicable.
+ *
+ * It's _possible_ that we might be able to replicate all the
+ * important wrinkles of this code in GtkClipboard. (In particular,
+ * cut buffers or local analogue look as if they might be accessible
+ * via gtk_clipboard_set_can_store(), and delivering text in
+ * non-Unicode formats only in the direct-to-font case ought to be
+ * possible if we can figure out the right set of things to put in the
+ * GtkTargetList.) But that work can wait until there's a need for it!
+ */
+
/* Store the data in a cut-buffer. */
-void store_cutbuffer(char * ptr, int len)
+static void store_cutbuffer(char * ptr, int len)
{
#ifndef NOT_X_WINDOWS
Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
/* Retrieve data from a cut-buffer.
* Returned data needs to be freed with XFree().
*/
-char * retrieve_cutbuffer(int * nbytes)
+static char *retrieve_cutbuffer(int *nbytes)
{
#ifndef NOT_X_WINDOWS
Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
#endif
}
-void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_deselect)
+void write_clip(void *frontend, wchar_t *data, int *attr, int len,
+ int must_deselect)
{
struct gui_data *inst = (struct gui_data *)frontend;
if (inst->pasteout_data)
term_deselect(inst->term);
}
-void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
- guint info, guint time_stamp, gpointer data)
+static void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
+ guint info, guint time_stamp, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
GdkAtom target = gtk_selection_data_get_target(seldata);
inst->pasteout_data_len);
}
-gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
- gpointer data)
+static gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
+ gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
}
}
-gint idle_paste_func(gpointer data); /* forward ref */
-
-void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
- guint time, gpointer data)
+static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
+ guint time, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
char *text;
if (inst->pastein_data)
sfree(inst->pastein_data);
- inst->pastein_data = snewn(length, wchar_t);
- inst->pastein_data_len = length;
- inst->pastein_data_len =
- mb_to_wc(charset, 0, text, length,
- inst->pastein_data, inst->pastein_data_len);
+ inst->pastein_data = snewn(length, wchar_t);
+ inst->pastein_data_len = length;
+ inst->pastein_data_len =
+ mb_to_wc(charset, 0, text, length,
+ inst->pastein_data, inst->pastein_data_len);
+
+ term_do_paste(inst->term);
+
+#ifndef NOT_X_WINDOWS
+ if (free_list_required)
+ XFreeStringList(list);
+ if (free_required)
+ XFree(text);
+#endif
+}
+
+void init_clipboard(struct gui_data *inst)
+{
+#ifndef NOT_X_WINDOWS
+ /*
+ * Ensure that all the cut buffers exist - according to the ICCCM,
+ * we must do this before we start using cut buffers.
+ */
+ unsigned char empty[] = "";
+ Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, empty, 0);
+ x11_ignore_error(disp, BadMatch);
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
+ XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);
+#endif
+
+ g_signal_connect(G_OBJECT(inst->area), "selection_received",
+ G_CALLBACK(selection_received), inst);
+ g_signal_connect(G_OBJECT(inst->area), "selection_get",
+ G_CALLBACK(selection_get), inst);
+ g_signal_connect(G_OBJECT(inst->area), "selection_clear_event",
+ G_CALLBACK(selection_clear), inst);
+}
- term_do_paste(inst->term);
+/*
+ * End of selection/clipboard handling.
+ * ----------------------------------------------------------------------
+ */
-#ifndef NOT_X_WINDOWS
- if (free_list_required)
- XFreeStringList(list);
- if (free_required)
- XFree(text);
-#endif
-}
+#endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */
void get_clip(void *frontend, wchar_t ** p, int *len)
{
gtk_adjustment_set_step_increment(inst->sbar_adjust, 1);
gtk_adjustment_set_page_increment(inst->sbar_adjust, page/2);
inst->ignore_sbar = TRUE;
+#if !GTK_CHECK_VERSION(3,18,0)
gtk_adjustment_changed(inst->sbar_adjust);
+#endif
inst->ignore_sbar = FALSE;
}
term_scroll(inst->term, 1, (int)gtk_adjustment_get_value(adj));
}
+static void show_scrollbar(struct gui_data *inst, gboolean visible)
+{
+ inst->sbar_visible = visible;
+ if (visible)
+ gtk_widget_show(inst->sbar);
+ else
+ gtk_widget_hide(inst->sbar);
+}
+
void sys_cursor(void *frontend, int x, int y)
{
/*
int char_width(Context ctx, int uc)
{
/*
- * Under X, any fixed-width font really _is_ fixed-width.
- * Double-width characters will be dealt with using a separate
- * font. For the moment we can simply return 1.
- *
- * FIXME: but is that also true of Pango?
+ * In this front end, double-width characters are handled using a
+ * separate font, so this can safely just return 1 always.
*/
return 1;
}
{
struct gui_data *inst = (struct gui_data *)frontend;
struct draw_ctx *dctx;
- GdkWindow *target;
if (!gtk_widget_get_window(inst->area))
return NULL;
-#ifndef NO_BACKING_PIXMAPS
- target = inst->pixmap;
-#else
- target = gtk_widget_get_window(inst->area);
-#endif
-
dctx = snew(struct draw_ctx);
dctx->inst = inst;
dctx->uctx.type = inst->drawtype;
#ifdef DRAW_TEXT_GDK
if (dctx->uctx.type == DRAWTYPE_GDK) {
- dctx->uctx.u.gdk.target = target;
+ /* If we're doing GDK-based drawing, then we also expect
+ * inst->pixmap to exist. */
+ dctx->uctx.u.gdk.target = inst->pixmap;
dctx->uctx.u.gdk.gc = gdk_gc_new(gtk_widget_get_window(inst->area));
}
#endif
#ifdef DRAW_TEXT_CAIRO
if (dctx->uctx.type == DRAWTYPE_CAIRO) {
dctx->uctx.u.cairo.widget = GTK_WIDGET(inst->area);
- dctx->uctx.u.cairo.cr = gdk_cairo_create(target);
+ /* If we're doing Cairo drawing, we expect inst->surface to
+ * exist, and we draw to that first, regardless of whether we
+ * subsequently copy the results to inst->pixmap. */
+ dctx->uctx.u.cairo.cr = cairo_create(inst->surface);
cairo_setup_dctx(dctx);
}
#endif
static void draw_update(struct draw_ctx *dctx, int x, int y, int w, int h)
{
-#ifndef NO_BACKING_PIXMAPS
-#ifdef DRAW_TEXT_GDK
- if (dctx->uctx.type == DRAWTYPE_GDK) {
- gdk_draw_pixmap(gtk_widget_get_window(dctx->inst->area),
- dctx->uctx.u.gdk.gc, dctx->inst->pixmap,
- x, y, x, y, w, h);
- }
-#endif
-#ifdef DRAW_TEXT_CAIRO /* FIXME: and not GTK3 where a cairo_t is all we have */
+#if defined DRAW_TEXT_CAIRO && !defined NO_BACKING_PIXMAPS
if (dctx->uctx.type == DRAWTYPE_CAIRO) {
- GdkGC *gc = gdk_gc_new(gtk_widget_get_window(dctx->inst->area));
- gdk_draw_pixmap(gtk_widget_get_window(dctx->inst->area),
- gc, dctx->inst->pixmap, x, y, x, y, w, h);
- gdk_gc_unref(gc);
+ /*
+ * If inst->surface and inst->pixmap both exist, then we've
+ * just drawn new content to the former which we must copy to
+ * the latter.
+ */
+ cairo_t *cr = gdk_cairo_create(dctx->inst->pixmap);
+ cairo_set_source_surface(cr, dctx->inst->surface, 0, 0);
+ cairo_rectangle(cr, x, y, w, h);
+ cairo_fill(cr);
+ cairo_destroy(cr);
}
#endif
-#endif
+
+ /*
+ * Now we just queue a window redraw, which will cause
+ * inst->surface or inst->pixmap (whichever is appropriate for our
+ * compile mode) to be copied to the real window when we receive
+ * the resulting "expose" or "draw" event.
+ *
+ * Amazingly, this one API call is actually valid in all versions
+ * of GTK :-)
+ */
+ gtk_widget_queue_draw_area(dctx->inst->area, x, y, w, h);
}
static void draw_set_colour(struct draw_ctx *dctx, int col)
static void draw_backing_rect(struct gui_data *inst)
{
struct draw_ctx *dctx = get_ctx(inst);
+ int w = inst->width * inst->font_width + 2*inst->window_border;
+ int h = inst->height * inst->font_height + 2*inst->window_border;
draw_set_colour(dctx, 258);
- draw_rectangle(dctx, 1, 0, 0,
- inst->width * inst->font_width + 2*inst->window_border,
- inst->height * inst->font_height + 2*inst->window_border);
+ draw_rectangle(dctx, 1, 0, 0, w, h);
+ draw_update(dctx, 0, 0, w, h);
free_ctx(dctx);
}
{
struct draw_ctx *dctx = (struct draw_ctx *)ctx;
struct gui_data *inst = dctx->inst;
- int ncombining, combining;
+ int ncombining;
int nfg, nbg, t, fontid, shadow, rlen, widefactor, bold;
int monochrome =
gdk_visual_get_depth(gtk_widget_get_visual(inst->area)) == 1;
rlen*widefactor*inst->font_width, inst->font_height);
draw_set_colour(dctx, nfg);
- for (combining = 0; combining < ncombining; combining++) {
+ if (ncombining > 1) {
+ assert(len == 1);
+ unifont_draw_combining(&dctx->uctx, inst->fonts[fontid],
+ x*inst->font_width+inst->window_border,
+ (y*inst->font_height+inst->window_border+
+ inst->fonts[0]->ascent),
+ text, ncombining, widefactor > 1,
+ bold, inst->font_width);
+ } else {
unifont_draw_text(&dctx->uctx, inst->fonts[fontid],
x*inst->font_width+inst->window_border,
- y*inst->font_height+inst->window_border+inst->fonts[0]->ascent,
- text + combining, len, widefactor > 1,
+ (y*inst->font_height+inst->window_border+
+ inst->fonts[0]->ascent),
+ text, len, widefactor > 1,
bold, inst->font_width);
}
}
#endif
-static void help(FILE *fp) {
- if(fprintf(fp,
-"pterm option summary:\n"
-"\n"
-" --display DISPLAY Specify X display to use (note '--')\n"
-" -name PREFIX Prefix when looking up resources (default: pterm)\n"
-" -fn FONT Normal text font\n"
-" -fb FONT Bold text font\n"
-" -geometry GEOMETRY Position and size of window (size in characters)\n"
-" -sl LINES Number of lines of scrollback\n"
-" -fg COLOUR, -bg COLOUR Foreground/background colour\n"
-" -bfg COLOUR, -bbg COLOUR Foreground/background bold colour\n"
-" -cfg COLOUR, -bfg COLOUR Foreground/background cursor colour\n"
-" -T TITLE Window title\n"
-" -ut, +ut Do(default) or do not update utmp\n"
-" -ls, +ls Do(default) or do not make shell a login shell\n"
-" -sb, +sb Do(default) or do not display a scrollbar\n"
-" -log PATH Log all output to a file\n"
-" -nethack Map numeric keypad to hjklyubn direction keys\n"
-" -xrm RESOURCE-STRING Set an X resource\n"
-" -e COMMAND [ARGS...] Execute command (consumes all remaining args)\n"
- ) < 0 || fflush(fp) < 0) {
- perror("output error");
- exit(1);
- }
-}
-
-static void version(FILE *fp) {
- if(fprintf(fp, "%s: %s\n", appname, ver) < 0 || fflush(fp) < 0) {
- perror("output error");
- exit(1);
- }
-}
-
-int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
- struct gui_data *inst, Conf *conf)
-{
- int err = 0;
- char *val;
-
- /*
- * Macros to make argument handling easier. Note that because
- * they need to call `continue', they cannot be contained in
- * the usual do {...} while (0) wrapper to make them
- * syntactically single statements; hence it is not legal to
- * use one of these macros as an unbraced statement between
- * `if' and `else'.
- */
-#define EXPECTS_ARG { \
- if (--argc <= 0) { \
- err = 1; \
- fprintf(stderr, "%s: %s expects an argument\n", appname, p); \
- continue; \
- } else \
- val = *++argv; \
-}
-#define SECOND_PASS_ONLY { if (!do_everything) continue; }
-
- while (--argc > 0) {
- const char *p = *++argv;
- int ret;
-
- /*
- * Shameless cheating. Debian requires all X terminal
- * emulators to support `-T title'; but
- * cmdline_process_param will eat -T (it means no-pty) and
- * complain that pterm doesn't support it. So, in pterm
- * only, we convert -T into -title.
- */
- if ((cmdline_tooltype & TOOLTYPE_NONNETWORK) &&
- !strcmp(p, "-T"))
- p = "-title";
-
- ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
- do_everything ? 1 : -1, conf);
-
- if (ret == -2) {
- cmdline_error("option \"%s\" requires an argument", p);
- } else if (ret == 2) {
- --argc, ++argv; /* skip next argument */
- continue;
- } else if (ret == 1) {
- continue;
- }
-
- if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
- FontSpec *fs;
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- fs = fontspec_new(val);
- conf_set_fontspec(conf, CONF_font, fs);
- fontspec_free(fs);
-
- } else if (!strcmp(p, "-fb")) {
- FontSpec *fs;
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- fs = fontspec_new(val);
- conf_set_fontspec(conf, CONF_boldfont, fs);
- fontspec_free(fs);
-
- } else if (!strcmp(p, "-fw")) {
- FontSpec *fs;
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- fs = fontspec_new(val);
- conf_set_fontspec(conf, CONF_widefont, fs);
- fontspec_free(fs);
-
- } else if (!strcmp(p, "-fwb")) {
- FontSpec *fs;
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- fs = fontspec_new(val);
- conf_set_fontspec(conf, CONF_wideboldfont, fs);
- fontspec_free(fs);
-
- } else if (!strcmp(p, "-cs")) {
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- conf_set_str(conf, CONF_line_codepage, val);
-
- } else if (!strcmp(p, "-geometry")) {
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
-
-#if GTK_CHECK_VERSION(2,0,0)
- inst->geometry = val;
-#else
- /* On GTK 1, we have to do this using raw Xlib */
- {
- int flags, x, y;
- unsigned int w, h;
- flags = XParseGeometry(val, &x, &y, &w, &h);
- if (flags & WidthValue)
- conf_set_int(conf, CONF_width, w);
- if (flags & HeightValue)
- conf_set_int(conf, CONF_height, h);
-
- if (flags & (XValue | YValue)) {
- inst->xpos = x;
- inst->ypos = y;
- inst->gotpos = TRUE;
- inst->gravity = ((flags & XNegative ? 1 : 0) |
- (flags & YNegative ? 2 : 0));
- }
- }
-#endif
-
- } else if (!strcmp(p, "-sl")) {
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_savelines, atoi(val));
-
- } else if (!strcmp(p, "-fg") || !strcmp(p, "-bg") ||
- !strcmp(p, "-bfg") || !strcmp(p, "-bbg") ||
- !strcmp(p, "-cfg") || !strcmp(p, "-cbg")) {
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
-
- {
-#if GTK_CHECK_VERSION(3,0,0)
- GdkRGBA rgba;
- int success = gdk_rgba_parse(&rgba, val);
-#else
- GdkColor col;
- int success = gdk_color_parse(val, &col);
-#endif
-
- if (!success) {
- err = 1;
- fprintf(stderr, "%s: unable to parse colour \"%s\"\n",
- appname, val);
- } else {
-#if GTK_CHECK_VERSION(3,0,0)
- int r = rgba.red * 255;
- int g = rgba.green * 255;
- int b = rgba.blue * 255;
-#else
- int r = col.red / 256;
- int g = col.green / 256;
- int b = col.blue / 256;
-#endif
-
- int index;
- index = (!strcmp(p, "-fg") ? 0 :
- !strcmp(p, "-bg") ? 2 :
- !strcmp(p, "-bfg") ? 1 :
- !strcmp(p, "-bbg") ? 3 :
- !strcmp(p, "-cfg") ? 4 :
- !strcmp(p, "-cbg") ? 5 : -1);
- assert(index != -1);
-
- conf_set_int_int(conf, CONF_colours, index*3+0, r);
- conf_set_int_int(conf, CONF_colours, index*3+1, g);
- conf_set_int_int(conf, CONF_colours, index*3+2, b);
- }
- }
-
- } else if (use_pty_argv && !strcmp(p, "-e")) {
- /* This option swallows all further arguments. */
- if (!do_everything)
- break;
-
- if (--argc > 0) {
- int i;
- pty_argv = snewn(argc+1, char *);
- ++argv;
- for (i = 0; i < argc; i++)
- pty_argv[i] = argv[i];
- pty_argv[argc] = NULL;
- break; /* finished command-line processing */
- } else
- err = 1, fprintf(stderr, "%s: -e expects an argument\n",
- appname);
-
- } else if (!strcmp(p, "-title")) {
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- conf_set_str(conf, CONF_wintitle, val);
-
- } else if (!strcmp(p, "-log")) {
- Filename *fn;
- EXPECTS_ARG;
- SECOND_PASS_ONLY;
- fn = filename_from_str(val);
- conf_set_filename(conf, CONF_logfilename, fn);
- conf_set_int(conf, CONF_logtype, LGTYP_DEBUG);
- filename_free(fn);
-
- } else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_stamp_utmp, 0);
-
- } else if (!strcmp(p, "-ut")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_stamp_utmp, 1);
-
- } else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_login_shell, 0);
-
- } else if (!strcmp(p, "-ls")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_login_shell, 1);
-
- } else if (!strcmp(p, "-nethack")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_nethack_keypad, 1);
-
- } else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_scrollbar, 0);
-
- } else if (!strcmp(p, "-sb")) {
- SECOND_PASS_ONLY;
- conf_set_int(conf, CONF_scrollbar, 1);
-
- } else if (!strcmp(p, "-name")) {
- EXPECTS_ARG;
- app_name = val;
-
- } else if (!strcmp(p, "-xrm")) {
- EXPECTS_ARG;
- provide_xrm_string(val);
-
- } else if(!strcmp(p, "-help") || !strcmp(p, "--help")) {
- help(stdout);
- exit(0);
-
- } else if(!strcmp(p, "-version") || !strcmp(p, "--version")) {
- version(stdout);
- exit(0);
-
- } else if (!strcmp(p, "-pgpfp")) {
- pgp_fingerprints();
- exit(1);
-
- } else if(p[0] != '-' && (!do_everything ||
- process_nonoption_arg(p, conf,
- allow_launch))) {
- /* do nothing */
-
- } else {
- err = 1;
- fprintf(stderr, "%s: unrecognized option '%s'\n", appname, p);
- }
- }
-
- return err;
-}
-
-struct uxsel_id {
-#if GTK_CHECK_VERSION(2,0,0)
- GIOChannel *chan;
- guint watch_id;
-#else
- int id;
-#endif
-};
-
-uxsel_id *uxsel_input_add(int fd, int rwx) {
- uxsel_id *id = snew(uxsel_id);
-
-#if GTK_CHECK_VERSION(2,0,0)
- int flags = 0;
- if (rwx & 1) flags |= G_IO_IN;
- if (rwx & 2) flags |= G_IO_OUT;
- if (rwx & 4) flags |= G_IO_PRI;
- id->chan = g_io_channel_unix_new(fd);
- g_io_channel_set_encoding(id->chan, NULL, NULL);
- id->watch_id = g_io_add_watch(id->chan, flags, fd_input_func, NULL);
-#else
- int flags = 0;
- if (rwx & 1) flags |= GDK_INPUT_READ;
- if (rwx & 2) flags |= GDK_INPUT_WRITE;
- if (rwx & 4) flags |= GDK_INPUT_EXCEPTION;
- assert(flags);
- id->id = gdk_input_add(fd, flags, fd_input_func, NULL);
-#endif
-
- return id;
-}
-
-void uxsel_input_remove(uxsel_id *id) {
-#if GTK_CHECK_VERSION(2,0,0)
- g_source_remove(id->watch_id);
- g_io_channel_unref(id->chan);
-#else
- gdk_input_remove(id->id);
-#endif
- sfree(id);
-}
-
int frontend_is_utf8(void *frontend)
{
struct gui_data *inst = (struct gui_data *)frontend;
void set_geom_hints(struct gui_data *inst)
{
GdkGeometry geom;
+ gint flags;
+
+ /*
+ * Unused fields in geom.
+ */
+ geom.max_width = geom.max_height = -1;
+ geom.min_aspect = geom.max_aspect = 0;
+
+ /*
+ * Set up the geometry fields we care about, with reference to
+ * just the drawing area. We'll correct for the scrollbar in a
+ * moment.
+ */
+ flags = GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | GDK_HINT_RESIZE_INC;
geom.min_width = inst->font_width + 2*inst->window_border;
geom.min_height = inst->font_height + 2*inst->window_border;
- geom.max_width = geom.max_height = -1;
geom.base_width = 2*inst->window_border;
geom.base_height = 2*inst->window_border;
geom.width_inc = inst->font_width;
geom.height_inc = inst->font_height;
- geom.min_aspect = geom.max_aspect = 0;
- gtk_window_set_geometry_hints(GTK_WINDOW(inst->window), inst->area, &geom,
- GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE |
- GDK_HINT_RESIZE_INC);
+
+ /*
+ * If we've got a scrollbar visible, then we must include its
+ * width as part of the base and min width, and also ensure that
+ * our window's minimum height is at least the height required by
+ * the scrollbar.
+ *
+ * In the latter case, we must also take care to arrange that
+ * (geom.min_height - geom.base_height) is an integer multiple of
+ * geom.height_inc, because if it's not, then some window managers
+ * (we know of xfwm4) get confused, with the effect that they
+ * resize our window to a height based on min_height instead of
+ * base_height, which we then round down and the window ends up
+ * too short.
+ */
+ if (inst->sbar_visible) {
+ GtkRequisition req;
+ int min_sb_height;
+
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_get_preferred_size(inst->sbar, &req, NULL);
+#else
+ gtk_widget_size_request(inst->sbar, &req);
+#endif
+
+ /* Compute rounded-up scrollbar height. */
+ min_sb_height = req.height;
+ min_sb_height += geom.height_inc - 1;
+ min_sb_height -= ((min_sb_height - geom.base_height % geom.height_inc)
+ % geom.height_inc);
+
+ geom.min_width += req.width;
+ geom.base_width += req.width;
+ if (geom.min_height < min_sb_height)
+ geom.min_height = min_sb_height;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(inst->window),
+ NULL, &geom, flags);
}
void clear_scrollback_menuitem(GtkMenuItem *item, gpointer data)
}
}
+ need_size = FALSE;
+
/*
* If the scrollbar needs to be shown, hidden, or moved
* from one end to the other of the window, do so now.
*/
if (conf_get_int(oldconf, CONF_scrollbar) !=
conf_get_int(newconf, CONF_scrollbar)) {
- if (conf_get_int(newconf, CONF_scrollbar))
- gtk_widget_show(inst->sbar);
- else
- gtk_widget_hide(inst->sbar);
+ show_scrollbar(inst, conf_get_int(newconf, CONF_scrollbar));
+ need_size = TRUE;
}
if (conf_get_int(oldconf, CONF_scrollbar_on_left) !=
conf_get_int(newconf, CONF_scrollbar_on_left)) {
* Redo the whole tangled fonts and Unicode mess if
* necessary.
*/
- need_size = FALSE;
if (strcmp(conf_get_fontspec(oldconf, CONF_font)->name,
conf_get_fontspec(newconf, CONF_font)->name) ||
strcmp(conf_get_fontspec(oldconf, CONF_boldfont)->name,
errmsg);
messagebox(inst->window, "Font setup error", msgboxtext,
string_width("Could not change fonts in terminal window:"),
- "OK", 'o', +1, 1,
+ FALSE, "OK", 'o', +1, 1,
NULL);
sfree(msgboxtext);
sfree(errmsg);
inst->reconfiguring = FALSE;
}
-void fork_and_exec_self(struct gui_data *inst, int fd_to_close, ...)
-{
- /*
- * Re-execing ourself is not an exact science under Unix. I do
- * the best I can by using /proc/self/exe if available and by
- * assuming argv[0] can be found on $PATH if not.
- *
- * Note that we also have to reconstruct the elements of the
- * original argv which gtk swallowed, since the user wants the
- * new session to appear on the same X display as the old one.
- */
- char **args;
- va_list ap;
- int i, n;
- int pid;
-
- /*
- * Collect the arguments with which to re-exec ourself.
- */
- va_start(ap, fd_to_close);
- n = 2; /* progname and terminating NULL */
- n += inst->ngtkargs;
- while (va_arg(ap, char *) != NULL)
- n++;
- va_end(ap);
-
- args = snewn(n, char *);
- args[0] = inst->progname;
- args[n-1] = NULL;
- for (i = 0; i < inst->ngtkargs; i++)
- args[i+1] = inst->gtkargvstart[i];
-
- i++;
- va_start(ap, fd_to_close);
- while ((args[i++] = va_arg(ap, char *)) != NULL);
- va_end(ap);
-
- assert(i == n);
-
- /*
- * Do the double fork.
- */
- pid = fork();
- if (pid < 0) {
- perror("fork");
- sfree(args);
- return;
- }
-
- if (pid == 0) {
- int pid2 = fork();
- if (pid2 < 0) {
- perror("fork");
- _exit(1);
- } else if (pid2 > 0) {
- /*
- * First child has successfully forked second child. My
- * Work Here Is Done. Note the use of _exit rather than
- * exit: the latter appears to cause destroy messages
- * to be sent to the X server. I suspect gtk uses
- * atexit.
- */
- _exit(0);
- }
-
- /*
- * If we reach here, we are the second child, so we now
- * actually perform the exec.
- */
- if (fd_to_close >= 0)
- close(fd_to_close);
-
- execv("/proc/self/exe", args);
- execvp(inst->progname, args);
- perror("exec");
- _exit(127);
-
- } else {
- int status;
- sfree(args);
- waitpid(pid, &status, 0);
- }
-
-}
-
void dup_session_menuitem(GtkMenuItem *item, gpointer gdata)
{
struct gui_data *inst = (struct gui_data *)gdata;
- /*
- * For this feature we must marshal conf and (possibly) pty_argv
- * into a byte stream, create a pipe, and send this byte stream
- * to the child through the pipe.
- */
- int i, ret, sersize, size;
- char *data;
- char option[80];
- int pipefd[2];
-
- if (pipe(pipefd) < 0) {
- perror("pipe");
- return;
- }
-
- size = sersize = conf_serialised_size(inst->conf);
- if (use_pty_argv && pty_argv) {
- for (i = 0; pty_argv[i]; i++)
- size += strlen(pty_argv[i]) + 1;
- }
-
- data = snewn(size, char);
- conf_serialise(inst->conf, data);
- if (use_pty_argv && pty_argv) {
- int p = sersize;
- for (i = 0; pty_argv[i]; i++) {
- strcpy(data + p, pty_argv[i]);
- p += strlen(pty_argv[i]) + 1;
- }
- assert(p == size);
- }
-
- sprintf(option, "---[%d,%d]", pipefd[0], size);
- noncloexec(pipefd[0]);
- fork_and_exec_self(inst, pipefd[1], option, NULL);
- close(pipefd[0]);
-
- i = ret = 0;
- while (i < size && (ret = write(pipefd[1], data + i, size - i)) > 0)
- i += ret;
- if (ret < 0)
- perror("write to pipe");
- close(pipefd[1]);
- sfree(data);
-}
-
-int read_dupsession_data(struct gui_data *inst, Conf *conf, char *arg)
-{
- int fd, i, ret, size, size_used;
- char *data;
-
- if (sscanf(arg, "---[%d,%d]", &fd, &size) != 2) {
- fprintf(stderr, "%s: malformed magic argument `%s'\n", appname, arg);
- exit(1);
- }
-
- data = snewn(size, char);
- i = ret = 0;
- while (i < size && (ret = read(fd, data + i, size - i)) > 0)
- i += ret;
- if (ret < 0) {
- perror("read from pipe");
- exit(1);
- } else if (i < size) {
- fprintf(stderr, "%s: unexpected EOF in Duplicate Session data\n",
- appname);
- exit(1);
- }
-
- size_used = conf_deserialise(conf, data, size);
- if (use_pty_argv && size > size_used) {
- int n = 0;
- i = size_used;
- while (i < size) {
- while (i < size && data[i]) i++;
- if (i >= size) {
- fprintf(stderr, "%s: malformed Duplicate Session data\n",
- appname);
- exit(1);
- }
- i++;
- n++;
- }
- pty_argv = snewn(n+1, char *);
- pty_argv[n] = NULL;
- n = 0;
- i = size_used;
- while (i < size) {
- char *p = data + i;
- while (i < size && data[i]) i++;
- assert(i < size);
- i++;
- pty_argv[n++] = dupstr(p);
- }
- }
-
- sfree(data);
- return 0;
+ launch_duplicate_session(inst->conf);
}
void new_session_menuitem(GtkMenuItem *item, gpointer data)
{
- struct gui_data *inst = (struct gui_data *)data;
-
- fork_and_exec_self(inst, -1, NULL);
+ launch_new_session();
}
void restart_session_menuitem(GtkMenuItem *item, gpointer data)
void saved_session_menuitem(GtkMenuItem *item, gpointer data)
{
- struct gui_data *inst = (struct gui_data *)data;
char *str = (char *)g_object_get_data(G_OBJECT(item), "user-data");
- fork_and_exec_self(inst, -1, "-load", str, NULL);
+ launch_saved_session(str);
}
void saved_session_freedata(GtkMenuItem *item, gpointer data)
gtk_widget_set_sensitive(inst->restartitem, FALSE);
}
-int pt_main(int argc, char **argv)
+struct gui_data *new_session_window(Conf *conf, const char *geometry_string)
{
- extern int cfgbox(Conf *conf);
struct gui_data *inst;
- setlocale(LC_CTYPE, "");
-
/*
* Create an instance structure and initialise to zeroes
*/
memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */
inst->busy_status = BUSY_NOT;
- inst->conf = conf_new();
+ inst->conf = conf;
inst->wintitle = inst->icontitle = NULL;
- inst->quit_fn_scheduled = FALSE;
- inst->idle_fn_scheduled = FALSE;
inst->drawtype = DRAWTYPE_DEFAULT;
+#if GTK_CHECK_VERSION(3,4,0)
+ inst->cumulative_scroll = 0.0;
+#endif
- /* defer any child exit handling until we're ready to deal with
- * it */
- block_signal(SIGCHLD, 1);
-
- inst->progname = argv[0];
- /*
- * Copy the original argv before letting gtk_init fiddle with
- * it. It will be required later.
- */
- {
- int i, oldargc;
- inst->gtkargvstart = snewn(argc-1, char *);
- for (i = 1; i < argc; i++)
- inst->gtkargvstart[i-1] = dupstr(argv[i]);
- oldargc = argc;
- gtk_init(&argc, &argv);
- inst->ngtkargs = oldargc - argc;
- }
-
- if (argc > 1 && !strncmp(argv[1], "---", 3)) {
- read_dupsession_data(inst, inst->conf, argv[1]);
- /* Splatter this argument so it doesn't clutter a ps listing */
- smemclr(argv[1], strlen(argv[1]));
- } else {
- /* By default, we bring up the config dialog, rather than launching
- * a session. This gets set to TRUE if something happens to change
- * that (e.g., a hostname is specified on the command-line). */
- int allow_launch = FALSE;
- if (do_cmdline(argc, argv, 0, &allow_launch, inst, inst->conf))
- exit(1); /* pre-defaults pass to get -class */
- do_defaults(NULL, inst->conf);
- if (do_cmdline(argc, argv, 1, &allow_launch, inst, inst->conf))
- exit(1); /* post-defaults, do everything */
-
- cmdline_run_saved(inst->conf);
-
- if (loaded_session)
- allow_launch = TRUE;
-
- if ((!allow_launch || !conf_launchable(inst->conf)) &&
- !cfgbox(inst->conf))
- exit(0); /* config box hit Cancel */
+ if (geometry_string) {
+#if GTK_CHECK_VERSION(2,0,0)
+ inst->geometry = geometry_string;
+#else
+ /* On GTK 1, we have to do this using raw Xlib */
+ int flags, x, y;
+ unsigned int w, h;
+ flags = XParseGeometry(geometry_string, &x, &y, &w, &h);
+ if (flags & WidthValue)
+ conf_set_int(conf, CONF_width, w);
+ if (flags & HeightValue)
+ conf_set_int(conf, CONF_height, h);
+
+ if (flags & (XValue | YValue)) {
+ inst->xpos = x;
+ inst->ypos = y;
+ inst->gotpos = TRUE;
+ inst->gravity = ((flags & XNegative ? 1 : 0) |
+ (flags & YNegative ? 2 : 0));
+ }
+#endif
}
if (!compound_text_atom)
exit(1);
}
}
- init_cutbuffers();
-
- inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ inst->window = make_gtk_toplevel_window(inst);
{
const char *winclass = conf_get_str(inst->conf, CONF_winclass);
if (*winclass)
inst->height = conf_get_int(inst->conf, CONF_height);
cache_conf_values(inst);
- {
- int w = inst->font_width * inst->width + 2*inst->window_border;
- int h = inst->font_height * inst->height + 2*inst->window_border;
-#if GTK_CHECK_VERSION(2,0,0)
- gtk_widget_set_size_request(inst->area, w, h);
-#else
- gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), w, h);
-#endif
- }
+ init_clipboard(inst);
+
inst->sbar_adjust = GTK_ADJUSTMENT(gtk_adjustment_new(0,0,0,0,0,0));
inst->sbar = gtk_vscrollbar_new(inst->sbar_adjust);
inst->hbox = GTK_BOX(gtk_hbox_new(FALSE, 0));
gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox));
- set_geom_hints(inst);
-
gtk_widget_show(inst->area);
- if (conf_get_int(inst->conf, CONF_scrollbar))
- gtk_widget_show(inst->sbar);
- else
- gtk_widget_hide(inst->sbar);
+ show_scrollbar(inst, conf_get_int(inst->conf, CONF_scrollbar));
gtk_widget_show(GTK_WIDGET(inst->hbox));
+ set_geom_hints(inst);
+
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_window_set_default_geometry(GTK_WINDOW(inst->window),
+ inst->width, inst->height);
+#else
+ {
+ int w = inst->font_width * inst->width + 2*inst->window_border;
+ int h = inst->font_height * inst->height + 2*inst->window_border;
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_widget_set_size_request(inst->area, w, h);
+#else
+ gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), w, h);
+#endif
+ }
+#endif
+
#if GTK_CHECK_VERSION(2,0,0)
if (inst->geometry) {
gtk_window_parse_geometry(GTK_WINDOW(inst->window), inst->geometry);
#endif
g_signal_connect(G_OBJECT(inst->area), "motion_notify_event",
G_CALLBACK(motion_event), inst);
- g_signal_connect(G_OBJECT(inst->area), "selection_received",
- G_CALLBACK(selection_received), inst);
- g_signal_connect(G_OBJECT(inst->area), "selection_get",
- G_CALLBACK(selection_get), inst);
- g_signal_connect(G_OBJECT(inst->area), "selection_clear_event",
- G_CALLBACK(selection_clear), inst);
#if GTK_CHECK_VERSION(2,0,0)
g_signal_connect(G_OBJECT(inst->imc), "commit",
G_CALLBACK(input_method_commit_event), inst);
gtk_widget_add_events(GTK_WIDGET(inst->area),
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
+ GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK
+#if GTK_CHECK_VERSION(3,4,0)
+ | GDK_SMOOTH_SCROLL_MASK
+#endif
+ );
{
extern const char *const *const main_icon[];
inst->eventlogstuff = eventlogstuff_new();
- request_callback_notifications(notify_toplevel_callback, inst);
-
inst->term = term_init(inst->conf, &inst->ucsdata, inst);
inst->logctx = log_init(inst, inst->conf);
term_provide_logctx(inst->term, inst->logctx);
- uxsel_init();
-
term_size(inst->term, inst->height, inst->width,
conf_get_int(inst->conf, CONF_savelines));
ldisc_echoedit_update(inst->ldisc); /* cause ldisc to notice changes */
- /* now we're reday to deal with the child exit handler being
- * called */
- block_signal(SIGCHLD, 0);
-
- /*
- * Block SIGPIPE: if we attempt Duplicate Session or similar
- * and it falls over in some way, we certainly don't want
- * SIGPIPE terminating the main pterm/PuTTY. Note that we do
- * this _after_ (at least pterm) forks off its child process,
- * since the child wants SIGPIPE handled in the usual way.
- */
- block_signal(SIGPIPE, 1);
-
inst->exited = FALSE;
- gtk_main();
-
- return 0;
+ return inst;
}
projects / PuTTY.git / blobdiff