#include <stdio.h>
#include <time.h>
#include <errno.h>
+#include <locale.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <gtk/gtk.h>
+#if !GTK_CHECK_VERSION(3,0,0)
#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
+#endif
+
+#if GTK_CHECK_VERSION(2,0,0)
+#include <gtk/gtkimmodule.h>
+#endif
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
+#define MAY_REFER_TO_GTK_IN_HEADERS
+
#include "putty.h"
#include "terminal.h"
+#include "gtkcompat.h"
#include "gtkfont.h"
+#ifndef NOT_X_WINDOWS
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#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)}
#endif
/* Colours come in two flavours: configurable, and xterm-extended. */
-#define NCFGCOLOURS (lenof(((Config *)0)->colours))
#define NEXTCOLOURS 240 /* 216 colour-cube plus 24 shades of grey */
#define NALLCOLOURS (NCFGCOLOURS + NEXTCOLOURS)
GtkWidget *menu, *specialsmenu, *specialsitem1, *specialsitem2,
*restartitem;
GtkWidget *sessionsmenu;
+#ifndef NO_BACKING_PIXMAPS
GdkPixmap *pixmap;
+#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;
+#endif
wchar_t *pastein_data;
int direct_to_font;
int pastein_data_len;
int ignore_sbar;
int mouseptr_visible;
int busy_status;
- guint term_paste_idle_id;
- guint term_exit_idle_id;
+ guint toplevel_callback_idle_id;
+ int idle_fn_scheduled, quit_fn_scheduled;
int alt_keycode;
int alt_digits;
- char wintitle[sizeof(((Config *)0)->wintitle)];
- char icontitle[sizeof(((Config *)0)->wintitle)];
+ char *wintitle;
+ char *icontitle;
int master_fd, master_func_id;
void *ldisc;
Backend *back;
void *logctx;
int exited;
struct unicode_data ucsdata;
- Config cfg;
+ Conf *conf;
void *eventlogstuff;
char *progname, **gtkargvstart;
int ngtkargs;
guint32 input_event_time; /* Timestamp of the most recent input event. */
int reconfiguring;
+ /* Cached things out of conf that we refer to a lot */
+ int bold_style;
+ int window_border;
+ int cursor_type;
+ int drawtype;
};
+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);
+}
+
struct draw_ctx {
- GdkGC *gc;
struct gui_data *inst;
+ unifont_drawctx uctx;
};
static int send_raw_mouse;
-static char *app_name = "pterm";
+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)
{
- return XGetDefault(GDK_DISPLAY(), app_name, 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, char *p, ...)
+void connection_fatal(void *frontend, const char *p, ...)
{
struct gui_data *inst = (struct gui_data *)frontend;
va_start(ap, p);
msg = dupvprintf(p, ap);
va_end(ap);
- inst->exited = TRUE;
fatal_message_box(inst->window, msg);
sfree(msg);
- if (inst->cfg.close_on_exit == FORCE_ON)
- cleanup_exit(1);
+
+ queue_toplevel_callback(exit_callback, inst);
}
/*
* Default settings that are specific to pterm.
*/
-FontSpec platform_default_fontspec(const char *name)
+FontSpec *platform_default_fontspec(const char *name)
{
- FontSpec ret;
if (!strcmp(name, "Font"))
- strcpy(ret.name, "server:fixed");
+ return fontspec_new("server:fixed");
else
- *ret.name = '\0';
- return ret;
+ return fontspec_new("");
}
-Filename platform_default_filename(const char *name)
+Filename *platform_default_filename(const char *name)
{
- Filename ret;
if (!strcmp(name, "LogFileName"))
- strcpy(ret.path, "putty.log");
+ return filename_from_str("putty.log");
else
- *ret.path = '\0';
- return ret;
+ return filename_from_str("");
}
char *platform_default_s(const char *name)
}
/* Dummy routine, only required in plink. */
-void ldisc_update(void *frontend, int echo, int edit)
+void frontend_echoedit_update(void *frontend, int echo, int edit)
{
}
return term_data_untrusted(inst->term, data, len);
}
-int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+int from_backend_eof(void *frontend)
+{
+ return TRUE; /* do respond to incoming EOF with outgoing */
+}
+
+int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
struct gui_data *inst = (struct gui_data *)p->frontend;
int ret;
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_move(GTK_WINDOW(inst->window), x, y);
#else
- gdk_window_move(inst->window->window, x, y);
+ gdk_window_move(gtk_widget_get_window(inst->window), x, y);
#endif
}
{
struct gui_data *inst = (struct gui_data *)frontend;
if (top)
- gdk_window_raise(inst->window->window);
+ gdk_window_raise(gtk_widget_get_window(inst->window));
else
- gdk_window_lower(inst->window->window);
+ gdk_window_lower(gtk_widget_get_window(inst->window));
}
/*
int is_iconic(void *frontend)
{
struct gui_data *inst = (struct gui_data *)frontend;
- return !gdk_window_is_viewable(inst->window->window);
+ return !gdk_window_is_viewable(gtk_widget_get_window(inst->window));
}
/*
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_get_position(GTK_WINDOW(inst->window), x, y);
#else
- gdk_window_get_position(inst->window->window, x, y);
+ gdk_window_get_position(gtk_widget_get_window(inst->window), x, y);
#endif
}
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_get_size(GTK_WINDOW(inst->window), x, y);
#else
- gdk_window_get_size(inst->window->window, x, y);
+ gdk_window_get_size(gtk_widget_get_window(inst->window), x, y);
#endif
}
gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
- if (!inst->exited && inst->cfg.warn_on_close) {
+ if (!inst->exited && conf_get_int(inst->conf, CONF_warn_on_close)) {
if (!reallyclose(inst))
return TRUE;
}
switch (inst->busy_status) {
case BUSY_NOT:
if (!inst->mouseptr_visible) {
- gdk_window_set_cursor(inst->area->window, inst->blankcursor);
+ gdk_window_set_cursor(gtk_widget_get_window(inst->area),
+ inst->blankcursor);
} else if (send_raw_mouse) {
- gdk_window_set_cursor(inst->area->window, inst->rawcursor);
+ gdk_window_set_cursor(gtk_widget_get_window(inst->area),
+ inst->rawcursor);
} else {
- gdk_window_set_cursor(inst->area->window, inst->textcursor);
+ gdk_window_set_cursor(gtk_widget_get_window(inst->area),
+ inst->textcursor);
}
break;
case BUSY_WAITING: /* XXX can we do better? */
case BUSY_CPU:
/* We always display these cursors. */
- gdk_window_set_cursor(inst->area->window, inst->waitcursor);
+ gdk_window_set_cursor(gtk_widget_get_window(inst->area),
+ inst->waitcursor);
break;
default:
assert(0);
static void show_mouseptr(struct gui_data *inst, int show)
{
- if (!inst->cfg.hide_mouseptr)
+ if (!conf_get_int(inst->conf, CONF_hide_mouseptr))
show = 1;
inst->mouseptr_visible = show;
update_mouseptr(inst);
}
-void draw_backing_rect(struct gui_data *inst)
-{
- GdkGC *gc = gdk_gc_new(inst->area->window);
- gdk_gc_set_foreground(gc, &inst->cols[258]); /* default background */
- gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0,
- inst->cfg.width * inst->font_width + 2*inst->cfg.window_border,
- inst->cfg.height * inst->font_height + 2*inst->cfg.window_border);
- gdk_gc_unref(gc);
-}
+static void draw_backing_rect(struct gui_data *inst);
gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
{
* See if the terminal size has changed, in which case we must
* let the terminal know.
*/
- w = (event->width - 2*inst->cfg.window_border) / inst->font_width;
- h = (event->height - 2*inst->cfg.window_border) / inst->font_height;
+ w = (event->width - 2*inst->window_border) / inst->font_width;
+ h = (event->height - 2*inst->window_border) / inst->font_height;
if (w != inst->width || h != inst->height) {
- inst->cfg.width = inst->width = w;
- inst->cfg.height = inst->height = h;
+ inst->width = w;
+ inst->height = h;
+ conf_set_int(inst->conf, CONF_width, inst->width);
+ conf_set_int(inst->conf, CONF_height, inst->height);
need_size = 1;
}
+#ifndef NO_BACKING_PIXMAPS
if (inst->pixmap) {
gdk_pixmap_unref(inst->pixmap);
inst->pixmap = NULL;
}
- inst->pixmap = gdk_pixmap_new(widget->window,
- (inst->cfg.width * inst->font_width +
- 2*inst->cfg.window_border),
- (inst->cfg.height * inst->font_height +
- 2*inst->cfg.window_border), -1);
+ 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);
+#endif
draw_backing_rect(inst);
if (need_size && inst->term) {
- term_size(inst->term, h, w, inst->cfg.savelines);
+ term_size(inst->term, h, w, conf_get_int(inst->conf, CONF_savelines));
}
if (inst->term)
term_invalidate(inst->term);
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_im_context_set_client_window(inst->imc, gtk_widget_get_window(widget));
+#endif
+
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;
+
+ if (inst->term) {
+ struct draw_ctx adctx, *dctx = &adctx;
+ 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);
+ }
+
+ 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.
*/
if (inst->pixmap) {
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+ gdk_draw_pixmap(gtk_widget_get_window(widget),
+ (gtk_widget_get_style(widget)->fg_gc
+ [gtk_widget_get_state(widget)]),
inst->pixmap,
event->area.x, event->area.y,
event->area.x, event->area.y,
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);
+ }
+#endif
+
return TRUE;
}
+#endif
#define KEY_PRESSED(k) \
(inst->keystate[(k) / 32] & (1 << ((k) % 32)))
char output[256];
wchar_t ucsoutput[2];
int ucsval, start, end, special, output_charset, use_ucsoutput;
+ int nethack_mode, app_keypad_mode;
/* Remember the timestamp. */
inst->input_event_time = event->time;
special = use_ucsoutput = FALSE;
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("|"); \
+ }
+#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);
+ }
+ printf(" hardware_keycode=%d is_modifier=%s\n",
+ (int)event->hardware_keycode, event->is_modifier ? "TRUE" : "FALSE");
+#endif /* KEY_EVENT_DIAGNOSTICS */
+
/*
* If Alt is being released after typing an Alt+numberpad
* sequence, we should generate the code that was typed.
* inconvenience in having to type a zero before a single-digit
* character code.
*/
- if (event->type == GDK_KEY_RELEASE &&
- (event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
- event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) &&
- inst->alt_keycode >= 0 && inst->alt_digits > 1) {
+ if (event->type == GDK_KEY_RELEASE) {
+ if ((event->keyval == GDK_KEY_Meta_L ||
+ event->keyval == GDK_KEY_Meta_R ||
+ 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);
+ printf("Alt key up, keycode = %d\n", inst->alt_keycode);
+#endif
+ /*
+ * FIXME: we might usefully try to do something clever here
+ * about interpreting the generated key code in a way that's
+ * appropriate to the line code page.
+ */
+ output[0] = inst->alt_keycode;
+ end = 1;
+ goto done;
+ }
+#if GTK_CHECK_VERSION(2,0,0)
+ if (gtk_im_context_filter_keypress(inst->imc, event))
+ return TRUE;
#endif
- /*
- * FIXME: we might usefully try to do something clever here
- * about interpreting the generated key code in a way that's
- * appropriate to the line code page.
- */
- output[0] = inst->alt_keycode;
- end = 1;
- goto done;
}
if (event->type == GDK_KEY_PRESS) {
* accumulating an Alt+numberpad code. We do this by
* setting alt_keycode to -1 (nothing yet but plausible).
*/
- if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
- event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) {
+ if ((event->keyval == GDK_KEY_Meta_L ||
+ event->keyval == GDK_KEY_Meta_R ||
+ event->keyval == GDK_KEY_Alt_L ||
+ event->keyval == GDK_KEY_Alt_R)) {
inst->alt_keycode = -1;
inst->alt_digits = 0;
goto done; /* this generates nothing else */
if ((event->state & GDK_MOD1_MASK) && inst->alt_keycode != -2) {
int digit = -1;
switch (event->keyval) {
- case GDK_KP_0: case GDK_KP_Insert: digit = 0; break;
- case GDK_KP_1: case GDK_KP_End: digit = 1; break;
- case GDK_KP_2: case GDK_KP_Down: digit = 2; break;
- case GDK_KP_3: case GDK_KP_Page_Down: digit = 3; break;
- case GDK_KP_4: case GDK_KP_Left: digit = 4; break;
- case GDK_KP_5: case GDK_KP_Begin: digit = 5; break;
- case GDK_KP_6: case GDK_KP_Right: digit = 6; break;
- case GDK_KP_7: case GDK_KP_Home: digit = 7; break;
- case GDK_KP_8: case GDK_KP_Up: digit = 8; break;
- case GDK_KP_9: case GDK_KP_Page_Up: digit = 9; break;
+ case GDK_KEY_KP_0: case GDK_KEY_KP_Insert: digit = 0; break;
+ case GDK_KEY_KP_1: case GDK_KEY_KP_End: digit = 1; break;
+ case GDK_KEY_KP_2: case GDK_KEY_KP_Down: digit = 2; break;
+ case GDK_KEY_KP_3: case GDK_KEY_KP_Page_Down: digit = 3; break;
+ case GDK_KEY_KP_4: case GDK_KEY_KP_Left: digit = 4; break;
+ case GDK_KEY_KP_5: case GDK_KEY_KP_Begin: digit = 5; break;
+ case GDK_KEY_KP_6: case GDK_KEY_KP_Right: digit = 6; break;
+ case GDK_KEY_KP_7: case GDK_KEY_KP_Home: digit = 7; break;
+ case GDK_KEY_KP_8: case GDK_KEY_KP_Up: digit = 8; break;
+ case GDK_KEY_KP_9: case GDK_KEY_KP_Page_Up: digit = 9; break;
}
if (digit < 0)
inst->alt_keycode = -2; /* it's invalid */
* Shift-PgUp and Shift-PgDn don't even generate keystrokes
* at all.
*/
- if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(inst->term, 0, -inst->cfg.height/2);
+ if (event->keyval == GDK_KEY_Page_Up &&
+ (event->state & GDK_SHIFT_MASK)) {
+ term_scroll(inst->term, 0, -inst->height/2);
return TRUE;
}
- if (event->keyval == GDK_Page_Up && (event->state & GDK_CONTROL_MASK)) {
+ if (event->keyval == GDK_KEY_Page_Up &&
+ (event->state & GDK_CONTROL_MASK)) {
term_scroll(inst->term, 0, -1);
return TRUE;
}
- if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(inst->term, 0, +inst->cfg.height/2);
+ if (event->keyval == GDK_KEY_Page_Down &&
+ (event->state & GDK_SHIFT_MASK)) {
+ term_scroll(inst->term, 0, +inst->height/2);
return TRUE;
}
- if (event->keyval == GDK_Page_Down && (event->state & GDK_CONTROL_MASK)) {
+ if (event->keyval == GDK_KEY_Page_Down &&
+ (event->state & GDK_CONTROL_MASK)) {
term_scroll(inst->term, 0, +1);
return TRUE;
}
/*
* Neither does Shift-Ins.
*/
- if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) {
+ if (event->keyval == GDK_KEY_Insert &&
+ (event->state & GDK_SHIFT_MASK)) {
request_paste(inst);
return TRUE;
}
special = FALSE;
use_ucsoutput = FALSE;
+ nethack_mode = conf_get_int(inst->conf, CONF_nethack_keypad);
+ app_keypad_mode = (inst->term->app_keypad_keys &&
+ !conf_get_int(inst->conf, CONF_no_applic_k));
+
/* ALT+things gives leading Escape. */
output[0] = '\033';
#if !GTK_CHECK_VERSION(2,0,0)
output_charset = CS_ISO8859_1;
strncpy(output+1, event->string, lenof(output)-1);
#else
+ /*
+ * Most things can now be passed to
+ * gtk_im_context_filter_keypress without breaking anything
+ * below this point. An exception is the numeric keypad if
+ * we're in Nethack or application mode: the IM will eat
+ * numeric keypad presses if Num Lock is on, but we don't want
+ * it to.
+ */
+ if (app_keypad_mode &&
+ (event->keyval == GDK_KEY_Num_Lock ||
+ event->keyval == GDK_KEY_KP_Divide ||
+ event->keyval == GDK_KEY_KP_Multiply ||
+ event->keyval == GDK_KEY_KP_Subtract ||
+ event->keyval == GDK_KEY_KP_Add ||
+ event->keyval == GDK_KEY_KP_Enter ||
+ event->keyval == GDK_KEY_KP_0 ||
+ event->keyval == GDK_KEY_KP_Insert ||
+ event->keyval == GDK_KEY_KP_1 ||
+ event->keyval == GDK_KEY_KP_End ||
+ event->keyval == GDK_KEY_KP_2 ||
+ event->keyval == GDK_KEY_KP_Down ||
+ event->keyval == GDK_KEY_KP_3 ||
+ event->keyval == GDK_KEY_KP_Page_Down ||
+ event->keyval == GDK_KEY_KP_4 ||
+ event->keyval == GDK_KEY_KP_Left ||
+ event->keyval == GDK_KEY_KP_5 ||
+ event->keyval == GDK_KEY_KP_Begin ||
+ event->keyval == GDK_KEY_KP_6 ||
+ event->keyval == GDK_KEY_KP_Right ||
+ event->keyval == GDK_KEY_KP_7 ||
+ event->keyval == GDK_KEY_KP_Home ||
+ event->keyval == GDK_KEY_KP_8 ||
+ event->keyval == GDK_KEY_KP_Up ||
+ event->keyval == GDK_KEY_KP_9 ||
+ event->keyval == GDK_KEY_KP_Page_Up ||
+ event->keyval == GDK_KEY_KP_Decimal ||
+ event->keyval == GDK_KEY_KP_Delete)) {
+ /* app keypad; do nothing */
+ } else if (nethack_mode &&
+ (event->keyval == GDK_KEY_KP_1 ||
+ event->keyval == GDK_KEY_KP_End ||
+ event->keyval == GDK_KEY_KP_2 ||
+ event->keyval == GDK_KEY_KP_Down ||
+ event->keyval == GDK_KEY_KP_3 ||
+ event->keyval == GDK_KEY_KP_Page_Down ||
+ event->keyval == GDK_KEY_KP_4 ||
+ event->keyval == GDK_KEY_KP_Left ||
+ event->keyval == GDK_KEY_KP_5 ||
+ event->keyval == GDK_KEY_KP_Begin ||
+ event->keyval == GDK_KEY_KP_6 ||
+ event->keyval == GDK_KEY_KP_Right ||
+ event->keyval == GDK_KEY_KP_7 ||
+ event->keyval == GDK_KEY_KP_Home ||
+ event->keyval == GDK_KEY_KP_8 ||
+ event->keyval == GDK_KEY_KP_Up ||
+ event->keyval == GDK_KEY_KP_9 ||
+ event->keyval == GDK_KEY_KP_Page_Up)) {
+ /* nethack mode; do nothing */
+ } else {
+ if (gtk_im_context_filter_keypress(inst->imc, event))
+ return TRUE;
+ }
+
/*
* GDK 2.0 arranges to have done some translation for us: in
* GDK 2.0, event->string is encoded in the current locale.
*
- * (However, it's also deprecated; we really ought to be
- * using a GTKIMContext.)
- *
* So we use the standard C library function mbstowcs() to
* convert from the current locale into Unicode; from there
* we can convert to whatever PuTTY is currently working in.
*/
output_charset = CS_UTF8;
{
- wchar_t widedata[32], *wp;
+ wchar_t widedata[32];
+ const wchar_t *wp;
int wlen;
int ulen;
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) {
+ 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 */
+ 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. */
+ }
+
/* Control-Break sends a Break special to the backend */
- if (event->keyval == GDK_Break &&
+ if (event->keyval == GDK_KEY_Break &&
(event->state & GDK_CONTROL_MASK)) {
if (inst->back)
inst->back->special(inst->backhandle, TS_BRK);
/* We handle Return ourselves, because it needs to be flagged as
* special to ldisc. */
- if (event->keyval == GDK_Return) {
+ if (event->keyval == GDK_KEY_Return) {
output[1] = '\015';
use_ucsoutput = FALSE;
end = 2;
}
/* We don't let GTK tell us what Backspace is! We know better. */
- if (event->keyval == GDK_BackSpace &&
+ if (event->keyval == GDK_KEY_BackSpace &&
!(event->state & GDK_SHIFT_MASK)) {
- output[1] = inst->cfg.bksp_is_delete ? '\x7F' : '\x08';
+ output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ?
+ '\x7F' : '\x08';
use_ucsoutput = FALSE;
end = 2;
special = TRUE;
}
/* For Shift Backspace, do opposite of what is configured. */
- if (event->keyval == GDK_BackSpace &&
+ if (event->keyval == GDK_KEY_BackSpace &&
(event->state & GDK_SHIFT_MASK)) {
- output[1] = inst->cfg.bksp_is_delete ? '\x08' : '\x7F';
+ output[1] = conf_get_int(inst->conf, CONF_bksp_is_delete) ?
+ '\x08' : '\x7F';
use_ucsoutput = FALSE;
end = 2;
special = TRUE;
}
/* Shift-Tab is ESC [ Z */
- if (event->keyval == GDK_ISO_Left_Tab ||
- (event->keyval == GDK_Tab && (event->state & GDK_SHIFT_MASK))) {
+ if (event->keyval == GDK_KEY_ISO_Left_Tab ||
+ (event->keyval == GDK_KEY_Tab &&
+ (event->state & GDK_SHIFT_MASK))) {
end = 1 + sprintf(output+1, "\033[Z");
use_ucsoutput = FALSE;
}
/* And normal Tab is Tab, if the keymap hasn't already told us.
* (Curiously, at least one version of the MacOS 10.5 X server
* doesn't translate Tab for us. */
- if (event->keyval == GDK_Tab && end <= 1) {
+ if (event->keyval == GDK_KEY_Tab && end <= 1) {
output[1] = '\t';
end = 2;
}
/*
* NetHack keypad mode.
*/
- if (inst->cfg.nethack_keypad) {
- char *keys = NULL;
+ if (nethack_mode) {
+ const char *keys = NULL;
switch (event->keyval) {
- case GDK_KP_1: case GDK_KP_End: keys = "bB\002"; break;
- case GDK_KP_2: case GDK_KP_Down: keys = "jJ\012"; break;
- case GDK_KP_3: case GDK_KP_Page_Down: keys = "nN\016"; break;
- case GDK_KP_4: case GDK_KP_Left: keys = "hH\010"; break;
- case GDK_KP_5: case GDK_KP_Begin: keys = "..."; break;
- case GDK_KP_6: case GDK_KP_Right: keys = "lL\014"; break;
- case GDK_KP_7: case GDK_KP_Home: keys = "yY\031"; break;
- case GDK_KP_8: case GDK_KP_Up: keys = "kK\013"; break;
- case GDK_KP_9: case GDK_KP_Page_Up: keys = "uU\025"; break;
+ case GDK_KEY_KP_1: case GDK_KEY_KP_End:
+ keys = "bB\002"; break;
+ case GDK_KEY_KP_2: case GDK_KEY_KP_Down:
+ keys = "jJ\012"; break;
+ case GDK_KEY_KP_3: case GDK_KEY_KP_Page_Down:
+ keys = "nN\016"; break;
+ case GDK_KEY_KP_4: case GDK_KEY_KP_Left:
+ keys = "hH\010"; break;
+ case GDK_KEY_KP_5: case GDK_KEY_KP_Begin:
+ keys = "..."; break;
+ case GDK_KEY_KP_6: case GDK_KEY_KP_Right:
+ keys = "lL\014"; break;
+ case GDK_KEY_KP_7: case GDK_KEY_KP_Home:
+ keys = "yY\031"; break;
+ case GDK_KEY_KP_8: case GDK_KEY_KP_Up:
+ keys = "kK\013"; break;
+ case GDK_KEY_KP_9: case GDK_KEY_KP_Page_Up:
+ keys = "uU\025"; break;
}
if (keys) {
end = 2;
/*
* Application keypad mode.
*/
- if (inst->term->app_keypad_keys && !inst->cfg.no_applic_k) {
+ if (app_keypad_mode) {
int xkey = 0;
switch (event->keyval) {
- case GDK_Num_Lock: xkey = 'P'; break;
- case GDK_KP_Divide: xkey = 'Q'; break;
- case GDK_KP_Multiply: xkey = 'R'; break;
- case GDK_KP_Subtract: xkey = 'S'; break;
+ case GDK_KEY_Num_Lock: xkey = 'P'; break;
+ case GDK_KEY_KP_Divide: xkey = 'Q'; break;
+ case GDK_KEY_KP_Multiply: xkey = 'R'; break;
+ case GDK_KEY_KP_Subtract: xkey = 'S'; break;
/*
* Keypad + is tricky. It covers a space that would
* be taken up on the VT100 by _two_ keys; so we
* let Shift select between the two. Worse still,
* in xterm function key mode we change which two...
*/
- case GDK_KP_Add:
- if (inst->cfg.funky_type == FUNKY_XTERM) {
+ case GDK_KEY_KP_Add:
+ if (conf_get_int(inst->conf, CONF_funky_type) == FUNKY_XTERM) {
if (event->state & GDK_SHIFT_MASK)
xkey = 'l';
else
else
xkey = 'l';
break;
- case GDK_KP_Enter: xkey = 'M'; break;
- case GDK_KP_0: case GDK_KP_Insert: xkey = 'p'; break;
- case GDK_KP_1: case GDK_KP_End: xkey = 'q'; break;
- case GDK_KP_2: case GDK_KP_Down: xkey = 'r'; break;
- case GDK_KP_3: case GDK_KP_Page_Down: xkey = 's'; break;
- case GDK_KP_4: case GDK_KP_Left: xkey = 't'; break;
- case GDK_KP_5: case GDK_KP_Begin: xkey = 'u'; break;
- case GDK_KP_6: case GDK_KP_Right: xkey = 'v'; break;
- case GDK_KP_7: case GDK_KP_Home: xkey = 'w'; break;
- case GDK_KP_8: case GDK_KP_Up: xkey = 'x'; break;
- case GDK_KP_9: case GDK_KP_Page_Up: xkey = 'y'; break;
- case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break;
+ case GDK_KEY_KP_Enter: xkey = 'M'; break;
+ case GDK_KEY_KP_0: case GDK_KEY_KP_Insert: xkey = 'p'; break;
+ case GDK_KEY_KP_1: case GDK_KEY_KP_End: xkey = 'q'; break;
+ case GDK_KEY_KP_2: case GDK_KEY_KP_Down: xkey = 'r'; break;
+ case GDK_KEY_KP_3: case GDK_KEY_KP_Page_Down: xkey = 's'; break;
+ case GDK_KEY_KP_4: case GDK_KEY_KP_Left: xkey = 't'; break;
+ case GDK_KEY_KP_5: case GDK_KEY_KP_Begin: xkey = 'u'; break;
+ case GDK_KEY_KP_6: case GDK_KEY_KP_Right: xkey = 'v'; break;
+ case GDK_KEY_KP_7: case GDK_KEY_KP_Home: xkey = 'w'; break;
+ case GDK_KEY_KP_8: case GDK_KEY_KP_Up: xkey = 'x'; break;
+ case GDK_KEY_KP_9: case GDK_KEY_KP_Page_Up: xkey = 'y'; break;
+ case GDK_KEY_KP_Decimal: case GDK_KEY_KP_Delete:
+ xkey = 'n'; break;
}
if (xkey) {
if (inst->term->vt52_mode) {
*/
{
int code = 0;
+ int funky_type = conf_get_int(inst->conf, CONF_funky_type);
switch (event->keyval) {
- case GDK_F1:
+ case GDK_KEY_F1:
code = (event->state & GDK_SHIFT_MASK ? 23 : 11);
break;
- case GDK_F2:
+ case GDK_KEY_F2:
code = (event->state & GDK_SHIFT_MASK ? 24 : 12);
break;
- case GDK_F3:
+ case GDK_KEY_F3:
code = (event->state & GDK_SHIFT_MASK ? 25 : 13);
break;
- case GDK_F4:
+ case GDK_KEY_F4:
code = (event->state & GDK_SHIFT_MASK ? 26 : 14);
break;
- case GDK_F5:
+ case GDK_KEY_F5:
code = (event->state & GDK_SHIFT_MASK ? 28 : 15);
break;
- case GDK_F6:
+ case GDK_KEY_F6:
code = (event->state & GDK_SHIFT_MASK ? 29 : 17);
break;
- case GDK_F7:
+ case GDK_KEY_F7:
code = (event->state & GDK_SHIFT_MASK ? 31 : 18);
break;
- case GDK_F8:
+ case GDK_KEY_F8:
code = (event->state & GDK_SHIFT_MASK ? 32 : 19);
break;
- case GDK_F9:
+ case GDK_KEY_F9:
code = (event->state & GDK_SHIFT_MASK ? 33 : 20);
break;
- case GDK_F10:
+ case GDK_KEY_F10:
code = (event->state & GDK_SHIFT_MASK ? 34 : 21);
break;
- case GDK_F11:
+ case GDK_KEY_F11:
code = 23;
break;
- case GDK_F12:
+ case GDK_KEY_F12:
code = 24;
break;
- case GDK_F13:
+ case GDK_KEY_F13:
code = 25;
break;
- case GDK_F14:
+ case GDK_KEY_F14:
code = 26;
break;
- case GDK_F15:
+ case GDK_KEY_F15:
code = 28;
break;
- case GDK_F16:
+ case GDK_KEY_F16:
code = 29;
break;
- case GDK_F17:
+ case GDK_KEY_F17:
code = 31;
break;
- case GDK_F18:
+ case GDK_KEY_F18:
code = 32;
break;
- case GDK_F19:
+ case GDK_KEY_F19:
code = 33;
break;
- case GDK_F20:
+ case GDK_KEY_F20:
code = 34;
break;
}
if (!(event->state & GDK_CONTROL_MASK)) switch (event->keyval) {
- case GDK_Home: case GDK_KP_Home:
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
code = 1;
break;
- case GDK_Insert: case GDK_KP_Insert:
+ case GDK_KEY_Insert: case GDK_KEY_KP_Insert:
code = 2;
break;
- case GDK_Delete: case GDK_KP_Delete:
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
code = 3;
break;
- case GDK_End: case GDK_KP_End:
+ case GDK_KEY_End: case GDK_KEY_KP_End:
code = 4;
break;
- case GDK_Page_Up: case GDK_KP_Page_Up:
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
code = 5;
break;
- case GDK_Page_Down: case GDK_KP_Page_Down:
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
code = 6;
break;
}
/* Reorder edit keys to physical order */
- if (inst->cfg.funky_type == FUNKY_VT400 && code <= 6)
+ if (funky_type == FUNKY_VT400 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
if (inst->term->vt52_mode && code > 0 && code <= 6) {
goto done;
}
- if (inst->cfg.funky_type == FUNKY_SCO && /* SCO function keys */
+ if (funky_type == FUNKY_SCO && /* SCO function keys */
code >= 11 && code <= 34) {
char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
int index = 0;
switch (event->keyval) {
- case GDK_F1: index = 0; break;
- case GDK_F2: index = 1; break;
- case GDK_F3: index = 2; break;
- case GDK_F4: index = 3; break;
- case GDK_F5: index = 4; break;
- case GDK_F6: index = 5; break;
- case GDK_F7: index = 6; break;
- case GDK_F8: index = 7; break;
- case GDK_F9: index = 8; break;
- case GDK_F10: index = 9; break;
- case GDK_F11: index = 10; break;
- case GDK_F12: index = 11; break;
+ case GDK_KEY_F1: index = 0; break;
+ case GDK_KEY_F2: index = 1; break;
+ case GDK_KEY_F3: index = 2; break;
+ case GDK_KEY_F4: index = 3; break;
+ case GDK_KEY_F5: index = 4; break;
+ case GDK_KEY_F6: index = 5; break;
+ case GDK_KEY_F7: index = 6; break;
+ case GDK_KEY_F8: index = 7; break;
+ case GDK_KEY_F9: index = 8; break;
+ case GDK_KEY_F10: index = 9; break;
+ case GDK_KEY_F11: index = 10; break;
+ case GDK_KEY_F12: index = 11; break;
}
if (event->state & GDK_SHIFT_MASK) index += 12;
if (event->state & GDK_CONTROL_MASK) index += 24;
use_ucsoutput = FALSE;
goto done;
}
- if (inst->cfg.funky_type == FUNKY_SCO && /* SCO small keypad */
+ if (funky_type == FUNKY_SCO && /* SCO small keypad */
code >= 1 && code <= 6) {
char codes[] = "HL.FIG";
if (code == 3) {
use_ucsoutput = FALSE;
goto done;
}
- if ((inst->term->vt52_mode || inst->cfg.funky_type == FUNKY_VT100P) &&
+ if ((inst->term->vt52_mode || funky_type == FUNKY_VT100P) &&
code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
use_ucsoutput = FALSE;
goto done;
}
- if (inst->cfg.funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
+ if (funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11);
use_ucsoutput = FALSE;
goto done;
}
- if (inst->cfg.funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
+ if (funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
if (inst->term->vt52_mode)
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
use_ucsoutput = FALSE;
goto done;
}
- if (inst->cfg.rxvt_homeend && (code == 1 || code == 4)) {
+ if ((code == 1 || code == 4) &&
+ conf_get_int(inst->conf, CONF_rxvt_homeend)) {
end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw");
use_ucsoutput = FALSE;
goto done;
{
int xkey = 0;
switch (event->keyval) {
- case GDK_Up: case GDK_KP_Up: xkey = 'A'; break;
- case GDK_Down: case GDK_KP_Down: xkey = 'B'; break;
- case GDK_Right: case GDK_KP_Right: xkey = 'C'; break;
- case GDK_Left: case GDK_KP_Left: xkey = 'D'; break;
- case GDK_Begin: case GDK_KP_Begin: xkey = 'G'; break;
+ case GDK_KEY_Up: case GDK_KEY_KP_Up: xkey = 'A'; break;
+ case GDK_KEY_Down: case GDK_KEY_KP_Down: xkey = 'B'; break;
+ case GDK_KEY_Right: case GDK_KEY_KP_Right: xkey = 'C'; break;
+ case GDK_KEY_Left: case GDK_KEY_KP_Left: xkey = 'D'; break;
+ case GDK_KEY_Begin: case GDK_KEY_KP_Begin: xkey = 'G'; break;
}
if (xkey) {
end = 1 + format_arrow_key(output+1, inst->term, xkey,
return TRUE;
}
+#if GTK_CHECK_VERSION(2,0,0)
+void input_method_commit_event(GtkIMContext *imc, gchar *str, gpointer data)
+{
+ struct gui_data *inst = (struct gui_data *)data;
+ if (inst->ldisc)
+ lpage_send(inst->ldisc, CS_UTF8, str, strlen(str), 1);
+ show_mouseptr(inst, 0);
+ term_seen_key_event(inst->term);
+}
+#endif
+
gboolean button_internal(struct gui_data *inst, guint32 timestamp,
GdkEventType type, guint ebutton, guint state,
gdouble ex, gdouble ey)
{
- int shift, ctrl, alt, x, y, button, act;
+ int shift, ctrl, alt, x, y, button, act, raw_mouse_mode;
/* Remember the timestamp. */
inst->input_event_time = timestamp;
show_mouseptr(inst, 1);
- if (ebutton == 4 && type == GDK_BUTTON_PRESS) {
- term_scroll(inst->term, 0, -5);
- return TRUE;
- }
- if (ebutton == 5 && type == GDK_BUTTON_PRESS) {
- term_scroll(inst->term, 0, +5);
- return TRUE;
- }
-
shift = state & GDK_SHIFT_MASK;
ctrl = state & GDK_CONTROL_MASK;
alt = state & GDK_MOD1_MASK;
+ raw_mouse_mode =
+ send_raw_mouse && !(shift && conf_get_int(inst->conf,
+ CONF_mouse_override));
+
+ if (!raw_mouse_mode) {
+ if (ebutton == 4 && type == GDK_BUTTON_PRESS) {
+ term_scroll(inst->term, 0, -5);
+ return TRUE;
+ }
+ if (ebutton == 5 && type == GDK_BUTTON_PRESS) {
+ term_scroll(inst->term, 0, +5);
+ return TRUE;
+ }
+ }
+
if (ebutton == 3 && ctrl) {
gtk_menu_popup(GTK_MENU(inst->menu), NULL, NULL, NULL, NULL,
ebutton, timestamp);
button = MBT_MIDDLE;
else if (ebutton == 3)
button = MBT_RIGHT;
+ else if (ebutton == 4)
+ button = MBT_WHEEL_UP;
+ else if (ebutton == 5)
+ button = MBT_WHEEL_DOWN;
else
return FALSE; /* don't even know what button! */
default: return FALSE; /* don't know this event type */
}
- if (send_raw_mouse && !(inst->cfg.mouse_override && shift) &&
- act != MA_CLICK && act != MA_RELEASE)
+ if (raw_mouse_mode && act != MA_CLICK && act != MA_RELEASE)
return TRUE; /* we ignore these in raw mouse mode */
- x = (ex - inst->cfg.window_border) / inst->font_width;
- y = (ey - inst->cfg.window_border) / inst->font_height;
+ x = (ex - inst->window_border) / inst->font_width;
+ y = (ey - inst->window_border) / inst->font_height;
term_mouse(inst->term, button, translate_button(button), act,
x, y, shift, ctrl, alt);
else
return FALSE; /* don't even know what button! */
- x = (event->x - inst->cfg.window_border) / inst->font_width;
- y = (event->y - inst->cfg.window_border) / inst->font_height;
+ x = (event->x - inst->window_border) / inst->font_width;
+ y = (event->y - inst->window_border) / inst->font_height;
term_mouse(inst->term, button, translate_button(button), MA_DRAG,
x, y, shift, ctrl, alt);
* any keypress.
*/
if (inst->exited)
- exit(0);
+ cleanup_exit(0);
}
-static gint idle_exit_func(gpointer data)
+static void exit_callback(void *vinst)
{
- struct gui_data *inst = (struct gui_data *)data;
- int exitcode;
+ struct gui_data *inst = (struct gui_data *)vinst;
+ int exitcode, close_on_exit;
if (!inst->exited &&
(exitcode = inst->back->exitcode(inst->backhandle)) >= 0) {
inst->exited = TRUE;
- if (inst->cfg.close_on_exit == FORCE_ON ||
- (inst->cfg.close_on_exit == AUTO && exitcode == 0))
+ close_on_exit = conf_get_int(inst->conf, CONF_close_on_exit);
+ if (close_on_exit == FORCE_ON ||
+ (close_on_exit == AUTO && exitcode == 0))
gtk_main_quit(); /* just go */
if (inst->ldisc) {
ldisc_free(inst->ldisc);
inst->ldisc = NULL;
}
- if (inst->back) {
- inst->back->free(inst->backhandle);
- inst->backhandle = NULL;
- inst->back = NULL;
- term_provide_resize_fn(inst->term, NULL, NULL);
- update_specials_menu(inst);
- }
+ inst->back->free(inst->backhandle);
+ inst->backhandle = NULL;
+ inst->back = NULL;
+ term_provide_resize_fn(inst->term, NULL, NULL);
+ update_specials_menu(inst);
gtk_widget_set_sensitive(inst->restartitem, TRUE);
}
+}
- gtk_idle_remove(inst->term_exit_idle_id);
- return TRUE;
+/*
+ * 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;
- inst->term_exit_idle_id = gtk_idle_add(idle_exit_func, inst);
+ 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)
{
- long now = GPOINTER_TO_LONG(data);
- long next;
+ unsigned long now = GPOINTER_TO_LONG(data);
+ unsigned long next, then;
long ticks;
- if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- timer_id = gtk_timeout_add(ticks > 0 ? ticks : 1, timer_trigger,
- LONG_TO_GPOINTER(next));
+ /*
+ * Destroy the timer we got here on.
+ */
+ if (timer_id) {
+ g_source_remove(timer_id);
+ timer_id = 0;
}
/*
- * Never let a timer resume. If we need another one, we've
- * asked for it explicitly above.
+ * 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(long next)
+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)
if (condition & GDK_INPUT_WRITE)
select_result(sourcefd, 2);
}
+#endif
void destroy(GtkWidget *widget, gpointer data)
{
void set_raw_mouse_mode(void *frontend, int activate)
{
struct gui_data *inst = (struct gui_data *)frontend;
- activate = activate && !inst->cfg.no_mouse_rep;
+ activate = activate && !conf_get_int(inst->conf, CONF_no_mouse_rep);
send_raw_mouse = activate;
update_mouseptr(inst);
}
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;
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);
offset_x = outer.width - inner.width;
offset_y = outer.height - inner.height;
- area_x = inst->font_width * w + 2*inst->cfg.window_border;
- area_y = inst->font_height * h + 2*inst->cfg.window_border;
+ area_x = inst->font_width * w + 2*inst->window_border;
+ area_y = inst->font_height * h + 2*inst->window_border;
/*
* Now we must set the size request on the drawing area back to
* 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
* above.
*/
gtk_container_dequeue_resize_handler(GTK_CONTAINER(inst->window));
- gdk_window_resize(inst->window->window,
+ 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 && inst->area->window)
- gdk_window_set_background(inst->area->window, &inst->cols[258]);
- if (inst->window && inst->window->window)
- gdk_window_set_background(inst->window->window, &inst->cols[258]);
+ if (inst->area && 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))
+ set_gdk_window_background(gtk_widget_get_window(inst->window),
+ &inst->cols[258]);
}
void palette_set(void *frontend, int n, int r, int g, int b)
struct gui_data *inst = (struct gui_data *)frontend;
if (n >= 16)
n += 256 - 16;
- if (n > NALLCOLOURS)
+ if (n >= NALLCOLOURS)
return;
real_palette_set(inst, n, r, g, b);
if (n == 258) {
void palette_reset(void *frontend)
{
struct gui_data *inst = (struct gui_data *)frontend;
- /* This maps colour indices in inst->cfg to those used in inst->cols. */
+ /* This maps colour indices in inst->conf to those used in inst->cols. */
static const int ww[] = {
256, 257, 258, 259, 260, 261,
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 = inst->cfg.colours[i][0] * 0x0101;
- inst->cols[ww[i]].green = inst->cfg.colours[i][1] * 0x0101;
- inst->cols[ww[i]].blue = inst->cfg.colours[i][2] * 0x0101;
+ inst->cols[ww[i]].red =
+ conf_get_int_int(inst->conf, CONF_colours, i*3+0) * 0x0101;
+ inst->cols[ww[i]].green =
+ conf_get_int_int(inst->conf, CONF_colours, i*3+1) * 0x0101;
+ inst->cols[ww[i]].blue =
+ conf_get_int_int(inst->conf, CONF_colours, i*3+2) * 0x0101;
}
for (i = 0; i < NEXTCOLOURS; i++) {
}
}
- 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, inst->cfg.colours[i][0],
- inst->cfg.colours[i][1], inst->cfg.colours[i][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. */
set_window_background(inst);
- if (inst->area && inst->area->window) {
+ if (inst->area && gtk_widget_get_window(inst->area)) {
draw_backing_rect(inst);
gtk_widget_queue_draw(inst->area);
}
*/
void init_cutbuffers()
{
+#ifndef NOT_X_WINDOWS
unsigned char empty[] = "";
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, empty, 0);
- XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),
+ XChangeProperty(disp, GDK_ROOT_WINDOW(),
XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);
+#endif
}
/* Store the data in a cut-buffer. */
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.
*/
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;
}
return ptr;
+#else
+ return NULL;
+#endif
}
void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_deselect)
* if we aren't in direct-to-font mode using the D800 hack.
*/
if (!inst->direct_to_font) {
- wchar_t *tmp = data;
+ const wchar_t *tmp = data;
int tmplen = len;
+#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);
inst->pasteout_data_utf8_len = len*6;
/*
* Now let Xlib convert our UTF-8 data into compound text.
*/
+#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);
inst->pasteout_data_ctext_len = tp.nitems;
XFree(tp.value);
- } else {
+ } else
+#endif
+ {
inst->pasteout_data_ctext = NULL;
inst->pasteout_data_ctext_len = 0;
}
guint info, guint time_stamp, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
- if (seldata->target == utf8_string_atom)
- gtk_selection_data_set(seldata, seldata->target, 8,
- (unsigned char *)inst->pasteout_data_utf8,
+ GdkAtom target = gtk_selection_data_get_target(seldata);
+ if (target == utf8_string_atom)
+ gtk_selection_data_set(seldata, target, 8,
+ (unsigned char *)inst->pasteout_data_utf8,
inst->pasteout_data_utf8_len);
- else if (seldata->target == compound_text_atom)
- gtk_selection_data_set(seldata, seldata->target, 8,
- (unsigned char *)inst->pasteout_data_ctext,
+ else if (target == compound_text_atom)
+ gtk_selection_data_set(seldata, target, 8,
+ (unsigned char *)inst->pasteout_data_ctext,
inst->pasteout_data_ctext_len);
else
- gtk_selection_data_set(seldata, seldata->target, 8,
- (unsigned char *)inst->pasteout_data,
+ gtk_selection_data_set(seldata, target, 8,
+ (unsigned char *)inst->pasteout_data,
inst->pasteout_data_len);
}
guint time, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
- XTextProperty tp;
- char **list;
char *text;
- int length, count, ret;
+ int length;
+#ifndef NOT_X_WINDOWS
+ char **list;
int free_list_required = 0;
int free_required = 0;
+#endif
int charset;
+ GdkAtom seldata_target = gtk_selection_data_get_target(seldata);
+ GdkAtom seldata_type = gtk_selection_data_get_data_type(seldata);
+ const guchar *seldata_data = gtk_selection_data_get_data(seldata);
+ gint seldata_length = gtk_selection_data_get_length(seldata);
- if (seldata->target == utf8_string_atom && seldata->length <= 0) {
+ if (seldata_target == utf8_string_atom && seldata_length <= 0) {
/*
* Failed to get a UTF-8 selection string. Try compound
* text next.
return;
}
- if (seldata->target == compound_text_atom && seldata->length <= 0) {
+ if (seldata_target == compound_text_atom && seldata_length <= 0) {
/*
* Failed to get UTF-8 or compound text. Try an ordinary
* string.
* If we have data, but it's not of a type we can deal with,
* we have to ignore the data.
*/
- if (seldata->length > 0 &&
- seldata->type != GDK_SELECTION_TYPE_STRING &&
- seldata->type != compound_text_atom &&
- seldata->type != utf8_string_atom)
+ if (seldata_length > 0 &&
+ seldata_type != GDK_SELECTION_TYPE_STRING &&
+ seldata_type != compound_text_atom &&
+ seldata_type != utf8_string_atom)
return;
/*
* If we have no data, try looking in a cut buffer.
*/
- if (seldata->length <= 0) {
+ if (seldata_length <= 0) {
+#ifndef NOT_X_WINDOWS
text = retrieve_cutbuffer(&length);
if (length == 0)
return;
* source, so use that as a de-facto standard. */
charset = CS_ISO8859_1;
free_required = 1;
+#else
+ return;
+#endif
} else {
/*
* Convert COMPOUND_TEXT into UTF-8.
*/
- if (seldata->type == compound_text_atom) {
- tp.value = seldata->data;
- tp.encoding = (Atom) seldata->type;
- tp.format = seldata->format;
- tp.nitems = seldata->length;
- ret = Xutf8TextPropertyToTextList(GDK_DISPLAY(), &tp,
- &list, &count);
- if (ret != 0 || count != 1) {
+ if (seldata_type == compound_text_atom) {
+#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(disp, &tp, &list, &count);
+ if (ret == 0 && count == 1) {
+ text = list[0];
+ length = strlen(list[0]);
+ charset = CS_UTF8;
+ free_list_required = 1;
+ } else
+#endif
+ {
/*
* Compound text failed; fall back to STRING.
*/
inst->input_event_time);
return;
}
- text = list[0];
- length = strlen(list[0]);
- charset = CS_UTF8;
- free_list_required = 1;
} else {
- text = (char *)seldata->data;
- length = seldata->length;
- charset = (seldata->type == utf8_string_atom ?
+ text = (char *)seldata_data;
+ length = seldata_length;
+ charset = (seldata_type == utf8_string_atom ?
CS_UTF8 : inst->ucsdata.line_codepage);
}
}
term_do_paste(inst->term);
- if (term_paste_pending(inst->term))
- inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
-
+#ifndef NOT_X_WINDOWS
if (free_list_required)
XFreeStringList(list);
if (free_required)
XFree(text);
+#endif
}
-gint idle_paste_func(gpointer data)
-{
- struct gui_data *inst = (struct gui_data *)data;
-
- if (term_paste_pending(inst->term))
- term_paste(inst->term);
- else
- gtk_idle_remove(inst->term_paste_idle_id);
-
- return TRUE;
-}
-
-
void get_clip(void *frontend, wchar_t ** p, int *len)
{
struct gui_data *inst = (struct gui_data *)frontend;
* is life.
*/
gtk_window_set_title(GTK_WINDOW(inst->window), inst->wintitle);
- if (!inst->cfg.win_name_always)
- gdk_window_set_icon_name(inst->window->window, inst->icontitle);
+ if (!conf_get_int(inst->conf, CONF_win_name_always))
+ gdk_window_set_icon_name(gtk_widget_get_window(inst->window),
+ inst->icontitle);
}
void set_title(void *frontend, char *title)
{
struct gui_data *inst = (struct gui_data *)frontend;
- strncpy(inst->wintitle, title, lenof(inst->wintitle));
- inst->wintitle[lenof(inst->wintitle)-1] = '\0';
+ sfree(inst->wintitle);
+ inst->wintitle = dupstr(title);
set_window_titles(inst);
}
void set_icon(void *frontend, char *title)
{
struct gui_data *inst = (struct gui_data *)frontend;
- strncpy(inst->icontitle, title, lenof(inst->icontitle));
- inst->icontitle[lenof(inst->icontitle)-1] = '\0';
+ sfree(inst->icontitle);
+ inst->icontitle = dupstr(title);
+ set_window_titles(inst);
+}
+
+void set_title_and_icon(void *frontend, char *title, char *icon)
+{
+ struct gui_data *inst = (struct gui_data *)frontend;
+ sfree(inst->wintitle);
+ inst->wintitle = dupstr(title);
+ sfree(inst->icontitle);
+ inst->icontitle = dupstr(icon);
set_window_titles(inst);
}
void set_sbar(void *frontend, int total, int start, int page)
{
struct gui_data *inst = (struct gui_data *)frontend;
- if (!inst->cfg.scrollbar)
+ if (!conf_get_int(inst->conf, CONF_scrollbar))
return;
- inst->sbar_adjust->lower = 0;
- inst->sbar_adjust->upper = total;
- inst->sbar_adjust->value = start;
- inst->sbar_adjust->page_size = page;
- inst->sbar_adjust->step_increment = 1;
- inst->sbar_adjust->page_increment = page/2;
+ gtk_adjustment_set_lower(inst->sbar_adjust, 0);
+ gtk_adjustment_set_upper(inst->sbar_adjust, total);
+ gtk_adjustment_set_value(inst->sbar_adjust, start);
+ gtk_adjustment_set_page_size(inst->sbar_adjust, page);
+ gtk_adjustment_set_step_increment(inst->sbar_adjust, 1);
+ gtk_adjustment_set_page_increment(inst->sbar_adjust, page/2);
inst->ignore_sbar = TRUE;
gtk_adjustment_changed(inst->sbar_adjust);
inst->ignore_sbar = FALSE;
{
struct gui_data *inst = (struct gui_data *)data;
- if (!inst->cfg.scrollbar)
+ if (!conf_get_int(inst->conf, CONF_scrollbar))
return;
if (!inst->ignore_sbar)
- term_scroll(inst->term, 1, (int)adj->value);
+ term_scroll(inst->term, 1, (int)gtk_adjustment_get_value(adj));
}
void sys_cursor(void *frontend, int x, int y)
{
struct gui_data *inst = (struct gui_data *)frontend;
struct draw_ctx *dctx;
+ GdkWindow *target;
- if (!inst->area->window)
+ 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->gc = gdk_gc_new(inst->area->window);
+ dctx->uctx.type = inst->drawtype;
+#ifdef DRAW_TEXT_GDK
+ if (dctx->uctx.type == DRAWTYPE_GDK) {
+ dctx->uctx.u.gdk.target = target;
+ 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);
+ cairo_setup_dctx(dctx);
+ }
+#endif
return dctx;
}
{
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)
+{
+#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 (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);
+ }
+#endif
+#endif
+}
+
+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);
+ 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);
+ free_ctx(dctx);
+}
+
/*
* Draw a line of text in the window, at given character
* coordinates, in given attributes.
{
struct draw_ctx *dctx = (struct draw_ctx *)ctx;
struct gui_data *inst = dctx->inst;
- GdkGC *gc = dctx->gc;
int ncombining, combining;
int nfg, nbg, t, fontid, shadow, rlen, widefactor, bold;
- int monochrome = gtk_widget_get_visual(inst->area)->depth == 1;
+ int monochrome =
+ gdk_visual_get_depth(gtk_widget_get_visual(inst->area)) == 1;
if (attr & TATTR_COMBINING) {
ncombining = len;
nfg = nbg;
nbg = t;
}
- if (inst->cfg.bold_colour && (attr & ATTR_BOLD)) {
+ if ((inst->bold_style & 2) && (attr & ATTR_BOLD)) {
if (nfg < 16) nfg |= 8;
else if (nfg >= 256) nfg |= 1;
}
- if (inst->cfg.bold_colour && (attr & ATTR_BLINK)) {
+ if ((inst->bold_style & 2) && (attr & ATTR_BLINK)) {
if (nbg < 16) nbg |= 8;
else if (nbg >= 256) nbg |= 1;
}
widefactor = 1;
}
- if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) {
+ if ((attr & ATTR_BOLD) && (inst->bold_style & 1)) {
bold = 1;
fontid |= 1;
} else {
} 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->cfg.window_border;
- r.y = y*inst->font_height+inst->cfg.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->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border,
- rlen*widefactor*inst->font_width, inst->font_height);
-
- gdk_gc_set_foreground(gc, &inst->cols[nfg]);
- {
- gchar *gcs;
-
- /*
- * FIXME: this length is hardwired on the assumption that
- * conversions from wide to multibyte characters will
- * never generate more than 10 bytes for a single wide
- * character.
- */
- gcs = snewn(len*10+1, gchar);
-
- for (combining = 0; combining < ncombining; combining++) {
- int mblen = wc_to_mb(inst->fonts[fontid]->real_charset, 0,
- text + combining, len, gcs, len*10+1, ".",
- NULL, NULL);
- unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid],
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
- gcs, mblen, widefactor > 1, bold, inst->font_width);
- }
-
- sfree(gcs);
+ 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);
+ for (combining = 0; combining < ncombining; combining++) {
+ 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,
+ bold, inst->font_width);
}
if (attr & ATTR_UNDER) {
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->cfg.window_border,
- y*inst->font_height + uheight + inst->cfg.window_border,
- (x+len)*widefactor*inst->font_width-1+inst->cfg.window_border,
- y*inst->font_height + uheight + inst->cfg.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->cfg.window_border + 2*i,
- y*inst->font_height+inst->cfg.window_border,
- x*inst->font_width+inst->cfg.window_border + 2*i+1,
- y*inst->font_height+inst->cfg.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->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border+dt*i+db,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.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));
}
}
{
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);
len *= 2;
}
- gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.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,
{
struct draw_ctx *dctx = (struct draw_ctx *)ctx;
struct gui_data *inst = dctx->inst;
- GdkGC *gc = dctx->gc;
int active, passive, widefactor;
passive = 1;
} else
passive = 0;
- if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) {
+ if ((attr & TATTR_ACTCURS) && inst->cursor_type != 0) {
attr &= ~TATTR_ACTCURS;
active = 1;
} else
len *= 2;
}
- if (inst->cfg.cursor_type == 0) {
+ if (inst->cursor_type == 0) {
/*
* An active block cursor will already have been done by
* the above do_text call, so we only need to do anything
* 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->cfg.window_border,
- y*inst->font_height+inst->cfg.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;
else
char_width = inst->font_width;
- if (inst->cfg.cursor_type == 1) {
+ if (inst->cursor_type == 1) {
uheight = inst->fonts[0]->ascent + 1;
if (uheight >= inst->font_height)
uheight = inst->font_height - 1;
- startx = x * inst->font_width + inst->cfg.window_border;
- starty = y * inst->font_height + inst->cfg.window_border + uheight;
+ startx = x * inst->font_width + inst->window_border;
+ starty = y * inst->font_height + inst->window_border + uheight;
dx = 1;
dy = 0;
length = len * widefactor * char_width;
int xadjust = 0;
if (attr & TATTR_RIGHTCURS)
xadjust = char_width - 1;
- startx = x * inst->font_width + inst->cfg.window_border + xadjust;
- starty = y * inst->font_height + inst->cfg.window_border;
+ startx = x * inst->font_width + inst->window_border + xadjust;
+ starty = y * inst->font_height + inst->window_border;
dx = 0;
dy = 1;
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(inst->area->window, gc, inst->pixmap,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.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)
+ {
+ GdkRectangle cursorrect;
+ cursorrect.x = x*inst->font_width+inst->window_border;
+ cursorrect.y = y*inst->font_height+inst->window_border;
+ cursorrect.width = len*widefactor*inst->font_width;
+ cursorrect.height = inst->font_height;
+ gtk_im_context_set_cursor_location(inst->imc, &cursorrect);
+ }
+#endif
}
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(char *p, ...)
+void modalfatalbox(const char *p, ...)
{
va_list ap;
fprintf(stderr, "FATAL ERROR: ");
exit(1);
}
-void cmdline_error(char *p, ...)
+void cmdline_error(const char *p, ...)
{
va_list ap;
fprintf(stderr, "%s: ", appname);
exit(1);
}
-char *get_x_display(void *frontend)
+const char *get_x_display(void *frontend)
{
return gdk_get_display();
}
+#ifndef NOT_X_WINDOWS
long get_windowid(void *frontend)
{
struct gui_data *inst = (struct gui_data *)frontend;
- return (long)GDK_WINDOW_XWINDOW(inst->area->window);
+ return (long)GDK_WINDOW_XID(gtk_widget_get_window(inst->area));
}
+#endif
static void help(FILE *fp) {
if(fprintf(fp,
}
}
+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, Config *cfg)
+ struct gui_data *inst, Conf *conf)
{
int err = 0;
char *val;
#define SECOND_PASS_ONLY { if (!do_everything) continue; }
while (--argc > 0) {
- char *p = *++argv;
+ const char *p = *++argv;
int ret;
/*
p = "-title";
ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
- do_everything ? 1 : -1, cfg);
+ do_everything ? 1 : -1, conf);
if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", p);
}
if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
+ FontSpec *fs;
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg->font.name, val, sizeof(cfg->font.name));
- cfg->font.name[sizeof(cfg->font.name)-1] = '\0';
+ 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;
- strncpy(cfg->boldfont.name, val, sizeof(cfg->boldfont.name));
- cfg->boldfont.name[sizeof(cfg->boldfont.name)-1] = '\0';
+ 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;
- strncpy(cfg->widefont.name, val, sizeof(cfg->widefont.name));
- cfg->widefont.name[sizeof(cfg->widefont.name)-1] = '\0';
+ 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;
- strncpy(cfg->wideboldfont.name, val, sizeof(cfg->wideboldfont.name));
- cfg->wideboldfont.name[sizeof(cfg->wideboldfont.name)-1] = '\0';
+ fs = fontspec_new(val);
+ conf_set_fontspec(conf, CONF_wideboldfont, fs);
+ fontspec_free(fs);
} else if (!strcmp(p, "-cs")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg->line_codepage, val, sizeof(cfg->line_codepage));
- cfg->line_codepage[sizeof(cfg->line_codepage)-1] = '\0';
+ conf_set_str(conf, CONF_line_codepage, val);
} 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)
- cfg->width = (int)w;
- if (flags & HeightValue)
- cfg->height = (int)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
} else if (!strcmp(p, "-sl")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- cfg->savelines = atoi(val);
+ 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") ? 4 :
!strcmp(p, "-cbg") ? 5 : -1);
assert(index != -1);
- cfg->colours[index][0] = col.red / 256;
- cfg->colours[index][1] = col.green / 256;
- cfg->colours[index][2] = col.blue / 256;
+ 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);
}
} else if (use_pty_argv && !strcmp(p, "-e")) {
} else if (!strcmp(p, "-title")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg->wintitle, val, sizeof(cfg->wintitle));
- cfg->wintitle[sizeof(cfg->wintitle)-1] = '\0';
+ conf_set_str(conf, CONF_wintitle, val);
} else if (!strcmp(p, "-log")) {
+ Filename *fn;
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg->logfilename.path, val, sizeof(cfg->logfilename.path));
- cfg->logfilename.path[sizeof(cfg->logfilename.path)-1] = '\0';
- cfg->logtype = LGTYP_DEBUG;
+ 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;
- cfg->stamp_utmp = 0;
+ conf_set_int(conf, CONF_stamp_utmp, 0);
} else if (!strcmp(p, "-ut")) {
SECOND_PASS_ONLY;
- cfg->stamp_utmp = 1;
+ conf_set_int(conf, CONF_stamp_utmp, 1);
} else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) {
SECOND_PASS_ONLY;
- cfg->login_shell = 0;
+ conf_set_int(conf, CONF_login_shell, 0);
} else if (!strcmp(p, "-ls")) {
SECOND_PASS_ONLY;
- cfg->login_shell = 1;
+ conf_set_int(conf, CONF_login_shell, 1);
} else if (!strcmp(p, "-nethack")) {
SECOND_PASS_ONLY;
- cfg->nethack_keypad = 1;
+ conf_set_int(conf, CONF_nethack_keypad, 1);
} else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) {
SECOND_PASS_ONLY;
- cfg->scrollbar = 0;
+ conf_set_int(conf, CONF_scrollbar, 0);
} else if (!strcmp(p, "-sb")) {
SECOND_PASS_ONLY;
- cfg->scrollbar = 0;
+ conf_set_int(conf, CONF_scrollbar, 1);
} else if (!strcmp(p, "-name")) {
EXPECTS_ARG;
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, cfg,
+ process_nonoption_arg(p, conf,
allow_launch))) {
/* do nothing */
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(int id) {
- gdk_input_remove(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 setup_fonts_ucs(struct gui_data *inst)
+char *setup_fonts_ucs(struct gui_data *inst)
{
- if (inst->fonts[0])
- unifont_destroy(inst->fonts[0]);
- if (inst->fonts[1])
- unifont_destroy(inst->fonts[1]);
- if (inst->fonts[2])
- unifont_destroy(inst->fonts[2]);
- if (inst->fonts[3])
- unifont_destroy(inst->fonts[3]);
+ int shadowbold = conf_get_int(inst->conf, CONF_shadowbold);
+ int shadowboldoffset = conf_get_int(inst->conf, CONF_shadowboldoffset);
+ FontSpec *fs;
+ unifont *fonts[4];
+ int i;
- inst->fonts[0] = unifont_create(inst->area, inst->cfg.font.name,
- FALSE, FALSE,
- inst->cfg.shadowboldoffset,
- inst->cfg.shadowbold);
- if (!inst->fonts[0]) {
- fprintf(stderr, "%s: unable to load font \"%s\"\n", appname,
- inst->cfg.font.name);
- exit(1);
+ fs = conf_get_fontspec(inst->conf, CONF_font);
+ fonts[0] = multifont_create(inst->area, fs->name, FALSE, FALSE,
+ shadowboldoffset, shadowbold);
+ if (!fonts[0]) {
+ return dupprintf("unable to load font \"%s\"", fs->name);
}
- if (inst->cfg.shadowbold || !inst->cfg.boldfont.name[0]) {
- inst->fonts[1] = NULL;
+ fs = conf_get_fontspec(inst->conf, CONF_boldfont);
+ if (shadowbold || !fs->name[0]) {
+ fonts[1] = NULL;
} else {
- inst->fonts[1] = unifont_create(inst->area, inst->cfg.boldfont.name,
- FALSE, TRUE,
- inst->cfg.shadowboldoffset,
- inst->cfg.shadowbold);
- if (!inst->fonts[1]) {
- fprintf(stderr, "%s: unable to load bold font \"%s\"\n", appname,
- inst->cfg.boldfont.name);
- exit(1);
+ fonts[1] = multifont_create(inst->area, fs->name, FALSE, TRUE,
+ shadowboldoffset, shadowbold);
+ if (!fonts[1]) {
+ if (fonts[0])
+ unifont_destroy(fonts[0]);
+ return dupprintf("unable to load bold font \"%s\"", fs->name);
}
}
- if (inst->cfg.widefont.name[0]) {
- inst->fonts[2] = unifont_create(inst->area, inst->cfg.widefont.name,
- TRUE, FALSE,
- inst->cfg.shadowboldoffset,
- inst->cfg.shadowbold);
- if (!inst->fonts[2]) {
- fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname,
- inst->cfg.widefont.name);
- exit(1);
+ fs = conf_get_fontspec(inst->conf, CONF_widefont);
+ if (fs->name[0]) {
+ fonts[2] = multifont_create(inst->area, fs->name, TRUE, FALSE,
+ shadowboldoffset, shadowbold);
+ if (!fonts[2]) {
+ for (i = 0; i < 2; i++)
+ if (fonts[i])
+ unifont_destroy(fonts[i]);
+ return dupprintf("unable to load wide font \"%s\"", fs->name);
}
} else {
- inst->fonts[2] = NULL;
+ fonts[2] = NULL;
}
- if (inst->cfg.shadowbold || !inst->cfg.wideboldfont.name[0]) {
- inst->fonts[3] = NULL;
+ fs = conf_get_fontspec(inst->conf, CONF_wideboldfont);
+ if (shadowbold || !fs->name[0]) {
+ fonts[3] = NULL;
} else {
- inst->fonts[3] = unifont_create(inst->area,
- inst->cfg.wideboldfont.name, TRUE,
- TRUE, inst->cfg.shadowboldoffset,
- inst->cfg.shadowbold);
- if (!inst->fonts[3]) {
- fprintf(stderr, "%s: unable to load wide bold font \"%s\"\n", appname,
- inst->cfg.boldfont.name);
- exit(1);
+ fonts[3] = multifont_create(inst->area, fs->name, TRUE, TRUE,
+ shadowboldoffset, shadowbold);
+ if (!fonts[3]) {
+ for (i = 0; i < 3; i++)
+ if (fonts[i])
+ unifont_destroy(fonts[i]);
+ return dupprintf("unable to load wide bold font \"%s\"", fs->name);
}
}
+ /*
+ * Now we've got past all the possible error conditions, we can
+ * actually update our state.
+ */
+
+ for (i = 0; i < 4; i++) {
+ if (inst->fonts[i])
+ unifont_destroy(inst->fonts[i]);
+ inst->fonts[i] = fonts[i];
+ }
+
inst->font_width = inst->fonts[0]->width;
inst->font_height = inst->fonts[0]->height;
- inst->direct_to_font = init_ucs(&inst->ucsdata, inst->cfg.line_codepage,
- inst->cfg.utf8_override,
+ inst->direct_to_font = init_ucs(&inst->ucsdata,
+ conf_get_str(inst->conf, CONF_line_codepage),
+ conf_get_int(inst->conf, CONF_utf8_override),
inst->fonts[0]->public_charset,
- inst->cfg.vtmode);
+ conf_get_int(inst->conf, CONF_vtmode));
+
+ inst->drawtype = inst->fonts[0]->preferred_drawtype;
+
+ return NULL;
}
void set_geom_hints(struct gui_data *inst)
{
GdkGeometry geom;
- geom.min_width = inst->font_width + 2*inst->cfg.window_border;
- geom.min_height = inst->font_height + 2*inst->cfg.window_border;
+ 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->cfg.window_border;
- geom.base_height = 2*inst->cfg.window_border;
+ 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;
struct gui_data *inst = (struct gui_data *)data;
term_pwron(inst->term, TRUE);
if (inst->ldisc)
- ldisc_send(inst->ldisc, NULL, 0, 0);
+ ldisc_echoedit_update(inst->ldisc);
}
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);
void change_settings_menuitem(GtkMenuItem *item, gpointer data)
{
- /* This maps colour indices in inst->cfg to those used in inst->cols. */
+ /* This maps colour indices in inst->conf to those used in inst->cols. */
static const int ww[] = {
256, 257, 258, 259, 260, 261,
0, 8, 1, 9, 2, 10, 3, 11,
4, 12, 5, 13, 6, 14, 7, 15
};
struct gui_data *inst = (struct gui_data *)data;
- char *title = dupcat(appname, " Reconfiguration", NULL);
- Config cfg2, oldcfg;
- int i, need_size;
+ char *title;
+ Conf *oldconf, *newconf;
+ int i, j, need_size;
assert(lenof(ww) == NCFGCOLOURS);
else
inst->reconfiguring = TRUE;
- cfg2 = inst->cfg; /* structure copy */
+ title = dupcat(appname, " Reconfiguration", NULL);
- if (do_config_box(title, &cfg2, 1,
- inst->back?inst->back->cfg_info(inst->backhandle):0)) {
+ oldconf = inst->conf;
+ newconf = conf_copy(inst->conf);
- oldcfg = inst->cfg; /* structure copy */
- inst->cfg = cfg2; /* structure copy */
+ if (do_config_box(title, newconf, 1,
+ inst->back?inst->back->cfg_info(inst->backhandle):0)) {
+ inst->conf = newconf;
/* Pass new config data to the logging module */
- log_reconfig(inst->logctx, &cfg2);
+ log_reconfig(inst->logctx, inst->conf);
/*
* Flush the line discipline's edit buffer in the case
* where local editing has just been disabled.
*/
- if (inst->ldisc)
- ldisc_send(inst->ldisc, NULL, 0, 0);
+ if (inst->ldisc) {
+ ldisc_configure(inst->ldisc, inst->conf);
+ ldisc_echoedit_update(inst->ldisc);
+ }
/* Pass new config data to the terminal */
- term_reconfig(inst->term, &cfg2);
+ term_reconfig(inst->term, inst->conf);
/* Pass new config data to the back end */
if (inst->back)
- inst->back->reconfig(inst->backhandle, &cfg2);
+ inst->back->reconfig(inst->backhandle, inst->conf);
+
+ cache_conf_values(inst);
/*
- * Just setting inst->cfg is sufficient to cause colour
+ * Just setting inst->conf is sufficient to cause colour
* setting changes to appear on the next ESC]R palette
* reset. But we should also check whether any colour
- * settings have been changed, and revert the ones that
- * have to the new default, on the assumption that the user
- * is most likely to want an immediate update.
+ * settings have been changed, and revert the ones that have
+ * to the new default, on the assumption that the user is
+ * most likely to want an immediate update.
*/
for (i = 0; i < NCFGCOLOURS; i++) {
- if (oldcfg.colours[i][0] != cfg2.colours[i][0] ||
- oldcfg.colours[i][1] != cfg2.colours[i][1] ||
- oldcfg.colours[i][2] != cfg2.colours[i][2]) {
- real_palette_set(inst, ww[i], cfg2.colours[i][0],
- cfg2.colours[i][1],
- cfg2.colours[i][2]);
+ for (j = 0; j < 3; j++)
+ if (conf_get_int_int(oldconf, CONF_colours, i*3+j) !=
+ conf_get_int_int(newconf, CONF_colours, i*3+j))
+ break;
+ if (j < 3) {
+ real_palette_set(inst, ww[i],
+ conf_get_int_int(newconf,CONF_colours,i*3+0),
+ conf_get_int_int(newconf,CONF_colours,i*3+1),
+ conf_get_int_int(newconf,CONF_colours,i*3+2));
/*
* If the default background has changed, we must
* repaint the space in between the window border
* and the text area.
*/
- if (i == 258) {
+ if (ww[i] == 258) {
set_window_background(inst);
draw_backing_rect(inst);
}
* If the scrollbar needs to be shown, hidden, or moved
* from one end to the other of the window, do so now.
*/
- if (oldcfg.scrollbar != cfg2.scrollbar) {
- if (cfg2.scrollbar)
+ 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);
}
- if (oldcfg.scrollbar_on_left != cfg2.scrollbar_on_left) {
+ if (conf_get_int(oldconf, CONF_scrollbar_on_left) !=
+ conf_get_int(newconf, CONF_scrollbar_on_left)) {
gtk_box_reorder_child(inst->hbox, inst->sbar,
- cfg2.scrollbar_on_left ? 0 : 1);
+ conf_get_int(newconf, CONF_scrollbar_on_left)
+ ? 0 : 1);
}
/*
* Change the window title, if required.
*/
- if (strcmp(oldcfg.wintitle, cfg2.wintitle))
- set_title(inst, cfg2.wintitle);
+ if (strcmp(conf_get_str(oldconf, CONF_wintitle),
+ conf_get_str(newconf, CONF_wintitle)))
+ set_title(inst, conf_get_str(newconf, CONF_wintitle));
set_window_titles(inst);
/*
* Redo the whole tangled fonts and Unicode mess if
* necessary.
*/
- if (strcmp(oldcfg.font.name, cfg2.font.name) ||
- strcmp(oldcfg.boldfont.name, cfg2.boldfont.name) ||
- strcmp(oldcfg.widefont.name, cfg2.widefont.name) ||
- strcmp(oldcfg.wideboldfont.name, cfg2.wideboldfont.name) ||
- strcmp(oldcfg.line_codepage, cfg2.line_codepage) ||
- oldcfg.vtmode != cfg2.vtmode ||
- oldcfg.shadowbold != cfg2.shadowbold) {
- setup_fonts_ucs(inst);
- need_size = 1;
- } else
- need_size = 0;
+ 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,
+ conf_get_fontspec(newconf, CONF_boldfont)->name) ||
+ strcmp(conf_get_fontspec(oldconf, CONF_widefont)->name,
+ conf_get_fontspec(newconf, CONF_widefont)->name) ||
+ strcmp(conf_get_fontspec(oldconf, CONF_wideboldfont)->name,
+ conf_get_fontspec(newconf, CONF_wideboldfont)->name) ||
+ strcmp(conf_get_str(oldconf, CONF_line_codepage),
+ conf_get_str(newconf, CONF_line_codepage)) ||
+ conf_get_int(oldconf, CONF_utf8_override) !=
+ conf_get_int(newconf, CONF_utf8_override) ||
+ conf_get_int(oldconf, CONF_vtmode) !=
+ conf_get_int(newconf, CONF_vtmode) ||
+ conf_get_int(oldconf, CONF_shadowbold) !=
+ conf_get_int(newconf, CONF_shadowbold) ||
+ conf_get_int(oldconf, CONF_shadowboldoffset) !=
+ conf_get_int(newconf, CONF_shadowboldoffset)) {
+ char *errmsg = setup_fonts_ucs(inst);
+ if (errmsg) {
+ char *msgboxtext =
+ dupprintf("Could not change fonts in terminal window: %s\n",
+ errmsg);
+ messagebox(inst->window, "Font setup error", msgboxtext,
+ string_width("Could not change fonts in terminal window:"),
+ "OK", 'o', +1, 1,
+ NULL);
+ sfree(msgboxtext);
+ sfree(errmsg);
+ } else {
+ need_size = TRUE;
+ }
+ }
/*
* Resize the window.
*/
- if (oldcfg.width != cfg2.width || oldcfg.height != cfg2.height ||
- oldcfg.window_border != cfg2.window_border || need_size) {
+ if (conf_get_int(oldconf, CONF_width) !=
+ conf_get_int(newconf, CONF_width) ||
+ conf_get_int(oldconf, CONF_height) !=
+ conf_get_int(newconf, CONF_height) ||
+ conf_get_int(oldconf, CONF_window_border) !=
+ conf_get_int(newconf, CONF_window_border) ||
+ need_size) {
set_geom_hints(inst);
- request_resize(inst, cfg2.width, cfg2.height);
+ request_resize(inst, conf_get_int(newconf, CONF_width),
+ conf_get_int(newconf, CONF_height));
} else {
/*
* The above will have caused a call to term_size() for
* happened and we will need an explicit term_size()
* here.
*/
- if (oldcfg.savelines != cfg2.savelines)
+ if (conf_get_int(oldconf, CONF_savelines) !=
+ conf_get_int(newconf, CONF_savelines))
term_size(inst->term, inst->term->rows, inst->term->cols,
- cfg2.savelines);
+ conf_get_int(newconf, CONF_savelines));
}
term_invalidate(inst->term);
* border has been redrawn as well as the text area.
*/
gtk_widget_queue_draw(inst->area);
+
+ conf_free(oldconf);
+ } else {
+ conf_free(newconf);
}
sfree(title);
inst->reconfiguring = FALSE;
pid = fork();
if (pid < 0) {
perror("fork");
+ sfree(args);
return;
}
} else {
int status;
+ sfree(args);
waitpid(pid, &status, 0);
}
{
struct gui_data *inst = (struct gui_data *)gdata;
/*
- * For this feature we must marshal cfg and (possibly) pty_argv
+ * 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, size;
+ int i, ret, sersize, size;
char *data;
char option[80];
int pipefd[2];
return;
}
- size = sizeof(inst->cfg);
+ 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);
- memcpy(data, &inst->cfg, sizeof(inst->cfg));
+ conf_serialise(inst->conf, data);
if (use_pty_argv && pty_argv) {
- int p = sizeof(inst->cfg);
+ int p = sersize;
for (i = 0; pty_argv[i]; i++) {
strcpy(data + p, pty_argv[i]);
p += strlen(pty_argv[i]) + 1;
}
sprintf(option, "---[%d,%d]", pipefd[0], size);
- fcntl(pipefd[0], F_SETFD, 0);
+ noncloexec(pipefd[0]);
fork_and_exec_self(inst, pipefd[1], option, NULL);
close(pipefd[0]);
sfree(data);
}
-int read_dupsession_data(struct gui_data *inst, Config *cfg, char *arg)
+int read_dupsession_data(struct gui_data *inst, Conf *conf, char *arg)
{
- int fd, i, ret, size;
+ int fd, i, ret, size, size_used;
char *data;
if (sscanf(arg, "---[%d,%d]", &fd, &size) != 2) {
exit(1);
}
- memcpy(cfg, data, sizeof(Config));
- if (use_pty_argv && size > sizeof(Config)) {
+ size_used = conf_deserialise(conf, data, size);
+ if (use_pty_argv && size > size_used) {
int n = 0;
- i = sizeof(Config);
+ i = size_used;
while (i < size) {
while (i < size && data[i]) i++;
if (i >= size) {
pty_argv = snewn(n+1, char *);
pty_argv[n] = NULL;
n = 0;
- i = sizeof(Config);
+ i = size_used;
while (i < size) {
char *p = data + i;
while (i < size && data[i]) i++;
}
}
+ sfree(data);
+
return 0;
}
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);
}
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 =
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);
- iconpm = gdk_pixmap_create_from_xpm_d(window->window, &iconmask,
- NULL, (gchar **)icon[0]);
- gdk_window_set_icon(window->window, NULL, iconpm, iconmask);
+#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;
gdk_pixbuf_new_from_xpm_data((const gchar **)
icon[n]));
}
- gdk_window_set_icon_list(window->window, iconlist);
+ gtk_window_set_icon_list(GTK_WINDOW(window), iconlist);
#endif
}
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) {
static void start_backend(struct gui_data *inst)
{
- extern Backend *select_backend(Config *cfg);
+ extern Backend *select_backend(Conf *conf);
char *realhost;
const char *error;
+ char *s;
- inst->back = select_backend(&inst->cfg);
+ inst->back = select_backend(inst->conf);
error = inst->back->init((void *)inst, &inst->backhandle,
- &inst->cfg, inst->cfg.host, inst->cfg.port,
- &realhost, inst->cfg.tcp_nodelay,
- inst->cfg.tcp_keepalives);
+ inst->conf,
+ conf_get_str(inst->conf, CONF_host),
+ conf_get_int(inst->conf, CONF_port),
+ &realhost,
+ conf_get_int(inst->conf, CONF_tcp_nodelay),
+ conf_get_int(inst->conf, CONF_tcp_keepalives));
if (error) {
char *msg = dupprintf("Unable to open connection to %s:\n%s",
- inst->cfg.host, error);
+ conf_get_str(inst->conf, CONF_host), error);
inst->exited = TRUE;
fatal_message_box(inst->window, msg);
sfree(msg);
exit(0);
}
- if (inst->cfg.wintitle[0]) {
- set_title(inst, inst->cfg.wintitle);
- set_icon(inst, inst->cfg.wintitle);
+ s = conf_get_str(inst->conf, CONF_wintitle);
+ if (s[0]) {
+ set_title_and_icon(inst, s, s);
} else {
char *title = make_default_wintitle(realhost);
- set_title(inst, title);
- set_icon(inst, title);
+ set_title_and_icon(inst, title, title);
sfree(title);
}
sfree(realhost);
term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
inst->ldisc =
- ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle,
+ ldisc_create(inst->conf, inst->term, inst->back, inst->backhandle,
inst);
gtk_widget_set_sensitive(inst->restartitem, FALSE);
int pt_main(int argc, char **argv)
{
- extern int cfgbox(Config *cfg);
+ 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->wintitle = inst->icontitle = NULL;
+ inst->quit_fn_scheduled = FALSE;
+ inst->idle_fn_scheduled = FALSE;
+ inst->drawtype = DRAWTYPE_DEFAULT;
/* defer any child exit handling until we're ready to deal with
* it */
}
if (argc > 1 && !strncmp(argv[1], "---", 3)) {
- read_dupsession_data(inst, &inst->cfg, argv[1]);
+ read_dupsession_data(inst, inst->conf, argv[1]);
/* Splatter this argument so it doesn't clutter a ps listing */
- memset(argv[1], 0, strlen(argv[1]));
+ 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->cfg))
+ if (do_cmdline(argc, argv, 0, &allow_launch, inst, inst->conf))
exit(1); /* pre-defaults pass to get -class */
- do_defaults(NULL, &inst->cfg);
- if (do_cmdline(argc, argv, 1, &allow_launch, inst, &inst->cfg))
+ 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->cfg);
+ cmdline_run_saved(inst->conf);
if (loaded_session)
allow_launch = TRUE;
- if ((!allow_launch || !cfg_launchable(&inst->cfg)) &&
- !cfgbox(&inst->cfg))
+ if ((!allow_launch || !conf_launchable(inst->conf)) &&
+ !cfgbox(inst->conf))
exit(0); /* config box hit Cancel */
}
inst->area = gtk_drawing_area_new();
- setup_fonts_ucs(inst);
+#if GTK_CHECK_VERSION(2,0,0)
+ inst->imc = gtk_im_multicontext_new();
+#endif
+
+ {
+ char *errmsg = setup_fonts_ucs(inst);
+ if (errmsg) {
+ fprintf(stderr, "%s: %s\n", appname, errmsg);
+ exit(1);
+ }
+ }
init_cutbuffers();
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ {
+ const char *winclass = conf_get_str(inst->conf, CONF_winclass);
+ if (*winclass)
+ gtk_window_set_wmclass(GTK_WINDOW(inst->window),
+ winclass, winclass);
+ }
/*
* Set up the colour map.
*/
palette_reset(inst);
- inst->width = inst->cfg.width;
- inst->height = inst->cfg.height;
+ inst->width = conf_get_int(inst->conf, CONF_width);
+ 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->cfg.width + 2*inst->cfg.window_border,
- inst->font_height * inst->cfg.height + 2*inst->cfg.window_border);
+ {
+ 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
+ }
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));
* unwanted, so we can pop it up quickly if it suddenly becomes
* desirable.
*/
- if (inst->cfg.scrollbar_on_left)
+ if (conf_get_int(inst->conf, CONF_scrollbar_on_left))
gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
gtk_box_pack_start(inst->hbox, inst->area, TRUE, TRUE, 0);
- if (!inst->cfg.scrollbar_on_left)
+ if (!conf_get_int(inst->conf, CONF_scrollbar_on_left))
gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox));
set_geom_hints(inst);
gtk_widget_show(inst->area);
- if (inst->cfg.scrollbar)
+ if (conf_get_int(inst->conf, CONF_scrollbar))
gtk_widget_show(inst->sbar);
else
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;
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)
+ 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);
+ 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)
- 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);
- if (inst->cfg.scrollbar)
- gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed",
- GTK_SIGNAL_FUNC(scrollbar_moved), inst);
+ g_signal_connect(G_OBJECT(inst->imc), "commit",
+ G_CALLBACK(input_method_commit_event), inst);
+#endif
+ if (conf_get_int(inst->conf, CONF_scrollbar))
+ 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 |
inst->menu = gtk_menu_new();
-#define MKMENUITEM(title, func) do { \
- menuitem = title ? gtk_menu_item_new_with_label(title) : \
- gtk_menu_item_new(); \
- gtk_container_add(GTK_CONTAINER(inst->menu), menuitem); \
- gtk_widget_show(menuitem); \
- if (func != NULL) \
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate", \
- GTK_SIGNAL_FUNC(func), inst); \
-} while (0)
+#define MKMENUITEM(title, func) do \
+ { \
+ menuitem = gtk_menu_item_new_with_label(title); \
+ gtk_container_add(GTK_CONTAINER(inst->menu), menuitem); \
+ gtk_widget_show(menuitem); \
+ g_signal_connect(G_OBJECT(menuitem), "activate", \
+ G_CALLBACK(func), inst); \
+ } while (0)
+
+#define MKSUBMENU(title) do \
+ { \
+ menuitem = gtk_menu_item_new_with_label(title); \
+ gtk_container_add(GTK_CONTAINER(inst->menu), menuitem); \
+ gtk_widget_show(menuitem); \
+ } while (0)
+
+#define MKSEP() do \
+ { \
+ menuitem = gtk_menu_item_new(); \
+ gtk_container_add(GTK_CONTAINER(inst->menu), menuitem); \
+ gtk_widget_show(menuitem); \
+ } while (0)
+
if (new_session)
MKMENUITEM("New Session...", new_session_menuitem);
MKMENUITEM("Restart Session", restart_session_menuitem);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
inst->sessionsmenu);
}
- MKMENUITEM(NULL, NULL);
+ MKSEP();
MKMENUITEM("Change Settings...", change_settings_menuitem);
- MKMENUITEM(NULL, NULL);
+ MKSEP();
if (use_event_log)
MKMENUITEM("Event Log", event_log_menuitem);
- MKMENUITEM("Special Commands", NULL);
+ MKSUBMENU("Special Commands");
inst->specialsmenu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), inst->specialsmenu);
inst->specialsitem1 = menuitem;
- MKMENUITEM(NULL, NULL);
+ MKSEP();
inst->specialsitem2 = menuitem;
gtk_widget_hide(inst->specialsitem1);
gtk_widget_hide(inst->specialsitem2);
MKMENUITEM("Clear Scrollback", clear_scrollback_menuitem);
MKMENUITEM("Reset Terminal", reset_terminal_menuitem);
MKMENUITEM("Copy All", copy_all_menuitem);
- MKMENUITEM(NULL, NULL);
+ MKSEP();
s = dupcat("About ", appname, NULL);
MKMENUITEM(s, about_menuitem);
sfree(s);
#undef MKMENUITEM
+#undef MKSUBMENU
+#undef MKSEP
}
inst->textcursor = make_mouse_ptr(inst, GDK_XTERM);
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);
inst->eventlogstuff = eventlogstuff_new();
- inst->term = term_init(&inst->cfg, &inst->ucsdata, inst);
- inst->logctx = log_init(inst, &inst->cfg);
+ 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->cfg.height, inst->cfg.width, inst->cfg.savelines);
+ term_size(inst->term, inst->height, inst->width,
+ conf_get_int(inst->conf, CONF_savelines));
start_backend(inst);
- ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
+ ldisc_echoedit_update(inst->ldisc); /* cause ldisc to notice changes */
/* now we're reday to deal with the child exit handler being
* called */
projects / PuTTY.git / blobdiff