#define CAT(x,y) CAT2(x,y)
#define ASSERT(x) enum {CAT(assertion_,__LINE__) = 1 / (x)}
-#define NCOLOURS (lenof(((Config *)0)->colours))
+/* 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)
GdkAtom compound_text_atom, utf8_string_atom;
extern char **pty_argv; /* declared in pty.c */
extern int use_pty_argv;
+/*
+ * Timers are global across all sessions (even if we were handling
+ * multiple sessions, which we aren't), so the current timer ID is
+ * a global variable.
+ */
+static guint timer_id = 0;
+
struct gui_data {
GtkWidget *window, *area, *sbar;
GtkBox *hbox;
GtkAdjustment *sbar_adjust;
- GtkWidget *menu, *specialsmenu, *specialsitem1, *specialsitem2;
+ GtkWidget *menu, *specialsmenu, *specialsitem1, *specialsitem2,
+ *restartitem;
GtkWidget *sessionsmenu;
GdkPixmap *pixmap;
GdkFont *fonts[4]; /* normal, bold, wide, widebold */
} fontinfo[4];
int xpos, ypos, gotpos, gravity;
GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor;
- GdkColor cols[NCOLOURS];
+ GdkColor cols[NALLCOLOURS];
GdkColormap *colmap;
wchar_t *pastein_data;
int direct_to_font;
static char *app_name = "pterm";
+static void start_backend(struct gui_data *inst);
+
char *x_get_default(const char *key)
{
return XGetDefault(GDK_DISPLAY(), app_name, key);
* in xterm function key mode we change which two...
*/
case GDK_KP_Add:
- if (inst->cfg.funky_type == 2) {
+ if (inst->cfg.funky_type == FUNKY_XTERM) {
if (event->state & GDK_SHIFT_MASK)
xkey = 'l';
else
break;
}
/* Reorder edit keys to physical order */
- if (inst->cfg.funky_type == 3 && code <= 6)
+ if (inst->cfg.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 == 5 && /* SCO function keys */
+ if (inst->cfg.funky_type == FUNKY_SCO && /* SCO function keys */
code >= 11 && code <= 34) {
char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
int index = 0;
use_ucsoutput = FALSE;
goto done;
}
- if (inst->cfg.funky_type == 5 && /* SCO small keypad */
+ if (inst->cfg.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 == 4) &&
+ if ((inst->term->vt52_mode || inst->cfg.funky_type == FUNKY_VT100P) &&
code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
use_ucsoutput = FALSE;
goto done;
}
- if (inst->cfg.funky_type == 1 && code >= 11 && code <= 15) {
+ if (inst->cfg.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 == 2 && code >= 11 && code <= 14) {
+ if (inst->cfg.funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
if (inst->term->vt52_mode)
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
* should never matter.
*/
output[end] = '\0'; /* NUL-terminate */
- ldisc_send(inst->ldisc, output+start, -2, 1);
+ if (inst->ldisc)
+ ldisc_send(inst->ldisc, output+start, -2, 1);
} else if (!inst->direct_to_font) {
if (!use_ucsoutput) {
/*
* far as I can tell, and it's poorly documented
* even in 2.0, so it'll have to wait.
*/
- lpage_send(inst->ldisc, CS_ISO8859_1, output+start,
- end-start, 1);
+ if (inst->ldisc)
+ lpage_send(inst->ldisc, CS_ISO8859_1, output+start,
+ end-start, 1);
} else {
/*
* We generated our own Unicode key data from the
* keysym, so use that instead.
*/
- luni_send(inst->ldisc, ucsoutput+start, end-start, 1);
+ if (inst->ldisc)
+ luni_send(inst->ldisc, ucsoutput+start, end-start, 1);
}
} else {
/*
* In direct-to-font mode, we just send the string
* exactly as we received it.
*/
- ldisc_send(inst->ldisc, output+start, end-start, 1);
+ if (inst->ldisc)
+ ldisc_send(inst->ldisc, output+start, end-start, 1);
}
show_mouseptr(inst, 0);
term_seen_key_event(inst->term);
- term_out(inst->term);
}
return TRUE;
exit(0);
}
-gint timer_func(gpointer data)
+void notify_remote_exit(void *frontend)
{
- struct gui_data *inst = (struct gui_data *)data;
+ struct gui_data *inst = (struct gui_data *)frontend;
int exitcode;
if (!inst->exited &&
if (inst->cfg.close_on_exit == FORCE_ON ||
(inst->cfg.close_on_exit == AUTO && exitcode == 0))
exit(0); /* 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;
+ update_specials_menu(inst);
+ }
+ gtk_widget_show(inst->restartitem);
}
+}
- term_update(inst->term);
- term_blink(inst->term, 0);
- return TRUE;
+static gint timer_trigger(gpointer data)
+{
+ long now = GPOINTER_TO_INT(data);
+ long next;
+ long ticks;
+
+ if (run_timers(now, &next)) {
+ ticks = next - GETTICKCOUNT();
+ timer_id = gtk_timeout_add(ticks > 0 ? ticks : 1, timer_trigger,
+ GINT_TO_POINTER(next));
+ }
+
+ /*
+ * Never let a timer resume. If we need another one, we've
+ * asked for it explicitly above.
+ */
+ return FALSE;
+}
+
+void timer_change_notify(long next)
+{
+ long ticks;
+
+ if (timer_id)
+ gtk_timeout_remove(timer_id);
+
+ ticks = next - GETTICKCOUNT();
+ if (ticks <= 0)
+ ticks = 1; /* just in case */
+
+ timer_id = gtk_timeout_add(ticks, timer_trigger,
+ GINT_TO_POINTER(next));
}
void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
- inst->term->has_focus = event->in;
- term_out(inst->term);
+ term_set_focus(inst->term, event->in);
term_update(inst->term);
show_mouseptr(inst, 1);
return FALSE;
void palette_set(void *frontend, int n, int r, int g, int b)
{
struct gui_data *inst = (struct gui_data *)frontend;
- static const int first[21] = {
- 0, 2, 4, 6, 8, 10, 12, 14,
- 1, 3, 5, 7, 9, 11, 13, 15,
- 16, 17, 18, 20, 22
- };
- real_palette_set(inst, first[n], r, g, b);
- if (first[n] >= 18)
- real_palette_set(inst, first[n] + 1, r, g, b);
- if (first[n] == 18)
+ if (n >= 16)
+ n += 256 - 16;
+ if (n > NALLCOLOURS)
+ return;
+ real_palette_set(inst, n, r, g, b);
+ if (n == 258)
set_window_background(inst);
}
struct gui_data *inst = (struct gui_data *)frontend;
/* This maps colour indices in inst->cfg to those used in inst->cols. */
static const int ww[] = {
- 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21,
- 0, 1, 2, 3, 4, 5
+ 256, 257, 258, 259, 260, 261,
+ 0, 8, 1, 9, 2, 10, 3, 11,
+ 4, 12, 5, 13, 6, 14, 7, 15
};
- gboolean success[NCOLOURS];
+ gboolean success[NALLCOLOURS];
int i;
- assert(lenof(ww) == NCOLOURS);
+ assert(lenof(ww) == NCFGCOLOURS);
if (!inst->colmap) {
inst->colmap = gdk_colormap_get_system();
} else {
- gdk_colormap_free_colors(inst->colmap, inst->cols, NCOLOURS);
+ gdk_colormap_free_colors(inst->colmap, inst->cols, NALLCOLOURS);
}
- for (i = 0; i < NCOLOURS; i++) {
- inst->cols[i].red = inst->cfg.colours[ww[i]][0] * 0x0101;
- inst->cols[i].green = inst->cfg.colours[ww[i]][1] * 0x0101;
- inst->cols[i].blue = inst->cfg.colours[ww[i]][2] * 0x0101;
+ 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;
+ }
+
+ for (i = 0; i < NEXTCOLOURS; i++) {
+ if (i < 216) {
+ int r = i / 36, g = (i / 6) % 6, b = i % 6;
+ inst->cols[i+16].red = r * 0x3333;
+ inst->cols[i+16].green = g * 0x3333;
+ inst->cols[i+16].blue = b * 0x3333;
+ } else {
+ int shade = i - 216;
+ shade = (shade + 1) * 0xFFFF / (NEXTCOLOURS - 216 + 1);
+ inst->cols[i+16].red = inst->cols[i+16].green =
+ inst->cols[i+16].blue = shade;
+ }
}
- gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS,
+ gdk_colormap_alloc_colors(inst->colmap, inst->cols, NALLCOLOURS,
FALSE, FALSE, success);
- for (i = 0; i < NCOLOURS; i++) {
+ 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],
{
char * ptr;
ptr = XFetchBytes(GDK_DISPLAY(), nbytes);
- if (nbytes <= 0 && ptr != 0) {
+ if (*nbytes <= 0 && ptr != 0) {
XFree(ptr);
ptr = 0;
}
memcpy(inst->pasteout_data_ctext, tp.value, tp.nitems);
inst->pasteout_data_ctext_len = tp.nitems;
XFree(tp.value);
- }
+ } else {
+ inst->pasteout_data_ctext = NULL;
+ inst->pasteout_data_ctext_len = 0;
+ }
} else {
inst->pasteout_data_utf8 = NULL;
inst->pasteout_data_utf8_len = 0;
charset = CS_ISO8859_1;
free_required = 1;
} 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) {
- /*
- * Compound text failed; fall back to STRING.
- */
- gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
- GDK_SELECTION_TYPE_STRING,
- inst->input_event_time);
- return;
+ /*
+ * 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) {
+ /*
+ * Compound text failed; fall back to STRING.
+ */
+ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+ GDK_SELECTION_TYPE_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 ?
+ CS_UTF8 : inst->ucsdata.line_codepage);
}
- 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 ?
- CS_UTF8 : inst->ucsdata.line_codepage);
- }
}
if (inst->pastein_data)
*
* We are allowed to fiddle with the contents of `text'.
*/
-void do_text_internal(Context ctx, int x, int y, char *text, int len,
+void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
unsigned long attr, int lattr)
{
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;
+ if (attr & TATTR_COMBINING) {
+ ncombining = len;
+ len = 1;
+ } else
+ ncombining = 1;
+
nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
- nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
- nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
if (attr & ATTR_REVERSE) {
t = nfg;
nfg = nbg;
nbg = t;
}
- if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
- nfg |= 1;
- if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
- nbg |= 1;
+ if (inst->cfg.bold_colour && (attr & ATTR_BOLD)) {
+ if (nfg < 16) nfg |= 8;
+ else if (nfg >= 256) nfg |= 1;
+ }
+ if (inst->cfg.bold_colour && (attr & ATTR_BLINK)) {
+ if (nbg < 16) nbg |= 8;
+ else if (nbg >= 256) nbg |= 1;
+ }
if (attr & TATTR_ACTCURS) {
- nfg = NCOLOURS-2;
- nbg = NCOLOURS-1;
+ nfg = 260;
+ nbg = 261;
}
fontid = shadow = 0;
shadow = 1;
}
- if (lattr != LATTR_NORM) {
+ if ((lattr & LATTR_MODE) != LATTR_NORM) {
x *= 2;
if (x >= inst->term->cols)
return;
wchar_t *wcs;
int i;
- wcs = snewn(len+1, wchar_t);
- for (i = 0; i < len; i++) {
- wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
+ wcs = snewn(len*ncombining+1, wchar_t);
+ for (i = 0; i < len*ncombining; i++) {
+ wcs[i] = text[i];
}
if (inst->fonts[fontid] == NULL) {
* FIXME: when we have a wide-char equivalent of
* from_unicode, use it instead of this.
*/
- for (i = 0; i <= len; i++)
- gwcs[i] = wcs[i];
- gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
- gwcs, len*2);
+ for (combining = 0; combining < ncombining; combining++) {
+ for (i = 0; i <= len; i++)
+ gwcs[i] = wcs[i + combining];
+ gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
+ x*inst->font_width+inst->cfg.window_border,
+ y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+ gwcs, len*2);
+ if (shadow)
+ gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
+ x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset,
+ y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+ gwcs, len*2);
+ }
sfree(gwcs);
} else {
gcs = snewn(len+1, gchar);
- wc_to_mb(inst->fontinfo[fontid].charset, 0,
- wcs, len, gcs, len, ".", NULL, NULL);
- gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
- x*inst->font_width+inst->cfg.window_border,
- y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
- gcs, len);
+ for (combining = 0; combining < ncombining; combining++) {
+ wc_to_mb(inst->fontinfo[fontid].charset, 0,
+ wcs + combining, len, gcs, len, ".", NULL, NULL);
+ gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
+ x*inst->font_width+inst->cfg.window_border,
+ y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+ gcs, len);
+ if (shadow)
+ gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
+ x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset,
+ y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+ gcs, len);
+ }
sfree(gcs);
}
sfree(wcs);
}
- if (shadow) {
- gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
- x*inst->font_width+inst->cfg.window_border + inst->cfg.shadowboldoffset,
- y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
- text, len);
- }
-
if (attr & ATTR_UNDER) {
int uheight = inst->fonts[0]->ascent + 1;
if (uheight >= inst->font_height)
y*inst->font_height + uheight + inst->cfg.window_border);
}
- if (lattr != LATTR_NORM) {
+ 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
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 * inst->font_width - i, inst->font_height);
+ len * widefactor * inst->font_width - i, inst->font_height);
}
len *= 2;
- if (lattr != LATTR_WIDE) {
+ if ((lattr & LATTR_MODE) != LATTR_WIDE) {
int dt, db;
/* Now stretch vertically, in the same way. */
- if (lattr == LATTR_BOT)
+ if ((lattr & LATTR_MODE) == LATTR_BOT)
dt = 0, db = 1;
else
dt = 1, db = 0;
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*widefactor*inst->font_width+inst->cfg.window_border,
+ x*inst->font_width+inst->cfg.window_border,
y*inst->font_height+inst->cfg.window_border+dt*(i+1),
- len * inst->font_width, inst->font_height-i-1);
+ len * widefactor * inst->font_width, inst->font_height-i-1);
}
}
}
}
-void do_text(Context ctx, int x, int y, char *text, int len,
+void do_text(Context ctx, int x, int y, wchar_t *text, int len,
unsigned long attr, int lattr)
{
struct draw_ctx *dctx = (struct draw_ctx *)ctx;
widefactor = 1;
}
- if (lattr != LATTR_NORM) {
+ if ((lattr & LATTR_MODE) != LATTR_NORM) {
x *= 2;
if (x >= inst->term->cols)
return;
len*widefactor*inst->font_width, inst->font_height);
}
-void do_cursor(Context ctx, int x, int y, char *text, int len,
+void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
unsigned long attr, int lattr)
{
struct draw_ctx *dctx = (struct draw_ctx *)ctx;
struct gui_data *inst = dctx->inst;
GdkGC *gc = dctx->gc;
- int passive, widefactor;
+ int active, passive, widefactor;
if (attr & TATTR_PASCURS) {
attr &= ~TATTR_PASCURS;
passive = 0;
if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) {
attr &= ~TATTR_ACTCURS;
- }
+ active = 1;
+ } else
+ active = 0;
do_text_internal(ctx, x, y, text, len, attr, lattr);
+ if (attr & TATTR_COMBINING)
+ len = 1;
+
if (attr & ATTR_WIDE) {
widefactor = 2;
} else {
widefactor = 1;
}
- if (lattr != LATTR_NORM) {
+ if ((lattr & LATTR_MODE) != LATTR_NORM) {
x *= 2;
if (x >= inst->term->cols)
return;
* if it's passive.
*/
if (passive) {
- gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]);
+ 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*inst->font_width-1, inst->font_height-1);
+ len*widefactor*inst->font_width-1, inst->font_height-1);
}
} else {
int uheight;
int char_width;
- if ((attr & ATTR_WIDE) || lattr != LATTR_NORM)
+ if ((attr & ATTR_WIDE) || (lattr & LATTR_MODE) != LATTR_NORM)
char_width = 2*inst->font_width;
else
char_width = inst->font_width;
starty = y * inst->font_height + inst->cfg.window_border + uheight;
dx = 1;
dy = 0;
- length = len * char_width;
+ length = len * widefactor * char_width;
} else {
int xadjust = 0;
if (attr & TATTR_RIGHTCURS)
length = inst->font_height;
}
- gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]);
+ gdk_gc_set_foreground(gc, &inst->cols[NCFGCOLOURS-1]);
if (passive) {
for (i = 0; i < length; i++) {
if (i % 2 == 0) {
startx += dx;
starty += dy;
}
- } else {
+ } else if (active) {
gdk_draw_line(inst->pixmap, gc, 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,
inst->font_width = gdk_char_width(inst->fonts[0], ' ');
inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent;
- inst->direct_to_font = init_ucs(&inst->ucsdata,
- inst->cfg.line_codepage, font_charset,
+ inst->direct_to_font = init_ucs(&inst->ucsdata, inst->cfg.line_codepage,
+ inst->cfg.utf8_override, font_charset,
inst->cfg.vtmode);
}
{
struct gui_data *inst = (struct gui_data *)data;
term_pwron(inst->term);
- ldisc_send(inst->ldisc, NULL, 0, 0);
+ if (inst->ldisc)
+ ldisc_send(inst->ldisc, NULL, 0, 0);
}
void copy_all_menuitem(GtkMenuItem *item, gpointer data)
int code = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item),
"user-data"));
- inst->back->special(inst->backhandle, code);
+ if (inst->back)
+ inst->back->special(inst->backhandle, code);
}
void about_menuitem(GtkMenuItem *item, gpointer data)
{
/* This maps colour indices in inst->cfg to those used in inst->cols. */
static const int ww[] = {
- 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21,
- 0, 1, 2, 3, 4, 5
+ 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;
+ assert(lenof(ww) == NCFGCOLOURS);
+
cfg2 = inst->cfg; /* structure copy */
if (do_config_box(title, &cfg2, 1)) {
* Flush the line discipline's edit buffer in the case
* where local editing has just been disabled.
*/
- ldisc_send(inst->ldisc, NULL, 0, 0);
+ if (inst->ldisc)
+ ldisc_send(inst->ldisc, NULL, 0, 0);
/* Pass new config data to the terminal */
term_reconfig(inst->term, &cfg2);
/* Pass new config data to the back end */
- inst->back->reconfig(inst->backhandle, &cfg2);
+ if (inst->back)
+ inst->back->reconfig(inst->backhandle, &cfg2);
/*
* Just setting inst->cfg is sufficient to cause colour
* have to the new default, on the assumption that the user
* is most likely to want an immediate update.
*/
- for (i = 0; i < NCOLOURS; i++) {
- if (oldcfg.colours[ww[i]][0] != cfg2.colours[ww[i]][0] ||
- oldcfg.colours[ww[i]][1] != cfg2.colours[ww[i]][1] ||
- oldcfg.colours[ww[i]][2] != cfg2.colours[ww[i]][2]) {
- real_palette_set(inst, i, cfg2.colours[ww[i]][0],
- cfg2.colours[ww[i]][1],
- cfg2.colours[ww[i]][2]);
+ 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]);
/*
* If the default background has changed, we must
* repaint the space in between the window border
* and the text area.
*/
- if (i == 18) {
+ if (i == 258) {
set_window_background(inst);
draw_backing_rect(inst);
}
fork_and_exec_self(inst, -1, NULL);
}
+void restart_session_menuitem(GtkMenuItem *item, gpointer data)
+{
+ struct gui_data *inst = (struct gui_data *)data;
+
+ if (!inst->back) {
+ logevent(inst, "----- Session restarted -----");
+ start_backend(inst);
+ inst->exited = FALSE;
+ }
+}
+
void saved_session_menuitem(GtkMenuItem *item, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
const struct telnet_special *specials;
- specials = inst->back->get_specials(inst->backhandle);
+ if (inst->back)
+ specials = inst->back->get_specials(inst->backhandle);
+ else
+ specials = NULL;
+
+ /* I believe this disposes of submenus too. */
gtk_container_foreach(GTK_CONTAINER(inst->specialsmenu),
(GtkCallback)gtk_widget_destroy, NULL);
if (specials) {
int i;
- GtkWidget *menuitem;
- for (i = 0; specials[i].name; i++) {
- if (*specials[i].name) {
+ GtkWidget *menu = inst->specialsmenu;
+ /* A lame "stack" for submenus that will do for now. */
+ GtkWidget *saved_menu = NULL;
+ int nesting = 1;
+ for (i = 0; nesting > 0; i++) {
+ GtkWidget *menuitem = NULL;
+ switch (specials[i].code) {
+ case TS_SUBMENU:
+ assert (nesting < 2);
+ saved_menu = menu; /* XXX lame stacking */
+ menu = gtk_menu_new();
+ menuitem = gtk_menu_item_new_with_label(specials[i].name);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
+ gtk_container_add(GTK_CONTAINER(saved_menu), menuitem);
+ gtk_widget_show(menuitem);
+ menuitem = NULL;
+ nesting++;
+ break;
+ case TS_EXITMENU:
+ nesting--;
+ if (nesting) {
+ menu = saved_menu; /* XXX lame stacking */
+ saved_menu = NULL;
+ }
+ break;
+ case TS_SEP:
+ menuitem = gtk_menu_item_new();
+ 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);
- } else
- menuitem = gtk_menu_item_new();
- gtk_container_add(GTK_CONTAINER(inst->specialsmenu), menuitem);
- gtk_widget_show(menuitem);
+ break;
+ }
+ if (menuitem) {
+ gtk_container_add(GTK_CONTAINER(menu), menuitem);
+ gtk_widget_show(menuitem);
+ }
}
gtk_widget_show(inst->specialsitem1);
gtk_widget_show(inst->specialsitem2);
}
}
-int pt_main(int argc, char **argv)
+static void start_backend(struct gui_data *inst)
{
extern Backend *select_backend(Config *cfg);
+ char *realhost;
+ const char *error;
+
+ inst->back = select_backend(&inst->cfg);
+
+ 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);
+
+ if (error) {
+ char *msg = dupprintf("Unable to open connection to %s:\n%s",
+ inst->cfg.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);
+ } else {
+ char *title = make_default_wintitle(realhost);
+ set_title(inst, title);
+ set_icon(inst, title);
+ sfree(title);
+ }
+ inst->back->provide_logctx(inst->backhandle, inst->logctx);
+
+ term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
+
+ inst->ldisc =
+ ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle,
+ inst);
+
+ gtk_widget_hide(inst->restartitem);
+}
+
+int pt_main(int argc, char **argv)
+{
extern int cfgbox(Config *cfg);
struct gui_data *inst;
if (inst->cfg.scrollbar)
gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed",
GTK_SIGNAL_FUNC(scrollbar_moved), inst);
- gtk_timeout_add(20, timer_func, 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 |
} while (0)
if (new_session)
MKMENUITEM("New Session", new_session_menuitem);
+ MKMENUITEM("Restart Session", restart_session_menuitem);
+ inst->restartitem = menuitem;
+ gtk_widget_hide(inst->restartitem);
MKMENUITEM("Duplicate Session", dup_session_menuitem);
if (saved_sessions) {
struct sesslist sesslist;
inst->specialsitem1 = menuitem;
MKMENUITEM(NULL, NULL);
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);
term_size(inst->term, inst->cfg.height, inst->cfg.width, inst->cfg.savelines);
- inst->back = select_backend(&inst->cfg);
- {
- char *realhost;
- const char *error;
-
- error = inst->back->init((void *)inst, &inst->backhandle,
- &inst->cfg, inst->cfg.host, inst->cfg.port,
- &realhost, inst->cfg.tcp_nodelay);
-
- if (error) {
- char *msg = dupprintf("Unable to open connection to %s:\n%s",
- inst->cfg.host, error);
- inst->exited = TRUE;
- fatal_message_box(inst->window, msg);
- sfree(msg);
- return 0;
- }
-
- if (inst->cfg.wintitle[0]) {
- set_title(inst, inst->cfg.wintitle);
- set_icon(inst, inst->cfg.wintitle);
- } else {
- char *title = make_default_wintitle(realhost);
- set_title(inst, title);
- set_icon(inst, title);
- sfree(title);
- }
- }
- inst->back->provide_logctx(inst->backhandle, inst->logctx);
- update_specials_menu(inst);
+ start_backend(inst);
- term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
-
- inst->ldisc =
- ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle, inst);
ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
/* now we're reday to deal with the child exit handler being
projects / u / mdw / putty / blobdiff