projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major destabilisation, phase 1. In this phase I've moved (I think)
[u/mdw/putty]
/
unix
/
pterm.c
diff --git
a/unix/pterm.c
b/unix/pterm.c
index
706ae03
..
c072e7a
100644
(file)
--- a/
unix/pterm.c
+++ b/
unix/pterm.c
@@
-18,6
+18,7
@@
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
+#include "terminal.h"
#define CAT2(x,y) x ## y
#define CAT(x,y) CAT2(x,y)
#define CAT2(x,y) x ## y
#define CAT(x,y) CAT2(x,y)
@@
-161,7
+162,7
@@
void set_zorder(int top)
*/
void refresh_window(void)
{
*/
void refresh_window(void)
{
- term_invalidate();
+ term_invalidate(
term
);
}
/*
}
/*
@@
-286,7
+287,7
@@
gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
}
if (need_size) {
}
if (need_size) {
- term_size(h, w, cfg.savelines);
+ term_size(
term,
h, w, cfg.savelines);
}
return TRUE;
}
return TRUE;
@@
-410,11
+411,11
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* at all.
*/
if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
* at all.
*/
if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(0, -cfg.height/2);
+ term_scroll(
term,
0, -cfg.height/2);
return TRUE;
}
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
return TRUE;
}
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(0, +cfg.height/2);
+ term_scroll(
term,
0, +cfg.height/2);
return TRUE;
}
return TRUE;
}
@@
-517,7
+518,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/*
* Application keypad mode.
*/
/*
* Application keypad mode.
*/
- if (app_keypad_keys && !cfg.no_applic_k) {
+ if (
term->
app_keypad_keys && !cfg.no_applic_k) {
int xkey = 0;
switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break;
int xkey = 0;
switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break;
@@
-555,7
+556,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break;
}
if (xkey) {
case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break;
}
if (xkey) {
- if (vt52_mode) {
+ if (
term->
vt52_mode) {
if (xkey >= 'P' && xkey <= 'S')
end = 1 + sprintf(output+1, "\033%c", xkey);
else
if (xkey >= 'P' && xkey <= 'S')
end = 1 + sprintf(output+1, "\033%c", xkey);
else
@@
-663,7
+664,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if (cfg.funky_type == 3 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
if (cfg.funky_type == 3 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
- if (vt52_mode && code > 0 && code <= 6) {
+ if (
term->
vt52_mode && code > 0 && code <= 6) {
end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]);
goto done;
}
end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]);
goto done;
}
@@
-702,13
+703,14
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
}
goto done;
}
}
goto done;
}
- if ((vt52_mode || cfg.funky_type == 4) && code >= 11 && code <= 24) {
+ if ((term->vt52_mode || cfg.funky_type == 4) &&
+ code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
offt++;
if (code > 21)
offt++;
int offt = 0;
if (code > 15)
offt++;
if (code > 21)
offt++;
- if (vt52_mode)
+ if (
term->
vt52_mode)
end = 1 + sprintf(output+1,
"\x1B%c", code + 'P' - 11 - offt);
else
end = 1 + sprintf(output+1,
"\x1B%c", code + 'P' - 11 - offt);
else
@@
-721,7
+723,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
goto done;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
goto done;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
- if (vt52_mode)
+ if (
term->
vt52_mode)
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
@@
-759,9
+761,9
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* app cursor keys mode they do ESC O A instead.
* Ctrl toggles the two modes.
*/
* app cursor keys mode they do ESC O A instead.
* Ctrl toggles the two modes.
*/
- if (vt52_mode) {
+ if (
term->
vt52_mode) {
end = 1 + sprintf(output+1, "\033%c", xkey);
end = 1 + sprintf(output+1, "\033%c", xkey);
- } else if (!app_cursor_keys ^
+ } else if (!
term->
app_cursor_keys ^
!(event->state & GDK_CONTROL_MASK)) {
end = 1 + sprintf(output+1, "\033O%c", xkey);
} else {
!(event->state & GDK_CONTROL_MASK)) {
end = 1 + sprintf(output+1, "\033O%c", xkey);
} else {
@@
-786,8
+788,8
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
ldisc_send(output+start, end-start, 1);
show_mouseptr(0);
ldisc_send(output+start, end-start, 1);
show_mouseptr(0);
- term_seen_key_event();
- term_out();
+ term_seen_key_event(
term
);
+ term_out(
term
);
}
return TRUE;
}
return TRUE;
@@
-801,11
+803,11
@@
gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
show_mouseptr(1);
if (event->button == 4 && event->type == GDK_BUTTON_PRESS) {
show_mouseptr(1);
if (event->button == 4 && event->type == GDK_BUTTON_PRESS) {
- term_scroll(0, -5);
+ term_scroll(
term,
0, -5);
return TRUE;
}
if (event->button == 5 && event->type == GDK_BUTTON_PRESS) {
return TRUE;
}
if (event->button == 5 && event->type == GDK_BUTTON_PRESS) {
- term_scroll(0, +5);
+ term_scroll(
term,
0, +5);
return TRUE;
}
return TRUE;
}
@@
-836,7
+838,7
@@
gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
- term_mouse(button, act, x, y, shift, ctrl, alt);
+ term_mouse(
term,
button, act, x, y, shift, ctrl, alt);
return TRUE;
}
return TRUE;
}
@@
-863,7
+865,7
@@
gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
- term_mouse(button, MA_DRAG, x, y, shift, ctrl, alt);
+ term_mouse(
term,
button, MA_DRAG, x, y, shift, ctrl, alt);
return TRUE;
}
return TRUE;
}
@@
-885,8
+887,8
@@
gint timer_func(gpointer data)
exit(0);
}
exit(0);
}
- term_update();
- term_blink(0);
+ term_update(
term
);
+ term_blink(
term,
0);
return TRUE;
}
return TRUE;
}
@@
-912,9
+914,9
@@
void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
exit(1);
}
if (ret > 0)
exit(1);
}
if (ret > 0)
- from_backend(0, buf, ret);
- term_blink(1);
- term_out();
+ from_backend(
term,
0, buf, ret);
+ term_blink(
term,
1);
+ term_out(
term
);
}
void destroy(GtkWidget *widget, gpointer data)
}
void destroy(GtkWidget *widget, gpointer data)
@@
-924,9
+926,9
@@
void destroy(GtkWidget *widget, gpointer data)
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
- has_focus = event->in;
- term_out();
- term_update();
+
term->
has_focus = event->in;
+ term_out(
term
);
+ term_update(
term
);
show_mouseptr(1);
return FALSE;
}
show_mouseptr(1);
return FALSE;
}
@@
-1100,7
+1102,7
@@
void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
gpointer data)
{
gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
gpointer data)
{
- term_deselect();
+ term_deselect(
term
);
if (inst->pasteout_data)
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
if (inst->pasteout_data)
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
@@
-1136,9
+1138,9
@@
void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
mb_to_wc(0, 0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
mb_to_wc(0, 0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
- term_do_paste();
+ term_do_paste(
term
);
- if (term_paste_pending())
+ if (term_paste_pending(
term
))
inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
}
inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
}
@@
-1146,8
+1148,8
@@
gint idle_paste_func(gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
{
struct gui_data *inst = (struct gui_data *)data;
- if (term_paste_pending())
- term_paste();
+ if (term_paste_pending(
term
))
+ term_paste(
term
);
else
gtk_idle_remove(inst->term_paste_idle_id);
else
gtk_idle_remove(inst->term_paste_idle_id);
@@
-1197,7
+1199,7
@@
void scrollbar_moved(GtkAdjustment *adj, gpointer data)
if (!cfg.scrollbar)
return;
if (!inst->ignore_sbar)
if (!cfg.scrollbar)
return;
if (!inst->ignore_sbar)
- term_scroll(1, (int)adj->value);
+ term_scroll(
term,
1, (int)adj->value);
}
void sys_cursor(int x, int y)
}
void sys_cursor(int x, int y)
@@
-1280,10
+1282,10
@@
void do_text_internal(Context ctx, int x, int y, char *text, int len,
if (lattr != LATTR_NORM) {
x *= 2;
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= cols)
+ if (x >=
term->
cols)
return;
return;
- if (x + len*2 > cols)
- len = (
cols-x)/2;
/* trim to LH half */
+ if (x + len*2 >
term->
cols)
+ len = (
term->cols-x)/2;
/* trim to LH half */
}
gdk_gc_set_foreground(gc, &inst->cols[nbg]);
}
gdk_gc_set_foreground(gc, &inst->cols[nbg]);
@@
-1362,10
+1364,10
@@
void do_text(Context ctx, int x, int y, char *text, int len,
if (lattr != LATTR_NORM) {
x *= 2;
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= cols)
+ if (x >=
term->
cols)
return;
return;
- if (x + len*2 > cols)
- len = (
cols-x)/2;
/* trim to LH half */
+ if (x + len*2 >
term->
cols)
+ len = (
term->cols-x)/2;
/* trim to LH half */
len *= 2;
}
len *= 2;
}
@@
-1395,10
+1397,10
@@
void do_cursor(Context ctx, int x, int y, char *text, int len,
if (lattr != LATTR_NORM) {
x *= 2;
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= cols)
+ if (x >=
term->
cols)
return;
return;
- if (x + len*2 > cols)
- len = (
cols-x)/2;
/* trim to LH half */
+ if (x + len*2 >
term->
cols)
+ len = (
term->cols-x)/2;
/* trim to LH half */
len *= 2;
}
len *= 2;
}
@@
-1875,13
+1877,15
@@
int main(int argc, char **argv)
inst->currcursor = inst->textcursor;
show_mouseptr(1);
inst->currcursor = inst->textcursor;
show_mouseptr(1);
+ term = term_init();
+
back = &pty_backend;
back = &pty_backend;
- back->init(NULL, 0, NULL, 0);
+ back->init(
(void *)term,
NULL, 0, NULL, 0);
- gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst);
+ term_size(term, cfg.height, cfg.width, cfg.savelines);
+ ldisc_send(NULL, 0, 0); /* cause ldisc to notice changes */
- term_init();
- term_size(cfg.height, cfg.width, cfg.savelines);
+ gdk_input_add(pty_master_fd, GDK_INPUT_READ, pty_input_func, inst);
gtk_main();
gtk_main();