ncurses 5.9 - patch 20130816

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index d9d12cf88afb61b969d9d728a44aad9ed904af49..e1eb7e095567f624dd311b7f8be734d7d6962dfe 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -46,7 +46,7 @@
 #include <hashed_db.h>
 #include <transform.h>
 
 #include <hashed_db.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.184 2013/03/09 23:14:07 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.187 2013/08/17 21:15:15 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -432,7 +432,7 @@ copy_input(FILE *source, const char *filename, char *alt_file)
         */
        result = fopen(alt_file, "r+");
        fclose(target);
         */
        result = fopen(alt_file, "r+");
        fclose(target);

-       to_remove = alt_file;
+       to_remove = strdup(alt_file);

     }
     return result;
 }
     }
     return result;
 }


@@ -1224,6 +1224,19 @@ check_ansi_cursor(char *list[4])
 }
 
 #define EXPECTED(name) if (!PRESENT(name)) _nc_warning("expected " #name)
 }
 
 #define EXPECTED(name) if (!PRESENT(name)) _nc_warning("expected " #name)

+#define UNEXPECTED(name) if (PRESENT(name)) _nc_warning("unexpected " #name ", for %s", why)
+
+static void
+check_noaddress(TERMTYPE *tp, const char *why)
+{
+    UNEXPECTED(column_address);
+    UNEXPECTED(cursor_address);
+    UNEXPECTED(cursor_home);
+    UNEXPECTED(cursor_mem_address);
+    UNEXPECTED(cursor_to_ll);
+    UNEXPECTED(row_address);
+    UNEXPECTED(row_address);
+}

 
 static void
 check_cursor(TERMTYPE *tp)
 
 static void
 check_cursor(TERMTYPE *tp)


@@ -1231,6 +1244,43 @@ check_cursor(TERMTYPE *tp)
     int count;
     char *list[4];
 
     int count;
     char *list[4];
 

+    if (hard_copy) {
+       check_noaddress(tp, "hard_copy");
+    } else if (generic_type) {
+       check_noaddress(tp, "generic_type");
+    } else if (strchr(tp->term_names, '+') == 0) {
+       int y = 0;
+       int x = 0;
+       if (PRESENT(column_address))
+           ++y;
+       if (PRESENT(cursor_address))
+           y = x = 10;
+       if (PRESENT(cursor_home))
+           ++y, ++x;
+       if (PRESENT(cursor_mem_address))
+           y = x = 10;
+       if (PRESENT(cursor_to_ll))
+           ++y, ++x;
+       if (PRESENT(row_address))
+           ++x;
+       if (PRESENT(cursor_down))
+           ++y;
+       if (PRESENT(cursor_up))
+           ++y;
+       if (PRESENT(cursor_left))
+           ++x;
+       if (PRESENT(cursor_right))
+           ++x;
+       if (x < 2 && y < 2) {
+           _nc_warning("terminal lacks cursor addressing");
+       } else {
+           if (x < 2)
+               _nc_warning("terminal lacks cursor column-addressing");
+           if (y < 2)
+               _nc_warning("terminal lacks cursor row-addressing");
+       }
+    }
+

     /* it is rare to have an insert-line feature without a matching delete */
     ANDMISSING(parm_insert_line, insert_line);
     ANDMISSING(parm_delete_line, delete_line);
     /* it is rare to have an insert-line feature without a matching delete */
     ANDMISSING(parm_insert_line, insert_line);
     ANDMISSING(parm_delete_line, delete_line);


@@ -1412,7 +1462,7 @@ check_keypad(TERMTYPE *tp)
 
     /*
      * These warnings are useful for consistency checks - it is possible that
 
     /*
      * These warnings are useful for consistency checks - it is possible that

-     * there are real terminals with mismatches in these 
+     * there are real terminals with mismatches in these

      */
     ANDMISSING(key_ic, key_dc);
 }
      */
     ANDMISSING(key_ic, key_dc);
 }


@@ -1456,6 +1506,7 @@ uses_SGR_39_49(const char *value)
 static void
 check_screen(TERMTYPE *tp)
 {
 static void
 check_screen(TERMTYPE *tp)
 {

+#if NCURSES_XNAMES

     if (_nc_user_definable) {
        int have_XT = tigetflag("XT");
        int have_XM = tigetflag("XM");
     if (_nc_user_definable) {
        int have_XT = tigetflag("XT");
        int have_XM = tigetflag("XM");


@@ -1507,6 +1558,7 @@ check_screen(TERMTYPE *tp)
                _nc_warning("Expected XT to be set, given kmous");
        }
     }
                _nc_warning("Expected XT to be set, given kmous");
        }
     }

+#endif

 }
 
 /*
 }
 
 /*