summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a0e16eb)
activated by `-hide' on the command line.
git-svn-id: svn://svn.tartarus.org/sgt/putty@2045
cda61777-01e9-0310-a592-
d414129be87e
GtkAdjustment *sbar_adjust;
GdkPixmap *pixmap;
GdkFont *fonts[2]; /* normal and bold (for now!) */
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;
GdkColor cols[NCOLOURS];
GdkColormap *colmap;
wchar_t *pastein_data;
void logevent(char *string)
{
/*
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.
gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
{
/*
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.
+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;
gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
- 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();
+ }
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button, act;
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button, act;
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
alt = event->state & GDK_MOD1_MASK;
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;
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button;
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
alt = event->state & GDK_MOD1_MASK;
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
alt = event->state & GDK_MOD1_MASK;
has_focus = event->in;
term_out();
term_update();
has_focus = event->in;
term_out();
term_update();
activate = activate && !cfg.no_mouse_rep;
send_raw_mouse = activate;
if (send_raw_mouse)
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;
- gdk_window_set_cursor(inst->area->window, inst->textcursor);
+ inst->currcursor = inst->textcursor;
+ show_mouseptr(1);
}
void request_resize(int w, int h)
}
void request_resize(int w, int h)
- * - 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
* - LATTR_* (ESC # 4 double-width and double-height stuff)
* - cursor shapes other than block
- * - VT100 line drawing stuff; code pages in general!
gchar text[2];
gint lb, rb, wid, asc, desc, w, h, x, y;
gchar text[2];
gint lb, rb, wid, asc, desc, w, h, x, y;
+ if (cursor_val == -2) {
gdk_font_unref(cursor_font);
return NULL;
}
gdk_font_unref(cursor_font);
return NULL;
}
+ if (cursor_val >= 0 && !cursor_font)
cursor_font = gdk_font_load("cursor");
/*
cursor_font = gdk_font_load("cursor");
/*
* mask character for this, because it's typically slightly
* bigger than the main character.
*/
* 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);
source = gdk_pixmap_new(NULL, w, h, 1);
mask = gdk_pixmap_new(NULL, w, h, 1);
/*
* Draw the mask character on the mask pixmap.
*/
/*
* 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);
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.
*/
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);
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);
+ }
} else
err = 1, fprintf(stderr, "pterm: -T expects an argument\n");
}
} else
err = 1, fprintf(stderr, "pterm: -T expects an argument\n");
}
+ if (!strcmp(p, "-hide")) {
+ cfg.hide_mouseptr = 1;
+ }
}
inst->fonts[0] = gdk_font_load(cfg.font);
}
inst->fonts[0] = gdk_font_load(cfg.font);
gtk_widget_add_events(GTK_WIDGET(inst->area),
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
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(inst->area);
gtk_widget_show(inst->sbar);
inst->textcursor = make_mouse_ptr(GDK_XTERM);
inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR);
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);
term_init();
term_size(24, 80, 2000);