guint term_paste_idle_id;
GdkAtom compound_text_atom;
char wintitle[sizeof(((Config *)0)->wintitle)];
+ char icontitle[sizeof(((Config *)0)->wintitle)];
};
static struct gui_data the_inst;
*/
}
+int font_dimension(int which) /* 0 for width, 1 for height */
+{
+ if (which)
+ return inst->font_height;
+ else
+ return inst->font_width;
+}
+
/*
* Translate a raw mouse button designation (LEFT, MIDDLE, RIGHT)
* into a cooked one (SELECT, EXTEND, PASTE).
*/
void set_iconic(int iconic)
{
- /* FIXME: currently ignored */
+ /*
+ * GTK 1.2 doesn't know how to do this.
+ */
+#if GTK_CHECK_VERSION(2,0,0)
+ if (iconic)
+ gtk_window_iconify(GTK_WINDOW(inst->window));
+ else
+ gtk_window_deiconify(GTK_WINDOW(inst->window));
+#endif
}
/*
*/
void move_window(int x, int y)
{
- /* FIXME: currently ignored */
+ /*
+ * 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,
+ * though.
+ */
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_window_move(GTK_WINDOW(inst->window), x, y);
+#else
+ gdk_window_move(inst->window->window, x, y);
+#endif
}
/*
*/
void set_zorder(int top)
{
- /* FIXME: currently ignored */
+ if (top)
+ gdk_window_raise(inst->window->window);
+ else
+ gdk_window_lower(inst->window->window);
}
/*
*/
void refresh_window(void)
{
- /* FIXME: currently ignored */
+ term_invalidate();
}
/*
*/
void set_zoomed(int zoomed)
{
- /* FIXME: currently ignored */
+ /*
+ * GTK 1.2 doesn't know how to do this.
+ */
+#if GTK_CHECK_VERSION(2,0,0)
+ if (iconic)
+ gtk_window_maximize(GTK_WINDOW(inst->window));
+ else
+ gtk_window_unmaximize(GTK_WINDOW(inst->window));
+#endif
}
/*
*/
int is_iconic(void)
{
- return 0; /* FIXME */
+ return !gdk_window_is_viewable(inst->window->window);
}
/*
*/
void get_window_pos(int *x, int *y)
{
- *x = 3; *y = 4; /* FIXME */
+ /*
+ * 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,
+ * though.
+ */
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_window_get_position(GTK_WINDOW(inst->window), x, y);
+#else
+ gdk_window_get_position(inst->window->window, x, y);
+#endif
}
/*
*/
void get_window_pixels(int *x, int *y)
{
- *x = 1; *y = 2; /* FIXME */
+ /*
+ * 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,
+ * though.
+ */
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_window_get_size(GTK_WINDOW(inst->window), x, y);
+#else
+ gdk_window_get_size(inst->window->window, x, y);
+#endif
}
/*
*/
char *get_window_title(int icon)
{
- return inst->wintitle;
+ return icon ? inst->wintitle : inst->icontitle;
}
gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
struct gui_data *inst = (struct gui_data *)data;
int w, h, need_size = 0;
- /*
- * Set up the colour map.
- */
- palette_reset();
-
w = (event->width - 2*cfg.window_border) / inst->font_width;
h = (event->height - 2*cfg.window_border) / inst->font_height;
/*
* NYI:
- * - nethack mode
* - alt+numpad
* - Compose key (!!! requires Unicode faff before even trying)
*/
void request_resize(int w, int h)
{
- /* FIXME: currently ignored */
+ int large_x, large_y;
+ int offset_x, offset_y;
+ int area_x, area_y;
+ GtkRequisition inner, outer;
+
+ /*
+ * This is a heinous hack dreamed up by the gnome-terminal
+ * people to get around a limitation in gtk. The problem is
+ * that in order to set the size correctly we really need to be
+ * calling gtk_window_resize - but that needs to know the size
+ * of the _whole window_, not the drawing area. So what we do
+ * is to set an artificially huge size request on the drawing
+ * area, recompute the resulting size request on the window,
+ * and look at the difference between the two. That gives us
+ * the x and y offsets we need to translate drawing area size
+ * into window size for real, and then we call
+ * gtk_window_resize.
+ */
+
+ /*
+ * We start by retrieving the current size of the whole window.
+ * Adding a bit to _that_ will give us a value we can use as a
+ * bogus size request which guarantees to be bigger than the
+ * current size of the drawing area.
+ */
+ get_window_pixels(&large_x, &large_y);
+ large_x += 32;
+ large_y += 32;
+
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_widget_set_size_request(inst->area, large_x, large_y);
+#else
+ gtk_widget_set_usize(inst->area, large_x, large_y);
+#endif
+ gtk_widget_size_request(inst->area, &inner);
+ gtk_widget_size_request(inst->window, &outer);
+
+ offset_x = outer.width - inner.width;
+ offset_y = outer.height - inner.height;
+
+ area_x = inst->font_width * w + 2*cfg.window_border;
+ area_y = inst->font_height * h + 2*cfg.window_border;
+
+ /*
+ * Now we must set the size request on the drawing area back to
+ * something sensible before we commit the real resize. Best
+ * way to do this, I think, is to set it to what the size is
+ * really going to end up being.
+ */
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_widget_set_size_request(inst->area, area_x, area_y);
+#else
+ gtk_widget_set_usize(inst->area, area_x, area_y);
+#endif
+
+#if GTK_CHECK_VERSION(2,0,0)
+ gtk_window_resize(GTK_WINDOW(inst->window),
+ area_x + offset_x, area_y + offset_y);
+#else
+ gdk_window_resize(inst->window->window,
+ area_x + offset_x, area_y + offset_y);
+#endif
}
void real_palette_set(int n, int r, int g, int b)
void set_icon(char *title)
{
- /* FIXME: currently ignored */
+ 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)
{
+ if (!cfg.scrollbar)
+ return;
inst->sbar_adjust->lower = 0;
inst->sbar_adjust->upper = total;
inst->sbar_adjust->value = start;
void scrollbar_moved(GtkAdjustment *adj, gpointer data)
{
+ if (!cfg.scrollbar)
+ return;
if (!inst->ignore_sbar)
term_scroll(1, (int)adj->value);
}
/*
* NYI:
* - Unicode, code pages, and ATTR_WIDE for CJK support.
- * - LATTR_* (ESC # 4 double-width and double-height stuff)
* - cursor shapes other than block
* - shadow bolding
*/
nbg = NCOLOURS-1;
}
+ if (lattr != LATTR_NORM) {
+ x *= 2;
+ if (x >= cols)
+ return;
+ if (x + len*2 > cols)
+ len = (cols-x)/2; /* trim to LH half */
+ }
+
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 + uheight + cfg.window_border);
}
+ if (lattr != LATTR_NORM) {
+ /*
+ * I can't find any plausible StretchBlt equivalent in the
+ * X server, so I'm going to do this the slow and painful
+ * way. This will involve repeated calls to
+ * gdk_draw_pixmap() to stretch the text horizontally. It's
+ * O(N^2) in time and O(N) in network bandwidth, but you
+ * try thinking of a better way. :-(
+ */
+ int i;
+ for (i = 0; i < len * inst->font_width; i++) {
+ gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap,
+ x*inst->font_width+cfg.window_border + 2*i,
+ y*inst->font_height+cfg.window_border,
+ x*inst->font_width+cfg.window_border + 2*i+1,
+ y*inst->font_height+cfg.window_border,
+ len * inst->font_width - i, inst->font_height);
+ }
+ len *= 2;
+ if (lattr != LATTR_WIDE) {
+ int dt, db;
+ /* Now stretch vertically, in the same way. */
+ if (lattr == LATTR_BOT)
+ dt = 0, db = 1;
+ else
+ dt = 1, db = 0;
+ for (i = 0; i < inst->font_height; i+=2) {
+ gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap,
+ x*inst->font_width+cfg.window_border,
+ y*inst->font_height+cfg.window_border+dt*i+db,
+ x*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);
+ }
+ }
+ len *= 2;
+ }
+
gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
x*inst->font_width+cfg.window_border,
y*inst->font_height+cfg.window_border,
exit(1);
}
+char *get_x_display(void)
+{
+ return gdk_get_display();
+}
+
int main(int argc, char **argv)
{
extern int pty_master_fd; /* declared in pty.c */
if (!strcmp(p, "-hide")) {
cfg.hide_mouseptr = 1;
}
+ if (!strcmp(p, "-ut-")) {
+ cfg.stamp_utmp = 0;
+ }
+ if (!strcmp(p, "-ls-")) {
+ cfg.login_shell = 0;
+ }
if (!strcmp(p, "-nethack")) {
cfg.nethack_keypad = 1;
}
+ if (!strcmp(p, "-sb-")) {
+ cfg.scrollbar = 0;
+ }
}
inst->fonts[0] = gdk_font_load(cfg.font);
init_ucs();
- back = &pty_backend;
- back->init(NULL, 0, NULL, 0);
-
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
if (cfg.wintitle[0])
else
set_title("pterm");
+ /*
+ * Set up the colour map.
+ */
+ palette_reset();
+
inst->area = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
inst->font_width * cfg.width + 2*cfg.window_border,
inst->font_height * cfg.height + 2*cfg.window_border);
- inst->sbar_adjust = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 0, 0, 0, 0));
- inst->sbar = gtk_vscrollbar_new(inst->sbar_adjust);
+ if (cfg.scrollbar) {
+ inst->sbar_adjust = GTK_ADJUSTMENT(gtk_adjustment_new(0,0,0,0,0,0));
+ inst->sbar = gtk_vscrollbar_new(inst->sbar_adjust);
+ }
inst->hbox = GTK_BOX(gtk_hbox_new(FALSE, 0));
gtk_box_pack_start(inst->hbox, inst->area, TRUE, TRUE, 0);
- gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 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(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);
+ if (cfg.scrollbar)
+ gtk_signal_connect(GTK_OBJECT(inst->sbar_adjust), "value_changed",
+ GTK_SIGNAL_FUNC(scrollbar_moved), inst);
gtk_timeout_add(20, timer_func, inst);
- gdk_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_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
gtk_widget_show(inst->area);
- gtk_widget_show(inst->sbar);
+ if (cfg.scrollbar)
+ gtk_widget_show(inst->sbar);
gtk_widget_show(GTK_WIDGET(inst->hbox));
gtk_widget_show(inst->window);
inst->currcursor = inst->textcursor;
show_mouseptr(1);
+ back = &pty_backend;
+ back->init(NULL, 0, NULL, 0);
+
+ gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst);
+
term_init();
- term_size(24, 80, 2000);
+ term_size(cfg.height, cfg.width, cfg.savelines);
gtk_main();
~mdw / sgt / putty / blobdiff