nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-30 08:20:28 -05:00
Code Issues Projects Releases Wiki Activity

Try to improve the caret usage

Browse Source 
[originally from svn r651]
This commit is contained in:
Simon Tatham 2000-09-29 10:32:07 +00:00
parent 0e9b76540b
commit a3df90a2e3
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
window.c
View File

@ -83,6 +83,8 @@ static RGBTRIPLE defpal[NCOLOURS];
static HWND hwnd; static HWND hwnd;
static HBITMAP caretbm;
static int dbltime, lasttime, lastact; static int dbltime, lasttime, lastact;
static Mouse_Button lastbtn; static Mouse_Button lastbtn;
@ -382,6 +384,18 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
SetWindowPos (hwnd, NULL, 0, 0, guess_width, guess_height, SetWindowPos (hwnd, NULL, 0, 0, guess_width, guess_height,
SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER); SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER);
/*
* Set up a caret bitmap, with no content.
*/
{
char *bits;
int size = (font_width+15)/16 * 2 * font_height;
bits = calloc(size, 1);
memset(bits, 0x55, size);
caretbm = CreateBitmap(font_width, font_height, 1, 1, bits);
free(bits);
}
/* /*
* Initialise the scroll bar. * Initialise the scroll bar.
*/ */
@ -536,9 +550,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
KillTimer(hwnd, timer_id); KillTimer(hwnd, timer_id);
timer_id = 0; timer_id = 0;
} }
HideCaret(hwnd);
if (inbuf_head) if (inbuf_head)
term_out(); term_out();
term_update(); term_update();
ShowCaret(hwnd);
if (!has_focus) if (!has_focus)
timer_id = SetTimer(hwnd, 1, 2000, NULL); timer_id = SetTimer(hwnd, 1, 2000, NULL);
else if (cfg.blinktext) else if (cfg.blinktext)
@ -990,7 +1006,9 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
enact_pending_netevent(); enact_pending_netevent();
if (inbuf_head) if (inbuf_head)
term_out(); term_out();
HideCaret(hwnd);
term_update(); term_update();
ShowCaret(hwnd);
return 0; return 0;
case WM_CREATE: case WM_CREATE:
break; break;
@ -1243,6 +1261,7 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT p; PAINTSTRUCT p;
HideCaret(hwnd);
hdc = BeginPaint (hwnd, &p); hdc = BeginPaint (hwnd, &p);
if (pal) { if (pal) {
SelectPalette (hdc, pal, TRUE); SelectPalette (hdc, pal, TRUE);
@ -1253,6 +1272,7 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
SelectObject (hdc, GetStockObject(SYSTEM_FONT)); SelectObject (hdc, GetStockObject(SYSTEM_FONT));
SelectObject (hdc, GetStockObject(WHITE_PEN)); SelectObject (hdc, GetStockObject(WHITE_PEN));
EndPaint (hwnd, &p); EndPaint (hwnd, &p);
ShowCaret(hwnd);
} }
return 0; return 0;
case WM_NETEVENT: case WM_NETEVENT:
@ -1269,7 +1289,8 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
return 0; return 0;
case WM_SETFOCUS: case WM_SETFOCUS:
has_focus = TRUE; has_focus = TRUE;
CreateCaret(hwnd, NULL, font_width, font_height); CreateCaret(hwnd, caretbm, 0, 0);
ShowCaret(hwnd);
term_out(); term_out();
term_update(); term_update();
break; break;