projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save Key now prompts before overwriting an existing file
[u/mdw/putty]
/
sizetip.c
diff --git
a/sizetip.c
b/sizetip.c
index
90c0573
..
439d88c
100644
(file)
--- a/
sizetip.c
+++ b/
sizetip.c
@@
-1,17
+1,27
@@
#include <windows.h>
#include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
#include <winreg.h>
#include <tchar.h>
#include <stdio.h>
#include <winreg.h>
#include <tchar.h>
#include <stdio.h>
+#include <stdlib.h>
#include "putty.h"
#include "putty.h"
+#include "winstuff.h"
-ATOM tip_class = 0;
+
static
ATOM tip_class = 0;
-HFONT tip_font;
-COLORREF tip_bg;
-COLORREF tip_text;
+
static
HFONT tip_font;
+
static
COLORREF tip_bg;
+
static
COLORREF tip_text;
-LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg,
+ WPARAM wParam, LPARAM lParam)
{
switch (nMsg) {
{
switch (nMsg) {
@@
-85,12
+95,12
@@
LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
return DefWindowProc(hWnd, nMsg, wParam, lParam);
}
return DefWindowProc(hWnd, nMsg, wParam, lParam);
}
-HWND tip_wnd = NULL;
-int tip_enabled = 0;
+
static
HWND tip_wnd = NULL;
+
static
int tip_enabled = 0;
void UpdateSizeTip(HWND src, int cx, int cy)
{
void UpdateSizeTip(HWND src, int cx, int cy)
{
- TCHAR str[
16
];
+ TCHAR str[
32
];
if (!tip_enabled) return;
if (!tip_enabled) return;
@@
-105,7
+115,7
@@
void UpdateSizeTip(HWND src, int cx, int cy)
wc.lpfnWndProc = SizeTipWndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.lpfnWndProc = SizeTipWndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
- wc.hInstance =
putty_
inst;
+ wc.hInstance =
h
inst;
wc.hIcon = NULL;
wc.hCursor = NULL;
wc.hbrBackground = NULL;
wc.hIcon = NULL;
wc.hCursor = NULL;
wc.hbrBackground = NULL;
@@
-136,8
+146,7
@@
void UpdateSizeTip(HWND src, int cx, int cy)
/* Generate the tip text */
/* Generate the tip text */
- _sntprintf(str, 16, "%dx%d", cx, cy);
-
+ sprintf(str, "%dx%d", cx, cy);
if (!tip_wnd) {
HDC hdc;
if (!tip_wnd) {
HDC hdc;
@@
-163,7
+172,7
@@
void UpdateSizeTip(HWND src, int cx, int cy)
tip_wnd = CreateWindowEx(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, MAKEINTRESOURCE(tip_class), str, WS_POPUP,
ix, iy, sz.cx, sz.cy,
tip_wnd = CreateWindowEx(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, MAKEINTRESOURCE(tip_class), str, WS_POPUP,
ix, iy, sz.cx, sz.cy,
- NULL, NULL,
putty_
inst, NULL);
+ NULL, NULL,
h
inst, NULL);
ShowWindow(tip_wnd, SW_SHOWNOACTIVATE);
ShowWindow(tip_wnd, SW_SHOWNOACTIVATE);