#define IDM_TEL_EOF 0x0130
#define IDM_ABOUT 0x0140
#define IDM_SAVEDSESS 0x0150
+#define IDM_COPYALL 0x0160
#define IDM_SAVED_MIN 0x1000
#define IDM_SAVED_MAX 0x2000
static Ldisc *real_ldisc;
+static int compose_state = 0;
+
void begin_session(void) {
ldisc = real_ldisc;
}
default_protocol = DEFAULT_PROTOCOL;
default_port = DEFAULT_PORT;
+ cfg.logtype = LGTYP_NONE;
do_defaults(NULL, &cfg);
tolower(p[2]) == 'h') {
default_protocol = cfg.protocol = PROT_SSH;
default_port = cfg.port = 22;
- } else if (q == p + 3 &&
- tolower(p[0]) == 'l' &&
- tolower(p[1]) == 'o' &&
- tolower(p[2]) == 'g') {
- logfile = "putty.log";
} else if (q == p + 7 &&
tolower(p[0]) == 'c' &&
tolower(p[1]) == 'l' &&
}
}
+ /* Check for invalid Port number (i.e. zero) */
+ if (cfg.port == 0) {
+ MessageBox(NULL, "Invalid Port Number",
+ "PuTTY Internal Error", MB_OK |MB_ICONEXCLAMATION);
+ WSACleanup();
+ return 1;
+ }
+
real_ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
/* To start with, we use the simple line discipline, so we can
* type passwords etc without fear of them being echoed... */
{
char *bits;
int size = (font_width+15)/16 * 2 * font_height;
- bits = calloc(size, 1);
+ bits = smalloc(size);
+ memset(bits, 0, size);
caretbm = CreateBitmap(font_width, font_height, 1, 1, bits);
- free(bits);
+ sfree(bits);
}
+ CreateCaret(hwnd, caretbm, font_width, font_height);
/*
* Initialise the scroll bar.
AppendMenu (m, MF_POPUP | MF_ENABLED, (UINT) s, "Sa&ved Sessions");
AppendMenu (m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
AppendMenu (m, MF_SEPARATOR, 0, 0);
+ AppendMenu (m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard");
AppendMenu (m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
AppendMenu (m, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
AppendMenu (m, MF_SEPARATOR, 0, 0);
ShowWindow (hwnd, show);
/*
+ * Open the initial log file if there is one.
+ */
+ logfopen();
+
+ /*
* Set the palette up.
*/
pal = NULL;
if (!has_focus)
timer_id = SetTimer(hwnd, 1, 59500, NULL);
else
- timer_id = SetTimer(hwnd, 1, 250, NULL);
+ timer_id = SetTimer(hwnd, 1, 100, NULL);
long_timer = 1;
/* There's no point rescanning everything in the message queue
static int ignore_clip = FALSE;
static int just_reconfigged = FALSE;
static int resizing = FALSE;
+ static int need_backend_resize = FALSE;
switch (message) {
case WM_TIMER:
{
time_t now;
time(&now);
- if (now-last_movement > cfg.ping_interval * 60 - 10)
+ if (now-last_movement > cfg.ping_interval)
{
back->special(TS_PING);
last_movement = now;
cl = c;
} else if (wParam == IDM_SAVEDSESS) {
char *session = sessions[(lParam - IDM_SAVED_MIN) / 16];
- cl = malloc(16 + strlen(session)); /* 8, but play safe */
+ cl = smalloc(16 + strlen(session)); /* 8, but play safe */
if (!cl)
cl = NULL; /* not a very important failure mode */
else {
if (filemap)
CloseHandle(filemap);
if (freecl)
- free(cl);
+ sfree(cl);
}
break;
case IDM_RECONF:
- if (!do_reconfig(hwnd))
- break;
- just_reconfigged = TRUE;
- {
- int i;
- for (i=0; i<8; i++)
- if (fonts[i])
- DeleteObject(fonts[i]);
- }
- bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
- und_mode = UND_FONT;
- init_fonts(0);
- sfree(logpal);
- /* Telnet will change local echo -> remote if the remote asks */
- if (cfg.protocol != PROT_TELNET)
- ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
- if (pal)
- DeleteObject(pal);
- logpal = NULL;
- pal = NULL;
- cfgtopalette();
- init_palette();
-
- /* Enable or disable the scroll bar, etc */
- {
- LONG nflg, flag = GetWindowLong(hwnd, GWL_STYLE);
- LONG nexflag, exflag = GetWindowLong(hwnd, GWL_EXSTYLE);
-
- nexflag = exflag;
- if (cfg.alwaysontop) {
- nexflag = WS_EX_TOPMOST;
- SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE);
- } else {
- nexflag = 0;
- SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE);
- }
+ {
+ int prev_alwaysontop = cfg.alwaysontop;
+ char oldlogfile[FILENAME_MAX];
+ int oldlogtype;
+ int need_setwpos = FALSE;
+ int old_fwidth, old_fheight;
+
+ strcpy(oldlogfile, cfg.logfilename);
+ oldlogtype = cfg.logtype;
+ cfg.width = cols;
+ cfg.height = rows;
+ old_fwidth = font_width;
+ old_fheight = font_height;
+ GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
+
+ if (!do_reconfig(hwnd))
+ break;
+
+ if (strcmp(oldlogfile, cfg.logfilename) ||
+ oldlogtype != cfg.logtype) {
+ logfclose(); /* reset logging */
+ logfopen();
+ }
- nflg = flag;
- if (cfg.scrollbar) nflg |= WS_VSCROLL;
- else nflg &= ~WS_VSCROLL;
- if (cfg.locksize)
- nflg &= ~(WS_THICKFRAME|WS_MAXIMIZEBOX);
- else
- nflg |= (WS_THICKFRAME|WS_MAXIMIZEBOX);
+ just_reconfigged = TRUE;
+ {
+ int i;
+ for (i=0; i<8; i++)
+ if (fonts[i])
+ DeleteObject(fonts[i]);
+ }
+ bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
+ und_mode = UND_FONT;
+ init_fonts(0);
+ sfree(logpal);
+ /*
+ * Telnet will change local echo -> remote if the
+ * remote asks.
+ */
+ if (cfg.protocol != PROT_TELNET)
+ ldisc = (cfg.ldisc_term ? &ldisc_term : &ldisc_simple);
+ if (pal)
+ DeleteObject(pal);
+ logpal = NULL;
+ pal = NULL;
+ cfgtopalette();
+ init_palette();
+
+ /* Enable or disable the scroll bar, etc */
+ {
+ LONG nflg, flag = GetWindowLong(hwnd, GWL_STYLE);
+ LONG nexflag, exflag = GetWindowLong(hwnd, GWL_EXSTYLE);
+
+ nexflag = exflag;
+ if (cfg.alwaysontop != prev_alwaysontop) {
+ if (cfg.alwaysontop) {
+ nexflag = WS_EX_TOPMOST;
+ SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
+ SWP_NOMOVE | SWP_NOSIZE);
+ } else {
+ nexflag = 0;
+ SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0,
+ SWP_NOMOVE | SWP_NOSIZE);
+ }
+ }
+
+ nflg = flag;
+ if (cfg.scrollbar) nflg |= WS_VSCROLL;
+ else nflg &= ~WS_VSCROLL;
+ if (cfg.locksize)
+ nflg &= ~(WS_THICKFRAME|WS_MAXIMIZEBOX);
+ else
+ nflg |= (WS_THICKFRAME|WS_MAXIMIZEBOX);
+
+ if (nflg != flag || nexflag != exflag)
+ {
+ RECT cr, wr;
+
+ if (nflg != flag)
+ SetWindowLong(hwnd, GWL_STYLE, nflg);
+ if (nexflag != exflag)
+ SetWindowLong(hwnd, GWL_EXSTYLE, nexflag);
+
+ SendMessage (hwnd, WM_IGNORE_SIZE, 0, 0);
+
+ SetWindowPos(hwnd, NULL, 0,0,0,0,
+ SWP_NOACTIVATE|SWP_NOCOPYBITS|
+ SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|
+ SWP_FRAMECHANGED);
+
+ GetWindowRect (hwnd, &wr);
+ GetClientRect (hwnd, &cr);
+ extra_width = wr.right - wr.left - cr.right + cr.left;
+ extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
+ }
+ }
- if (nflg != flag || nexflag != exflag)
- {
- RECT cr, wr;
-
- if (nflg != flag)
- SetWindowLong(hwnd, GWL_STYLE, nflg);
- if (nexflag != exflag)
- SetWindowLong(hwnd, GWL_EXSTYLE, nexflag);
-
- SendMessage (hwnd, WM_IGNORE_SIZE, 0, 0);
- SetWindowPos(hwnd, NULL, 0,0,0,0,
- SWP_NOACTIVATE|SWP_NOCOPYBITS|
- SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|
- SWP_FRAMECHANGED);
-
- GetWindowRect (hwnd, &wr);
- GetClientRect (hwnd, &cr);
- extra_width = wr.right - wr.left - cr.right + cr.left;
- extra_height = wr.bottom - wr.top - cr.bottom + cr.top;
+ if (cfg.height != rows ||
+ cfg.width != cols ||
+ old_fwidth != font_width ||
+ old_fheight != font_height ||
+ cfg.savelines != savelines)
+ need_setwpos = TRUE;
+ term_size(cfg.height, cfg.width, cfg.savelines);
+ InvalidateRect(hwnd, NULL, TRUE);
+ if (need_setwpos) {
+ force_normal(hwnd);
+ SetWindowPos (hwnd, NULL, 0, 0,
+ extra_width + font_width * cfg.width,
+ extra_height + font_height * cfg.height,
+ SWP_NOACTIVATE | SWP_NOCOPYBITS |
+ SWP_NOMOVE | SWP_NOZORDER);
}
- }
-
- term_size(cfg.height, cfg.width, cfg.savelines);
- InvalidateRect(hwnd, NULL, TRUE);
- SetWindowPos (hwnd, NULL, 0, 0,
- extra_width + font_width * cfg.width,
- extra_height + font_height * cfg.height,
- SWP_NOACTIVATE | SWP_NOCOPYBITS |
- SWP_NOMOVE | SWP_NOZORDER);
- if (IsIconic(hwnd)) {
- SetWindowText (hwnd,
- cfg.win_name_always ? window_name : icon_name);
- }
+ set_title(cfg.wintitle);
+ if (IsIconic(hwnd)) {
+ SetWindowText (hwnd,
+ cfg.win_name_always ? window_name : icon_name);
+ }
+ }
break;
- case IDM_CLRSB:
- term_clrsb();
- break;
- case IDM_RESET:
- term_pwron();
+ case IDM_COPYALL:
+ term_copyall();
break;
- case IDM_TEL_AYT: back->special (TS_AYT); break;
+ case IDM_CLRSB:
+ term_clrsb();
+ break;
+ case IDM_RESET:
+ term_pwron();
+ break;
+ case IDM_TEL_AYT: back->special (TS_AYT); break;
case IDM_TEL_BRK: back->special (TS_BRK); break;
case IDM_TEL_SYNCH: back->special (TS_SYNCH); break;
case IDM_TEL_EC: back->special (TS_EC); break;
return 0;
case WM_SETFOCUS:
has_focus = TRUE;
- CreateCaret(hwnd, caretbm, 0, 0);
+ CreateCaret(hwnd, caretbm, font_width, font_height);
ShowCaret(hwnd);
+ compose_state = 0;
term_out();
term_update();
break;
case WM_ENTERSIZEMOVE:
EnableSizeTip(1);
resizing = TRUE;
+ need_backend_resize = FALSE;
break;
case WM_EXITSIZEMOVE:
EnableSizeTip(0);
resizing = FALSE;
- back->size();
+ if (need_backend_resize)
+ back->size();
break;
case WM_SIZING:
{
*/
if (!resizing)
back->size();
+ else
+ need_backend_resize = TRUE;
just_reconfigged = FALSE;
}
}
x *= fnt_width;
y *= font_height;
- if (attr & ATTR_ACTCURS) {
+ if ((attr & ATTR_ACTCURS) && cfg.cursor_type == 0) {
attr &= (bold_mode == BOLD_COLOURS ? 0x300200 : 0x300300);
attr ^= ATTR_CUR_XOR;
}
oldpen = SelectObject (hdc, oldpen);
DeleteObject (oldpen);
}
- if (attr & ATTR_PASCURS) {
+ if ((attr & ATTR_PASCURS) && cfg.cursor_type == 0) {
POINT pts[5];
HPEN oldpen;
pts[0].x = pts[1].x = pts[4].x = x;
oldpen = SelectObject (hdc, oldpen);
DeleteObject (oldpen);
}
+ if ((attr & (ATTR_ACTCURS | ATTR_PASCURS)) && cfg.cursor_type != 0) {
+ int startx, starty, dx, dy, length, i;
+ if (cfg.cursor_type == 1) {
+ startx = x; starty = y+descent;
+ dx = 1; dy = 0; length = fnt_width;
+ } else {
+ int xadjust = 0;
+ if (attr & ATTR_RIGHTCURS)
+ xadjust = fnt_width-1;
+ startx = x+xadjust; starty = y;
+ dx = 0; dy = 1; length = font_height;
+ }
+ if (attr & ATTR_ACTCURS) {
+ HPEN oldpen;
+ oldpen = SelectObject (hdc, CreatePen(PS_SOLID, 0, colours[23]));
+ MoveToEx (hdc, startx, starty, NULL);
+ LineTo (hdc, startx+dx*length, starty+dy*length);
+ oldpen = SelectObject (hdc, oldpen);
+ DeleteObject (oldpen);
+ } else {
+ for (i = 0; i < length; i++) {
+ if (i % 2 == 0) {
+ SetPixel(hdc, startx, starty, colours[23]);
+ }
+ startx += dx; starty += dy;
+ }
+ }
+ }
}
static int check_compose(int first, int second) {
int scan, left_alt = 0, key_down, shift_state;
int r, i, code;
unsigned char * p = output;
+ static int alt_state = 0;
+
+ HKL kbd_layout = GetKeyboardLayout(0);
static WORD keys[3];
- static int compose_state = 0;
static int compose_char = 0;
static WPARAM compose_key = 0;
-
+
r = GetKeyboardState(keystate);
if (!r) memset(keystate, 0, sizeof(keystate));
else
debug(("*"));
debug((", S%02x", scan=(HIWORD(lParam) & 0xFF) ));
- ch = MapVirtualKey(wParam, 2);
+ ch = MapVirtualKeyEx(wParam, 2, kbd_layout);
if (ch>=' ' && ch<='~') debug((", '%c'", ch));
else if (ch) debug((", $%02x", ch));
}
#endif
+ if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED)) {
+ keystate[VK_RMENU] = keystate[VK_MENU];
+ }
+
/* Note if AltGr was pressed and if it was used as a compose key */
if (cfg.compose_key) {
if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
{
- keystate[VK_RMENU] = keystate[VK_MENU];
if (!compose_state) compose_key = wParam;
}
if (wParam == VK_APPS && !compose_state)
}
else if (compose_state==1 && wParam != VK_CONTROL)
compose_state = 0;
- } else
+ } else {
compose_state = 0;
+ }
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
if ( (cfg.funky_type == 3 ||
return -1;
}
if (left_alt && wParam == VK_SPACE && cfg.alt_space) {
-
+ alt_state = 0;
+ PostMessage(hwnd, WM_CHAR, ' ', 0);
SendMessage (hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
return -1;
}
if(cfg.xlat_capslockcyr)
keystate[VK_CAPITAL] = 0;
- r = ToAscii (wParam, scan, keystate, keys, 0);
+ r = ToAsciiEx(wParam, scan, keystate, keys, 0, kbd_layout);
if(r>0)
{
p = output;
}
}
- /* This stops ALT press-release doing a 'COMMAND MENU' function */
- if (!cfg.alt_only) {
- if (message == WM_SYSKEYUP && wParam == VK_MENU)
+ /* ALT alone may or may not want to bring up the System menu */
+ if (wParam == VK_MENU) {
+ if (cfg.alt_only) {
+ if (message == WM_SYSKEYDOWN)
+ alt_state = 1;
+ else if (message == WM_SYSKEYUP && alt_state)
+ PostMessage(hwnd, WM_CHAR, ' ', 0);
+ if (message == WM_SYSKEYUP)
+ alt_state = 0;
+ } else
return 0;
}
projects / u / mdw / putty / blobdiff