#define NCOLOURS (lenof(((Config *)0)->colours))
struct gui_data {
- GtkWidget *area, *sbar;
+ 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;
wchar_t *pastein_data;
int font_width, font_height;
int ignore_sbar;
GdkAtom compound_text_atom;
+ char wintitle[sizeof(((Config *)0)->wintitle)];
};
static struct gui_data the_inst;
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.
*/
}
*/
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;
}
/*
+ * 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) {
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;
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;
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;
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;
}
+gint idle_func(gpointer data)
+{
+ /* struct gui_data *inst = (struct gui_data *)data; */
+ term_paste();
+ return TRUE;
+}
+
void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
{
/* struct gui_data *inst = (struct gui_data *)data; */
has_focus = event->in;
term_out();
term_update();
+ show_mouseptr(1);
return FALSE;
}
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)
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)
/*
* 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
*/
gchar text[2];
gint lb, rb, wid, asc, desc, w, h, x, y;
- if (cursor_val < 0) {
+ if (cursor_val == -2) {
gdk_font_unref(cursor_font);
return NULL;
}
- if (!cursor_font)
+ if (cursor_val >= 0 && !cursor_font)
cursor_font = gdk_font_load("cursor");
/*
* mask character for this, because it's typically slightly
* bigger than the main character.
*/
- 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;
+ 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.
*/
- text[1] = '\0';
- text[0] = (char)cursor_val + 1;
gc = gdk_gc_new(mask);
gdk_gc_set_foreground(gc, &dbg);
gdk_draw_rectangle(mask, gc, 1, 0, 0, w, h);
- gdk_gc_set_foreground(gc, &dfg);
- gdk_draw_text(mask, cursor_font, gc, x, y, text, 1);
+ 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.
*/
- text[1] = '\0';
- text[0] = (char)cursor_val;
gc = gdk_gc_new(source);
gdk_gc_set_foreground(gc, &dbg);
gdk_draw_rectangle(source, gc, 1, 0, 0, w, h);
- gdk_gc_set_foreground(gc, &dfg);
- gdk_draw_text(source, cursor_font, gc, x, y, text, 1);
+ 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);
/*
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;
} 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, "-hide")) {
+ cfg.hide_mouseptr = 1;
+ }
+ if (!strcmp(p, "-nethack")) {
+ cfg.nethack_keypad = 1;
+ }
}
inst->fonts[0] = gdk_font_load(cfg.font);
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),
inst->font_width * cfg.width + 2*cfg.window_border,
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), GTK_WIDGET(inst->hbox));
+ gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox));
{
GdkGeometry geom;
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(window), inst->area, &geom,
+ 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(window), "destroy",
+ 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_FUNC(selection_clear), inst);
gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed",
GTK_SIGNAL_FUNC(scrollbar_moved), inst);
+ gtk_idle_add(idle_func, 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_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON_MOTION_MASK);
+ GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
gtk_widget_show(inst->area);
gtk_widget_show(inst->sbar);
gtk_widget_show(GTK_WIDGET(inst->hbox));
- gtk_widget_show(window);
+ gtk_widget_show(inst->window);
inst->textcursor = make_mouse_ptr(GDK_XTERM);
inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR);
- make_mouse_ptr(-1); /* clean up cursor font */
- gdk_window_set_cursor(inst->area->window, inst->textcursor);
+ 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);