From b623f5953691b2a0614e6f1f4def86bdbb9a4113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Aug 2020 11:53:00 +0200 Subject: New upstream version 5.2.0Beta2.1 --- app/bin/misc.h | 87 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 28 deletions(-) (limited to 'app/bin/misc.h') diff --git a/app/bin/misc.h b/app/bin/misc.h index 2fb3359..2be0be2 100644 --- a/app/bin/misc.h +++ b/app/bin/misc.h @@ -44,6 +44,7 @@ typedef void (*addButtonCallBack_t)(void*); #define STR_SIZE (256) #define STR_SHORT_SIZE (80) #define STR_LONG_SIZE (1024) +#define STR_HUGE_SIZE (10240) #define CAST_AWAY_CONST (char*) @@ -68,15 +69,17 @@ extern long hideSelectionWindow; extern long labelWhen; extern long labelScale; extern long labelEnable; -extern long colorLayers; +extern long colorTrack; +extern long colorDraw; extern long carHotbarModeInx; extern DIST_T minLength; extern DIST_T connectDistance; extern ANGLE_T connectAngle; extern long twoRailScale; extern long mapScale; -extern long zoomCorner; +extern long constrainMain; extern long checkPtInterval; +extern long autosaveChkPoints; extern long liveMap; extern long preSelect; extern long hideTrainsInTunnels; @@ -91,8 +94,11 @@ extern DIST_T curScaleRatio; extern char * curScaleName; extern int enumerateMaxDescLen; extern long enableBalloonHelp; +extern long showFlexTrack; extern long hotBarLabels; extern long rightClickMode; +extern long selectMode; +extern long selectZero; extern void * commandContext; extern coOrd cmdMenuPos; #define MODE_DESIGN (0) @@ -136,6 +142,12 @@ extern long programMode; #define C_TEXT wActionText #define C_WUP wActionWheelUp #define C_WDOWN wActionWheelDown +#define C_LDOUBLE wActionLDownDouble +#define C_MODKEY wActionModKey +#define C_SCROLLUP wActionScrollUp +#define C_SCROLLDOWN wActionScrollDown +#define C_SCROLLLEFT wActionScrollLeft +#define C_SCROLLRIGHT wActionScrollRight #define C_INIT (wActionLast+1) #define C_START (wActionLast+2) #define C_REDRAW (wActionLast+3) @@ -146,6 +158,7 @@ extern long programMode; #define C_RCLICK (wActionLast+8) #define C_CMDMENU (wActionLast+9) #define C_FINISH (wActionLast+10) +#define C_UPDATE (wActionLast+11) #define C_CONTINUE (100) #define C_TERMINATE (101) @@ -180,7 +193,7 @@ extern wPos_t DlgSepFrmBottom; extern wWin_p mainW; extern wPos_t toolbarHeight; extern wIndex_t changed; -extern char message[STR_LONG_SIZE]; +extern char message[STR_HUGE_SIZE]; extern REGION_T curRegion; extern long paramVersion; extern coOrd zero; @@ -189,6 +202,7 @@ extern wButton_p undoB; extern wButton_p redoB; extern wButton_p zoomUpB; /** ZoomUp button on toolbar */ extern wButton_p zoomDownB; /** ZoomDown button on toolbar */ +extern wButton_p backgroundB; /** background visibility control */ // extern wButton_p easementB; extern wIndex_t checkPtMark; extern wMenu_p demoM; @@ -221,9 +235,11 @@ int NoticeMessage( char *, char*, char *, ... ); int NoticeMessage2( int, char *, char*, char *, ... ); void DoQuit( void ); +void FileIsChanged(void); char * ConvertFromEscapedText(const char * text); char * ConvertToEscapedText(const char * text); +int MagneticSnap( int state ); void wShow( wWin_p ); void wHide( wWin_p ); void CloseDemoWindows( void ); @@ -232,28 +248,34 @@ void SelectFont(); void CheckRoomSize( BOOL_T ); const char * GetBalloonHelpStr( char* ); +const char * GetCurCommandName( void ); void EnableCommands( void ); void Reset( void ); +wIndex_t GetCurrentCommand(void); +BOOL_T IsCurCommandSticky(void); void ResetIfNotSticky( void ); wBool_t DoCurCommand( wAction_t, coOrd ); void ConfirmReset( BOOL_T ); void LayoutToolBar( void * ); -#define IC_STICKY (1<<0) -#define IC_CANCEL (1<<1) -#define IC_MENU (1<<2) -#define IC_NORESTART (1<<3) -#define IC_SELECTED (1<<4) -#define IC_POPUP (1<<5) -#define IC_LCLICK (1<<6) -#define IC_RCLICK (1<<7) -#define IC_CMDMENU (1<<8) -#define IC_POPUP2 (1<<9) -#define IC_ABUT (1<<10) -#define IC_ACCLKEY (1<<11) -#define IC_MODETRAIN_TOO (1<<12) -#define IC_MODETRAIN_ONLY (1<<13) -#define IC_WANT_MOVE (1<<14) -#define IC_PLAYBACK_PUSH (1<<15) +#define IC_STICKY (1<<0) +#define IC_INITNOTSTICKY (1<<1) +#define IC_CANCEL (1<<2) +#define IC_MENU (1<<3) +#define IC_NORESTART (1<<4) +#define IC_SELECTED (1<<5) +#define IC_POPUP (1<<6) +#define IC_LCLICK (1<<7) +#define IC_RCLICK (1<<8) +#define IC_CMDMENU (1<<9) +#define IC_POPUP2 (1<<10) +#define IC_ABUT (1<<11) +#define IC_ACCLKEY (1<<12) +#define IC_MODETRAIN_TOO (1<<13) +#define IC_MODETRAIN_ONLY (1<<14) +#define IC_WANT_MOVE (1<<15) +#define IC_PLAYBACK_PUSH (1<<16) +#define IC_WANT_MODKEYS (1<<17) +#define IC_POPUP3 (1<<18) wIndex_t InitCommand( wMenu_p, procCommand_t, char *, char *, int, long, long ); void AddToolbarControl( wControl_p, long ); BOOL_T CommandEnabled( wIndex_t ); @@ -278,22 +300,25 @@ void InitDebug( char *, long * ); #define CHANGE_MAIN (1<<2) #define CHANGE_MAP (1<<4) #define CHANGE_GRID (1<<5) +#define CHANGE_BACKGROUND (1<<6) #define CHANGE_UNITS (1<<7) #define CHANGE_TOOLBAR (1<<8) #define CHANGE_CMDOPT (1<<9) #define CHANGE_LIMITS (1<<10) -#define CHANGE_ALL (CHANGE_SCALE|CHANGE_PARAMS|CHANGE_MAIN|CHANGE_MAP|CHANGE_UNITS|CHANGE_TOOLBAR|CHANGE_CMDOPT) +#define CHANGE_ALL (CHANGE_SCALE|CHANGE_PARAMS|CHANGE_MAIN|CHANGE_MAP|CHANGE_UNITS|CHANGE_TOOLBAR|CHANGE_CMDOPT|CHANGE_BACKGROUND) typedef void (*changeNotificationCallBack_t)( long ); void RegisterChangeNotification( changeNotificationCallBack_t ); void DoChangeNotification( long ); +wBool_t CheckHelpTopicExists(const char * topic); + /* foreign externs */ extern drawCmd_t mapD; extern STATUS_T CmdEnumerate( wAction_t, coOrd ); -wIndex_t modifyCmdInx; -wIndex_t joinCmdInx; -wIndex_t tunnelCmdInx; +extern wIndex_t modifyCmdInx; +extern wIndex_t joinCmdInx; +extern wIndex_t tunnelCmdInx; /* ctodesgn.c */ void InitNewTurn( wMenu_p m ); @@ -308,7 +333,7 @@ STATUS_T ModifyRuler( wAction_t, coOrd ); /* dialogs */ void OutputBitMap( void ); -wDrawColor snapGridColor; +extern wDrawColor snapGridColor; addButtonCallBack_t ColorInit( void ); addButtonCallBack_t PrefInit( void ); @@ -330,9 +355,8 @@ void InitSnapGridButtons( void ); void SnapGridEnable( void ); void SnapGridShow( void ); void MapWindowShow( int state ); -wMenuToggle_p snapGridEnableMI; -wMenuToggle_p snapGridShowMI; -wMenuToggle_p mapShowMI; +extern wMenuToggle_p snapGridEnableMI; +extern wMenuToggle_p snapGridShowMI; void ScaleLengthEnd( void ); void EnumerateList( long, FLOAT_T, char * ); @@ -343,6 +367,8 @@ void EnumerateEnd(void); void DoNote( void ); BOOL_T WriteMainNote( FILE * ); +BOOL_T ReadMainNote(char * line); + /* dbench.c */ long GetBenchData( long, long ); wIndex_t GetBenchListIndex( long ); @@ -360,7 +386,7 @@ long BenchOutputOption( long ); DIST_T BenchGetWidth( long ); /* dcustmgm.c */ -FILE * customMgmF; +extern FILE * customMgmF; #define CUSTMGM_DO_COPYTO (1) #define CUSTMGM_CAN_EDIT (2) #define CUSTMGM_DO_EDIT (3) @@ -389,6 +415,7 @@ void ContMgmLoad (wIcon_p,contMgmCallBack_p,void *); /* dlayer.c */ void LayerSetCounts(); +int FindUnusedLayer(unsigned int start); void DecrementLayerObjects(unsigned int index); void IncrementLayerObjects(unsigned int index); @@ -418,4 +445,8 @@ void InitCmdControl ( wMenu_p menu ); /* csensor.c */ void SensorMgmLoad ( void ); void InitCmdSensor ( wMenu_p menu ); +/* cmodify.c */ +STATUS_T CmdModify(wAction_t action,coOrd pos ); + + #endif -- cgit v1.2.3