X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/604fab0c2d879947490eceb1b898b82be0fb0c00..8ce999b9504afef593ba6f91a6ddb2377f5bd70d:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index 71334936..0f04bee0 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -1135,12 +1135,12 @@ static void cfgtopalette(void)
     for (i = 0; i < NEXTCOLOURS; i++) {
 	if (i < 216) {
 	    int r = i / 36, g = (i / 6) % 6, b = i % 6;
-	    defpal[i+16].rgbtRed = r * 0x33;
-	    defpal[i+16].rgbtGreen = g * 0x33;
-	    defpal[i+16].rgbtBlue = b * 0x33;
+	    defpal[i+16].rgbtRed = r ? r * 40 + 55 : 0;
+	    defpal[i+16].rgbtGreen = g ? g * 40 + 55 : 0;
+	    defpal[i+16].rgbtBlue = b ? b * 40 + 55 : 0;
 	} else {
 	    int shade = i - 216;
-	    shade = (shade + 1) * 0xFF / (NEXTCOLOURS - 216 + 1);
+	    shade = shade * 10 + 8;
 	    defpal[i+16].rgbtRed = defpal[i+16].rgbtGreen =
 		defpal[i+16].rgbtBlue = shade;
 	}
@@ -4777,7 +4777,7 @@ static void flash_window(int mode)
 /*
  * Beep.
  */
-void beep(void *frontend, int mode)
+void do_beep(void *frontend, int mode)
 {
     if (mode == BELL_DEFAULT) {
 	/*
@@ -5069,6 +5069,20 @@ int from_backend(void *frontend, int is_stderr, const char *data, int len)
     return term_data(term, is_stderr, data, len);
 }
 
+int from_backend_untrusted(void *frontend, const char *data, int len)
+{
+    return term_data_untrusted(term, data, len);
+}
+
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+    int ret;
+    ret = cmdline_get_passwd_input(p, in, inlen);
+    if (ret == -1)
+	ret = term_get_userpass_input(term, p, in, inlen);
+    return ret;
+}
+
 void agent_schedule_callback(void (*callback)(void *, void *, int),
 			     void *callback_ctx, void *data, int len)
 {