Changeset 895 for trunk/dll/newview.c

Timestamp:

Dec 30, 2007, 12:46:11 AM (18 years ago)

Author:

Gregg Young

Message:

Added remove_first_occurence_of_character to strip.c; Refined mailrun to use <mailto:> syntax;

File:

• trunk/dll/newview.c (modified) (7 diffs)

trunk/dll/newview.c

@@ -28 +28 @@
   17 Dec 07 GKY Make WPURLDEFAULTSETTINGS the fall back for ftp/httprun
   28 Dec 07 GKY Add mailrun to allow mailto by clicking on an email address in the viewer
+  29 Dec 07 GKY Formated email address using "<mailto:"
 
 ***********************************************************************/
@@ -78 +79 @@
 #define COLORS_MAILFORE              13
 
-static LONG Colors[COLORS_MAX] = { COLR_WHITE, COLR_DARKGRAY,
+static LONG Colors[COLORS_MAX] = {
+  COLR_WHITE, COLR_DARKGRAY,
   COLR_PALEGRAY, COLR_BLACK,
   COLR_BLACK, COLR_RED,
@@ -91 +93 @@
 typedef struct
 {
-  USHORT size;
-  USHORT flags;
-  USHORT cliptype;
-  CHAR filename[CCHMAXPATH];
+  FATTRS fattrs;
+  LONG colors[COLORS_MAX];
   CHAR *text;
   CHAR **lines, *markedlines;
@@ -100 +100 @@
   ULONG textsize, numlines, topline, cursored, selected, numalloc, multiplier,
     lastselected, found;
-  CHAR stopflag, busy;
   LONG oldwidth, lastdirection, lMaxAscender, lMaxDescender, lMaxHeight,
     maxx, horzscroll;
-  BOOL hex, mousecaptured, sensitive, dummy, literalsearch, clientfocused,
-    alsoselect, wrapon, relining, httpin, ftpin, mailin, ignorehttp, ignoreftp,
-    ignoremail, needrefreshing;
   HMTX ScanSem;
   HWND hvscroll, hwndMenu, hwndStatus1, hwndStatus2, hwndStatus3, hwndRestore,
     hwndPopup, hwndListbox, hwndFrame, hwndDrag, hwndParent, hhscroll;
   HPS hps;
-  FATTRS fattrs;
-  LONG colors[COLORS_MAX];
+  USHORT size;
+  USHORT flags;
+  USHORT cliptype;
+  CHAR filename[CCHMAXPATH];
+  CHAR stopflag, busy;
+  BOOL hex, mousecaptured, sensitive, dummy, literalsearch, clientfocused,
+    alsoselect, wrapon, relining, httpin, ftpin, mailin, ignorehttp, ignoreftp,
+    ignoremail, needrefreshing;
 }
 VIEWDATA;
@@ -117 +119 @@
 typedef struct
 {
+  ULONG len;
+  CHAR *line;
   USHORT size;
   USHORT dummy;
-  ULONG len;
-  CHAR *line;
   CHAR url[SEARCHSTRINGLEN];
 }
@@ -137 +139 @@
 
 // mailstr checks for a designated character in a string then cuts the string
-//to the first word that contains the character
-
-CHAR *mailstr(CHAR *t, CHAR *s, LONG lens)
+//to the first word that contains the character then prepends <mailto: and appends >
+
+CHAR *mailstr(CHAR *pszSrc, CHAR *pszFindChar, LONG StrLens)
 {
-  CHAR *pp;
-  CHAR *test = t;
-
-  if (!strnstr(test, s, lens))
+  CHAR *pszCharCounter;
+  CHAR *pszTestStr = pszSrc;
+  CHAR szMailTo[1024] = "<mailto:";
+  CHAR szMailEnd[] = ">";
+
+  if (!strnstr(pszTestStr, pszFindChar, StrLens))
     return NULL;
-  bstripcr(t);
-  if (!strstr(t, " "))
-    return t;
-  while (strchr(t, ' ') < strchr(t, (CHAR) s)){
-    pp = t;
-    while (*pp && *pp != ' '){
-      *pp = ' ';
-      pp++;
-    }
-      lstrip(t);
+  bstripcr(pszSrc);
+  remove_first_occurence_of_character("\r", pszSrc);
+  remove_first_occurence_of_character("\n", pszSrc);
+  if (!strstr(pszSrc, " ")){
+    if (!stristr(pszSrc, "<mailto:")) {
+      strip_lead_char("<", pszSrc);
+      strip_trail_char(">", pszSrc);
+      strcat(szMailTo, pszSrc);
+      strcat(szMailTo, szMailEnd);
+      pszSrc = szMailTo;
+      return pszSrc;
+    }
+    else {
+      return pszSrc;
+    }
   }
-  pp = t;
-  while (*pp && *pp != ' ' && *pp != '\r' && *pp != '\n' &&
-         *pp != '\"')
-    pp++;
-  *pp = 0;
-  strip_lead_char(t, "<");
-  strip_trail_char(t, ">");
-  return t;
+  while (strchr(pszSrc, ' ') < strchr(pszSrc, *pszFindChar)){
+    pszCharCounter = pszSrc;
+    while (*pszCharCounter && *pszCharCounter != ' '){
+      *pszCharCounter = ' ';
+      pszCharCounter++;
+    }
+    lstrip(pszSrc);
+  }
+  pszCharCounter = pszSrc;
+  while (*pszCharCounter && *pszCharCounter != ' ' && *pszCharCounter != '\r' &&
+         *pszCharCounter != '\n' && *pszCharCounter != '\"')
+    pszCharCounter++;
+  *pszCharCounter = 0;
+  if (!stristr(pszSrc, "<mailto:")) {
+    strip_lead_char("<", pszSrc);
+    strip_trail_char(">", pszSrc);
+    strcat(szMailTo, pszSrc);
+    strcat(szMailTo, szMailEnd);
+    pszSrc = szMailTo;
+    return pszSrc;
+    }
+  else {
+    return pszSrc;
+  }
 }
 
@@ -216 +241 @@
       p = urld->line;
       if (mailstr(p, "@", e - p)) {
-        strcpy(urld->url, p);
+        pp = mailstr(p, "@", e - p);
+        strcpy(urld->url, pp);
         WinSendDlgItemMsg(hwnd, URL_LISTBOX, LM_INSERTITEM,
                           MPFROM2SHORT(LIT_END, 0), MPFROMP(urld->url));