From: Pascal Stumpf Date: Mon, 22 Jul 2013 10:34:15 +0000 (+0200) Subject: Kill most warnings in lib/DtTerm. X-Git-Tag: 2.2.1~55 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dc0e8ea74d0448503cfe013f9c9d5de5e1f40b57;p=oweals%2Fcde.git Kill most warnings in lib/DtTerm. Mostly missing headers, explicit parentheses and new prototypes. Some Caveats: * I haven't compile-tested the SVR4 getpty file, it might need another tweak * There were operator precedence bugs in TermPrimCursor.c and TermPrimRender.c (^ vs. !=). This might change behaviour, but at least I haven't experienced any crashes ... * This adds a little more dependencies for include ordering, but unless we want to play the "headers that include headers that include headers..." game, this is unavoidable. --- diff --git a/cde/include/Xm/XmPrivate.h b/cde/include/Xm/XmPrivate.h index 789e2416..c1f32333 100644 --- a/cde/include/Xm/XmPrivate.h +++ b/cde/include/Xm/XmPrivate.h @@ -81,11 +81,26 @@ extern char * _XmStringSourceGetString(XmTextWidget tw, Boolean want_wchar); #endif /* NeedWidePrototypes */ /* Extracted from TravActI.h */ -extern void _XmEnterGadget( +extern void _XmPrimitiveEnter( Widget wid, XEvent *event, String *params, Cardinal *num_params) ; +extern void _XmPrimitiveLeave( + Widget wid, + XEvent *event, + String *params, + Cardinal *num_params) ; +extern void _XmPrimitiveFocusOut( + Widget wid, + XEvent *event, + String *params, + Cardinal *num_params) ; +extern void _XmPrimitiveFocusIn( + Widget pw, + XEvent *event, + String *params, + Cardinal *num_params) ; extern void _XmLeaveGadget( Widget wid, XEvent *event, @@ -104,6 +119,8 @@ extern void _XmFocusOutGadget( /* Extracted from TraversalI.h */ extern Boolean _XmFocusIsHere( Widget w) ; +extern unsigned char _XmGetFocusPolicy( + Widget w) ; extern Boolean _XmShellIsExclusive( Widget wid) ; /* Extracted from UniqueEvnI.h */ diff --git a/cde/include/Xm/extractprototype.awk b/cde/include/Xm/extractprototype.awk index a2c6d042..1f0aa14f 100644 --- a/cde/include/Xm/extractprototype.awk +++ b/cde/include/Xm/extractprototype.awk @@ -61,4 +61,9 @@ function proto() { /_XmShellIsExclusive/ { proto(); } /_XmTextFieldSetDestination/ { proto(); } /_XmGetActiveTopLevelMenu/ { proto(); } +/_XmGetFocusPolicy/ { proto(); } +/_XmPrimitiveEnter/ { proto(); } +/_XmPrimitiveLeave/ { proto(); } +/_XmPrimitiveFocusOut/ { proto(); } +/_XmPrimitiveFocusIn\(/ { proto(); } /XmeFlushIconFileCache/ { proto(); } diff --git a/cde/lib/DtTerm/Term/TermAction.c b/cde/lib/DtTerm/Term/TermAction.c index 13e2c639..d47e21b2 100644 --- a/cde/lib/DtTerm/Term/TermAction.c +++ b/cde/lib/DtTerm/Term/TermAction.c @@ -167,9 +167,9 @@ typedef enum { } ScrollAmount; static EnumType scrollUnits[] = { - "page", (char) scrollPage, - "halfpage", (char) scrollHalfPage, - "line", (char) scrollLine + { "page", (char) scrollPage, }, + { "halfpage", (char) scrollHalfPage, }, + { "line", (char) scrollLine }, }; void @@ -227,7 +227,7 @@ void _DtTermActionBeginningOfBuffer(Widget w, XEvent *event, String *params, Cardinal *num_params) { - _DtTermFuncBeginningOfBuffer(w,NULL,1) ; + _DtTermFuncBeginningOfBuffer(w,0,1) ; (void) _DtTermPrimCursorOn(w); return; } @@ -236,7 +236,7 @@ void _DtTermActionEndOfBuffer(Widget w, XEvent *event, String *params, Cardinal *num_params) { - _DtTermFuncEndOfBuffer(w,NULL,1) ; + _DtTermFuncEndOfBuffer(w,0,1) ; (void) _DtTermPrimCursorOn(w); return; } @@ -330,10 +330,10 @@ typedef enum { } CursorDirection; static EnumType cursorDirections[] = { - "forward", (char) cursorForward, - "backward", (char) cursorBackward, - "up", (char) cursorUp, - "down", (char) cursorDown + { "forward", (char) cursorForward, }, + { "backward", (char) cursorBackward, }, + { "up", (char) cursorUp, }, + { "down", (char) cursorDown }, }; void @@ -557,16 +557,16 @@ typedef enum { } EditType; static EnumType editTypes[] = { - "find", (char) findType, - "insert", (char) insertType, - "select", (char) selectType, - "next", (char) nextType, - "prior", (char) priorType, - "delete", (char) deleteType, - "remove", (char) removeType, - "help", (char) helpType, - "menu", (char) menuType, - "do", (char) doType + { "find", (char) findType, }, + { "insert", (char) insertType, }, + { "select", (char) selectType, }, + { "next", (char) nextType, }, + { "prior", (char) priorType, }, + { "delete", (char) deleteType, }, + { "remove", (char) removeType, }, + { "help", (char) helpType, }, + { "menu", (char) menuType, }, + { "do", (char) doType }, }; void diff --git a/cde/lib/DtTerm/Term/TermAction.h b/cde/lib/DtTerm/Term/TermAction.h index cbf84903..024bee58 100644 --- a/cde/lib/DtTerm/Term/TermAction.h +++ b/cde/lib/DtTerm/Term/TermAction.h @@ -60,6 +60,7 @@ extern void _DtTermActionEditKeyExecute(Widget w, XEvent *event, String *params, Cardinal *num_params); extern void _DtTermActionKeypadKeyExecute(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern void _DtTermWriteEscSeq(Widget w, char *transmitString); #endif /* _Dt_TermAction_h */ /* DON'T ADD ANYTHING AFTER THIS #endif... */ diff --git a/cde/lib/DtTerm/Term/TermBuffer.c b/cde/lib/DtTerm/Term/TermBuffer.c index 2ae3e931..55ee435c 100644 --- a/cde/lib/DtTerm/Term/TermBuffer.c +++ b/cde/lib/DtTerm/Term/TermBuffer.c @@ -39,6 +39,7 @@ static char rcs_id[] = "$TOG: TermBuffer.c /main/2 1997/04/17 18:04:41 samborn $ #define USE_MEMCPY /* use memcpy for line movement... */ #include +#include "TermPrim.h" #include "TermHeader.h" /* for MIN/MAX */ #include "TermBufferP.h" #include "TermEnhance.h" @@ -46,7 +47,7 @@ static char rcs_id[] = "$TOG: TermBuffer.c /main/2 1997/04/17 18:04:41 samborn $ /* ** clear "count" enhancements starting at startCol */ -static +static void clearEnhancements ( TermBuffer tb, @@ -451,7 +452,7 @@ _DtTermBufferFreeBuffer /* ** clear all the enhancements from startCol through stopCol */ -static +static void clearEnhancements ( TermBuffer tb, diff --git a/cde/lib/DtTerm/Term/TermFunction.c b/cde/lib/DtTerm/Term/TermFunction.c index bbedf8c5..7c0e31fc 100644 --- a/cde/lib/DtTerm/Term/TermFunction.c +++ b/cde/lib/DtTerm/Term/TermFunction.c @@ -285,7 +285,7 @@ termFuncErase break; case eraseBuffer: - (void) _DtTermFuncClearBuffer(w, (int) NULL, functionSource); + (void) _DtTermFuncClearBuffer(w, 0, functionSource); break; case eraseFromCol0: @@ -508,7 +508,7 @@ _DtTermFuncDeleteLine(Widget w, int count, FunctionSource functionSource) /* special case out when there is a single line and we are * deleting the top line... */ - if ((tpd->lastUsedRow == 1) && (tpd->cursorRow == 0) || + if (((tpd->lastUsedRow == 1) && (tpd->cursorRow == 0)) || (tpd->cursorRow + 1 == tpd->lastUsedRow)) { /* we need to clear the line, re-render it, and we are done... */ @@ -588,7 +588,7 @@ _DtTermFuncHardReset(Widget w, int count, FunctionSource functionSource) tpd->autoLineFeed=False ; vtw->term.jumpScroll = True ; /* auto key repeat is X server issue - do nothing here */ - _DtTermFuncClearBuffer(w, (int) NULL, (FunctionSource) NULL ) ; + _DtTermFuncClearBuffer(w, 0, (FunctionSource) NULL ) ; _DtTermFunctionKeyClear(w) ; (void) _DtTermPrimSetCursorVisible(w, True); diff --git a/cde/lib/DtTerm/Term/TermFunctionKey.c b/cde/lib/DtTerm/Term/TermFunctionKey.c index 1910939e..08a77559 100644 --- a/cde/lib/DtTerm/Term/TermFunctionKey.c +++ b/cde/lib/DtTerm/Term/TermFunctionKey.c @@ -35,6 +35,7 @@ static char rcs_id[] = "$XConsortium: TermFunctionKey.c /main/1 1996/04/21 19:15 #include "TermHeader.h" #include +#include "TermAction.h" #include "TermPrimI.h" #include "TermP.h" /* #include "TermFunctionKeyP.h" */ @@ -147,6 +148,7 @@ _DtTermFunctionKeyClear( } } +void _DtTermFunctionKeyInit( Widget w ) diff --git a/cde/lib/DtTerm/Term/TermFunctionKey.h b/cde/lib/DtTerm/Term/TermFunctionKey.h index 5ae65a2a..e83ff3f1 100644 --- a/cde/lib/DtTerm/Term/TermFunctionKey.h +++ b/cde/lib/DtTerm/Term/TermFunctionKey.h @@ -70,7 +70,7 @@ _DtTermFunctionKeyClear( ); -extern _DtTermFunctionKeyInit( +extern void _DtTermFunctionKeyInit( Widget w ); diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c index b173f77f..79137593 100644 --- a/cde/lib/DtTerm/Term/TermParse.c +++ b/cde/lib/DtTerm/Term/TermParse.c @@ -36,6 +36,8 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $" * (c) Copyright 1996 Hitachi. * */ +#include + #include "TermHeader.h" #include "TermPrimDebug.h" #include "TermPrimP.h" @@ -50,6 +52,8 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $" #include "TermFunctionKey.h" #include "TermParseTableP.h" #include "TermBufferP.h" +#include "TermPrimUtil.h" +#include "TermPrimParseTable.h" #if defined (__hpux) /* @@ -274,7 +278,7 @@ _DtTermPModeSet(Widget w) /* DECSET CSI?ph */ /* case 2: can't return from vt52 mode */ case 3: /* Column (132) */ if ( vtw->vt.c132 ) { /* xterm allow 132 mode */ - (void) _DtTermFuncClearBuffer(w, NULL, fromParser); + (void) _DtTermFuncClearBuffer(w, 0, fromParser); vtw->term.tpd->cursorRow = TOPROW(vtw) ; vtw->term.tpd->cursorColumn = FIRSTCOLUMN(vtw) ; vtw->term.tpd->scrollLockTopRow = TOPROW(vtw); @@ -362,7 +366,7 @@ _DtTermPModeReset(Widget w) /* DECRST CSI?pl */ /* case 2: ** set vt52 mode */ case 3: /* Column (80) */ if (vtw->vt.c132) { /* allow 132 mode */ - (void) _DtTermFuncClearBuffer(w, NULL, fromParser); + (void) _DtTermFuncClearBuffer(w, 0, fromParser); vtw->term.tpd->cursorRow = TOPROW(vtw) ; vtw->term.tpd->cursorColumn = FIRSTCOLUMN(vtw) ; vtw->term.tpd->scrollLockTopRow = TOPROW(vtw); diff --git a/cde/lib/DtTerm/Term/TermParseTable.c b/cde/lib/DtTerm/Term/TermParseTable.c index 5956ce58..4bd31411 100644 --- a/cde/lib/DtTerm/Term/TermParseTable.c +++ b/cde/lib/DtTerm/Term/TermParseTable.c @@ -49,28 +49,28 @@ static StateTableRec stateStart; static StateEntryRec pre_parse_table[] = { - 0x00, 0x00, NULL, NULL, /* null chars -- ignore */ + { 0x00, 0x00, NULL, NULL, /* null chars -- ignore */ }, #ifdef NOTDEF - 0x05, 0x05, NULL, enquire, /* send answer back */ + { 0x05, 0x05, NULL, enquire, /* send answer back */ }, #endif /* NOTDEF */ - 0x07, 0x07, NULL, _DtTermPrimParseBell, /* ring the bell */ - 0x08, 0x08, NULL, _DtTermParseBackspace, /* backspace */ - 0x09, 0x09, NULL, _DtTermParseTab, /* horizontal tab */ - 0x0A, 0x0A, NULL, _DtTermParseLF, /* newline */ - 0x0B, 0x0B, NULL, _DtTermParseLF, /* Vertical Tab (Ctrl-k) */ - 0x0C, 0x0C, NULL, _DtTermParseLF, /* Form Feed or New Page */ - 0x0D, 0x0D, NULL, _DtTermPrimParseCR, /* carriage return */ - 0x0E, 0x0F, NULL, _DtTermParseFontShift, /* font shift in/out */ - 0x1B, 0x1B, &_DtTermStateEscape, _DtTermClearParam, /* Esc */ - 0x84, 0x84, &stateStart,_DtTermIndex, /* Index */ - 0x85, 0x85, &stateStart,_DtTermNextLine, /* Next Line */ - 0x88, 0x88, &stateStart,_DtTermTabSet, /* Horizontal Tab Set */ - 0x8D, 0x8D, &stateStart,_DtTermReverseIndex, /* Reverse Index */ - 0x8E, 0x8E, &stateStart,_DtTermSingleShiftG2,/* Single Shift G2 */ - 0x8F, 0x8F, &stateStart,_DtTermSingleShiftG3, /* Single Shift G3 */ - 0x90, 0x90, &_DtTermStateP, _DtTermPrimParserNextState, /* DCS */ - 0x9B, 0x9B, &_DtTermStateLeftBracket, _DtTermClearParam,/*CSI*/ - 0x00, 0xFF, NULL, NULL, /* end of table */ + { 0x07, 0x07, NULL, _DtTermPrimParseBell, /* ring the bell */ }, + { 0x08, 0x08, NULL, _DtTermParseBackspace, /* backspace */ }, + { 0x09, 0x09, NULL, _DtTermParseTab, /* horizontal tab */ }, + { 0x0A, 0x0A, NULL, _DtTermParseLF, /* newline */ }, + { 0x0B, 0x0B, NULL, _DtTermParseLF, /* Vertical Tab (Ctrl-k) */ }, + { 0x0C, 0x0C, NULL, _DtTermParseLF, /* Form Feed or New Page */ }, + { 0x0D, 0x0D, NULL, _DtTermPrimParseCR, /* carriage return */ }, + { 0x0E, 0x0F, NULL, _DtTermParseFontShift, /* font shift in/out */ }, + { 0x1B, 0x1B, &_DtTermStateEscape, _DtTermClearParam, /* Esc */ }, + { 0x84, 0x84, &stateStart,_DtTermIndex, /* Index */ }, + { 0x85, 0x85, &stateStart,_DtTermNextLine, /* Next Line */ }, + { 0x88, 0x88, &stateStart,_DtTermTabSet, /* Horizontal Tab Set */ }, + { 0x8D, 0x8D, &stateStart,_DtTermReverseIndex, /* Reverse Index */ }, + { 0x8E, 0x8E, &stateStart,_DtTermSingleShiftG2,/* Single Shift G2 */ }, + { 0x8F, 0x8F, &stateStart,_DtTermSingleShiftG3, /* Single Shift G3 */ }, + { 0x90, 0x90, &_DtTermStateP, _DtTermPrimParserNextState, /* DCS */ }, + { 0x9B, 0x9B, &_DtTermStateLeftBracket, _DtTermClearParam,/*CSI*/ }, + { 0x00, 0xFF, NULL, NULL, /* end of table */ }, }; /* @@ -80,7 +80,7 @@ pre_parse_table[] = static StateEntryRec start_table[] = { - 0x00, 0xFF, &stateStart, _DtTermPrimParserNextState /* end of table */ + { 0x00, 0xFF, &stateStart, _DtTermPrimParserNextState /* end of table */ }, }; static StateTableRec stateStart = {True, start_table, pre_parse_table}; @@ -92,35 +92,35 @@ StateTable _DtTermStateStart = &stateStart; static StateEntryRec escape_table[] = { - '[', '[', &_DtTermStateLeftBracket, _DtTermPrimParserNextState, - '#', '#', &_DtTermStatePound, _DtTermPrimParserNextState, - '(', '(', &_DtTermStateLeftParen, _DtTermPrimParserNextState, - ')', ')', &_DtTermStateRightParen, _DtTermPrimParserNextState, - '*', '*', &_DtTermStateAsterisk, _DtTermPrimParserNextState, - '+', '+', &_DtTermStatePlus, _DtTermPrimParserNextState, - '7', '7', &stateStart, _DtTermSaveCursor, /* Save Cursor (DECSC) */ - '8', '8', &stateStart,_DtTermRestoreCursor, /* Restore Cursor (DECRC)*/ - '=', '=', &stateStart, _DtTermAppKeypad , /* App keypad */ - '>', '>', &stateStart, _DtTermNormalKeypad, /* Normal keypad */ - 'D', 'D', &stateStart, _DtTermIndex, /* cursor down IND */ - 'E', 'E', &stateStart, _DtTermNextLine, /* next line (NEL) */ - 'H', 'H', &stateStart, _DtTermTabSet, /* Tab Set (HTS) */ - 'M', 'M', &stateStart, _DtTermReverseIndex, /* RI */ - 'N', 'N', &stateStart, _DtTermSingleShiftG2, /* SS2 */ - 'O', 'O', &stateStart, _DtTermSingleShiftG3, /* SS3 */ - 'P', 'P', &_DtTermStateP, _DtTermPrimParserNextState, /* DCS */ - 'Z', 'Z', &stateStart, _DtTermParseStatus, /* Same as DA */ - ']', ']', &_DtTermStateRightBracket, _DtTermPrimParserNextState, - '^', '^', &_DtTermStateUpArrow, _DtTermPrimParserNextState, /* PM */ - '_', '_', &_DtTermStateUnderscore, _DtTermPrimParserNextState, /*ACP*/ - 'c', 'c', &stateStart, _DtTermReset, /* Full Reset (RIS) */ - 'n', 'n', &stateStart, _DtTermSelectG2, /* Select G2 character set */ - 'o', 'o', &stateStart, _DtTermSelectG3, /* Select G3 character set */ - '|', '|', &stateStart, _DtTermInvokeG3, /* Invoke G3 character set */ - '}', '}', &stateStart, _DtTermInvokeG2, /* Select G2 character set */ - '~', '~', &_DtTermStateTilda, _DtTermPrimParserNextState, /* Invoke G1*/ - ' ', ' ', &_DtTermStateC1, _DtTermPrimParserNextState,/* set C1 control*/ - 0x00, 0xFF, &stateStart, _DtTermPrimParserNextState /* end of table */ + { '[', '[', &_DtTermStateLeftBracket, _DtTermPrimParserNextState, }, + { '#', '#', &_DtTermStatePound, _DtTermPrimParserNextState, }, + { '(', '(', &_DtTermStateLeftParen, _DtTermPrimParserNextState, }, + { ')', ')', &_DtTermStateRightParen, _DtTermPrimParserNextState, }, + { '*', '*', &_DtTermStateAsterisk, _DtTermPrimParserNextState, }, + { '+', '+', &_DtTermStatePlus, _DtTermPrimParserNextState, }, + { '7', '7', &stateStart, _DtTermSaveCursor, /* Save Cursor (DECSC) */ }, + { '8', '8', &stateStart,_DtTermRestoreCursor, /* Restore Cursor (DECRC)*/ }, + { '=', '=', &stateStart, _DtTermAppKeypad , /* App keypad */ }, + { '>', '>', &stateStart, _DtTermNormalKeypad, /* Normal keypad */ }, + { 'D', 'D', &stateStart, _DtTermIndex, /* cursor down IND */ }, + { 'E', 'E', &stateStart, _DtTermNextLine, /* next line (NEL) */ }, + { 'H', 'H', &stateStart, _DtTermTabSet, /* Tab Set (HTS) */ }, + { 'M', 'M', &stateStart, _DtTermReverseIndex, /* RI */ }, + { 'N', 'N', &stateStart, _DtTermSingleShiftG2, /* SS2 */ }, + { 'O', 'O', &stateStart, _DtTermSingleShiftG3, /* SS3 */ }, + { 'P', 'P', &_DtTermStateP, _DtTermPrimParserNextState, /* DCS */ }, + { 'Z', 'Z', &stateStart, _DtTermParseStatus, /* Same as DA */ }, + { ']', ']', &_DtTermStateRightBracket, _DtTermPrimParserNextState, }, + { '^', '^', &_DtTermStateUpArrow, _DtTermPrimParserNextState, /* PM */ }, + { '_', '_', &_DtTermStateUnderscore, _DtTermPrimParserNextState, /*ACP*/ }, + { 'c', 'c', &stateStart, _DtTermReset, /* Full Reset (RIS) */ }, + { 'n', 'n', &stateStart, _DtTermSelectG2, /* Select G2 character set */ }, + { 'o', 'o', &stateStart, _DtTermSelectG3, /* Select G3 character set */ }, + { '|', '|', &stateStart, _DtTermInvokeG3, /* Invoke G3 character set */ }, + { '}', '}', &stateStart, _DtTermInvokeG2, /* Select G2 character set */ }, + { '~', '~', &_DtTermStateTilda, _DtTermPrimParserNextState, /* Invoke G1*/ }, + { ' ', ' ', &_DtTermStateC1, _DtTermPrimParserNextState,/* set C1 control*/ }, + { 0x00, 0xFF, &stateStart, _DtTermPrimParserNextState /* end of table */ }, }; StateTableRec _DtTermStateEscape = {False, escape_table, pre_parse_table}; @@ -131,9 +131,9 @@ StateTableRec _DtTermStateEscape = {False, escape_table, pre_parse_table}; static StateEntryRec set_c1_table[] = { - 'F', 'F', &stateStart, _DtTermS7C1T, /* Select 7-bit C1 Control */ - 'G', 'G', &stateStart, _DtTermS8C1T, /* Select 8-bit C1 Control */ - 0x00, 0xFF, &stateStart, _DtTermPrintState , /* end of table */ + { 'F', 'F', &stateStart, _DtTermS7C1T, /* Select 7-bit C1 Control */ }, + { 'G', 'G', &stateStart, _DtTermS8C1T, /* Select 8-bit C1 Control */ }, + { 0x00, 0xFF, &stateStart, _DtTermPrintState , /* end of table */ }, }; StateTableRec _DtTermStateC1 = {False, set_c1_table, pre_parse_table}; @@ -143,11 +143,11 @@ StateTableRec _DtTermStateC1 = {False, set_c1_table, pre_parse_table}; static StateEntryRec pound_table[] = { - '3', '3', &stateStart, _DtTermDoubleHigh, - '5', '5', &stateStart, _DtTermSingleWide, - '6', '6', &stateStart, _DtTermDoubleWide, - '8', '8', &stateStart, _DtTermAlignTest, - 0x00, 0xFF, &stateStart, _DtTermPrintState , /* end of table */ + { '3', '3', &stateStart, _DtTermDoubleHigh, }, + { '5', '5', &stateStart, _DtTermSingleWide, }, + { '6', '6', &stateStart, _DtTermDoubleWide, }, + { '8', '8', &stateStart, _DtTermAlignTest, }, + { 0x00, 0xFF, &stateStart, _DtTermPrintState , /* end of table */ }, }; StateTableRec _DtTermStatePound = {False, pound_table, pre_parse_table}; @@ -158,7 +158,7 @@ StateTableRec _DtTermStatePound = {False, pound_table, pre_parse_table}; static StateEntryRec left_paren_table[] = { - 0x00, 0xFF, &stateStart, _DtTermParseFontG0 /* end of table */ + { 0x00, 0xFF, &stateStart, _DtTermParseFontG0 /* end of table */ }, }; StateTableRec _DtTermStateLeftParen = {False, left_paren_table, pre_parse_table}; @@ -168,7 +168,7 @@ StateTableRec _DtTermStateLeftParen = {False, left_paren_table, pre_parse_tabl static StateEntryRec right_paren_table[] = { - 0x00, 0xFF, &stateStart, _DtTermParseFontG1 /* end of table */ + { 0x00, 0xFF, &stateStart, _DtTermParseFontG1 /* end of table */ }, }; StateTableRec _DtTermStateRightParen = {False, right_paren_table, pre_parse_table}; @@ -178,7 +178,7 @@ StateTableRec _DtTermStateRightParen = {False, right_paren_table, pre_parse_ta static StateEntryRec esc_asterisk_table[] = { - 0x00, 0xFF, &stateStart, _DtTermParseFontG2 /* end of table */ + { 0x00, 0xFF, &stateStart, _DtTermParseFontG2 /* end of table */ }, }; StateTableRec _DtTermStateAsterisk = {False, esc_asterisk_table, pre_parse_table}; @@ -188,7 +188,7 @@ StateTableRec _DtTermStateAsterisk = {False, esc_asterisk_table, pre_parse_tabl static StateEntryRec plus_table[] = { - 0x00, 0xFF, &stateStart, _DtTermParseFontG3 /* end of table */ + { 0x00, 0xFF, &stateStart, _DtTermParseFontG3 /* end of table */ }, }; StateTableRec _DtTermStatePlus = {False, plus_table, pre_parse_table}; @@ -198,8 +198,8 @@ StateTableRec _DtTermStatePlus = {False, plus_table, pre_parse_table}; static StateEntryRec get_titleBS_table[] = { - '\\', '\\', &stateStart, _DtTermParserSunWindowTitle, - 0x00,0xFF, &_DtTermStateGetTitle, _DtTermSaveChar, + { '\\', '\\', &stateStart, _DtTermParserSunWindowTitle, }, + { 0x00,0xFF, &_DtTermStateGetTitle, _DtTermSaveChar, }, }; StateTableRec _DtTermStateGetTitleBS = {False, get_titleBS_table}; @@ -209,8 +209,8 @@ StateTableRec _DtTermStateGetTitleBS = {False, get_titleBS_table}; static StateEntryRec get_title_table[] = { - 0x1B, 0x1B,&_DtTermStateGetTitleBS,_DtTermPrimParserNextState, - 0x00,0xFF, &_DtTermStateGetTitle, _DtTermSaveChar, + { 0x1B, 0x1B,&_DtTermStateGetTitleBS,_DtTermPrimParserNextState, }, + { 0x00,0xFF, &_DtTermStateGetTitle, _DtTermSaveChar, }, }; StateTableRec _DtTermStateGetTitle = {False, get_title_table}; @@ -220,8 +220,8 @@ StateTableRec _DtTermStateGetTitle = {False, get_title_table}; static StateEntryRec get_iconBS_table[] = { - '\\', '\\', &stateStart, _DtTermParserSunWindowIcon, - 0x00,0xFF, &_DtTermStateGetIcon, _DtTermSaveChar, + { '\\', '\\', &stateStart, _DtTermParserSunWindowIcon, }, + { 0x00,0xFF, &_DtTermStateGetIcon, _DtTermSaveChar, }, }; StateTableRec _DtTermStateGetIconBS = {False, get_iconBS_table}; @@ -231,8 +231,8 @@ StateTableRec _DtTermStateGetIconBS = {False, get_iconBS_table}; static StateEntryRec get_icon_table[] = { - 0x1B, 0x1B,&_DtTermStateGetIconBS , _DtTermPrimParserNextState, - 0x00,0xFF, &_DtTermStateGetIcon, _DtTermSaveChar, + { 0x1B, 0x1B,&_DtTermStateGetIconBS , _DtTermPrimParserNextState, }, + { 0x00,0xFF, &_DtTermStateGetIcon, _DtTermSaveChar, }, }; StateTableRec _DtTermStateGetIcon = {False, get_icon_table}; @@ -242,8 +242,8 @@ StateTableRec _DtTermStateGetIcon = {False, get_icon_table}; static StateEntryRec get_fileBS_table[] = { - '\\', '\\', &stateStart, _DtTermParserSunIconFile, - 0x00,0xFF, &_DtTermStateGetIconFile, _DtTermSaveChar, + { '\\', '\\', &stateStart, _DtTermParserSunIconFile, }, + { 0x00,0xFF, &_DtTermStateGetIconFile, _DtTermSaveChar, }, }; StateTableRec _DtTermStateGetIconFileBS = {False, get_fileBS_table}; @@ -253,8 +253,8 @@ StateTableRec _DtTermStateGetIconFileBS = {False, get_fileBS_table}; static StateEntryRec get_file_table[] = { - 0x1B, 0x1B,&_DtTermStateGetIconFileBS , _DtTermPrimParserNextState, - 0x00,0xFF, &_DtTermStateGetIconFile, _DtTermSaveChar, + { 0x1B, 0x1B,&_DtTermStateGetIconFileBS , _DtTermPrimParserNextState, }, + { 0x00,0xFF, &_DtTermStateGetIconFile, _DtTermSaveChar, }, }; StateTableRec _DtTermStateGetIconFile = {False, get_file_table}; @@ -265,9 +265,9 @@ StateTableRec _DtTermStateGetIconFile = {False, get_file_table}; static StateEntryRec get_stringBS_table[] = { - '\\', '\\', &stateStart, _DtTermPrimParserNextState,/*valid terminator*/ - 0x07, 0x07, &stateStart, _DtTermChangeTextParam,/*new Icon,Title,etc*/ - 0x00, 0xFF, &_DtTermStateGetString, _DtTermSaveChar, /* text*/ + { '\\', '\\', &stateStart, _DtTermPrimParserNextState,/*valid terminator*/ }, + { 0x07, 0x07, &stateStart, _DtTermChangeTextParam,/*new Icon,Title,etc*/ }, + { 0x00, 0xFF, &_DtTermStateGetString, _DtTermSaveChar, /* text*/ }, }; StateTableRec _DtTermStateGetStringBS = {False, get_stringBS_table}; @@ -277,9 +277,9 @@ StateTableRec _DtTermStateGetStringBS = {False, get_stringBS_table}; static StateEntryRec get_string_table[] = { - 0x07, 0x07, &stateStart, _DtTermChangeTextParam,/*new Icon,Title,etc*/ - 0x1B, 0x1B, &_DtTermStateGetStringBS , _DtTermPrimParserNextState, - 0x00,0xFF, &_DtTermStateGetString, _DtTermSaveChar, /* text*/ + { 0x07, 0x07, &stateStart, _DtTermChangeTextParam,/*new Icon,Title,etc*/ }, + { 0x1B, 0x1B, &_DtTermStateGetStringBS , _DtTermPrimParserNextState, }, + { 0x00,0xFF, &_DtTermStateGetString, _DtTermSaveChar, /* text*/ }, }; StateTableRec _DtTermStateGetString = {False, get_string_table}; @@ -289,12 +289,12 @@ StateTableRec _DtTermStateGetString = {False, get_string_table}; static StateEntryRec right_bracket_table[] = { - ';', ';', &_DtTermStateGetString, _DtTermParsePushNum,/* increment count */ - '0', '9', &_DtTermStateRightBracket, _DtTermEnterNum, /* enter number */ - 'l', 'l', &_DtTermStateGetTitle, _DtTermPrimParserNextState, - 'L', 'L', &_DtTermStateGetIcon, _DtTermPrimParserNextState, - 'I', 'I', &_DtTermStateGetIconFile, _DtTermPrimParserNextState, - 0x00, 0xFF, &stateStart, _DtTermPrintState /* end of table */ + { ';', ';', &_DtTermStateGetString, _DtTermParsePushNum,/* increment count */ }, + { '0', '9', &_DtTermStateRightBracket, _DtTermEnterNum, /* enter number */ }, + { 'l', 'l', &_DtTermStateGetTitle, _DtTermPrimParserNextState, }, + { 'L', 'L', &_DtTermStateGetIcon, _DtTermPrimParserNextState, }, + { 'I', 'I', &_DtTermStateGetIconFile, _DtTermPrimParserNextState, }, + { 0x00, 0xFF, &stateStart, _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateRightBracket = {False, right_bracket_table}; @@ -304,37 +304,37 @@ StateTableRec _DtTermStateRightBracket = {False, right_bracket_table}; static StateEntryRec left_bracket_table_no_Q[] = { - ';', ';', &_DtTermStateLeftBracketNotQ,_DtTermParsePushNum, - '0', '9', &_DtTermStateLeftBracketNotQ, _DtTermEnterNum, - '@', '@', &stateStart, _DtTermInsertChars, /* IL Insert Blank char*/ - 'A', 'A', &stateStart, _DtTermCursorUp, /* CUU Cursor up n */ - 'B', 'B', &stateStart, _DtTermCursorDown, /* CUD Cursor down n*/ - 'C', 'C', &stateStart, _DtTermCursorForward,/* CUF Cursor forward n*/ - 'D', 'D', &stateStart, _DtTermCursorBack, /* CUB Cursor back n*/ - 'F', 'F', &stateStart, _DtTermCursorToLineUp,/* CPL Curs to Line up*/ - 'G', 'G', &stateStart, _DtTermCursorToCol, /* CHA Curs to Col */ - 'H', 'H', &stateStart, _DtTermCursorPos , /* Cursor Position */ - 'J', 'J', &stateStart, _DtTermEraseDisplay, /* Erase in Display */ - 'K', 'K', &stateStart, _DtTermEraseInLine, /* EL Erase in Line */ - 'L', 'L', &stateStart, _DtTermInsertLines, /* IL Insert Lines */ - 'M', 'M', &stateStart, _DtTermDeleteLines, /* DL Delete Lines */ - 'S', 'S', &stateStart, _DtTermScrollUp , /* SU Scroll Up p lines*/ - 'T', 'T', &stateStart, _DtTermScrollDown ,/*SD Scroll DOwn p lines*/ - 'X', 'X', &stateStart, _DtTermEraseChars , /* ECH Erase chars */ - 'c', 'c', &stateStart, _DtTermDeviceAttributes, /* DA */ - 'P', 'P', &stateStart, _DtTermDeleteChars, /* DCH Delete Chars */ - 'f', 'f', &stateStart, _DtTermCursorPos, /* Cursor Position */ - 'g', 'g', &stateStart, _DtTermTabClear, /* TBC */ - 'h', 'h', &stateStart, _DtTermSetMode, /* SM */ - 'l', 'l', &stateStart, _DtTermResetMode, /* RM */ - 'm', 'm', &stateStart, _DtTermCharAttributes, /* SGR */ - 'n', 'n', &stateStart, _DtTermDeviceStatusAnsi, /* DSR */ - 'r', 'r', &stateStart, _DtTermScrollingRegion, /* DECSTBM */ - 't', 't', &stateStart, _DtTermParseSunMisc, /* misc sun esc seq */ - 'x', 'x', &stateStart, _DtTermRequestParam, /* DECREQTPARM */ - '"', '"', &_DtTermStateDECSCA, _DtTermPrimParserNextState,/* sel erase */ - '!', '!', &_DtTermStateSoftReset, _DtTermPrimParserNextState , /* set erase attr */ - 0x00, 0xFF, &stateStart, _DtTermPrintState /* end of table */ + { ';', ';', &_DtTermStateLeftBracketNotQ,_DtTermParsePushNum, }, + { '0', '9', &_DtTermStateLeftBracketNotQ, _DtTermEnterNum, }, + { '@', '@', &stateStart, _DtTermInsertChars, /* IL Insert Blank char*/ }, + { 'A', 'A', &stateStart, _DtTermCursorUp, /* CUU Cursor up n */ }, + { 'B', 'B', &stateStart, _DtTermCursorDown, /* CUD Cursor down n*/ }, + { 'C', 'C', &stateStart, _DtTermCursorForward,/* CUF Cursor forward n*/ }, + { 'D', 'D', &stateStart, _DtTermCursorBack, /* CUB Cursor back n*/ }, + { 'F', 'F', &stateStart, _DtTermCursorToLineUp,/* CPL Curs to Line up*/ }, + { 'G', 'G', &stateStart, _DtTermCursorToCol, /* CHA Curs to Col */ }, + { 'H', 'H', &stateStart, _DtTermCursorPos , /* Cursor Position */ }, + { 'J', 'J', &stateStart, _DtTermEraseDisplay, /* Erase in Display */ }, + { 'K', 'K', &stateStart, _DtTermEraseInLine, /* EL Erase in Line */ }, + { 'L', 'L', &stateStart, _DtTermInsertLines, /* IL Insert Lines */ }, + { 'M', 'M', &stateStart, _DtTermDeleteLines, /* DL Delete Lines */ }, + { 'S', 'S', &stateStart, _DtTermScrollUp , /* SU Scroll Up p lines*/ }, + { 'T', 'T', &stateStart, _DtTermScrollDown ,/*SD Scroll DOwn p lines*/ }, + { 'X', 'X', &stateStart, _DtTermEraseChars , /* ECH Erase chars */ }, + { 'c', 'c', &stateStart, _DtTermDeviceAttributes, /* DA */ }, + { 'P', 'P', &stateStart, _DtTermDeleteChars, /* DCH Delete Chars */ }, + { 'f', 'f', &stateStart, _DtTermCursorPos, /* Cursor Position */ }, + { 'g', 'g', &stateStart, _DtTermTabClear, /* TBC */ }, + { 'h', 'h', &stateStart, _DtTermSetMode, /* SM */ }, + { 'l', 'l', &stateStart, _DtTermResetMode, /* RM */ }, + { 'm', 'm', &stateStart, _DtTermCharAttributes, /* SGR */ }, + { 'n', 'n', &stateStart, _DtTermDeviceStatusAnsi, /* DSR */ }, + { 'r', 'r', &stateStart, _DtTermScrollingRegion, /* DECSTBM */ }, + { 't', 't', &stateStart, _DtTermParseSunMisc, /* misc sun esc seq */ }, + { 'x', 'x', &stateStart, _DtTermRequestParam, /* DECREQTPARM */ }, + { '"', '"', &_DtTermStateDECSCA, _DtTermPrimParserNextState,/* sel erase */ }, + { '!', '!', &_DtTermStateSoftReset, _DtTermPrimParserNextState , /* set erase attr */ }, + { 0x00, 0xFF, &stateStart, _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateLeftBracketNotQ = {False, left_bracket_table_no_Q, pre_parse_table}; @@ -344,38 +344,38 @@ StateTableRec _DtTermStateLeftBracketNotQ = {False, left_bracket_table_no_Q, pr static StateEntryRec left_bracket_table[] = { - '?', '?', &_DtTermStateEscQuestion, _DtTermPrimParserNextState,/*DECSET*/ - ';', ';', &_DtTermStateLeftBracketNotQ ,_DtTermParsePushNum, - '0', '9', &_DtTermStateLeftBracketNotQ , _DtTermEnterNum, - '@', '@', &stateStart, _DtTermInsertChars, /* IL Insert Blank char*/ - 'A', 'A', &stateStart, _DtTermCursorUp, /* CUU Cursor up n */ - 'B', 'B', &stateStart, _DtTermCursorDown, /* CUD Cursor down n*/ - 'C', 'C', &stateStart, _DtTermCursorForward,/* CUF Cursor forward n*/ - 'D', 'D', &stateStart, _DtTermCursorBack, /* CUB Cursor back n*/ - 'F', 'F', &stateStart, _DtTermCursorToLineUp,/* CPL Curs to Line up*/ - 'G', 'G', &stateStart, _DtTermCursorToCol, /* CHA Curs to Col */ - 'H', 'H', &stateStart, _DtTermCursorPos , /* Cursor Position */ - 'J', 'J', &stateStart, _DtTermEraseDisplay, /* Erase in Display */ - 'K', 'K', &stateStart, _DtTermEraseInLine, /* EL Erase in Line */ - 'L', 'L', &stateStart, _DtTermInsertLines, /* IL Insert Lines */ - 'M', 'M', &stateStart, _DtTermDeleteLines, /* DL Delete Lines */ - 'S', 'S', &stateStart, _DtTermScrollUp , /* SU Scroll Up p lines*/ - 'T', 'T', &stateStart, _DtTermScrollDown ,/*SD Scroll DOwn p lines*/ - 'X', 'X', &stateStart, _DtTermEraseChars , /* ECH Erase chars */ - 'c', 'c', &stateStart, _DtTermDeviceAttributes, /* DA */ - 'P', 'P', &stateStart, _DtTermDeleteChars, /* DCH Delete Chars */ - 'f', 'f', &stateStart, _DtTermCursorPos, /* Cursor Position */ - 'g', 'g', &stateStart, _DtTermTabClear, /* TBC */ - 'h', 'h', &stateStart, _DtTermSetMode, /* SM */ - 'l', 'l', &stateStart, _DtTermResetMode, /* RM */ - 'm', 'm', &stateStart, _DtTermCharAttributes, /* SGR */ - 'n', 'n', &stateStart, _DtTermDeviceStatusAnsi, /* DSR */ - 'r', 'r', &stateStart, _DtTermScrollingRegion, /* DECSTBM */ - 't', 't', &stateStart, _DtTermParseSunMisc, /* misc sun esc seq */ - 'x', 'x', &stateStart, _DtTermRequestParam, /* DECREQTPARM */ - '"', '"', &_DtTermStateDECSCA, _DtTermPrimParserNextState,/* sel erase */ - '!', '!', &_DtTermStateSoftReset, _DtTermPrimParserNextState , /* set erase attr */ - 0x00, 0xFF, &stateStart, _DtTermPrintState /* end of table */ + { '?', '?', &_DtTermStateEscQuestion, _DtTermPrimParserNextState,/*DECSET*/ }, + { ';', ';', &_DtTermStateLeftBracketNotQ ,_DtTermParsePushNum, }, + { '0', '9', &_DtTermStateLeftBracketNotQ , _DtTermEnterNum, }, + { '@', '@', &stateStart, _DtTermInsertChars, /* IL Insert Blank char*/ }, + { 'A', 'A', &stateStart, _DtTermCursorUp, /* CUU Cursor up n */ }, + { 'B', 'B', &stateStart, _DtTermCursorDown, /* CUD Cursor down n*/ }, + { 'C', 'C', &stateStart, _DtTermCursorForward,/* CUF Cursor forward n*/ }, + { 'D', 'D', &stateStart, _DtTermCursorBack, /* CUB Cursor back n*/ }, + { 'F', 'F', &stateStart, _DtTermCursorToLineUp,/* CPL Curs to Line up*/ }, + { 'G', 'G', &stateStart, _DtTermCursorToCol, /* CHA Curs to Col */ }, + { 'H', 'H', &stateStart, _DtTermCursorPos , /* Cursor Position */ }, + { 'J', 'J', &stateStart, _DtTermEraseDisplay, /* Erase in Display */ }, + { 'K', 'K', &stateStart, _DtTermEraseInLine, /* EL Erase in Line */ }, + { 'L', 'L', &stateStart, _DtTermInsertLines, /* IL Insert Lines */ }, + { 'M', 'M', &stateStart, _DtTermDeleteLines, /* DL Delete Lines */ }, + { 'S', 'S', &stateStart, _DtTermScrollUp , /* SU Scroll Up p lines*/ }, + { 'T', 'T', &stateStart, _DtTermScrollDown ,/*SD Scroll DOwn p lines*/ }, + { 'X', 'X', &stateStart, _DtTermEraseChars , /* ECH Erase chars */ }, + { 'c', 'c', &stateStart, _DtTermDeviceAttributes, /* DA */ }, + { 'P', 'P', &stateStart, _DtTermDeleteChars, /* DCH Delete Chars */ }, + { 'f', 'f', &stateStart, _DtTermCursorPos, /* Cursor Position */ }, + { 'g', 'g', &stateStart, _DtTermTabClear, /* TBC */ }, + { 'h', 'h', &stateStart, _DtTermSetMode, /* SM */ }, + { 'l', 'l', &stateStart, _DtTermResetMode, /* RM */ }, + { 'm', 'm', &stateStart, _DtTermCharAttributes, /* SGR */ }, + { 'n', 'n', &stateStart, _DtTermDeviceStatusAnsi, /* DSR */ }, + { 'r', 'r', &stateStart, _DtTermScrollingRegion, /* DECSTBM */ }, + { 't', 't', &stateStart, _DtTermParseSunMisc, /* misc sun esc seq */ }, + { 'x', 'x', &stateStart, _DtTermRequestParam, /* DECREQTPARM */ }, + { '"', '"', &_DtTermStateDECSCA, _DtTermPrimParserNextState,/* sel erase */ }, + { '!', '!', &_DtTermStateSoftReset, _DtTermPrimParserNextState , /* set erase attr */ }, + { 0x00, 0xFF, &stateStart, _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateLeftBracket = {False, left_bracket_table, pre_parse_table}; @@ -385,8 +385,8 @@ StateTableRec _DtTermStateLeftBracket = {False, left_bracket_table, pre_parse_t static StateEntryRec soft_reset_table[] = { - 'p', 'p', &stateStart , _DtTermSoftReset, /* End of text */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table*/ + { 'p', 'p', &stateStart , _DtTermSoftReset, /* End of text */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table*/ }, }; StateTableRec _DtTermStateSoftReset = {False, soft_reset_table, pre_parse_table}; @@ -396,9 +396,9 @@ StateTableRec _DtTermStateSoftReset = {False, soft_reset_table, pre_parse_table} static StateEntryRec set_erase_table[] = { - 'p', 'p', &stateStart , _DtTermSetCompatLevel, /* DECSCL */ - 'q', 'q', &stateStart , _DtTermSetCharEraseMode, /* set sel erase */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table*/ + { 'p', 'p', &stateStart , _DtTermSetCompatLevel, /* DECSCL */ }, + { 'q', 'q', &stateStart , _DtTermSetCharEraseMode, /* set sel erase */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table*/ }, }; StateTableRec _DtTermStateDECSCA = {False, set_erase_table, pre_parse_table}; @@ -408,8 +408,8 @@ StateTableRec _DtTermStateDECSCA = {False, set_erase_table, pre_parse_table}; static StateEntryRec up_backslash_table[] = { - '\\', '\\',&stateStart , _DtTermPrimParserNextState, /* End of text */ - 0x00, 0xFF, &_DtTermStateUpArrow, _DtTermPrimParserNextState + { '\\', '\\',&stateStart , _DtTermPrimParserNextState, /* End of text */ }, + { 0x00, 0xFF, &_DtTermStateUpArrow, _DtTermPrimParserNextState }, }; StateTableRec _DtTermStateUA_BS = {False, up_backslash_table}; @@ -419,9 +419,9 @@ StateTableRec _DtTermStateUA_BS = {False, up_backslash_table}; static StateEntryRec uparrow_table[] = { - 0x1B, 0x1B,&_DtTermStateUA_BS , _DtTermPrimParserNextState, /* Esc */ - 0x9C, 0x9C, &stateStart, _DtTermPrimParserNextState, /* ST */ - 0x00, 0xFF, &_DtTermStateUpArrow, _DtTermPrimParserNextState + { 0x1B, 0x1B,&_DtTermStateUA_BS , _DtTermPrimParserNextState, /* Esc */ }, + { 0x9C, 0x9C, &stateStart, _DtTermPrimParserNextState, /* ST */ }, + { 0x00, 0xFF, &_DtTermStateUpArrow, _DtTermPrimParserNextState }, }; StateTableRec _DtTermStateUpArrow = {False, uparrow_table}; @@ -431,8 +431,8 @@ StateTableRec _DtTermStateUpArrow = {False, uparrow_table}; static StateEntryRec under_backslash_table[] = { - '\\', '\\',&stateStart , _DtTermPrimParserNextState, /* End of text */ - 0x00, 0xFF, &_DtTermStateUnderscore, _DtTermPrimParserNextState /* Go back to Underscore*/ + { '\\', '\\',&stateStart , _DtTermPrimParserNextState, /* End of text */ }, + { 0x00, 0xFF, &_DtTermStateUnderscore, _DtTermPrimParserNextState /* Go back to Underscore*/ }, }; StateTableRec _DtTermStateUS_BS = {False, under_backslash_table}; @@ -442,9 +442,9 @@ StateTableRec _DtTermStateUS_BS = {False, under_backslash_table}; static StateEntryRec underscore_table[] = { - 0x1B, 0x1B,&_DtTermStateUS_BS , _DtTermPrimParserNextState, /* Esc */ - 0x9C, 0x9C, &stateStart, _DtTermPrimParserNextState, /* ST */ - 0x00, 0xFF, &_DtTermStateUnderscore, _DtTermPrimParserNextState + { 0x1B, 0x1B,&_DtTermStateUS_BS , _DtTermPrimParserNextState, /* Esc */ }, + { 0x9C, 0x9C, &stateStart, _DtTermPrimParserNextState, /* ST */ }, + { 0x00, 0xFF, &_DtTermStateUnderscore, _DtTermPrimParserNextState }, }; StateTableRec _DtTermStateUnderscore = {False, underscore_table}; @@ -454,15 +454,15 @@ StateTableRec _DtTermStateUnderscore = {False, underscore_table}; static StateEntryRec esc_question_table[] = { - '0', '9', &_DtTermStateEscQuestion , _DtTermEnterNum, - 'h', 'h', &stateStart , _DtTermPModeSet, /* DECSET private mode*/ - 'l', 'l', &stateStart , _DtTermPModeReset, /*DECSET private mode*/ - 'n', 'n', &stateStart , _DtTermDeviceStatus, /*DECSET private mode*/ - 'r', 'r', &stateStart , _DtTermRestoreModeValues, /*restore Mode values*/ - 's', 's', &stateStart , _DtTermSaveModeValues, /*save Mode values*/ - 'K', 'K', &stateStart , _DtTermSelEraseInLine, /* DECSEL */ - 'J', 'J', &stateStart , _DtTermSelEraseInDisplay,/* DECSEL */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table*/ + { '0', '9', &_DtTermStateEscQuestion , _DtTermEnterNum, }, + { 'h', 'h', &stateStart , _DtTermPModeSet, /* DECSET private mode*/ }, + { 'l', 'l', &stateStart , _DtTermPModeReset, /*DECSET private mode*/ }, + { 'n', 'n', &stateStart , _DtTermDeviceStatus, /*DECSET private mode*/ }, + { 'r', 'r', &stateStart , _DtTermRestoreModeValues, /*restore Mode values*/ }, + { 's', 's', &stateStart , _DtTermSaveModeValues, /*save Mode values*/ }, + { 'K', 'K', &stateStart , _DtTermSelEraseInLine, /* DECSEL */ }, + { 'J', 'J', &stateStart , _DtTermSelEraseInDisplay,/* DECSEL */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table*/ }, }; StateTableRec _DtTermStateEscQuestion = {False, esc_question_table, pre_parse_table}; @@ -472,8 +472,8 @@ StateTableRec _DtTermStateEscQuestion = {False, esc_question_table, pre_parse_t static StateEntryRec tilda_table[] = { - 0x1B, 0x1B,&stateStart,_DtTermInvokeG1, /* LS1R Invoke G1 Char set */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ + { 0x1B, 0x1B,&stateStart,_DtTermInvokeG1, /* LS1R Invoke G1 Char set */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateTilda = {False, tilda_table, pre_parse_table}; @@ -483,8 +483,8 @@ StateTableRec _DtTermStateTilda = {False, tilda_table, pre_parse_table}; static StateEntryRec sk_backslash_table[] = { - '\\', '\\',&stateStart, _DtTermParseUserKeyLoadLast, /* ST */ - 0x00, 0xFF, &_DtTermStateIsNextBS_SK, _DtTermPrimParserNextState/*toss*/ + { '\\', '\\',&stateStart, _DtTermParseUserKeyLoadLast, /* ST */ }, + { 0x00, 0xFF, &_DtTermStateIsNextBS_SK, _DtTermPrimParserNextState/*toss*/ }, }; StateTableRec _DtTermStateIsNextBS_SK = {False, sk_backslash_table}; @@ -494,13 +494,13 @@ StateTableRec _DtTermStateIsNextBS_SK = {False, sk_backslash_table}; static StateEntryRec user_key_string_table[] = { - '0','9', &_DtTermStateUserKeyString, _DtTermParseHexDigit, /*hex digit*/ - 'a','f', &_DtTermStateUserKeyString, _DtTermParseHexDigit, /*hex digit*/ - 'A','F', &_DtTermStateUserKeyString, _DtTermParseHexDigit, /*hex digit*/ - ';', ';', &_DtTermStateUserKey, _DtTermParseUserKeyLoad,/*load string*/ - 0x1B, 0x1B, &_DtTermStateIsNextBS_SK, _DtTermPrimParserNextState,/*Esc*/ - 0x9C, 0x9C, &stateStart, _DtTermParseUserKeyLoadLast, /* ST */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ + { '0','9', &_DtTermStateUserKeyString, _DtTermParseHexDigit, /*hex digit*/ }, + { 'a','f', &_DtTermStateUserKeyString, _DtTermParseHexDigit, /*hex digit*/ }, + { 'A','F', &_DtTermStateUserKeyString, _DtTermParseHexDigit, /*hex digit*/ }, + { ';', ';', &_DtTermStateUserKey, _DtTermParseUserKeyLoad,/*load string*/ }, + { 0x1B, 0x1B, &_DtTermStateIsNextBS_SK, _DtTermPrimParserNextState,/*Esc*/ }, + { 0x9C, 0x9C, &stateStart, _DtTermParseUserKeyLoadLast, /* ST */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateUserKeyString = {False, user_key_string_table}; @@ -510,11 +510,11 @@ StateTableRec _DtTermStateUserKeyString = {False, user_key_string_table}; static StateEntryRec softkey_table[] = { - '0', '9', &_DtTermStateUserKey, _DtTermEnterNum, /* enter number */ - '/', '/',&_DtTermStateUserKeyString,_DtTermPrimParserNextState,/*store key*/ - 0x1B, 0x1B, &_DtTermStateIsNextBS_SK, _DtTermPrimParserNextState,/*Esc*/ - 0x9C, 0x9C, &stateStart, _DtTermParseUserKeyLoadLast, /* ST */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ + { '0', '9', &_DtTermStateUserKey, _DtTermEnterNum, /* enter number */ }, + { '/', '/',&_DtTermStateUserKeyString,_DtTermPrimParserNextState,/*store key*/ }, + { 0x1B, 0x1B, &_DtTermStateIsNextBS_SK, _DtTermPrimParserNextState,/*Esc*/ }, + { 0x9C, 0x9C, &stateStart, _DtTermParseUserKeyLoadLast, /* ST */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateUserKey = {False, softkey_table}; @@ -524,9 +524,9 @@ StateTableRec _DtTermStateUserKey = {False, softkey_table}; static StateEntryRec dl_backslash_table[] = { - '\\', '\\',&stateStart, _DtTermLoadCharSet, /* ST */ - 0x20,0x7E, &_DtTermStateP, _DtTermPrimParserNextState, /* all text */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ + { '\\', '\\',&stateStart, _DtTermLoadCharSet, /* ST */ }, + { 0x20,0x7E, &_DtTermStateP, _DtTermPrimParserNextState, /* all text */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateIsNextBS_DL = {False, dl_backslash_table}; @@ -536,11 +536,11 @@ StateTableRec _DtTermStateIsNextBS_DL = {False, dl_backslash_table}; static StateEntryRec dl_char_table[] = { - '\\', '\\',&stateStart, _DtTermLoadCharSet , /* ST */ - 0x20,0x7E, &_DtTermStateDLCharSet, _DtTermPrimParserNextState,/* text */ - 0x1B, 0x1B,&_DtTermStateIsNextBS_DL,_DtTermPrimParserNextState,/*end?*/ - 0x9C, 0x9C, &stateStart, _DtTermLoadCharSet, /* C1 string terminator*/ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ + { '\\', '\\',&stateStart, _DtTermLoadCharSet , /* ST */ }, + { 0x20,0x7E, &_DtTermStateDLCharSet, _DtTermPrimParserNextState,/* text */ }, + { 0x1B, 0x1B,&_DtTermStateIsNextBS_DL,_DtTermPrimParserNextState,/*end?*/ }, + { 0x9C, 0x9C, &stateStart, _DtTermLoadCharSet, /* C1 string terminator*/ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateDLCharSet = {False, dl_char_table}; @@ -550,12 +550,12 @@ StateTableRec _DtTermStateDLCharSet = {False, dl_char_table}; static StateEntryRec esc_P_table[] = { - ';', ';', &_DtTermStateP, _DtTermParsePushNum, /*increment count*/ - '0', '9', &_DtTermStateP, _DtTermEnterNum, /* enter number */ - '|', '|', &_DtTermStateUserKey, _DtTermParseUserKeyClear, /* DECUDK */ - '{', '{', &_DtTermStateDLCharSet, _DtTermPrimParserNextState, - /* down-line-load char set */ - 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ + { ';', ';', &_DtTermStateP, _DtTermParsePushNum, /*increment count*/ }, + { '0', '9', &_DtTermStateP, _DtTermEnterNum, /* enter number */ }, + { '|', '|', &_DtTermStateUserKey, _DtTermParseUserKeyClear, /* DECUDK */ }, + { '{', '{', &_DtTermStateDLCharSet, _DtTermPrimParserNextState, }, + { /* down-line-load char set */ }, + { 0x00, 0xFF, &stateStart , _DtTermPrintState /* end of table */ }, }; StateTableRec _DtTermStateP = {False, esc_P_table, pre_parse_table}; @@ -566,8 +566,8 @@ StateTableRec _DtTermStateP = {False, esc_P_table, pre_parse_table}; static StateEntryRec error_table[] = { - 'A', 'Z', &stateStart, _DtTermPrimParserNextState, /* legal char */ - 0x00, 0xFF, &_DtTermStateError, _DtTermPrimParserNextState /* end */ + { 'A', 'Z', &stateStart, _DtTermPrimParserNextState, /* legal char */ }, + { 0x00, 0xFF, &_DtTermStateError, _DtTermPrimParserNextState /* end */ }, }; StateTableRec _DtTermStateError = {False, error_table}; diff --git a/cde/lib/DtTerm/TermPrim/TermPrim.c b/cde/lib/DtTerm/TermPrim/TermPrim.c index 87c836d7..f9859aba 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrim.c +++ b/cde/lib/DtTerm/TermPrim/TermPrim.c @@ -49,16 +49,20 @@ extern char * _DtTermPrimGetMessage( char *filename, int set, int n, char *s ); #include #include #include +#include #include #include +#include #include "TermHeader.h" #include "TermPrimOSDepI.h" /* for SETENV_LINES_AND_COLS */ #include "TermPrimI.h" #include "TermPrimP.h" #include "TermPrimBufferP.h" #include "TermPrimAction.h" +#include "TermPrimGetPty.h" #include "TermPrimParser.h" #include "TermPrimParseTable.h" +#include "TermPrimPendingText.h" #include "TermPrimPendingTextP.h" #include "TermPrimRenderFont.h" #include "TermPrimRenderFontSet.h" @@ -76,6 +80,7 @@ extern char * _DtTermPrimGetMessage( char *filename, int set, int n, char *s ); #include #include #include +#include #if defined(linux) || defined(hpV4) # include /* For FD_* macros. */ # include /* For select() prototype. */ @@ -679,7 +684,7 @@ _DtTermPrimGetFontSet * "Assignment in conditional 'while' expression."... */ /*SUPPRESS 624*/ - while (fontListEntry = XmFontListNextEntry(fontContext)) { + while ((fontListEntry = XmFontListNextEntry(fontContext))) { pointer = XmFontListEntryGetFont(fontListEntry, &fontType); if (fontType == XmFONT_IS_FONTSET) { int i; @@ -2386,7 +2391,7 @@ Realize(Widget w, XtValueMask *p_valueMask, XSetWindowAttributes *attributes) * register input method, and set callbacks for on the spot * support. */ - (void) XmImRegister(w, (unsigned int) NULL); + (void) XmImRegister(w, 0); imPoint.x = 0; imPoint.y = 0; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c index c65ddecf..3dda7943 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c @@ -38,8 +38,11 @@ static char rcs_id[] = "$XConsortium: TermPrimBuffer.c /main/1 1996/04/21 19:16: #define USE_MEMCPY /* use memcpy for line movement... */ +#include #include #include "TermHeader.h" /* for MIN/MAX */ +#include "TermPrim.h" +#include "TermPrimBuffer.h" #include "TermPrimBufferP.h" #include "TermPrimSelect.h" #include "TermPrimDebug.h" diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h index 42f81b89..a080438f 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h @@ -662,6 +662,17 @@ _DtTermPrimBufferSetInSelectionFlag short row, TermLineSelection state ); + +extern void +_DtTermPrimBufferSetSelectLines +( + TermBuffer tb, + short beginRow, + short beginCol, + short endRow, + short endCol +); + #ifdef __cplusplus } /* close scope of 'extern "C"'... */ #endif /* __cplusplus */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBufferP.h b/cde/lib/DtTerm/TermPrim/TermPrimBufferP.h index d9b098a1..66f88608 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBufferP.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimBufferP.h @@ -174,6 +174,29 @@ typedef struct _TermBufferRec TermBufferPart term_buffer; } TermBufferRec; +extern +short +_DtTermPrimBufferInsertWc +( + const TermBuffer tb, + const short row, + const short col, + wchar_t *newChars, + short numChars, + Boolean insertFlag, + termChar **returnChars, + short *returnLength +); + +extern +Boolean +_DtTermPrimBufferClearLineWc +( + const TermBuffer tb, + const short row, + short newWidth +); + #ifdef __cplusplus } /* close scope of 'extern "C"'... */ #endif /* __cplusplus */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c index 14d0ad2a..4e348a13 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c @@ -38,8 +38,10 @@ static char rcs_id[] = "$XConsortium: TermPrimBufferWc.c /main/1 1996/04/21 19:1 #define USE_MEMCPY /* use memcpy for line movement... */ +#include #include #include "TermHeader.h" /* for MIN/MAX */ +#include "TermPrim.h" #include "TermPrimOSDepI.h" #include "TermPrimBufferP.h" #include "TermPrimDebug.h" diff --git a/cde/lib/DtTerm/TermPrim/TermPrimCursor.c b/cde/lib/DtTerm/TermPrim/TermPrimCursor.c index 57b03c56..7840dc6a 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimCursor.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimCursor.c @@ -36,8 +36,12 @@ static char rcs_id[] = "$XConsortium: TermPrimCursor.c /main/1 1996/04/21 19:17: * (c) Copyright 1996 Hitachi. * */ +#include +#include + #include "TermHeader.h" #include "TermPrimDebug.h" +#include "TermPrimI.h" #include "TermPrimP.h" #include "TermPrimData.h" #include "TermPrimLineDraw.h" @@ -322,7 +326,7 @@ _DtTermPrimCursorOn(Widget w) } /* set the GC... */ - if (tpd->cursorGC.foreground != enhInfo.fg ^ enhInfo.bg) { + if (tpd->cursorGC.foreground != (enhInfo.fg ^ enhInfo.bg)) { tpd->cursorGC.foreground = enhInfo.fg ^ enhInfo.bg; values.foreground = enhInfo.fg ^ enhInfo.bg; valueMask |= GCForeground; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimDebug.c b/cde/lib/DtTerm/TermPrim/TermPrimDebug.c index f0a96dda..fc0c27d6 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimDebug.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimDebug.c @@ -138,7 +138,7 @@ setDebugFlags(char *c1) argHead.next = (argArray *) 0; argPtr = &argHead; - while (c3 = _XStrtok(c2, " \t\n", strtok_buf)) { + while ((c3 = _XStrtok(c2, " \t\n", strtok_buf))) { /* null out c2 so we won't restart strtok... */ c2 = (char *) 0; argPtr->next = (argArray *) malloc(sizeof(argArray)); @@ -151,7 +151,7 @@ setDebugFlags(char *c1) for (argPtr = argHead.next; argPtr; argPtr = argPtr->next) { charList = argPtr->str; flagList = (char *) 0; - if (c2 = strchr(argPtr->str, ':')) { + if ((c2 = strchr(argPtr->str, ':'))) { /* null out the ':'... */ *c2++ = '\0'; flagList = c2; @@ -197,7 +197,7 @@ setDebugFlags(char *c1) } c3 = flagList; - while (flagList = _XStrtok(c3, ",", strtok_buf)) { + while ((flagList = _XStrtok(c3, ",", strtok_buf))) { /* null out c3 so we won't restart strtok... */ c3 = (char *) 0; if (!flagList || !*flagList) { diff --git a/cde/lib/DtTerm/TermPrim/TermPrimDebug.h b/cde/lib/DtTerm/TermPrim/TermPrimDebug.h index 16002913..a83e2b20 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimDebug.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimDebug.h @@ -58,5 +58,8 @@ extern unsigned char *debugLevel[256]; #define _TERM_DEBUG(c, a) \ _TERM_DEBUG_FLAG(c, 0, a) +void _DtTermPrimDebugDumpEvent (FILE *f, Widget w, XEvent *ev); + + #endif /* _Dt_TermPrimDebug_h */ /* DON'T ADD ANYTHING AFTER THIS #endif... */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c index 8507cdf3..1ffd419a 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c @@ -33,11 +33,10 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-bsd.c /main/4 1996/11/21 19 * (c) Copyright 1993, 1994 Novell, Inc. * */ -#include "TermPrimDebug.h" -#include "TermHeader.h" #include #include #if defined(OPENBSD_ARCHITECTURE) +#include #include #endif #include @@ -49,6 +48,10 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-bsd.c /main/4 1996/11/21 19 #define X_INCLUDE_UNISTD_H #define XOS_USE_XT_LOCKING #include +#include "TermPrim.h" +#include "TermPrimDebug.h" +#include "TermPrimUtil.h" +#include "TermHeader.h" typedef struct _ptyInfo { char *ptyName; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c index 820c62e0..5f79d298 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c @@ -39,6 +39,7 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-svr4.c /main/1 1996/04/21 1 * was basically taken intact as were the comments... */ +#include "TermPrim.h" #include "TermPrimOSDepI.h" #include "TermPrimDebug.h" #include "TermHeader.h" diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty.h b/cde/lib/DtTerm/TermPrim/TermPrimGetPty.h index adabab18..2122924b 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty.h @@ -36,6 +36,8 @@ int _DtTermPrimGetPty(char **ptySlave, char **ptyMaster); int _DtTermPrimSetupPty(char *ptySlave, int ptyFd); void _DtTermPrimReleasePty(char *ptySlave); void _DtTermPrimPtyCleanup(); +int _DtTermPrimGetPty(char **ptySlave, char **ptyMaster); +void _DtTermPrimReleasePty(char *ptySlave); #endif /* _Dt_TermPrimGetPty_h */ /* DON'T ADD ANYTHING AFTER THIS #endif... */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParseTable.c b/cde/lib/DtTerm/TermPrim/TermPrimParseTable.c index 14d95cef..a1983d0a 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimParseTable.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimParseTable.c @@ -47,12 +47,12 @@ static StateTableRec stateStart; static StateEntryRec startTable[] = { - 0x07, 0x07, &stateStart, _DtTermPrimParseBell, /* ring the bell */ - 0x08, 0x08, &stateStart, _DtTermPrimParseBackspace, /* backspace */ - 0x09, 0x09, &stateStart, _DtTermPrimParseTab, /* horizontal tab */ - 0x0A, 0x0A, &stateStart, _DtTermPrimParseLF, /* newline */ - 0x0D, 0x0D, &stateStart, _DtTermPrimParseCR, /* carriage return */ - 0x00, 0xFF, &stateStart, _DtTermPrimParseWriteChar, /* write to dpy */ + { 0x07, 0x07, &stateStart, _DtTermPrimParseBell, }, /* ring the bell */ + { 0x08, 0x08, &stateStart, _DtTermPrimParseBackspace, }, /* backspace */ + { 0x09, 0x09, &stateStart, _DtTermPrimParseTab, }, /* horizontal tab */ + { 0x0A, 0x0A, &stateStart, _DtTermPrimParseLF, }, /* newline */ + { 0x0D, 0x0D, &stateStart, _DtTermPrimParseCR, }, /* carriage return */ + { 0x00, 0xFF, &stateStart, _DtTermPrimParseWriteChar, }, /* write to dpy */ }; static StateTableRec stateStart = {True, startTable}; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParser.c b/cde/lib/DtTerm/TermPrim/TermPrimParser.c index f3a6ab7e..f2114379 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimParser.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimParser.c @@ -36,6 +36,7 @@ static char rcs_id[] = "$TOG: TermPrimParser.c /main/2 1999/10/15 12:23:41 mgree * (c) Copyright 1996 Hitachi. * */ +#include #include "TermPrimDebug.h" #include "TermPrimP.h" #include "TermPrimParserP.h" diff --git a/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c b/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c index 5d872b10..2fcb6d21 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c @@ -278,7 +278,7 @@ _DtTermPrimPendingTextFlush walkPendingText(list); #endif /* DEBUG */ - while (chunk = _DtTermPrimPendingTextGetChunk(list)) { + while ((chunk = _DtTermPrimPendingTextGetChunk(list))) { (void) _DtTermPrimPendingTextRemoveChunk(list, chunk); } } diff --git a/cde/lib/DtTerm/TermPrim/TermPrimPendingText.h b/cde/lib/DtTerm/TermPrim/TermPrimPendingText.h index 53160a56..62bc6177 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimPendingText.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimPendingText.h @@ -120,6 +120,15 @@ _DtTermPrimPendingTextDestroy PendingText ptr ); +extern +Boolean +_DtTermPrimPendingTextAppend +( + PendingText list, + unsigned char *text, + int len +); + #ifdef __cplusplus } /* close scope of 'extern "C"'... */ #endif /* __cplusplus */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRender.c b/cde/lib/DtTerm/TermPrim/TermPrimRender.c index 907f96ac..3f250f01 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRender.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRender.c @@ -43,7 +43,9 @@ static char rcs_id[] = "$TOG: TermPrimRender.c /main/3 1999/07/20 17:34:54 mgree #include "TermPrimData.h" #include "TermPrimLineDraw.h" #include "TermPrimBufferP.h" +#include "TermPrimRender.h" #include "TermPrimRenderP.h" +#include "TermPrimSelect.h" #include "TermPrimSelectP.h" #include "TermPrimMessageCatI.h" #include @@ -123,7 +125,7 @@ _DtTermPrimBell(Widget w) * are done... */ if (tpd->renderGC.foreground != - tw->primitive.foreground ^ tw->core.background_pixel) { + (tw->primitive.foreground ^ tw->core.background_pixel)) { tpd->renderGC.foreground = tw->primitive.foreground ^ tw->core.background_pixel; (void) XSetForeground(XtDisplay(w), tpd->renderGC.gc, diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRender.h b/cde/lib/DtTerm/TermPrim/TermPrimRender.h index 3dbdbb22..1492c09e 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRender.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimRender.h @@ -63,6 +63,8 @@ extern void _DtTermPrimExposeText(Widget w, int startX, int startY, int endX, int endY, Boolean isExposeEvent); extern int _DtTermPrimInsertText(Widget w, unsigned char *buffer, int length); extern int _DtTermPrimInsertTextWc(Widget w, wchar_t *buffer, int length); +extern void _DtTermPrimRefreshTextWc(Widget w, short startColumn, + short startRow, short endColumn, short endRow); extern Boolean _DtTermPrimParseInput diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c index 91ddd9ee..96cfd2a0 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c @@ -33,6 +33,8 @@ static char rcs_id[] = "$XConsortium: TermPrimRenderLineDraw.c /main/1 1996/04/2 * (c) Copyright 1993, 1994 Novell, Inc. * */ +#include + #include "TermHeader.h" #include "TermPrimP.h" #include "TermPrimDebug.h" diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c index c17bfd40..4bc964cd 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c @@ -48,8 +48,10 @@ static char rcs_id[] = "$XConsortium: TermPrimRenderMb.c /main/1 1996/04/21 19:1 #include "TermPrimOSDepI.h" #include "TermPrimBufferP.h" #include "TermPrimRenderP.h" +#include "TermPrimSelect.h" #include "TermPrimSelectP.h" #include +#include void _DtTermPrimRefreshTextWc(Widget w, short startColumn, short startRow, diff --git a/cde/lib/DtTerm/TermPrim/TermPrimScroll.c b/cde/lib/DtTerm/TermPrim/TermPrimScroll.c index d4110be9..bbfd1289 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimScroll.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimScroll.c @@ -514,11 +514,11 @@ _DtTermPrimScrollText(Widget w, short lines) if (0 == lines) return; - if (tw->term.jumpScroll && + if ((tw->term.jumpScroll && ((lines + tpd->scroll.jump.scrollLines) > (tw->term.rows - tpd->scrollLockTopRow - - (tw->term.rows - 1 - tpd->scrollLockBottomRow))) || + (tw->term.rows - 1 - tpd->scrollLockBottomRow)))) || ((lines + tpd->scroll.jump.scrollLines) < -(tw->term.rows - tpd->scrollLockTopRow - diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSelect.c b/cde/lib/DtTerm/TermPrim/TermPrimSelect.c index 6256b7dd..24f5e8e8 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSelect.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSelect.c @@ -41,7 +41,9 @@ static char rcs_id[] = "$TOG: TermPrimSelect.c /main/6 1999/10/14 16:22:53 mgree #include #include #include +#include #include +#include "TermPrimAction.h" #include "TermPrimDebug.h" #include "TermPrimP.h" #include "TermPrimData.h" @@ -51,7 +53,7 @@ static char rcs_id[] = "$TOG: TermPrimSelect.c /main/6 1999/10/14 16:22:53 mgree #include #include -#if defined(USL) +#if defined(USL) || defined(OPENBSD_ARCHITECTURE) #include #include #endif @@ -1200,7 +1202,7 @@ _DtTermPrimSelectStart selectInfo->anchor = xyToPos(tw, btnEvent->x, btnEvent->y); if (selectInfo->scanType != XmSELECT_POSITION || - _DtTermPrimSelectGetSelection(w, &begin, &end) && begin != end + (_DtTermPrimSelectGetSelection(w, &begin, &end) && begin != end) ) { _DtTermPrimSelectDoSelection(w, event, params, paramCount); @@ -2057,7 +2059,7 @@ _DtTermPrimSelectConvert return(False); } } - else if ((*target == CS_OF_LOCALE) && !isDebugFSet('s', 2) || + else if (((*target == CS_OF_LOCALE) && !isDebugFSet('s', 2)) || (*target == TEXT && !isDebugFSet('s', 3))) { *type = CS_OF_LOCALE; @@ -2241,8 +2243,8 @@ _DtTermPrimSelectDeleteLines /* if there are no lines, etc. return... */ if ((len <= 0) || !selectInfo->ownPrimary || ((tw->term.tpd->scrollLockTopRow > 0 || - tw->term.tpd->scrollLockBottomRow < tw->term.rows-1)) && - row < tw->term.tpd->scrollLockTopRow) { + (tw->term.tpd->scrollLockBottomRow < tw->term.rows-1)) && + row < tw->term.tpd->scrollLockTopRow)) { return; } @@ -3003,8 +3005,8 @@ XmTestInSelection( position = xyToPos(tw, event->xbutton.x, event->xbutton.y); - if (!(_DtTermPrimSelectGetSelection(w, &left, &right) && - left != right && (position > left && position < right) + if ((!(_DtTermPrimSelectGetSelection(w, &left, &right) && + (left != right && (position > left && position < right))) || (position == left && event->xbutton.x > GetXFromPos(w, left)) || (position == right && diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSelect.h b/cde/lib/DtTerm/TermPrim/TermPrimSelect.h index ae1ce8fb..c16fda8b 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSelect.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimSelect.h @@ -277,6 +277,41 @@ void _DtTermPrimSelectInitBtnEvents( Widget w); +extern +void +_DtTermPrimRenderRefreshTextLinear +( + Widget w, + XmTextPosition start, + XmTextPosition stop +); + +extern +XmTextPosition +rowColToPos +( + DtTermPrimitiveWidget tw, + short row, + short col +); + +extern +void +_DtTermPrimSelectDisown +( + Widget w +); + +extern +Boolean +_DtTermPrimSelectIsInSelection +( + Widget w, + int row, + short startCol, + short width, + short *selWidth +); #ifdef __cplusplus } /* close scope of 'extern "C"'... */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c index 49fc8c9d..6f496fbe 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c @@ -71,7 +71,7 @@ static char rcs_id[] = "$TOG: TermPrimSetPty.c /main/2 1998/04/03 17:11:24 mgree #include #endif /* USE_TIOCCONS */ -#ifdef LINUX_ARCHITECTURE +#if defined(LINUX_ARCHITECTURE) || defined(OPENBSD_ARCHITECTURE) #include #endif /* LINUX_ARCHITECTURE */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c index b7401409..211fd2ab 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c @@ -36,12 +36,12 @@ static char rcs_id[] = "$TOG: TermPrimSetUtmp.c /main/10 1998/04/03 17:11:42 mgr * (c) Copyright 1996 Hitachi. * */ -#include "TermPrimDebug.h" -#include "TermHeader.h" #include #include #include #include +#include "TermPrimDebug.h" +#include "TermHeader.h" /* for sigprocmask... */ #include diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c index 207381ad..d517e9ee 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c @@ -65,6 +65,7 @@ static char rcs_id[] = "$TOG: TermPrimSubproc.c /main/11 1998/04/20 12:45:57 mgr #include "TermPrimSetPty.h" #include "TermPrimSubproc.h" #include "TermPrimDebug.h" +#include "TermPrimSetUtmp.h" #include "TermPrimUtil.h" typedef struct _subprocInfo { @@ -94,7 +95,7 @@ FakeFork (void) #endif /*BBA*/ _DtTermProcessLock(); if (debugInit) { - if (c = getenv("dttermDebugForkFailures")) { + if ((c = getenv("dttermDebugForkFailures"))) { debugForkFailures = strtol(c, (char **) 0, 0); debugInit = 0; } @@ -382,7 +383,7 @@ _DtTermPrimSubprocExec(Widget w, if (loginShell) { /* pre-pend an '-' for loginShell... */ (void) strcat(argv[0], "-"); - if (c = strrchr(cmd, '/')) { + if ((c = strrchr(cmd, '/'))) { strcat(argv[0], ++c); } else { strcat(argv[0], cmd); diff --git a/cde/lib/DtTerm/TermPrim/TermPrimUtil.c b/cde/lib/DtTerm/TermPrim/TermPrimUtil.c index 1d9a638d..df04eb34 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimUtil.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimUtil.c @@ -467,7 +467,7 @@ _DtTermPrimStartLog(Widget w) _bA_dump(); #endif /* BBA */ (void) execl(DEFAULT_SHELL, DEFAULT_SHELL_ARGV0, - "-c", &tw->term.logFile[1], 0); + "-c", &tw->term.logFile[1], NULL); (void) fprintf(stderr, " Can't exec \"%s\"\n", &tw->term.logFile[1]); (void) exit(1); @@ -484,7 +484,7 @@ _DtTermPrimStartLog(Widget w) if (access(tw->term.logFile, W_OK) < 0) { return; } - } else if (cp = strrchr(tw->term.logFile, '/')) { + } else if ((cp = strrchr(tw->term.logFile, '/'))) { *cp = 0; i = access(tw->term.logFile, W_OK); *cp = '/'; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimUtil.h b/cde/lib/DtTerm/TermPrim/TermPrimUtil.h index 1eb6c81a..e2744629 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimUtil.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimUtil.h @@ -49,6 +49,9 @@ extern void _DtTermPrimLogFileCleanup(void); extern void _DtTermPrimRemoveSuidRoot(); extern void _DtTermPrimToggleSuidRoot(Boolean root); +extern void _DtTermPrimStartLog(Widget w); +extern void _DtTermPrimCloseLog(Widget w); +extern void _DtTermPrimWriteLog(DtTermPrimitiveWidget tw, char *buffer, int cnt); #endif /* _Dt_TermPrimUtil_h */ diff --git a/cde/lib/DtTerm/TermView/TermView.c b/cde/lib/DtTerm/TermView/TermView.c index 83172723..63c35af7 100644 --- a/cde/lib/DtTerm/TermView/TermView.c +++ b/cde/lib/DtTerm/TermView/TermView.c @@ -41,6 +41,7 @@ static char rcs_id[] = "$XConsortium: TermView.c /main/1 1996/04/21 19:20:13 drk #include "TermViewP.h" #include #include +#include #include #include #include @@ -601,7 +602,7 @@ externaldef(termclassrec) DtTermViewClassRec dtTermViewClassRec = { NULL, 0, - NULL, + 0, NULL, NULL, NULL, diff --git a/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c b/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c index 841428fd..5b39155d 100644 --- a/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c +++ b/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c @@ -55,6 +55,7 @@ static char rcs_id[] = "$XConsortium: TermViewGlobalDialog.c /main/2 1996/08/28 #include "TermViewGlobalDialog.h" #include "TermViewMenu.h" #include "TermViewP.h" +#include "TermPrimCursor.h" #include "TermPrimFunction.h" #include "TermPrimMessageCatI.h" diff --git a/cde/lib/DtTerm/TermView/TermViewMenu.c b/cde/lib/DtTerm/TermView/TermViewMenu.c index f67dfb8f..f10484d5 100644 --- a/cde/lib/DtTerm/TermView/TermViewMenu.c +++ b/cde/lib/DtTerm/TermView/TermViewMenu.c @@ -58,6 +58,8 @@ static char rcs_id[] = "$XConsortium: TermViewMenu.c /main/4 1996/09/26 16:42:48 #include "TermViewGlobalDialog.h" #include "TermViewTerminalDialog.h" #include "TermPrimMessageCatI.h" +#include "TermPrimSelect.h" +#include "TermFunction.h" static Widget currentWidget = (Widget ) 0; /* widget for current menu @@ -254,14 +256,14 @@ Widget _DtTermViewCreateLabel(Widget parent, char *label) { return(createMenuWidget(xmLabelGadgetClass, NULL, - parent, NULL, label, NULL, NULL, NULL, NULL, NULL)); + parent, NULL, label, 0, NULL, NULL, NULL, NULL)); } Widget _DtTermViewCreateSeparator(Widget parent, char *label) { return(createMenuWidget(xmSeparatorGadgetClass, NULL, - parent, NULL, label, NULL, NULL, NULL, NULL, NULL)); + parent, NULL, label, 0, NULL, NULL, NULL, NULL)); } static Widget @@ -304,7 +306,7 @@ createSizeMenu DtTermViewWidget tw = (DtTermViewWidget) w; Widget submenu; Widget button; - int i1; + long i1; char *c1; char *c2; #ifdef NOTDEF @@ -357,10 +359,10 @@ createSizeMenu #endif #ifdef WINDOW_SIZE_TOGGLES windowSizeToggles[i1] = _DtTermViewCreateToggleButton(submenu, buffer, - NULL, NULL, NULL, sizeChangeCallback, (XtPointer) i1); + 0, NULL, NULL, sizeChangeCallback, (XtPointer) i1); #else /* WINDOW_SIZE_TOGGLES */ button = _DtTermViewCreatePushButton(submenu, buffer, - NULL, NULL, NULL, sizeChangeCallback, (XtPointer) i1); + 0, NULL, NULL, sizeChangeCallback, (XtPointer) i1); #endif /* WINDOW_SIZE_TOGGLES */ } @@ -381,10 +383,10 @@ createSizeMenu #endif #ifdef WINDOW_SIZE_TOGGLES windowSizeToggles[i1] = _DtTermViewCreateToggleButton(submenu, buffer, - NULL, NULL, NULL, defaultSizeCallback, NULL); + 0, NULL, NULL, defaultSizeCallback, NULL); #else /* WINDOW_SIZE_TOGGLES */ button = _DtTermViewCreatePushButton(submenu, buffer, - NULL, NULL, NULL, defaultSizeCallback, NULL); + 0, NULL, NULL, defaultSizeCallback, NULL); #endif /* WINDOW_SIZE_TOGGLES */ ks = XStringToKeysym(GETMESSAGE(NL_SETN_ViewMenu,3, "W")); @@ -415,7 +417,7 @@ createFontMenu DtTermViewWidget tw = (DtTermViewWidget) w; Widget submenu; Widget button; - int i1; + long i1; int i2; char *c1; char *c2; @@ -471,7 +473,7 @@ createFontMenu fontArray[i1].labelName = XtMalloc(strlen(buffer) + 1); (void) strcpy(fontArray[i1].labelName, buffer); /* look for a separating '/'... */ - if (c2 = strchr(fontArray[i1].labelName, '/')) { + if ((c2 = strchr(fontArray[i1].labelName, '/'))) { /* found, null it out... */ *c2++ = '\0'; /* and assign it to the fontName... */ @@ -496,8 +498,8 @@ createFontMenu } (void) strcat(fontName, (GETMESSAGE(NL_SETN_ViewMenu,4, "-iso8859-1"))); } - if (fontNames = - XListFonts(XtDisplay(w), fontName, 1, &fontNameCount)) { + if ((fontNames = + XListFonts(XtDisplay(w), fontName, 1, &fontNameCount))) { c2 = *fontNames; for (i2 = 0; i2 < 7; i2++) { while (*c2 && (*c2 != '-')) { @@ -570,12 +572,12 @@ createFontMenu #endif fontSizeToggles[i1] = _DtTermViewCreateToggleButton(submenu, fontArray[i1].labelName, - NULL, NULL, NULL, fontChangeCallback, (XtPointer) i1); + 0, NULL, NULL, fontChangeCallback, (XtPointer) i1); } (void) strcpy(buffer, (GETMESSAGE(NL_SETN_ViewMenu,9, "Default"))); fontSizeToggles[i1] = _DtTermViewCreateToggleButton(submenu, buffer, - NULL, NULL, NULL, defaultFontCallback, NULL); + 0, NULL, NULL, defaultFontCallback, NULL); fontSizeTogglesDefault = i1; ks = XStringToKeysym(GETMESSAGE(NL_SETN_ViewMenu,11, "F")); @@ -1400,13 +1402,13 @@ sizeChangeCallback(Widget w, XtPointer client_data, XtPointer call_data) DtTermViewWidget tw; Arg al[10]; int ac; - int i1; + long i1; _DtTermProcessLock(); tw = (DtTermViewWidget) currentWidget; _DtTermProcessUnlock(); - i1 = (int) client_data; + i1 = (long) client_data; ac = 0; if (tw->termview.sizeList.sizes[i1].columns > 0) { (void) XtSetArg(al[ac], DtNcolumns, @@ -1452,12 +1454,12 @@ fontChangeCallback(Widget w, XtPointer client_data, XtPointer call_data) XrmValue to; Arg al[10]; int ac; - int i1; + long i1; _DtTermProcessLock(); tw = (DtTermViewWidget) currentWidget; - i1 = (int) client_data; + i1 = (long) client_data; /* generate the fontlist from the font... */ from.size = strlen(fontArray[i1].fontName); @@ -1593,7 +1595,7 @@ void _DtTermViewSetUserFontListIndex ( Widget w, - int i1 + long i1 ) { DtTermViewWidget tw = (DtTermViewWidget) w; diff --git a/cde/lib/DtTerm/TermView/TermViewMenu.h b/cde/lib/DtTerm/TermView/TermViewMenu.h index 580250f6..d6fb3e9b 100644 --- a/cde/lib/DtTerm/TermView/TermViewMenu.h +++ b/cde/lib/DtTerm/TermView/TermViewMenu.h @@ -113,7 +113,7 @@ extern void _DtTermViewSetUserFontListIndex ( Widget w, - int i + long i ); #endif /* _Dt_TermViewMenu_h */ diff --git a/cde/lib/DtTerm/util/lineToData.c b/cde/lib/DtTerm/util/lineToData.c index 817f4770..c98e340f 100644 --- a/cde/lib/DtTerm/util/lineToData.c +++ b/cde/lib/DtTerm/util/lineToData.c @@ -33,6 +33,7 @@ static char rcs_id[] = "$XConsortium: lineToData.c /main/1 1996/04/21 19:20:58 d * (c) Copyright 1993, 1994 Novell, Inc. * */ +#include #include #include #include diff --git a/cde/programs/dtterm/DtTermMain.c b/cde/programs/dtterm/DtTermMain.c index 15daf1b7..910ae96e 100644 --- a/cde/programs/dtterm/DtTermMain.c +++ b/cde/programs/dtterm/DtTermMain.c @@ -37,6 +37,7 @@ static char rcs_id[] = "$TOG: DtTermMain.c /main/19 1999/09/17 13:26:34 mgreess #include #endif /* sun */ #include "TermHeader.h" +#include "TermPrim.h" #include "TermPrimDebug.h" #include #include