int mouseptr_visible;
guint term_paste_idle_id;
GdkAtom compound_text_atom;
+ int alt_keycode;
char wintitle[sizeof(((Config *)0)->wintitle)];
char icontitle[sizeof(((Config *)0)->wintitle)];
};
char output[32];
int start, end;
+ /* By default, nothing is generated. */
+ end = start = 0;
+
+ /*
+ * If Alt is being released after typing an Alt+numberpad
+ * sequence, we should generate the code that was typed.
+ */
+ if (event->type == GDK_KEY_RELEASE &&
+ (event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
+ event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) &&
+ inst->alt_keycode >= 0) {
+#ifdef KEY_DEBUGGING
+ printf("Alt key up, keycode = %d\n", inst->alt_keycode);
+#endif
+ output[0] = inst->alt_keycode;
+ end = 1;
+ goto done;
+ }
+
if (event->type == GDK_KEY_PRESS) {
#ifdef KEY_DEBUGGING
{
#endif
/*
- * NYI:
- * - alt+numpad
- * - Compose key (!!! requires Unicode faff before even trying)
+ * NYI: Compose key (!!! requires Unicode faff before even trying)
+ */
+
+ /*
+ * If Alt has just been pressed, we start potentially
+ * accumulating an Alt+numberpad code. We do this by
+ * setting alt_keycode to -1 (nothing yet but plausible).
+ */
+ if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
+ event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) {
+ inst->alt_keycode = -1;
+ goto done; /* this generates nothing else */
+ }
+
+ /*
+ * If we're seeing a numberpad key press with Mod1 down,
+ * consider adding it to alt_keycode if that's sensible.
+ * Anything _else_ with Mod1 down cancels any possibility
+ * of an ALT keycode: we set alt_keycode to -2.
*/
+ if ((event->state & GDK_MOD1_MASK) && inst->alt_keycode != -2) {
+ int digit = -1;
+ switch (event->keyval) {
+ case GDK_KP_0: case GDK_KP_Insert: digit = 0; break;
+ case GDK_KP_1: case GDK_KP_End: digit = 1; break;
+ case GDK_KP_2: case GDK_KP_Down: digit = 2; break;
+ case GDK_KP_3: case GDK_KP_Page_Down: digit = 3; break;
+ case GDK_KP_4: case GDK_KP_Left: digit = 4; break;
+ case GDK_KP_5: case GDK_KP_Begin: digit = 5; break;
+ case GDK_KP_6: case GDK_KP_Right: digit = 6; break;
+ case GDK_KP_7: case GDK_KP_Home: digit = 7; break;
+ case GDK_KP_8: case GDK_KP_Up: digit = 8; break;
+ case GDK_KP_9: case GDK_KP_Page_Up: digit = 9; break;
+ }
+ if (digit < 0)
+ inst->alt_keycode = -2; /* it's invalid */
+ else {
+#ifdef KEY_DEBUGGING
+ printf("Adding digit %d to keycode %d", digit,
+ inst->alt_keycode);
+#endif
+ if (inst->alt_keycode == -1)
+ inst->alt_keycode = digit; /* one-digit code */
+ else
+ inst->alt_keycode = inst->alt_keycode * 10 + digit;
+#ifdef KEY_DEBUGGING
+ printf(" gives new code %d\n", inst->alt_keycode);
+#endif
+ /* Having used this digit, we now do nothing more with it. */
+ goto done;
+ }
+ }
/*
* Shift-PgUp and Shift-PgDn don't even generate keystrokes
goto done;
}
}
+ goto done;
+ }
- done:
+ done:
+ if (end-start > 0) {
#ifdef KEY_DEBUGGING
- {
- int i;
- printf("generating sequence:");
- for (i = start; i < end; i++)
- printf(" %02x", (unsigned char) output[i]);
- printf("\n");
- }
+ int i;
+ printf("generating sequence:");
+ for (i = start; i < end; i++)
+ printf(" %02x", (unsigned char) output[i]);
+ printf("\n");
#endif
- if (end-start > 0) {
- ldisc_send(output+start, end-start, 1);
- show_mouseptr(0);
- term_out();
- }
+
+ ldisc_send(output+start, end-start, 1);
+ show_mouseptr(0);
+ term_out();
}
return TRUE;
*
* We are allowed to fiddle with the contents of `text'.
*/
-void do_text(Context ctx, int x, int y, char *text, int len,
- unsigned long attr, int lattr)
+void do_text_internal(Context ctx, int x, int y, char *text, int len,
+ unsigned long attr, int lattr)
{
int nfg, nbg, t;
GdkGC *gc = (GdkGC *)ctx;
/*
* NYI:
* - Unicode, code pages, and ATTR_WIDE for CJK support.
- * - cursor shapes other than block
* - shadow bolding
*/
len * inst->font_width, inst->font_height-i-1);
}
}
+ }
+}
+
+void do_text(Context ctx, int x, int y, char *text, int len,
+ unsigned long attr, int lattr)
+{
+ GdkGC *gc = (GdkGC *)ctx;
+
+ do_text_internal(ctx, x, y, text, len, attr, lattr);
+
+ if (lattr != LATTR_NORM) {
+ x *= 2;
+ if (x >= cols)
+ return;
+ if (x + len*2 > cols)
+ len = (cols-x)/2; /* trim to LH half */
len *= 2;
}
int passive;
GdkGC *gc = (GdkGC *)ctx;
- /*
- * NYI: cursor shapes other than block
- */
if (attr & TATTR_PASCURS) {
attr &= ~TATTR_PASCURS;
passive = 1;
} else
passive = 0;
- do_text(ctx, x, y, text, len, attr, lattr);
- if (passive) {
+ if ((attr & TATTR_ACTCURS) && cfg.cursor_type != 0) {
+ attr &= ~TATTR_ACTCURS;
+ }
+ do_text_internal(ctx, x, y, text, len, attr, lattr);
+
+ if (lattr != LATTR_NORM) {
+ x *= 2;
+ if (x >= cols)
+ return;
+ if (x + len*2 > cols)
+ len = (cols-x)/2; /* trim to LH half */
+ len *= 2;
+ }
+
+ if (cfg.cursor_type == 0) {
+ /*
+ * An active block cursor will already have been done by
+ * the above do_text call, so we only need to do anything
+ * if it's passive.
+ */
+ if (passive) {
+ gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-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);
+ }
+ } else {
+ int uheight;
+ int startx, starty, dx, dy, length, i;
+
+ int char_width;
+
+ if ((attr & ATTR_WIDE) || lattr != LATTR_NORM)
+ char_width = 2*inst->font_width;
+ else
+ char_width = inst->font_width;
+
+ if (cfg.cursor_type == 1) {
+ uheight = inst->fonts[0]->ascent + 1;
+ if (uheight >= inst->font_height)
+ uheight = inst->font_height - 1;
+
+ startx = x * inst->font_width + cfg.window_border;
+ starty = y * inst->font_height + cfg.window_border + uheight;
+ dx = 1;
+ dy = 0;
+ length = len * char_width;
+ } else {
+ int xadjust = 0;
+ if (attr & TATTR_RIGHTCURS)
+ xadjust = char_width - 1;
+ startx = x * inst->font_width + cfg.window_border + xadjust;
+ starty = y * inst->font_height + cfg.window_border;
+ dx = 0;
+ dy = 1;
+ length = inst->font_height;
+ }
+
gdk_gc_set_foreground(gc, &inst->cols[NCOLOURS-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*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);
+ if (passive) {
+ for (i = 0; i < length; i++) {
+ if (i % 2 == 0) {
+ gdk_draw_point(inst->pixmap, gc, startx, starty);
+ }
+ startx += dx;
+ starty += dy;
+ }
+ } else {
+ gdk_draw_line(inst->pixmap, gc, startx, starty,
+ startx + (length-1) * dx, starty + (length-1) * dy);
+ }
}
+
+ gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
+ 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)
}
inst->fonts[0] = gdk_font_load(cfg.font);
+ if (!inst->fonts[0]) {
+ fprintf(stderr, "pterm: unable to load font \"%s\"\n", cfg.font);
+ exit(1);
+ }
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->sbar = gtk_vscrollbar_new(inst->sbar_adjust);
}
inst->hbox = GTK_BOX(gtk_hbox_new(FALSE, 0));
+ if (cfg.scrollbar) {
+ if (cfg.scrollbar_on_left)
+ gtk_box_pack_start(inst->hbox, inst->sbar, FALSE, FALSE, 0);
+ else
+ gtk_box_pack_end(inst->hbox, inst->sbar, FALSE, FALSE, 0);
+ }
gtk_box_pack_start(inst->hbox, inst->area, TRUE, TRUE, 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(delete_window), inst);
gtk_signal_connect(GTK_OBJECT(inst->window), "key_press_event",
GTK_SIGNAL_FUNC(key_event), inst);
+ gtk_signal_connect(GTK_OBJECT(inst->window), "key_release_event",
+ GTK_SIGNAL_FUNC(key_event), inst);
gtk_signal_connect(GTK_OBJECT(inst->window), "focus_in_event",
GTK_SIGNAL_FUNC(focus_event), inst);
gtk_signal_connect(GTK_OBJECT(inst->window), "focus_out_event",