~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganised the Unicode layer somewhat: moved luni_send and
[sgt/putty]
/
window.c
diff --git
a/window.c
b/window.c
index
a4a376b
..
cda2d1d
100644
(file)
--- a/
window.c
+++ b/
window.c
@@
-26,6
+26,7
@@
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
+#include "terminal.h"
#include "winstuff.h"
#include "storage.h"
#include "win_res.h"
#include "winstuff.h"
#include "storage.h"
#include "win_res.h"
@@
-107,12
+108,18
@@
static LPARAM pend_netevent_lParam = 0;
static void enact_pending_netevent(void);
static void flash_window(int mode);
static void sys_cursor_update(void);
static void enact_pending_netevent(void);
static void flash_window(int mode);
static void sys_cursor_update(void);
+static int is_shift_pressed(void);
static int get_fullscreen_rect(RECT * ss);
static time_t last_movement = 0;
static int caret_x = -1, caret_y = -1;
static int get_fullscreen_rect(RECT * ss);
static time_t last_movement = 0;
static int caret_x = -1, caret_y = -1;
+static void *ldisc;
+static Backend *back;
+static void *backhandle;
+static Terminal *term;
+
#define FONT_NORMAL 0
#define FONT_BOLD 1
#define FONT_UNDERLINE 2
#define FONT_NORMAL 0
#define FONT_BOLD 1
#define FONT_UNDERLINE 2
@@
-167,7
+174,7
@@
static OSVERSIONINFO osVersion;
static UINT wm_mousewheel = WM_MOUSEWHEEL;
/* Dummy routine, only required in plink. */
static UINT wm_mousewheel = WM_MOUSEWHEEL;
/* Dummy routine, only required in plink. */
-void ldisc_update(int echo, int edit)
+void ldisc_update(
void *frontend,
int echo, int edit)
{
}
{
}
@@
-430,6
+437,21
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
* Trim a colon suffix off the hostname if it's there.
*/
cfg.host[strcspn(cfg.host, ":")] = '\0';
* Trim a colon suffix off the hostname if it's there.
*/
cfg.host[strcspn(cfg.host, ":")] = '\0';
+
+ /*
+ * Remove any remaining whitespace from the hostname.
+ */
+ {
+ int p1 = 0, p2 = 0;
+ while (cfg.host[p2] != '\0') {
+ if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
+ cfg.host[p1] = cfg.host[p2];
+ p1++;
+ }
+ p2++;
+ }
+ cfg.host[p1] = '\0';
+ }
}
/*
}
/*
@@
-477,8
+499,7
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
hwnd = NULL;
hwnd = NULL;
- savelines = cfg.savelines;
- term_init();
+ term = term_init();
cfgtopalette();
cfgtopalette();
@@
-493,9
+514,9
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
font_height = 20;
extra_width = 25;
extra_height = 28;
font_height = 20;
extra_width = 25;
extra_height = 28;
- term_size(cfg.height, cfg.width, cfg.savelines);
- guess_width = extra_width + font_width * cols;
- guess_height = extra_height + font_height * rows;
+ term_size(
term,
cfg.height, cfg.width, cfg.savelines);
+ guess_width = extra_width + font_width *
term->
cols;
+ guess_height = extra_height + font_height *
term->
rows;
{
RECT r;
get_fullscreen_rect(&r);
{
RECT r;
get_fullscreen_rect(&r);
@@
-544,8
+565,8
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
* Resize the window, now we know what size we _really_ want it
* to be.
*/
* Resize the window, now we know what size we _really_ want it
* to be.
*/
- guess_width = extra_width + font_width * cols;
- guess_height = extra_height + font_height * rows;
+ guess_width = extra_width + font_width *
term->
cols;
+ guess_height = extra_height + font_height *
term->
rows;
SetWindowPos(hwnd, NULL, 0, 0, guess_width, guess_height,
SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER);
SetWindowPos(hwnd, NULL, 0, 0, guess_width, guess_height,
SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER);
@@
-571,8
+592,8
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
si.cbSize = sizeof(si);
si.fMask = SIF_ALL | SIF_DISABLENOSCROLL;
si.nMin = 0;
si.cbSize = sizeof(si);
si.fMask = SIF_ALL | SIF_DISABLENOSCROLL;
si.nMin = 0;
- si.nMax = rows - 1;
- si.nPage = rows;
+ si.nMax =
term->
rows - 1;
+ si.nPage =
term->
rows;
si.nPos = 0;
SetScrollInfo(hwnd, SB_VERT, &si, FALSE);
}
si.nPos = 0;
SetScrollInfo(hwnd, SB_VERT, &si, FALSE);
}
@@
-585,7
+606,8
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
char msg[1024], *title;
char *realhost;
char msg[1024], *title;
char *realhost;
- error = back->init(cfg.host, cfg.port, &realhost, cfg.tcp_nodelay);
+ error = back->init((void *)term, &backhandle,
+ cfg.host, cfg.port, &realhost, cfg.tcp_nodelay);
if (error) {
sprintf(msg, "Unable to open connection to\n"
"%.800s\n" "%s", cfg.host, error);
if (error) {
sprintf(msg, "Unable to open connection to\n"
"%.800s\n" "%s", cfg.host, error);
@@
-604,6
+626,16
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
set_icon(title);
}
set_icon(title);
}
+ /*
+ * Connect the terminal to the backend for resize purposes.
+ */
+ term_provide_resize_fn(term, back->size, backhandle);
+
+ /*
+ * Set up a line discipline.
+ */
+ ldisc = ldisc_create(term, back, backhandle, NULL);
+
session_closed = FALSE;
/*
session_closed = FALSE;
/*
@@
-691,7
+723,7
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
logpal = NULL;
init_palette();
logpal = NULL;
init_palette();
- has_focus = (GetForegroundWindow() == hwnd);
+
term->
has_focus = (GetForegroundWindow() == hwnd);
UpdateWindow(hwnd);
if (GetMessage(&msg, NULL, 0, 0) == 1) {
UpdateWindow(hwnd);
if (GetMessage(&msg, NULL, 0, 0) == 1) {
@@
-714,10
+746,10
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
DispatchMessage(&msg);
/* Make sure we blink everything that needs it. */
DispatchMessage(&msg);
/* Make sure we blink everything that needs it. */
- term_blink(0);
+ term_blink(
term,
0);
/* Send the paste buffer if there's anything to send */
/* Send the paste buffer if there's anything to send */
- term_paste();
+ term_paste(
term
);
/* If there's nothing new in the queue then we can do everything
* we've delayed, reading the socket, writing, and repainting
/* If there's nothing new in the queue then we can do everything
* we've delayed, reading the socket, writing, and repainting
@@
-730,7
+762,7
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
enact_pending_netevent();
/* Force the cursor blink on */
enact_pending_netevent();
/* Force the cursor blink on */
- term_blink(1);
+ term_blink(
term,
1);
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
continue;
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
continue;
@@
-746,20
+778,21
@@
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
}
HideCaret(hwnd);
if (GetCapture() != hwnd ||
}
HideCaret(hwnd);
if (GetCapture() != hwnd ||
- (send_raw_mouse && !(cfg.mouse_override && is_shift_pressed())))
- term_out();
- term_update();
+ (send_raw_mouse &&
+ !(cfg.mouse_override && is_shift_pressed())))
+ term_out(term);
+ term_update(term);
ShowCaret(hwnd);
flash_window(1); /* maintain */
/* The messages seem unreliable; especially if we're being tricky */
ShowCaret(hwnd);
flash_window(1); /* maintain */
/* The messages seem unreliable; especially if we're being tricky */
- has_focus = (GetForegroundWindow() == hwnd);
+
term->
has_focus = (GetForegroundWindow() == hwnd);
- if (in_vbell)
+ if (
term->
in_vbell)
/* Hmm, term_update didn't want to do an update too soon ... */
timer_id = SetTimer(hwnd, 1, 50, NULL);
/* Hmm, term_update didn't want to do an update too soon ... */
timer_id = SetTimer(hwnd, 1, 50, NULL);
- else if (!has_focus)
+ else if (!
term->
has_focus)
timer_id = SetTimer(hwnd, 1, 500, NULL);
else
timer_id = SetTimer(hwnd, 1, 100, NULL);
timer_id = SetTimer(hwnd, 1, 500, NULL);
else
timer_id = SetTimer(hwnd, 1, 100, NULL);
@@
-1162,7
+1195,7
@@
static void init_fonts(int pick_width, int pick_height)
}
fontflag[0] = fontflag[1] = fontflag[2] = 1;
}
fontflag[0] = fontflag[1] = fontflag[2] = 1;
- init_ucs
_tables
();
+ init_ucs();
}
static void another_font(int fontno)
}
static void another_font(int fontno)
@@
-1235,7
+1268,7
@@
void request_resize(int w, int h)
}
if (cfg.resize_action == RESIZE_DISABLED) return;
}
if (cfg.resize_action == RESIZE_DISABLED) return;
- if (h ==
rows && w ==
cols) return;
+ if (h ==
term->rows && w == term->
cols) return;
/* Sanity checks ... */
{
/* Sanity checks ... */
{
@@
-1265,7
+1298,7
@@
void request_resize(int w, int h)
}
}
}
}
- term_size(h, w, cfg.savelines);
+ term_size(
term,
h, w, cfg.savelines);
if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) {
width = extra_width + font_width * w;
if (cfg.resize_action != RESIZE_FONT && !IsZoomed(hwnd)) {
width = extra_width + font_width * w;
@@
-1319,10
+1352,10
@@
static void reset_window(int reinit) {
/* Is the window out of position ? */
if ( !reinit &&
/* Is the window out of position ? */
if ( !reinit &&
- (offset_width != (win_width-font_width*cols)/2 ||
- offset_height != (win_height-font_height*rows)/2) ){
- offset_width = (win_width-font_width*cols)/2;
- offset_height = (win_height-font_height*rows)/2;
+ (offset_width != (win_width-font_width*
term->
cols)/2 ||
+ offset_height != (win_height-font_height*
term->
rows)/2) ){
+ offset_width = (win_width-font_width*
term->
cols)/2;
+ offset_height = (win_height-font_height*
term->
rows)/2;
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> Reposition terminal"));
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> Reposition terminal"));
@@
-1338,12
+1371,12
@@
static void reset_window(int reinit) {
extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
if (cfg.resize_action != RESIZE_TERM) {
extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
if (cfg.resize_action != RESIZE_TERM) {
- if ( font_width != win_width/cols ||
- font_height != win_height/rows) {
+ if ( font_width != win_width/
term->
cols ||
+ font_height != win_height/
term->
rows) {
deinit_fonts();
deinit_fonts();
- init_fonts(win_width/
cols, win_height/
rows);
- offset_width = (win_width-font_width*cols)/2;
- offset_height = (win_height-font_height*rows)/2;
+ init_fonts(win_width/
term->cols, win_height/term->
rows);
+ offset_width = (win_width-font_width*
term->
cols)/2;
+ offset_height = (win_height-font_height*
term->
rows)/2;
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((25, "reset_window() -> Z font resize to (%d, %d)",
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((25, "reset_window() -> Z font resize to (%d, %d)",
@@
-1351,15
+1384,15
@@
static void reset_window(int reinit) {
#endif
}
} else {
#endif
}
} else {
- if ( font_width != win_width/cols ||
- font_height != win_height/rows) {
+ if ( font_width != win_width/
term->
cols ||
+ font_height != win_height/
term->
rows) {
/* Our only choice at this point is to change the
* size of the terminal; Oh well.
*/
/* Our only choice at this point is to change the
* size of the terminal; Oh well.
*/
- term_size( win_height/font_height, win_width/font_width,
-
cfg.savelines);
- offset_width = (win_width-font_width*cols)/2;
- offset_height = (win_height-font_height*rows)/2;
+ term_size(
term,
win_height/font_height, win_width/font_width,
+ cfg.savelines);
+ offset_width = (win_width-font_width*
term->
cols)/2;
+ offset_height = (win_height-font_height*
term->
rows)/2;
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> Zoomed term_size"));
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> Zoomed term_size"));
@@
-1381,16
+1414,16
@@
static void reset_window(int reinit) {
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
- if (win_width != font_width*cols + offset_width*2 ||
- win_height != font_height*rows + offset_height*2) {
+ if (win_width != font_width*
term->
cols + offset_width*2 ||
+ win_height != font_height*
term->
rows + offset_height*2) {
/* If this is too large windows will resize it to the maximum
* allowed window size, we will then be back in here and resize
* the font or terminal to fit.
*/
SetWindowPos(hwnd, NULL, 0, 0,
/* If this is too large windows will resize it to the maximum
* allowed window size, we will then be back in here and resize
* the font or terminal to fit.
*/
SetWindowPos(hwnd, NULL, 0, 0,
- font_width*cols + extra_width,
- font_height*rows + extra_height,
+ font_width*
term->
cols + extra_width,
+ font_height*
term->
rows + extra_height,
SWP_NOMOVE | SWP_NOZORDER);
}
SWP_NOMOVE | SWP_NOZORDER);
}
@@
-1409,8
+1442,8
@@
static void reset_window(int reinit) {
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
extra_width = wr.right - wr.left - cr.right + cr.left + offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top +offset_height*2;
- if (win_width != font_width*cols + offset_width*2 ||
- win_height != font_height*rows + offset_height*2) {
+ if (win_width != font_width*
term->
cols + offset_width*2 ||
+ win_height != font_height*
term->
rows + offset_height*2) {
static RECT ss;
int width, height;
static RECT ss;
int width, height;
@@
-1421,13
+1454,15
@@
static void reset_window(int reinit) {
height = (ss.bottom - ss.top - extra_height) / font_height;
/* Grrr too big */
height = (ss.bottom - ss.top - extra_height) / font_height;
/* Grrr too big */
- if (
rows > height ||
cols > width ) {
+ if (
term->rows > height || term->
cols > width ) {
if (cfg.resize_action == RESIZE_EITHER) {
/* Make the font the biggest we can */
if (cfg.resize_action == RESIZE_EITHER) {
/* Make the font the biggest we can */
- if (cols > width)
- font_width = (ss.right - ss.left - extra_width)/cols;
- if (rows > height)
- font_height = (ss.bottom - ss.top - extra_height)/rows;
+ if (term->cols > width)
+ font_width = (ss.right - ss.left - extra_width)
+ / term->cols;
+ if (term->rows > height)
+ font_height = (ss.bottom - ss.top - extra_height)
+ / term->rows;
deinit_fonts();
init_fonts(font_width, font_height);
deinit_fonts();
init_fonts(font_width, font_height);
@@
-1435,9
+1470,9
@@
static void reset_window(int reinit) {
width = (ss.right - ss.left - extra_width) / font_width;
height = (ss.bottom - ss.top - extra_height) / font_height;
} else {
width = (ss.right - ss.left - extra_width) / font_width;
height = (ss.bottom - ss.top - extra_height) / font_height;
} else {
- if ( height >
rows ) height =
rows;
- if ( width >
cols ) width =
cols;
- term_size(height, width, cfg.savelines);
+ if ( height >
term->rows ) height = term->
rows;
+ if ( width >
term->cols ) width = term->
cols;
+ term_size(
term,
height, width, cfg.savelines);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> term resize to (%d,%d)",
height, width));
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> term resize to (%d,%d)",
height, width));
@@
-1446,15
+1481,15
@@
static void reset_window(int reinit) {
}
SetWindowPos(hwnd, NULL, 0, 0,
}
SetWindowPos(hwnd, NULL, 0, 0,
- font_width*cols + extra_width,
- font_height*rows + extra_height,
+ font_width*
term->
cols + extra_width,
+ font_height*
term->
rows + extra_height,
SWP_NOMOVE | SWP_NOZORDER);
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> window resize to (%d,%d)",
SWP_NOMOVE | SWP_NOZORDER);
InvalidateRect(hwnd, NULL, TRUE);
#ifdef RDB_DEBUG_PATCH
debug((27, "reset_window() -> window resize to (%d,%d)",
- font_width*cols + extra_width,
- font_height*rows + extra_height));
+ font_width*
term->
cols + extra_width,
+ font_height*
term->
rows + extra_height));
#endif
}
return;
#endif
}
return;
@@
-1462,14
+1497,14
@@
static void reset_window(int reinit) {
/* We're allowed to or must change the font but do we want to ? */
/* We're allowed to or must change the font but do we want to ? */
- if (font_width != (win_width-cfg.window_border*2)/cols ||
- font_height != (win_height-cfg.window_border*2)/rows) {
+ if (font_width != (win_width-cfg.window_border*2)/
term->
cols ||
+ font_height != (win_height-cfg.window_border*2)/
term->
rows) {
deinit_fonts();
deinit_fonts();
- init_fonts((win_width-cfg.window_border*2)/cols,
- (win_height-cfg.window_border*2)/rows);
- offset_width = (win_width-font_width*cols)/2;
- offset_height = (win_height-font_height*rows)/2;
+ init_fonts((win_width-cfg.window_border*2)/
term->
cols,
+ (win_height-cfg.window_border*2)/
term->
rows);
+ offset_width = (win_width-font_width*
term->
cols)/2;
+ offset_height = (win_height-font_height*
term->
rows)/2;
extra_width = wr.right - wr.left - cr.right + cr.left +offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top+offset_height*2;
extra_width = wr.right - wr.left - cr.right + cr.left +offset_width*2;
extra_height = wr.bottom - wr.top - cr.bottom + cr.top+offset_height*2;
@@
-1498,7
+1533,7
@@
static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
if (send_raw_mouse && !(cfg.mouse_override && shift)) {
lastbtn = MBT_NOTHING;
if (send_raw_mouse && !(cfg.mouse_override && shift)) {
lastbtn = MBT_NOTHING;
- term_mouse(b, MA_CLICK, x, y, shift, ctrl, alt);
+ term_mouse(
term,
b, MA_CLICK, x, y, shift, ctrl, alt);
return;
}
return;
}
@@
-1511,7
+1546,7
@@
static void click(Mouse_Button b, int x, int y, int shift, int ctrl, int alt)
lastact = MA_CLICK;
}
if (lastact != MA_NOTHING)
lastact = MA_CLICK;
}
if (lastact != MA_NOTHING)
- term_mouse(b, lastact, x, y, shift, ctrl, alt);
+ term_mouse(
term,
b, lastact, x, y, shift, ctrl, alt);
lasttime = thistime;
}
lasttime = thistime;
}
@@
-1582,16
+1617,16
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
enact_pending_netevent();
if (GetCapture() != hwnd ||
(send_raw_mouse && !(cfg.mouse_override && is_shift_pressed())))
enact_pending_netevent();
if (GetCapture() != hwnd ||
(send_raw_mouse && !(cfg.mouse_override && is_shift_pressed())))
- term_out();
+ term_out(
term
);
noise_regular();
HideCaret(hwnd);
noise_regular();
HideCaret(hwnd);
- term_update();
+ term_update(
term
);
ShowCaret(hwnd);
if (cfg.ping_interval > 0) {
time_t now;
time(&now);
if (now - last_movement > cfg.ping_interval) {
ShowCaret(hwnd);
if (cfg.ping_interval > 0) {
time_t now;
time(&now);
if (now - last_movement > cfg.ping_interval) {
- back->special(TS_PING);
+ back->special(
backhandle,
TS_PING);
last_movement = now;
}
}
last_movement = now;
}
}
@@
-1724,7
+1759,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
* Flush the line discipline's edit buffer in the
* case where local editing has just been disabled.
*/
* Flush the line discipline's edit buffer in the
* case where local editing has just been disabled.
*/
- ldisc_send(NULL, 0, 0);
+ ldisc_send(
ldisc,
NULL, 0, 0);
if (pal)
DeleteObject(pal);
logpal = NULL;
if (pal)
DeleteObject(pal);
logpal = NULL;
@@
-1733,7
+1768,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
init_palette();
/* Give terminal a heads-up on miscellaneous stuff */
init_palette();
/* Give terminal a heads-up on miscellaneous stuff */
- term_reconfig();
+ term_reconfig(
term
);
/* Screen size changed ? */
if (cfg.height != prev_cfg.height ||
/* Screen size changed ? */
if (cfg.height != prev_cfg.height ||
@@
-1742,7
+1777,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
cfg.resize_action == RESIZE_FONT ||
(cfg.resize_action == RESIZE_EITHER && IsZoomed(hwnd)) ||
cfg.resize_action == RESIZE_DISABLED)
cfg.resize_action == RESIZE_FONT ||
(cfg.resize_action == RESIZE_EITHER && IsZoomed(hwnd)) ||
cfg.resize_action == RESIZE_DISABLED)
- term_size(cfg.height, cfg.width, cfg.savelines);
+ term_size(
term,
cfg.height, cfg.width, cfg.savelines);
/* Enable or disable the scroll bar, etc */
{
/* Enable or disable the scroll bar, etc */
{
@@
-1831,64
+1866,65
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
}
break;
case IDM_COPYALL:
}
break;
case IDM_COPYALL:
- term_copyall();
+ term_copyall(
term
);
break;
case IDM_CLRSB:
break;
case IDM_CLRSB:
- term_clrsb();
+ term_clrsb(
term
);
break;
case IDM_RESET:
break;
case IDM_RESET:
- term_pwron();
+ term_pwron(term);
+ ldisc_send(ldisc, NULL, 0, 0);
break;
case IDM_TEL_AYT:
break;
case IDM_TEL_AYT:
- back->special(TS_AYT);
+ back->special(
backhandle,
TS_AYT);
net_pending_errors();
break;
case IDM_TEL_BRK:
net_pending_errors();
break;
case IDM_TEL_BRK:
- back->special(TS_BRK);
+ back->special(
backhandle,
TS_BRK);
net_pending_errors();
break;
case IDM_TEL_SYNCH:
net_pending_errors();
break;
case IDM_TEL_SYNCH:
- back->special(TS_SYNCH);
+ back->special(
backhandle,
TS_SYNCH);
net_pending_errors();
break;
case IDM_TEL_EC:
net_pending_errors();
break;
case IDM_TEL_EC:
- back->special(TS_EC);
+ back->special(
backhandle,
TS_EC);
net_pending_errors();
break;
case IDM_TEL_EL:
net_pending_errors();
break;
case IDM_TEL_EL:
- back->special(TS_EL);
+ back->special(
backhandle,
TS_EL);
net_pending_errors();
break;
case IDM_TEL_GA:
net_pending_errors();
break;
case IDM_TEL_GA:
- back->special(TS_GA);
+ back->special(
backhandle,
TS_GA);
net_pending_errors();
break;
case IDM_TEL_NOP:
net_pending_errors();
break;
case IDM_TEL_NOP:
- back->special(TS_NOP);
+ back->special(
backhandle,
TS_NOP);
net_pending_errors();
break;
case IDM_TEL_ABORT:
net_pending_errors();
break;
case IDM_TEL_ABORT:
- back->special(TS_ABORT);
+ back->special(
backhandle,
TS_ABORT);
net_pending_errors();
break;
case IDM_TEL_AO:
net_pending_errors();
break;
case IDM_TEL_AO:
- back->special(TS_AO);
+ back->special(
backhandle,
TS_AO);
net_pending_errors();
break;
case IDM_TEL_IP:
net_pending_errors();
break;
case IDM_TEL_IP:
- back->special(TS_IP);
+ back->special(
backhandle,
TS_IP);
net_pending_errors();
break;
case IDM_TEL_SUSP:
net_pending_errors();
break;
case IDM_TEL_SUSP:
- back->special(TS_SUSP);
+ back->special(
backhandle,
TS_SUSP);
net_pending_errors();
break;
case IDM_TEL_EOR:
net_pending_errors();
break;
case IDM_TEL_EOR:
- back->special(TS_EOR);
+ back->special(
backhandle,
TS_EOR);
net_pending_errors();
break;
case IDM_TEL_EOF:
net_pending_errors();
break;
case IDM_TEL_EOF:
- back->special(TS_EOF);
+ back->special(
backhandle,
TS_EOF);
net_pending_errors();
break;
case IDM_ABOUT:
net_pending_errors();
break;
case IDM_ABOUT:
@@
-1989,7
+2025,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
is_alt_pressed());
SetCapture(hwnd);
} else {
is_alt_pressed());
SetCapture(hwnd);
} else {
- term_mouse(button, MA_RELEASE,
+ term_mouse(
term,
button, MA_RELEASE,
TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
wParam & MK_CONTROL, is_alt_pressed());
TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
wParam & MK_CONTROL, is_alt_pressed());
@@
-2014,7
+2050,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
b = MBT_MIDDLE;
else
b = MBT_RIGHT;
b = MBT_MIDDLE;
else
b = MBT_RIGHT;
- term_mouse(b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
+ term_mouse(
term,
b, MA_DRAG, TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
wParam & MK_CONTROL, is_alt_pressed());
}
TO_CHR_Y(Y_POS(lParam)), wParam & MK_SHIFT,
wParam & MK_CONTROL, is_alt_pressed());
}
@@
-2028,7
+2064,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
break;
case WM_DESTROYCLIPBOARD:
if (!ignore_clip)
break;
case WM_DESTROYCLIPBOARD:
if (!ignore_clip)
- term_deselect();
+ term_deselect(
term
);
ignore_clip = FALSE;
return 0;
case WM_PAINT:
ignore_clip = FALSE;
return 0;
case WM_PAINT:
@@
-2040,7
+2076,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
SelectPalette(hdc, pal, TRUE);
RealizePalette(hdc);
}
SelectPalette(hdc, pal, TRUE);
RealizePalette(hdc);
}
- term_paint(hdc,
+ term_paint(
term,
hdc,
(p.rcPaint.left-offset_width)/font_width,
(p.rcPaint.top-offset_height)/font_height,
(p.rcPaint.right-offset_width-1)/font_width,
(p.rcPaint.left-offset_width)/font_width,
(p.rcPaint.top-offset_height)/font_height,
(p.rcPaint.right-offset_width-1)/font_width,
@@
-2049,8
+2085,8
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
if (p.fErase ||
p.rcPaint.left < offset_width ||
p.rcPaint.top < offset_height ||
if (p.fErase ||
p.rcPaint.left < offset_width ||
p.rcPaint.top < offset_height ||
- p.rcPaint.right >= offset_width + font_width*cols ||
- p.rcPaint.bottom>= offset_height + font_height*rows)
+ p.rcPaint.right >= offset_width + font_width*
term->
cols ||
+ p.rcPaint.bottom>= offset_height + font_height*
term->
rows)
{
HBRUSH fillcolour, oldbrush;
HPEN edge, oldpen;
{
HBRUSH fillcolour, oldbrush;
HPEN edge, oldpen;
@@
-2074,8
+2110,8
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
ExcludeClipRect(hdc,
offset_width, offset_height,
ExcludeClipRect(hdc,
offset_width, offset_height,
- offset_width+font_width*cols,
- offset_height+font_height*rows);
+ offset_width+font_width*
term->
cols,
+ offset_height+font_height*
term->
rows);
Rectangle(hdc, p.rcPaint.left, p.rcPaint.top,
p.rcPaint.right, p.rcPaint.bottom);
Rectangle(hdc, p.rcPaint.left, p.rcPaint.top,
p.rcPaint.right, p.rcPaint.bottom);
@@
-2110,21
+2146,21
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
time(&last_movement);
return 0;
case WM_SETFOCUS:
time(&last_movement);
return 0;
case WM_SETFOCUS:
- has_focus = TRUE;
+
term->
has_focus = TRUE;
CreateCaret(hwnd, caretbm, font_width, font_height);
ShowCaret(hwnd);
flash_window(0); /* stop */
compose_state = 0;
CreateCaret(hwnd, caretbm, font_width, font_height);
ShowCaret(hwnd);
flash_window(0); /* stop */
compose_state = 0;
- term_out();
- term_update();
+ term_out(
term
);
+ term_update(
term
);
break;
case WM_KILLFOCUS:
show_mouseptr(1);
break;
case WM_KILLFOCUS:
show_mouseptr(1);
- has_focus = FALSE;
+
term->
has_focus = FALSE;
DestroyCaret();
caret_x = caret_y = -1; /* ensure caret is replaced next time */
DestroyCaret();
caret_x = caret_y = -1; /* ensure caret is replaced next time */
- term_out();
- term_update();
+ term_out(
term
);
+ term_update(
term
);
break;
case WM_ENTERSIZEMOVE:
#ifdef RDB_DEBUG_PATCH
break;
case WM_ENTERSIZEMOVE:
#ifdef RDB_DEBUG_PATCH
@@
-2141,7
+2177,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
debug((27, "WM_EXITSIZEMOVE"));
#endif
if (need_backend_resize) {
debug((27, "WM_EXITSIZEMOVE"));
#endif
if (need_backend_resize) {
- term_size(cfg.height, cfg.width, cfg.savelines);
+ term_size(
term,
cfg.height, cfg.width, cfg.savelines);
InvalidateRect(hwnd, NULL, TRUE);
}
break;
InvalidateRect(hwnd, NULL, TRUE);
}
break;
@@
-2156,7
+2192,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
LPRECT r = (LPRECT) lParam;
if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER &&
LPRECT r = (LPRECT) lParam;
if ( !need_backend_resize && cfg.resize_action == RESIZE_EITHER &&
- (cfg.height !=
rows || cfg.width !=
cols )) {
+ (cfg.height !=
term->rows || cfg.width != term->
cols )) {
/*
* Great! It seems that both the terminal size and the
* font size have been changed and the user is now dragging.
/*
* Great! It seems that both the terminal size and the
* font size have been changed and the user is now dragging.
@@
-2166,10
+2202,10
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
*
* This would be easier but it seems to be too confusing.
*
* This would be easier but it seems to be too confusing.
- term_size(cfg.height, cfg.width, cfg.savelines);
+ term_size(
term,
cfg.height, cfg.width, cfg.savelines);
reset_window(2);
*/
reset_window(2);
*/
- cfg.height=
rows; cfg.width=
cols;
+ cfg.height=
term->rows; cfg.width=term->
cols;
InvalidateRect(hwnd, NULL, TRUE);
need_backend_resize = TRUE;
InvalidateRect(hwnd, NULL, TRUE);
need_backend_resize = TRUE;
@@
-2213,25
+2249,25
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
width = r->right - r->left - ex_width;
height = r->bottom - r->top - ex_height;
width = r->right - r->left - ex_width;
height = r->bottom - r->top - ex_height;
- w = (width +
cols/2)/
cols;
- h = (height +
rows/2)/
rows;
- if ( r->right != r->left + w*
cols + ex_width)
+ w = (width +
term->cols/2)/term->
cols;
+ h = (height +
term->rows/2)/term->
rows;
+ if ( r->right != r->left + w*
term->cols + ex_width)
rv = 1;
if (wParam == WMSZ_LEFT ||
wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_TOPLEFT)
rv = 1;
if (wParam == WMSZ_LEFT ||
wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_TOPLEFT)
- r->left = r->right - w*cols - ex_width;
+ r->left = r->right - w*
term->
cols - ex_width;
else
else
- r->right = r->left + w*cols + ex_width;
+ r->right = r->left + w*
term->
cols + ex_width;
- if (r->bottom != r->top + h*rows + ex_height)
+ if (r->bottom != r->top + h*
term->
rows + ex_height)
rv = 1;
if (wParam == WMSZ_TOP ||
wParam == WMSZ_TOPRIGHT || wParam == WMSZ_TOPLEFT)
rv = 1;
if (wParam == WMSZ_TOP ||
wParam == WMSZ_TOPRIGHT || wParam == WMSZ_TOPLEFT)
- r->top = r->bottom - h*rows - ex_height;
+ r->top = r->bottom - h*
term->
rows - ex_height;
else
else
- r->bottom = r->top + h*rows + ex_height;
+ r->bottom = r->top + h*
term->
rows + ex_height;
return rv;
}
return rv;
}
@@
-2277,21
+2313,21
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
if (!resizing) {
if (wParam == SIZE_MAXIMIZED && !was_zoomed) {
was_zoomed = 1;
if (!resizing) {
if (wParam == SIZE_MAXIMIZED && !was_zoomed) {
was_zoomed = 1;
- prev_rows = rows;
- prev_cols = cols;
+ prev_rows =
term->
rows;
+ prev_cols =
term->
cols;
if (cfg.resize_action == RESIZE_TERM) {
w = width / font_width;
if (w < 1) w = 1;
h = height / font_height;
if (h < 1) h = 1;
if (cfg.resize_action == RESIZE_TERM) {
w = width / font_width;
if (w < 1) w = 1;
h = height / font_height;
if (h < 1) h = 1;
- term_size(h, w, cfg.savelines);
+ term_size(
term,
h, w, cfg.savelines);
}
reset_window(0);
} else if (wParam == SIZE_RESTORED && was_zoomed) {
was_zoomed = 0;
if (cfg.resize_action == RESIZE_TERM)
}
reset_window(0);
} else if (wParam == SIZE_RESTORED && was_zoomed) {
was_zoomed = 0;
if (cfg.resize_action == RESIZE_TERM)
- term_size(prev_rows, prev_cols, cfg.savelines);
+ term_size(
term,
prev_rows, prev_cols, cfg.savelines);
if (cfg.resize_action != RESIZE_FONT)
reset_window(2);
else
if (cfg.resize_action != RESIZE_FONT)
reset_window(2);
else
@@
-2330,26
+2366,26
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
case WM_VSCROLL:
switch (LOWORD(wParam)) {
case SB_BOTTOM:
case WM_VSCROLL:
switch (LOWORD(wParam)) {
case SB_BOTTOM:
- term_scroll(-1, 0);
+ term_scroll(
term,
-1, 0);
break;
case SB_TOP:
break;
case SB_TOP:
- term_scroll(+1, 0);
+ term_scroll(
term,
+1, 0);
break;
case SB_LINEDOWN:
break;
case SB_LINEDOWN:
- term_scroll(0, +1);
+ term_scroll(
term,
0, +1);
break;
case SB_LINEUP:
break;
case SB_LINEUP:
- term_scroll(0, -1);
+ term_scroll(
term,
0, -1);
break;
case SB_PAGEDOWN:
break;
case SB_PAGEDOWN:
- term_scroll(
0, +
rows / 2);
+ term_scroll(
term, 0, +term->
rows / 2);
break;
case SB_PAGEUP:
break;
case SB_PAGEUP:
- term_scroll(
0, -
rows / 2);
+ term_scroll(
term, 0, -term->
rows / 2);
break;
case SB_THUMBPOSITION:
case SB_THUMBTRACK:
break;
case SB_THUMBPOSITION:
case SB_THUMBTRACK:
- term_scroll(1, HIWORD(wParam));
+ term_scroll(
term,
1, HIWORD(wParam));
break;
}
break;
break;
}
break;
@@
-2414,7
+2450,7
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
* preferable to having to faff about buffering
* things.
*/
* preferable to having to faff about buffering
* things.
*/
- term_nopaste();
+ term_nopaste(
term
);
/*
* We need not bother about stdin backlogs
/*
* We need not bother about stdin backlogs
@@
-2424,7
+2460,8
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
* messages. We _have_ to buffer everything
* we're sent.
*/
* messages. We _have_ to buffer everything
* we're sent.
*/
- ldisc_send(buf, len, 1);
+ term_seen_key_event(term);
+ ldisc_send(ldisc, buf, len, 1);
show_mouseptr(0);
}
}
show_mouseptr(0);
}
}
@@
-2470,8
+2507,10
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
* luni_send() covering the whole of buff. So
* instead we luni_send the characters one by one.
*/
* luni_send() covering the whole of buff. So
* instead we luni_send the characters one by one.
*/
- for (i = 0; i < n; i += 2)
- luni_send((unsigned short *)(buff+i), 1, 1);
+ term_seen_key_event(term);
+ for (i = 0; i < n; i += 2) {
+ luni_send(ldisc, (unsigned short *)(buff+i), 1, 1);
+ }
free(buff);
}
ImmReleaseContext(hwnd, hIMC);
free(buff);
}
ImmReleaseContext(hwnd, hIMC);
@@
-2484,10
+2523,12
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
buf[1] = wParam;
buf[0] = wParam >> 8;
buf[1] = wParam;
buf[0] = wParam >> 8;
- lpage_send(kbd_codepage, buf, 2, 1);
+ term_seen_key_event(term);
+ lpage_send(ldisc, kbd_codepage, buf, 2, 1);
} else {
char c = (unsigned char) wParam;
} else {
char c = (unsigned char) wParam;
- lpage_send(kbd_codepage, &c, 1, 1);
+ term_seen_key_event(term);
+ lpage_send(ldisc, kbd_codepage, &c, 1, 1);
}
return (0);
case WM_CHAR:
}
return (0);
case WM_CHAR:
@@
-2500,7
+2541,8
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
*/
{
char c = (unsigned char)wParam;
*/
{
char c = (unsigned char)wParam;
- lpage_send(CP_ACP, &c, 1, 1);
+ term_seen_key_event(term);
+ lpage_send(ldisc, CP_ACP, &c, 1, 1);
}
return 0;
case WM_SETCURSOR:
}
return 0;
case WM_SETCURSOR:
@@
-2542,18
+2584,19
@@
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
if (send_raw_mouse &&
!(cfg.mouse_override && shift_pressed)) {
/* send a mouse-down followed by a mouse up */
if (send_raw_mouse &&
!(cfg.mouse_override && shift_pressed)) {
/* send a mouse-down followed by a mouse up */
- term_mouse(b,
+ term_mouse(
term,
b,
MA_CLICK,
TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), shift_pressed,
control_pressed, is_alt_pressed());
MA_CLICK,
TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), shift_pressed,
control_pressed, is_alt_pressed());
- term_mouse(b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
+ term_mouse(
term,
b, MA_RELEASE, TO_CHR_X(X_POS(lParam)),
TO_CHR_Y(Y_POS(lParam)), shift_pressed,
control_pressed, is_alt_pressed());
} else {
/* trigger a scroll */
TO_CHR_Y(Y_POS(lParam)), shift_pressed,
control_pressed, is_alt_pressed());
} else {
/* trigger a scroll */
- term_scroll(0,
- b == MBT_WHEEL_UP ? -rows / 2 : rows / 2);
+ term_scroll(term, 0,
+ b == MBT_WHEEL_UP ?
+ -term->rows / 2 : term->rows / 2);
}
}
return 0;
}
}
return 0;
@@
-2573,7
+2616,7
@@
void sys_cursor(int x, int y)
{
int cx, cy;
{
int cx, cy;
- if (!has_focus) return;
+ if (!
term->
has_focus) return;
/*
* Avoid gratuitously re-updating the cursor position and IMM
/*
* Avoid gratuitously re-updating the cursor position and IMM
@@
-2594,7
+2637,7
@@
static void sys_cursor_update(void)
COMPOSITIONFORM cf;
HIMC hIMC;
COMPOSITIONFORM cf;
HIMC hIMC;
- if (!has_focus) return;
+ if (!
term->
has_focus) return;
if (caret_x < 0 || caret_y < 0)
return;
if (caret_x < 0 || caret_y < 0)
return;
@@
-2651,7
+2694,7
@@
void do_text(Context ctx, int x, int y, char *text, int len,
}
/* Only want the left half of double width lines */
}
/* Only want the left half of double width lines */
- if (lattr != LATTR_NORM && x*2 >= cols)
+ if (lattr != LATTR_NORM && x*2 >=
term->
cols)
return;
x *= fnt_width;
return;
x *= fnt_width;
@@
-2659,7
+2702,7
@@
void do_text(Context ctx, int x, int y, char *text, int len,
x += offset_width;
y += offset_height;
x += offset_width;
y += offset_height;
- if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 || big_cursor)) {
+ if ((attr & TATTR_ACTCURS) && (cfg.cursor_type == 0 ||
term->
big_cursor)) {
attr &= ATTR_CUR_AND | (bold_mode != BOLD_COLOURS ? ATTR_BOLD : 0);
attr ^= ATTR_CUR_XOR;
}
attr &= ATTR_CUR_AND | (bold_mode != BOLD_COLOURS ? ATTR_BOLD : 0);
attr ^= ATTR_CUR_XOR;
}
@@
-2760,8
+2803,8
@@
void do_text(Context ctx, int x, int y, char *text, int len,
line_box.bottom = y + font_height;
/* Only want the left half of double width lines */
line_box.bottom = y + font_height;
/* Only want the left half of double width lines */
- if (line_box.right > font_width*cols+offset_width)
- line_box.right = font_width*cols+offset_width;
+ if (line_box.right > font_width*
term->
cols+offset_width)
+ line_box.right = font_width*
term->
cols+offset_width;
/* We're using a private area for direct to font. (512 chars.) */
if (dbcs_screenfont && (attr & CSET_MASK) == ATTR_ACP) {
/* We're using a private area for direct to font. (512 chars.) */
if (dbcs_screenfont && (attr & CSET_MASK) == ATTR_ACP) {
@@
-2875,7
+2918,7
@@
void do_cursor(Context ctx, int x, int y, char *text, int len,
HDC hdc = ctx;
int ctype = cfg.cursor_type;
HDC hdc = ctx;
int ctype = cfg.cursor_type;
- if ((attr & TATTR_ACTCURS) && (ctype == 0 || big_cursor)) {
+ if ((attr & TATTR_ACTCURS) && (ctype == 0 ||
term->
big_cursor)) {
if (((attr & CSET_MASK) | (unsigned char) *text) != UCSWIDE) {
do_text(ctx, x, y, text, len, attr, lattr);
return;
if (((attr & CSET_MASK) | (unsigned char) *text) != UCSWIDE) {
do_text(ctx, x, y, text, len, attr, lattr);
return;
@@
-2892,7
+2935,7
@@
void do_cursor(Context ctx, int x, int y, char *text, int len,
x += offset_width;
y += offset_height;
x += offset_width;
y += offset_height;
- if ((attr & TATTR_PASCURS) && (ctype == 0 || big_cursor)) {
+ if ((attr & TATTR_PASCURS) && (ctype == 0 ||
term->
big_cursor)) {
POINT pts[5];
HPEN oldpen;
pts[0].x = pts[1].x = pts[4].x = x;
POINT pts[5];
HPEN oldpen;
pts[0].x = pts[1].x = pts[4].x = x;
@@
-3108,7
+3151,8
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
if ((cfg.funky_type == 3 ||
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
if ((cfg.funky_type == 3 ||
- (cfg.funky_type <= 1 && app_keypad_keys && !cfg.no_applic_k))
+ (cfg.funky_type <= 1 && term->app_keypad_keys &&
+ !cfg.no_applic_k))
&& wParam == VK_NUMLOCK && !(keystate[VK_SHIFT] & 0x80)) {
wParam = VK_EXECUTE;
&& wParam == VK_NUMLOCK && !(keystate[VK_SHIFT] & 0x80)) {
wParam = VK_EXECUTE;
@@
-3123,7
+3167,8
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
}
/* Disable Auto repeat if required */
}
/* Disable Auto repeat if required */
- if (repeat_off && (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == KF_REPEAT)
+ if (term->repeat_off &&
+ (HIWORD(lParam) & (KF_UP | KF_REPEAT)) == KF_REPEAT)
return 0;
if ((HIWORD(lParam) & KF_ALTDOWN) && (keystate[VK_RMENU] & 0x80) == 0)
return 0;
if ((HIWORD(lParam) & KF_ALTDOWN) && (keystate[VK_RMENU] & 0x80) == 0)
@@
-3169,20
+3214,11
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
} else if (compose_state == 1 && wParam != VK_CONTROL)
compose_state = 0;
} else if (compose_state == 1 && wParam != VK_CONTROL)
compose_state = 0;
- /*
- * Record that we pressed key so the scroll window can be reset, but
- * be careful to avoid Shift-UP/Down
- */
- if (wParam != VK_SHIFT && wParam != VK_PRIOR && wParam != VK_NEXT &&
- wParam != VK_MENU && wParam != VK_CONTROL) {
- seen_key_event = 1;
- }
-
if (compose_state > 1 && left_alt)
compose_state = 0;
/* Sanitize the number pad if not using a PC NumPad */
if (compose_state > 1 && left_alt)
compose_state = 0;
/* Sanitize the number pad if not using a PC NumPad */
- if (left_alt || (app_keypad_keys && !cfg.no_applic_k
+ if (left_alt || (
term->
app_keypad_keys && !cfg.no_applic_k
&& cfg.funky_type != 2)
|| cfg.funky_type == 3 || cfg.nethack_keypad || compose_state) {
if ((HIWORD(lParam) & KF_EXTENDED) == 0) {
&& cfg.funky_type != 2)
|| cfg.funky_type == 3 || cfg.nethack_keypad || compose_state) {
if ((HIWORD(lParam) & KF_EXTENDED) == 0) {
@@
-3246,7
+3282,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
return 0;
}
if (wParam == VK_INSERT && shift_state == 1) {
return 0;
}
if (wParam == VK_INSERT && shift_state == 1) {
- term_do_paste();
+ term_do_paste(
term
);
return 0;
}
if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
return 0;
}
if (left_alt && wParam == VK_F4 && cfg.alt_f4) {
@@
-3264,7
+3300,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
}
/* Control-Numlock for app-keypad mode switch */
if (wParam == VK_PAUSE && shift_state == 2) {
}
/* Control-Numlock for app-keypad mode switch */
if (wParam == VK_PAUSE && shift_state == 2) {
- app_keypad_keys ^= 1;
+
term->
app_keypad_keys ^= 1;
return 0;
}
return 0;
}
@@
-3307,7
+3343,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
if (cfg.funky_type == 3 ||
(cfg.funky_type <= 1 &&
if (cfg.funky_type == 3 ||
(cfg.funky_type <= 1 &&
- app_keypad_keys && !cfg.no_applic_k)) switch (wParam) {
+
term->
app_keypad_keys && !cfg.no_applic_k)) switch (wParam) {
case VK_EXECUTE:
xkey = 'P';
break;
case VK_EXECUTE:
xkey = 'P';
break;
@@
-3321,7
+3357,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
xkey = 'S';
break;
}
xkey = 'S';
break;
}
- if (app_keypad_keys && !cfg.no_applic_k)
+ if (
term->
app_keypad_keys && !cfg.no_applic_k)
switch (wParam) {
case VK_NUMPAD0:
xkey = 'p';
switch (wParam) {
case VK_NUMPAD0:
xkey = 'p';
@@
-3388,7
+3424,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
break;
}
if (xkey) {
break;
}
if (xkey) {
- if (vt52_mode) {
+ if (
term->
vt52_mode) {
if (xkey >= 'P' && xkey <= 'S')
p += sprintf((char *) p, "\x1B%c", xkey);
else
if (xkey >= 'P' && xkey <= 'S')
p += sprintf((char *) p, "\x1B%c", xkey);
else
@@
-3404,6
+3440,12
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
*p++ = 0;
return -2;
}
*p++ = 0;
return -2;
}
+ if (wParam == VK_BACK && shift_state == 1) { /* Shift Backspace */
+ /* We do the opposite of what is configured */
+ *p++ = (cfg.bksp_is_delete ? 0x08 : 0x7F);
+ *p++ = 0;
+ return -2;
+ }
if (wParam == VK_TAB && shift_state == 1) { /* Shift tab */
*p++ = 0x1B;
*p++ = '[';
if (wParam == VK_TAB && shift_state == 1) { /* Shift tab */
*p++ = 0x1B;
*p++ = '[';
@@
-3441,7
+3483,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
*p++ = 0x1C;
return p - output;
}
*p++ = 0x1C;
return p - output;
}
- if (shift_state == 0 && wParam == VK_RETURN && cr_lf_return) {
+ if (shift_state == 0 && wParam == VK_RETURN &&
term->
cr_lf_return) {
*p++ = '\r';
*p++ = '\n';
return p - output;
*p++ = '\r';
*p++ = '\n';
return p - output;
@@
-3543,7
+3585,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
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) {
p += sprintf((char *) p, "\x1B%c", " HLMEIG"[code]);
return p - output;
}
p += sprintf((char *) p, "\x1B%c", " HLMEIG"[code]);
return p - output;
}
@@
-3581,13
+3623,13
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
}
return p - output;
}
}
return p - output;
}
- 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)
p += sprintf((char *) p, "\x1B%c", code + 'P' - 11 - offt);
else
p +=
p += sprintf((char *) p, "\x1B%c", code + 'P' - 11 - offt);
else
p +=
@@
-3599,7
+3641,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
return p - output;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
return p - output;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
- if (vt52_mode)
+ if (
term->
vt52_mode)
p += sprintf((char *) p, "\x1B%c", code + 'P' - 11);
else
p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11);
p += sprintf((char *) p, "\x1B%c", code + 'P' - 11);
else
p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11);
@@
-3638,10
+3680,10
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
break;
}
if (xkey) {
break;
}
if (xkey) {
- if (vt52_mode)
+ if (
term->
vt52_mode)
p += sprintf((char *) p, "\x1B%c", xkey);
else {
p += sprintf((char *) p, "\x1B%c", xkey);
else {
- int app_flg = (app_cursor_keys && !cfg.no_applic_c);
+ int app_flg = (
term->
app_cursor_keys && !cfg.no_applic_c);
#if 0
/*
* RDB: VT100 & VT102 manuals both state the
#if 0
/*
* RDB: VT100 & VT102 manuals both state the
@@
-3657,7
+3699,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
* _this_ I'll have to put in a configurable
* option.
*/
* _this_ I'll have to put in a configurable
* option.
*/
- if (!app_keypad_keys)
+ if (!
term->
app_keypad_keys)
app_flg = 0;
#endif
/* Useful mapping of Ctrl-arrows */
app_flg = 0;
#endif
/* Useful mapping of Ctrl-arrows */
@@
-3704,7
+3746,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
#ifdef SHOW_TOASCII_RESULT
if (r == 1 && !key_down) {
if (alt_sum) {
#ifdef SHOW_TOASCII_RESULT
if (r == 1 && !key_down) {
if (alt_sum) {
- if (in_utf || dbcs_screenfont)
+ if (in_utf
(term)
|| dbcs_screenfont)
debug((", (U+%04x)", alt_sum));
else
debug((", LCH(%d)", alt_sum));
debug((", (U+%04x)", alt_sum));
else
debug((", LCH(%d)", alt_sum));
@@
-3728,7
+3770,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
* sensible, but for the moment it's preferable to
* having to faff about buffering things.
*/
* sensible, but for the moment it's preferable to
* having to faff about buffering things.
*/
- term_nopaste();
+ term_nopaste(
term
);
p = output;
for (i = 0; i < r; i++) {
p = output;
for (i = 0; i < r; i++) {
@@
-3748,7
+3790,8
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
return 0;
}
keybuf = nc;
return 0;
}
keybuf = nc;
- luni_send(&keybuf, 1, 1);
+ term_seen_key_event(term);
+ luni_send(ldisc, &keybuf, 1, 1);
continue;
}
continue;
}
@@
-3756,9
+3799,10
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
if (!key_down) {
if (alt_sum) {
if (!key_down) {
if (alt_sum) {
- if (in_utf || dbcs_screenfont) {
+ if (in_utf
(term)
|| dbcs_screenfont) {
keybuf = alt_sum;
keybuf = alt_sum;
- luni_send(&keybuf, 1, 1);
+ term_seen_key_event(term);
+ luni_send(ldisc, &keybuf, 1, 1);
} else {
ch = (char) alt_sum;
/*
} else {
ch = (char) alt_sum;
/*
@@
-3770,22
+3814,27
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
* messages. We _have_ to buffer
* everything we're sent.
*/
* messages. We _have_ to buffer
* everything we're sent.
*/
- ldisc_send(&ch, 1, 1);
+ term_seen_key_event(term);
+ ldisc_send(ldisc, &ch, 1, 1);
}
alt_sum = 0;
} else
}
alt_sum = 0;
} else
- lpage_send(kbd_codepage, &ch, 1, 1);
+ term_seen_key_event(term);
+ lpage_send(ldisc, kbd_codepage, &ch, 1, 1);
} else {
if(capsOn && ch < 0x80) {
WCHAR cbuf[2];
cbuf[0] = 27;
cbuf[1] = xlat_uskbd2cyrllic(ch);
} else {
if(capsOn && ch < 0x80) {
WCHAR cbuf[2];
cbuf[0] = 27;
cbuf[1] = xlat_uskbd2cyrllic(ch);
- luni_send(cbuf+!left_alt, 1+!!left_alt, 1);
+ term_seen_key_event(term);
+ luni_send(ldisc, cbuf+!left_alt, 1+!!left_alt, 1);
} else {
char cbuf[2];
cbuf[0] = '\033';
cbuf[1] = ch;
} else {
char cbuf[2];
cbuf[0] = '\033';
cbuf[1] = ch;
- lpage_send(kbd_codepage, cbuf+!left_alt, 1+!!left_alt, 1);
+ term_seen_key_event(term);
+ lpage_send(ldisc, kbd_codepage,
+ cbuf+!left_alt, 1+!!left_alt, 1);
}
}
show_mouseptr(0);
}
}
show_mouseptr(0);
@@
-3800,7
+3849,7
@@
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
if (!left_alt)
keys[0] = 0;
/* If we will be using alt_sum fix the 256s */
if (!left_alt)
keys[0] = 0;
/* If we will be using alt_sum fix the 256s */
- else if (keys[0] && (in_utf || dbcs_screenfont))
+ else if (keys[0] && (in_utf
(term)
|| dbcs_screenfont))
keys[0] = 10;
}
keys[0] = 10;
}
@@
-3824,7
+3873,7
@@
void request_paste(void)
* clipboard with no difficulty, so request_paste() can just go
* ahead and paste.
*/
* clipboard with no difficulty, so request_paste() can just go
* ahead and paste.
*/
- term_do_paste();
+ term_do_paste(
term
);
}
void set_title(char *title)
}
void set_title(char *title)
@@
-4189,7
+4238,7
@@
void optimised_move(int to, int from, int lines)
max = to + from - min;
r.left = offset_width;
max = to + from - min;
r.left = offset_width;
- r.right = offset_width + cols * font_width;
+ r.right = offset_width +
term->
cols * font_width;
r.top = offset_height + min * font_height;
r.bottom = offset_height + (max + lines) * font_height;
ScrollWindow(hwnd, 0, (to - from) * font_height, &r, &r);
r.top = offset_height + min * font_height;
r.bottom = offset_height + (max + lines) * font_height;
ScrollWindow(hwnd, 0, (to - from) * font_height, &r, &r);
@@
-4298,7
+4347,7
@@
void beep(int mode)
}
}
/* Otherwise, either visual bell or disabled; do nothing here */
}
}
/* Otherwise, either visual bell or disabled; do nothing here */
- if (!has_focus) {
+ if (!
term->
has_focus) {
flash_window(2); /* start */
}
}
flash_window(2); /* start */
}
}
@@
-4521,3
+4570,14
@@
void flip_full_screen()
ShowWindow(hwnd, SW_MAXIMIZE);
}
}
ShowWindow(hwnd, SW_MAXIMIZE);
}
}
+
+void frontend_keypress(void *handle)
+{
+ /*
+ * Keypress termination in non-Close-On-Exit mode is not
+ * currently supported in PuTTY proper, because the window
+ * always has a perfectly good Close button anyway. So we do
+ * nothing here.
+ */
+ return;
+}