Changeset 25401
- Timestamp:
- 05/09/08 14:56:25 (1 week ago)
- Files:
-
- haiku/trunk/src/apps/terminal/TermParse.cpp (modified) (8 diffs)
- haiku/trunk/src/apps/terminal/VTPrsTbl.c (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
haiku/trunk/src/apps/terminal/TermParse.cpp
r25392 r25401 28 28 29 29 30 extern int utf8_groundtable[]; /* UTF8 Ground table */31 extern int cs96_groundtable[]; /* CS96 Ground table */32 extern int iso8859_groundtable[]; /* ISO8859 & EUC Ground table */33 extern int sjis_groundtable[]; /* Shift-JIS Ground table */34 35 extern int esctable[]; /* ESC */36 extern int csitable[]; /* ESC [ */37 extern int dectable[]; /* ESC [ ? */38 extern int scrtable[]; /* ESC # */39 extern int igntable[]; /* ignore table */40 extern int iestable[]; /* ignore ESC table */41 extern int eigtable[]; /* ESC ignore table */42 extern int mbcstable[]; /* ESC $ */30 extern int gUTF8GroundTable[]; /* UTF8 Ground table */ 31 extern int gCS96GroundTable[]; /* CS96 Ground table */ 32 extern int gISO8859GroundTable[]; /* ISO8859 & EUC Ground table */ 33 extern int gSJISGroundTable[]; /* Shift-JIS Ground table */ 34 35 extern int gEscTable[]; /* ESC */ 36 extern int gCsiTable[]; /* ESC [ */ 37 extern int gDecTable[]; /* ESC [ ? */ 38 extern int gScrTable[]; /* ESC # */ 39 extern int gIgnoreTable[]; /* ignore table */ 40 extern int gIesTable[]; /* ignore ESC table */ 41 extern int gEscIgnoreTable[]; /* ESC ignore table */ 42 extern int gMbcsTable[]; /* ESC $ */ 43 43 44 44 … … 303 303 304 304 /* default coding system is UTF8 */ 305 int *groundtable = utf8_groundtable;305 int *groundtable = gUTF8GroundTable; 306 306 int *parsestate = groundtable; 307 307 … … 326 326 case B_ISO9_CONVERSION: 327 327 case B_ISO10_CONVERSION: 328 groundtable = iso8859_groundtable;328 groundtable = gISO8859GroundTable; 329 329 break; 330 330 case B_SJIS_CONVERSION: 331 groundtable = sjis_groundtable;331 groundtable = gSJISGroundTable; 332 332 break; 333 333 case B_EUC_CONVERSION: 334 334 case B_EUC_KR_CONVERSION: 335 335 case B_JIS_CONVERSION: 336 groundtable = iso8859_groundtable;336 groundtable = gISO8859GroundTable; 337 337 break; 338 338 case M_UTF8: 339 339 default: 340 groundtable = utf8_groundtable;340 groundtable = gUTF8GroundTable; 341 341 break; 342 342 } … … 453 453 case CASE_MBCS: 454 454 /* ESC $ */ 455 parsestate = mbcstable;455 parsestate = gMbcsTable; 456 456 break; 457 457 458 458 case CASE_GSETS: 459 459 /* ESC $ ? */ 460 parsestate = cs96_groundtable;460 parsestate = gCS96GroundTable; 461 461 cs96 = 1; 462 462 break; … … 491 491 case CASE_ESC: 492 492 /* escape */ 493 parsestate = esctable;493 parsestate = gEscTable; 494 494 break; 495 495 496 496 case CASE_IGNORE_STATE: 497 497 /* Ies: ignore anything else */ 498 parsestate = igntable;498 parsestate = gIgnoreTable; 499 499 break; 500 500 501 501 case CASE_IGNORE_ESC: 502 502 /* Ign: escape */ 503 parsestate = iestable;503 parsestate = gIesTable; 504 504 break; 505 505 … … 516 516 case CASE_SCR_STATE: // ESC # 517 517 /* enter scr state */ 518 parsestate = scrtable;518 parsestate = gScrTable; 519 519 break; 520 520 521 521 case CASE_ESC_IGNORE: 522 522 /* unknown escape sequence */ 523 parsestate = eigtable;523 parsestate = gEscIgnoreTable; 524 524 break; 525 525 … … 539 539 case CASE_DEC_STATE: 540 540 /* enter dec mode */ 541 parsestate = dectable;541 parsestate = gDecTable; 542 542 break; 543 543 … … 811 811 nparam = 1; 812 812 param[0] = DEFAULT; 813 parsestate = csitable;813 parsestate = gCsiTable; 814 814 break; 815 815 haiku/trunk/src/apps/terminal/VTPrsTbl.c
r25392 r25401 34 34 #define USE_ISO2022 35 35 36 int utf8_groundtable[] = /* UTF8 coding ground table */36 int gUTF8GroundTable[] = /* UTF8 coding ground table */ 37 37 { 38 38 /* NUL SOH STX ETX */ … … 358 358 }; 359 359 360 int cs96_groundtable[] = /* charset 96 table */360 int gCS96GroundTable[] = /* charset 96 table */ 361 361 { 362 362 /* NUL SOH STX ETX */ … … 682 682 }; 683 683 684 int iso8859_groundtable[] =684 int gISO8859GroundTable[] = 685 685 { 686 686 /* NUL SOH STX ETX */ … … 1006 1006 }; 1007 1007 1008 int csitable[] = /* ESC [ */1008 int gCsiTable[] = /* ESC [ */ 1009 1009 { 1010 1010 /* NUL SOH STX ETX */ … … 1330 1330 }; 1331 1331 1332 int dectable[] = /* ESC [ ? */1332 int gDecTable[] = /* ESC [ ? */ 1333 1333 { 1334 1334 /* NUL SOH STX ETX */ … … 1671 1671 }; 1672 1672 1673 int eigtable[] = /* CASE_ESC_IGNORE */1673 int gEscIgnoreTable[] = /* CASE_ESC_IGNORE */ 1674 1674 { 1675 1675 /* NUL SOH STX ETX */ … … 1996 1996 }; 1997 1997 1998 int esctable[] = /* ESC */1998 int gEscTable[] = /* ESC */ 1999 1999 { 2000 2000 /* NUL SOH STX ETX */ … … 2338 2338 }; 2339 2339 2340 int iestable[] = /* CASE_IGNORE_ESC */2340 int gIesTable[] = /* CASE_IGNORE_ESC */ 2341 2341 { 2342 2342 /* NUL SOH STX ETX */ … … 2662 2662 }; 2663 2663 2664 int igntable[] = /* CASE_IGNORE_STATE */2664 int gIgnoreTable[] = /* CASE_IGNORE_STATE */ 2665 2665 { 2666 2666 /* NUL SOH STX ETX */ … … 2986 2986 }; 2987 2987 2988 int scrtable[] = /* ESC # */2988 int gScrTable[] = /* ESC # */ 2989 2989 { 2990 2990 /* NUL SOH STX ETX */ … … 3310 3310 }; 3311 3311 3312 int scstable[] = /* ESC ( etc. */3312 int gScsTable[] = /* ESC ( etc. */ 3313 3313 { 3314 3314 /* NUL SOH STX ETX */ … … 3738 3738 3739 3739 #ifdef USE_MBCS 3740 int mbcstable[] = {3740 int gMbcsTable[] = { 3741 3741 /* NUL SOH STX ETX */ 3742 3742 CASE_IGNORE, … … 4061 4061 }; 4062 4062 4063 int smbcstable[] = {4063 int gSmbcsTable[] = { 4064 4064 /* NUL SOH STX ETX */ 4065 4065 CASE_IGNORE, … … 4386 4386 #endif 4387 4387 4388 int sjis_groundtable[] = /* Shift-JIS ground table. */4388 int gSJISGroundTable[] = /* Shift-JIS ground table. */ 4389 4389 { 4390 4390 /* NUL SOH STX ETX */
