void *backhandle;
Terminal *term;
void *logctx;
+ struct unicode_data ucsdata;
Config cfg;
};
static char *app_name = "pterm";
-char *x_get_default(char *key)
+char *x_get_default(const char *key)
{
return XGetDefault(GDK_DISPLAY(), app_name, key);
}
/*
* Default settings that are specific to pterm.
*/
-char *platform_default_s(char *name)
+char *platform_default_s(const char *name)
{
if (!strcmp(name, "Font"))
return "fixed"; /* COE_NORMAL works badly in an xterm */
return NULL;
}
-int platform_default_i(char *name, int def)
+int platform_default_i(const char *name, int def)
{
if (!strcmp(name, "CloseOnExit"))
return COE_ALWAYS; /* COE_NORMAL works badly in an xterm */
term_scroll(inst->term, 0, -inst->cfg.height/2);
return TRUE;
}
+ if (event->keyval == GDK_Page_Up && (event->state & GDK_CONTROL_MASK)) {
+ term_scroll(inst->term, 0, -1);
+ return TRUE;
+ }
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
term_scroll(inst->term, 0, +inst->cfg.height/2);
return TRUE;
}
+ if (event->keyval == GDK_Page_Down && (event->state & GDK_CONTROL_MASK)) {
+ term_scroll(inst->term, 0, +1);
+ return TRUE;
+ }
/*
* Neither does Shift-Ins.
inst->pasteout_data = smalloc(len*6);
inst->pasteout_data_len = len*6;
- inst->pasteout_data_len = wc_to_mb(line_codepage, 0, data, len,
- inst->pasteout_data,
- inst->pasteout_data_len, NULL, NULL);
+ inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
+ data, len, inst->pasteout_data,
+ inst->pasteout_data_len,
+ NULL, NULL, NULL);
if (inst->pasteout_data_len == 0) {
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
inst->pastein_data_len = seldata->length;
inst->pastein_data_len =
mb_to_wc((seldata->type == inst->utf8_string_atom ?
- CS_UTF8 : line_codepage),
+ CS_UTF8 : inst->ucsdata.line_codepage),
0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
} else {
gcs = smalloc(sizeof(GdkWChar) * (len+1));
wc_to_mb(inst->fontinfo[fontid].charset, 0,
- wcs, len, gcs, len, ".", NULL);
+ wcs, len, gcs, len, ".", NULL, NULL);
gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
x*inst->font_width+inst->cfg.window_border,
y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
gtk_init(&argc, &argv);
- if (do_cmdline(argc, argv, 0, &inst->cfg))
- exit(1); /* pre-defaults pass to get -class */
- do_defaults(NULL, &inst->cfg);
- if (do_cmdline(argc, argv, 1, &inst->cfg))
- exit(1); /* post-defaults, do everything */
-
/*
* Create an instance structure and initialise to zeroes
*/
memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */
+ if (do_cmdline(argc, argv, 0, &inst->cfg))
+ exit(1); /* pre-defaults pass to get -class */
+ do_defaults(NULL, &inst->cfg);
+ if (do_cmdline(argc, argv, 1, &inst->cfg))
+ exit(1); /* post-defaults, do everything */
+
inst->fonts[0] = gdk_font_load(inst->cfg.font);
if (!inst->fonts[0]) {
fprintf(stderr, "pterm: unable to load font \"%s\"\n", inst->cfg.font);
inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
- inst->direct_to_font = init_ucs(inst->cfg.line_codepage, font_charset);
+ inst->direct_to_font = init_ucs(&inst->ucsdata,
+ inst->cfg.line_codepage, font_charset);
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
inst->currcursor = inst->textcursor;
show_mouseptr(inst, 1);
- inst->term = term_init(&inst->cfg, inst);
+ inst->term = term_init(&inst->cfg, &inst->ucsdata, inst);
inst->logctx = log_init(inst, &inst->cfg);
term_provide_logctx(inst->term, inst->logctx);