-#include <windows.h>
-#include <imm.h>
-#include <commctrl.h>
-#include <richedit.h>
-#include <mmsystem.h>
-#ifndef AUTO_WINSOCK
-#ifdef WINSOCK_TWO
-#include <winsock2.h>
-#else
-#include <winsock.h>
-#endif
-#endif
-
-#ifndef NO_MULTIMON
-#if WINVER < 0x0500
-#define COMPILE_MULTIMON_STUBS
-#include <multimon.h>
-#endif
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
#include "terminal.h"
-#include "winstuff.h"
#include "storage.h"
#include "win_res.h"
+#ifndef NO_MULTIMON
+#if WINVER < 0x0500
+#define COMPILE_MULTIMON_STUBS
+#include <multimon.h>
+#endif
+#endif
+
+#include <imm.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <mmsystem.h>
+
#define IDM_SHOWLOG 0x0010
#define IDM_NEWSESS 0x0020
#define IDM_DUPSESS 0x0030
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
unsigned char *output);
static void cfgtopalette(void);
+static void systopalette(void);
static void init_palette(void);
static void init_fonts(int, int);
static void another_font(int);
static int compose_state = 0;
-static int wsa_started = 0;
-
-static OSVERSIONINFO osVersion;
-
static UINT wm_mousewheel = WM_MOUSEWHEEL;
/* Dummy routine, only required in plink. */
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{
- WORD winsock_ver;
- WSADATA wsadata;
WNDCLASS wndclass;
MSG msg;
int guess_width, guess_height;
hinst = inst;
flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
- winsock_ver = MAKEWORD(1, 1);
- if (WSAStartup(winsock_ver, &wsadata)) {
- MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
- MB_OK | MB_ICONEXCLAMATION);
- return 1;
- }
- if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1) {
- MessageBox(NULL, "WinSock version is incompatible with 1.1",
- "WinSock Error", MB_OK | MB_ICONEXCLAMATION);
- WSACleanup();
- return 1;
- }
- wsa_started = 1;
- /* WISHLIST: maybe allow config tweaking even if winsock not present? */
sk_init();
InitCommonControls();
* config box. */
defuse_showwindow();
+ if (!init_winver())
{
- ZeroMemory(&osVersion, sizeof(osVersion));
- osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
- if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) {
- char *str = dupprintf("%s Fatal Error", appname);
- MessageBox(NULL, "Windows refuses to report a version",
- str, MB_OK | MB_ICONEXCLAMATION);
- sfree(str);
- return 1;
- }
+ char *str = dupprintf("%s Fatal Error", appname);
+ MessageBox(NULL, "Windows refuses to report a version",
+ str, MB_OK | MB_ICONEXCLAMATION);
+ sfree(str);
+ return 1;
}
/*
p[i] = '\0';
do_defaults(p + 1, &cfg);
if (!*cfg.host && !do_config()) {
- WSACleanup();
- return 0;
+ cleanup_exit(0);
}
} else if (*p == '&') {
/*
UnmapViewOfFile(cp);
CloseHandle(filemap);
} else if (!do_config()) {
- WSACleanup();
- return 0;
+ cleanup_exit(0);
}
} else {
/*
cmdline_run_saved(&cfg);
if (!*cfg.host && !do_config()) {
- WSACleanup();
- return 0;
+ cleanup_exit(0);
}
/*
MessageBox(NULL, "Unsupported protocol number found",
str, MB_OK | MB_ICONEXCLAMATION);
sfree(str);
- WSACleanup();
- return 1;
+ cleanup_exit(1);
}
}
MessageBox(NULL, "Invalid Port Number",
str, MB_OK | MB_ICONEXCLAMATION);
sfree(str);
- WSACleanup();
- return 1;
+ cleanup_exit(1);
}
if (!prev) {
if (pal)
DeleteObject(pal);
sk_cleanup();
- if (wsa_started)
- WSACleanup();
if (cfg.protocol == PROT_SSH) {
random_save_seed();
}
if (!hwnd)
return "do_select(): internal error (hwnd==NULL)";
- if (WSAAsyncSelect(skt, hwnd, msg, events) == SOCKET_ERROR) {
- switch (WSAGetLastError()) {
+ if (p_WSAAsyncSelect(skt, hwnd, msg, events) == SOCKET_ERROR) {
+ switch (p_WSAGetLastError()) {
case WSAENETDOWN:
return "Network is down";
default:
defpal[i].rgbtGreen = cfg.colours[w][1];
defpal[i].rgbtBlue = cfg.colours[w][2];
}
+
+ /* Override with system colours if appropriate */
+ if (cfg.system_colour)
+ systopalette();
+}
+
+/*
+ * Override bit of defpal with colours from the system.
+ * (NB that this takes a copy the system colours at the time this is called,
+ * so subsequent colour scheme changes don't take effect. To fix that we'd
+ * probably want to be using GetSysColorBrush() and the like.)
+ */
+static void systopalette(void)
+{
+ int i;
+ static const struct { int nIndex; int norm; int bold; } or[] =
+ {
+ { COLOR_WINDOWTEXT, 16, 17 }, /* Default Foreground */
+ { COLOR_WINDOW, 18, 19 }, /* Default Background */
+ { COLOR_HIGHLIGHTTEXT, 20, 21 }, /* Cursor Text */
+ { COLOR_HIGHLIGHT, 22, 23 }, /* Cursor Colour */
+ };
+
+ for (i = 0; i < (sizeof(or)/sizeof(or[0])); i++) {
+ COLORREF colour = GetSysColor(or[i].nIndex);
+ defpal[or[i].norm].rgbtRed =
+ defpal[or[i].bold].rgbtRed = GetRValue(colour);
+ defpal[or[i].norm].rgbtGreen =
+ defpal[or[i].bold].rgbtGreen = GetGValue(colour);
+ defpal[or[i].norm].rgbtBlue =
+ defpal[or[i].bold].rgbtBlue = GetBValue(colour);
+ }
}
/*
case WM_NCMOUSEMOVE:
show_mouseptr(1);
noise_ultralight(lParam);
- return 0;
+ break;
case WM_IGNORE_CLIP:
ignore_clip = wParam; /* don't panic on DESTROYCLIPBOARD */
break;
*p++ = 0x1C;
return p - output;
}
+ if (shift_state == 3 && wParam == 0xDE) {
+ *p++ = 0x1E; /* Ctrl-~ == Ctrl-^ in xterm at least */
+ return p - output;
+ }
if (shift_state == 0 && wParam == VK_RETURN && term->cr_lf_return) {
*p++ = '\r';
*p++ = '\n';
ldisc_send(ldisc, &ch, 1, 1);
}
alt_sum = 0;
- } else
+ } else {
term_seen_key_event(term);
lpage_send(ldisc, kbd_codepage, &ch, 1, 1);
+ }
} else {
if(capsOn && ch < 0x80) {
WCHAR cbuf[2];