X-Git-Url: http://www.privoxy.org/gitweb/new.html?a=blobdiff_plain;f=w32log.c;h=c7e3540dc6ab74aefe12b874b282b51fd5fd7e90;hb=b8f8680019ba02efe0883eb9b8e5b52c329863ed;hp=b0f3c62081a43ec56b224a88e1c64abd461406dc;hpb=0428133610c525457cb16f7ac6a54203a2743d6c;p=privoxy.git
diff --git a/w32log.c b/w32log.c
index b0f3c620..c7e3540d 100644
--- a/w32log.c
+++ b/w32log.c
@@ -1,13 +1,12 @@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.39 2011/05/27 11:34:16 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
*
* Purpose : Functions for creating and destroying the log window,
- * ouputting strings, processing messages and so on.
+ * outputting strings, processing messages and so on.
*
* Copyright : Written by and Copyright (C) 2001-2009 members of
- * the Privoxy team. http://www.privoxy.org/
+ * the Privoxy team. https://www.privoxy.org/
*
* Written by and Copyright (C) 1999 Adam Lock
*
@@ -41,6 +40,7 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.39 2011/05/27 11:34:16 fabiankeil E
#ifndef STRICT
#define STRICT
#endif
+#include
#include
#include
@@ -54,15 +54,6 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.39 2011/05/27 11:34:16 fabiankeil E
#include "errlog.h"
#include "loadcfg.h"
-const char w32res_h_rcs[] = W32RES_H_VERSION;
-
-#ifdef __MINGW32__
-#include "cygwin.h"
-const char cygwin_h_rcs[] = CYGWIN_H_VERSION;
-#endif
-
-const char w32log_h_rcs[] = W32LOG_H_VERSION;
-
#ifndef _WIN_CONSOLE /* entire file */
/*
@@ -172,6 +163,9 @@ static struct _Pattern
{ "Connect: Reusing server socket", STYLE_HIGHLIGHT },
{ "Connect: Created new connection to", STYLE_HIGHLIGHT },
{ "hung up on us", STYLE_HIGHLIGHT },
+ { "Info: Loading actions file:", STYLE_HIGHLIGHT },
+ { "Info: Loading filter file:", STYLE_HIGHLIGHT },
+ { "Info: Now toggled ", STYLE_HIGHLIGHT },
{ "Crunching Referer:", STYLE_HIGHLIGHT },
/* what are all the possible error strings?? */
{ "Error:", STYLE_HIGHLIGHT },
@@ -641,7 +635,7 @@ HWND CreateHiddenLogOwnerWindow(HINSTANCE hInstance)
hwnd = CreateWindow(szWndName, szWndName,
WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
- CW_USEDEFAULT, NULL, NULL, hInstance, NULL );
+ CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
return hwnd;
@@ -724,8 +718,8 @@ HWND CreateLogWindow(HINSTANCE hInstance, int nCmdShow)
/* SendMessage(g_hwndLogBox, EM_SETWORDWRAPMODE, 0, 0); */
/* Subclass the control to catch certain messages */
- g_fnLogBox = (WNDPROC) GetWindowLong(g_hwndLogBox, GWL_WNDPROC);
- SetWindowLong(g_hwndLogBox, GWL_WNDPROC, (LONG) LogRichEditProc);
+ g_fnLogBox = (WNDPROC) GetWindowLongPtr(g_hwndLogBox, GWLP_WNDPROC);
+ SetWindowLongPtr(g_hwndLogBox, GWLP_WNDPROC, (LONG_PTR) LogRichEditProc);
/* Minimizing looks stupid when the log window is not on the task bar, so hide instead */
if (!g_bShowOnTaskBar &&
@@ -944,18 +938,17 @@ void OnLogCommand(int nCommand)
break;
#ifdef FEATURE_TOGGLE
- /* by haroon - change toggle to its opposite value */
case ID_TOGGLE_ENABLED:
global_toggle_state = !global_toggle_state;
- if (global_toggle_state)
- {
- log_error(LOG_LEVEL_INFO, "Now toggled ON.");
- }
- else
- {
- log_error(LOG_LEVEL_INFO, "Now toggled OFF.");
- }
- SetIdleIcon();
+ log_error(LOG_LEVEL_INFO,
+ "Now toggled %s", global_toggle_state ? "ON" : "OFF");
+ /*
+ * Leverage TIMER_ANIMSTOP_ID to set the idle icon through the
+ * "application queue". According to MSDN, 10 milliseconds are
+ * the lowest value possible and seem to be close enough to
+ * "instantly".
+ */
+ SetTimer(g_hwndLogFrame, TIMER_ANIMSTOP_ID, 10, NULL);
break;
#endif /* def FEATURE_TOGGLE */
@@ -1111,7 +1104,6 @@ void SetIdleIcon()
if (!global_toggle_state)
{
TraySetIcon(g_hwndTray, 1, g_hiconOff);
- /* log_error(LOG_LEVEL_INFO, "Privoxy OFF icon selected."); */
}
else
#endif /* def FEATURE_TOGGLE */
@@ -1184,7 +1176,7 @@ LRESULT CALLBACK LogWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
return 0;
case WM_CLOSE:
- /* This is the end - beautiful friend - the end */
+ /* This is the end - my only friend - the end */
DestroyWindow(g_hwndLogBox);
DestroyWindow(g_hwndLogFrame);
return 0;
@@ -1195,7 +1187,7 @@ LRESULT CALLBACK LogWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
case WM_SHOWWINDOW:
g_bShowLogWindow = wParam;
- case WM_SIZE:
+ case WM_SIZE: /* note: implicit-fallthrough */
/* Resize the logging window to fit the new frame */
if (g_hwndLogBox)
{