github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #187 from selvanair/highlight-logs 

Highlight warning and error messages in status window

Acked-by: Gert Doering <gert@greenie.muc.de>
pull/190/head
Selva Nair 2017-09-23 12:32:28 -04:00 committed by GitHub
parent e71d993cc3 23ac3c00bb
commit 2e388f5b84
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openvpn.c
View File

@ -145,6 +145,7 @@ OnLogLine(connection_t *c, char *line)
message = strchr(flags, ',') + 1; message = strchr(flags, ',') + 1;
if (message - 1 == NULL) if (message - 1 == NULL)
return; return;
size_t flag_size = message - flags - 1; /* message is always > flags */
/* Remove lines from log window if it is getting full */ /* Remove lines from log window if it is getting full */
if (SendMessage(logWnd, EM_GETLINECOUNT, 0, 0) > MAX_LOG_LINES) if (SendMessage(logWnd, EM_GETLINECOUNT, 0, 0) > MAX_LOG_LINES)
@ -158,8 +159,28 @@ OnLogLine(connection_t *c, char *line)
datetime = _tctime(&timestamp); datetime = _tctime(&timestamp);
datetime[24] = _T(' '); datetime[24] = _T(' ');
/* Append line to log window */ /* deselect current selection, if any */
SendMessage(logWnd, EM_SETSEL, (WPARAM) -1, (LPARAM) -1); SendMessage(logWnd, EM_SETSEL, (WPARAM) -1, (LPARAM) -1);
/* change text color if Warning or Error */
COLORREF text_clr = 0;
if (memchr(flags, 'N', flag_size) || memchr(flags, 'F', flag_size))
text_clr = o.clr_error;
else if (memchr(flags, 'W', flag_size))
text_clr = o.clr_warning;
if (text_clr != 0)
{
CHARFORMAT cfm = { .cbSize = sizeof(CHARFORMAT),
.dwMask = CFM_COLOR|CFM_BOLD,
.dwEffects = 0,
.crTextColor = text_clr,
};
SendMessage(logWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cfm);
}
/* Append line to log window */
SendMessage(logWnd, EM_REPLACESEL, FALSE, (LPARAM) datetime); SendMessage(logWnd, EM_REPLACESEL, FALSE, (LPARAM) datetime);
SendMessage(logWnd, EM_SETTEXTEX, (WPARAM) &ste, (LPARAM) message); SendMessage(logWnd, EM_SETTEXTEX, (WPARAM) &ste, (LPARAM) message);
SendMessage(logWnd, EM_REPLACESEL, FALSE, (LPARAM) _T("\n")); SendMessage(logWnd, EM_REPLACESEL, FALSE, (LPARAM) _T("\n"));