diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 21:26:53 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 21:26:53 +0200 |
commit | df247efec654e512242e4f4f1b0212034f9e01fe (patch) | |
tree | 25c02e16957f3aa613af30c140fd8e8a3d52fda6 /app/bin/cnote.c | |
parent | d0b6a8a4ec298024f14f704f9e40a6f9d324ccf3 (diff) | |
parent | a5ade52caa489cf0a713e0f02b764000d203140e (diff) |
Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterHEADdebian/1%5.2.0Beta2.1-1master
Diffstat (limited to 'app/bin/cnote.c')
-rw-r--r-- | app/bin/cnote.c | 430 |
1 files changed, 50 insertions, 380 deletions
diff --git a/app/bin/cnote.c b/app/bin/cnote.c index 3cbd28d..0a015f1 100644 --- a/app/bin/cnote.c +++ b/app/bin/cnote.c @@ -1,5 +1,5 @@ /** \file cnote.c - * NOTE + * Main layout note */ /* XTrkCad - Model Railroad CAD @@ -21,26 +21,13 @@ */ #include <string.h> -#include "cundo.h" #include "custom.h" +#include "dynstring.h" #include "fileio.h" #include "i18n.h" +#include "misc.h" #include "param.h" -#include "track.h" -#include "utility.h" - -static TRKTYP_T T_NOTE = -1; - -static wDrawBitMap_p note_bm; -struct extraData { - coOrd pos; - char * text; -}; - -extern BOOL_T inDescribeCmd; - -#define NOTEHIDE "CNOTE HIDE" -#define NOTEDONE "CNOTE DONE" +#include "include/utf8convert.h" static char * mainText = NULL; static wWin_p noteW; @@ -54,18 +41,6 @@ static paramData_t notePLs[] = { static paramGroup_t notePG = { "note", 0, notePLs, sizeof notePLs/sizeof notePLs[0] }; -static track_p NewNote(wIndex_t index, coOrd p, long size) -{ - track_p t; - struct extraData * xx; - t = NewTrack(index, T_NOTE, 0, sizeof *xx); - xx = GetTrkExtraData(t); - xx->pos = p; - xx->text = (char*)MyMalloc((int)size + 2); - SetBoundingBox(t, p, p); - return t; -} - void ClearNote(void) { if (mainText) { @@ -82,12 +57,6 @@ static void NoteOk(void * junk) len = wTextGetSize(noteT); mainText = (char*)MyMalloc(len+2); wTextGetText(noteT, mainText, len); - - if (mainText[len-1] != '\n') { - mainText[len++] = '\n'; - } - - mainText[len] = '\0'; } wHide(noteW); @@ -98,7 +67,7 @@ void DoNote(void) { if (noteW == NULL) { noteW = ParamCreateDialog(¬ePG, MakeWindowTitle(_("Note")), _("Ok"), NoteOk, - NULL, FALSE, NULL, F_RESIZE, NULL); + wHide, FALSE, NULL, F_NOTTRANSIENT|F_RESIZE, NULL); } wTextClear(noteT); @@ -109,365 +78,66 @@ void DoNote(void) } - -/***************************************************************************** - * NOTE OBJECT - */ - -static void DrawNote(track_p t, drawCmd_p d, wDrawColor color) -{ - struct extraData *xx = GetTrkExtraData(t); - coOrd p[4]; - - if (d->scale >= 16) { - return; - } - - if ((d->funcs->options & wDrawOptTemp) == 0) { - DrawBitMap(d, xx->pos, note_bm, color); - } else { - DIST_T dist; - dist = 0.1*d->scale; - p[0].x = p[1].x = xx->pos.x-dist; - p[2].x = p[3].x = xx->pos.x+dist; - p[1].y = p[2].y = xx->pos.y-dist; - p[3].y = p[0].y = xx->pos.y+dist; - DrawLine(d, p[0], p[1], 0, color); - DrawLine(d, p[1], p[2], 0, color); - DrawLine(d, p[2], p[3], 0, color); - DrawLine(d, p[3], p[0], 0, color); - } -} - -static DIST_T DistanceNote(track_p t, coOrd * p) -{ - struct extraData *xx = GetTrkExtraData(t); - DIST_T d; - d = FindDistance(*p, xx->pos); - - if (d < 1.0) { - return d; - } - - return 100000.0; -} - - -static struct { - coOrd pos; - unsigned int layer; -} noteData; -typedef enum { OR, LY, TX } noteDesc_e; -static descData_t noteDesc[] = { - /*OR*/ { DESC_POS, N_("Position"), ¬eData.pos }, - /*LY*/ { DESC_LAYER, N_("Layer"), ¬eData.layer }, - /*TX*/ { DESC_TEXT, NULL, NULL }, - { DESC_NULL } -}; - -static void UpdateNote(track_p trk, int inx, descData_p descUpd, - BOOL_T needUndoStart) -{ - struct extraData *xx = GetTrkExtraData(trk); - - switch (inx) { - case OR: - xx->pos = noteData.pos; - SetBoundingBox(trk, xx->pos, xx->pos); - MainRedraw(); - break; - - case LY: - SetTrkLayer(trk, noteData.layer); - MainRedraw(); - break; - - case -1: - if (wTextGetModified((wText_p)noteDesc[TX].control0)) { - int len; - - if (needUndoStart) { - UndoStart(_("Change Track"), "Change Track"); - } - - UndoModify(trk); - MyFree(xx->text); - len = wTextGetSize((wText_p)noteDesc[TX].control0); - xx->text = (char*)MyMalloc(len+2); - wTextGetText((wText_p)noteDesc[TX].control0, xx->text, len); - - if (xx->text[len-1] != '\n') { - xx->text[len++] = '\n'; - } - - xx->text[len] = '\0'; - } - MainRedraw(); - break; - - default: - break; - } -} - - -static void DescribeNote(track_p trk, char * str, CSIZE_T len) -{ - struct extraData * xx = GetTrkExtraData(trk); - strcpy(str, _("Note: ")); - len -= strlen(_("Note: ")); - str += strlen(_("Note: ")); - strncpy(str, xx->text, len); - - for (; *str; str++) { - if (*str=='\n') { - *str = ' '; - } - } - - noteData.pos = xx->pos; - noteDesc[TX].valueP = xx->text; - noteDesc[OR].mode = 0; - noteDesc[TX].mode = 0; - noteDesc[LY].mode = DESC_NOREDRAW; - DoDescribe(_("Note"), trk, noteDesc, UpdateNote); -} - -static void DeleteNote(track_p t) -{ - struct extraData *xx = GetTrkExtraData(t); - - if (xx->text) { - MyFree(xx->text); - } -} - -static BOOL_T WriteNote(track_p t, FILE * f) +BOOL_T WriteMainNote(FILE* f) { - struct extraData *xx = GetTrkExtraData(t); - int len; - BOOL_T addNL = FALSE; BOOL_T rc = TRUE; - len = strlen(xx->text); - - if (xx->text[len-1] != '\n') { - len++; - addNL = TRUE; + char *noteText = mainText; + + if (noteText && *noteText) { +#ifdef WINDOWS + char *out = NULL; + if (RequiresConvToUTF8(mainText)) { + unsigned cnt = strlen(mainText) * 2 + 1; + out = MyMalloc(cnt); + wSystemToUTF8(mainText, out, cnt); + noteText = out; + } +#endif // WINDOWS + + + char * sText = ConvertToEscapedText( noteText ); + rc &= fprintf(f, "NOTE MAIN 0 0 0 0 0 \"%s\"\n", sText )>0; + MyFree( sText ); + +#ifdef WINDOWS + if (out) { + MyFree(out); + } +#endif // WINDOWS } - - rc &= fprintf(f, "NOTE %d %d 0 0 %0.6f %0.6f 0 %d\n", GetTrkIndex(t), - GetTrkLayer(t), - xx->pos.x, xx->pos.y, len)>0; - rc &= fprintf(f, "%s%s", xx->text, addNL?"\n":"")>0; - rc &= fprintf(f, " END\n")>0; return rc; } +/** + * Read the layout main note + * + * \param line complete NOTE statement + */ -static void ReadNote(char * line) +BOOL_T ReadMainNote(char *line) { - coOrd pos; - DIST_T elev; - CSIZE_T size; - char * cp; - struct extraData *xx; - wIndex_t index; - wIndex_t layer; - int lineCount; - - if (strncmp(line, "NOTE MAIN", 9) == 0) { - if (!GetArgs(line+9, paramVersion<3?"d":"0000d", &size)) { - return; - } + long size; + char * sNote = NULL; - if (mainText) { - MyFree(mainText); - } - - mainText = (char*)MyMalloc(size+2); - cp = mainText; - } else { - track_p t; - - if (!GetArgs(line+5, paramVersion<3?"XXpYd":paramVersion<9?"dL00pYd":"dL00pfd", - &index, &layer, &pos, &elev, &size)) { - return; - } - - t = NewNote(index, pos, size+2); - SetTrkLayer(t, layer); - xx = GetTrkExtraData(t); - cp = xx->text; - } - - lineCount = 0; - - while (1) { - int len; - line = GetNextLine(); - - if (strncmp(line, " END", 7) == 0) { - break; - } - - len = strlen(line); - - if (size > 0 && size < len) { - InputError("NOTE text overflow", TRUE); - size = -1; - } - - if (size > 0) { - if (lineCount != 0) { - strcat(cp, "\n"); - cp++; - size--; - } - - strcpy(cp, line); - cp += len; - size -= len; - } - - lineCount++; - } - - if (cp[-1] != '\n') { - *cp++ = '\n'; + if (!GetArgs(line + 9, + paramVersion < 3 ? "l" : + paramVersion < 12 ? "0000l": + "0000lq", &size, &sNote)) { + return FALSE; } - *cp = '\0'; -} - - -static void MoveNote(track_p trk, coOrd orig) -{ - struct extraData * xx = GetTrkExtraData(trk); - xx->pos.x += orig.x; - xx->pos.y += orig.y; - SetBoundingBox(trk, xx->pos, xx->pos); -} - - -static void RotateNote(track_p trk, coOrd orig, ANGLE_T angle) -{ - struct extraData * xx = GetTrkExtraData(trk); - Rotate(&xx->pos, orig, angle); - SetBoundingBox(trk, xx->pos, xx->pos); -} - -static void RescaleNote(track_p trk, FLOAT_T ratio) -{ - struct extraData * xx = GetTrkExtraData(trk); - xx->pos.x *= ratio; - xx->pos.y *= ratio; -} - - -static trackCmd_t noteCmds = { - "NOTE", - DrawNote, - DistanceNote, - DescribeNote, - DeleteNote, - WriteNote, - ReadNote, - MoveNote, - RotateNote, - RescaleNote, - NULL, /* audit */ - NULL, /* getAngle */ - NULL, /* split */ - NULL, /* traverse */ - NULL, /* enumerate */ - NULL /* redraw */ -}; - - -BOOL_T WriteMainNote(FILE* f) -{ - BOOL_T rc = TRUE; - - if (mainText && *mainText) { - rc &= fprintf(f, "NOTE MAIN 0 0 0 0 %lu\n", strlen(mainText))>0; - rc &= fprintf(f, "%s", mainText)>0; - rc &= fprintf(f, " END\n")>0; + if (mainText) { + MyFree(mainText); } - return rc; + if ( paramVersion < 12 ) + mainText = ReadMultilineText(); + else + mainText = sNote; + return TRUE; } -/***************************************************************************** - * NOTE COMMAND - */ - - - -static STATUS_T CmdNote(wAction_t action, coOrd pos) -{ - static coOrd oldPos; - track_p trk; - struct extraData * xx; - const char* tmpPtrText; - static int state_on = FALSE; - - switch (action) { - case C_START: - InfoMessage(_("Place a note on the layout")); - return C_CONTINUE; - - case C_DOWN: - state_on = TRUE; - oldPos = pos; - MainRedraw(); - return C_CONTINUE; - - case C_MOVE: - oldPos = pos; - MainRedraw(); - return C_CONTINUE; - break; - - case C_UP: - UndoStart(_("New Note"), "New Note"); - state_on = FALSE; - MainRedraw(); - trk = NewNote(-1, pos, 2); - DrawNewTrack(trk); - xx = GetTrkExtraData(trk); - tmpPtrText = _("Replace this text with your note"); - xx->text = (char*)MyMalloc(strlen(tmpPtrText) + 1); - strcpy(xx->text, tmpPtrText); - inDescribeCmd = TRUE; - DescribeNote(trk, message, sizeof message); - inDescribeCmd = FALSE; - return C_CONTINUE; - - case C_REDRAW: - if (state_on) DrawBitMap(&tempD, oldPos, note_bm, normalColor); - return C_CONTINUE; - - case C_CANCEL: - DescribeCancel(); - return C_CONTINUE; - } - - return C_INFO; -} - - -#include "bitmaps/note.xbm" -#include "bitmaps/cnote.xpm" - -void InitCmdNote(wMenu_p menu) +void InitCmdNote() { ParamRegister(¬ePG); - AddMenuButton(menu, CmdNote, "cmdNote", _("Note"), wIconCreatePixMap(cnote_xpm), - LEVEL0_50, IC_POPUP2, ACCL_NOTE, NULL); -} - -void InitTrkNote(void) -{ - note_bm = wDrawBitMapCreate(mainD.d, note_width, note_width, 8, 8, note_bits); - T_NOTE = InitObject(¬eCmds); } |