ecere/samples/guiAndGfx: Initial commit of Ecere Writer, first component of the Ecere Office Productivity Suite.

Author: jerstlouis

extras/XMLParser.ec

@@ -19,6 +19,7 @@ static WordStatus GetKeyWordEx(char ** input, char * keyWord, int maxSize, bool
    char ch;
    int c = 0;
    bool quoted = false, start = true, wasQuoted = false;
+   char quoteChar = 0;
 
    for(; (ch = *string); string++)
    {
@@ -33,8 +34,12 @@ static WordStatus GetKeyWordEx(char ** input, char * keyWord, int maxSize, bool
       {
          if(!quoted && ((ch == ',' || (treatEqual && ch == '=')) || ch == '>') )
             break;
-         else if(ch == '\"' /*|| ch == '\''*/)
+         // TOCHECK: Why weren't single quotes accepted here? How was this working?
+         else if((ch == '\"' || (/*acceptSingleQuote && */ch == '\'')) && (!quoteChar || quoteChar == ch))
+         // else if(ch == '\"' /*|| ch == '\''*/)
          {
+            if(!wasQuoted)
+               quoteChar = ch;
             quoted ^= true;
             wasQuoted = true;
             start = false;

extras/html/HTMLView.ec

@@ -120,7 +120,7 @@ class ObjectThread : Thread
 
                strcpy(path, entry.src);
                //strcpy(referer, browserWindow.location ? browserWindow.location : "");
-               strcpy(referer, entry.referer); //browserWindow.location ? browserWindow.location : "");
+               strcpy(referer, entry.referer ? entry.referer : ""); //browserWindow.location ? browserWindow.location : "");
 
                //((GuiApplication)__thisModule).Unlock();
 
@@ -1002,27 +1002,24 @@ class HTMLView : Window
       NotifyPageOpened(master);
    }
 
-   void OpenFile(File f, char * firstReferer)
+   void OpenFile(File f, const char * firstReferer)
    {
-      char referer[MAX_LOCATION] = "";
       bool opened = false;
 
       clickedLink = null;
       overLink = null;
       overBlock = null;
 
-      if(firstReferer)
-         strcpy(referer, firstReferer);
-
       delete html;
       html = HTMLFile {};
 
       SetScrollArea(0,0,0);
       Update(null);
 
       opened = true;
-      this.location = null;
-      fileName = this.location;
+      delete location;
+      location = CopyString(firstReferer);
+      fileName = location;
 
       if(opened)
       {

extras/html/htmlParser.ec

@@ -173,7 +173,7 @@ String ParseURL(String input)
 
 static int GetKeyWord(char ** input, char * keyWord, int maxSize)
 {
-   return GetKeyWordEx(input, keyWord, maxSize, true, false);
+   return GetKeyWordEx(input, keyWord, maxSize, true, true); //false);
 }
 
 /*static char * GetString(char * string, char * what, int count)
@@ -535,7 +535,7 @@ class HTMLFile
                                        }
                                     subBlock.size = fontSizes[c];
                                  }
-                                 else if(size && size < NUM_FONT_SIZES)
+                                 else if(size && size <= NUM_FONT_SIZES)
                                  {
                                     subBlock.size = fontSizes[size-1];
                                  }

extras/html/lines.ec

@@ -345,8 +345,7 @@ void RenderLine(HTMLView browser, Surface surface, int x, int y, int w, int h, B
          {
             int bw = block.pWidth ? (w * block.pWidth / 100) : block.w;
             int bh = block.pHeight ? (h * block.pHeight / 100) : block.h;
-
-            int dx, dy;
+            int dx = 0, dy = 0;
 
             ColorAlpha fg = surface.GetForeground();
             surface.SetForeground(white);
@@ -499,7 +498,7 @@ bool PickLine(HTMLView browser, Surface surface, int x, int y, int w, int h, Blo
          {
             int bw = block.pWidth ? (w * block.pWidth / 100) : block.w;
             int bh = block.pHeight ? (h * block.pHeight / 100) : block.h;
-            int dx, dy;
+            int dx = 0, dy = 0;
 
             switch(block.halign)
             {