Changeset 2865


Ignore:
Timestamp:
Feb 15, 2012, 1:29:24 AM (3 years ago)
Author:
quozl
Message:

Terminal Emulator - global change, black-letters replaced with cancel, provides identical display on OpenFirmware?, fixes display on black background terminal emulators, such as Linux console, xterm, and others.

Files:
33 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/olpc/1.75/testinstructions.fth

    r2266 r2865  
    423423;
    424424: message-off  ( -- )  d# 2  d# 27  at-xy  kill-line  ;
    425 : message  ( adr len -- )  cursor-off  message-off  red-letters  type  black-letters  ;
     425: message  ( adr len -- )  cursor-off  message-off  red-letters  type  cancel  ;
    426426
    427427: performed  ( -- )
  • cpu/arm/olpc/3.0/testinstructions.fth

    r2729 r2865  
    424424;
    425425: message-off  ( -- )  d# 2  d# 27  at-xy  kill-line  ;
    426 : message  ( adr len -- )  cursor-off  message-off  red-letters  type  black-letters  ;
     426: message  ( adr len -- )  cursor-off  message-off  red-letters  type  cancel  ;
    427427
    428428: performed  ( -- )
  • cpu/arm/olpc/build-fw.fth

    r2859 r2865  
    10391039   if  banner  then  \ Reissue banner if it was suppressed
    10401040
    1041    blue-letters ." Type 'help' for more information." black-letters cancel
     1041   blue-letters ." Type 'help' for more information." cancel
    10421042   cr cr
    10431043
  • cpu/arm/olpc/help.fth

    r2726 r2865  
    33warning @ warning off
    44: help  ( -- )
    5    blue-letters  ." INSTALLATION:" black-letters  mcr
     5   blue-letters  ." INSTALLATION:" cancel  mcr
    66   \ ================================================================================
    77   ."   fs-update u:\os1.zd4   Install OS from USB drive to internal storage" mcr
    88   ."   flash u:\q4b07.rom     Install firmware from USB drive" mcr
    99   ."   flash ext:\q4b07.rom   Install firmware from external SD card" mcr
    10    blue-letters  ." DIRECTORY LISTING:" black-letters  mcr
     10   blue-letters  ." DIRECTORY LISTING:" cancel  mcr
    1111   ."   dir u:\                List USB drive root directory" mcr
    1212   ."   dir u:\boot\           List USB drive /boot directory" mcr
    1313   ."   dir int:\boot\*.zip    List .zip files in internal SD /boot directory" mcr
    14    blue-letters  ." BOOTING:" black-letters  mcr
     14   blue-letters  ." BOOTING:" cancel  mcr
    1515   ."   boot                   Start the OS from list of default locations" mcr
    1616   ."   printenv boot-device   Show the list of default locations used by boot" mcr
    1717   ."   boot u:\test.fth       Start the OS from a specific location" mcr
    18    blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters  mcr
     18   blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" cancel  mcr
    1919   ."   boot-device  Kernel or boot script paths.  Example: ext:\boot\olpc.fth" mcr
    2020   ."   boot-file    Default kernel command line.  Example: console=ttyS0,115200" mcr
    2121   ."   ramdisk      Initial RAMDISK path.         Example: int:\boot\initrd.img" mcr
    22    blue-letters  ." MANAGING CONFIGURATION VARIABLES:" black-letters  mcr
     22   blue-letters  ." MANAGING CONFIGURATION VARIABLES:" cancel  mcr
    2323   ."   printenv [ <name> ]    Show configuration variables" mcr
    2424   ."   setenv <name> <value>  Set configuration variable" mcr
    2525   ."   editenv <name>         Edit configuration variable" mcr
    26    blue-letters  ." DIAGNOSTICS:" black-letters  mcr
     26   blue-letters  ." DIAGNOSTICS:" cancel  mcr
    2727   ."   test <device-name>     Test device.  Example: test mouse" mcr
    2828   ."   test-all               Test all devices that have test routines" mcr
    2929   ."   menu                   Graphical interface to selftests" mcr
    30    blue-letters  ." More information: "  black-letters mcr
    31    green-letters  ."   http://wiki.laptop.org/go/OFW_FAQ" black-letters  cr
     30   blue-letters  ." More information: "  cancel mcr
     31   green-letters  ."   http://wiki.laptop.org/go/OFW_FAQ" cancel  cr
    3232;
    3333warning !
  • cpu/x86/pc/alex/fw.bth

    r2840 r2865  
    300300
    301301   ." See "
    302    blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" black-letters
     302   blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" cancel
    303303   cr cr
    304304   ." Type  menu  to run diagnostics" cr
  • cpu/x86/pc/biosload/fw.bth

    r2836 r2865  
    377377[ifdef] linux-support
    378378   ." See "
    379    blue-letters ." http://www.firmworks.com/linux/demo.html" black-letters
     379   blue-letters ." http://www.firmworks.com/linux/demo.html" cancel
    380380   cr cr
    381381
  • cpu/x86/pc/biosload/usb.fth

    r1152 r2865  
    5656   " keyboard" expand-alias  if   ( devspec$ )
    5757      drop " /usb"  comp  0=  if  ( )
    58          red-letters  ." Using USB keyboard." cr  black-letters
     58         red-letters  ." Using USB keyboard." cr  cancel
    5959         " keyboard" input
    6060         exit
     
    6262   then
    6363   " /usb/serial" open-dev  ?dup  if
    64       red-letters  ." Using USB serial console." cr  black-letters
     64      red-letters  ." Using USB serial console." cr  cancel
    6565      dup set-stdin set-stdout
    6666   then
  • cpu/x86/pc/linux.fth

    r1543 r2865  
    306306   ." Debugging the Linux kernel requires a few patches to keep Linux from"  mcr
    307307   ." overwriting the firmware debug vector."  mcr mcr
    308    black-letters
     308   cancel
    309309
    310310   ." COMMAND   STACK EFFECT   DESCRIPTION" mcr
  • cpu/x86/pc/lxdevel/fw.bth

    r838 r2865  
    477477   then
    478478
    479    blue-letters ." Type 'help' for more information." black-letters
     479   blue-letters ." Type 'help' for more information." cancel
    480480   cr cr
    481481
  • cpu/x86/pc/neptune/fw.bth

    r2843 r2865  
    433433   auto-boot
    434434
    435    blue-letters ." Type 'help' for more information." black-letters
     435   blue-letters ." Type 'help' for more information." cancel
    436436   cr cr
    437437
  • cpu/x86/pc/newton/fw.bth

    r2840 r2865  
    302302
    303303   ." See "
    304    blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" black-letters
     304   blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" cancel
    305305   cr cr
    306306   ." Type  menu  to run diagnostics" cr
  • cpu/x86/pc/olpc/copynand.fth

    r1333 r2865  
    432432
    433433: examine-nand  ( -- )
    434    0 status-line 1- at-xy  red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr
     434   0 status-line 1- at-xy  red-letters ." Arrows, fn Arrows to move, Esc to exit" cancel cr
    435435   #nand-pages nand-pages/block /  to nand-block-limit
    436436   0 to current-block
  • cpu/x86/pc/olpc/fw.bth

    r2836 r2865  
    579579      red-letters
    580580      ." Restarting due to botched resume" cr
    581       black-letters
     581      cancel
    582582      bye
    583583   then
     
    640640   if  banner  then  \ Reissue banner if it was suppressed
    641641
    642    blue-letters ." Type 'help' for more information." black-letters cancel
     642   blue-letters ." Type 'help' for more information." cancel
    643643   cr cr
    644644
  • cpu/x86/pc/olpc/help.fth

    r919 r2865  
    33warning @ warning off
    44: help  ( -- )
    5    blue-letters  ." UPDATES:" black-letters  mcr
     5   blue-letters  ." UPDATES:" cancel  mcr
    66   ."   flash u:\q2c18.rom              Rewrite the firmware from USB key" mcr
    77   ."   flash nand:\q2c18.rom           Rewrite the firmware from NAND file" mcr
    88   ."   copy-nand u:\boot\nand290.img   Rewrite the OS on NAND from USB key" mcr
    9    blue-letters  ." DIRECTORY LISTING:" black-letters  mcr
     9   blue-letters  ." DIRECTORY LISTING:" cancel  mcr
    1010   ."   dir u:\               List USB key root directory" mcr
    1111   ."   dir u:\boot\          List USB key /boot directory" mcr
    1212   ."   dir nand:\boot\*.rom  List .rom files in NAND FLASH /boot directory" mcr
    13    blue-letters  ." BOOTING:" black-letters  mcr
     13   blue-letters  ." BOOTING:" cancel  mcr
    1414   ."   boot                  Load the OS from list of default locations" mcr
    1515   ."                         'printenv boot-device' shows the list" mcr
    1616   ."   boot <cmdline>        Load the OS, passing <cmdline> to kernel" mcr
    1717   ."   boot u:\boot\vmlinuz  Load the OS from a specific location" mcr
    18    blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters  mcr
     18   blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" cancel  mcr
    1919   ."   boot-device  Kernel or boot script path.  Example: nand:\boot\olpc.fth" mcr
    2020   ."   boot-file    Default cmdline.    Example: console=ttyS0,115200" mcr
    2121   ."   ramdisk      initrd pathname.    Example: disk:\boot\initrd.imz" mcr
    22    blue-letters  ." MANAGING CONFIGURATION VARIABLES:" black-letters  mcr
     22   blue-letters  ." MANAGING CONFIGURATION VARIABLES:" cancel  mcr
    2323   ."   printenv [ <name> ]     Show configuration variables" mcr
    2424   ."   setenv <name> <value>   Set configuration variable" mcr
    2525   ."   editenv <name>          Edit configuration variable" mcr
    26    blue-letters  ." DIAGNOSTICS:" black-letters  mcr
     26   blue-letters  ." DIAGNOSTICS:" cancel  mcr
    2727   ."   test <device-name>      Test device.  Example: test mouse" mcr
    2828   ."   test-all                Test all devices that have test routines" mcr
    29    blue-letters  ." More information: "  black-letters mcr
    30    green-letters  ." http://wiki.laptop.org/go/OFW_FAQ" black-letters  cr
     29   blue-letters  ." More information: "  cancel mcr
     30   green-letters  ." http://wiki.laptop.org/go/OFW_FAQ" cancel  cr
    3131;
    3232warning !
  • cpu/x86/pc/olpc/keyinsert.fth

    r1906 r2865  
    6161         green-letters
    6262         ." Replaced " type cr       ( value$ )
    63          black-letters
     63         cancel
    6464      else                           ( keyname$ value$ )
    6565         2swap                       ( value$ keyname$ )
     
    6868         green-letters
    6969         ." Added " type cr          ( value$ )
    70          black-letters
     70         cancel
    7171      then                           ( value$ )
    7272      free-mem                       ( )
     
    8888: keyject-error  ( msg$ -- )
    8989   cr
    90    red-letters  ." Not injecting because:   "  type  cr  black-letters
     90   red-letters  ." Not injecting because:   "  type  cr  cancel
    9191   cr
    9292;
     
    137137: ?keyject  ( -- )
    138138   visible
    139    green-letters  cr ." Security Key Injector" cr cr  black-letters
     139   green-letters  cr ." Security Key Injector" cr cr  cancel
    140140   do-keyject?  if
    141141      wait-enough-power
  • cpu/x86/pc/olpc/keyject.fth

    r1759 r2865  
    5353         green-letters
    5454         ." Replaced " type cr       ( value$ )
    55          black-letters
     55         cancel
    5656      else                           ( keyname$ value$ )
    5757         2swap                       ( value$ keyname$ )
     
    6060         green-letters
    6161         ." Added " type cr          ( value$ )
    62          black-letters
     62         cancel
    6363      then                           ( value$ )
    6464      free-mem                       ( )
     
    8080: keyject-error  ( msg$ -- )
    8181   cr
    82    red-letters  ." Not injecting because:   "  type  cr  black-letters
     82   red-letters  ." Not injecting because:   "  type  cr  cancel
    8383   cr
    8484   ." Will update firmware in 20 seconds" cr
     
    181181: ?keyject  ( -- )
    182182   visible
    183    green-letters  cr ." Security Key Injector" cr cr  black-letters
     183   green-letters  cr ." Security Key Injector" cr cr  cancel
    184184   \ Get the new firmware first, so any security checks use the old keys
    185185   get-new-firmware
  • cpu/x86/pc/olpc/mfgdata.fth

    r2015 r2865  
    8787      3 .tab  i c@  <# u# u# u#> type
    8888   loop
    89    black-letters
     89   cancel
    9090   r> d# 10 >  if  cr  then
    9191   r> tabstops !  r> rmargin !  r> lmargin !
  • cpu/x86/pc/olpc/mfgkeyject.fth

    r1153 r2865  
    7272         green-letters
    7373         ." Replaced " type cr       ( value$ )
    74          black-letters
     74         cancel
    7575      else                           ( keyname$ value$ )
    7676         2swap                       ( value$ keyname$ )
     
    7979         green-letters
    8080         ." Added " type cr          ( value$ )
    81          black-letters
     81         cancel
    8282      then                           ( value$ )
    8383      free-mem                       ( )
     
    9999: keyject-error  ( msg$ -- )
    100100   cr
    101    red-letters  ." Not injecting because:   "  type  cr  black-letters
     101   red-letters  ." Not injecting because:   "  type  cr  cancel
    102102   cr
    103103;
     
    117117: ?keyject  ( -- )
    118118   visible
    119    green-letters  cr ." Security Key Injector" cr cr  black-letters
     119   green-letters  cr ." Security Key Injector" cr cr  cancel
    120120
    121121   do-keyject?  if
  • cpu/x86/pc/olpc/nandstat.fth

    r1333 r2865  
    226226
    227227: examine-nand  ( -- )
    228    0 status-line 1- at-xy  red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr
     228   0 status-line 1- at-xy  red-letters ." Arrows, fn Arrows to move, Esc to exit" cancel cr
    229229   0 to current-block
    230230   current-block highlight-block
  • cpu/x86/pc/olpc/security.fth

    r2793 r2865  
    2727;
    2828: ?lease-error-cr  ( msg$2 -- )
    29    debug-security?  if  red-letters type black-letters cr  else  2drop  then
     29   debug-security?  if  red-letters type cancel cr  else  2drop  then
    3030;
    3131
     
    5555
    5656: .security-failure  ( error$ -- )
    57    visible  red-letters type black-letters cr
     57   visible  red-letters type cancel cr
    5858   show-sad
    5959   security-failure
     
    935935      ." Bad EC firmware image file - "  .error
    936936      ." Continuing with old EC firmware" cr
    937       black-letters
     937      cancel
    938938      exit
    939939   then
     
    946946      ." Unsafe to update EC firmware now - " .error
    947947      ."  Continuing with old EC firmware" cr
    948       black-letters
     948      cancel
    949949      exit
    950950   then
     
    984984      ." Bad firmware image file - "  .error
    985985      ." Continuing with old firmware" cr
    986       black-letters
     986      cancel
    987987      exit
    988988   then
     
    998998      ." Unsafe to update firmware now - " .error
    999999      ."  Continuing with old firmware" cr
    1000       black-letters
     1000      cancel
    10011001      exit
    10021002   then
     
    12971297   date-bad?  if
    12981298      \ This is not fatal, because we don't want a brick if the RTC battery fails
    1299       visible  red-letters ." Invalid system date" black-letters cr  show-sad
     1299      visible  red-letters ." Invalid system date" cancel cr  show-sad
    13001300      banner
    13011301   then
  • cpu/x86/pc/olpc/via/banner.fth

    r2679 r2865  
    8787      red-letters
    8888      ." WARNING!  OS image larger than internal storage device!"  cr
    89       black-letters
     89      cancel
    9090      exit
    9191   then
     
    9494      red-letters
    9595      ." WARNING!  OS image much smaller than internal storage device"  cr
    96       black-letters
     96      cancel
    9797   then
    9898;
  • cpu/x86/pc/olpc/via/cstate.fth

    r1635 r2865  
    102102     black-letters (cr show-temperature  d# 1024 idle-ms
    103103   key?  until
     104   cancel
    104105   cursor-on
    105106
  • cpu/x86/pc/olpc/via/factory.fth

    r1749 r2865  
    9595
    9696: .instructions  ( adr len -- )
    97    cr blue-letters  type  black-letters cr
     97   cr blue-letters  type  cancel cr
    9898;
    9999: .problem  ( adr len -- )
    100    red-letters type  black-letters cr
     100   red-letters type  cancel cr
    101101;
    102102
  • cpu/x86/pc/olpc/via/fsupdate.fth

    r2762 r2865  
    2424      ." WARNING: The file said highest block " #image-eblocks .d
    2525      ." but wrote only as high as block " max-eblock# .d cr
    26       black-letters
     26      cancel
    2727   then
    2828   min-eblock# 0 <>  if
     
    3131      ." WARNING: The file did not write a zero block, "
    3232      ." but wrote only as low as block " min-eblock# .d cr
    33       black-letters
     33      cancel
    3434   then
    3535;
  • cpu/x86/pc/olpc/via/fw.bth

    r2860 r2865  
    718718   if  banner  then  \ Reissue banner if it was suppressed
    719719
    720    blue-letters ." Type 'help' for more information." black-letters cancel
     720   blue-letters ." Type 'help' for more information." cancel
    721721   cr cr
    722722
  • cpu/x86/pc/olpc/via/help.fth

    r2189 r2865  
    33warning @ warning off
    44: help  ( -- )
    5    blue-letters  ." UPDATES:" black-letters  mcr
     5   blue-letters  ." UPDATES:" cancel  mcr
    66   \ ================================================================================
    77   ."   fs-update u:\os1.zd4   Rewrite the OS on internal SD from USB drive" mcr
    88   ."   flash u:\q3a64.rom     Rewrite the firmware from USB drive" mcr
    99   ."   flash ext:\q3a64.rom   Rewrite the firmware from external SD file" mcr
    10    blue-letters  ." DIRECTORY LISTING:" black-letters  mcr
     10   blue-letters  ." DIRECTORY LISTING:" cancel  mcr
    1111   ."   dir u:\                List USB drive root directory" mcr
    1212   ."   dir u:\boot\           List USB drive /boot directory" mcr
    1313   ."   dir int:\boot\*.zip    List .zip files in internal SD /boot directory" mcr
    14    blue-letters  ." BOOTING:" black-letters  mcr
     14   blue-letters  ." BOOTING:" cancel  mcr
    1515   ."   boot                   Start the OS from list of default locations" mcr
    1616   ."   printenv boot-device   Show the list of default locations used by boot" mcr
    1717   ."   boot u:\test.fth       Start the OS from a specific location" mcr
    18    blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters  mcr
     18   blue-letters  ." CONFIGURATION VARIABLES FOR BOOTING:" cancel  mcr
    1919   ."   boot-device  Kernel or boot script paths.  Example: ext:\boot\olpc.fth" mcr
    2020   ."   boot-file    Default kernel command line.  Example: console=ttyS0,115200" mcr
    2121   ."   ramdisk      Initial RAMDISK path.         Example: int:\boot\initrd.img" mcr
    22    blue-letters  ." MANAGING CONFIGURATION VARIABLES:" black-letters  mcr
     22   blue-letters  ." MANAGING CONFIGURATION VARIABLES:" cancel  mcr
    2323   ."   printenv [ <name> ]    Show configuration variables" mcr
    2424   ."   setenv <name> <value>  Set configuration variable" mcr
    2525   ."   editenv <name>         Edit configuration variable" mcr
    26    blue-letters  ." DIAGNOSTICS:" black-letters  mcr
     26   blue-letters  ." DIAGNOSTICS:" cancel  mcr
    2727   ."   test <device-name>     Test device.  Example: test mouse" mcr
    2828   ."   test-all               Test all devices that have test routines" mcr
    2929   ."   menu                   Graphical interface to selftests" mcr
    30    blue-letters  ." More information: "  black-letters mcr
    31    green-letters  ."   http://wiki.laptop.org/go/OFW_FAQ" black-letters  cr
     30   blue-letters  ." More information: "  cancel mcr
     31   green-letters  ."   http://wiki.laptop.org/go/OFW_FAQ" cancel  cr
    3232;
    3333warning !
  • cpu/x86/pc/olpc/via/keyject.fth

    r1945 r2865  
    5353         green-letters
    5454         ." Replaced " type cr       ( value$ )
    55          black-letters
     55         cancel
    5656      else                           ( keyname$ value$ )
    5757         2swap                       ( value$ keyname$ )
     
    6060         green-letters
    6161         ." Added " type cr          ( value$ )
    62          black-letters
     62         cancel
    6363      then                           ( value$ )
    6464      free-mem                       ( )
     
    8080: keyject-error  ( msg$ -- )
    8181   cr
    82    red-letters  ." Not injecting because:   "  type  cr  black-letters
     82   red-letters  ." Not injecting because:   "  type  cr  cancel
    8383   cr
    8484   ." Will update firmware in 20 seconds" cr
     
    181181: ?keyject  ( -- )
    182182   visible
    183    green-letters  cr ." Security Key Injector" cr cr  black-letters
     183   green-letters  cr ." Security Key Injector" cr cr  cancel
    184184   \ Get the new firmware first, so any security checks use the old keys
    185185   get-new-firmware
  • cpu/x86/pc/olpc/via/mfgtest.fth

    r2860 r2865  
    6060         green-letters
    6161         ??cr ." Okay" cr
    62          black-letters
     62         cancel
    6363         mfg-color-green sq-border!
    6464         true to pass?
  • cpu/x86/pc/olpc/via/temptest.fth

    r1831 r2865  
    2121      green-letters  ." OKAY"                      ( fail? )
    2222   then                                            ( fail? )
    23    black-letters
     23   cancel
    2424;
    2525warning off
  • cpu/x86/pc/olpc/via/testinstructions.fth

    r2266 r2865  
    397397;
    398398: message-off  ( -- )  d# 2  d# 27  at-xy  kill-line  ;
    399 : message  ( adr len -- )  cursor-off  message-off  red-letters  type  black-letters  ;
     399: message  ( adr len -- )  cursor-off  message-off  red-letters  type  cancel  ;
    400400
    401401: performed  ( -- )
  • dev/olpc/kb3700/ecio.fth

    r2196 r2865  
    312312      cr  red-letters
    313313      ." Restarting to enable SPI FLASH writing.  Try again after the system restarts."
    314       black-letters cr
     314      cancel cr
    315315      d# 5000 ms
    316316      ec-ixio-reboot
  • dev/olpc/touchpad/touchpad.fth

    r2740 r2865  
    268268            0 d# 26 at-xy red-screen white-letters
    269269            ." Unexpected touchpad reset"
    270             white-screen black-letters
     270            white-screen cancel
    271271            cr
    272272            start gs-only   false exit
  • ofw/core/ofwcore.fth

    r2690 r2865  
    32983298            red-letters
    32993299            ??cr ." Selftest failed. Return code = " .d cr
    3300             black-letters
     3300            cancel
    33013301            d# 10000                              ( delay-ms )
    33023302         else
    33033303            green-letters
    33043304            ." Okay" cr
    3305             black-letters
     3305            cancel
    33063306            d# 2000                               ( delay-ms )
    33073307         then                                     ( delay-ms )
     
    33093309         red-letters
    33103310         ." Selftest failed due to abort"  cr
    3311          black-letters
     3311         cancel
    33123312         d# 10000                                 ( delay-ms )
    33133313      then                                        ( delay-ms )
Note: See TracChangeset for help on using the changeset viewer.