int alt_digits;
char wintitle[sizeof(((Config *)0)->wintitle)];
char icontitle[sizeof(((Config *)0)->wintitle)];
- int master_fd, master_func_id, exited;
+ int master_fd, master_func_id;
void *ldisc;
Backend *back;
void *backhandle;
Terminal *term;
void *logctx;
+ int exited;
+ struct unicode_data ucsdata;
+ Config cfg;
};
struct draw_ctx {
static char *app_name = "pterm";
-char *x_get_default(char *key)
+char *x_get_default(const char *key)
{
return XGetDefault(GDK_DISPLAY(), app_name, key);
}
+/*
+ * Default settings that are specific to pterm.
+ */
+FontSpec platform_default_fontspec(const char *name)
+{
+ FontSpec ret;
+ if (!strcmp(name, "Font"))
+ strcpy(ret.name, "fixed");
+ else
+ *ret.name = '\0';
+ return ret;
+}
+
+Filename platform_default_filename(const char *name)
+{
+ Filename ret;
+ if (!strcmp(name, "LogFileName"))
+ strcpy(ret.path, "putty.log");
+ else
+ *ret.path = '\0';
+ return ret;
+}
+
+char *platform_default_s(const char *name)
+{
+ return NULL;
+}
+
+int platform_default_i(const char *name, int def)
+{
+ if (!strcmp(name, "CloseOnExit"))
+ return 2; /* maps to FORCE_ON after painful rearrangement :-( */
+ return def;
+}
+
void ldisc_update(void *frontend, int echo, int edit)
{
/*
*/
}
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
{
/*
* Logging in an xterm-alike is liable to be something you only
* mouse or a means of faking it, and there is no need to switch
* buttons around at all.
*/
-Mouse_Button translate_button(void *frontend, Mouse_Button button)
+static Mouse_Button translate_button(Mouse_Button button)
{
/* struct gui_data *inst = (struct gui_data *)frontend; */
static void show_mouseptr(struct gui_data *inst, int show)
{
- if (!cfg.hide_mouseptr)
+ if (!inst->cfg.hide_mouseptr)
show = 1;
if (show)
gdk_window_set_cursor(inst->area->window, inst->currcursor);
struct gui_data *inst = (struct gui_data *)data;
int w, h, need_size = 0;
- w = (event->width - 2*cfg.window_border) / inst->font_width;
- h = (event->height - 2*cfg.window_border) / inst->font_height;
+ w = (event->width - 2*inst->cfg.window_border) / inst->font_width;
+ h = (event->height - 2*inst->cfg.window_border) / inst->font_height;
- if (w != cfg.width || h != cfg.height) {
+ if (w != inst->cfg.width || h != inst->cfg.height) {
if (inst->pixmap) {
gdk_pixmap_unref(inst->pixmap);
inst->pixmap = NULL;
}
- cfg.width = w;
- cfg.height = h;
+ inst->cfg.width = w;
+ inst->cfg.height = h;
need_size = 1;
}
if (!inst->pixmap) {
GdkGC *gc;
inst->pixmap = gdk_pixmap_new(widget->window,
- (cfg.width * inst->font_width +
- 2*cfg.window_border),
- (cfg.height * inst->font_height +
- 2*cfg.window_border), -1);
+ (inst->cfg.width * inst->font_width +
+ 2*inst->cfg.window_border),
+ (inst->cfg.height * inst->font_height +
+ 2*inst->cfg.window_border), -1);
gc = gdk_gc_new(inst->area->window);
gdk_gc_set_foreground(gc, &inst->cols[18]); /* default background */
gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0,
- cfg.width * inst->font_width + 2*cfg.window_border,
- cfg.height * inst->font_height + 2*cfg.window_border);
+ 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);
}
if (need_size) {
- term_size(inst->term, h, w, cfg.savelines);
+ term_size(inst->term, h, w, inst->cfg.savelines);
}
return TRUE;
* at all.
*/
if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(inst->term, 0, -cfg.height/2);
+ term_scroll(inst->term, 0, -inst->cfg.height/2);
+ return TRUE;
+ }
+ if (event->keyval == GDK_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, +cfg.height/2);
+ term_scroll(inst->term, 0, +inst->cfg.height/2);
+ return TRUE;
+ }
+ if (event->keyval == GDK_Page_Down && (event->state & GDK_CONTROL_MASK)) {
+ term_scroll(inst->term, 0, +1);
return TRUE;
}
/* We don't let GTK tell us what Backspace is! We know better. */
if (event->keyval == GDK_BackSpace &&
!(event->state & GDK_SHIFT_MASK)) {
- output[1] = cfg.bksp_is_delete ? '\x7F' : '\x08';
+ output[1] = inst->cfg.bksp_is_delete ? '\x7F' : '\x08';
end = 2;
}
/* For Shift Backspace, do opposite of what is configured. */
if (event->keyval == GDK_BackSpace &&
(event->state & GDK_SHIFT_MASK)) {
- output[1] = cfg.bksp_is_delete ? '\x08' : '\x7F';
+ output[1] = inst->cfg.bksp_is_delete ? '\x08' : '\x7F';
end = 2;
}
/*
* NetHack keypad mode.
*/
- if (cfg.nethack_keypad) {
+ if (inst->cfg.nethack_keypad) {
char *keys = NULL;
switch (event->keyval) {
case GDK_KP_1: case GDK_KP_End: keys = "bB"; break;
/*
* Application keypad mode.
*/
- if (inst->term->app_keypad_keys && !cfg.no_applic_k) {
+ if (inst->term->app_keypad_keys && !inst->cfg.no_applic_k) {
int xkey = 0;
switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break;
* in xterm function key mode we change which two...
*/
case GDK_KP_Add:
- if (cfg.funky_type == 2) {
+ if (inst->cfg.funky_type == 2) {
if (event->state & GDK_SHIFT_MASK)
xkey = 'l';
else
break;
}
/* Reorder edit keys to physical order */
- if (cfg.funky_type == 3 && code <= 6)
+ if (inst->cfg.funky_type == 3 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
if (inst->term->vt52_mode && code > 0 && code <= 6) {
goto done;
}
- if (cfg.funky_type == 5 && /* SCO function keys */
+ if (inst->cfg.funky_type == 5 && /* SCO function keys */
code >= 11 && code <= 34) {
char codes[] = "MNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@[\\]^_`{";
int index = 0;
end = 1 + sprintf(output+1, "\x1B[%c", codes[index]);
goto done;
}
- if (cfg.funky_type == 5 && /* SCO small keypad */
+ if (inst->cfg.funky_type == 5 && /* SCO small keypad */
code >= 1 && code <= 6) {
char codes[] = "HL.FIG";
if (code == 3) {
}
goto done;
}
- if ((inst->term->vt52_mode || cfg.funky_type == 4) &&
+ if ((inst->term->vt52_mode || inst->cfg.funky_type == 4) &&
code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
"\x1BO%c", code + 'P' - 11 - offt);
goto done;
}
- if (cfg.funky_type == 1 && code >= 11 && code <= 15) {
+ if (inst->cfg.funky_type == 1 && code >= 11 && code <= 15) {
end = 1 + sprintf(output+1, "\x1B[[%c", code + 'A' - 11);
goto done;
}
- if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
+ if (inst->cfg.funky_type == 2 && code >= 11 && code <= 14) {
if (inst->term->vt52_mode)
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
goto done;
}
- if (cfg.rxvt_homeend && (code == 1 || code == 4)) {
+ if (inst->cfg.rxvt_homeend && (code == 1 || code == 4)) {
end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw");
goto done;
}
default: return FALSE; /* don't know this event type */
}
- if (send_raw_mouse && !(cfg.mouse_override && shift) &&
+ if (send_raw_mouse && !(inst->cfg.mouse_override && shift) &&
act != MA_CLICK && act != MA_RELEASE)
return TRUE; /* we ignore these in raw mouse mode */
- x = (event->x - cfg.window_border) / inst->font_width;
- y = (event->y - cfg.window_border) / inst->font_height;
+ x = (event->x - inst->cfg.window_border) / inst->font_width;
+ y = (event->y - inst->cfg.window_border) / inst->font_height;
- term_mouse(inst->term, button, act, x, y, shift, ctrl, alt);
+ term_mouse(inst->term, button, translate_button(button), act,
+ x, y, shift, ctrl, alt);
return TRUE;
}
else
return FALSE; /* don't even know what button! */
- x = (event->x - cfg.window_border) / inst->font_width;
- y = (event->y - cfg.window_border) / inst->font_height;
+ x = (event->x - inst->cfg.window_border) / inst->font_width;
+ y = (event->y - inst->cfg.window_border) / inst->font_height;
- term_mouse(inst->term, button, MA_DRAG, x, y, shift, ctrl, alt);
+ term_mouse(inst->term, button, translate_button(button), MA_DRAG,
+ x, y, shift, ctrl, alt);
return TRUE;
}
-void done_with_pty(struct gui_data *inst)
-{
- extern void pty_close(void);
-
- if (inst->master_fd >= 0) {
- pty_close();
- inst->master_fd = -1;
- gtk_input_remove(inst->master_func_id);
- }
-
- if (!inst->exited && inst->back->exitcode(inst->backhandle) >= 0) {
- int exitcode = inst->back->exitcode(inst->backhandle);
- int clean;
-
- clean = WIFEXITED(exitcode) && (WEXITSTATUS(exitcode) == 0);
-
- /*
- * Terminate now, if the Close On Exit setting is
- * appropriate.
- */
- if (cfg.close_on_exit == COE_ALWAYS ||
- (cfg.close_on_exit == COE_NORMAL && clean))
- exit(0);
-
- /*
- * Otherwise, output an indication that the session has
- * closed.
- */
- {
- char message[512];
- if (WIFEXITED(exitcode))
- sprintf(message, "\r\n[pterm: process terminated with exit"
- " code %d]\r\n", WEXITSTATUS(exitcode));
- else if (WIFSIGNALED(exitcode))
-#ifdef HAVE_NO_STRSIGNAL
- sprintf(message, "\r\n[pterm: process terminated on signal"
- " %d]\r\n", WTERMSIG(exitcode));
-#else
- sprintf(message, "\r\n[pterm: process terminated on signal"
- " %d (%.400s)]\r\n", WTERMSIG(exitcode),
- strsignal(WTERMSIG(exitcode)));
-#endif
- from_backend((void *)inst->term, 0, message, strlen(message));
- }
- inst->exited = 1;
- }
-}
-
void frontend_keypress(void *handle)
{
struct gui_data *inst = (struct gui_data *)handle;
gint timer_func(gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
+ int exitcode;
- if (inst->back->exitcode(inst->backhandle) >= 0) {
- /*
- * The primary child process died. We could keep the
- * terminal open for remaining subprocesses to output to,
- * but conventional wisdom seems to feel that that's the
- * Wrong Thing for an xterm-alike, so we bail out now
- * (though we don't necessarily _close_ the window,
- * depending on the state of Close On Exit). This would be
- * easy enough to change or make configurable if necessary.
- */
- done_with_pty(inst);
+ if ((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))
+ exit(0); /* just go. */
}
term_update(inst->term);
return TRUE;
}
-void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
+void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
{
- struct gui_data *inst = (struct gui_data *)data;
- char buf[4096];
- int ret;
-
- ret = read(sourcefd, buf, sizeof(buf));
-
- /*
- * Clean termination condition is that either ret == 0, or ret
- * < 0 and errno == EIO. Not sure why the latter, but it seems
- * to happen. Boo.
- */
- if (ret == 0 || (ret < 0 && errno == EIO)) {
- done_with_pty(inst);
- } else if (ret < 0) {
- perror("read pty master");
- exit(1);
- } else if (ret > 0)
- from_backend(inst->term, 0, buf, ret);
- term_blink(inst->term, 1);
- term_out(inst->term);
+ select_result(sourcefd,
+ (condition == GDK_INPUT_READ ? 1 :
+ condition == GDK_INPUT_WRITE ? 2 :
+ condition == GDK_INPUT_EXCEPTION ? 4 : -1));
}
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 && !cfg.no_mouse_rep;
+ activate = activate && !inst->cfg.no_mouse_rep;
send_raw_mouse = activate;
if (send_raw_mouse)
inst->currcursor = inst->rawcursor;
offset_x = outer.width - inner.width;
offset_y = outer.height - inner.height;
- area_x = inst->font_width * w + 2*cfg.window_border;
- area_y = inst->font_height * h + 2*cfg.window_border;
+ area_x = inst->font_width * w + 2*inst->cfg.window_border;
+ area_y = inst->font_height * h + 2*inst->cfg.window_border;
/*
* Now we must set the size request on the drawing area back to
void palette_reset(void *frontend)
{
struct gui_data *inst = (struct gui_data *)frontend;
- /* This maps colour indices in cfg to those used in inst->cols. */
+ /* 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,
}
for (i = 0; i < NCOLOURS; i++) {
- inst->cols[i].red = cfg.colours[ww[i]][0] * 0x0101;
- inst->cols[i].green = cfg.colours[ww[i]][1] * 0x0101;
- inst->cols[i].blue = cfg.colours[ww[i]][2] * 0x0101;
+ 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;
}
gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS,
for (i = 0; i < NCOLOURS; i++) {
if (!success[i])
g_error("pterm: couldn't allocate colour %d (#%02x%02x%02x)\n",
- i, cfg.colours[i][0], cfg.colours[i][1], cfg.colours[i][2]);
+ i, inst->cfg.colours[i][0], inst->cfg.colours[i][1], inst->cfg.colours[i][2]);
}
set_window_background(inst);
wchar_t *tmp = data;
int tmplen = len;
- inst->pasteout_data_utf8 = smalloc(len*6);
+ inst->pasteout_data_utf8 = snewn(len*6, char);
inst->pasteout_data_utf8_len = len*6;
inst->pasteout_data_utf8_len =
charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
inst->pasteout_data_utf8 = NULL;
} else {
inst->pasteout_data_utf8 =
- srealloc(inst->pasteout_data_utf8,
- inst->pasteout_data_utf8_len);
+ sresize(inst->pasteout_data_utf8,
+ inst->pasteout_data_utf8_len, char);
}
} else {
inst->pasteout_data_utf8 = NULL;
inst->pasteout_data_utf8_len = 0;
}
- inst->pasteout_data = smalloc(len*6);
+ inst->pasteout_data = snewn(len*6, char);
inst->pasteout_data_len = len*6;
- inst->pasteout_data_len = wc_to_mb(line_codepage, 0, data, len,
- inst->pasteout_data,
- inst->pasteout_data_len, NULL, NULL);
+ inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
+ data, len, inst->pasteout_data,
+ inst->pasteout_data_len,
+ NULL, NULL, NULL);
if (inst->pasteout_data_len == 0) {
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
} else {
inst->pasteout_data =
- srealloc(inst->pasteout_data, inst->pasteout_data_len);
+ sresize(inst->pasteout_data, inst->pasteout_data_len, char);
}
if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
if (inst->pastein_data)
sfree(inst->pastein_data);
- inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t));
+ inst->pastein_data = snewn(seldata->length, wchar_t);
inst->pastein_data_len = seldata->length;
inst->pastein_data_len =
mb_to_wc((seldata->type == inst->utf8_string_atom ?
- CS_UTF8 : line_codepage),
+ CS_UTF8 : inst->ucsdata.line_codepage),
0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
void set_sbar(void *frontend, int total, int start, int page)
{
struct gui_data *inst = (struct gui_data *)frontend;
- if (!cfg.scrollbar)
+ if (!inst->cfg.scrollbar)
return;
inst->sbar_adjust->lower = 0;
inst->sbar_adjust->upper = total;
{
struct gui_data *inst = (struct gui_data *)data;
- if (!cfg.scrollbar)
+ if (!inst->cfg.scrollbar)
return;
if (!inst->ignore_sbar)
term_scroll(inst->term, 1, (int)adj->value);
if (!inst->area->window)
return NULL;
- dctx = smalloc(sizeof(*dctx));
+ dctx = snew(struct draw_ctx);
dctx->inst = inst;
dctx->gc = gdk_gc_new(inst->area->window);
return dctx;
int nfg, nbg, t, fontid, shadow, rlen, widefactor;
- nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
- nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+ 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 (cfg.bold_colour && (attr & ATTR_BOLD))
- nfg++;
- if (cfg.bold_colour && (attr & ATTR_BLINK))
- nbg++;
+ if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
+ nfg |= 1;
+ if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
+ nbg |= 1;
if (attr & TATTR_ACTCURS) {
nfg = NCOLOURS-2;
nbg = NCOLOURS-1;
widefactor = 1;
}
- if ((attr & ATTR_BOLD) && !cfg.bold_colour) {
+ if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) {
if (inst->fonts[fontid | 1])
fontid |= 1;
else
{
GdkRectangle r;
- r.x = x*inst->font_width+cfg.window_border;
- r.y = y*inst->font_height+cfg.window_border;
+ 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);
gdk_gc_set_foreground(gc, &inst->cols[nbg]);
gdk_draw_rectangle(inst->pixmap, gc, 1,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border,
+ 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]);
wchar_t *wcs;
int i;
- wcs = smalloc(sizeof(wchar_t) * (len+1));
+ wcs = snewn(len+1, wchar_t);
for (i = 0; i < len; i++) {
wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
}
* and (c) the clip rectangle should prevent it causing
* trouble anyway.
*/
- gwcs = smalloc(sizeof(GdkWChar) * (len*2+1));
+ gwcs = snewn(len*2+1, GdkWChar);
memset(gwcs, 0, sizeof(GdkWChar) * (len*2+1));
/*
* FIXME: when we have a wide-char equivalent of
for (i = 0; i <= len; i++)
gwcs[i] = wcs[i];
gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+ x*inst->font_width+inst->cfg.window_border,
+ y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
gwcs, len*2);
sfree(gwcs);
} else {
- gcs = smalloc(sizeof(GdkWChar) * (len+1));
+ gcs = snewn(len+1, gchar);
wc_to_mb(inst->fontinfo[fontid].charset, 0,
- wcs, len, gcs, len, ".", NULL);
+ wcs, len, gcs, len, ".", NULL, NULL);
gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+ x*inst->font_width+inst->cfg.window_border,
+ y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
gcs, len);
sfree(gcs);
}
if (shadow) {
gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
- x*inst->font_width+cfg.window_border + cfg.shadowboldoffset,
- y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+ 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);
}
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+cfg.window_border,
- y*inst->font_height + uheight + cfg.window_border,
- (x+len)*widefactor*inst->font_width-1+cfg.window_border,
- y*inst->font_height + uheight + cfg.window_border);
+ 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);
}
if (lattr != LATTR_NORM) {
int i;
for (i = 0; i < len * widefactor * inst->font_width; i++) {
gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap,
- x*inst->font_width+cfg.window_border + 2*i,
- y*inst->font_height+cfg.window_border,
- x*inst->font_width+cfg.window_border + 2*i+1,
- y*inst->font_height+cfg.window_border,
+ 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 * inst->font_width - i, inst->font_height);
}
len *= 2;
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+cfg.window_border,
- y*inst->font_height+cfg.window_border+dt*i+db,
- x*widefactor*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border+dt*(i+1),
+ 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,
+ y*inst->font_height+inst->cfg.window_border+dt*(i+1),
len * inst->font_width, inst->font_height-i-1);
}
}
}
gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border,
+ 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);
}
passive = 1;
} else
passive = 0;
- if ((attr & TATTR_ACTCURS) && cfg.cursor_type != 0) {
+ if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) {
attr &= ~TATTR_ACTCURS;
}
do_text_internal(ctx, x, y, text, len, attr, lattr);
len *= 2;
}
- if (cfg.cursor_type == 0) {
+ if (inst->cfg.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 (passive) {
gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]);
gdk_draw_rectangle(inst->pixmap, gc, 0,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border,
+ 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);
}
} else {
else
char_width = inst->font_width;
- if (cfg.cursor_type == 1) {
+ if (inst->cfg.cursor_type == 1) {
uheight = inst->fonts[0]->ascent + 1;
if (uheight >= inst->font_height)
uheight = inst->font_height - 1;
- startx = x * inst->font_width + cfg.window_border;
- starty = y * inst->font_height + cfg.window_border + uheight;
+ startx = x * inst->font_width + inst->cfg.window_border;
+ starty = y * inst->font_height + inst->cfg.window_border + uheight;
dx = 1;
dy = 0;
length = len * char_width;
int xadjust = 0;
if (attr & TATTR_RIGHTCURS)
xadjust = char_width - 1;
- startx = x * inst->font_width + cfg.window_border + xadjust;
- starty = y * inst->font_height + cfg.window_border;
+ startx = x * inst->font_width + inst->cfg.window_border + xadjust;
+ starty = y * inst->font_height + inst->cfg.window_border;
dx = 0;
dy = 1;
length = inst->font_height;
}
gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border,
+ 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);
}
return gdk_get_display();
}
+long get_windowid(void *frontend)
+{
+ Terminal *term = (Terminal *)frontend;
+ struct gui_data *inst = (struct gui_data *)(term->frontend);
+ return (long)GDK_WINDOW_XWINDOW(inst->area->window);
+}
+
static void help(FILE *fp) {
if(fprintf(fp,
"pterm option summary:\n"
}
}
-int do_cmdline(int argc, char **argv, int do_everything)
+int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
{
int err = 0;
extern char **pty_argv; /* declared in pty.c */
+ extern int use_pty_argv;
/*
* Macros to make argument handling easier. Note that because
if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg.font, val, sizeof(cfg.font));
- cfg.font[sizeof(cfg.font)-1] = '\0';
+ strncpy(cfg->font.name, val, sizeof(cfg->font.name));
+ cfg->font.name[sizeof(cfg->font.name)-1] = '\0';
} else if (!strcmp(p, "-fb")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg.boldfont, val, sizeof(cfg.boldfont));
- cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0';
+ strncpy(cfg->boldfont.name, val, sizeof(cfg->boldfont.name));
+ cfg->boldfont.name[sizeof(cfg->boldfont.name)-1] = '\0';
} else if (!strcmp(p, "-fw")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg.widefont, val, sizeof(cfg.widefont));
- cfg.widefont[sizeof(cfg.widefont)-1] = '\0';
+ strncpy(cfg->widefont.name, val, sizeof(cfg->widefont.name));
+ cfg->widefont.name[sizeof(cfg->widefont.name)-1] = '\0';
} else if (!strcmp(p, "-fwb")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg.wideboldfont, val, sizeof(cfg.wideboldfont));
- cfg.wideboldfont[sizeof(cfg.wideboldfont)-1] = '\0';
+ strncpy(cfg->wideboldfont.name, val, sizeof(cfg->wideboldfont.name));
+ cfg->wideboldfont.name[sizeof(cfg->wideboldfont.name)-1] = '\0';
} 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';
+ strncpy(cfg->line_codepage, val, sizeof(cfg->line_codepage));
+ cfg->line_codepage[sizeof(cfg->line_codepage)-1] = '\0';
} else if (!strcmp(p, "-geometry")) {
int flags, x, y, w, h;
flags = XParseGeometry(val, &x, &y, &w, &h);
if (flags & WidthValue)
- cfg.width = w;
+ cfg->width = w;
if (flags & HeightValue)
- cfg.height = h;
+ cfg->height = h;
/*
* Apparently setting the initial window position is
} else if (!strcmp(p, "-sl")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- cfg.savelines = atoi(val);
+ cfg->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;
+ cfg->colours[index][0] = col.red / 256;
+ cfg->colours[index][1] = col.green / 256;
+ cfg->colours[index][2] = col.blue / 256;
}
- } else if (!strcmp(p, "-e")) {
+ } else if (use_pty_argv && !strcmp(p, "-e")) {
/* This option swallows all further arguments. */
if (!do_everything)
break;
if (--argc > 0) {
int i;
- pty_argv = smalloc((argc+1) * sizeof(char *));
+ pty_argv = snewn(argc+1, char *);
++argv;
for (i = 0; i < argc; i++)
pty_argv[i] = argv[i];
} else if (!strcmp(p, "-T")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg.wintitle, val, sizeof(cfg.wintitle));
- cfg.wintitle[sizeof(cfg.wintitle)-1] = '\0';
+ strncpy(cfg->wintitle, val, sizeof(cfg->wintitle));
+ cfg->wintitle[sizeof(cfg->wintitle)-1] = '\0';
} else if (!strcmp(p, "-log")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
- strncpy(cfg.logfilename, val, sizeof(cfg.logfilename));
- cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0';
- cfg.logtype = LGTYP_DEBUG;
+ strncpy(cfg->logfilename.path, val, sizeof(cfg->logfilename.path));
+ cfg->logfilename.path[sizeof(cfg->logfilename.path)-1] = '\0';
+ cfg->logtype = LGTYP_DEBUG;
} else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
SECOND_PASS_ONLY;
- cfg.stamp_utmp = 0;
+ cfg->stamp_utmp = 0;
} else if (!strcmp(p, "-ut")) {
SECOND_PASS_ONLY;
- cfg.stamp_utmp = 1;
+ cfg->stamp_utmp = 1;
} else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) {
SECOND_PASS_ONLY;
- cfg.login_shell = 0;
+ cfg->login_shell = 0;
} else if (!strcmp(p, "-ls")) {
SECOND_PASS_ONLY;
- cfg.login_shell = 1;
+ cfg->login_shell = 1;
} else if (!strcmp(p, "-nethack")) {
SECOND_PASS_ONLY;
- cfg.nethack_keypad = 1;
+ cfg->nethack_keypad = 1;
} else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) {
SECOND_PASS_ONLY;
- cfg.scrollbar = 0;
+ cfg->scrollbar = 0;
} else if (!strcmp(p, "-sb")) {
SECOND_PASS_ONLY;
- cfg.scrollbar = 0;
+ cfg->scrollbar = 0;
} else if (!strcmp(p, "-name")) {
EXPECTS_ARG;
return retval;
}
-int main(int argc, char **argv)
+int uxsel_input_add(int fd, int rwx) {
+ int flags = 0;
+ if (rwx & 1) flags |= GDK_INPUT_READ;
+ if (rwx & 2) flags |= GDK_INPUT_WRITE;
+ if (rwx & 4) flags |= GDK_INPUT_EXCEPTION;
+ return gdk_input_add(fd, flags, fd_input_func, NULL);
+}
+
+void uxsel_input_remove(int id) {
+ gdk_input_remove(id);
+}
+
+int pt_main(int argc, char **argv)
{
- extern int pty_master_fd; /* declared in pty.c */
- extern void pty_pre_init(void); /* declared in pty.c */
+ extern Backend *select_backend(Config *cfg);
+ extern int cfgbox(Config *cfg);
struct gui_data *inst;
int font_charset;
* it */
block_signal(SIGCHLD, 1);
- pty_pre_init();
-
gtk_init(&argc, &argv);
- if (do_cmdline(argc, argv, 0)) /* pre-defaults pass to get -class */
- exit(1);
- do_defaults(NULL, &cfg);
- if (do_cmdline(argc, argv, 1)) /* post-defaults, do everything */
- exit(1);
-
/*
* Create an instance structure and initialise to zeroes
*/
- inst = smalloc(sizeof(*inst));
+ inst = snew(struct gui_data);
memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */
- inst->fonts[0] = gdk_font_load(cfg.font);
+ if (do_cmdline(argc, argv, 0, &inst->cfg))
+ exit(1); /* pre-defaults pass to get -class */
+ do_defaults(NULL, &inst->cfg);
+ if (do_cmdline(argc, argv, 1, &inst->cfg))
+ exit(1); /* post-defaults, do everything */
+
+ if (!cfgbox(&inst->cfg))
+ exit(0); /* config box hit Cancel */
+
+ inst->fonts[0] = gdk_font_load(inst->cfg.font.name);
if (!inst->fonts[0]) {
- fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font);
+ fprintf(stderr, "pterm: unable to load font \"%s\"\n",
+ inst->cfg.font.name);
exit(1);
}
font_charset = set_font_info(inst, 0);
- if (cfg.boldfont[0]) {
- inst->fonts[1] = gdk_font_load(cfg.boldfont);
+ if (inst->cfg.boldfont.name[0]) {
+ inst->fonts[1] = gdk_font_load(inst->cfg.boldfont.name);
if (!inst->fonts[1]) {
fprintf(stderr, "pterm: unable to load bold font \"%s\"\n",
- cfg.boldfont);
+ inst->cfg.boldfont.name);
exit(1);
}
set_font_info(inst, 1);
} else
inst->fonts[1] = NULL;
- if (cfg.widefont[0]) {
- inst->fonts[2] = gdk_font_load(cfg.widefont);
+ if (inst->cfg.widefont.name[0]) {
+ inst->fonts[2] = gdk_font_load(inst->cfg.widefont.name);
if (!inst->fonts[2]) {
fprintf(stderr, "pterm: unable to load wide font \"%s\"\n",
- cfg.boldfont);
+ inst->cfg.widefont.name);
exit(1);
}
set_font_info(inst, 2);
} else
inst->fonts[2] = NULL;
- if (cfg.wideboldfont[0]) {
- inst->fonts[3] = gdk_font_load(cfg.wideboldfont);
+ if (inst->cfg.wideboldfont.name[0]) {
+ inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont.name);
if (!inst->fonts[3]) {
fprintf(stderr, "pterm: unable to load wide/bold font \"%s\"\n",
- cfg.boldfont);
+ inst->cfg.wideboldfont.name);
exit(1);
}
set_font_info(inst, 3);
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
- inst->direct_to_font = init_ucs(font_charset);
+ inst->direct_to_font = init_ucs(&inst->ucsdata,
+ inst->cfg.line_codepage, font_charset);
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- if (cfg.wintitle[0])
- set_title(inst, cfg.wintitle);
+ if (inst->cfg.wintitle[0])
+ set_title(inst, inst->cfg.wintitle);
else
set_title(inst, "pterm");
inst->area = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
- inst->font_width * cfg.width + 2*cfg.window_border,
- inst->font_height * cfg.height + 2*cfg.window_border);
- if (cfg.scrollbar) {
+ inst->font_width * inst->cfg.width + 2*inst->cfg.window_border,
+ inst->font_height * inst->cfg.height + 2*inst->cfg.window_border);
+ if (inst->cfg.scrollbar) {
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));
- if (cfg.scrollbar) {
- if (cfg.scrollbar_on_left)
+ if (inst->cfg.scrollbar) {
+ if (inst->cfg.scrollbar_on_left)
gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
else
gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0);
{
GdkGeometry geom;
- geom.min_width = inst->font_width + 2*cfg.window_border;
- geom.min_height = inst->font_height + 2*cfg.window_border;
+ geom.min_width = inst->font_width + 2*inst->cfg.window_border;
+ geom.min_height = inst->font_height + 2*inst->cfg.window_border;
geom.max_width = geom.max_height = -1;
- geom.base_width = 2*cfg.window_border;
- geom.base_height = 2*cfg.window_border;
+ geom.base_width = 2*inst->cfg.window_border;
+ geom.base_height = 2*inst->cfg.window_border;
geom.width_inc = inst->font_width;
geom.height_inc = inst->font_height;
geom.min_aspect = geom.max_aspect = 0;
GTK_SIGNAL_FUNC(selection_get), inst);
gtk_signal_connect(GTK_OBJECT(inst->area), "selection_clear_event",
GTK_SIGNAL_FUNC(selection_clear), inst);
- if (cfg.scrollbar)
+ 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);
GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
gtk_widget_show(inst->area);
- if (cfg.scrollbar)
+ if (inst->cfg.scrollbar)
gtk_widget_show(inst->sbar);
gtk_widget_show(GTK_WIDGET(inst->hbox));
gtk_widget_show(inst->window);
inst->currcursor = inst->textcursor;
show_mouseptr(inst, 1);
- inst->term = term_init(&cfg, inst);
- inst->logctx = log_init(inst);
+ inst->term = term_init(&inst->cfg, &inst->ucsdata, inst);
+ inst->logctx = log_init(inst, &inst->cfg);
term_provide_logctx(inst->term, inst->logctx);
- inst->back = &pty_backend;
- inst->back->init((void *)inst->term, &inst->backhandle, NULL, 0, NULL, 0);
+ uxsel_init();
+
+ inst->back = select_backend(&inst->cfg);
+ {
+ char *realhost; /* FIXME: don't ignore this! */
+ inst->back->init((void *)inst->term, &inst->backhandle, &inst->cfg,
+ inst->cfg.host, inst->cfg.port, &realhost,
+ inst->cfg.tcp_nodelay);
+ }
inst->back->provide_logctx(inst->backhandle, inst->logctx);
term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
- term_size(inst->term, cfg.height, cfg.width, cfg.savelines);
+ term_size(inst->term, inst->cfg.height, inst->cfg.width, inst->cfg.savelines);
inst->ldisc =
- ldisc_create(&cfg, inst->term, inst->back, inst->backhandle, inst);
+ ldisc_create(&inst->cfg, inst->term, inst->back, inst->backhandle, inst);
ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
- inst->master_fd = pty_master_fd;
- inst->exited = FALSE;
- inst->master_func_id = gdk_input_add(pty_master_fd, GDK_INPUT_READ,
- pty_input_func, inst);
-
/* now we're reday to deal with the child exit handler being
* called */
block_signal(SIGCHLD, 0);
-
+
+ inst->exited = FALSE;
+
gtk_main();
return 0;
projects / u / mdw / putty / blobdiff