* back end, all running as a GTK application. Wish me luck.
*/
+#define _GNU_SOURCE
+
#include <string.h>
#include <assert.h>
#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
#include <stdio.h>
#include <time.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
+
#include "putty.h"
+#include "terminal.h"
#define CAT2(x,y) x ## y
#define CAT(x,y) CAT2(x,y)
GtkBox *hbox;
GtkAdjustment *sbar_adjust;
GdkPixmap *pixmap;
- GdkFont *fonts[2]; /* normal and bold (for now!) */
+ GdkFont *fonts[4]; /* normal, bold, wide, widebold */
+ struct {
+ int charset;
+ int is_wide;
+ } fontinfo[4];
GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor;
GdkColor cols[NCOLOURS];
GdkColormap *colmap;
wchar_t *pastein_data;
+ int direct_to_font;
int pastein_data_len;
- char *pasteout_data;
- int pasteout_data_len;
+ char *pasteout_data, *pasteout_data_utf8;
+ int pasteout_data_len, pasteout_data_utf8_len;
int font_width, font_height;
int ignore_sbar;
int mouseptr_visible;
guint term_paste_idle_id;
- GdkAtom compound_text_atom;
+ GdkAtom compound_text_atom, utf8_string_atom;
+ int alt_keycode;
+ int alt_digits;
char wintitle[sizeof(((Config *)0)->wintitle)];
char icontitle[sizeof(((Config *)0)->wintitle)];
+ int master_fd, master_func_id, exited;
+ void *ldisc;
+ Backend *back;
+ void *backhandle;
+ Terminal *term;
+ void *logctx;
+};
+
+struct draw_ctx {
+ GdkGC *gc;
+ struct gui_data *inst;
};
-static struct gui_data the_inst;
-static struct gui_data *inst = &the_inst; /* so we always write `inst->' */
static int send_raw_mouse;
-void ldisc_update(int echo, int edit)
+static char *app_name = "pterm";
+
+char *x_get_default(char *key)
+{
+ return XGetDefault(GDK_DISPLAY(), app_name, key);
+}
+
+/*
+ * Default settings that are specific to pterm.
+ */
+char *platform_default_s(char *name)
+{
+ if (!strcmp(name, "Font"))
+ return "fixed"; /* COE_NORMAL works badly in an xterm */
+ return NULL;
+}
+
+int platform_default_i(char *name, int def)
+{
+ if (!strcmp(name, "CloseOnExit"))
+ return COE_ALWAYS; /* COE_NORMAL works badly in an xterm */
+ return def;
+}
+
+void ldisc_update(void *frontend, int echo, int edit)
{
/*
* This is a stub in pterm. If I ever produce a Unix
*/
}
-int askappend(char *filename)
+int askappend(void *frontend, char *filename)
{
/*
* Logging in an xterm-alike is liable to be something you only
return 2;
}
-void logevent(char *string)
+void logevent(void *frontend, char *string)
{
/*
* This is not a very helpful function: events are logged
*/
}
-int font_dimension(int which) /* 0 for width, 1 for height */
+int font_dimension(void *frontend, int which)/* 0 for width, 1 for height */
{
+ struct gui_data *inst = (struct gui_data *)frontend;
+
if (which)
return inst->font_height;
else
* mouse or a means of faking it, and there is no need to switch
* buttons around at all.
*/
-Mouse_Button translate_button(Mouse_Button button)
+Mouse_Button translate_button(void *frontend, Mouse_Button button)
{
+ /* struct gui_data *inst = (struct gui_data *)frontend; */
+
if (button == MBT_LEFT)
return MBT_SELECT;
if (button == MBT_MIDDLE)
* Minimise or restore the window in response to a server-side
* request.
*/
-void set_iconic(int iconic)
+void set_iconic(void *frontend, int iconic)
{
/*
* GTK 1.2 doesn't know how to do this.
*/
#if GTK_CHECK_VERSION(2,0,0)
+ struct gui_data *inst = (struct gui_data *)frontend;
if (iconic)
gtk_window_iconify(GTK_WINDOW(inst->window));
else
/*
* Move the window in response to a server-side request.
*/
-void move_window(int x, int y)
+void move_window(void *frontend, int x, int y)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
* Move the window to the top or bottom of the z-order in response
* to a server-side request.
*/
-void set_zorder(int top)
+void set_zorder(void *frontend, int top)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
if (top)
gdk_window_raise(inst->window->window);
else
/*
* Refresh the window in response to a server-side request.
*/
-void refresh_window(void)
+void refresh_window(void *frontend)
{
- term_invalidate();
+ struct gui_data *inst = (struct gui_data *)frontend;
+ term_invalidate(inst->term);
}
/*
* Maximise or restore the window in response to a server-side
* request.
*/
-void set_zoomed(int zoomed)
+void set_zoomed(void *frontend, int zoomed)
{
/*
* GTK 1.2 doesn't know how to do this.
*/
#if GTK_CHECK_VERSION(2,0,0)
+ struct gui_data *inst = (struct gui_data *)frontend;
if (iconic)
gtk_window_maximize(GTK_WINDOW(inst->window));
else
/*
* Report whether the window is iconic, for terminal reports.
*/
-int is_iconic(void)
+int is_iconic(void *frontend)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
return !gdk_window_is_viewable(inst->window->window);
}
/*
* Report the window's position, for terminal reports.
*/
-void get_window_pos(int *x, int *y)
+void get_window_pos(void *frontend, int *x, int *y)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
/*
* Report the window's pixel size, for terminal reports.
*/
-void get_window_pixels(int *x, int *y)
+void get_window_pixels(void *frontend, int *x, int *y)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
/*
* Return the window or icon title.
*/
-char *get_window_title(int icon)
+char *get_window_title(void *frontend, int icon)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
return icon ? inst->wintitle : inst->icontitle;
}
return FALSE;
}
-void show_mouseptr(int show)
+static void show_mouseptr(struct gui_data *inst, int show)
{
if (!cfg.hide_mouseptr)
show = 1;
}
if (need_size) {
- term_size(h, w, cfg.savelines);
+ term_size(inst->term, h, w, cfg.savelines);
}
return TRUE;
gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
- /* struct gui_data *inst = (struct gui_data *)data; */
+ struct gui_data *inst = (struct gui_data *)data;
/*
* Pass the exposed rectangle to terminal.c, which will call us
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- /* struct gui_data *inst = (struct gui_data *)data; */
+ struct gui_data *inst = (struct gui_data *)data;
char output[32];
int start, end;
+ /* By default, nothing is generated. */
+ end = start = 0;
+
+ /*
+ * If Alt is being released after typing an Alt+numberpad
+ * sequence, we should generate the code that was typed.
+ *
+ * Note that we only do this if more than one key was actually
+ * pressed - I don't think Alt+NumPad4 should be ^D or that
+ * Alt+NumPad3 should be ^C, for example. There's no serious
+ * 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) {
+#ifdef KEY_DEBUGGING
+ printf("Alt key up, keycode = %d\n", inst->alt_keycode);
+#endif
+ output[0] = inst->alt_keycode;
+ end = 1;
+ goto done;
+ }
+
if (event->type == GDK_KEY_PRESS) {
#ifdef KEY_DEBUGGING
{
#endif
/*
- * NYI:
- * - alt+numpad
- * - Compose key (!!! requires Unicode faff before even trying)
+ * NYI: Compose key (!!! requires Unicode faff before even trying)
*/
/*
+ * If Alt has just been pressed, we start potentially
+ * accumulating an Alt+numberpad code. We do this by
+ * 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)) {
+ inst->alt_keycode = -1;
+ inst->alt_digits = 0;
+ goto done; /* this generates nothing else */
+ }
+
+ /*
+ * If we're seeing a numberpad key press with Mod1 down,
+ * consider adding it to alt_keycode if that's sensible.
+ * Anything _else_ with Mod1 down cancels any possibility
+ * of an ALT keycode: we set alt_keycode to -2.
+ */
+ 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;
+ }
+ if (digit < 0)
+ inst->alt_keycode = -2; /* it's invalid */
+ else {
+#ifdef KEY_DEBUGGING
+ printf("Adding digit %d to keycode %d", digit,
+ inst->alt_keycode);
+#endif
+ if (inst->alt_keycode == -1)
+ inst->alt_keycode = digit; /* one-digit code */
+ else
+ inst->alt_keycode = inst->alt_keycode * 10 + digit;
+ inst->alt_digits++;
+#ifdef KEY_DEBUGGING
+ printf(" gives new code %d\n", inst->alt_keycode);
+#endif
+ /* Having used this digit, we now do nothing more with it. */
+ goto done;
+ }
+ }
+
+ /*
* 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(0, -cfg.height/2);
+ term_scroll(inst->term, 0, -cfg.height/2);
return TRUE;
}
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(0, +cfg.height/2);
+ term_scroll(inst->term, 0, +cfg.height/2);
return TRUE;
}
* Neither does Shift-Ins.
*/
if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) {
- request_paste();
+ request_paste(inst);
return TRUE;
}
strncpy(output+1, event->string, 31);
output[31] = '\0';
end = strlen(output);
- if (event->state & GDK_MOD1_MASK)
+ if (event->state & GDK_MOD1_MASK) {
start = 0;
- else
+ if (end == 1) end = 0;
+ } else
start = 1;
/* Control-` is the same as Control-\ (unless gtk has a better idea) */
output[1] = 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';
+ end = 2;
+ }
/* Shift-Tab is ESC [ Z */
if (event->keyval == GDK_ISO_Left_Tab ||
/*
* Application keypad mode.
*/
- if (app_keypad_keys && !cfg.no_applic_k) {
+ if (inst->term->app_keypad_keys && !cfg.no_applic_k) {
int xkey = 0;
switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break;
case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break;
}
if (xkey) {
- if (vt52_mode) {
+ if (inst->term->vt52_mode) {
if (xkey >= 'P' && xkey <= 'S')
end = 1 + sprintf(output+1, "\033%c", xkey);
else
if (cfg.funky_type == 3 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
- if (vt52_mode && code > 0 && code <= 6) {
+ if (inst->term->vt52_mode && code > 0 && code <= 6) {
end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]);
goto done;
}
}
goto done;
}
- if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
+ if ((inst->term->vt52_mode || cfg.funky_type == 4) &&
+ code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
offt++;
if (code > 21)
offt++;
- if (vt52_mode)
+ if (inst->term->vt52_mode)
end = 1 + sprintf(output+1,
"\x1B%c", code + 'P' - 11 - offt);
else
goto done;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
- if (vt52_mode)
+ 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);
* app cursor keys mode they do ESC O A instead.
* Ctrl toggles the two modes.
*/
- if (vt52_mode) {
+ if (inst->term->vt52_mode) {
end = 1 + sprintf(output+1, "\033%c", xkey);
- } else if (!app_cursor_keys ^
+ } else if (!inst->term->app_cursor_keys ^
!(event->state & GDK_CONTROL_MASK)) {
end = 1 + sprintf(output+1, "\033O%c", xkey);
} else {
goto done;
}
}
+ goto done;
+ }
- done:
+ done:
+ if (end-start > 0) {
#ifdef KEY_DEBUGGING
- {
- int i;
- printf("generating sequence:");
- for (i = start; i < end; i++)
- printf(" %02x", (unsigned char) output[i]);
- printf("\n");
- }
+ int i;
+ printf("generating sequence:");
+ for (i = start; i < end; i++)
+ printf(" %02x", (unsigned char) output[i]);
+ printf("\n");
#endif
- if (end-start > 0) {
- ldisc_send(output+start, end-start, 1);
- show_mouseptr(0);
- term_out();
+
+ if (!inst->direct_to_font) {
+ /*
+ * The stuff we've just generated is assumed to be
+ * ISO-8859-1! This sounds insane, but `man
+ * XLookupString' agrees: strings of this type returned
+ * from the X server are hardcoded to 8859-1. Strictly
+ * speaking we should be doing this using some sort of
+ * GtkIMContext, which (if we're lucky) would give us
+ * our data directly in Unicode; but that's not
+ * supported in GTK 1.2 as 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);
+ } 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);
}
+
+ show_mouseptr(inst, 0);
+ term_seen_key_event(inst->term);
+ term_out(inst->term);
}
return TRUE;
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button, act;
- show_mouseptr(1);
+ show_mouseptr(inst, 1);
+
+ if (event->button == 4 && event->type == GDK_BUTTON_PRESS) {
+ term_scroll(inst->term, 0, -5);
+ return TRUE;
+ }
+ if (event->button == 5 && event->type == GDK_BUTTON_PRESS) {
+ term_scroll(inst->term, 0, +5);
+ return TRUE;
+ }
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
- term_mouse(button, act, x, y, shift, ctrl, alt);
+ term_mouse(inst->term, button, act, x, y, shift, ctrl, alt);
return TRUE;
}
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button;
- show_mouseptr(1);
+ show_mouseptr(inst, 1);
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
- term_mouse(button, MA_DRAG, x, y, shift, ctrl, alt);
+ term_mouse(inst->term, 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;
+
+ /*
+ * If our child process has exited but not closed, terminate on
+ * any keypress.
+ */
+ if (inst->exited)
+ exit(0);
+}
+
gint timer_func(gpointer data)
{
- /* struct gui_data *inst = (struct gui_data *)data; */
- extern int pty_child_is_dead(); /* declared in pty.c */
+ struct gui_data *inst = (struct gui_data *)data;
- if (pty_child_is_dead()) {
+ 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. This
- * would be easy enough to change or make configurable if
- * necessary.
+ * 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.
*/
- exit(0);
+ done_with_pty(inst);
}
- term_update();
+ term_update(inst->term);
+ term_blink(inst->term, 0);
return TRUE;
}
void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
{
- /* struct gui_data *inst = (struct gui_data *)data; */
+ struct gui_data *inst = (struct gui_data *)data;
char buf[4096];
int ret;
* to happen. Boo.
*/
if (ret == 0 || (ret < 0 && errno == EIO)) {
- exit(0);
- }
-
- if (ret < 0) {
+ done_with_pty(inst);
+ } else if (ret < 0) {
perror("read pty master");
exit(1);
- }
- if (ret > 0)
- from_backend(0, buf, ret);
- term_out();
+ } else if (ret > 0)
+ from_backend(inst->term, 0, buf, ret);
+ term_blink(inst->term, 1);
+ term_out(inst->term);
}
void destroy(GtkWidget *widget, gpointer data)
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
- has_focus = event->in;
- term_out();
- term_update();
- show_mouseptr(1);
+ struct gui_data *inst = (struct gui_data *)data;
+ inst->term->has_focus = event->in;
+ term_out(inst->term);
+ term_update(inst->term);
+ show_mouseptr(inst, 1);
return FALSE;
}
/*
* set or clear the "raw mouse message" mode
*/
-void set_raw_mouse_mode(int activate)
+void set_raw_mouse_mode(void *frontend, int activate)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
activate = activate && !cfg.no_mouse_rep;
send_raw_mouse = activate;
if (send_raw_mouse)
inst->currcursor = inst->rawcursor;
else
inst->currcursor = inst->textcursor;
- show_mouseptr(inst->mouseptr_visible);
+ show_mouseptr(inst, inst->mouseptr_visible);
}
-void request_resize(int w, int h)
+void request_resize(void *frontend, int w, int h)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
int large_x, large_y;
int offset_x, offset_y;
int area_x, area_y;
* bogus size request which guarantees to be bigger than the
* current size of the drawing area.
*/
- get_window_pixels(&large_x, &large_y);
+ get_window_pixels(inst, &large_x, &large_y);
large_x += 32;
large_y += 32;
#endif
}
-void real_palette_set(int n, int r, int g, int b)
+static void real_palette_set(struct gui_data *inst, int n, int r, int g, int b)
{
gboolean success[1];
n, r, g, b);
}
-void palette_set(int n, int r, int g, int b)
+void set_window_background(struct gui_data *inst)
{
+ if (inst->area && inst->area->window)
+ gdk_window_set_background(inst->area->window, &inst->cols[18]);
+ if (inst->window && inst->window->window)
+ gdk_window_set_background(inst->window->window, &inst->cols[18]);
+}
+
+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(first[n], r, g, b);
+ real_palette_set(inst, first[n], r, g, b);
if (first[n] >= 18)
- real_palette_set(first[n] + 1, r, g, b);
+ real_palette_set(inst, first[n] + 1, r, g, b);
+ if (first[n] == 18)
+ set_window_background(inst);
}
-void palette_reset(void)
+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. */
static const int ww[] = {
6, 7, 8, 9, 10, 11, 12, 13,
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]);
}
+
+ set_window_background(inst);
}
-void write_clip(wchar_t * data, int len, int must_deselect)
+void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
if (inst->pasteout_data)
sfree(inst->pasteout_data);
- inst->pasteout_data = smalloc(len);
- inst->pasteout_data_len = len;
- wc_to_mb(0, 0, data, len, inst->pasteout_data, inst->pasteout_data_len,
- NULL, NULL);
+ if (inst->pasteout_data_utf8)
+ sfree(inst->pasteout_data_utf8);
+
+ /*
+ * Set up UTF-8 paste data. This only happens if we aren't in
+ * direct-to-font mode using the D800 hack.
+ */
+ if (!inst->direct_to_font) {
+ wchar_t *tmp = data;
+ int tmplen = len;
+
+ inst->pasteout_data_utf8 = smalloc(len*6);
+ 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_len,
+ CS_UTF8, NULL, NULL, 0);
+ if (inst->pasteout_data_utf8_len == 0) {
+ sfree(inst->pasteout_data_utf8);
+ inst->pasteout_data_utf8 = NULL;
+ } else {
+ inst->pasteout_data_utf8 =
+ srealloc(inst->pasteout_data_utf8,
+ inst->pasteout_data_utf8_len);
+ }
+ } else {
+ inst->pasteout_data_utf8 = NULL;
+ inst->pasteout_data_utf8_len = 0;
+ }
+
+ inst->pasteout_data = smalloc(len*6);
+ 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);
+ 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);
+ }
if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
GDK_CURRENT_TIME)) {
GDK_SELECTION_TYPE_STRING, 1);
gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
inst->compound_text_atom, 1);
+ if (inst->pasteout_data_utf8)
+ gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+ inst->utf8_string_atom, 1);
}
}
void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
guint info, guint time_stamp, gpointer data)
{
- gtk_selection_data_set(seldata, GDK_SELECTION_TYPE_STRING, 8,
- inst->pasteout_data, inst->pasteout_data_len);
+ struct gui_data *inst = (struct gui_data *)data;
+ if (seldata->target == inst->utf8_string_atom)
+ gtk_selection_data_set(seldata, seldata->target, 8,
+ inst->pasteout_data_utf8,
+ inst->pasteout_data_utf8_len);
+ else
+ gtk_selection_data_set(seldata, seldata->target, 8,
+ inst->pasteout_data, inst->pasteout_data_len);
}
gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
gpointer data)
{
- term_deselect();
+ struct gui_data *inst = (struct gui_data *)data;
+ term_deselect(inst->term);
if (inst->pasteout_data)
sfree(inst->pasteout_data);
+ if (inst->pasteout_data_utf8)
+ sfree(inst->pasteout_data_utf8);
inst->pasteout_data = NULL;
inst->pasteout_data_len = 0;
+ inst->pasteout_data_utf8 = NULL;
+ inst->pasteout_data_utf8_len = 0;
return TRUE;
}
-void request_paste(void)
+void request_paste(void *frontend)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* In Unix, pasting is asynchronous: all we can do at the
* moment is to call gtk_selection_convert(), and when the data
* comes back _then_ we can call term_do_paste().
*/
- gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
- GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME);
+
+ if (!inst->direct_to_font) {
+ /*
+ * First we attempt to retrieve the selection as a UTF-8
+ * string (which we will convert to the correct code page
+ * before sending to the session, of course). If that
+ * fails, selection_received() will be informed and will
+ * fall back to an ordinary string.
+ */
+ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+ inst->utf8_string_atom, GDK_CURRENT_TIME);
+ } else {
+ /*
+ * If we're in direct-to-font mode, we disable UTF-8
+ * pasting, and go straight to ordinary string data.
+ */
+ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+ GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME);
+ }
}
gint idle_paste_func(gpointer data); /* forward ref */
void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
- gpointer data)
+ guint time, gpointer data)
{
+ struct gui_data *inst = (struct gui_data *)data;
+
+ if (seldata->target == inst->utf8_string_atom && seldata->length <= 0) {
+ /*
+ * Failed to get a UTF-8 selection string. Try an ordinary
+ * string.
+ */
+ gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+ GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME);
+ return;
+ }
+
+ /*
+ * Any other failure should just go foom.
+ */
if (seldata->length <= 0 ||
- seldata->type != GDK_SELECTION_TYPE_STRING)
+ (seldata->type != GDK_SELECTION_TYPE_STRING &&
+ seldata->type != inst->utf8_string_atom))
return; /* Nothing happens. */
if (inst->pastein_data)
inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t));
inst->pastein_data_len = seldata->length;
- mb_to_wc(0, 0, seldata->data, seldata->length,
- inst->pastein_data, inst->pastein_data_len);
+ inst->pastein_data_len =
+ mb_to_wc((seldata->type == inst->utf8_string_atom ?
+ CS_UTF8 : line_codepage),
+ 0, seldata->data, seldata->length,
+ inst->pastein_data, inst->pastein_data_len);
- term_do_paste();
+ term_do_paste(inst->term);
- if (term_paste_pending())
+ if (term_paste_pending(inst->term))
inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
}
{
struct gui_data *inst = (struct gui_data *)data;
- if (term_paste_pending())
- term_paste();
+ if (term_paste_pending(inst->term))
+ term_paste(inst->term);
else
gtk_idle_remove(inst->term_paste_idle_id);
}
-void get_clip(wchar_t ** p, int *len)
+void get_clip(void *frontend, wchar_t ** p, int *len)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
+
if (p) {
*p = inst->pastein_data;
*len = inst->pastein_data_len;
}
}
-void set_title(char *title)
+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';
gtk_window_set_title(GTK_WINDOW(inst->window), inst->wintitle);
}
-void set_icon(char *title)
+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';
gdk_window_set_icon_name(inst->window->window, inst->icontitle);
}
-void set_sbar(int total, int start, int page)
+void set_sbar(void *frontend, int total, int start, int page)
{
+ struct gui_data *inst = (struct gui_data *)frontend;
if (!cfg.scrollbar)
return;
inst->sbar_adjust->lower = 0;
void scrollbar_moved(GtkAdjustment *adj, gpointer data)
{
+ struct gui_data *inst = (struct gui_data *)data;
+
if (!cfg.scrollbar)
return;
if (!inst->ignore_sbar)
- term_scroll(1, (int)adj->value);
+ term_scroll(inst->term, 1, (int)adj->value);
}
-void sys_cursor(int x, int y)
+void sys_cursor(void *frontend, int x, int y)
{
/*
* This is meaningless under X.
*/
}
-void beep(int mode)
+/*
+ * This is still called when mode==BELL_VISUAL, even though the
+ * visual bell is handled entirely within terminal.c, because we
+ * may want to perform additional actions on any kind of bell (for
+ * example, taskbar flashing in Windows).
+ */
+void beep(void *frontend, int mode)
{
- gdk_beep();
+ if (mode != BELL_VISUAL)
+ gdk_beep();
}
-int CharWidth(Context ctx, int uc)
+int char_width(Context ctx, int uc)
{
/*
* Under X, any fixed-width font really _is_ fixed-width.
return 1;
}
-Context get_ctx(void)
+Context get_ctx(void *frontend)
{
- GdkGC *gc;
+ struct gui_data *inst = (struct gui_data *)frontend;
+ struct draw_ctx *dctx;
+
if (!inst->area->window)
return NULL;
- gc = gdk_gc_new(inst->area->window);
- return gc;
+
+ dctx = smalloc(sizeof(*dctx));
+ dctx->inst = inst;
+ dctx->gc = gdk_gc_new(inst->area->window);
+ return dctx;
}
void free_ctx(Context ctx)
{
- GdkGC *gc = (GdkGC *)ctx;
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ /* struct gui_data *inst = dctx->inst; */
+ GdkGC *gc = dctx->gc;
gdk_gc_unref(gc);
+ sfree(dctx);
}
/*
*
* We are allowed to fiddle with the contents of `text'.
*/
-void do_text(Context ctx, int x, int y, char *text, int len,
- unsigned long attr, int lattr)
+void do_text_internal(Context ctx, int x, int y, char *text, int len,
+ unsigned long attr, int lattr)
{
- int nfg, nbg, t;
- GdkGC *gc = (GdkGC *)ctx;
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ struct gui_data *inst = dctx->inst;
+ GdkGC *gc = dctx->gc;
- /*
- * NYI:
- * - Unicode, code pages, and ATTR_WIDE for CJK support.
- * - cursor shapes other than block
- * - shadow bolding
- */
+ int nfg, nbg, t, fontid, shadow, rlen, widefactor;
nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
nbg = NCOLOURS-1;
}
+ fontid = shadow = 0;
+
+ if (attr & ATTR_WIDE) {
+ widefactor = 2;
+ fontid |= 2;
+ } else {
+ widefactor = 1;
+ }
+
+ if ((attr & ATTR_BOLD) && !cfg.bold_colour) {
+ if (inst->fonts[fontid | 1])
+ fontid |= 1;
+ else
+ shadow = 1;
+ }
+
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= cols)
+ if (x >= inst->term->cols)
return;
- if (x + len*2 > cols)
- len = (cols-x)/2; /* trim to LH half */
+ if (x + len*2*widefactor > inst->term->cols)
+ len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */
+ rlen = len * 2;
+ } else
+ rlen = len;
+
+ {
+ GdkRectangle r;
+
+ r.x = x*inst->font_width+cfg.window_border;
+ r.y = y*inst->font_height+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,
- len*inst->font_width, inst->font_height);
+ rlen*widefactor*inst->font_width, inst->font_height);
gdk_gc_set_foreground(gc, &inst->cols[nfg]);
- gdk_draw_text(inst->pixmap, inst->fonts[0], gc,
- x*inst->font_width+cfg.window_border,
- y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
- text, len);
+ {
+ GdkWChar *gwcs;
+ gchar *gcs;
+ wchar_t *wcs;
+ int i;
+
+ wcs = smalloc(sizeof(wchar_t) * (len+1));
+ for (i = 0; i < len; i++) {
+ wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
+ }
+
+ if (inst->fonts[fontid] == NULL) {
+ /*
+ * The font for this contingency does not exist.
+ * Typically this means we've been given ATTR_WIDE
+ * character and have no wide font. So we display
+ * nothing at all; such is life.
+ */
+ } else if (inst->fontinfo[fontid].is_wide) {
+ /*
+ * At least one version of gdk_draw_text_wc() has a
+ * weird bug whereby it reads `len' elements of the
+ * input string, but only draws `len/2'. Hence I'm
+ * going to make its input array twice as long as it
+ * theoretically needs to be, and pass in twice the
+ * actual number of characters. If a fixed gdk actually
+ * takes the doubled length seriously, then (a) the
+ * array will stand scrutiny up to the full length, (b)
+ * the spare elements of the array are full of zeroes
+ * which will probably be an empty glyph in the font,
+ * and (c) the clip rectangle should prevent it causing
+ * trouble anyway.
+ */
+ gwcs = smalloc(sizeof(GdkWChar) * (len*2+1));
+ memset(gwcs, 0, sizeof(GdkWChar) * (len*2+1));
+ /*
+ * 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+cfg.window_border,
+ y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+ gwcs, len*2);
+ sfree(gwcs);
+ } else {
+ gcs = smalloc(sizeof(GdkWChar) * (len+1));
+ wc_to_mb(inst->fontinfo[fontid].charset, 0,
+ wcs, len, gcs, len, ".", 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,
+ gcs, len);
+ sfree(gcs);
+ }
+ sfree(wcs);
+ }
+
+ 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,
+ text, len);
+ }
if (attr & ATTR_UNDER) {
int uheight = inst->fonts[0]->ascent + 1;
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)*inst->font_width-1+cfg.window_border,
+ (x+len)*widefactor*inst->font_width-1+cfg.window_border,
y*inst->font_height + uheight + cfg.window_border);
}
* try thinking of a better way. :-(
*/
int i;
- for (i = 0; i < len * inst->font_width; 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,
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*inst->font_width+cfg.window_border,
+ x*widefactor*inst->font_width+cfg.window_border,
y*inst->font_height+cfg.window_border+dt*(i+1),
len * inst->font_width, inst->font_height-i-1);
}
}
+ }
+}
+
+void do_text(Context ctx, int x, int y, char *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 widefactor;
+
+ do_text_internal(ctx, x, y, text, len, attr, lattr);
+
+ if (attr & ATTR_WIDE) {
+ widefactor = 2;
+ } else {
+ widefactor = 1;
+ }
+
+ if (lattr != LATTR_NORM) {
+ x *= 2;
+ if (x >= inst->term->cols)
+ return;
+ if (x + len*2*widefactor > inst->term->cols)
+ len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */
len *= 2;
}
y*inst->font_height+cfg.window_border,
x*inst->font_width+cfg.window_border,
y*inst->font_height+cfg.window_border,
- len*inst->font_width, inst->font_height);
+ len*widefactor*inst->font_width, inst->font_height);
}
void do_cursor(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
- int passive;
- GdkGC *gc = (GdkGC *)ctx;
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ struct gui_data *inst = dctx->inst;
+ GdkGC *gc = dctx->gc;
+
+ int passive, widefactor;
- /*
- * NYI: cursor shapes other than block
- */
if (attr & TATTR_PASCURS) {
attr &= ~TATTR_PASCURS;
passive = 1;
} else
passive = 0;
- do_text(ctx, x, y, text, len, attr, lattr);
- if (passive) {
+ if ((attr & TATTR_ACTCURS) && cfg.cursor_type != 0) {
+ attr &= ~TATTR_ACTCURS;
+ }
+ do_text_internal(ctx, x, y, text, len, attr, lattr);
+
+ if (attr & ATTR_WIDE) {
+ widefactor = 2;
+ } else {
+ widefactor = 1;
+ }
+
+ if (lattr != LATTR_NORM) {
+ x *= 2;
+ if (x >= inst->term->cols)
+ return;
+ if (x + len*2*widefactor > inst->term->cols)
+ len = (inst->term->cols-x)/2/widefactor;/* trim to LH half */
+ len *= 2;
+ }
+
+ if (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 it's passive.
+ */
+ 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,
+ len*inst->font_width-1, inst->font_height-1);
+ }
+ } else {
+ int uheight;
+ int startx, starty, dx, dy, length, i;
+
+ int char_width;
+
+ if ((attr & ATTR_WIDE) || lattr != LATTR_NORM)
+ char_width = 2*inst->font_width;
+ else
+ char_width = inst->font_width;
+
+ if (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;
+ dx = 1;
+ dy = 0;
+ length = len * char_width;
+ } else {
+ 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;
+ dx = 0;
+ dy = 1;
+ length = inst->font_height;
+ }
+
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,
- len*inst->font_width-1, inst->font_height-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,
- len*inst->font_width, inst->font_height);
+ if (passive) {
+ for (i = 0; i < length; i++) {
+ if (i % 2 == 0) {
+ gdk_draw_point(inst->pixmap, gc, startx, starty);
+ }
+ startx += dx;
+ starty += dy;
+ }
+ } else {
+ gdk_draw_line(inst->pixmap, gc, startx, starty,
+ startx + (length-1) * dx, starty + (length-1) * dy);
+ }
}
+
+ 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,
+ len*widefactor*inst->font_width, inst->font_height);
}
-GdkCursor *make_mouse_ptr(int cursor_val)
+GdkCursor *make_mouse_ptr(struct gui_data *inst, int cursor_val)
{
/*
* Truly hideous hack: GTK doesn't allow us to set the mouse
exit(1);
}
-char *get_x_display(void)
+char *get_x_display(void *frontend)
{
return gdk_get_display();
}
-int main(int argc, char **argv)
+static void help(FILE *fp) {
+ if(fprintf(fp,
+"pterm option summary:\n"
+"\n"
+" --display DISPLAY Specify X display to use (note '--')\n"
+" -name PREFIX Prefix when looking up resources (default: pterm)\n"
+" -fn FONT Normal text font\n"
+" -fb FONT Bold text font\n"
+" -geometry WIDTHxHEIGHT Size of terminal in characters\n"
+" -sl LINES Number of lines of scrollback\n"
+" -fg COLOUR, -bg COLOUR Foreground/background colour\n"
+" -bfg COLOUR, -bbg COLOUR Foreground/background bold colour\n"
+" -cfg COLOUR, -bfg COLOUR Foreground/background cursor colour\n"
+" -T TITLE Window title\n"
+" -ut, +ut Do(default) or do not update utmp\n"
+" -ls, +ls Do(default) or do not make shell a login shell\n"
+" -sb, +sb Do(default) or do not display a scrollbar\n"
+" -log PATH Log all output to a file\n"
+" -nethack Map numeric keypad to hjklyubn direction keys\n"
+" -xrm RESOURCE-STRING Set an X resource\n"
+" -e COMMAND [ARGS...] Execute command (consumes all remaining args)\n"
+ ) < 0 || fflush(fp) < 0) {
+ perror("output error");
+ exit(1);
+ }
+}
+
+int do_cmdline(int argc, char **argv, int do_everything)
{
- extern int pty_master_fd; /* declared in pty.c */
- extern char **pty_argv; /* declared in pty.c */
int err = 0;
+ extern char **pty_argv; /* declared in pty.c */
- gtk_init(&argc, &argv);
+ /*
+ * Macros to make argument handling easier. Note that because
+ * they need to call `continue', they cannot be contained in
+ * the usual do {...} while (0) wrapper to make them
+ * syntactically single statements; hence it is not legal to
+ * use one of these macros as an unbraced statement between
+ * `if' and `else'.
+ */
+#define EXPECTS_ARG { \
+ if (--argc <= 0) { \
+ err = 1; \
+ fprintf(stderr, "pterm: %s expects an argument\n", p); \
+ continue; \
+ } else \
+ val = *++argv; \
+}
+#define SECOND_PASS_ONLY { if (!do_everything) continue; }
- do_defaults(NULL, &cfg);
+ /*
+ * TODO:
+ *
+ * finish -geometry
+ */
+ char *val;
while (--argc > 0) {
char *p = *++argv;
- if (!strcmp(p, "-fn")) {
- if (--argc > 0) {
- strncpy(cfg.font, *++argv, sizeof(cfg.font));
- cfg.font[sizeof(cfg.font)-1] = '\0';
- } else
- err = 1, fprintf(stderr, "pterm: -fn expects an argument\n");
- }
- if (!strcmp(p, "-e")) {
+ 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';
+
+ } else if (!strcmp(p, "-fb")) {
+ EXPECTS_ARG;
+ SECOND_PASS_ONLY;
+ strncpy(cfg.boldfont, val, sizeof(cfg.boldfont));
+ cfg.boldfont[sizeof(cfg.boldfont)-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';
+
+ } else if (!strcmp(p, "-fwb")) {
+ EXPECTS_ARG;
+ SECOND_PASS_ONLY;
+ strncpy(cfg.wideboldfont, val, sizeof(cfg.wideboldfont));
+ cfg.wideboldfont[sizeof(cfg.wideboldfont)-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';
+
+ } else if (!strcmp(p, "-geometry")) {
+ int flags, x, y, w, h;
+ EXPECTS_ARG;
+ SECOND_PASS_ONLY;
+
+ flags = XParseGeometry(val, &x, &y, &w, &h);
+ if (flags & WidthValue)
+ cfg.width = w;
+ if (flags & HeightValue)
+ cfg.height = h;
+
+ /*
+ * Apparently setting the initial window position is
+ * difficult in GTK 1.2. Not entirely sure why this
+ * should be. 2.0 has gtk_window_parse_geometry(),
+ * which would help... For the moment, though, I can't
+ * be bothered with this.
+ */
+
+ } else if (!strcmp(p, "-sl")) {
+ EXPECTS_ARG;
+ SECOND_PASS_ONLY;
+ cfg.savelines = atoi(val);
+
+ } else if (!strcmp(p, "-fg") || !strcmp(p, "-bg") ||
+ !strcmp(p, "-bfg") || !strcmp(p, "-bbg") ||
+ !strcmp(p, "-cfg") || !strcmp(p, "-cbg")) {
+ GdkColor col;
+
+ EXPECTS_ARG;
+ SECOND_PASS_ONLY;
+ if (!gdk_color_parse(val, &col)) {
+ err = 1;
+ fprintf(stderr, "pterm: unable to parse colour \"%s\"\n", val);
+ } else {
+ int index;
+ index = (!strcmp(p, "-fg") ? 0 :
+ !strcmp(p, "-bg") ? 2 :
+ !strcmp(p, "-bfg") ? 1 :
+ !strcmp(p, "-bbg") ? 3 :
+ !strcmp(p, "-cfg") ? 4 :
+ !strcmp(p, "-cbg") ? 5 : -1);
+ assert(index != -1);
+ 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")) {
+ /* This option swallows all further arguments. */
+ if (!do_everything)
+ break;
+
if (--argc > 0) {
int i;
pty_argv = smalloc((argc+1) * sizeof(char *));
break; /* finished command-line processing */
} else
err = 1, fprintf(stderr, "pterm: -e expects an argument\n");
- }
- if (!strcmp(p, "-T")) {
- if (--argc > 0) {
- strncpy(cfg.wintitle, *++argv, sizeof(cfg.wintitle));
- cfg.wintitle[sizeof(cfg.wintitle)-1] = '\0';
- } else
- err = 1, fprintf(stderr, "pterm: -T expects an argument\n");
- }
- if (!strcmp(p, "-log")) {
- if (--argc > 0) {
- strncpy(cfg.logfilename, *++argv, sizeof(cfg.logfilename));
- cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0';
- cfg.logtype = LGTYP_DEBUG;
- } else
- err = 1, fprintf(stderr, "pterm: -log expects an argument\n");
- }
- if (!strcmp(p, "-hide")) {
- cfg.hide_mouseptr = 1;
- }
- if (!strcmp(p, "-ut-")) {
+
+ } else if (!strcmp(p, "-T")) {
+ EXPECTS_ARG;
+ SECOND_PASS_ONLY;
+ 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;
+
+ } else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
+ SECOND_PASS_ONLY;
cfg.stamp_utmp = 0;
- }
- if (!strcmp(p, "-ls-")) {
+
+ } else if (!strcmp(p, "-ut")) {
+ SECOND_PASS_ONLY;
+ cfg.stamp_utmp = 1;
+
+ } else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) {
+ SECOND_PASS_ONLY;
cfg.login_shell = 0;
- }
- if (!strcmp(p, "-nethack")) {
+
+ } else if (!strcmp(p, "-ls")) {
+ SECOND_PASS_ONLY;
+ cfg.login_shell = 1;
+
+ } else if (!strcmp(p, "-nethack")) {
+ SECOND_PASS_ONLY;
cfg.nethack_keypad = 1;
- }
- if (!strcmp(p, "-sb-")) {
+
+ } else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) {
+ SECOND_PASS_ONLY;
+ cfg.scrollbar = 0;
+
+ } else if (!strcmp(p, "-sb")) {
+ SECOND_PASS_ONLY;
cfg.scrollbar = 0;
+
+ } else if (!strcmp(p, "-name")) {
+ EXPECTS_ARG;
+ app_name = val;
+
+ } else if (!strcmp(p, "-xrm")) {
+ EXPECTS_ARG;
+ provide_xrm_string(val);
+
+ } else if(!strcmp(p, "-help") || !strcmp(p, "--help")) {
+ help(stdout);
+ exit(0);
+
+ } else {
+ err = 1;
+ fprintf(stderr, "pterm: unrecognized option '%s'\n", p);
+ }
+ }
+
+ return err;
+}
+
+static void block_signal(int sig, int block_it) {
+ sigset_t ss;
+
+ sigemptyset(&ss);
+ sigaddset(&ss, sig);
+ if(sigprocmask(block_it ? SIG_BLOCK : SIG_UNBLOCK, &ss, 0) < 0) {
+ perror("sigprocmask");
+ exit(1);
+ }
+}
+
+/*
+ * This function retrieves the character set encoding of a font. It
+ * returns the character set without the X11 hack (in case the user
+ * asks to use the font's own encoding).
+ */
+static int set_font_info(struct gui_data *inst, int fontid)
+{
+ GdkFont *font = inst->fonts[fontid];
+ XFontStruct *xfs = GDK_FONT_XFONT(font);
+ Display *disp = GDK_FONT_XDISPLAY(font);
+ Atom charset_registry, charset_encoding;
+ unsigned long registry_ret, encoding_ret;
+ int retval = CS_NONE;
+
+ charset_registry = XInternAtom(disp, "CHARSET_REGISTRY", False);
+ charset_encoding = XInternAtom(disp, "CHARSET_ENCODING", False);
+ inst->fontinfo[fontid].charset = CS_NONE;
+ inst->fontinfo[fontid].is_wide = 0;
+ if (XGetFontProperty(xfs, charset_registry, ®istry_ret) &&
+ XGetFontProperty(xfs, charset_encoding, &encoding_ret)) {
+ char *reg, *enc;
+ reg = XGetAtomName(disp, (Atom)registry_ret);
+ enc = XGetAtomName(disp, (Atom)encoding_ret);
+ if (reg && enc) {
+ char *encoding = dupcat(reg, "-", enc, NULL);
+ retval = inst->fontinfo[fontid].charset =
+ charset_from_xenc(encoding);
+ /* FIXME: when libcharset supports wide encodings fix this. */
+ if (!strcasecmp(encoding, "iso10646-1")) {
+ inst->fontinfo[fontid].is_wide = 1;
+ retval = CS_UTF8;
+ }
+
+ /*
+ * Hack for X line-drawing characters: if the primary
+ * font is encoded as ISO-8859-anything, and has valid
+ * glyphs in the first 32 char positions, it is assumed
+ * that those glyphs are the VT100 line-drawing
+ * character set.
+ *
+ * Actually, we'll hack even harder by only checking
+ * position 0x19 (vertical line, VT100 linedrawing
+ * `x'). Then we can check it easily by seeing if the
+ * ascent and descent differ.
+ */
+ if (inst->fontinfo[fontid].charset == CS_ISO8859_1) {
+ int lb, rb, wid, asc, desc;
+ gchar text[2];
+
+ text[1] = '\0';
+ text[0] = '\x12';
+ gdk_string_extents(inst->fonts[fontid], text,
+ &lb, &rb, &wid, &asc, &desc);
+ if (asc != desc)
+ inst->fontinfo[fontid].charset = CS_ISO8859_1_X11;
+ }
+
+ sfree(encoding);
}
}
+ return retval;
+}
+
+int main(int argc, char **argv)
+{
+ extern int pty_master_fd; /* declared in pty.c */
+ extern void pty_pre_init(void); /* declared in pty.c */
+ struct gui_data *inst;
+ int font_charset;
+
+ /* defer any child exit handling until we're ready to deal with
+ * 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));
+ memset(inst, 0, sizeof(*inst));
+ inst->alt_keycode = -1; /* this one needs _not_ to be zero */
+
inst->fonts[0] = gdk_font_load(cfg.font);
- inst->fonts[1] = NULL; /* FIXME: what about bold font? */
+ if (!inst->fonts[0]) {
+ fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font);
+ exit(1);
+ }
+ font_charset = set_font_info(inst, 0);
+ if (cfg.boldfont[0]) {
+ inst->fonts[1] = gdk_font_load(cfg.boldfont);
+ if (!inst->fonts[1]) {
+ fprintf(stderr, "pterm: unable to load bold font \"%s\"\n",
+ cfg.boldfont);
+ 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->fonts[2]) {
+ fprintf(stderr, "pterm: unable to load wide font \"%s\"\n",
+ cfg.boldfont);
+ 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->fonts[3]) {
+ fprintf(stderr, "pterm: unable to load wide/bold font \"%s\"\n",
+ cfg.boldfont);
+ exit(1);
+ }
+ set_font_info(inst, 3);
+ } else
+ inst->fonts[3] = NULL;
+
inst->font_width = gdk_char_width(inst->fonts[0], ' ');
inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent;
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
+ inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
- init_ucs();
+ inst->direct_to_font = init_ucs(font_charset);
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
if (cfg.wintitle[0])
- set_title(cfg.wintitle);
+ set_title(inst, cfg.wintitle);
else
- set_title("pterm");
+ set_title(inst, "pterm");
/*
* Set up the colour map.
*/
- palette_reset();
+ palette_reset(inst);
inst->area = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
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)
+ gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
+ else
+ gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0);
+ }
gtk_box_pack_start(inst->hbox, inst->area, TRUE, TRUE, 0);
- if (cfg.scrollbar)
- gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox));
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_widget_show(GTK_WIDGET(inst->hbox));
gtk_widget_show(inst->window);
- inst->textcursor = make_mouse_ptr(GDK_XTERM);
- inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR);
- inst->blankcursor = make_mouse_ptr(-1);
- make_mouse_ptr(-2); /* clean up cursor font */
+ set_window_background(inst);
+
+ inst->textcursor = make_mouse_ptr(inst, GDK_XTERM);
+ inst->rawcursor = make_mouse_ptr(inst, GDK_LEFT_PTR);
+ inst->blankcursor = make_mouse_ptr(inst, -1);
+ make_mouse_ptr(inst, -2); /* clean up cursor font */
inst->currcursor = inst->textcursor;
- show_mouseptr(1);
+ show_mouseptr(inst, 1);
+
+ inst->term = term_init(&cfg, inst);
+ inst->logctx = log_init(inst);
+ term_provide_logctx(inst->term, inst->logctx);
+
+ inst->back = &pty_backend;
+ inst->back->init((void *)inst->term, &inst->backhandle, &cfg,
+ NULL, 0, NULL, 0);
+ inst->back->provide_logctx(inst->backhandle, inst->logctx);
+
+ term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
- back = &pty_backend;
- back->init(NULL, 0, NULL, 0);
+ term_size(inst->term, cfg.height, cfg.width, cfg.savelines);
- gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst);
+ inst->ldisc =
+ ldisc_create(&cfg, inst->term, inst->back, inst->backhandle, inst);
+ ldisc_send(inst->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
- term_init();
- term_size(cfg.height, cfg.width, cfg.savelines);
+ 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);
+
gtk_main();
return 0;
projects / u / mdw / putty / blobdiff