terminology: ' ' can be underlined or striken through

Commit on rev 78285 got wrongly removed.

Please, use svn revert (or git revert) instead of pushing some old working
code you had. I do hate wasting my time twice on the same bug I fixed weeks ago.

SVN revision: 80623

configure.ac

@@ -19,17 +19,17 @@ AM_PROG_CC_C_O
 AC_C___ATTRIBUTE__
 
 requirements="\
-   elementary >= 1.7.0 \
-   eina >= 1.7.0 \
-   eet >= 1.7.0 \
-   evas >= 1.7.0 \
-   ecore >= 1.7.0 \
-   edje >= 1.7.0 \
-   emotion >= 1.7.0 \
-   ecore-input >= 1.7.0 \
-   ecore-imf >= 1.7.0 \
-   ecore-imf-evas >= 1.7.0 \
-   efreet >= 1.7.0
+   elementary >= 1.7.99 \
+   eina >= 1.7.99 \
+   eet >= 1.7.99 \
+   evas >= 1.7.99 \
+   ecore >= 1.7.99 \
+   edje >= 1.7.99 \
+   emotion >= 1.7.99 \
+   ecore-input >= 1.7.99 \
+   ecore-imf >= 1.7.99 \
+   ecore-imf-evas >= 1.7.99 \
+   efreet >= 1.7.99
    "
 
 PKG_CHECK_MODULES([TERMINOLOGY], [${requirements}])

src/bin/main.c

@@ -326,7 +326,7 @@ static const Ecore_Getopt options = {
    "Terminal emulator written with Enlightenment Foundation Libraries.",
    EINA_TRUE,
    {
-      ECORE_GETOPT_STORE_STR ('e', "exec",
+      ECORE_GETOPT_BREAK_STR ('e', "exec",
                               "command to execute. "
                               "Defaults to $SHELL (or passwd shel or /bin/sh)"),
       ECORE_GETOPT_STORE_STR ('d', "current-directory",
@@ -406,8 +406,9 @@ elm_main(int argc, char **argv)
    Eina_Bool maximized = EINA_FALSE;
    Eina_Bool nowm = EINA_FALSE;
    Eina_Bool quit_option = EINA_FALSE;
+   Eina_Bool cmd_options = EINA_FALSE;
    Ecore_Getopt_Value values[] = {
-     ECORE_GETOPT_VALUE_STR(cmd),
+     ECORE_GETOPT_VALUE_BOOL(cmd_options),
      ECORE_GETOPT_VALUE_STR(cd),
      ECORE_GETOPT_VALUE_STR(theme),
      ECORE_GETOPT_VALUE_STR(background),
@@ -472,6 +473,28 @@ elm_main(int argc, char **argv)
 
    if (quit_option) goto end;
 
+   if (cmd_options)
+     {
+        int i;
+        Eina_Strbuf *strb;
+
+        if (args == argc)
+          {
+             fprintf(stdout, "ERROR: option %s requires an argument!\n", argv[args-1]);
+             fprintf(stdout, "ERROR: invalid options found. See --help.\n");
+             goto end;
+          }
+        
+        strb = eina_strbuf_new();
+        for(i = args; i < argc; i++)
+          {
+             eina_strbuf_append(strb, argv[i]);
+             eina_strbuf_append_char(strb, ' ');
+          }
+        cmd = eina_strbuf_string_steal(strb);
+        eina_strbuf_free(strb);
+     }
+
    if (theme)
      {
         char path[PATH_MAX];
@@ -738,6 +761,7 @@ elm_main(int argc, char **argv)
 
    elm_run();
  end:
+   free(cmd);
 
    config_del(config);
    config_shutdown();

src/bin/termio.c

@@ -502,7 +502,9 @@ _smart_apply(Evas_Object *obj)
                               }
                             if (cells[j].att.fgintense) fg += 48;
                             if (cells[j].att.bgintense) bg += 48;
-                            if ((codepoint == ' ') || (codepoint == 0))
+                            if (((codepoint == ' ') || (codepoint == 0)) &&
+                                (!cells[j].att.strike) &&
+                                (!cells[j].att.underline))
                               fg = COL_INVIS;
                          }
                        if ((tc[x].codepoint != codepoint) ||