X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4c0901edb98a3987acf3ba17e7205f1275ed760c..330f49beb368e6eedcacbf4306c9936d24660a24:/unix/pterm.c diff --git a/unix/pterm.c b/unix/pterm.c index 77743edf..d4b8f4d3 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -38,8 +38,11 @@ struct gui_data { int pasteout_data_len; int font_width, font_height; int ignore_sbar; + int mouseptr_visible; + 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; @@ -102,7 +105,15 @@ Mouse_Button translate_button(Mouse_Button button) */ 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 } /* @@ -110,7 +121,16 @@ void set_iconic(int iconic) */ 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 } /* @@ -119,7 +139,10 @@ void move_window(int x, int y) */ void set_zorder(int top) { - /* FIXME: currently ignored */ + if (top) + gdk_window_raise(inst->window->window); + else + gdk_window_lower(inst->window->window); } /* @@ -127,7 +150,7 @@ void set_zorder(int top) */ void refresh_window(void) { - /* FIXME: currently ignored */ + term_invalidate(); } /* @@ -136,7 +159,15 @@ void refresh_window(void) */ 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 } /* @@ -144,7 +175,7 @@ void set_zoomed(int zoomed) */ int is_iconic(void) { - return 0; /* FIXME */ + return !gdk_window_is_viewable(inst->window->window); } /* @@ -152,7 +183,16 @@ int is_iconic(void) */ 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 } /* @@ -160,7 +200,16 @@ void get_window_pos(int *x, int *y) */ 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 } /* @@ -168,7 +217,7 @@ void get_window_pixels(int *x, int *y) */ char *get_window_title(int icon) { - return inst->wintitle; + return icon ? inst->wintitle : inst->icontitle; } gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data) @@ -188,6 +237,7 @@ void show_mouseptr(int show) gdk_window_set_cursor(inst->area->window, inst->currcursor); else gdk_window_set_cursor(inst->area->window, inst->blankcursor); + inst->mouseptr_visible = show; } gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) @@ -195,8 +245,10 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) struct gui_data *inst = (struct gui_data *)data; int w, h, need_size = 0; +printf("configure %d x %d\n", event->width, event->height); w = (event->width - 2*cfg.window_border) / inst->font_width; h = (event->height - 2*cfg.window_border) / inst->font_height; +printf(" = %d x %d\n", w, h); if (w != cfg.width || h != cfg.height) { if (inst->pixmap) { @@ -206,6 +258,7 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) cfg.width = w; cfg.height = h; need_size = 1; +printf("need size\n"); } if (!inst->pixmap) { GdkGC *gc; @@ -228,11 +281,6 @@ gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data) term_size(h, w, cfg.savelines); } - /* - * Set up the colour map. - */ - palette_reset(); - return TRUE; } @@ -278,7 +326,6 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* * NYI: - * - nethack mode * - alt+numpad * - Compose key (!!! requires Unicode faff before even trying) */ @@ -750,13 +797,6 @@ gint timer_func(gpointer data) 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; */ @@ -808,12 +848,14 @@ void set_raw_mouse_mode(int activate) inst->currcursor = inst->rawcursor; else inst->currcursor = inst->textcursor; - show_mouseptr(1); + show_mouseptr(inst->mouseptr_visible); } void request_resize(int w, int h) { - /* FIXME: currently ignored */ + gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area), + inst->font_width * w + 2*cfg.window_border, + inst->font_height * h + 2*cfg.window_border); } void real_palette_set(int n, int r, int g, int b) @@ -924,6 +966,8 @@ void request_paste(void) GDK_SELECTION_TYPE_STRING, GDK_CURRENT_TIME); } +gint idle_paste_func(gpointer data); /* forward ref */ + void selection_received(GtkWidget *widget, GtkSelectionData *seldata, gpointer data) { @@ -940,8 +984,24 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, 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) { @@ -959,11 +1019,15 @@ void set_title(char *title) 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; @@ -977,6 +1041,8 @@ void set_sbar(int total, int start, int page) void scrollbar_moved(GtkAdjustment *adj, gpointer data) { + if (!cfg.scrollbar) + return; if (!inst->ignore_sbar) term_scroll(1, (int)adj->value); } @@ -1033,7 +1099,6 @@ void do_text(Context ctx, int x, int y, char *text, int len, /* * 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 */ @@ -1054,6 +1119,14 @@ void do_text(Context ctx, int x, int y, char *text, int len, 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, @@ -1076,6 +1149,44 @@ void do_text(Context ctx, int x, int y, char *text, int len, 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, @@ -1217,6 +1328,11 @@ void modalfatalbox(char *p, ...) 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 */ @@ -1266,9 +1382,18 @@ int main(int argc, char **argv) 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); @@ -1280,9 +1405,6 @@ int main(int argc, char **argv) init_ucs(); - back = &pty_backend; - back->init(NULL, 0, NULL, 0); - inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); if (cfg.wintitle[0]) @@ -1290,15 +1412,25 @@ int main(int argc, char **argv) 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_window_set_policy(GTK_WINDOW(inst->window), FALSE, TRUE, TRUE); gtk_container_add(GTK_CONTAINER(inst->window), GTK_WIDGET(inst->hbox)); @@ -1343,18 +1475,18 @@ int main(int argc, char **argv) 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_idle_add(idle_func, 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); @@ -1365,8 +1497,13 @@ int main(int argc, char **argv) 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();