X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkwin.c;h=872e6bb94f5f074e3f744028efe8f275bc8f2daf;hb=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d;hp=b975ec1e0e954acb47f462e9065acb7c56d5ea36;hpb=2ac190c06d516387b4f580c660db9a6808769ce8;p=PuTTY.git diff --git a/unix/gtkwin.c b/unix/gtkwin.c index b975ec1e..872e6bb9 100644 --- a/unix/gtkwin.c +++ b/unix/gtkwin.c @@ -22,12 +22,6 @@ #if !GTK_CHECK_VERSION(3,0,0) #include #endif -#ifndef NOT_X_WINDOWS -#include -#include -#include -#include -#endif #if GTK_CHECK_VERSION(2,0,0) #include @@ -41,6 +35,14 @@ #include "terminal.h" #include "gtkcompat.h" #include "gtkfont.h" +#include "gtkmisc.h" + +#ifndef NOT_X_WINDOWS +#include +#include +#include +#include +#endif #define CAT2(x,y) x ## y #define CAT(x,y) CAT2(x,y) @@ -72,6 +74,8 @@ extern int use_pty_argv; */ static guint timer_id = 0; +struct clipboard_data_instance; + struct gui_data { GtkWidget *window, *area, *sbar; GtkBox *hbox; @@ -79,20 +83,58 @@ struct gui_data { 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 unifont *fonts[4]; /* normal, bold, wide, widebold */ +#if GTK_CHECK_VERSION(2,0,0) + const char *geometry; +#else int xpos, ypos, gotpos, gravity; +#endif GdkCursor *rawcursor, *textcursor, *blankcursor, *waitcursor, *currcursor; GdkColor cols[NALLCOLOURS]; +#if !GTK_CHECK_VERSION(3,0,0) GdkColormap *colmap; - wchar_t *pastein_data; +#endif 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; @@ -118,10 +160,15 @@ struct gui_data { 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; int cursor_type; + int drawtype; + int meta_mod_mask; }; static void cache_conf_values(struct gui_data *inst) @@ -129,11 +176,20 @@ static void cache_conf_values(struct gui_data *inst) inst->bold_style = conf_get_int(inst->conf, CONF_bold_style); inst->window_border = conf_get_int(inst->conf, CONF_window_border); inst->cursor_type = conf_get_int(inst->conf, CONF_cursor_type); +#ifdef OSX_META_KEY_CONFIG + inst->meta_mod_mask = 0; + if (conf_get_int(inst->conf, CONF_osx_option_meta)) + inst->meta_mod_mask |= GDK_MOD1_MASK; + if (conf_get_int(inst->conf, CONF_osx_command_meta)) + inst->meta_mod_mask |= GDK_MOD2_MASK; +#else + inst->meta_mod_mask = GDK_MOD1_MASK; +#endif } struct draw_ctx { - GdkGC *gc; struct gui_data *inst; + unifont_drawctx uctx; }; static int send_raw_mouse; @@ -146,7 +202,8 @@ static void exit_callback(void *vinst); char *x_get_default(const char *key) { #ifndef NOT_X_WINDOWS - return XGetDefault(GDK_DISPLAY(), app_name, key); + return XGetDefault(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + app_name, key); #else return NULL; #endif @@ -173,7 +230,7 @@ void connection_fatal(void *frontend, const char *p, ...) FontSpec *platform_default_fontspec(const char *name) { if (!strcmp(name, "Font")) - return fontspec_new("server:fixed"); + return fontspec_new(DEFAULT_GTK_FONT); else return fontspec_new(""); } @@ -465,15 +522,7 @@ static void show_mouseptr(struct gui_data *inst, int show) update_mouseptr(inst); } -void draw_backing_rect(struct gui_data *inst) -{ - GdkGC *gc = gdk_gc_new(gtk_widget_get_window(inst->area)); - gdk_gc_set_foreground(gc, &inst->cols[258]); /* default background */ - gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0, - inst->width * inst->font_width + 2*inst->window_border, - inst->height * inst->font_height + 2*inst->window_border); - gdk_gc_unref(gc); -} +static void draw_backing_rect(struct gui_data *inst); gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) { @@ -494,14 +543,30 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) need_size = 1; } - if (inst->pixmap) { - gdk_pixmap_unref(inst->pixmap); - inst->pixmap = NULL; - } + { + int backing_w = w * inst->font_width + 2*inst->window_border; + int backing_h = h * inst->font_height + 2*inst->window_border; - 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); +#ifndef NO_BACKING_PIXMAPS + 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->surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, + backing_w, backing_h); +#endif + } draw_backing_rect(inst); @@ -519,13 +584,55 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) return TRUE; } +#ifdef DRAW_TEXT_CAIRO +static void cairo_setup_dctx(struct draw_ctx *dctx) +{ + cairo_get_matrix(dctx->uctx.u.cairo.cr, + &dctx->uctx.u.cairo.origmatrix); + cairo_set_line_width(dctx->uctx.u.cairo.cr, 1.0); + cairo_set_line_cap(dctx->uctx.u.cairo.cr, CAIRO_LINE_CAP_SQUARE); + cairo_set_line_join(dctx->uctx.u.cairo.cr, CAIRO_LINE_JOIN_MITER); + /* This antialiasing setting appears to be ignored for Pango + * font rendering but honoured for stroking and filling paths; + * I don't quite understand the logic of that, but I won't + * complain since it's exactly what I happen to want */ + cairo_set_antialias(dctx->uctx.u.cairo.cr, CAIRO_ANTIALIAS_NONE); +} +#endif + +#if GTK_CHECK_VERSION(3,0,0) +static gint draw_area(GtkWidget *widget, cairo_t *cr, gpointer data) +{ + struct gui_data *inst = (struct gui_data *)data; + + /* + * 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; + + gdk_cairo_get_clip_rectangle(cr, &dirtyrect); + + 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; +} +#else gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data) { struct gui_data *inst = (struct gui_data *)data; +#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), @@ -536,12 +643,40 @@ gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data) event->area.x, event->area.y, event->area.width, event->area.height); } +#else + /* + * 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 + return TRUE; } +#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; @@ -558,6 +693,85 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) special = use_ucsoutput = FALSE; output_charset = CS_ISO8859_1; +#ifdef KEY_EVENT_DIAGNOSTICS + { + 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); + } + } + + 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); + } +#endif /* KEY_EVENT_DIAGNOSTICS */ + /* * If Alt is being released after typing an Alt+numberpad * sequence, we should generate the code that was typed. @@ -574,8 +788,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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 @@ -587,27 +802,23 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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 @@ -617,18 +828,22 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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 we're seeing a numberpad key press with Mod1 down, + * If we're seeing a numberpad key press with Meta down, * consider adding it to alt_keycode if that's sensible. - * Anything _else_ with Mod1 down cancels any possibility + * Anything _else_ with Meta down cancels any possibility * of an ALT keycode: we set alt_keycode to -2. */ - if ((event->state & GDK_MOD1_MASK) && inst->alt_keycode != -2) { + if ((event->state & inst->meta_mod_mask) && inst->alt_keycode != -2) { int digit = -1; switch (event->keyval) { case GDK_KEY_KP_0: case GDK_KEY_KP_Insert: digit = 0; break; @@ -645,17 +860,17 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; @@ -668,21 +883,33 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) */ 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; } @@ -692,6 +919,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) */ 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; } @@ -715,7 +945,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) */ 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 @@ -775,8 +1005,40 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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 + } + } } /* @@ -802,40 +1064,162 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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 { output[lenof(output)-1] = '\0'; end = strlen(output); } - if (event->state & GDK_MOD1_MASK) { + 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; } + /* Some GTK backends (e.g. Quartz) do not change event->string + * in response to the Control modifier. So we do it ourselves + * here, if it's not already happened. + * + * 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' || output[1] == ' ') { + /* ^2 and ^Space are both ^@, i.e. \0 */ + output[1] = '\0'; + } else if (output[1] == '8') { + /* ^8 is DEL */ + output[1] = '\x7F'; + } else if (output[1] == '/') { + /* ^/ is the same as ^_ */ + output[1] = '\x1F'; + } else if (output[1] >= 0x40 && output[1] < 0x7F) { + /* Everything anywhere near the alphabetics just gets + * masked. */ + 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; @@ -844,6 +1228,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* 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; @@ -856,6 +1243,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; @@ -865,6 +1255,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; @@ -876,6 +1269,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) !(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; @@ -885,6 +1282,10 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) (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; @@ -894,6 +1295,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; } @@ -901,6 +1305,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * (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; } @@ -938,6 +1345,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) output[1] = keys[1]; else output[1] = keys[0]; +#ifdef KEY_EVENT_DIAGNOSTICS + debug((" - Nethack-mode key")); +#endif use_ucsoutput = FALSE; goto done; } @@ -993,6 +1403,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } else end = 1 + sprintf(output+1, "\033O%c", xkey); use_ucsoutput = FALSE; +#ifdef KEY_EVENT_DIAGNOSTICS + debug((" - Application keypad mode key")); +#endif goto done; } } @@ -1097,6 +1510,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; } @@ -1122,6 +1538,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; } @@ -1134,6 +1553,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) } 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; } @@ -1144,35 +1566,59 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; @@ -1198,6 +1644,9 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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; } @@ -1208,15 +1657,22 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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. @@ -1226,10 +1682,41 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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. @@ -1242,6 +1729,21 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) * 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); } @@ -1257,6 +1759,22 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) 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); @@ -1264,6 +1782,61 @@ void input_method_commit_event(GtkIMContext *imc, gchar *str, gpointer data) } #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) @@ -1277,7 +1850,7 @@ gboolean button_internal(struct gui_data *inst, guint32 timestamp, shift = state & GDK_SHIFT_MASK; ctrl = state & GDK_CONTROL_MASK; - alt = state & GDK_MOD1_MASK; + alt = state & inst->meta_mod_mask; raw_mouse_mode = send_raw_mouse && !(shift && conf_get_int(inst->conf, @@ -1285,11 +1858,11 @@ gboolean button_internal(struct gui_data *inst, guint32 timestamp, 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; } } @@ -1349,8 +1922,15 @@ gboolean button_event(GtkWidget *widget, GdkEventButton *event, gpointer data) 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) @@ -1360,6 +1940,7 @@ gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) return button_internal(inst, event->time, GDK_BUTTON_PRESS, button, event->state, event->x, event->y); +#endif } #endif @@ -1375,7 +1956,7 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) shift = event->state & GDK_SHIFT_MASK; ctrl = event->state & GDK_CONTROL_MASK; - alt = event->state & GDK_MOD1_MASK; + alt = event->state & inst->meta_mod_mask; if (event->state & GDK_BUTTON1_MASK) button = MBT_LEFT; else if (event->state & GDK_BUTTON2_MASK) @@ -1431,6 +2012,48 @@ static void exit_callback(void *vinst) } } +/* + * 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; @@ -1440,15 +2063,17 @@ void notify_remote_exit(void *frontend) static void notify_toplevel_callback(void *frontend); -static gint quit_toplevel_callback_func(gpointer data) +static void inst_post_main(struct gui_data *inst) { - struct gui_data *inst = (struct gui_data *)data; - - notify_toplevel_callback(inst); - - inst->quit_fn_scheduled = FALSE; - - return 0; + 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) @@ -1463,7 +2088,7 @@ static gint idle_toplevel_callback_func(gpointer data) * already arranged one), so we can reschedule ourself then. */ if (!inst->quit_fn_scheduled) { - gtk_quit_add(2, quit_toplevel_callback_func, inst); + request_post_main(inst); inst->quit_fn_scheduled = TRUE; } /* @@ -1472,7 +2097,7 @@ static gint idle_toplevel_callback_func(gpointer data) * can reschedule us with a chance of actually taking action. */ if (inst->idle_fn_scheduled) { /* double-check, just in case */ - gtk_idle_remove(inst->toplevel_callback_idle_id); + g_source_remove(inst->toplevel_callback_idle_id); inst->idle_fn_scheduled = FALSE; } } else { @@ -1486,7 +2111,7 @@ static gint idle_toplevel_callback_func(gpointer data) * event loop. */ if (!toplevel_callback_pending() && inst->idle_fn_scheduled) { - gtk_idle_remove(inst->toplevel_callback_idle_id); + g_source_remove(inst->toplevel_callback_idle_id); inst->idle_fn_scheduled = FALSE; } @@ -1499,7 +2124,7 @@ static void notify_toplevel_callback(void *frontend) if (!inst->idle_fn_scheduled) { inst->toplevel_callback_idle_id = - gtk_idle_add(idle_toplevel_callback_func, inst); + g_idle_add(idle_toplevel_callback_func, inst); inst->idle_fn_scheduled = TRUE; } } @@ -1514,7 +2139,7 @@ static gint timer_trigger(gpointer data) * Destroy the timer we got here on. */ if (timer_id) { - gtk_timeout_remove(timer_id); + g_source_remove(timer_id); timer_id = 0; } @@ -1531,8 +2156,7 @@ static gint timer_trigger(gpointer data) ticks = 0; else ticks = next - now; - timer_id = gtk_timeout_add(ticks, timer_trigger, - LONG_TO_GPOINTER(next)); + timer_id = g_timeout_add(ticks, timer_trigger, LONG_TO_GPOINTER(next)); } /* @@ -1548,23 +2172,37 @@ void timer_change_notify(unsigned long next) long ticks; if (timer_id) - gtk_timeout_remove(timer_id); + g_source_remove(timer_id); ticks = next - GETTICKCOUNT(); if (ticks <= 0) ticks = 1; /* just in case */ - timer_id = gtk_timeout_add(ticks, timer_trigger, - LONG_TO_GPOINTER(next)); + timer_id = g_timeout_add(ticks, timer_trigger, LONG_TO_GPOINTER(next)); } -void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) +#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) @@ -1572,6 +2210,7 @@ void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition) if (condition & GDK_INPUT_WRITE) select_result(sourcefd, 2); } +#endif void destroy(GtkWidget *widget, gpointer data) { @@ -1608,6 +2247,9 @@ void set_raw_mouse_mode(void *frontend, int activate) void request_resize(void *frontend, int w, int h) { struct gui_data *inst = (struct gui_data *)frontend; + +#if !GTK_CHECK_VERSION(3,0,0) + int large_x, large_y; int offset_x, offset_y; int area_x, area_y; @@ -1637,11 +2279,7 @@ void request_resize(void *frontend, int w, int h) large_x += 32; large_y += 32; -#if GTK_CHECK_VERSION(2,0,0) gtk_widget_set_size_request(inst->area, large_x, large_y); -#else - gtk_widget_set_usize(inst->area, large_x, large_y); -#endif gtk_widget_size_request(inst->area, &inner); gtk_widget_size_request(inst->window, &outer); @@ -1657,12 +2295,11 @@ void request_resize(void *frontend, int w, int h) * way to do this, I think, is to set it to what the size is * really going to end up being. */ -#if GTK_CHECK_VERSION(2,0,0) gtk_widget_set_size_request(inst->area, area_x, area_y); +#if GTK_CHECK_VERSION(2,0,0) gtk_window_resize(GTK_WINDOW(inst->window), area_x + offset_x, area_y + offset_y); #else - gtk_widget_set_usize(inst->area, area_x, area_y); gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), area_x, area_y); /* * I can no longer remember what this call to @@ -1685,31 +2322,69 @@ void request_resize(void *frontend, int w, int h) gdk_window_resize(gtk_widget_get_window(inst->window), area_x + offset_x, area_y + offset_y); #endif + +#else /* GTK_CHECK_VERSION(3,0,0) */ + + /* + * In GTK3, we can do this by using gtk_window_resize_to_geometry, + * which uses the fact that we've already set up the main window's + * WM hints to reflect the terminal drawing area's resize + * increment (i.e. character cell) and the fixed amount of stuff + * round the edges. + */ + gtk_window_resize_to_geometry(GTK_WINDOW(inst->window), w, h); + +#endif + } static void real_palette_set(struct gui_data *inst, int n, int r, int g, int b) { - gboolean success[1]; - inst->cols[n].red = r * 0x0101; inst->cols[n].green = g * 0x0101; inst->cols[n].blue = b * 0x0101; - gdk_colormap_free_colors(inst->colmap, inst->cols + n, 1); - gdk_colormap_alloc_colors(inst->colmap, inst->cols + n, 1, - FALSE, TRUE, success); - if (!success[0]) - g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n", appname, - n, r, g, b); +#if !GTK_CHECK_VERSION(3,0,0) + { + gboolean success[1]; + gdk_colormap_free_colors(inst->colmap, inst->cols + n, 1); + gdk_colormap_alloc_colors(inst->colmap, inst->cols + n, 1, + FALSE, TRUE, success); + if (!success[0]) + g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n", + appname, n, r, g, b); + } +#endif +} + +void set_gdk_window_background(GdkWindow *win, const GdkColor *col) +{ +#if GTK_CHECK_VERSION(3,0,0) + /* gdk_window_set_background is deprecated; work around its + * absence. */ + GdkRGBA rgba; + rgba.red = col->red / 65535.0; + rgba.green = col->green / 65535.0; + rgba.blue = col->blue / 65535.0; + rgba.alpha = 1.0; + gdk_window_set_background_rgba(win, &rgba); +#else + { + /* For GTK1, which doesn't have a 'const' on + * gdk_window_set_background's second parameter type. */ + GdkColor col_mutable = *col; + gdk_window_set_background(win, &col_mutable); + } +#endif } void set_window_background(struct gui_data *inst) { if (inst->area && gtk_widget_get_window(inst->area)) - gdk_window_set_background(gtk_widget_get_window(inst->area), + set_gdk_window_background(gtk_widget_get_window(inst->area), &inst->cols[258]); if (inst->window && gtk_widget_get_window(inst->window)) - gdk_window_set_background(gtk_widget_get_window(inst->window), + set_gdk_window_background(gtk_widget_get_window(inst->window), &inst->cols[258]); } @@ -1739,16 +2414,17 @@ void palette_reset(void *frontend) 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15 }; - gboolean success[NALLCOLOURS]; int i; assert(lenof(ww) == NCFGCOLOURS); +#if !GTK_CHECK_VERSION(3,0,0) if (!inst->colmap) { inst->colmap = gdk_colormap_get_system(); } else { gdk_colormap_free_colors(inst->colmap, inst->cols, NALLCOLOURS); } +#endif for (i = 0; i < NCFGCOLOURS; i++) { inst->cols[ww[i]].red = @@ -1773,16 +2449,21 @@ void palette_reset(void *frontend) } } - gdk_colormap_alloc_colors(inst->colmap, inst->cols, NALLCOLOURS, - FALSE, TRUE, success); - for (i = 0; i < NALLCOLOURS; i++) { - if (!success[i]) - g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n", - appname, i, - conf_get_int_int(inst->conf, CONF_colours, i*3+0), - conf_get_int_int(inst->conf, CONF_colours, i*3+1), - conf_get_int_int(inst->conf, CONF_colours, i*3+2)); +#if !GTK_CHECK_VERSION(3,0,0) + { + gboolean success[NALLCOLOURS]; + gdk_colormap_alloc_colors(inst->colmap, inst->cols, NALLCOLOURS, + FALSE, TRUE, success); + for (i = 0; i < NALLCOLOURS; i++) { + if (!success[i]) + g_error("%s: couldn't allocate colour %d (#%02x%02x%02x)\n", + appname, i, + conf_get_int_int(inst->conf, CONF_colours, i*3+0), + conf_get_int_int(inst->conf, CONF_colours, i*3+1), + conf_get_int_int(inst->conf, CONF_colours, i*3+2)); + } } +#endif /* Since Default Background may have changed, ensure that space * between text area and window border is refreshed. */ @@ -1793,50 +2474,182 @@ void palette_reset(void *frontend) } } -/* Ensure that all the cut buffers exist - according to the ICCCM, we must - * do this before we start using cut buffers. - */ -void init_cutbuffers() +#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_clipboard(struct gui_data *inst) +{ + 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) { -#ifndef NOT_X_WINDOWS - unsigned char empty[] = ""; - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, empty, 0); - XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(), - XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0); -#endif + 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()); /* ICCCM says we must rotate the buffers before storing to buffer 0. */ - XRotateBuffers(GDK_DISPLAY(), 1); - XStoreBytes(GDK_DISPLAY(), ptr, len); + XRotateBuffers(disp, 1); + XStoreBytes(disp, ptr, len); #endif } /* 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()); char * ptr; - ptr = XFetchBytes(GDK_DISPLAY(), nbytes); + ptr = XFetchBytes(disp, nbytes); if (*nbytes <= 0 && ptr != 0) { XFree(ptr); ptr = 0; @@ -1847,7 +2660,8 @@ char * retrieve_cutbuffer(int * nbytes) #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) @@ -1867,6 +2681,7 @@ void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_des #ifndef NOT_X_WINDOWS XTextProperty tp; char *list[1]; + Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); #endif inst->pasteout_data_utf8 = snewn(len*6, char); @@ -1890,7 +2705,7 @@ void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_des */ #ifndef NOT_X_WINDOWS list[0] = inst->pasteout_data_utf8; - if (Xutf8TextListToTextProperty(GDK_DISPLAY(), list, 1, + if (Xutf8TextListToTextProperty(disp, list, 1, XCompoundTextStyle, &tp) == 0) { inst->pasteout_data_ctext = snewn(tp.nitems+1, char); memcpy(inst->pasteout_data_ctext, tp.value, tp.nitems); @@ -1944,8 +2759,8 @@ void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_des 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); @@ -1963,8 +2778,8 @@ void selection_get(GtkWidget *widget, GtkSelectionData *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; @@ -2015,10 +2830,8 @@ void request_paste(void *frontend) } } -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; @@ -2089,13 +2902,13 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, #ifndef NOT_X_WINDOWS XTextProperty tp; int ret, count; + Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); tp.value = (unsigned char *)seldata_data; tp.encoding = (Atom) seldata_type; tp.format = gtk_selection_data_get_format(seldata); tp.nitems = seldata_length; - ret = Xutf8TextPropertyToTextList(GDK_DISPLAY(), &tp, - &list, &count); + ret = Xutf8TextPropertyToTextList(disp, &tp, &list, &count); if (ret == 0 && count == 1) { text = list[0]; length = strlen(list[0]); @@ -2139,6 +2952,48 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, #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()); + 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 + + 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); +} + +/* + * End of selection/clipboard handling. + * ---------------------------------------------------------------------- + */ + +#endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */ + void get_clip(void *frontend, wchar_t ** p, int *len) { struct gui_data *inst = (struct gui_data *)frontend; @@ -2236,11 +3091,8 @@ void do_beep(void *frontend, int mode) 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; } @@ -2255,7 +3107,25 @@ Context get_ctx(void *frontend) dctx = snew(struct draw_ctx); dctx->inst = inst; - dctx->gc = gdk_gc_new(gtk_widget_get_window(inst->area)); + dctx->uctx.type = inst->drawtype; +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + /* 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); + /* 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 return dctx; } @@ -2263,11 +3133,252 @@ void free_ctx(Context ctx) { struct draw_ctx *dctx = (struct draw_ctx *)ctx; /* struct gui_data *inst = dctx->inst; */ - GdkGC *gc = dctx->gc; - gdk_gc_unref(gc); +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + gdk_gc_unref(dctx->uctx.u.gdk.gc); + } +#endif +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_destroy(dctx->uctx.u.cairo.cr); + } +#endif sfree(dctx); } + +static void draw_update(struct draw_ctx *dctx, int x, int y, int w, int h) +{ +#if defined DRAW_TEXT_CAIRO && !defined NO_BACKING_PIXMAPS + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + /* + * 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 + + /* + * 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) +{ +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + gdk_gc_set_foreground(dctx->uctx.u.gdk.gc, &dctx->inst->cols[col]); + } +#endif +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_set_source_rgb(dctx->uctx.u.cairo.cr, + dctx->inst->cols[col].red / 65535.0, + dctx->inst->cols[col].green / 65535.0, + dctx->inst->cols[col].blue / 65535.0); + } +#endif +} + +static void draw_rectangle(struct draw_ctx *dctx, int filled, + int x, int y, int w, int h) +{ +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + gdk_draw_rectangle(dctx->uctx.u.gdk.target, dctx->uctx.u.gdk.gc, + filled, x, y, w, h); + } +#endif +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_new_path(dctx->uctx.u.cairo.cr); + if (filled) { + cairo_rectangle(dctx->uctx.u.cairo.cr, x, y, w, h); + cairo_fill(dctx->uctx.u.cairo.cr); + } else { + cairo_rectangle(dctx->uctx.u.cairo.cr, + x + 0.5, y + 0.5, w, h); + cairo_close_path(dctx->uctx.u.cairo.cr); + cairo_stroke(dctx->uctx.u.cairo.cr); + } + } +#endif +} + +static void draw_clip(struct draw_ctx *dctx, int x, int y, int w, int h) +{ +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + GdkRectangle r; + + r.x = x; + r.y = y; + r.width = w; + r.height = h; + + gdk_gc_set_clip_rectangle(dctx->uctx.u.gdk.gc, &r); + } +#endif +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_reset_clip(dctx->uctx.u.cairo.cr); + cairo_new_path(dctx->uctx.u.cairo.cr); + cairo_rectangle(dctx->uctx.u.cairo.cr, x, y, w, h); + cairo_clip(dctx->uctx.u.cairo.cr); + } +#endif +} + +static void draw_point(struct draw_ctx *dctx, int x, int y) +{ +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + gdk_draw_point(dctx->uctx.u.gdk.target, dctx->uctx.u.gdk.gc, x, y); + } +#endif +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_new_path(dctx->uctx.u.cairo.cr); + cairo_rectangle(dctx->uctx.u.cairo.cr, x, y, 1, 1); + cairo_fill(dctx->uctx.u.cairo.cr); + } +#endif +} + +static void draw_line(struct draw_ctx *dctx, int x0, int y0, int x1, int y1) +{ +#ifdef DRAW_TEXT_GDK + if (dctx->uctx.type == DRAWTYPE_GDK) { + gdk_draw_line(dctx->uctx.u.gdk.target, dctx->uctx.u.gdk.gc, + x0, y0, x1, y1); + } +#endif +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_new_path(dctx->uctx.u.cairo.cr); + cairo_move_to(dctx->uctx.u.cairo.cr, x0 + 0.5, y0 + 0.5); + cairo_line_to(dctx->uctx.u.cairo.cr, x1 + 0.5, y1 + 0.5); + cairo_stroke(dctx->uctx.u.cairo.cr); + } +#endif +} + +static void draw_stretch_before(struct draw_ctx *dctx, int x, int y, + int w, int wdouble, + int h, int hdouble, int hbothalf) +{ +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_matrix_t matrix; + + matrix.xy = 0; + matrix.yx = 0; + + if (wdouble) { + matrix.xx = 2; + matrix.x0 = -x; + } else { + matrix.xx = 1; + matrix.x0 = 0; + } + + if (hdouble) { + matrix.yy = 2; + if (hbothalf) { + matrix.y0 = -(y+h); + } else { + matrix.y0 = -y; + } + } else { + matrix.yy = 1; + matrix.y0 = 0; + } + cairo_transform(dctx->uctx.u.cairo.cr, &matrix); + } +#endif +} + +static void draw_stretch_after(struct draw_ctx *dctx, int x, int y, + int w, int wdouble, + int h, int hdouble, int hbothalf) +{ +#ifdef DRAW_TEXT_GDK +#ifndef NO_BACKING_PIXMAPS + if (dctx->uctx.type == DRAWTYPE_GDK) { + /* + * I can't find any plausible StretchBlt equivalent in the X + * server, so I'm going to do this the slow and painful way. + * This will involve repeated calls to gdk_draw_pixmap() to + * stretch the text horizontally. It's O(N^2) in time and O(N) + * in network bandwidth, but you try thinking of a better way. + * :-( + */ + int i; + if (wdouble) { + for (i = 0; i < w; i++) { + gdk_draw_pixmap(dctx->uctx.u.gdk.target, + dctx->uctx.u.gdk.gc, + dctx->uctx.u.gdk.target, + x + 2*i, y, + x + 2*i+1, y, + w - i, h); + } + w *= 2; + } + + if (hdouble) { + int dt, db; + /* Now stretch vertically, in the same way. */ + if (hbothalf) + dt = 0, db = 1; + else + dt = 1, db = 0; + for (i = 0; i < h; i += 2) { + gdk_draw_pixmap(dctx->uctx.u.gdk.target, + dctx->uctx.u.gdk.gc, + dctx->uctx.u.gdk.target, + x, y + dt*i + db, + x, y + dt*(i+1), + w, h-i-1); + } + } + } +#else +#error No way to implement stretching in GDK without a reliable backing pixmap +#endif +#endif /* DRAW_TEXT_GDK */ +#ifdef DRAW_TEXT_CAIRO + if (dctx->uctx.type == DRAWTYPE_CAIRO) { + cairo_set_matrix(dctx->uctx.u.cairo.cr, + &dctx->uctx.u.cairo.origmatrix); + } +#endif +} + +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, w, h); + draw_update(dctx, 0, 0, w, h); + free_ctx(dctx); +} + /* * Draw a line of text in the window, at given character * coordinates, in given attributes. @@ -2279,8 +3390,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, { struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; - GdkGC *gc = dctx->gc; - 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; @@ -2354,28 +3464,43 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, } else rlen = len; - { - GdkRectangle r; + draw_clip(dctx, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + rlen*widefactor*inst->font_width, + inst->font_height); - r.x = x*inst->font_width+inst->window_border; - r.y = y*inst->font_height+inst->window_border; - r.width = rlen*widefactor*inst->font_width; - r.height = inst->font_height; - gdk_gc_set_clip_rectangle(gc, &r); + if ((lattr & LATTR_MODE) != LATTR_NORM) { + draw_stretch_before(dctx, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + rlen*widefactor*inst->font_width, TRUE, + inst->font_height, + ((lattr & LATTR_MODE) != LATTR_WIDE), + ((lattr & LATTR_MODE) == LATTR_BOT)); } - gdk_gc_set_foreground(gc, &inst->cols[nbg]); - gdk_draw_rectangle(inst->pixmap, gc, 1, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border, - rlen*widefactor*inst->font_width, inst->font_height); - - gdk_gc_set_foreground(gc, &inst->cols[nfg]); - for (combining = 0; combining < ncombining; combining++) { - unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid], + draw_set_colour(dctx, nbg); + draw_rectangle(dctx, TRUE, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + rlen*widefactor*inst->font_width, inst->font_height); + + draw_set_colour(dctx, nfg); + 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); } @@ -2383,47 +3508,20 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len, int uheight = inst->fonts[0]->ascent + 1; if (uheight >= inst->font_height) uheight = inst->font_height - 1; - gdk_draw_line(inst->pixmap, gc, x*inst->font_width+inst->window_border, - y*inst->font_height + uheight + inst->window_border, - (x+len)*widefactor*inst->font_width-1+inst->window_border, - y*inst->font_height + uheight + inst->window_border); + draw_line(dctx, x*inst->font_width+inst->window_border, + y*inst->font_height + uheight + inst->window_border, + (x+len)*widefactor*inst->font_width-1+inst->window_border, + y*inst->font_height + uheight + inst->window_border); } if ((lattr & LATTR_MODE) != LATTR_NORM) { - /* - * I can't find any plausible StretchBlt equivalent in the - * X server, so I'm going to do this the slow and painful - * way. This will involve repeated calls to - * gdk_draw_pixmap() to stretch the text horizontally. It's - * O(N^2) in time and O(N) in network bandwidth, but you - * try thinking of a better way. :-( - */ - int i; - for (i = 0; i < len * widefactor * inst->font_width; i++) { - gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, - x*inst->font_width+inst->window_border + 2*i, - y*inst->font_height+inst->window_border, - x*inst->font_width+inst->window_border + 2*i+1, - y*inst->font_height+inst->window_border, - len * widefactor * inst->font_width - i, inst->font_height); - } - len *= 2; - if ((lattr & LATTR_MODE) != LATTR_WIDE) { - int dt, db; - /* Now stretch vertically, in the same way. */ - if ((lattr & LATTR_MODE) == LATTR_BOT) - dt = 0, db = 1; - else - dt = 1, db = 0; - for (i = 0; i < inst->font_height; i+=2) { - gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border+dt*i+db, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border+dt*(i+1), - len * widefactor * inst->font_width, inst->font_height-i-1); - } - } + draw_stretch_after(dctx, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + rlen*widefactor*inst->font_width, TRUE, + inst->font_height, + ((lattr & LATTR_MODE) != LATTR_WIDE), + ((lattr & LATTR_MODE) == LATTR_BOT)); } } @@ -2432,7 +3530,6 @@ void do_text(Context ctx, int x, int y, wchar_t *text, int len, { struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; - GdkGC *gc = dctx->gc; int widefactor; do_text_internal(ctx, x, y, text, len, attr, lattr); @@ -2452,12 +3549,10 @@ void do_text(Context ctx, int x, int y, wchar_t *text, int len, len *= 2; } - gdk_draw_pixmap(gtk_widget_get_window(inst->area), gc, inst->pixmap, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border, - len*widefactor*inst->font_width, inst->font_height); + draw_update(dctx, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + len*widefactor*inst->font_width, inst->font_height); } void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, @@ -2465,7 +3560,6 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, { struct draw_ctx *dctx = (struct draw_ctx *)ctx; struct gui_data *inst = dctx->inst; - GdkGC *gc = dctx->gc; int active, passive, widefactor; @@ -2506,11 +3600,12 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, * if it's passive. */ if (passive) { - gdk_gc_set_foreground(gc, &inst->cols[261]); - gdk_draw_rectangle(inst->pixmap, gc, 0, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border, - len*widefactor*inst->font_width-1, inst->font_height-1); + draw_set_colour(dctx, 261); + draw_rectangle(dctx, FALSE, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + len*widefactor*inst->font_width-1, + inst->font_height-1); } } else { int uheight; @@ -2544,27 +3639,25 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, length = inst->font_height; } - gdk_gc_set_foreground(gc, &inst->cols[261]); + draw_set_colour(dctx, 261); if (passive) { for (i = 0; i < length; i++) { if (i % 2 == 0) { - gdk_draw_point(inst->pixmap, gc, startx, starty); + draw_point(dctx, startx, starty); } startx += dx; starty += dy; } } else if (active) { - gdk_draw_line(inst->pixmap, gc, startx, starty, - startx + (length-1) * dx, starty + (length-1) * dy); + draw_line(dctx, startx, starty, + startx + (length-1) * dx, starty + (length-1) * dy); } /* else no cursor (e.g., blinked off) */ } - gdk_draw_pixmap(gtk_widget_get_window(inst->area), gc, inst->pixmap, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border, - x*inst->font_width+inst->window_border, - y*inst->font_height+inst->window_border, - len*widefactor*inst->font_width, inst->font_height); + draw_update(dctx, + x*inst->font_width+inst->window_border, + y*inst->font_height+inst->window_border, + len*widefactor*inst->font_width, inst->font_height); #if GTK_CHECK_VERSION(2,0,0) { @@ -2580,97 +3673,28 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len, GdkCursor *make_mouse_ptr(struct gui_data *inst, int cursor_val) { - /* - * Truly hideous hack: GTK doesn't allow us to set the mouse - * cursor foreground and background colours unless we've _also_ - * created our own cursor from bitmaps. Therefore, I need to - * load the `cursor' font and draw glyphs from it on to - * pixmaps, in order to construct my cursors with the fg and bg - * I want. This is a gross hack, but it's more self-contained - * than linking in Xlib to find the X window handle to - * inst->area and calling XRecolorCursor, and it's more - * futureproof than hard-coding the shapes as bitmap arrays. - */ - static GdkFont *cursor_font = NULL; - GdkPixmap *source, *mask; - GdkGC *gc; - GdkColor cfg = { 0, 65535, 65535, 65535 }; - GdkColor cbg = { 0, 0, 0, 0 }; - GdkColor dfg = { 1, 65535, 65535, 65535 }; - GdkColor dbg = { 0, 0, 0, 0 }; - GdkCursor *ret; - gchar text[2]; - gint lb, rb, wid, asc, desc, w, h, x, y; - - if (cursor_val == -2) { - gdk_font_unref(cursor_font); - return NULL; - } - - if (cursor_val >= 0 && !cursor_font) { - cursor_font = gdk_font_load("cursor"); - if (cursor_font) - gdk_font_ref(cursor_font); - } - - /* - * Get the text extent of the cursor in question. We use the - * mask character for this, because it's typically slightly - * bigger than the main character. - */ - if (cursor_val >= 0) { - text[1] = '\0'; - text[0] = (char)cursor_val + 1; - gdk_string_extents(cursor_font, text, &lb, &rb, &wid, &asc, &desc); - w = rb-lb; h = asc+desc; x = -lb; y = asc; - } else { - w = h = 1; - x = y = 0; - } - - source = gdk_pixmap_new(NULL, w, h, 1); - mask = gdk_pixmap_new(NULL, w, h, 1); - - /* - * Draw the mask character on the mask pixmap. - */ - gc = gdk_gc_new(mask); - gdk_gc_set_foreground(gc, &dbg); - gdk_draw_rectangle(mask, gc, 1, 0, 0, w, h); - if (cursor_val >= 0) { - text[1] = '\0'; - text[0] = (char)cursor_val + 1; - gdk_gc_set_foreground(gc, &dfg); - gdk_draw_text(mask, cursor_font, gc, x, y, text, 1); - } - gdk_gc_unref(gc); - - /* - * Draw the main character on the source pixmap. - */ - gc = gdk_gc_new(source); - gdk_gc_set_foreground(gc, &dbg); - gdk_draw_rectangle(source, gc, 1, 0, 0, w, h); - if (cursor_val >= 0) { - text[1] = '\0'; - text[0] = (char)cursor_val; - gdk_gc_set_foreground(gc, &dfg); - gdk_draw_text(source, cursor_font, gc, x, y, text, 1); + if (cursor_val == -1) { +#if GTK_CHECK_VERSION(2,16,0) + cursor_val = GDK_BLANK_CURSOR; +#else + /* + * Work around absence of GDK_BLANK_CURSOR by inventing a + * blank pixmap. + */ + GdkCursor *ret; + GdkColor bg = { 0, 0, 0, 0 }; + GdkPixmap *pm = gdk_pixmap_new(NULL, 1, 1, 1); + GdkGC *gc = gdk_gc_new(pm); + gdk_gc_set_foreground(gc, &bg); + gdk_draw_rectangle(pm, gc, 1, 0, 0, 1, 1); + gdk_gc_unref(gc); + ret = gdk_cursor_new_from_pixmap(pm, pm, &bg, &bg, 1, 1); + gdk_pixmap_unref(pm); + return ret; +#endif } - gdk_gc_unref(gc); - - /* - * Create the cursor. - */ - ret = gdk_cursor_new_from_pixmap(source, mask, &cfg, &cbg, x, y); - - /* - * Clean up. - */ - gdk_pixmap_unref(source); - gdk_pixmap_unref(mask); - return ret; + return gdk_cursor_new(cursor_val); } void modalfatalbox(const char *p, ...) @@ -2695,7 +3719,7 @@ void cmdline_error(const char *p, ...) exit(1); } -char *get_x_display(void *frontend) +const char *get_x_display(void *frontend) { return gdk_get_display(); } @@ -2704,7 +3728,7 @@ char *get_x_display(void *frontend) long get_windowid(void *frontend) { struct gui_data *inst = (struct gui_data *)frontend; - return (long)GDK_WINDOW_XWINDOW(gtk_widget_get_window(inst->area)); + return (long)GDK_WINDOW_XID(gtk_widget_get_window(inst->area)); } #endif @@ -2830,25 +3854,30 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch, SECOND_PASS_ONLY; conf_set_str(conf, CONF_line_codepage, val); -#ifndef NOT_X_WINDOWS } else if (!strcmp(p, "-geometry")) { - int flags, x, y; - unsigned int w, h; EXPECTS_ARG; SECOND_PASS_ONLY; - 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)); +#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 @@ -2860,27 +3889,47 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch, } else if (!strcmp(p, "-fg") || !strcmp(p, "-bg") || !strcmp(p, "-bfg") || !strcmp(p, "-bbg") || !strcmp(p, "-cfg") || !strcmp(p, "-cbg")) { - GdkColor col; - EXPECTS_ARG; SECOND_PASS_ONLY; - if (!gdk_color_parse(val, &col)) { - err = 1; - fprintf(stderr, "%s: unable to parse colour \"%s\"\n", - appname, val); - } else { - 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, col.red / 256); - conf_set_int_int(conf, CONF_colours, index*3+1,col.green/ 256); - conf_set_int_int(conf, CONF_colours, index*3+2, col.blue/ 256); - } + + { +#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. */ @@ -2975,17 +4024,52 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch, return err; } -int uxsel_input_add(int fd, int rwx) { +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); - return gdk_input_add(fd, flags, fd_input_func, NULL); + 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); } -void uxsel_input_remove(int id) { - gdk_input_remove(id); +int frontend_is_utf8(void *frontend) +{ + struct gui_data *inst = (struct gui_data *)frontend; + return inst->ucsdata.line_codepage == CS_UTF8; } char *setup_fonts_ucs(struct gui_data *inst) @@ -3064,6 +4148,8 @@ char *setup_fonts_ucs(struct gui_data *inst) inst->fonts[0]->public_charset, conf_get_int(inst->conf, CONF_vtmode)); + inst->drawtype = inst->fonts[0]->preferred_drawtype; + return NULL; } @@ -3106,8 +4192,8 @@ void copy_all_menuitem(GtkMenuItem *item, gpointer data) void special_menuitem(GtkMenuItem *item, gpointer data) { struct gui_data *inst = (struct gui_data *)data; - int code = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), - "user-data")); + int code = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), + "user-data")); if (inst->back) inst->back->special(inst->backhandle, code); @@ -3522,14 +4608,14 @@ 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 *)gtk_object_get_data(GTK_OBJECT(item), "user-data"); + char *str = (char *)g_object_get_data(G_OBJECT(item), "user-data"); fork_and_exec_self(inst, -1, "-load", str, NULL); } void saved_session_freedata(GtkMenuItem *item, gpointer data) { - char *str = (char *)gtk_object_get_data(GTK_OBJECT(item), "user-data"); + char *str = (char *)g_object_get_data(G_OBJECT(item), "user-data"); sfree(str); } @@ -3550,14 +4636,14 @@ static void update_savedsess_menu(GtkMenuItem *menuitem, gpointer data) gtk_menu_item_new_with_label(sesslist.sessions[i]); gtk_container_add(GTK_CONTAINER(inst->sessionsmenu), menuitem); gtk_widget_show(menuitem); - gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", - dupstr(sesslist.sessions[i])); - gtk_signal_connect(GTK_OBJECT(menuitem), "activate", - GTK_SIGNAL_FUNC(saved_session_menuitem), - inst); - gtk_signal_connect(GTK_OBJECT(menuitem), "destroy", - GTK_SIGNAL_FUNC(saved_session_freedata), - inst); + g_object_set_data(G_OBJECT(menuitem), "user-data", + dupstr(sesslist.sessions[i])); + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(saved_session_menuitem), + inst); + g_signal_connect(G_OBJECT(menuitem), "destroy", + G_CALLBACK(saved_session_freedata), + inst); } if (sesslist.nsessions <= 1) { GtkWidget *menuitem = @@ -3572,20 +4658,26 @@ static void update_savedsess_menu(GtkMenuItem *menuitem, gpointer data) void set_window_icon(GtkWidget *window, const char *const *const *icon, int n_icon) { - GdkPixmap *iconpm; - GdkBitmap *iconmask; #if GTK_CHECK_VERSION(2,0,0) GList *iconlist; int n; +#else + GdkPixmap *iconpm; + GdkBitmap *iconmask; #endif if (!n_icon) return; gtk_widget_realize(window); +#if GTK_CHECK_VERSION(2,0,0) + gtk_window_set_icon(GTK_WINDOW(window), + gdk_pixbuf_new_from_xpm_data((const gchar **)icon[0])); +#else iconpm = gdk_pixmap_create_from_xpm_d(gtk_widget_get_window(window), &iconmask, NULL, (gchar **)icon[0]); gdk_window_set_icon(gtk_widget_get_window(window), NULL, iconpm, iconmask); +#endif #if GTK_CHECK_VERSION(2,0,0) iconlist = NULL; @@ -3595,7 +4687,7 @@ void set_window_icon(GtkWidget *window, const char *const *const *icon, gdk_pixbuf_new_from_xpm_data((const gchar **) icon[n])); } - gdk_window_set_icon_list(gtk_widget_get_window(window), iconlist); + gtk_window_set_icon_list(GTK_WINDOW(window), iconlist); #endif } @@ -3645,10 +4737,10 @@ void update_specials_menu(void *frontend) break; default: menuitem = gtk_menu_item_new_with_label(specials[i].name); - gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", - GINT_TO_POINTER(specials[i].code)); - gtk_signal_connect(GTK_OBJECT(menuitem), "activate", - GTK_SIGNAL_FUNC(special_menuitem), inst); + g_object_set_data(G_OBJECT(menuitem), "user-data", + GINT_TO_POINTER(specials[i].code)); + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(special_menuitem), inst); break; } if (menuitem) { @@ -3729,6 +4821,10 @@ int pt_main(int argc, char **argv) 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 */ @@ -3792,8 +4888,6 @@ int pt_main(int argc, char **argv) exit(1); } } - init_cutbuffers(); - inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); { const char *winclass = conf_get_str(inst->conf, CONF_winclass); @@ -3811,9 +4905,25 @@ int pt_main(int argc, char **argv) inst->height = conf_get_int(inst->conf, CONF_height); cache_conf_values(inst); - gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), - inst->font_width * inst->width + 2*inst->window_border, - inst->font_height * inst->height + 2*inst->window_border); + init_clipboard(inst); + + 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 + 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)); @@ -3830,8 +4940,6 @@ int pt_main(int argc, char **argv) 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); @@ -3839,6 +4947,11 @@ int pt_main(int argc, char **argv) gtk_widget_hide(inst->sbar); gtk_widget_show(GTK_WIDGET(inst->hbox)); +#if GTK_CHECK_VERSION(2,0,0) + if (inst->geometry) { + gtk_window_parse_geometry(GTK_WINDOW(inst->window), inst->geometry); + } +#else if (inst->gotpos) { int x = inst->xpos, y = inst->ypos; GtkRequisition req; @@ -3848,50 +4961,54 @@ int pt_main(int argc, char **argv) gtk_window_set_position(GTK_WINDOW(inst->window), GTK_WIN_POS_NONE); gtk_widget_set_uposition(GTK_WIDGET(inst->window), x, y); } +#endif - gtk_signal_connect(GTK_OBJECT(inst->window), "destroy", - GTK_SIGNAL_FUNC(destroy), inst); - gtk_signal_connect(GTK_OBJECT(inst->window), "delete_event", - GTK_SIGNAL_FUNC(delete_window), inst); - gtk_signal_connect(GTK_OBJECT(inst->window), "key_press_event", - GTK_SIGNAL_FUNC(key_event), inst); - gtk_signal_connect(GTK_OBJECT(inst->window), "key_release_event", - GTK_SIGNAL_FUNC(key_event), inst); - gtk_signal_connect(GTK_OBJECT(inst->window), "focus_in_event", - GTK_SIGNAL_FUNC(focus_event), inst); - gtk_signal_connect(GTK_OBJECT(inst->window), "focus_out_event", - GTK_SIGNAL_FUNC(focus_event), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "configure_event", - GTK_SIGNAL_FUNC(configure_area), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "expose_event", - GTK_SIGNAL_FUNC(expose_area), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "button_press_event", - GTK_SIGNAL_FUNC(button_event), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "button_release_event", - GTK_SIGNAL_FUNC(button_event), inst); + g_signal_connect(G_OBJECT(inst->window), "destroy", + G_CALLBACK(destroy), inst); + g_signal_connect(G_OBJECT(inst->window), "delete_event", + G_CALLBACK(delete_window), inst); + g_signal_connect(G_OBJECT(inst->window), "key_press_event", + G_CALLBACK(key_event), inst); + g_signal_connect(G_OBJECT(inst->window), "key_release_event", + G_CALLBACK(key_event), inst); + g_signal_connect(G_OBJECT(inst->window), "focus_in_event", + G_CALLBACK(focus_event), inst); + g_signal_connect(G_OBJECT(inst->window), "focus_out_event", + G_CALLBACK(focus_event), inst); + g_signal_connect(G_OBJECT(inst->area), "configure_event", + G_CALLBACK(configure_area), inst); +#if GTK_CHECK_VERSION(3,0,0) + g_signal_connect(G_OBJECT(inst->area), "draw", + G_CALLBACK(draw_area), inst); +#else + g_signal_connect(G_OBJECT(inst->area), "expose_event", + G_CALLBACK(expose_area), inst); +#endif + g_signal_connect(G_OBJECT(inst->area), "button_press_event", + G_CALLBACK(button_event), inst); + g_signal_connect(G_OBJECT(inst->area), "button_release_event", + G_CALLBACK(button_event), inst); #if GTK_CHECK_VERSION(2,0,0) - gtk_signal_connect(GTK_OBJECT(inst->area), "scroll_event", - GTK_SIGNAL_FUNC(scroll_event), inst); -#endif - gtk_signal_connect(GTK_OBJECT(inst->area), "motion_notify_event", - GTK_SIGNAL_FUNC(motion_event), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "selection_received", - GTK_SIGNAL_FUNC(selection_received), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "selection_get", - GTK_SIGNAL_FUNC(selection_get), inst); - gtk_signal_connect(GTK_OBJECT(inst->area), "selection_clear_event", - GTK_SIGNAL_FUNC(selection_clear), inst); + g_signal_connect(G_OBJECT(inst->area), "scroll_event", + G_CALLBACK(scroll_event), inst); +#endif + g_signal_connect(G_OBJECT(inst->area), "motion_notify_event", + G_CALLBACK(motion_event), inst); #if GTK_CHECK_VERSION(2,0,0) g_signal_connect(G_OBJECT(inst->imc), "commit", G_CALLBACK(input_method_commit_event), inst); #endif if (conf_get_int(inst->conf, CONF_scrollbar)) - gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed", - GTK_SIGNAL_FUNC(scrollbar_moved), inst); + g_signal_connect(G_OBJECT(inst->sbar_adjust), "value_changed", + G_CALLBACK(scrollbar_moved), 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[]; @@ -3918,8 +5035,8 @@ int pt_main(int argc, char **argv) menuitem = gtk_menu_item_new_with_label(title); \ gtk_container_add(GTK_CONTAINER(inst->menu), menuitem); \ gtk_widget_show(menuitem); \ - gtk_signal_connect(GTK_OBJECT(menuitem), "activate", \ - GTK_SIGNAL_FUNC(func), inst); \ + g_signal_connect(G_OBJECT(menuitem), "activate", \ + G_CALLBACK(func), inst); \ } while (0) #define MKSUBMENU(title) do \ @@ -3979,7 +5096,6 @@ int pt_main(int argc, char **argv) inst->rawcursor = make_mouse_ptr(inst, GDK_LEFT_PTR); inst->waitcursor = make_mouse_ptr(inst, GDK_WATCH); inst->blankcursor = make_mouse_ptr(inst, -1); - make_mouse_ptr(inst, -2); /* clean up cursor font */ inst->currcursor = inst->textcursor; show_mouseptr(inst, 1);