Only engage a GTK idle function when absolutely necessary, otherwise
[u/mdw/putty] / unix / pterm.c
index 97fe6c4..0c1dc7c 100644 (file)
@@ -8,6 +8,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #define NCOLOURS (lenof(((Config *)0)->colours))
 
 struct gui_data {
-    GtkWidget *area;
+    GtkWidget *window, *area, *sbar;
+    GtkBox *hbox;
+    GtkAdjustment *sbar_adjust;
     GdkPixmap *pixmap;
     GdkFont *fonts[2];                 /* normal and bold (for now!) */
-    GdkCursor *rawcursor, *textcursor;
+    GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor;
     GdkColor cols[NCOLOURS];
     GdkColormap *colmap;
-    GdkGC *black_gc, *white_gc;
+    wchar_t *pastein_data;
+    int pastein_data_len;
+    char *pasteout_data;
+    int pasteout_data_len;
+    int font_width, font_height;
+    int ignore_sbar;
+    guint term_paste_idle_id;
+    GdkAtom compound_text_atom;
+    char wintitle[sizeof(((Config *)0)->wintitle)];
 };
 
 static struct gui_data the_inst;
@@ -47,8 +60,10 @@ void ldisc_update(int echo, int edit)
 int askappend(char *filename)
 {
     /*
-     * FIXME: for the moment we just wipe the log file. Since I
-     * haven't yet enabled logging, this shouldn't matter yet!
+     * Logging in an xterm-alike is liable to be something you only
+     * do at serious diagnostic need. Hence, I'm going to take the
+     * easy option for now and assume we always want to overwrite
+     * log files. I can always make it properly configurable later.
      */
     return 2;
 }
@@ -56,7 +71,9 @@ int askappend(char *filename)
 void logevent(char *string)
 {
     /*
-     * FIXME: event log entries are currently ignored.
+     * This is not a very helpful function: events are logged
+     * pretty much exclusively by the back end, and our pty back
+     * end is self-contained. So we need do nothing.
      */
 }
 
@@ -152,59 +169,69 @@ void get_window_pixels(int *x, int *y)
  */
 char *get_window_title(int icon)
 {
-    return "FIXME: window title retrieval not yet implemented";
+    return inst->wintitle;
 }
 
 gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     /*
-     * FIXME: warn on close?
+     * We could implement warn-on-close here if we really wanted
+     * to.
      */
     return FALSE;
 }
 
+void show_mouseptr(int show)
+{
+    if (!cfg.hide_mouseptr)
+       show = 1;
+    if (show)
+       gdk_window_set_cursor(inst->area->window, inst->currcursor);
+    else
+       gdk_window_set_cursor(inst->area->window, inst->blankcursor);
+}
+
 gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-
-    if (inst->pixmap)
-       gdk_pixmap_unref(inst->pixmap);
-
-    inst->pixmap = gdk_pixmap_new(widget->window, 9*80, 15*24, -1);
-
-    inst->fonts[0] = gdk_font_load("9x15t");   /* XXCONFIG */
-    inst->fonts[1] = NULL;             /* XXCONFIG */
-    inst->black_gc = widget->style->black_gc;
-    inst->white_gc = widget->style->white_gc;
+    int w, h, need_size = 0;
 
     /*
      * Set up the colour map.
      */
-    inst->colmap = gdk_colormap_get_system();
-    {
-       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
-       };
-       gboolean success[NCOLOURS];
-       int i;
-
-       assert(lenof(ww) == NCOLOURS);
-
-       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;
-       }
+    palette_reset();
 
-       gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS,
-                                 FALSE, FALSE, success);
-       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]);
+    w = (event->width - 2*cfg.window_border) / inst->font_width;
+    h = (event->height - 2*cfg.window_border) / inst->font_height;
+
+    if (w != cfg.width || h != cfg.height) {
+       if (inst->pixmap) {
+           gdk_pixmap_unref(inst->pixmap);
+           inst->pixmap = NULL;
        }
+       cfg.width = w;
+       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);
+
+       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);
+       gdk_gc_unref(gc);
+    }
+
+    if (need_size) {
+       term_size(h, w, cfg.savelines);
     }
 
     return TRUE;
@@ -218,10 +245,14 @@ gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data)
      * Pass the exposed rectangle to terminal.c, which will call us
      * back to do the actual painting.
      */
-    term_paint(NULL, 
-              event->area.x / 9, event->area.y / 15,
-              (event->area.x + event->area.width - 1) / 9,
-              (event->area.y + event->area.height - 1) / 15);
+    if (inst->pixmap) {
+       gdk_draw_pixmap(widget->window,
+                       widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+                       inst->pixmap,
+                       event->area.x, event->area.y,
+                       event->area.x, event->area.y,
+                       event->area.width, event->area.height);
+    }
     return TRUE;
 }
 
@@ -248,13 +279,32 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 
        /*
         * NYI:
-        *  - Shift-PgUp/PgDn for scrollbar
         *  - nethack mode
         *  - alt+numpad
         *  - Compose key (!!! requires Unicode faff before even trying)
-        *  - Shift-Ins for paste (need to deal with pasting first)
         */
 
+       /*
+        * 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);
+           return TRUE;
+       }
+       if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
+           term_scroll(0, +cfg.height/2);
+           return TRUE;
+       }
+
+       /*
+        * Neither does Shift-Ins.
+        */
+       if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) {
+           request_paste();
+           return TRUE;
+       }
+
        /* ALT+things gives leading Escape. */
        output[0] = '\033';
        strncpy(output+1, event->string, 31);
@@ -311,6 +361,32 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
        }
 
        /*
+        * NetHack keypad mode.
+        */
+       if (cfg.nethack_keypad) {
+           char *keys = NULL;
+           switch (event->keyval) {
+             case GDK_KP_1: case GDK_KP_End: keys = "bB"; break;
+             case GDK_KP_2: case GDK_KP_Down: keys = "jJ"; break;
+             case GDK_KP_3: case GDK_KP_Page_Down: keys = "nN"; break;
+             case GDK_KP_4: case GDK_KP_Left: keys = "hH"; break;
+             case GDK_KP_5: case GDK_KP_Begin: keys = ".."; break;
+             case GDK_KP_6: case GDK_KP_Right: keys = "lL"; break;
+             case GDK_KP_7: case GDK_KP_Home: keys = "yY"; break;
+             case GDK_KP_8: case GDK_KP_Up: keys = "kK"; break;
+             case GDK_KP_9: case GDK_KP_Page_Up: keys = "uU"; break;
+           }
+           if (keys) {
+               end = 2;
+               if (event->state & GDK_SHIFT_MASK)
+                   output[1] = keys[1];
+               else
+                   output[1] = keys[0];
+               goto done;
+           }
+       }
+
+       /*
         * Application keypad mode.
         */
        if (app_keypad_keys && !cfg.no_applic_k) {
@@ -578,21 +654,129 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
            printf("\n");
        }
 #endif
-       ldisc_send(output+start, end-start, 1);
-       term_out();
+       if (end-start > 0) {
+           ldisc_send(output+start, end-start, 1);
+           show_mouseptr(0);
+           term_out();
+       }
+    }
+
+    return TRUE;
+}
+
+gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+    struct gui_data *inst = (struct gui_data *)data;
+    int shift, ctrl, alt, x, y, button, act;
+
+    show_mouseptr(1);
+
+    shift = event->state & GDK_SHIFT_MASK;
+    ctrl = event->state & GDK_CONTROL_MASK;
+    alt = event->state & GDK_MOD1_MASK;
+    if (event->button == 1)
+       button = MBT_LEFT;
+    else if (event->button == 2)
+       button = MBT_MIDDLE;
+    else if (event->button == 3)
+       button = MBT_RIGHT;
+    else
+       return FALSE;                  /* don't even know what button! */
+
+    switch (event->type) {
+      case GDK_BUTTON_PRESS: act = MA_CLICK; break;
+      case GDK_BUTTON_RELEASE: act = MA_RELEASE; break;
+      case GDK_2BUTTON_PRESS: act = MA_2CLK; break;
+      case GDK_3BUTTON_PRESS: act = MA_3CLK; break;
+      default: return FALSE;          /* don't know this event type */
     }
 
+    if (send_raw_mouse && !(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;
+
+    term_mouse(button, act, x, y, shift, ctrl, alt);
+
+    return TRUE;
+}
+
+gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+{
+    struct gui_data *inst = (struct gui_data *)data;
+    int shift, ctrl, alt, x, y, button;
+
+    show_mouseptr(1);
+
+    shift = event->state & GDK_SHIFT_MASK;
+    ctrl = event->state & GDK_CONTROL_MASK;
+    alt = event->state & GDK_MOD1_MASK;
+    if (event->state & GDK_BUTTON1_MASK)
+       button = MBT_LEFT;
+    else if (event->state & GDK_BUTTON2_MASK)
+       button = MBT_MIDDLE;
+    else if (event->state & GDK_BUTTON3_MASK)
+       button = MBT_RIGHT;
+    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;
+
+    term_mouse(button, MA_DRAG, x, y, shift, ctrl, alt);
+
     return TRUE;
 }
 
 gint timer_func(gpointer data)
 {
     /* struct gui_data *inst = (struct gui_data *)data; */
+    extern int pty_child_is_dead();  /* declared in pty.c */
+
+    if (pty_child_is_dead()) {
+       /*
+        * 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.
+        */
+       exit(0);
+    }
 
     term_update();
     return TRUE;
 }
 
+void pty_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)) {
+       exit(0);
+    }
+
+    if (ret < 0) {
+       perror("read pty master");
+       exit(1);
+    }
+    if (ret > 0)
+       from_backend(0, buf, ret);
+    term_out();
+}
+
 void destroy(GtkWidget *widget, gpointer data)
 {
     gtk_main_quit();
@@ -603,6 +787,7 @@ gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
     has_focus = event->in;
     term_out();
     term_update();
+    show_mouseptr(1);
     return FALSE;
 }
 
@@ -614,9 +799,10 @@ void set_raw_mouse_mode(int activate)
     activate = activate && !cfg.no_mouse_rep;
     send_raw_mouse = activate;
     if (send_raw_mouse)
-       gdk_window_set_cursor(inst->area->window, inst->rawcursor);
+       inst->currcursor = inst->rawcursor;
     else
-       gdk_window_set_cursor(inst->area->window, inst->textcursor);
+       inst->currcursor = inst->textcursor;
+    show_mouseptr(1);
 }
 
 void request_resize(int w, int h)
@@ -624,32 +810,163 @@ void request_resize(int w, int h)
     /* FIXME: currently ignored */
 }
 
+void real_palette_set(int n, int r, int g, int b)
+{
+    gboolean success[1];
+
+    inst->cols[n].red = r * 0x0101;
+    inst->cols[n].green = g * 0x0101;
+    inst->cols[n].blue = b * 0x0101;
+
+    gdk_colormap_alloc_colors(inst->colmap, inst->cols + n, 1,
+                             FALSE, FALSE, success);
+    if (!success[0])
+       g_error("pterm: couldn't allocate colour %d (#%02x%02x%02x)\n",
+               n, r, g, b);
+}
+
 void palette_set(int n, int r, int g, int b)
 {
-    /* FIXME: currently ignored */
+    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);
+    if (first[n] >= 18)
+       real_palette_set(first[n] + 1, r, g, b);
 }
+
 void palette_reset(void)
 {
-    /* FIXME: currently ignored */
+    /* This maps colour indices in 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
+    };
+    gboolean success[NCOLOURS];
+    int i;
+
+    assert(lenof(ww) == NCOLOURS);
+
+    if (!inst->colmap) {
+       inst->colmap = gdk_colormap_get_system();
+    } else {
+       gdk_colormap_free_colors(inst->colmap, inst->cols, NCOLOURS);
+    }
+
+    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;
+    }
+
+    gdk_colormap_alloc_colors(inst->colmap, inst->cols, NCOLOURS,
+                             FALSE, FALSE, success);
+    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]);
+    }
 }
 
 void write_clip(wchar_t * data, int len, int must_deselect)
 {
-    /* FIXME: currently ignored */
+    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 (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
+                               GDK_CURRENT_TIME)) {
+       gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+                                GDK_SELECTION_TYPE_STRING, 1);
+       gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+                                inst->compound_text_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);
+}
+
+gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
+                    gpointer data)
+{
+    term_deselect();
+    if (inst->pasteout_data)
+       sfree(inst->pasteout_data);
+    inst->pasteout_data = NULL;
+    inst->pasteout_data_len = 0;
+    return TRUE;
+}
+
+void request_paste(void)
+{
+    /*
+     * 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);
+}
+
+gint idle_paste_func(gpointer data);   /* forward ref */
+
+void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
+                       gpointer data)
+{
+    if (seldata->length <= 0 ||
+       seldata->type != GDK_SELECTION_TYPE_STRING)
+       return;                        /* Nothing happens. */
+
+    if (inst->pastein_data)
+       sfree(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);
+
+    term_do_paste();
+
+    if (term_paste_pending())
+       inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
+}
+
+gint idle_paste_func(gpointer data)
+{
+    struct gui_data *inst = (struct gui_data *)data;
+
+    if (term_paste_pending())
+       term_paste();
+    else
+       gtk_idle_remove(inst->term_paste_idle_id);
+
+    return TRUE;
+}
+
+
 void get_clip(wchar_t ** p, int *len)
 {
     if (p) {
-       /* FIXME: currently nonfunctional */
-       *p = NULL;
-       *len = 0;
+       *p = inst->pastein_data;
+       *len = inst->pastein_data_len;
     }
 }
 
 void set_title(char *title)
 {
-    /* FIXME: currently ignored */
+    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)
@@ -659,7 +976,21 @@ void set_icon(char *title)
 
 void set_sbar(int total, int start, int page)
 {
-    /* FIXME: currently ignored */
+    inst->sbar_adjust->lower = 0;
+    inst->sbar_adjust->upper = total;
+    inst->sbar_adjust->value = start;
+    inst->sbar_adjust->page_size = page;
+    inst->sbar_adjust->step_increment = 1;
+    inst->sbar_adjust->page_increment = page/2;
+    inst->ignore_sbar = TRUE;
+    gtk_adjustment_changed(inst->sbar_adjust);
+    inst->ignore_sbar = FALSE;
+}
+
+void scrollbar_moved(GtkAdjustment *adj, gpointer data)
+{
+    if (!inst->ignore_sbar)
+       term_scroll(1, (int)adj->value);
 }
 
 void sys_cursor(int x, int y)
@@ -713,12 +1044,10 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 
     /*
      * NYI:
-     *  - ATTR_WIDE (is this for Unicode CJK? I hope so)
+     *  - Unicode, code pages, and ATTR_WIDE for CJK support.
      *  - LATTR_* (ESC # 4 double-width and double-height stuff)
      *  - cursor shapes other than block
-     *  - VT100 line drawing stuff; code pages in general!
      *  - shadow bolding
-     *  - underline
      */
 
     nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
@@ -738,22 +1067,33 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     }
 
     gdk_gc_set_foreground(gc, &inst->cols[nbg]);
-    gdk_draw_rectangle(inst->pixmap, gc, 1, x*9, y*15, len*9, 15);
-    
+    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);
+
     gdk_gc_set_foreground(gc, &inst->cols[nfg]);
     gdk_draw_text(inst->pixmap, inst->fonts[0], gc,
-                 x*9, y*15 + inst->fonts[0]->ascent, text, len);
+                 x*inst->font_width+cfg.window_border,
+                 y*inst->font_height+cfg.window_border+inst->fonts[0]->ascent,
+                 text, len);
 
     if (attr & ATTR_UNDER) {
        int uheight = inst->fonts[0]->ascent + 1;
-       if (uheight >= 15)
-           uheight = 14;
-       gdk_draw_line(inst->pixmap, gc, x*9, y*15 + uheight,
-                     (x+len)*9-1, y*15+uheight);
+       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)*inst->font_width-1+cfg.window_border,
+                     y*inst->font_height + uheight + cfg.window_border);
     }
 
     gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
-                   x*9, y*15, x*9, y*15, len*9, 15);
+                   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);
 }
 
 void do_cursor(Context ctx, int x, int y, char *text, int len,
@@ -773,12 +1113,111 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
     do_text(ctx, x, y, text, len, attr, lattr);
     if (passive) {
        gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-1]);
-       gdk_draw_rectangle(inst->pixmap, gc, 0, x*9, y*15, len*9-1, 15-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*9, y*15, x*9, y*15, len*9, 15);
+                       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);
     }
 }
 
+GdkCursor *make_mouse_ptr(int cursor_val)
+{
+    /*
+     * Truly hideous hack: GTK doesn't allow us to set the mouse
+     * cursor foreground and background colours unless we've _also_
+     * created our own cursor from bitmaps. Therefore, I need to
+     * load the `cursor' font and draw glyphs from it on to
+     * pixmaps, in order to construct my cursors with the fg and bg
+     * I want. This is a gross hack, but it's more self-contained
+     * than linking in Xlib to find the X window handle to
+     * inst->area and calling XRecolorCursor, and it's more
+     * futureproof than hard-coding the shapes as bitmap arrays.
+     */
+    static GdkFont *cursor_font = NULL;
+    GdkPixmap *source, *mask;
+    GdkGC *gc;
+    GdkColor cfg = { 0, 65535, 65535, 65535 };
+    GdkColor cbg = { 0, 0, 0, 0 };
+    GdkColor dfg = { 1, 65535, 65535, 65535 };
+    GdkColor dbg = { 0, 0, 0, 0 };
+    GdkCursor *ret;
+    gchar text[2];
+    gint lb, rb, wid, asc, desc, w, h, x, y;
+
+    if (cursor_val == -2) {
+       gdk_font_unref(cursor_font);
+       return NULL;
+    }
+
+    if (cursor_val >= 0 && !cursor_font)
+       cursor_font = gdk_font_load("cursor");
+
+    /*
+     * Get the text extent of the cursor in question. We use the
+     * mask character for this, because it's typically slightly
+     * bigger than the main character.
+     */
+    if (cursor_val >= 0) {
+       text[1] = '\0';
+       text[0] = (char)cursor_val + 1;
+       gdk_string_extents(cursor_font, text, &lb, &rb, &wid, &asc, &desc);
+       w = rb-lb; h = asc+desc; x = -lb; y = asc;
+    } else {
+       w = h = 1;
+       x = y = 0;
+    }
+
+    source = gdk_pixmap_new(NULL, w, h, 1);
+    mask = gdk_pixmap_new(NULL, w, h, 1);
+
+    /*
+     * Draw the mask character on the mask pixmap.
+     */
+    gc = gdk_gc_new(mask);
+    gdk_gc_set_foreground(gc, &dbg);
+    gdk_draw_rectangle(mask, gc, 1, 0, 0, w, h);
+    if (cursor_val >= 0) {
+       text[1] = '\0';
+       text[0] = (char)cursor_val + 1;
+       gdk_gc_set_foreground(gc, &dfg);
+       gdk_draw_text(mask, cursor_font, gc, x, y, text, 1);
+    }
+    gdk_gc_unref(gc);
+
+    /*
+     * Draw the main character on the source pixmap.
+     */
+    gc = gdk_gc_new(source);
+    gdk_gc_set_foreground(gc, &dbg);
+    gdk_draw_rectangle(source, gc, 1, 0, 0, w, h);
+    if (cursor_val >= 0) {
+       text[1] = '\0';
+       text[0] = (char)cursor_val;
+       gdk_gc_set_foreground(gc, &dfg);
+       gdk_draw_text(source, cursor_font, gc, x, y, text, 1);
+    }
+    gdk_gc_unref(gc);
+
+    /*
+     * Create the cursor.
+     */
+    ret = gdk_cursor_new_from_pixmap(source, mask, &cfg, &cbg, x, y);
+
+    /*
+     * Clean up.
+     */
+    gdk_pixmap_unref(source);
+    gdk_pixmap_unref(mask);
+
+    return ret;
+}
+
 void modalfatalbox(char *p, ...)
 {
     va_list ap;
@@ -792,48 +1231,150 @@ void modalfatalbox(char *p, ...)
 
 int main(int argc, char **argv)
 {
-    GtkWidget *window;
+    extern int pty_master_fd;         /* declared in pty.c */
+    extern char **pty_argv;           /* declared in pty.c */
+    int err = 0;
 
     gtk_init(&argc, &argv);
 
     do_defaults(NULL, &cfg);
 
+    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 (--argc > 0) {
+               int i;
+               pty_argv = smalloc((argc+1) * sizeof(char *));
+               ++argv;
+               for (i = 0; i < argc; i++)
+                   pty_argv[i] = argv[i];
+               pty_argv[argc] = NULL;
+               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, "-nethack")) {
+           cfg.nethack_keypad = 1;
+       }
+    }
+
+    inst->fonts[0] = gdk_font_load(cfg.font);
+    inst->fonts[1] = NULL;             /* FIXME: what about bold font? */
+    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);
+
     init_ucs();
 
     back = &pty_backend;
     back->init(NULL, 0, NULL, 0);
 
-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+    if (cfg.wintitle[0])
+       set_title(cfg.wintitle);
+    else
+       set_title("pterm");
+
     inst->area = gtk_drawing_area_new();
     gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
-                         9*80, 15*24);/* FIXME: proper resizing stuff */
+                         inst->font_width * cfg.width + 2*cfg.window_border,
+                         inst->font_height * cfg.height + 2*cfg.window_border);
+    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));
+    gtk_box_pack_start(inst->hbox, inst->area, TRUE, TRUE, 0);
+    gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0);
 
-    gtk_container_add(GTK_CONTAINER(window), inst->area);
+    gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox));
 
-    gtk_signal_connect(GTK_OBJECT(window), "destroy",
+    {
+       GdkGeometry geom;
+       geom.min_width = inst->font_width + 2*cfg.window_border;
+       geom.min_height = inst->font_height + 2*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.width_inc = inst->font_width;
+       geom.height_inc = inst->font_height;
+       geom.min_aspect = geom.max_aspect = 0;
+       gtk_window_set_geometry_hints(GTK_WINDOW(inst->window), inst->area, &geom,
+                                     GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE |
+                                     GDK_HINT_RESIZE_INC);
+    }
+
+    gtk_signal_connect(GTK_OBJECT(inst->window), "destroy",
                       GTK_SIGNAL_FUNC(destroy), inst);
-    gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+    gtk_signal_connect(GTK_OBJECT(inst->window), "delete_event",
                       GTK_SIGNAL_FUNC(delete_window), inst);
-    gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+    gtk_signal_connect(GTK_OBJECT(inst->window), "key_press_event",
                       GTK_SIGNAL_FUNC(key_event), inst);
-    gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
+    gtk_signal_connect(GTK_OBJECT(inst->window), "focus_in_event",
                       GTK_SIGNAL_FUNC(focus_event), inst);
-    gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
+    gtk_signal_connect(GTK_OBJECT(inst->window), "focus_out_event",
                       GTK_SIGNAL_FUNC(focus_event), inst);
     gtk_signal_connect(GTK_OBJECT(inst->area), "configure_event",
                       GTK_SIGNAL_FUNC(configure_area), inst);
     gtk_signal_connect(GTK_OBJECT(inst->area), "expose_event",
                       GTK_SIGNAL_FUNC(expose_area), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->area), "button_press_event",
+                      GTK_SIGNAL_FUNC(button_event), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->area), "button_release_event",
+                      GTK_SIGNAL_FUNC(button_event), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->area), "motion_notify_event",
+                      GTK_SIGNAL_FUNC(motion_event), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->area), "selection_received",
+                      GTK_SIGNAL_FUNC(selection_received), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->area), "selection_get",
+                      GTK_SIGNAL_FUNC(selection_get), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->area), "selection_clear_event",
+                      GTK_SIGNAL_FUNC(selection_clear), inst);
+    gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed",
+                      GTK_SIGNAL_FUNC(scrollbar_moved), inst);
     gtk_timeout_add(20, timer_func, inst);
+    gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst);
     gtk_widget_add_events(GTK_WIDGET(inst->area),
-                         GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
+                         GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
+                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
 
     gtk_widget_show(inst->area);
-    gtk_widget_show(window);
-
-    inst->textcursor = gdk_cursor_new(GDK_XTERM);
-    inst->rawcursor = gdk_cursor_new(GDK_ARROW);
-    gdk_window_set_cursor(inst->area->window, inst->textcursor);
+    gtk_widget_show(inst->sbar);
+    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 */
+    inst->currcursor = inst->textcursor;
+    show_mouseptr(1);
 
     term_init();
     term_size(24, 80, 2000);