diff options
| author | NatsuDrag9 | 2018-06-15 15:39:36 +0530 |
|---|---|---|
| committer | NatsuDrag9 | 2018-06-15 15:39:36 +0530 |
| commit | f43bd6c34fc3bae64223806c90f431e6f70a5a0e (patch) | |
| tree | 30a677d50539e18393f8cc2ea9c5e967e5ca7888 | |
| parent | c05949bafcc68a09153201097f7e46103bdb8864 (diff) | |
| parent | 7ee6d232a84e011ce51313912fa547058985987c (diff) | |
| download | LDMicroGtk-f43bd6c34fc3bae64223806c90f431e6f70a5a0e.tar.gz LDMicroGtk-f43bd6c34fc3bae64223806c90f431e6f70a5a0e.tar.bz2 LDMicroGtk-f43bd6c34fc3bae64223806c90f431e6f70a5a0e.zip | |
Merged
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ldmicro/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ldmicro/draw.cpp | 1766 | ||||
| -rw-r--r-- | ldmicro/draw_outputdev.cpp | 283 | ||||
| -rw-r--r-- | ldmicro/includes/ldmicro.h | 5 | ||||
| -rw-r--r-- | ldmicro/ldmicro.cpp | 902 | ||||
| -rw-r--r-- | ldmicro/lib/linuxUI/linuxLD.cpp | 11 | ||||
| -rw-r--r-- | ldmicro/lib/linuxUI/linuxLD.h | 54 | ||||
| -rw-r--r-- | ldmicro/lib/linuxUI/linuxUI.cpp | 134 | ||||
| -rw-r--r-- | ldmicro/lib/linuxUI/linuxUI.h | 81 | ||||
| -rw-r--r-- | ldmicro/maincontrols.cpp | 164 | ||||
| -rw-r--r-- | ldmicro/miscutil.cpp | 3 |
12 files changed, 1891 insertions, 1514 deletions
@@ -7,3 +7,4 @@ /ldmicro/reg/results/* /ldmicro/includes/testMain.h LDMicro-linux-Workspace.code-workspace +ldmicro/reg/t.pl diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt index 49668a3..49d8405 100644 --- a/ldmicro/CMakeLists.txt +++ b/ldmicro/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF (MSVC) IF(UNIX) MESSAGE( STATUS "Initializing.." ) + add_definitions ("-w") add_definitions(-D__UNIX__) add_definitions(-DLDLANG_EN) use_cxx11() diff --git a/ldmicro/draw.cpp b/ldmicro/draw.cpp index ad70101..78232ba 100644 --- a/ldmicro/draw.cpp +++ b/ldmicro/draw.cpp @@ -69,182 +69,182 @@ BOOL ThisHighlighted; // return FALSE; // } -// //----------------------------------------------------------------------------- -// // Determine the width, in leaf element units, of a particular subcircuit. -// // The width of a leaf is 1, the width of a series circuit is the sum of -// // of the widths of its members, and the width of a parallel circuit is -// // the maximum of the widths of its members. -// //----------------------------------------------------------------------------- -// static int CountWidthOfElement(int which, void *elem, int soFar) -// { -// switch(which) { -// case ELEM_PLACEHOLDER: -// case ELEM_OPEN: -// case ELEM_SHORT: -// case ELEM_CONTACTS: -// case ELEM_TON: -// case ELEM_TOF: -// case ELEM_RTO: -// case ELEM_CTU: -// case ELEM_CTD: -// case ELEM_ONE_SHOT_RISING: -// case ELEM_ONE_SHOT_FALLING: -// case ELEM_EQU: -// case ELEM_NEQ: -// case ELEM_GRT: -// case ELEM_GEQ: -// case ELEM_LES: -// case ELEM_LEQ: -// case ELEM_UART_RECV: -// case ELEM_UART_SEND: -// return 1; - -// case ELEM_FORMATTED_STRING: -// return 2; - -// case ELEM_COMMENT: { -// if(soFar != 0) oops(); - -// ElemLeaf *l = (ElemLeaf *)elem; -// char tbuf[MAX_COMMENT_LEN]; - -// strcpy(tbuf, l->d.comment.str); -// char *b = strchr(tbuf, '\n'); - -// int len; -// if(b) { -// *b = '\0'; -// len = max(strlen(tbuf)-1, strlen(b+1)); -// } else { -// len = strlen(tbuf); -// } -// // round up, and allow space for lead-in -// len = (len + 7 + (POS_WIDTH-1)) / POS_WIDTH; -// return max(ColsAvailable, len); -// } -// case ELEM_CTC: -// case ELEM_RES: -// case ELEM_COIL: -// case ELEM_MOVE: -// case ELEM_SHIFT_REGISTER: -// case ELEM_LOOK_UP_TABLE: -// case ELEM_PIECEWISE_LINEAR: -// case ELEM_MASTER_RELAY: -// case ELEM_READ_ADC: -// case ELEM_SET_PWM: -// case ELEM_PERSIST: -// if(ColsAvailable - soFar > 1) { -// return ColsAvailable - soFar; -// } else { -// return 1; -// } - -// case ELEM_ADD: -// case ELEM_SUB: -// case ELEM_MUL: -// case ELEM_DIV: -// if(ColsAvailable - soFar > 2) { -// return ColsAvailable - soFar; -// } else { -// return 2; -// } - -// case ELEM_SERIES_SUBCKT: { -// // total of the width of the members -// int total = 0; -// int i; -// ElemSubcktSeries *s = (ElemSubcktSeries *)elem; -// for(i = 0; i < s->count; i++) { -// total += CountWidthOfElement(s->contents[i].which, -// s->contents[i].d.any, total+soFar); -// } -// return total; -// } - -// case ELEM_PARALLEL_SUBCKT: { -// // greatest of the width of the members -// int max = 0; -// int i; -// ElemSubcktParallel *p = (ElemSubcktParallel *)elem; -// for(i = 0; i < p->count; i++) { -// int w = CountWidthOfElement(p->contents[i].which, -// p->contents[i].d.any, soFar); -// if(w > max) { -// max = w; -// } -// } -// return max; -// } - -// default: -// oops(); -// } -// } - -// //----------------------------------------------------------------------------- -// // Determine the height, in leaf element units, of a particular subcircuit. -// // The height of a leaf is 1, the height of a parallel circuit is the sum of -// // of the heights of its members, and the height of a series circuit is the -// // maximum of the heights of its members. (This is the dual of the width -// // case.) -// //----------------------------------------------------------------------------- -// int CountHeightOfElement(int which, void *elem) -// { -// switch(which) { -// CASE_LEAF -// return 1; - -// case ELEM_PARALLEL_SUBCKT: { -// // total of the height of the members -// int total = 0; -// int i; -// ElemSubcktParallel *s = (ElemSubcktParallel *)elem; -// for(i = 0; i < s->count; i++) { -// total += CountHeightOfElement(s->contents[i].which, -// s->contents[i].d.any); -// } -// return total; -// } - -// case ELEM_SERIES_SUBCKT: { -// // greatest of the height of the members -// int max = 0; -// int i; -// ElemSubcktSeries *s = (ElemSubcktSeries *)elem; -// for(i = 0; i < s->count; i++) { -// int w = CountHeightOfElement(s->contents[i].which, -// s->contents[i].d.any); -// if(w > max) { -// max = w; -// } -// } -// return max; -// } +//----------------------------------------------------------------------------- +// Determine the width, in leaf element units, of a particular subcircuit. +// The width of a leaf is 1, the width of a series circuit is the sum of +// of the widths of its members, and the width of a parallel circuit is +// the maximum of the widths of its members. +//----------------------------------------------------------------------------- +static int CountWidthOfElement(int which, void *elem, int soFar) +{ + switch(which) { + case ELEM_PLACEHOLDER: + case ELEM_OPEN: + case ELEM_SHORT: + case ELEM_CONTACTS: + case ELEM_TON: + case ELEM_TOF: + case ELEM_RTO: + case ELEM_CTU: + case ELEM_CTD: + case ELEM_ONE_SHOT_RISING: + case ELEM_ONE_SHOT_FALLING: + case ELEM_EQU: + case ELEM_NEQ: + case ELEM_GRT: + case ELEM_GEQ: + case ELEM_LES: + case ELEM_LEQ: + case ELEM_UART_RECV: + case ELEM_UART_SEND: + return 1; + + case ELEM_FORMATTED_STRING: + return 2; + + case ELEM_COMMENT: { + if(soFar != 0) oops(); + + ElemLeaf *l = (ElemLeaf *)elem; + char tbuf[MAX_COMMENT_LEN]; + + strcpy(tbuf, l->d.comment.str); + char *b = strchr(tbuf, '\n'); + + int len; + if(b) { + *b = '\0'; + len = max(strlen(tbuf)-1, strlen(b+1)); + } else { + len = strlen(tbuf); + } + // round up, and allow space for lead-in + len = (len + 7 + (POS_WIDTH-1)) / POS_WIDTH; + return max(ColsAvailable, len); + } + case ELEM_CTC: + case ELEM_RES: + case ELEM_COIL: + case ELEM_MOVE: + case ELEM_SHIFT_REGISTER: + case ELEM_LOOK_UP_TABLE: + case ELEM_PIECEWISE_LINEAR: + case ELEM_MASTER_RELAY: + case ELEM_READ_ADC: + case ELEM_SET_PWM: + case ELEM_PERSIST: + if(ColsAvailable - soFar > 1) { + return ColsAvailable - soFar; + } else { + return 1; + } + + case ELEM_ADD: + case ELEM_SUB: + case ELEM_MUL: + case ELEM_DIV: + if(ColsAvailable - soFar > 2) { + return ColsAvailable - soFar; + } else { + return 2; + } + + case ELEM_SERIES_SUBCKT: { + // total of the width of the members + int total = 0; + int i; + ElemSubcktSeries *s = (ElemSubcktSeries *)elem; + for(i = 0; i < s->count; i++) { + total += CountWidthOfElement(s->contents[i].which, + s->contents[i].d.any, total+soFar); + } + return total; + } + + case ELEM_PARALLEL_SUBCKT: { + // greatest of the width of the members + int max = 0; + int i; + ElemSubcktParallel *p = (ElemSubcktParallel *)elem; + for(i = 0; i < p->count; i++) { + int w = CountWidthOfElement(p->contents[i].which, + p->contents[i].d.any, soFar); + if(w > max) { + max = w; + } + } + return max; + } + + default: + oops(); + } +} -// default: -// oops(); -// } -// } +//----------------------------------------------------------------------------- +// Determine the height, in leaf element units, of a particular subcircuit. +// The height of a leaf is 1, the height of a parallel circuit is the sum of +// of the heights of its members, and the height of a series circuit is the +// maximum of the heights of its members. (This is the dual of the width +// case.) +//----------------------------------------------------------------------------- +int CountHeightOfElement(int which, void *elem) +{ + switch(which) { + CASE_LEAF + return 1; + + case ELEM_PARALLEL_SUBCKT: { + // total of the height of the members + int total = 0; + int i; + ElemSubcktParallel *s = (ElemSubcktParallel *)elem; + for(i = 0; i < s->count; i++) { + total += CountHeightOfElement(s->contents[i].which, + s->contents[i].d.any); + } + return total; + } + + case ELEM_SERIES_SUBCKT: { + // greatest of the height of the members + int max = 0; + int i; + ElemSubcktSeries *s = (ElemSubcktSeries *)elem; + for(i = 0; i < s->count; i++) { + int w = CountHeightOfElement(s->contents[i].which, + s->contents[i].d.any); + if(w > max) { + max = w; + } + } + return max; + } + + default: + oops(); + } +} -// //----------------------------------------------------------------------------- -// // Determine the width, in leaf element units, of the widest row of the PLC -// // program (i.e. loop over all the rungs and find the widest). -// //----------------------------------------------------------------------------- -// int ProgCountWidestRow(void) -// { -// int i; -// int max = 0; -// int colsTemp = ColsAvailable; -// ColsAvailable = 0; -// for(i = 0; i < Prog.numRungs; i++) { -// int w = CountWidthOfElement(ELEM_SERIES_SUBCKT, Prog.rungs[i], 0); -// if(w > max) { -// max = w; -// } -// } -// ColsAvailable = colsTemp; -// return max; -// } +//----------------------------------------------------------------------------- +// Determine the width, in leaf element units, of the widest row of the PLC +// program (i.e. loop over all the rungs and find the widest). +//----------------------------------------------------------------------------- +int ProgCountWidestRow(void) +{ + int i; + int max = 0; + int colsTemp = ColsAvailable; + ColsAvailable = 0; + for(i = 0; i < Prog.numRungs; i++) { + int w = CountWidthOfElement(ELEM_SERIES_SUBCKT, Prog.rungs[i], 0); + if(w > max) { + max = w; + } + } + ColsAvailable = colsTemp; + return max; +} // //----------------------------------------------------------------------------- // // Draw a vertical wire one leaf element unit high up from (cx, cy), where cx @@ -355,716 +355,716 @@ BOOL ThisHighlighted; // } // } -// //----------------------------------------------------------------------------- -// // Draw a string, centred in the space of a single position, with en dashes on -// // the left and right coloured according to the powered state. Draws on the -// // middle line. -// //----------------------------------------------------------------------------- -// // static void CenterWithWires(int cx, int cy, char *str, BOOL before, BOOL after) -// // { -// // CenterWithWiresWidth(cx, cy, str, before, after, POS_WIDTH); -// // } +//----------------------------------------------------------------------------- +// Draw a string, centred in the space of a single position, with en dashes on +// the left and right coloured according to the powered state. Draws on the +// middle line. +//----------------------------------------------------------------------------- +// static void CenterWithWires(int cx, int cy, char *str, BOOL before, BOOL after) +// { +// CenterWithWiresWidth(cx, cy, str, before, after, POS_WIDTH); +// } -// //----------------------------------------------------------------------------- -// // Draw an end of line element (coil, RES, MOV, etc.). Special things about -// // an end of line element: we must right-justify it. -// //----------------------------------------------------------------------------- -// // static BOOL DrawEndOfLine(int which, ElemLeaf *leaf, int *cx, int *cy, -// // BOOL poweredBefore) -// // { -// // int cx0 = *cx, cy0 = *cy; - -// // BOOL poweredAfter = leaf->poweredAfter; - -// // int thisWidth; -// // switch(which) { -// // case ELEM_ADD: -// // case ELEM_SUB: -// // case ELEM_MUL: -// // case ELEM_DIV: -// // thisWidth = 2; -// // break; - -// // default: -// // thisWidth = 1; -// // break; -// // } - -// // NormText(); -// // PoweredText(poweredBefore); -// // while(*cx < (ColsAvailable-thisWidth)*POS_WIDTH) { -// // int gx = *cx/POS_WIDTH; -// // int gy = *cy/POS_HEIGHT; - -// // if(CheckBoundsUndoIfFails(gx, gy)) return FALSE; - -// // if(gx >= DISPLAY_MATRIX_X_SIZE) oops(); -// // DM_BOUNDS(gx, gy); -// // DisplayMatrix[gx][gy] = PADDING_IN_DISPLAY_MATRIX; -// // DisplayMatrixWhich[gx][gy] = ELEM_PADDING; - -// // int i; -// // for(i = 0; i < POS_WIDTH; i++) { -// // DrawChars(*cx + i, *cy + (POS_HEIGHT/2), "-"); -// // } -// // *cx += POS_WIDTH; -// // cx0 += POS_WIDTH; -// // } - -// // if(leaf == Selected && !InSimulationMode) { -// // EmphText(); -// // ThisHighlighted = TRUE; -// // } else { -// // ThisHighlighted = FALSE; -// // } - -// // switch(which) { -// // case ELEM_CTC: { -// // char buf[256]; -// // ElemCounter *c = &leaf->d.counter; -// // sprintf(buf, "{\x01""CTC\x02 0:%d}", c->max); - -// // CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); -// // break; -// // } -// // case ELEM_RES: { -// // ElemReset *r = &leaf->d.reset; -// // CenterWithSpaces(*cx, *cy, r->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, "{RES}", poweredBefore, poweredAfter); -// // break; -// // } -// // case ELEM_READ_ADC: { -// // ElemReadAdc *r = &leaf->d.readAdc; -// // CenterWithSpaces(*cx, *cy, r->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, "{READ ADC}", poweredBefore, -// // poweredAfter); -// // break; -// // } -// // case ELEM_SET_PWM: { -// // ElemSetPwm *s = &leaf->d.setPwm; -// // CenterWithSpaces(*cx, *cy, s->name, poweredAfter, TRUE); -// // char l[50]; -// // if(s->targetFreq >= 100000) { -// // sprintf(l, "{PWM %d kHz}", (s->targetFreq+500)/1000); -// // } else if(s->targetFreq >= 10000) { -// // sprintf(l, "{PWM %.1f kHz}", s->targetFreq/1000.0); -// // } else if(s->targetFreq >= 1000) { -// // sprintf(l, "{PWM %.2f kHz}", s->targetFreq/1000.0); -// // } else { -// // sprintf(l, "{PWM %d Hz}", s->targetFreq); -// // } -// // CenterWithWires(*cx, *cy, l, poweredBefore, -// // poweredAfter); -// // break; -// // } -// // case ELEM_PERSIST: -// // CenterWithSpaces(*cx, *cy, leaf->d.persist.var, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, "{PERSIST}", poweredBefore, poweredAfter); -// // break; - -// // case ELEM_MOVE: { -// // char top[256]; -// // char bot[256]; -// // ElemMove *m = &leaf->d.move; - -// // if((strlen(m->dest) > (POS_WIDTH - 9)) || -// // (strlen(m->src) > (POS_WIDTH - 9))) -// // { -// // CenterWithWires(*cx, *cy, TOO_LONG, poweredBefore, -// // poweredAfter); -// // break; -// // } - -// // strcpy(top, "{ }"); -// // memcpy(top+1, m->dest, strlen(m->dest)); -// // top[strlen(m->dest) + 3] = ':'; -// // top[strlen(m->dest) + 4] = '='; - -// // strcpy(bot, "{ \x01MOV\x02}"); -// // memcpy(bot+2, m->src, strlen(m->src)); - -// // CenterWithSpaces(*cx, *cy, top, poweredAfter, FALSE); -// // CenterWithWires(*cx, *cy, bot, poweredBefore, poweredAfter); -// // break; -// // } -// // case ELEM_MASTER_RELAY: -// // CenterWithWires(*cx, *cy, "{MASTER RLY}", poweredBefore, -// // poweredAfter); -// // break; - -// // case ELEM_SHIFT_REGISTER: { -// // char bot[MAX_NAME_LEN+20]; -// // memset(bot, ' ', sizeof(bot)); -// // bot[0] = '{'; -// // sprintf(bot+2, "%s0..%d", leaf->d.shiftRegister.name, -// // leaf->d.shiftRegister.stages-1); -// // bot[strlen(bot)] = ' '; -// // bot[13] = '}'; -// // bot[14] = '\0'; -// // CenterWithSpaces(*cx, *cy, "{\x01SHIFT REG\x02 }", -// // poweredAfter, FALSE); -// // CenterWithWires(*cx, *cy, bot, poweredBefore, poweredAfter); -// // break; -// // } -// // case ELEM_PIECEWISE_LINEAR: -// // case ELEM_LOOK_UP_TABLE: { -// // char top[MAX_NAME_LEN+20], bot[MAX_NAME_LEN+20]; -// // char *dest, *index, *str; -// // if(which == ELEM_PIECEWISE_LINEAR) { -// // dest = leaf->d.piecewiseLinear.dest; -// // index = leaf->d.piecewiseLinear.index; -// // str = "PWL"; -// // } else { -// // dest = leaf->d.lookUpTable.dest; -// // index = leaf->d.lookUpTable.index; -// // str = "LUT"; -// // } -// // memset(top, ' ', sizeof(top)); -// // top[0] = '{'; -// // sprintf(top+2, "%s :=", dest); -// // top[strlen(top)] = ' '; -// // top[13] = '}'; -// // top[14] = '\0'; -// // CenterWithSpaces(*cx, *cy, top, poweredAfter, FALSE); -// // memset(bot, ' ', sizeof(bot)); -// // bot[0] = '{'; -// // sprintf(bot+2, " %s[%s]", str, index); -// // bot[strlen(bot)] = ' '; -// // bot[13] = '}'; -// // bot[14] = '\0'; -// // CenterWithWires(*cx, *cy, bot, poweredBefore, poweredAfter); -// // break; -// // } -// // case ELEM_COIL: { -// // char buf[4]; -// // ElemCoil *c = &leaf->d.coil; - -// // buf[0] = '('; -// // if(c->negated) { -// // buf[1] = '/'; -// // } else if(c->setOnly) { -// // buf[1] = 'S'; -// // } else if(c->resetOnly) { -// // buf[1] = 'R'; -// // } else { -// // buf[1] = ' '; -// // } -// // buf[2] = ')'; -// // buf[3] = '\0'; - -// // CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); -// // break; -// // } -// // case ELEM_DIV: -// // case ELEM_MUL: -// // case ELEM_SUB: -// // case ELEM_ADD: { -// // char top[POS_WIDTH*2-3+2]; -// // char bot[POS_WIDTH*2-3]; - -// // memset(top, ' ', sizeof(top)-1); -// // top[0] = '{'; - -// // memset(bot, ' ', sizeof(bot)-1); -// // bot[0] = '{'; - -// // int lt = 1; -// // if(which == ELEM_ADD) { -// // memcpy(top+lt, "\x01""ADD\x02", 5); -// // } else if(which == ELEM_SUB) { -// // memcpy(top+lt, "\x01SUB\x02", 5); -// // } else if(which == ELEM_MUL) { -// // memcpy(top+lt, "\x01MUL\x02", 5); -// // } else if(which == ELEM_DIV) { -// // memcpy(top+lt, "\x01""DIV\x02", 5); -// // } else oops(); - -// // lt += 7; -// // memcpy(top+lt, leaf->d.math.dest, strlen(leaf->d.math.dest)); -// // lt += strlen(leaf->d.math.dest) + 2; -// // top[lt++] = ':'; -// // top[lt++] = '='; - -// // int lb = 2; -// // memcpy(bot+lb, leaf->d.math.op1, strlen(leaf->d.math.op1)); -// // lb += strlen(leaf->d.math.op1) + 1; -// // if(which == ELEM_ADD) { -// // bot[lb++] = '+'; -// // } else if(which == ELEM_SUB) { -// // bot[lb++] = '-'; -// // } else if(which == ELEM_MUL) { -// // bot[lb++] = '*'; -// // } else if(which == ELEM_DIV) { -// // bot[lb++] = '/'; -// // } else oops(); -// // lb++; -// // memcpy(bot+lb, leaf->d.math.op2, strlen(leaf->d.math.op2)); -// // lb += strlen(leaf->d.math.op2); - -// // int l = max(lb, lt - 2); -// // top[l+2] = '}'; top[l+3] = '\0'; -// // bot[l] = '}'; bot[l+1] = '\0'; - -// // int extra = 2*POS_WIDTH - FormattedStrlen(top); -// // PoweredText(poweredAfter); -// // DrawChars(*cx + (extra/2), *cy + (POS_HEIGHT/2) - 1, top); -// // CenterWithWiresWidth(*cx, *cy, bot, poweredBefore, poweredAfter, -// // 2*POS_WIDTH); - -// // *cx += POS_WIDTH; - -// // break; -// // } -// // default: -// // oops(); -// // break; -// // } - -// // *cx += POS_WIDTH; - -// // return poweredAfter; -// // } +//----------------------------------------------------------------------------- +// Draw an end of line element (coil, RES, MOV, etc.). Special things about +// an end of line element: we must right-justify it. +//----------------------------------------------------------------------------- +// static BOOL DrawEndOfLine(int which, ElemLeaf *leaf, int *cx, int *cy, +// BOOL poweredBefore) +// { +// int cx0 = *cx, cy0 = *cy; -// //----------------------------------------------------------------------------- -// // Draw a leaf element. Special things about a leaf: no need to recurse -// // further, and we must put it into the display matrix. -// //----------------------------------------------------------------------------- -// // static BOOL DrawLeaf(int which, ElemLeaf *leaf, int *cx, int *cy, -// // BOOL poweredBefore) -// // { -// // int cx0 = *cx, cy0 = *cy; -// // BOOL poweredAfter = leaf->poweredAfter; - -// // switch(which) { -// // case ELEM_COMMENT: { -// // char tbuf[MAX_COMMENT_LEN]; -// // char tlbuf[MAX_COMMENT_LEN+8]; - -// // strcpy(tbuf, leaf->d.comment.str); -// // char *b = strchr(tbuf, '\n'); - -// // if(b) { -// // if(b[-1] == '\r') b[-1] = '\0'; -// // *b = '\0'; -// // sprintf(tlbuf, "\x03 ; %s\x02", tbuf); -// // DrawChars(*cx, *cy + (POS_HEIGHT/2) - 1, tlbuf); -// // sprintf(tlbuf, "\x03 ; %s\x02", b+1); -// // DrawChars(*cx, *cy + (POS_HEIGHT/2), tlbuf); -// // } else { -// // sprintf(tlbuf, "\x03 ; %s\x02", tbuf); -// // DrawChars(*cx, *cy + (POS_HEIGHT/2) - 1, tlbuf); -// // } - -// // *cx += ColsAvailable*POS_WIDTH; -// // break; -// // } -// // case ELEM_PLACEHOLDER: { -// // NormText(); -// // CenterWithWiresWidth(*cx, *cy, "--", FALSE, FALSE, 2); -// // *cx += POS_WIDTH; -// // break; -// // } -// // case ELEM_CONTACTS: { -// // char buf[4]; -// // ElemContacts *c = &leaf->d.contacts; - -// // buf[0] = ']'; -// // buf[1] = c->negated ? '/' : ' '; -// // buf[2] = '['; -// // buf[3] = '\0'; - -// // CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); - -// // *cx += POS_WIDTH; -// // break; -// // } -// // { -// // char *s; -// // case ELEM_EQU: -// // s = "=="; goto cmp; -// // case ELEM_NEQ: -// // s = "/="; goto cmp; -// // case ELEM_GRT: -// // s = ">"; goto cmp; -// // case ELEM_GEQ: -// // s = ">="; goto cmp; -// // case ELEM_LES: -// // s = "<"; goto cmp; -// // case ELEM_LEQ: -// // s = "<="; goto cmp; -// // cmp: -// // char s1[POS_WIDTH+10], s2[POS_WIDTH+10]; -// // int l1, l2, lmax; - -// // l1 = 2 + 1 + strlen(s) + strlen(leaf->d.cmp.op1); -// // l2 = 2 + 1 + strlen(leaf->d.cmp.op2); -// // lmax = max(l1, l2); - -// // if(lmax < POS_WIDTH) { -// // memset(s1, ' ', sizeof(s1)); -// // s1[0] = '['; -// // s1[lmax-1] = ']'; -// // s1[lmax] = '\0'; -// // strcpy(s2, s1); -// // memcpy(s1+1, leaf->d.cmp.op1, strlen(leaf->d.cmp.op1)); -// // memcpy(s1+strlen(leaf->d.cmp.op1)+2, s, strlen(s)); -// // memcpy(s2+2, leaf->d.cmp.op2, strlen(leaf->d.cmp.op2)); -// // } else { -// // strcpy(s1, ""); -// // strcpy(s2, TOO_LONG); -// // } - -// // CenterWithSpaces(*cx, *cy, s1, poweredAfter, FALSE); -// // CenterWithWires(*cx, *cy, s2, poweredBefore, poweredAfter); - -// // *cx += POS_WIDTH; -// // break; -// // } -// // case ELEM_OPEN: -// // CenterWithWires(*cx, *cy, "+ +", poweredBefore, poweredAfter); -// // *cx += POS_WIDTH; -// // break; - -// // case ELEM_SHORT: -// // CenterWithWires(*cx, *cy, "+------+", poweredBefore, poweredAfter); -// // *cx += POS_WIDTH; -// // break; - -// // case ELEM_ONE_SHOT_RISING: -// // case ELEM_ONE_SHOT_FALLING: { -// // char *s1, *s2; -// // if(which == ELEM_ONE_SHOT_RISING) { -// // s1 = " _ "; -// // s2 = "[\x01OSR\x02_/ ]"; -// // } else if(which == ELEM_ONE_SHOT_FALLING) { -// // s1 = " _ "; -// // s2 = "[\x01OSF\x02 \\_]"; -// // } else oops(); - -// // CenterWithSpaces(*cx, *cy, s1, poweredAfter, FALSE); -// // CenterWithWires(*cx, *cy, s2, poweredBefore, poweredAfter); - -// // *cx += POS_WIDTH; -// // break; -// // } -// // case ELEM_CTU: -// // case ELEM_CTD: { -// // char *s; -// // if(which == ELEM_CTU) -// // s = "\x01""CTU\x02"; -// // else if(which == ELEM_CTD) -// // s = "\x01""CTD\x02"; -// // else oops(); - -// // char buf[256]; -// // ElemCounter *c = &leaf->d.counter; -// // sprintf(buf, "[%s >=%d]", s, c->max); - -// // CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); - -// // *cx += POS_WIDTH; -// // break; -// // } -// // case ELEM_RTO: -// // case ELEM_TON: -// // case ELEM_TOF: { -// // char *s; -// // if(which == ELEM_TON) -// // s = "\x01TON\x02"; -// // else if(which == ELEM_TOF) -// // s = "\x01TOF\x02"; -// // else if(which == ELEM_RTO) -// // s = "\x01RTO\x02"; -// // else oops(); - -// // char buf[256]; -// // ElemTimer *t = &leaf->d.timer; -// // if(t->delay >= 1000*1000) { -// // sprintf(buf, "[%s %.3f s]", s, t->delay/1000000.0); -// // } else if(t->delay >= 100*1000) { -// // sprintf(buf, "[%s %.1f ms]", s, t->delay/1000.0); -// // } else { -// // sprintf(buf, "[%s %.2f ms]", s, t->delay/1000.0); -// // } - -// // CenterWithSpaces(*cx, *cy, t->name, poweredAfter, TRUE); -// // CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); - -// // *cx += POS_WIDTH; -// // break; -// // } -// // case ELEM_FORMATTED_STRING: { -// // // Careful, string could be longer than fits in our space. -// // char str[POS_WIDTH*2]; -// // memset(str, 0, sizeof(str)); -// // char *srcStr = leaf->d.fmtdStr.string; -// // memcpy(str, srcStr, min(strlen(srcStr), POS_WIDTH*2 - 7)); - -// // char bot[100]; -// // sprintf(bot, "{\"%s\"}", str); - -// // int extra = 2*POS_WIDTH - strlen(leaf->d.fmtdStr.var); -// // PoweredText(poweredAfter); -// // NameText(); -// // DrawChars(*cx + (extra/2), *cy + (POS_HEIGHT/2) - 1, -// // leaf->d.fmtdStr.var); -// // BodyText(); - -// // CenterWithWiresWidth(*cx, *cy, bot, poweredBefore, poweredAfter, -// // 2*POS_WIDTH); -// // *cx += 2*POS_WIDTH; -// // break; -// // } -// // case ELEM_UART_RECV: -// // case ELEM_UART_SEND: -// // CenterWithWires(*cx, *cy, -// // (which == ELEM_UART_RECV) ? "{UART RECV}" : "{UART SEND}", -// // poweredBefore, poweredAfter); -// // CenterWithSpaces(*cx, *cy, leaf->d.uart.name, poweredAfter, TRUE); -// // *cx += POS_WIDTH; -// // break; - -// // default: -// // poweredAfter = DrawEndOfLine(which, leaf, cx, cy, poweredBefore); -// // break; -// // } - -// // // And now we can enter the element into the display matrix so that the -// // // UI routines know what element is at position (gx, gy) when the user -// // // clicks there, and so that we know where to put the cursor if this -// // // element is selected. - -// // // Don't use original cx0, as an end of line element might be further -// // // along than that. -// // cx0 = *cx - POS_WIDTH; - -// // int gx = cx0/POS_WIDTH; -// // int gy = cy0/POS_HEIGHT; -// // if(CheckBoundsUndoIfFails(gx, gy)) return FALSE; -// // DM_BOUNDS(gx, gy); - -// // DisplayMatrix[gx][gy] = leaf; -// // DisplayMatrixWhich[gx][gy] = which; - -// // int xadj = 0; -// // switch(which) { -// // case ELEM_ADD: -// // case ELEM_SUB: -// // case ELEM_MUL: -// // case ELEM_DIV: -// // case ELEM_FORMATTED_STRING: -// // DM_BOUNDS(gx-1, gy); -// // DisplayMatrix[gx-1][gy] = leaf; -// // DisplayMatrixWhich[gx-1][gy] = which; -// // xadj = POS_WIDTH*FONT_WIDTH; -// // break; -// // } - -// // if(which == ELEM_COMMENT) { -// // int i; -// // for(i = 0; i < ColsAvailable; i++) { -// // DisplayMatrix[i][gy] = leaf; -// // DisplayMatrixWhich[i][gy] = ELEM_COMMENT; -// // } -// // xadj = (ColsAvailable-1)*POS_WIDTH*FONT_WIDTH; -// // } - -// // int x0 = X_PADDING + cx0*FONT_WIDTH; -// // int y0 = Y_PADDING + cy0*FONT_HEIGHT; - -// // if(leaf->selectedState != SELECTED_NONE && leaf == Selected) { -// // SelectionActive = TRUE; -// // } -// // switch(leaf->selectedState) { -// // case SELECTED_LEFT: -// // Cursor.left = x0 + FONT_WIDTH - 4 - xadj; -// // Cursor.top = y0 - FONT_HEIGHT/2; -// // Cursor.width = 2; -// // Cursor.height = POS_HEIGHT*FONT_HEIGHT; -// // break; - -// // case SELECTED_RIGHT: -// // Cursor.left = x0 + (POS_WIDTH-1)*FONT_WIDTH - 5; -// // Cursor.top = y0 - FONT_HEIGHT/2; -// // Cursor.width = 2; -// // Cursor.height = POS_HEIGHT*FONT_HEIGHT; -// // break; - -// // case SELECTED_ABOVE: -// // Cursor.left = x0 + FONT_WIDTH/2 - xadj; -// // Cursor.top = y0 - 2; -// // Cursor.width = (POS_WIDTH-2)*FONT_WIDTH + xadj; -// // Cursor.height = 2; -// // break; - -// // case SELECTED_BELOW: -// // Cursor.left = x0 + FONT_WIDTH/2 - xadj; -// // Cursor.top = y0 + (POS_HEIGHT-1)*FONT_HEIGHT + -// // FONT_HEIGHT/2 - 2; -// // Cursor.width = (POS_WIDTH-2)*(FONT_WIDTH) + xadj; -// // Cursor.height = 2; -// // break; - -// // default: -// // break; -// // } - -// // return poweredAfter; -// // } +// BOOL poweredAfter = leaf->poweredAfter; -// //----------------------------------------------------------------------------- -// // Draw a particular subcircuit with its top left corner at *cx and *cy (in -// // characters). If it is a leaf element then just print it and return; else -// // loop over the elements of the subcircuit and call ourselves recursively. -// // At the end updates *cx and *cy. -// // -// // In simulation mode, returns TRUE the circuit is energized after the given -// // element, else FALSE. This is needed to colour all the wires correctly, -// // since the colouring indicates whether a wire is energized. -// //----------------------------------------------------------------------------- -// // BOOL DrawElement(int which, void *elem, int *cx, int *cy, BOOL poweredBefore) -// // { -// // BOOL poweredAfter; - -// // int cx0 = *cx, cy0 = *cy; -// // ElemLeaf *leaf = (ElemLeaf *)elem; - -// // SetBkColor(Hdc, InSimulationMode ? HighlightColours.simBg : -// // HighlightColours.bg); -// // NormText(); - -// // if(elem == Selected && !InSimulationMode) { -// // EmphText(); -// // ThisHighlighted = TRUE; -// // } else { -// // ThisHighlighted = FALSE; -// // } - -// // switch(which) { -// // case ELEM_SERIES_SUBCKT: { -// // int i; -// // ElemSubcktSeries *s = (ElemSubcktSeries *)elem; -// // poweredAfter = poweredBefore; -// // for(i = 0; i < s->count; i++) { -// // poweredAfter = DrawElement(s->contents[i].which, -// // s->contents[i].d.any, cx, cy, poweredAfter); -// // } -// // break; -// // } -// // case ELEM_PARALLEL_SUBCKT: { -// // int i; -// // ElemSubcktParallel *p = (ElemSubcktParallel *)elem; -// // int widthMax = CountWidthOfElement(which, elem, (*cx)/POS_WIDTH); -// // int heightMax = CountHeightOfElement(which, elem); - -// // poweredAfter = FALSE; - -// // int lowestPowered = -1; -// // int downBy = 0; -// // for(i = 0; i < p->count; i++) { -// // BOOL poweredThis; - -// // poweredThis = DrawElement(p->contents[i].which, -// // p->contents[i].d.any, cx, cy, poweredBefore); - -// // if(InSimulationMode) { -// // if(poweredThis) poweredAfter = TRUE; -// // PoweredText(poweredThis); -// // } - -// // while((*cx - cx0) < widthMax*POS_WIDTH) { -// // int gx = *cx/POS_WIDTH; -// // int gy = *cy/POS_HEIGHT; - -// // if(CheckBoundsUndoIfFails(gx, gy)) return FALSE; - -// // DM_BOUNDS(gx, gy); -// // DisplayMatrix[gx][gy] = PADDING_IN_DISPLAY_MATRIX; -// // DisplayMatrixWhich[gx][gy] = ELEM_PADDING; - -// // char buf[256]; -// // int j; -// // for(j = 0; j < POS_WIDTH; j++) { -// // buf[j] = '-'; -// // } -// // buf[j] = '\0'; -// // DrawChars(*cx, *cy + (POS_HEIGHT/2), buf); -// // *cx += POS_WIDTH; -// // } - -// // *cx = cx0; -// // int justDrewHeight = CountHeightOfElement(p->contents[i].which, -// // p->contents[i].d.any); -// // *cy += POS_HEIGHT*justDrewHeight; - -// // downBy += justDrewHeight; -// // if(poweredThis) { -// // lowestPowered = downBy - 1; -// // } -// // } -// // *cx = cx0 + POS_WIDTH*widthMax; -// // *cy = cy0; - -// // int j; -// // BOOL needWire; - -// // if(*cx/POS_WIDTH != ColsAvailable) { -// // needWire = FALSE; -// // for(j = heightMax - 1; j >= 1; j--) { -// // if(j <= lowestPowered) PoweredText(poweredAfter); -// // if(DisplayMatrix[*cx/POS_WIDTH - 1][*cy/POS_HEIGHT + j]) { -// // needWire = TRUE; -// // } -// // if(needWire) VerticalWire(*cx - 1, *cy + j*POS_HEIGHT); -// // } -// // // stupid special case -// // if(lowestPowered == 0 && InSimulationMode) { -// // EmphText(); -// // DrawChars(*cx - 1, *cy + (POS_HEIGHT/2), "+"); -// // } -// // } - -// // PoweredText(poweredBefore); -// // needWire = FALSE; -// // for(j = heightMax - 1; j >= 1; j--) { -// // if(DisplayMatrix[cx0/POS_WIDTH][*cy/POS_HEIGHT + j]) { -// // needWire = TRUE; -// // } -// // if(needWire) VerticalWire(cx0 - 1, *cy + j*POS_HEIGHT); -// // } - -// // break; -// // } -// // default: -// // poweredAfter = DrawLeaf(which, leaf, cx, cy, poweredBefore); -// // break; -// // } - - -// // NormText(); -// // return poweredAfter; -// // } +// int thisWidth; +// switch(which) { +// case ELEM_ADD: +// case ELEM_SUB: +// case ELEM_MUL: +// case ELEM_DIV: +// thisWidth = 2; +// break; -// //----------------------------------------------------------------------------- -// // Draw the rung that signals the end of the program. Kind of useless but -// // do it anyways, for convention. -// //----------------------------------------------------------------------------- -// // void DrawEndRung(int cx, int cy) -// // { -// // int i; -// // char *str = "[END]"; -// // int lead = (POS_WIDTH - strlen(str))/2; -// // ThisHighlighted = TRUE; -// // for(i = 0; i < lead; i++) { -// // DrawChars(cx + i, cy + (POS_HEIGHT/2), "-"); -// // } -// // DrawChars(cx + i, cy + (POS_HEIGHT/2), str); -// // i += strlen(str); -// // for(; i < ColsAvailable*POS_WIDTH; i++) { -// // DrawChars(cx + i, cy + (POS_HEIGHT/2), "-"); -// // } -// // } +// default: +// thisWidth = 1; +// break; +// } + +// NormText(); +// PoweredText(poweredBefore); +// while(*cx < (ColsAvailable-thisWidth)*POS_WIDTH) { +// int gx = *cx/POS_WIDTH; +// int gy = *cy/POS_HEIGHT; + +// if(CheckBoundsUndoIfFails(gx, gy)) return FALSE; + +// if(gx >= DISPLAY_MATRIX_X_SIZE) oops(); +// DM_BOUNDS(gx, gy); +// DisplayMatrix[gx][gy] = PADDING_IN_DISPLAY_MATRIX; +// DisplayMatrixWhich[gx][gy] = ELEM_PADDING; + +// int i; +// for(i = 0; i < POS_WIDTH; i++) { +// DrawChars(*cx + i, *cy + (POS_HEIGHT/2), "-"); +// } +// *cx += POS_WIDTH; +// cx0 += POS_WIDTH; +// } + +// if(leaf == Selected && !InSimulationMode) { +// EmphText(); +// ThisHighlighted = TRUE; +// } else { +// ThisHighlighted = FALSE; +// } + +// switch(which) { +// case ELEM_CTC: { +// char buf[256]; +// ElemCounter *c = &leaf->d.counter; +// sprintf(buf, "{\x01""CTC\x02 0:%d}", c->max); + +// CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); +// break; +// } +// case ELEM_RES: { +// ElemReset *r = &leaf->d.reset; +// CenterWithSpaces(*cx, *cy, r->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, "{RES}", poweredBefore, poweredAfter); +// break; +// } +// case ELEM_READ_ADC: { +// ElemReadAdc *r = &leaf->d.readAdc; +// CenterWithSpaces(*cx, *cy, r->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, "{READ ADC}", poweredBefore, +// poweredAfter); +// break; +// } +// case ELEM_SET_PWM: { +// ElemSetPwm *s = &leaf->d.setPwm; +// CenterWithSpaces(*cx, *cy, s->name, poweredAfter, TRUE); +// char l[50]; +// if(s->targetFreq >= 100000) { +// sprintf(l, "{PWM %d kHz}", (s->targetFreq+500)/1000); +// } else if(s->targetFreq >= 10000) { +// sprintf(l, "{PWM %.1f kHz}", s->targetFreq/1000.0); +// } else if(s->targetFreq >= 1000) { +// sprintf(l, "{PWM %.2f kHz}", s->targetFreq/1000.0); +// } else { +// sprintf(l, "{PWM %d Hz}", s->targetFreq); +// } +// CenterWithWires(*cx, *cy, l, poweredBefore, +// poweredAfter); +// break; +// } +// case ELEM_PERSIST: +// CenterWithSpaces(*cx, *cy, leaf->d.persist.var, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, "{PERSIST}", poweredBefore, poweredAfter); +// break; + +// case ELEM_MOVE: { +// char top[256]; +// char bot[256]; +// ElemMove *m = &leaf->d.move; + +// if((strlen(m->dest) > (POS_WIDTH - 9)) || +// (strlen(m->src) > (POS_WIDTH - 9))) +// { +// CenterWithWires(*cx, *cy, TOO_LONG, poweredBefore, +// poweredAfter); +// break; +// } + +// strcpy(top, "{ }"); +// memcpy(top+1, m->dest, strlen(m->dest)); +// top[strlen(m->dest) + 3] = ':'; +// top[strlen(m->dest) + 4] = '='; + +// strcpy(bot, "{ \x01MOV\x02}"); +// memcpy(bot+2, m->src, strlen(m->src)); + +// CenterWithSpaces(*cx, *cy, top, poweredAfter, FALSE); +// CenterWithWires(*cx, *cy, bot, poweredBefore, poweredAfter); +// break; +// } +// case ELEM_MASTER_RELAY: +// CenterWithWires(*cx, *cy, "{MASTER RLY}", poweredBefore, +// poweredAfter); +// break; + +// case ELEM_SHIFT_REGISTER: { +// char bot[MAX_NAME_LEN+20]; +// memset(bot, ' ', sizeof(bot)); +// bot[0] = '{'; +// sprintf(bot+2, "%s0..%d", leaf->d.shiftRegister.name, +// leaf->d.shiftRegister.stages-1); +// bot[strlen(bot)] = ' '; +// bot[13] = '}'; +// bot[14] = '\0'; +// CenterWithSpaces(*cx, *cy, "{\x01SHIFT REG\x02 }", +// poweredAfter, FALSE); +// CenterWithWires(*cx, *cy, bot, poweredBefore, poweredAfter); +// break; +// } +// case ELEM_PIECEWISE_LINEAR: +// case ELEM_LOOK_UP_TABLE: { +// char top[MAX_NAME_LEN+20], bot[MAX_NAME_LEN+20]; +// char *dest, *index, *str; +// if(which == ELEM_PIECEWISE_LINEAR) { +// dest = leaf->d.piecewiseLinear.dest; +// index = leaf->d.piecewiseLinear.index; +// str = "PWL"; +// } else { +// dest = leaf->d.lookUpTable.dest; +// index = leaf->d.lookUpTable.index; +// str = "LUT"; +// } +// memset(top, ' ', sizeof(top)); +// top[0] = '{'; +// sprintf(top+2, "%s :=", dest); +// top[strlen(top)] = ' '; +// top[13] = '}'; +// top[14] = '\0'; +// CenterWithSpaces(*cx, *cy, top, poweredAfter, FALSE); +// memset(bot, ' ', sizeof(bot)); +// bot[0] = '{'; +// sprintf(bot+2, " %s[%s]", str, index); +// bot[strlen(bot)] = ' '; +// bot[13] = '}'; +// bot[14] = '\0'; +// CenterWithWires(*cx, *cy, bot, poweredBefore, poweredAfter); +// break; +// } +// case ELEM_COIL: { +// char buf[4]; +// ElemCoil *c = &leaf->d.coil; + +// buf[0] = '('; +// if(c->negated) { +// buf[1] = '/'; +// } else if(c->setOnly) { +// buf[1] = 'S'; +// } else if(c->resetOnly) { +// buf[1] = 'R'; +// } else { +// buf[1] = ' '; +// } +// buf[2] = ')'; +// buf[3] = '\0'; + +// CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); +// break; +// } +// case ELEM_DIV: +// case ELEM_MUL: +// case ELEM_SUB: +// case ELEM_ADD: { +// char top[POS_WIDTH*2-3+2]; +// char bot[POS_WIDTH*2-3]; + +// memset(top, ' ', sizeof(top)-1); +// top[0] = '{'; + +// memset(bot, ' ', sizeof(bot)-1); +// bot[0] = '{'; + +// int lt = 1; +// if(which == ELEM_ADD) { +// memcpy(top+lt, "\x01""ADD\x02", 5); +// } else if(which == ELEM_SUB) { +// memcpy(top+lt, "\x01SUB\x02", 5); +// } else if(which == ELEM_MUL) { +// memcpy(top+lt, "\x01MUL\x02", 5); +// } else if(which == ELEM_DIV) { +// memcpy(top+lt, "\x01""DIV\x02", 5); +// } else oops(); + +// lt += 7; +// memcpy(top+lt, leaf->d.math.dest, strlen(leaf->d.math.dest)); +// lt += strlen(leaf->d.math.dest) + 2; +// top[lt++] = ':'; +// top[lt++] = '='; + +// int lb = 2; +// memcpy(bot+lb, leaf->d.math.op1, strlen(leaf->d.math.op1)); +// lb += strlen(leaf->d.math.op1) + 1; +// if(which == ELEM_ADD) { +// bot[lb++] = '+'; +// } else if(which == ELEM_SUB) { +// bot[lb++] = '-'; +// } else if(which == ELEM_MUL) { +// bot[lb++] = '*'; +// } else if(which == ELEM_DIV) { +// bot[lb++] = '/'; +// } else oops(); +// lb++; +// memcpy(bot+lb, leaf->d.math.op2, strlen(leaf->d.math.op2)); +// lb += strlen(leaf->d.math.op2); + +// int l = max(lb, lt - 2); +// top[l+2] = '}'; top[l+3] = '\0'; +// bot[l] = '}'; bot[l+1] = '\0'; + +// int extra = 2*POS_WIDTH - FormattedStrlen(top); +// PoweredText(poweredAfter); +// DrawChars(*cx + (extra/2), *cy + (POS_HEIGHT/2) - 1, top); +// CenterWithWiresWidth(*cx, *cy, bot, poweredBefore, poweredAfter, +// 2*POS_WIDTH); + +// *cx += POS_WIDTH; + +// break; +// } +// default: +// oops(); +// break; +// } + +// *cx += POS_WIDTH; + +// return poweredAfter; +// } + +//----------------------------------------------------------------------------- +// Draw a leaf element. Special things about a leaf: no need to recurse +// further, and we must put it into the display matrix. +//----------------------------------------------------------------------------- +// static BOOL DrawLeaf(int which, ElemLeaf *leaf, int *cx, int *cy, +// BOOL poweredBefore) +// { +// int cx0 = *cx, cy0 = *cy; +// BOOL poweredAfter = leaf->poweredAfter; + +// switch(which) { +// case ELEM_COMMENT: { +// char tbuf[MAX_COMMENT_LEN]; +// char tlbuf[MAX_COMMENT_LEN+8]; + +// strcpy(tbuf, leaf->d.comment.str); +// char *b = strchr(tbuf, '\n'); + +// if(b) { +// if(b[-1] == '\r') b[-1] = '\0'; +// *b = '\0'; +// sprintf(tlbuf, "\x03 ; %s\x02", tbuf); +// DrawChars(*cx, *cy + (POS_HEIGHT/2) - 1, tlbuf); +// sprintf(tlbuf, "\x03 ; %s\x02", b+1); +// DrawChars(*cx, *cy + (POS_HEIGHT/2), tlbuf); +// } else { +// sprintf(tlbuf, "\x03 ; %s\x02", tbuf); +// DrawChars(*cx, *cy + (POS_HEIGHT/2) - 1, tlbuf); +// } + +// *cx += ColsAvailable*POS_WIDTH; +// break; +// } +// case ELEM_PLACEHOLDER: { +// NormText(); +// CenterWithWiresWidth(*cx, *cy, "--", FALSE, FALSE, 2); +// *cx += POS_WIDTH; +// break; +// } +// case ELEM_CONTACTS: { +// char buf[4]; +// ElemContacts *c = &leaf->d.contacts; + +// buf[0] = ']'; +// buf[1] = c->negated ? '/' : ' '; +// buf[2] = '['; +// buf[3] = '\0'; + +// CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); + +// *cx += POS_WIDTH; +// break; +// } +// { +// char *s; +// case ELEM_EQU: +// s = "=="; goto cmp; +// case ELEM_NEQ: +// s = "/="; goto cmp; +// case ELEM_GRT: +// s = ">"; goto cmp; +// case ELEM_GEQ: +// s = ">="; goto cmp; +// case ELEM_LES: +// s = "<"; goto cmp; +// case ELEM_LEQ: +// s = "<="; goto cmp; +// cmp: +// char s1[POS_WIDTH+10], s2[POS_WIDTH+10]; +// int l1, l2, lmax; + +// l1 = 2 + 1 + strlen(s) + strlen(leaf->d.cmp.op1); +// l2 = 2 + 1 + strlen(leaf->d.cmp.op2); +// lmax = max(l1, l2); + +// if(lmax < POS_WIDTH) { +// memset(s1, ' ', sizeof(s1)); +// s1[0] = '['; +// s1[lmax-1] = ']'; +// s1[lmax] = '\0'; +// strcpy(s2, s1); +// memcpy(s1+1, leaf->d.cmp.op1, strlen(leaf->d.cmp.op1)); +// memcpy(s1+strlen(leaf->d.cmp.op1)+2, s, strlen(s)); +// memcpy(s2+2, leaf->d.cmp.op2, strlen(leaf->d.cmp.op2)); +// } else { +// strcpy(s1, ""); +// strcpy(s2, TOO_LONG); +// } + +// CenterWithSpaces(*cx, *cy, s1, poweredAfter, FALSE); +// CenterWithWires(*cx, *cy, s2, poweredBefore, poweredAfter); + +// *cx += POS_WIDTH; +// break; +// } +// case ELEM_OPEN: +// CenterWithWires(*cx, *cy, "+ +", poweredBefore, poweredAfter); +// *cx += POS_WIDTH; +// break; + +// case ELEM_SHORT: +// CenterWithWires(*cx, *cy, "+------+", poweredBefore, poweredAfter); +// *cx += POS_WIDTH; +// break; + +// case ELEM_ONE_SHOT_RISING: +// case ELEM_ONE_SHOT_FALLING: { +// char *s1, *s2; +// if(which == ELEM_ONE_SHOT_RISING) { +// s1 = " _ "; +// s2 = "[\x01OSR\x02_/ ]"; +// } else if(which == ELEM_ONE_SHOT_FALLING) { +// s1 = " _ "; +// s2 = "[\x01OSF\x02 \\_]"; +// } else oops(); + +// CenterWithSpaces(*cx, *cy, s1, poweredAfter, FALSE); +// CenterWithWires(*cx, *cy, s2, poweredBefore, poweredAfter); + +// *cx += POS_WIDTH; +// break; +// } +// case ELEM_CTU: +// case ELEM_CTD: { +// char *s; +// if(which == ELEM_CTU) +// s = "\x01""CTU\x02"; +// else if(which == ELEM_CTD) +// s = "\x01""CTD\x02"; +// else oops(); + +// char buf[256]; +// ElemCounter *c = &leaf->d.counter; +// sprintf(buf, "[%s >=%d]", s, c->max); + +// CenterWithSpaces(*cx, *cy, c->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); + +// *cx += POS_WIDTH; +// break; +// } +// case ELEM_RTO: +// case ELEM_TON: +// case ELEM_TOF: { +// char *s; +// if(which == ELEM_TON) +// s = "\x01TON\x02"; +// else if(which == ELEM_TOF) +// s = "\x01TOF\x02"; +// else if(which == ELEM_RTO) +// s = "\x01RTO\x02"; +// else oops(); + +// char buf[256]; +// ElemTimer *t = &leaf->d.timer; +// if(t->delay >= 1000*1000) { +// sprintf(buf, "[%s %.3f s]", s, t->delay/1000000.0); +// } else if(t->delay >= 100*1000) { +// sprintf(buf, "[%s %.1f ms]", s, t->delay/1000.0); +// } else { +// sprintf(buf, "[%s %.2f ms]", s, t->delay/1000.0); +// } + +// CenterWithSpaces(*cx, *cy, t->name, poweredAfter, TRUE); +// CenterWithWires(*cx, *cy, buf, poweredBefore, poweredAfter); + +// *cx += POS_WIDTH; +// break; +// } +// case ELEM_FORMATTED_STRING: { +// // Careful, string could be longer than fits in our space. +// char str[POS_WIDTH*2]; +// memset(str, 0, sizeof(str)); +// char *srcStr = leaf->d.fmtdStr.string; +// memcpy(str, srcStr, min(strlen(srcStr), POS_WIDTH*2 - 7)); + +// char bot[100]; +// sprintf(bot, "{\"%s\"}", str); + +// int extra = 2*POS_WIDTH - strlen(leaf->d.fmtdStr.var); +// PoweredText(poweredAfter); +// NameText(); +// DrawChars(*cx + (extra/2), *cy + (POS_HEIGHT/2) - 1, +// leaf->d.fmtdStr.var); +// BodyText(); + +// CenterWithWiresWidth(*cx, *cy, bot, poweredBefore, poweredAfter, +// 2*POS_WIDTH); +// *cx += 2*POS_WIDTH; +// break; +// } +// case ELEM_UART_RECV: +// case ELEM_UART_SEND: +// CenterWithWires(*cx, *cy, +// (which == ELEM_UART_RECV) ? "{UART RECV}" : "{UART SEND}", +// poweredBefore, poweredAfter); +// CenterWithSpaces(*cx, *cy, leaf->d.uart.name, poweredAfter, TRUE); +// *cx += POS_WIDTH; +// break; + +// default: +// poweredAfter = DrawEndOfLine(which, leaf, cx, cy, poweredBefore); +// break; +// } + +// // And now we can enter the element into the display matrix so that the +// // UI routines know what element is at position (gx, gy) when the user +// // clicks there, and so that we know where to put the cursor if this +// // element is selected. + +// // Don't use original cx0, as an end of line element might be further +// // along than that. +// cx0 = *cx - POS_WIDTH; + +// int gx = cx0/POS_WIDTH; +// int gy = cy0/POS_HEIGHT; +// if(CheckBoundsUndoIfFails(gx, gy)) return FALSE; +// DM_BOUNDS(gx, gy); + +// DisplayMatrix[gx][gy] = leaf; +// DisplayMatrixWhich[gx][gy] = which; + +// int xadj = 0; +// switch(which) { +// case ELEM_ADD: +// case ELEM_SUB: +// case ELEM_MUL: +// case ELEM_DIV: +// case ELEM_FORMATTED_STRING: +// DM_BOUNDS(gx-1, gy); +// DisplayMatrix[gx-1][gy] = leaf; +// DisplayMatrixWhich[gx-1][gy] = which; +// xadj = POS_WIDTH*FONT_WIDTH; +// break; +// } + +// if(which == ELEM_COMMENT) { +// int i; +// for(i = 0; i < ColsAvailable; i++) { +// DisplayMatrix[i][gy] = leaf; +// DisplayMatrixWhich[i][gy] = ELEM_COMMENT; +// } +// xadj = (ColsAvailable-1)*POS_WIDTH*FONT_WIDTH; +// } + +// int x0 = X_PADDING + cx0*FONT_WIDTH; +// int y0 = Y_PADDING + cy0*FONT_HEIGHT; + +// if(leaf->selectedState != SELECTED_NONE && leaf == Selected) { +// SelectionActive = TRUE; +// } +// switch(leaf->selectedState) { +// case SELECTED_LEFT: +// Cursor.left = x0 + FONT_WIDTH - 4 - xadj; +// Cursor.top = y0 - FONT_HEIGHT/2; +// Cursor.width = 2; +// Cursor.height = POS_HEIGHT*FONT_HEIGHT; +// break; + +// case SELECTED_RIGHT: +// Cursor.left = x0 + (POS_WIDTH-1)*FONT_WIDTH - 5; +// Cursor.top = y0 - FONT_HEIGHT/2; +// Cursor.width = 2; +// Cursor.height = POS_HEIGHT*FONT_HEIGHT; +// break; + +// case SELECTED_ABOVE: +// Cursor.left = x0 + FONT_WIDTH/2 - xadj; +// Cursor.top = y0 - 2; +// Cursor.width = (POS_WIDTH-2)*FONT_WIDTH + xadj; +// Cursor.height = 2; +// break; + +// case SELECTED_BELOW: +// Cursor.left = x0 + FONT_WIDTH/2 - xadj; +// Cursor.top = y0 + (POS_HEIGHT-1)*FONT_HEIGHT + +// FONT_HEIGHT/2 - 2; +// Cursor.width = (POS_WIDTH-2)*(FONT_WIDTH) + xadj; +// Cursor.height = 2; +// break; + +// default: +// break; +// } + +// return poweredAfter; +// } + +//----------------------------------------------------------------------------- +// Draw a particular subcircuit with its top left corner at *cx and *cy (in +// characters). If it is a leaf element then just print it and return; else +// loop over the elements of the subcircuit and call ourselves recursively. +// At the end updates *cx and *cy. +// +// In simulation mode, returns TRUE the circuit is energized after the given +// element, else FALSE. This is needed to colour all the wires correctly, +// since the colouring indicates whether a wire is energized. +//----------------------------------------------------------------------------- +BOOL DrawElement(int which, void *elem, int *cx, int *cy, BOOL poweredBefore) +{ +// BOOL poweredAfter; + +// int cx0 = *cx, cy0 = *cy; +// ElemLeaf *leaf = (ElemLeaf *)elem; + +// SetBkColor(Hdc, InSimulationMode ? HighlightColours.simBg : +// HighlightColours.bg); +// NormText(); + +// if(elem == Selected && !InSimulationMode) { +// EmphText(); +// ThisHighlighted = TRUE; +// } else { +// ThisHighlighted = FALSE; +// } + +// switch(which) { +// case ELEM_SERIES_SUBCKT: { +// int i; +// ElemSubcktSeries *s = (ElemSubcktSeries *)elem; +// poweredAfter = poweredBefore; +// for(i = 0; i < s->count; i++) { +// poweredAfter = DrawElement(s->contents[i].which, +// s->contents[i].d.any, cx, cy, poweredAfter); +// } +// break; +// } +// case ELEM_PARALLEL_SUBCKT: { +// int i; +// ElemSubcktParallel *p = (ElemSubcktParallel *)elem; +// int widthMax = CountWidthOfElement(which, elem, (*cx)/POS_WIDTH); +// int heightMax = CountHeightOfElement(which, elem); + +// poweredAfter = FALSE; + +// int lowestPowered = -1; +// int downBy = 0; +// for(i = 0; i < p->count; i++) { +// BOOL poweredThis; + +// poweredThis = DrawElement(p->contents[i].which, +// p->contents[i].d.any, cx, cy, poweredBefore); + +// if(InSimulationMode) { +// if(poweredThis) poweredAfter = TRUE; +// PoweredText(poweredThis); +// } + +// while((*cx - cx0) < widthMax*POS_WIDTH) { +// int gx = *cx/POS_WIDTH; +// int gy = *cy/POS_HEIGHT; + +// if(CheckBoundsUndoIfFails(gx, gy)) return FALSE; + +// DM_BOUNDS(gx, gy); +// DisplayMatrix[gx][gy] = PADDING_IN_DISPLAY_MATRIX; +// DisplayMatrixWhich[gx][gy] = ELEM_PADDING; + +// char buf[256]; +// int j; +// for(j = 0; j < POS_WIDTH; j++) { +// buf[j] = '-'; +// } +// buf[j] = '\0'; +// DrawChars(*cx, *cy + (POS_HEIGHT/2), buf); +// *cx += POS_WIDTH; +// } + +// *cx = cx0; +// int justDrewHeight = CountHeightOfElement(p->contents[i].which, +// p->contents[i].d.any); +// *cy += POS_HEIGHT*justDrewHeight; + +// downBy += justDrewHeight; +// if(poweredThis) { +// lowestPowered = downBy - 1; +// } +// } +// *cx = cx0 + POS_WIDTH*widthMax; +// *cy = cy0; + +// int j; +// BOOL needWire; + +// if(*cx/POS_WIDTH != ColsAvailable) { +// needWire = FALSE; +// for(j = heightMax - 1; j >= 1; j--) { +// if(j <= lowestPowered) PoweredText(poweredAfter); +// if(DisplayMatrix[*cx/POS_WIDTH - 1][*cy/POS_HEIGHT + j]) { +// needWire = TRUE; +// } +// if(needWire) VerticalWire(*cx - 1, *cy + j*POS_HEIGHT); +// } +// // stupid special case +// if(lowestPowered == 0 && InSimulationMode) { +// EmphText(); +// DrawChars(*cx - 1, *cy + (POS_HEIGHT/2), "+"); +// } +// } + +// PoweredText(poweredBefore); +// needWire = FALSE; +// for(j = heightMax - 1; j >= 1; j--) { +// if(DisplayMatrix[cx0/POS_WIDTH][*cy/POS_HEIGHT + j]) { +// needWire = TRUE; +// } +// if(needWire) VerticalWire(cx0 - 1, *cy + j*POS_HEIGHT); +// } + +// break; +// } +// default: +// poweredAfter = DrawLeaf(which, leaf, cx, cy, poweredBefore); +// break; +// } + + +// NormText(); +// return poweredAfter; +} + +//----------------------------------------------------------------------------- +// Draw the rung that signals the end of the program. Kind of useless but +// do it anyways, for convention. +//----------------------------------------------------------------------------- +void DrawEndRung(int cx, int cy) +{ +// int i; +// char *str = "[END]"; +// int lead = (POS_WIDTH - strlen(str))/2; +// ThisHighlighted = TRUE; +// for(i = 0; i < lead; i++) { +// DrawChars(cx + i, cy + (POS_HEIGHT/2), "-"); +// } +// DrawChars(cx + i, cy + (POS_HEIGHT/2), str); +// i += strlen(str); +// for(; i < ColsAvailable*POS_WIDTH; i++) { +// DrawChars(cx + i, cy + (POS_HEIGHT/2), "-"); +// } +} diff --git a/ldmicro/draw_outputdev.cpp b/ldmicro/draw_outputdev.cpp index e5aeda9..3788ff8 100644 --- a/ldmicro/draw_outputdev.cpp +++ b/ldmicro/draw_outputdev.cpp @@ -179,10 +179,9 @@ static void DrawCharsToScreen(int cx, int cy, char *str) //----------------------------------------------------------------------------- int ScreenColsAvailable(void) { - // RECT r; - // GetClientRect(MainWindow, &r); + int rw = gtk_widget_get_allocated_width (DrawWindow); - // return (r.right - (X_PADDING + X_RIGHT_PADDING)) / (POS_WIDTH*FONT_WIDTH); + return (rw - (X_PADDING + X_RIGHT_PADDING)) / (POS_WIDTH*FONT_WIDTH); } //----------------------------------------------------------------------------- @@ -193,13 +192,13 @@ int ScreenColsAvailable(void) //----------------------------------------------------------------------------- int ScreenRowsAvailable(void) { - // int adj; - // if(ScrollXOffsetMax == 0) { - // adj = 0; - // } else { - // adj = 18; - // } - // return (IoListTop - Y_PADDING - adj) / (POS_HEIGHT*FONT_HEIGHT); + int adj; + if(ScrollXOffsetMax == 0) { + adj = 0; + } else { + adj = 18; + } + return (IoListTop - Y_PADDING - adj) / (POS_HEIGHT*FONT_HEIGHT); } //----------------------------------------------------------------------------- @@ -207,18 +206,43 @@ int ScreenRowsAvailable(void) // cursor should go and fill in coordinates for BlinkCursor. Not allowed to // draw deeper than IoListTop, as we would run in to the I/O listbox. //----------------------------------------------------------------------------- -void PaintWindow(void) +void PaintWindow(HCRDC hcr) { + /* + cairo_set_source_rgb(cr, Cairo_R, Cairo_G, Cairo_G); + + cairo_select_font_face(cr, "Purisa", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + + cairo_set_font_size(cr, 20); + + cairo_move_to(cr, 20, height / 2.0); + cairo_show_text(cr, "-----------THIS IS A TEST DRAW----------"); + + cairo_fill (cr); + */ + + SetBkColor(DrawWindow, hcr, InSimulationMode ? HighlightColours.simBg : + HighlightColours.bg); + + SetTextColor(hcr, InSimulationMode ? HighlightColours.simRungNum : + HighlightColours.rungNum); + + SelectObject(hcr, FixedWidthFont); + + TextOut(hcr, 5, 100, "-------] [-------------------------------------------------------------------------------------------------------------------------------------------------{RES}-------", 14); // static HBITMAP BackBitmap; // static HDC BackDc; // static int BitmapWidth; - // ok(); + ok(); // RECT r; // GetClientRect(MainWindow, &r); - // int bw = r.right; - // int bh = IoListTop; + + int bw = gtk_widget_get_allocated_width (DrawWindow);// = r.right; + int bh = IoListTop; // HDC paintDc; // if(!BackDc) { @@ -239,103 +263,103 @@ void PaintWindow(void) // fi.right = BitmapWidth; fi.bottom = bh; // FillRect(Hdc, &fi, InSimulationMode ? SimBgBrush : BgBrush); - // // now figure out how we should draw the ladder logic - // ColsAvailable = ProgCountWidestRow(); - // if(ColsAvailable < ScreenColsAvailable()) { - // ColsAvailable = ScreenColsAvailable(); - // } - // memset(DisplayMatrix, 0, sizeof(DisplayMatrix)); - // SelectionActive = FALSE; - // memset(&Cursor, 0, sizeof(Cursor)); - - // DrawChars = DrawCharsToScreen; - - // int i; - // int cy = 0; - // int rowsAvailable = ScreenRowsAvailable(); - // for(i = 0; i < Prog.numRungs; i++) { - // int thisHeight = POS_HEIGHT*CountHeightOfElement(ELEM_SERIES_SUBCKT, - // Prog.rungs[i]); - - // // For speed, there is no need to draw everything all the time, but - // // we still must draw a bit above and below so that the DisplayMatrix - // // is filled in enough to make it possible to reselect using the - // // cursor keys. - // if(((cy + thisHeight) >= (ScrollYOffset - 8)*POS_HEIGHT) && - // (cy < (ScrollYOffset + rowsAvailable + 8)*POS_HEIGHT)) - // { - // SetBkColor(Hdc, InSimulationMode ? HighlightColours.simBg : - // HighlightColours.bg); - // SetTextColor(Hdc, InSimulationMode ? HighlightColours.simRungNum : - // HighlightColours.rungNum); - // SelectObject(Hdc, FixedWidthFont); - // int rung = i + 1; - // int y = Y_PADDING + FONT_HEIGHT*cy; - // int yp = y + FONT_HEIGHT*(POS_HEIGHT/2) - - // POS_HEIGHT*FONT_HEIGHT*ScrollYOffset; - - // if(rung < 10) { - // char r[1] = { rung + '0' }; - // TextOut(Hdc, 8 + FONT_WIDTH, yp, r, 1); - // } else { - // char r[2] = { (rung / 10) + '0', (rung % 10) + '0' }; - // TextOut(Hdc, 8, yp, r, 2); - // } - - // int cx = 0; - // DrawElement(ELEM_SERIES_SUBCKT, Prog.rungs[i], &cx, &cy, - // Prog.rungPowered[i]); - // } + /// now figure out how we should draw the ladder logic + ColsAvailable = ProgCountWidestRow(); + if(ColsAvailable < ScreenColsAvailable()) { + ColsAvailable = ScreenColsAvailable(); + } + memset(DisplayMatrix, 0, sizeof(DisplayMatrix)); + SelectionActive = FALSE; + memset(&Cursor, 0, sizeof(Cursor)); + + DrawChars = DrawCharsToScreen; + + int i; + int cy = 0; + int rowsAvailable = ScreenRowsAvailable(); + for(i = 0; i < Prog.numRungs; i++) { + int thisHeight = POS_HEIGHT*CountHeightOfElement(ELEM_SERIES_SUBCKT, + Prog.rungs[i]); + + // For speed, there is no need to draw everything all the time, but + // we still must draw a bit above and below so that the DisplayMatrix + // is filled in enough to make it possible to reselect using the + // cursor keys. + if(((cy + thisHeight) >= (ScrollYOffset - 8)*POS_HEIGHT) && + (cy < (ScrollYOffset + rowsAvailable + 8)*POS_HEIGHT)) + { + SetBkColor(DrawWindow, hcr, InSimulationMode ? HighlightColours.simBg : + HighlightColours.bg); + SetTextColor(hcr, InSimulationMode ? HighlightColours.simRungNum : + HighlightColours.rungNum); + SelectObject(hcr, FixedWidthFont); + int rung = i + 1; + int y = Y_PADDING + FONT_HEIGHT*cy; + int yp = y + FONT_HEIGHT*(POS_HEIGHT/2) - + POS_HEIGHT*FONT_HEIGHT*ScrollYOffset; + + if(rung < 10) { + char r[1] = { rung + '0' }; + TextOut(hcr, 8 + FONT_WIDTH, yp, r, 1); + } else { + char r[2] = { (rung / 10) + '0', (rung % 10) + '0' }; + TextOut(hcr, 8, yp, r, 2); + } + + // int cx = 0; + // // DrawElement(ELEM_SERIES_SUBCKT, Prog.rungs[i], &cx, &cy, + // // Prog.rungPowered[i]); + } - // cy += thisHeight; - // cy += POS_HEIGHT; - // } + cy += thisHeight; + cy += POS_HEIGHT; + } // cy -= 2; - // DrawEndRung(0, cy); + // // DrawEndRung(0, cy); // if(SelectedGxAfterNextPaint >= 0) { - // MoveCursorNear(SelectedGxAfterNextPaint, SelectedGyAfterNextPaint); - // InvalidateRect(MainWindow, NULL, FALSE); - // SelectedGxAfterNextPaint = -1; - // SelectedGyAfterNextPaint = -1; + // // MoveCursorNear(SelectedGxAfterNextPaint, SelectedGyAfterNextPaint); + // // InvalidateRect(MainWindow, NULL, FALSE); + // // SelectedGxAfterNextPaint = -1; + // // SelectedGyAfterNextPaint = -1; // } else if(ScrollSelectedIntoViewAfterNextPaint && Selected) { - // SelectElement(-1, -1, Selected->selectedState); - // ScrollSelectedIntoViewAfterNextPaint = FALSE; - // InvalidateRect(MainWindow, NULL, FALSE); + // // SelectElement(-1, -1, Selected->selectedState); + // // ScrollSelectedIntoViewAfterNextPaint = FALSE; + // // InvalidateRect(MainWindow, NULL, FALSE); // } else { // if(!SelectionActive) { // if(Prog.numRungs > 0) { - // if(MoveCursorTopLeft()) { - // InvalidateRect(MainWindow, NULL, FALSE); - // } + // // if(MoveCursorTopLeft()) { + // // InvalidateRect(MainWindow, NULL, FALSE); + // // } // } // } // } - // // draw the `buses' at either side of the screen - // r.left = X_PADDING - FONT_WIDTH; - // r.top = 0; - // r.right = r.left + 4; - // r.bottom = IoListTop; - // FillRect(Hdc, &r, InSimulationMode ? BusLeftBrush : BusBrush); + // /// draw the `buses' at either side of the screen + // // r.left = X_PADDING - FONT_WIDTH; + // // r.top = 0; + // // r.right = r.left + 4; + // // r.bottom = IoListTop; + // // FillRect(Hdc, &r, InSimulationMode ? BusLeftBrush : BusBrush); - // r.left += POS_WIDTH*FONT_WIDTH*ColsAvailable + 2; - // r.right += POS_WIDTH*FONT_WIDTH*ColsAvailable + 2; - // FillRect(Hdc, &r, InSimulationMode ? BusRightBus : BusBrush); + // // r.left += POS_WIDTH*FONT_WIDTH*ColsAvailable + 2; + // // r.right += POS_WIDTH*FONT_WIDTH*ColsAvailable + 2; + // // FillRect(Hdc, &r, InSimulationMode ? BusRightBus : BusBrush); // CursorDrawn = FALSE; - // BitBlt(paintDc, 0, 0, bw, bh, BackDc, ScrollXOffset, 0, SRCCOPY); + // // BitBlt(paintDc, 0, 0, bw, bh, BackDc, ScrollXOffset, 0, SRCCOPY); // if(InSimulationMode) { - // KillTimer(MainWindow, TIMER_BLINK_CURSOR); + // // KillTimer(MainWindow, TIMER_BLINK_CURSOR); // } else { - // KillTimer(MainWindow, TIMER_BLINK_CURSOR); - // BlinkCursor(NULL, 0, NULL, 0); - // SetTimer(MainWindow, TIMER_BLINK_CURSOR, 800, BlinkCursor); + // // KillTimer(MainWindow, TIMER_BLINK_CURSOR); + // // BlinkCursor(NULL, 0, NULL, 0); + // // SetTimer(MainWindow, TIMER_BLINK_CURSOR, 800, BlinkCursor); // } - // Hdc = paintDc; + // // Hdc = paintDc; // ok(); } @@ -378,52 +402,39 @@ static void SetSyntaxHighlightingColours(void) //----------------------------------------------------------------------------- void InitForDrawing(void) { - // SetSyntaxHighlightingColours(); - - // FixedWidthFont = CreateFont( - // FONT_HEIGHT, FONT_WIDTH, - // 0, 0, - // FW_REGULAR, - // FALSE, - // FALSE, - // FALSE, - // ANSI_CHARSET, - // OUT_DEFAULT_PRECIS, - // CLIP_DEFAULT_PRECIS, - // DEFAULT_QUALITY, - // FF_DONTCARE, - // "Lucida Console"); - - // FixedWidthFontBold = CreateFont( - // FONT_HEIGHT, FONT_WIDTH, - // 0, 0, - // FW_REGULAR, // the bold text renders funny under Vista - // FALSE, - // FALSE, - // FALSE, - // ANSI_CHARSET, - // OUT_DEFAULT_PRECIS, - // CLIP_DEFAULT_PRECIS, - // DEFAULT_QUALITY, - // FF_DONTCARE, - // "Lucida Console"); - - // LOGBRUSH lb; - // lb.lbStyle = BS_SOLID; - // lb.lbColor = HighlightColours.simBusRight; - // BusRightBus = CreateBrushIndirect(&lb); - - // lb.lbColor = HighlightColours.simBusLeft; - // BusLeftBrush = CreateBrushIndirect(&lb); - - // lb.lbColor = HighlightColours.bus; - // BusBrush = CreateBrushIndirect(&lb); - - // lb.lbColor = HighlightColours.bg; - // BgBrush = CreateBrushIndirect(&lb); - - // lb.lbColor = HighlightColours.simBg; - // SimBgBrush = CreateBrushIndirect(&lb); + DrawWindow = gtk_drawing_area_new (); + SetSyntaxHighlightingColours(); + + FixedWidthFont = CreateFont( + FONT_HEIGHT, FONT_WIDTH, + 0, + FW_REGULAR, + FALSE, + "Lucida Console"); + + FixedWidthFontBold = CreateFont( + FONT_HEIGHT, FONT_WIDTH, + 0, + FW_REGULAR, // the bold text renders funny under Vista + FALSE, + "Lucida Console"); + + LOGBRUSH lb; + lb.lbStyle = BS_SOLID; + lb.lbColor = HighlightColours.simBusRight; + BusRightBus = CreateBrushIndirect(&lb); + + lb.lbColor = HighlightColours.simBusLeft; + BusLeftBrush = CreateBrushIndirect(&lb); + + lb.lbColor = HighlightColours.bus; + BusBrush = CreateBrushIndirect(&lb); + + lb.lbColor = HighlightColours.bg; + BgBrush = CreateBrushIndirect(&lb); + + lb.lbColor = HighlightColours.simBg; + SimBgBrush = CreateBrushIndirect(&lb); } //----------------------------------------------------------------------------- diff --git a/ldmicro/includes/ldmicro.h b/ldmicro/includes/ldmicro.h index a36bd3c..6513078 100644 --- a/ldmicro/includes/ldmicro.h +++ b/ldmicro/includes/ldmicro.h @@ -588,7 +588,8 @@ void SetUndoEnabled(BOOL undoEnabled, BOOL redoEnabled); void RefreshScrollbars(void); extern HINSTANCE Instance; extern HWID MainWindow; -extern HDC Hdc; +extern HWID DrawWindow; +extern HCRDC Hdc; extern PlcProgram Prog; extern char CurrentSaveFile[MAX_PATH]; extern char CurrentCompileFile[MAX_PATH]; @@ -632,7 +633,7 @@ extern BOOL ThisHighlighted; // draw_outputdev.cpp extern void (*DrawChars)(int, int, char *); void CALLBACK BlinkCursor(HWND hwnd, UINT msg, UINT_PTR id, DWORD time); -void PaintWindow(void); +void PaintWindow(cairo_t *cr); void ExportDrawingAsText(char *file); void InitForDrawing(void); void SetUpScrollbars(BOOL *horizShown, SCROLLINFO *horiz, SCROLLINFO *vert); diff --git a/ldmicro/ldmicro.cpp b/ldmicro/ldmicro.cpp index fa2e17f..5773c3b 100644 --- a/ldmicro/ldmicro.cpp +++ b/ldmicro/ldmicro.cpp @@ -39,7 +39,8 @@ using namespace std; HINSTANCE Instance; HWID MainWindow; -HDC Hdc; +HWID DrawWindow; +HCRDC Hdc; // parameters used to capture the mouse when implementing our totally non- // general splitter control @@ -603,448 +604,577 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) // break; // case WM_SETFOCUS: - // InvalidateRect(MainWindow, NULL, FALSE); - // break; // case WM_PAINT: { - // PAINTSTRUCT ps; - // Hdc = BeginPaint(hwnd, &ps); - - // // This draws the schematic. - // PaintWindow(); - - // RECT r; - // // Fill around the scroll bars - // if(NeedHoriz) { - // r.top = IoListTop - ScrollHeight - 2; - // r.bottom = IoListTop - 2; - // FillRect(Hdc, &r, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); - // } - // GetClientRect(MainWindow, &r); - // r.left = r.right - ScrollWidth - 2; - // FillRect(Hdc, &r, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); - - // // Draw the splitter thing to grab to resize the I/O listview. - // GetClientRect(MainWindow, &r); - // r.top = IoListTop - 2; - // r.bottom = IoListTop; - // FillRect(Hdc, &r, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); - // r.top = IoListTop - 2; - // r.bottom = IoListTop - 1; - // FillRect(Hdc, &r, (HBRUSH)GetStockObject(WHITE_BRUSH)); - // r.top = IoListTop; - // r.bottom = IoListTop + 1; - // FillRect(Hdc, &r, (HBRUSH)GetStockObject(DKGRAY_BRUSH)); - - // EndPaint(hwnd, &ps); - // return 1; // } // case WM_KEYDOWN: { - // if(wParam == 'M') { - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // ToggleSimulationMode(); - // break; - // } - // } else if(wParam == VK_TAB) { - // SetFocus(IoList); - // BlinkCursor(0, 0, 0, 0); - // break; - // } else if(wParam == VK_F1) { - // ShowHelpDialog(FALSE); - // break; + // } + + // case WM_LBUTTONDBLCLK: { + // } + + // case WM_LBUTTONDOWN: { + // } + // case WM_MOUSEMOVE: { + // } + // case WM_MOUSEWHEEL: { + // } + + // case WM_SIZE: + + // case WM_NOTIFY: { + // NMHDR *h = (NMHDR *)lParam; + // if(h->hwndFrom == IoList) { + // IoListProc(h); // } + // return 0; + // } + // case WM_VSCROLL: - // if(InSimulationMode) { - // switch(wParam) { - // case ' ': - // SimulateOneCycle(TRUE); - // break; - - // case 'R': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) - // StartSimulation(); - // break; - - // case 'H': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) - // StopSimulation(); - // break; - - // case VK_DOWN: - // if(ScrollYOffset < ScrollYOffsetMax) - // ScrollYOffset++; - // RefreshScrollbars(); - // InvalidateRect(MainWindow, NULL, FALSE); - // break; - - // case VK_UP: - // if(ScrollYOffset > 0) - // ScrollYOffset--; - // RefreshScrollbars(); - // InvalidateRect(MainWindow, NULL, FALSE); - // break; - - // case VK_LEFT: - // ScrollXOffset -= FONT_WIDTH; - // if(ScrollXOffset < 0) ScrollXOffset = 0; - // RefreshScrollbars(); - // InvalidateRect(MainWindow, NULL, FALSE); - // break; - - // case VK_RIGHT: - // ScrollXOffset += FONT_WIDTH; - // if(ScrollXOffset >= ScrollXOffsetMax) - // ScrollXOffset = ScrollXOffsetMax; - // RefreshScrollbars(); - // InvalidateRect(MainWindow, NULL, FALSE); - // break; - - // case VK_RETURN: - // case VK_ESCAPE: - // ToggleSimulationMode(); - // break; - // } + // case WM_HSCROLL: + + // case WM_COMMAND: + // ProcessMenu(LOWORD(wParam)); + // InvalidateRect(MainWindow, NULL, FALSE); + // break; + + // case WM_CLOSE: + // case WM_DESTROY: + + // default: + // return DefWindowProc(hwnd, msg, wParam, lParam); + // } + + return 1; +} + +void LD_WM_Close_call(GtkWidget *widget, GdkEvent *event, gpointer user_data)//(HWND window) +{ + /* Handles: + * WM_CLOSE + */ + + FreezeWindowPos(MainWindow); + FreezeDWORD(IoListHeight); + + gtk_main_quit(); +} + +gboolean LD_WM_KeyDown_call(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + /* Handles: + * WM_KEYDOWN + */ + + switch(event->key.state) + { + case GDK_SHIFT_MASK: + g_print("SHIFT+"); + break; + case GDK_CONTROL_MASK: + g_print("CONTROL+"); + break; + } + + g_print("%c\n", (char)gdk_keyval_to_unicode(event->key.keyval)); + + // if(wParam == 'M') { + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // ToggleSimulationMode(); // break; // } + // } else if(wParam == VK_TAB) { + // SetFocus(IoList); + // BlinkCursor(0, 0, 0, 0); + // break; + // } else if(wParam == VK_F1) { + // ShowHelpDialog(FALSE); + // break; + // } - + // if(InSimulationMode) { // switch(wParam) { - // case VK_F5: - // CompileProgram(FALSE); + // case ' ': + // SimulateOneCycle(TRUE); // break; - // case VK_UP: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(PushRungUp()); - // } else { - // MoveCursorKeyboard(wParam); - // } + // case 'R': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) + // StartSimulation(); // break; - // case VK_DOWN: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(PushRungDown()); - // } else { - // MoveCursorKeyboard(wParam); - // } + // case 'H': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) + // StopSimulation(); // break; - // case VK_RIGHT: - // case VK_LEFT: - // MoveCursorKeyboard(wParam); + // case VK_DOWN: + // if(ScrollYOffset < ScrollYOffsetMax) + // ScrollYOffset++; + // RefreshScrollbars(); + // InvalidateRect(MainWindow, NULL, FALSE); // break; - // case VK_RETURN: - // CHANGING_PROGRAM(EditSelectedElement()); + // case VK_UP: + // if(ScrollYOffset > 0) + // ScrollYOffset--; + // RefreshScrollbars(); + // InvalidateRect(MainWindow, NULL, FALSE); // break; - // case VK_DELETE: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(DeleteSelectedRung()); - // } else { - // CHANGING_PROGRAM(DeleteSelectedFromProgram()); - // } + // case VK_LEFT: + // ScrollXOffset -= FONT_WIDTH; + // if(ScrollXOffset < 0) ScrollXOffset = 0; + // RefreshScrollbars(); + // InvalidateRect(MainWindow, NULL, FALSE); // break; - // case VK_OEM_1: - // CHANGING_PROGRAM(AddComment(_("--add comment here--"))); + // case VK_RIGHT: + // ScrollXOffset += FONT_WIDTH; + // if(ScrollXOffset >= ScrollXOffsetMax) + // ScrollXOffset = ScrollXOffsetMax; + // RefreshScrollbars(); + // InvalidateRect(MainWindow, NULL, FALSE); // break; - // case 'C': - // CHANGING_PROGRAM(AddContact()); + // case VK_RETURN: + // case VK_ESCAPE: + // ToggleSimulationMode(); // break; + // } + // break; + // } - // // TODO: rather country-specific here - // case VK_OEM_2: - // CHANGING_PROGRAM(AddEmpty(ELEM_ONE_SHOT_RISING)); - // break; - // case VK_OEM_5: - // CHANGING_PROGRAM(AddEmpty(ELEM_ONE_SHOT_FALLING)); - // break; + // switch(wParam) { + // case VK_F5: + // CompileProgram(FALSE); + // break; - // case 'L': - // CHANGING_PROGRAM(AddCoil()); - // break; + // case VK_UP: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(PushRungUp()); + // } else { + // MoveCursorKeyboard(wParam); + // } + // break; - // case 'R': - // CHANGING_PROGRAM(MakeResetOnlySelected()); - // break; + // case VK_DOWN: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(PushRungDown()); + // } else { + // MoveCursorKeyboard(wParam); + // } + // break; - // case 'E': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // ExportDialog(); - // } else { - // CHANGING_PROGRAM(AddReset()); - // } - // break; + // case VK_RIGHT: + // case VK_LEFT: + // MoveCursorKeyboard(wParam); + // break; - // case 'S': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // SaveProgram(); - // UpdateMainWindowTitleBar(); - // } else { - // CHANGING_PROGRAM(MakeSetOnlySelected()); - // } - // break; + // case VK_RETURN: + // CHANGING_PROGRAM(EditSelectedElement()); + // break; - // case 'N': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // if(CheckSaveUserCancels()) break; - // if(!ProgramChangedNotSaved) { - // int r = MessageBox(MainWindow, - // _("Start new program?"), - // "LDmicro", MB_YESNO | MB_DEFBUTTON2 | - // MB_ICONQUESTION); - // if(r == IDNO) break; - // } - // NewProgram(); - // strcpy(CurrentSaveFile, ""); - // strcpy(CurrentCompileFile, ""); - // GenerateIoListDontLoseSelection(); - // RefreshScrollbars(); - // UpdateMainWindowTitleBar(); - // } else { - // CHANGING_PROGRAM(NegateSelected()); - // } - // break; + // case VK_DELETE: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(DeleteSelectedRung()); + // } else { + // CHANGING_PROGRAM(DeleteSelectedFromProgram()); + // } + // break; - // case 'A': - // CHANGING_PROGRAM(MakeNormalSelected()); - // break; + // case VK_OEM_1: + // CHANGING_PROGRAM(AddComment(_("--add comment here--"))); + // break; - // case 'T': - // CHANGING_PROGRAM(AddTimer(ELEM_RTO)); - // break; + // case 'C': + // CHANGING_PROGRAM(AddContact()); + // break; - // case 'O': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // if(CheckSaveUserCancels()) break; - // OpenDialog(); - // } else { - // CHANGING_PROGRAM(AddTimer(ELEM_TON)); + // // TODO: rather country-specific here + // case VK_OEM_2: + // CHANGING_PROGRAM(AddEmpty(ELEM_ONE_SHOT_RISING)); + // break; + + // case VK_OEM_5: + // CHANGING_PROGRAM(AddEmpty(ELEM_ONE_SHOT_FALLING)); + // break; + + // case 'L': + // CHANGING_PROGRAM(AddCoil()); + // break; + + // case 'R': + // CHANGING_PROGRAM(MakeResetOnlySelected()); + // break; + + // case 'E': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // ExportDialog(); + // } else { + // CHANGING_PROGRAM(AddReset()); + // } + // break; + + // case 'S': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // SaveProgram(); + // UpdateMainWindowTitleBar(); + // } else { + // CHANGING_PROGRAM(MakeSetOnlySelected()); + // } + // break; + + // case 'N': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // if(CheckSaveUserCancels()) break; + // if(!ProgramChangedNotSaved) { + // int r = MessageBox(MainWindow, + // _("Start new program?"), + // "LDmicro", MB_YESNO | MB_DEFBUTTON2 | + // MB_ICONQUESTION); + // if(r == IDNO) break; // } - // break; + // NewProgram(); + // strcpy(CurrentSaveFile, ""); + // strcpy(CurrentCompileFile, ""); + // GenerateIoListDontLoseSelection(); + // RefreshScrollbars(); + // UpdateMainWindowTitleBar(); + // } else { + // CHANGING_PROGRAM(NegateSelected()); + // } + // break; - // case 'F': - // CHANGING_PROGRAM(AddTimer(ELEM_TOF)); - // break; + // case 'A': + // CHANGING_PROGRAM(MakeNormalSelected()); + // break; - // case 'U': - // CHANGING_PROGRAM(AddCounter(ELEM_CTU)); - // break; + // case 'T': + // CHANGING_PROGRAM(AddTimer(ELEM_RTO)); + // break; - // case 'I': - // CHANGING_PROGRAM(AddCounter(ELEM_CTD)); - // break; + // case 'O': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // if(CheckSaveUserCancels()) break; + // OpenDialog(); + // } else { + // CHANGING_PROGRAM(AddTimer(ELEM_TON)); + // } + // break; - // case 'J': - // CHANGING_PROGRAM(AddCounter(ELEM_CTC)); - // break; + // case 'F': + // CHANGING_PROGRAM(AddTimer(ELEM_TOF)); + // break; - // case 'M': - // CHANGING_PROGRAM(AddMove()); - // break; + // case 'U': + // CHANGING_PROGRAM(AddCounter(ELEM_CTU)); + // break; - // case 'P': - // CHANGING_PROGRAM(AddReadAdc()); - // break; + // case 'I': + // CHANGING_PROGRAM(AddCounter(ELEM_CTD)); + // break; - // case VK_OEM_PLUS: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(AddMath(ELEM_ADD)); - // } else { - // CHANGING_PROGRAM(AddCmp(ELEM_EQU)); - // } - // break; + // case 'J': + // CHANGING_PROGRAM(AddCounter(ELEM_CTC)); + // break; - // case VK_OEM_MINUS: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // } else { - // CHANGING_PROGRAM(AddMath(ELEM_SUB)); - // } - // break; + // case 'M': + // CHANGING_PROGRAM(AddMove()); + // break; - // case '8': - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(AddMath(ELEM_MUL)); - // } - // break; + // case 'P': + // CHANGING_PROGRAM(AddReadAdc()); + // break; - // case 'D': - // CHANGING_PROGRAM(AddMath(ELEM_DIV)); - // break; + // case VK_OEM_PLUS: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(AddMath(ELEM_ADD)); + // } else { + // CHANGING_PROGRAM(AddCmp(ELEM_EQU)); + // } + // break; - // case VK_OEM_PERIOD: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(AddCmp(ELEM_GRT)); - // } else { - // CHANGING_PROGRAM(AddCmp(ELEM_GEQ)); - // } - // break; + // case VK_OEM_MINUS: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // } else { + // CHANGING_PROGRAM(AddMath(ELEM_SUB)); + // } + // break; - // case VK_OEM_COMMA: - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(AddCmp(ELEM_LES)); - // } else { - // CHANGING_PROGRAM(AddCmp(ELEM_LEQ)); - // } - // break; + // case '8': + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(AddMath(ELEM_MUL)); + // } + // break; - // case 'V': - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(InsertRung(TRUE)); - // } - // break; + // case 'D': + // CHANGING_PROGRAM(AddMath(ELEM_DIV)); + // break; - // case '6': - // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { - // CHANGING_PROGRAM(InsertRung(FALSE)); - // } - // break; + // case VK_OEM_PERIOD: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(AddCmp(ELEM_GRT)); + // } else { + // CHANGING_PROGRAM(AddCmp(ELEM_GEQ)); + // } + // break; - // case 'Z': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // UndoUndo(); - // } - // break; + // case VK_OEM_COMMA: + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(AddCmp(ELEM_LES)); + // } else { + // CHANGING_PROGRAM(AddCmp(ELEM_LEQ)); + // } + // break; - // case 'Y': - // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { - // UndoRedo(); - // } - // break; + // case 'V': + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(InsertRung(TRUE)); + // } + // break; - // default: - // break; - // } - // if(wParam != VK_SHIFT && wParam != VK_CONTROL) { - // InvalidateRect(MainWindow, NULL, FALSE); - // } - // break; - // } + // case '6': + // if(GetAsyncKeyState(VK_SHIFT) & 0x8000) { + // CHANGING_PROGRAM(InsertRung(FALSE)); + // } + // break; - // case WM_LBUTTONDBLCLK: { - // int x = LOWORD(lParam); - // int y = HIWORD(lParam); - // if(InSimulationMode) { - // EditElementMouseDoubleclick(x, y); - // } else { - // CHANGING_PROGRAM(EditElementMouseDoubleclick(x, y)); - // } - // InvalidateRect(MainWindow, NULL, FALSE); - // break; - // } + // case 'Z': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // UndoUndo(); + // } + // break; - // case WM_LBUTTONDOWN: { - // int x = LOWORD(lParam); - // int y = HIWORD(lParam); - // if((y > (IoListTop - 9)) && (y < (IoListTop + 3))) { - // POINT pt; - // pt.x = x; pt.y = y; - // ClientToScreen(MainWindow, &pt); - // MouseY = pt.y; - // MouseHookHandle = SetWindowsHookEx(WH_MOUSE_LL, - // (HOOKPROC)MouseHook, Instance, 0); - // } - // if(!InSimulationMode) MoveCursorMouseClick(x, y); + // case 'Y': + // if(GetAsyncKeyState(VK_CONTROL) & 0x8000) { + // UndoRedo(); + // } + // break; - // SetFocus(MainWindow); + // default: + // break; + // } + // if(wParam != VK_SHIFT && wParam != VK_CONTROL) { // InvalidateRect(MainWindow, NULL, FALSE); - // break; // } - // case WM_MOUSEMOVE: { - // int x = LOWORD(lParam); - // int y = HIWORD(lParam); + // break; + return FALSE; +} - // if((y > (IoListTop - 9)) && (y < (IoListTop + 3))) { - // SetCursor(LoadCursor(NULL, IDC_SIZENS)); - // } else { - // SetCursor(LoadCursor(NULL, IDC_ARROW)); - // } - - // break; - // } - // case WM_MOUSEWHEEL: { - // if((GET_WHEEL_DELTA_WPARAM(wParam)) > 0) { - // VscrollProc(SB_LINEUP); - // } else { - // VscrollProc(SB_LINEDOWN); - // } - // break; - // } +gboolean LD_GTK_mouse_click_hook(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + /* Handles: + * WM_LBUTTONDBLCLK, WM_LBUTTONDOWN + */ - // case WM_SIZE: - // MainWindowResized(); - // break; + g_print("x = %f\n", event->button.x_root); + g_print("y = %f\n", event->button.y_root); + switch(event->button.type) + { + case GDK_BUTTON_PRESS:// To Do: run only for left click + // int x = LOWORD(lParam); + // int y = HIWORD(lParam); + // if((y > (IoListTop - 9)) && (y < (IoListTop + 3))) { + // POINT pt; + // pt.x = x; pt.y = y; + // ClientToScreen(MainWindow, &pt); + // MouseY = pt.y; + // MouseHookHandle = SetWindowsHookEx(WH_MOUSE_LL, + // (HOOKPROC)MouseHook, Instance, 0); + // } + // if(!InSimulationMode) MoveCursorMouseClick(x, y); + + // SetFocus(MainWindow); + // InvalidateRect(MainWindow, NULL, FALSE); + break; + case GDK_2BUTTON_PRESS: + // int x = LOWORD(lParam); + // int y = HIWORD(lParam); + // if(InSimulationMode) { + // EditElementMouseDoubleclick(x, y); + // } else { + // CHANGING_PROGRAM(EditElementMouseDoubleclick(x, y)); + // } + // InvalidateRect(MainWindow, NULL, FALSE); + break; - // case WM_NOTIFY: { - // NMHDR *h = (NMHDR *)lParam; - // if(h->hwndFrom == IoList) { - // IoListProc(h); - // } - // return 0; - // } - // case WM_VSCROLL: - // VscrollProc(wParam); - // break; + } + return FALSE; +} - // case WM_HSCROLL: - // HscrollProc(wParam); - // break; +gboolean LD_GTK_mouse_scroll_hook(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + /* Handles: + * WM_VSCROLL, WM_HSCROLL, WM_MOUSEWHEEL + */ - // case WM_COMMAND: - // ProcessMenu(LOWORD(wParam)); - // InvalidateRect(MainWindow, NULL, FALSE); - // break; + switch(event->scroll.direction) + { + case GDK_SCROLL_UP: + case GDK_SCROLL_DOWN: + // VscrollProc(wParam); + break; + case GDK_SCROLL_LEFT: + case GDK_SCROLL_RIGHT: + // HscrollProc(wParam); + break; + case GDK_SCROLL_SMOOTH: + // if((GET_WHEEL_DELTA_WPARAM(wParam)) > 0) { + // VscrollProc(SB_LINEUP); + // } else { + // VscrollProc(SB_LINEDOWN); + // } + // gdk_event_get_scroll_deltas (const GdkEvent *event, gdouble *delta_x, gdouble *delta_y); + break; - // case WM_CLOSE: - // case WM_DESTROY: - // if(CheckSaveUserCancels()) break; + } + return FALSE; +} - // PostQuitMessage(0); - // return 1; +gboolean LD_WM_MouseMove_call(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + /* Handles: + * WM_MOUSEMOVE + */ - // default: - // return DefWindowProc(hwnd, msg, wParam, lParam); + g_print("x = %f\n", event->button.x_root); + g_print("y = %f\n", event->button.y_root); + // int x = LOWORD(lParam); + // int y = HIWORD(lParam); + + // if((y > (IoListTop - 9)) && (y < (IoListTop + 3))) { + // SetCursor(LoadCursor(NULL, IDC_SIZENS)); + // } else { + // SetCursor(LoadCursor(NULL, IDC_ARROW)); // } + + // break; + return FALSE; +} - return 1; +gboolean LD_WM_Paint_call(HWID widget, HCRDC cr, gpointer data) +{ + /* Handles: + * WM_PAINT + */ + + g_print("draw called\n"); + + // guint width, height; + // GdkRGBA color; + // GtkStyleContext *context; + + // context = gtk_widget_get_style_context (widget); + + // width = gtk_widget_get_allocated_width (widget); + // height = gtk_widget_get_allocated_height (widget); + + // gtk_render_background (context, cr, 0, 0, width, height); + + // cairo_arc (cr, + // width / 2.0, height / 2.0, + // MIN (width, height) / 3.0, + // 0, 2 * G_PI); + + // gtk_style_context_get_color (context, + // gtk_style_context_get_state (context), + // &color); + // gdk_cairo_set_source_rgba (cr, &color); + + // cairo_fill (cr); + // static double Cairo_R = 0.0, Cairo_G = 0.0, Cairo_B = 0.0; + // cairo_set_source_rgb(cr, Cairo_R, Cairo_G, Cairo_G); + // Cairo_R = (Cairo_R+0.2 > 0.4) ? 0 : Cairo_R+0.2; + // Cairo_G = (Cairo_G+0.4 > 1.0) ? 0.4 : Cairo_G+0.4; + // Cairo_B = (Cairo_B+0.1 > 0.5) ? 0 : Cairo_B+0.1; + + // cairo_select_font_face(cr, "Purisa", + // CAIRO_FONT_SLANT_NORMAL, + // CAIRO_FONT_WEIGHT_BOLD); + + // cairo_set_font_size(cr, 20); + + // cairo_move_to(cr, 20, height / 2.0); + // cairo_show_text(cr, "-----------THIS IS A TEST DRAW----------"); + + // cairo_fill (cr); + + + // PAINTSTRUCT ps; + // Hdc = BeginPaint(hwnd, &ps); + + /// This draws the schematic. + PaintWindow(cr); + + // RECT r; + // // Fill around the scroll bars + // if(NeedHoriz) { + // r.top = IoListTop - ScrollHeight - 2; + // r.bottom = IoListTop - 2; + // FillRect(Hdc, &r, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); + // } + // GetClientRect(MainWindow, &r); + // r.left = r.right - ScrollWidth - 2; + // FillRect(Hdc, &r, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); + + // // Draw the splitter thing to grab to resize the I/O listview. + // GetClientRect(MainWindow, &r); + // r.top = IoListTop - 2; + // r.bottom = IoListTop; + // FillRect(Hdc, &r, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); + // r.top = IoListTop - 2; + // r.bottom = IoListTop - 1; + // FillRect(Hdc, &r, (HBRUSH)GetStockObject(WHITE_BRUSH)); + // r.top = IoListTop; + // r.bottom = IoListTop + 1; + // FillRect(Hdc, &r, (HBRUSH)GetStockObject(DKGRAY_BRUSH)); + + // EndPaint(hwnd, &ps); + + return FALSE; } -//----------------------------------------------------------------------------- -// Create our window class; nothing exciting. -//----------------------------------------------------------------------------- -static BOOL MakeWindowClass() +gboolean LD_WM_Destroy_call(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - WNDCLASSEX wc; - memset(&wc, 0, sizeof(wc)); - wc.cbSize = sizeof(wc); - - // wc.style = CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW | CS_OWNDC | - // CS_DBLCLKS; - // wc.lpfnWndProc = (WNDPROC)MainWndProc; - wc.hInstance = NULL; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - wc.lpszClassName = "LDmicro"; - // wc.lpszMenuName = Instance; - // wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hIcon = (HICON)LoadImage(Instance, LDMICRO_ICON, - IMAGE_ICON, 32, 32, 0); - wc.hIconSm = (HICON)LoadImage(Instance, LDMICRO_ICON, - IMAGE_ICON, 16, 16, 0);//MAKEINTRESOURCE(4000) - - return RegisterClassEx(&wc); + /* Handles: + * WM_DESTROY + */ + + // if(CheckSaveUserCancels()) break; + + // PostQuitMessage(0); + // return 1; + + return FALSE; } -void LDMicro_close(HWND window) +gboolean LD_WM_Size_call(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - FreezeWindowPos(MainWindow); - FreezeDWORD(IoListHeight); + /* Handles: + * WM_SIZE + */ - gtk_main_quit(); + // MainWindowResized(); + // break; + + return FALSE; } + +gboolean LD_WM_SetFocus_call(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + /* Handles: + * WM_SETFOCUS + */ + + // InvalidateRect(MainWindow, NULL, FALSE); + // break; + + return FALSE; +} + //----------------------------------------------------------------------------- // Entry point into the program. //----------------------------------------------------------------------------- @@ -1144,7 +1274,6 @@ int main(int argc, char** argv) MainHeap = HeapCreate(0, 1024*64, 0); - MakeWindowClass(); // MakeDialogBoxClass(); // MakeComponentListClass(); // MakeSmplDialogClass(); @@ -1152,23 +1281,42 @@ int main(int argc, char** argv) HMENU top = MakeMainWindowMenus(); /// Make main window - // WS_OVERLAPPED | WS_THICKFRAME | WS_CLIPCHILDREN | WS_MAXIMIZEBOX | - // WS_MINIMIZEBOX | WS_SYSMENU | WS_SIZEBOX - MainWindow = CreateWindowEx(0, "LDmicro", "", - 0, 10, 10, 800, 600, NULL, top, NULL, NULL); - g_signal_connect (MainWindow, "delete_event", G_CALLBACK (LDMicro_close), NULL); - + MainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(MainWindow), "LDmicro"); + gtk_window_set_default_size (GTK_WINDOW(MainWindow), 800, 600); + gtk_window_resize (GTK_WINDOW(MainWindow), 800, 600); + gtk_window_move(GTK_WINDOW(MainWindow), 10, 10); + gtk_widget_override_background_color(GTK_WIDGET(MainWindow), + GTK_STATE_FLAG_NORMAL, ((HBRUSH)GetStockObject(GREY_BRUSH))->getThis()); + gtk_window_set_default_icon(LoadImage(Instance, LDMICRO_ICON, + IMAGE_ICON, 32, 32, 0)); + gtk_window_set_icon(GTK_WINDOW(MainWindow), LoadImage(Instance, LDMICRO_ICON, + IMAGE_ICON, 32, 32, 0)); + /// Make main window - end + + InitForDrawing(); + ThawWindowPos(MainWindow); IoListHeight = 100; ThawDWORD(IoListHeight); - // InitCommonControls(); /// NOT USED, Only for windows - InitForDrawing(); - - MakeMainWindowControls(); + MakeMainWindowControls(); /// takes care of MakeMainWindowMenus() MainWindowResized(); // CHANGING_PROGRAM(ShowConfDialog()); MenuHandler(); + + /// Keyboard and mouse hooks equivalent to MainWndProc + g_signal_connect (MainWindow, "delete_event", G_CALLBACK (LD_WM_Close_call), NULL); + g_signal_connect (MainWindow, "key_press_event", G_CALLBACK (LD_WM_KeyDown_call), NULL); + g_signal_connect (MainWindow, "button_press_event", G_CALLBACK (LD_GTK_mouse_click_hook), NULL); + g_signal_connect (MainWindow, "scroll_event", G_CALLBACK (LD_GTK_mouse_scroll_hook), NULL); + g_signal_connect (MainWindow, "motion_notify_event", G_CALLBACK (LD_WM_MouseMove_call), NULL); + g_signal_connect (DrawWindow, "draw", G_CALLBACK (LD_WM_Paint_call), NULL); + g_signal_connect (MainWindow, "destroy_event", G_CALLBACK (LD_WM_Destroy_call), NULL); + g_signal_connect (MainWindow, "configure_event", G_CALLBACK (LD_WM_Size_call), NULL); + g_signal_connect (MainWindow, "focus_in_event", G_CALLBACK (LD_WM_SetFocus_call), NULL); + /// Keyboard and mouse hooks equivalent to MainWndProc - end + // NewProgram(); // strcpy(CurrentSaveFile, ""); diff --git a/ldmicro/lib/linuxUI/linuxLD.cpp b/ldmicro/lib/linuxUI/linuxLD.cpp index ce9899b..cdeb190 100644 --- a/ldmicro/lib/linuxUI/linuxLD.cpp +++ b/ldmicro/lib/linuxUI/linuxLD.cpp @@ -1,7 +1,6 @@ #include "linuxUI.h" std::vector<HEAPRECORD> HeapRecords; -std::vector<WNDCLASSEX> WindClassRecord; HANDLE HeapCreate(DWORD flOptions, SIZE_T dwInitialSize, SIZE_T dwMaximumSize) { @@ -100,13 +99,7 @@ BOOL HeapFree(HANDLE hHeap, DWORD dwFlags, LPVOID lpMem) } -BOOL RegisterClassEx(const WNDCLASSEX *lpwcx) -{ - WindClassRecord.push_back(*lpwcx); - return TRUE; -} - -HANDLE LoadImage(HINSTANCE hinst, LPCTSTR lpszName, UINT uType, int cxDesired, +HICON LoadImage(HINSTANCE hinst, LPCTSTR lpszName, UINT uType, int cxDesired, int cyDesired, UINT fuLoad) { HICON pixbuf; @@ -118,7 +111,7 @@ HANDLE LoadImage(HINSTANCE hinst, LPCTSTR lpszName, UINT uType, int cxDesired, g_error_free(error); } - return (HANDLE) pixbuf; + return pixbuf; } void OutputDebugString(char* str) diff --git a/ldmicro/lib/linuxUI/linuxLD.h b/ldmicro/lib/linuxUI/linuxLD.h index 25d42bb..5f8e0e7 100644 --- a/ldmicro/lib/linuxUI/linuxLD.h +++ b/ldmicro/lib/linuxUI/linuxLD.h @@ -4,6 +4,7 @@ #include "linuxUI.h" #include <ctype.h> #include <vector> +#include <math.h> #include <algorithm> #include <sys/mman.h> @@ -19,7 +20,10 @@ /// Image loading flags #define IMAGE_ICON 1 -#define LDMICRO_ICON "ldmicro.ico" +#define LDMICRO_ICON "../ldmicro.ico" + +/// Macro functions +#define max(_A, _B) std::max(_A, _B) /// Typedefs //typedef int64_t __int64; @@ -54,14 +58,14 @@ typedef CHAR *LPSTR; typedef void *PVOID; typedef void *LPVOID; -typedef PVOID HFONT; typedef PVOID HMODULE; typedef PVOID HHOOK; -typedef PVOID HFONT; typedef PVOID HANDLE; typedef HANDLE HINSTANCE; -typedef HANDLE HDC; +typedef HANDLE HGDIOBJ; + +typedef cairo_t *HCRDC; typedef GtkWidget *HWID; typedef GtkWidget *HMENU; typedef GtkWindow *HWND; @@ -106,6 +110,14 @@ typedef class tagColorReferance: public GdkRGBA{ this->alpha = 1.0; } + // tagColorReferance(tagColorReferance &refCpy) + // { + // this->red = refCpy.red; + // this->green = refCpy.green; + // this->blue = refCpy.blue; + // this->alpha = refCpy.alpha; + // } + GdkRGBA* getThis() { return this; @@ -143,25 +155,23 @@ typedef struct tagNMHDR { UINT code; } NMHDR; -typedef struct tagWNDCLASSEX { - UINT cbSize; - UINT style; -// WNDPROC lpfnWndProc; - int cbClsExtra; - int cbWndExtra; - HINSTANCE hInstance; - HICON hIcon; -// HCURSOR hCursor; - HBRUSH hbrBackground; - LPCTSTR lpszMenuName; - LPCTSTR lpszClassName; - HICON hIconSm; -} WNDCLASSEX, *PWNDCLASSEX; - +typedef struct FontTag { + int nHeight; + int nWidth; + int nOrientation; + int fnWeight; + DWORD fdwItalic; + LPCTSTR lpszFace; +} *HFONT, FONT; + +typedef struct tagLOGBRUSH { + UINT lbStyle; + COLORREF lbColor; +// ULONG_PTR lbHatch; +} LOGBRUSH, *PLOGBRUSH; /// Variables extern std::vector<HEAPRECORD> HeapRecord; -extern std::vector<WNDCLASSEX> WindClassRecord; /// Functions HANDLE HeapCreate( @@ -179,9 +189,7 @@ BOOL HeapFree( DWORD dwFlags, LPVOID lpMem); -BOOL RegisterClassEx(const WNDCLASSEX *lpwcx); - -HANDLE LoadImage( +HICON LoadImage( HINSTANCE hinst, LPCTSTR lpszName, UINT uType, diff --git a/ldmicro/lib/linuxUI/linuxUI.cpp b/ldmicro/lib/linuxUI/linuxUI.cpp index 670e864..bbaa001 100644 --- a/ldmicro/lib/linuxUI/linuxUI.cpp +++ b/ldmicro/lib/linuxUI/linuxUI.cpp @@ -33,19 +33,6 @@ COLORREF RGB(int red, int green, int blue) return col; } -HBRUSH GetStockObject(int fnObject) -{ - switch(fnObject) - { - case BLACK_BRUSH: - return new COLORREF(0, 0, 0); - break; - - default: - return new COLORREF(255, 255, 255); - } -} - int MessageBox(HWID pWindow, char* message, char* title, UINT mFlags) { GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT; @@ -97,6 +84,7 @@ int MessageBox(HWID pWindow, char* message, char* title, UINT mFlags) return result; } + BOOL GetSaveFileName(OPENFILENAME *ofn) { GtkWidget *dialog; @@ -195,38 +183,98 @@ void CheckMenuItem(HMENU MenuName, HMENU MenuItem, UINT Check) } } -HWID CreateWindowEx(DWORD dwExStyle, LPCTSTR lpClassName, LPCTSTR lpWindowName, - DWORD dwStyle, int x, int y, int nWidth, int nHeight, HWND hWndParent, - HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam) +HANDLE GetStockObject(int fnObject) { - - auto WinClR_it = std::find_if(WindClassRecord.begin(), WindClassRecord.end(), [&lpClassName](WNDCLASSEX &Record) { return Record.lpszClassName == lpClassName; }); + switch(fnObject) + { + case BLACK_BRUSH: + return new COLORREF(0, 0, 0); + break; + case WHITE_BRUSH: + return new COLORREF(255, 255, 255); + break; + case GREY_BRUSH: + return new COLORREF(128, 128, 128); + break; + default: + return new COLORREF(255, 255, 255); + } +} - if (WinClR_it == WindClassRecord.end()) - return NULL; +void SelectObject(HCRDC hcr, HFONT hfont) +{ + cairo_select_font_face(hcr, hfont->lpszFace, + hfont->fdwItalic ? CAIRO_FONT_SLANT_ITALIC : CAIRO_FONT_SLANT_NORMAL, + hfont->fnWeight == FW_BOLD ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL); + + cairo_rotate(hcr, hfont->nOrientation); + + // cairo_text_extents_t extents; + // cairo_text_extents (hcr, "H", &extents); + + // cairo_matrix_t matrix; + // cairo_matrix_init_scale (&matrix, + // (double)hfont->nWidth / extents.width, + // (double)hfont->nHeight / extents.width); + + // cairo_set_font_matrix (hcr, &matrix); + // g_print("wR = %f\nhR = %f\n", (double)hfont->nWidth / extents.width, (double)hfont->nHeight / extents.height); + // g_print("tW = %f\ntH = %f\n", extents.width, extents.width); + cairo_set_font_size(hcr, 15); +} + +HBRUSH CreateBrushIndirect(PLOGBRUSH plb) +{ + COLORREF brush(plb->lbColor); + brush.alpha = (plb->lbStyle == BS_SOLID) ? 1 : 0.2; + + return &brush; +} + +HFONT CreateFont(int nHeight, int nWidth, int nOrientation, int fnWeight, + DWORD fdwItalic, LPCTSTR lpszFace) +{ + HFONT font = new FONT; + font->nHeight = nHeight; + font->nWidth = nWidth; + font->nOrientation = nOrientation; + font->fnWeight = fnWeight; + font->fdwItalic = fdwItalic; + font->lpszFace = lpszFace; + + return font; +} + +void SetBkColor(HWID widget, HCRDC hcr, COLORREF bkCol) +{ + gtk_widget_override_background_color(GTK_WIDGET(widget), + GTK_STATE_FLAG_NORMAL, &bkCol); + + GtkStyleContext *context; + COLORREF col; + + context = gtk_widget_get_style_context (widget); + gint width = gtk_widget_get_allocated_width (widget); + gint height = gtk_widget_get_allocated_height (widget); + + gtk_style_context_get_color (context, + gtk_style_context_get_state (context), + &col); - HWID window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(window), lpWindowName); - gtk_window_set_default_size (GTK_WINDOW(window), nWidth, nHeight); - gtk_window_resize (GTK_WINDOW(window), nWidth, nHeight); - gtk_window_move(GTK_WINDOW(window), x, y); - gtk_widget_override_background_color(GTK_WIDGET(window), GTK_STATE_FLAG_NORMAL, WinClR_it->hbrBackground->getThis()); - gtk_window_set_default_icon(WinClR_it->hIcon); - gtk_window_set_icon(GTK_WINDOW(window), WinClR_it->hIcon); - - return window; + gdk_cairo_set_source_rgba (hcr, &col); + + gtk_render_background (context, hcr, 0, 0, width, height); +} + +void SetTextColor(HCRDC hcr, COLORREF color) +{ + gdk_cairo_set_source_rgba (hcr, &color); } -// bool KeyPressEnter(HWID widget, GdkEventKey* event, gpointer* data) { -// if (event->keyval == GDK_KEY_Return){ -// return TRUE; -// } -// return FALSE; -// } - -// bool KeyPressEsc(HWID widget, GdkEventKey* event, gpointer* data) { -// if (event->keyval == GDK_KEY_Escape){ -// return TRUE; -// } -// return FALSE; -// } +void TextOut(HCRDC hcr, int nXStart, int nYStart, LPCTSTR lpString, int cchString) +{ + cairo_move_to(hcr, nXStart, nYStart); + cairo_show_text(hcr, lpString); + + cairo_fill (hcr); +}
\ No newline at end of file diff --git a/ldmicro/lib/linuxUI/linuxUI.h b/ldmicro/lib/linuxUI/linuxUI.h index 279bf86..08dab39 100644 --- a/ldmicro/lib/linuxUI/linuxUI.h +++ b/ldmicro/lib/linuxUI/linuxUI.h @@ -39,7 +39,15 @@ #define OFN_OVERWRITEPROMPT 0x00000400L /// window brushes -#define BLACK_BRUSH 0x00000401L +#define BS_SOLID 0x00000001L +#define BS_HOLLOW 0x00000002L +#define BLACK_BRUSH 0x00000004L +#define WHITE_BRUSH 0x00000008L +#define GREY_BRUSH 0x00000010L + +/// Font flags +#define FW_REGULAR 0x00000001L +#define FW_BOLD 0x00000002L /// EnableMenuItem variables extern const UINT MF_ENABLED; @@ -68,29 +76,52 @@ typedef struct OpenFileInfoData { } OPENFILENAME; /// functions -BOOL isFocus(HWID); -COLORREF RGB(int, int, int); -int MessageBox(HWID, char*, char*, UINT); -BOOL GetSaveFileName(OPENFILENAME* ); -void EnableMenuItem(HMENU, HMENU, UINT); -void CheckMenuItem(HMENU, HMENU, UINT); -HBRUSH GetStockObject(int fnObject); -// bool KeyPressEnter (HWID, GdkEventKey, gpointer); -// bool KeyPressEsc (HWID, GdkEventKey, gpointer); - -HWID CreateWindowEx( - DWORD dwExStyle, - LPCTSTR lpClassName, - LPCTSTR lpWindowName, - DWORD dwStyle, - int x, - int y, - int nWidth, - int nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam -); +BOOL isFocus(HWID window); + +COLORREF RGB(int red, + int green, + int blue); + +int MessageBox(HWID pWindow, + char* message, + char* title, + UINT mFlags); + +BOOL GetSaveFileName(OPENFILENAME *ofn); + +void EnableMenuItem(HMENU MenuName, + HMENU MenuItem, + UINT CheckEnabledItem); + +void CheckMenuItem(HMENU MenuName, + HMENU MenuItem, + UINT Check); + +HANDLE GetStockObject(int fnObject); + +void SelectObject(HCRDC hcr, + HFONT hfont); + +HBRUSH CreateBrushIndirect(PLOGBRUSH plb); + +HFONT CreateFont(int nHeight, + int nWidth, + int nOrientation, + int fnWeight, + DWORD fdwItalic, + LPCTSTR lpszFace); + +void SetBkColor(HWID widget, + HCRDC hcr, + COLORREF bkCol); + +void SetTextColor(HCRDC hcr, + COLORREF color); + +void TextOut(HCRDC hcr, + int nXStart, + int nYStart, + LPCTSTR lpString, + int cchString); #endif
\ No newline at end of file diff --git a/ldmicro/maincontrols.cpp b/ldmicro/maincontrols.cpp index c46676d..d25c14e 100644 --- a/ldmicro/maincontrols.cpp +++ b/ldmicro/maincontrols.cpp @@ -524,6 +524,7 @@ void MakeMainWindowControls(void) { HWID PackBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); HWID grid = gtk_grid_new(); + /// Pane to separate Scrolled Window and other widgets HWID pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL); IoList = gtk_list_store_new (5, @@ -537,7 +538,7 @@ void MakeMainWindowControls(void) int pinWidth = 100; int portWidth = 90; - // Creating a list + /// Creating a list view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(IoList)); gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (IoList)); @@ -576,39 +577,172 @@ void MakeMainWindowControls(void) gtk_tree_view_append_column(GTK_TREE_VIEW(view), column); gtk_tree_view_column_set_min_width (column, portWidth); - // Appending Menus to grid + /// Appending Menus to grid gtk_grid_attach (GTK_GRID (grid), MakeMainWindowMenus(), 0, 0, 1, 1); - // Creating Scrolled Window + /// Creating Scrolled Window ScrollWindow = gtk_scrolled_window_new (NULL, NULL); + HWID viewport = gtk_viewport_new (NULL,NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ScrollWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - - // Creating a pane to separate Scrolled Window and other widgets - gtk_paned_pack1 (GTK_PANED (pane), ScrollWindow, TRUE, TRUE); - gtk_paned_set_position (GTK_PANED (pane), 0); - gtk_widget_set_vexpand (ScrollWindow, TRUE); - gtk_widget_set_hexpand (ScrollWindow, TRUE); - - // Appending tree view to pane and pane to grid - gtk_paned_pack2 (GTK_PANED(pane), view, FALSE, TRUE); - gtk_paned_set_position (GTK_PANED (pane), 400); + gtk_widget_set_hexpand(GTK_WIDGET(ScrollWindow), TRUE); + gtk_widget_set_vexpand(GTK_WIDGET(ScrollWindow), TRUE); + + /// Adding DrawWindow to pane + gtk_container_add (GTK_CONTAINER(viewport), DrawWindow); + gtk_container_add (GTK_CONTAINER(ScrollWindow), viewport); + gtk_paned_add1 (GTK_PANED (pane), ScrollWindow); + gtk_paned_set_position (GTK_PANED (pane), 0); + + /// Appending tree view to pane and pane to grid + gtk_paned_pack2 (GTK_PANED(pane), view, FALSE, FALSE); + gtk_paned_set_position (GTK_PANED (pane), 250); gtk_grid_attach (GTK_GRID (grid), pane, 0, 0, 1, 1); - // Creating Status Bar and attaching to grid + /// Creating Status Bar and attaching to grid StatusBar = gtk_statusbar_new(); gtk_statusbar_push (GTK_STATUSBAR (StatusBar), gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "Introduction"), "LDMicro Started"); - // Appneding Status Bar to box which is then added to Main Window + /// Appneding Status Bar to box which is then added to Main Window gtk_box_pack_start(GTK_BOX(PackBox), grid, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(PackBox), StatusBar, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(MainWindow), PackBox); } //----------------------------------------------------------------------------- +// Adjust the size and visibility of the scrollbars as necessary, either due +// to a change in the size of the program or a change in the size of the +// window. +//----------------------------------------------------------------------------- +void RefreshScrollbars(void) +{ + // SCROLLINFO vert, horiz; + // SetUpScrollbars(&NeedHoriz, &horiz, &vert); + // SetScrollInfo(HorizScrollBar, SB_CTL, &horiz, TRUE); + // SetScrollInfo(VertScrollBar, SB_CTL, &vert, TRUE); + + // RECT main; + // GetClientRect(MainWindow, &main); + + // if(NeedHoriz) { + // MoveWindow(HorizScrollBar, 0, IoListTop - ScrollHeight - 2, + // main.right - ScrollWidth - 2, ScrollHeight, TRUE); + // ShowWindow(HorizScrollBar, SW_SHOW); + // EnableWindow(HorizScrollBar, TRUE); + // } else { + // ShowWindow(HorizScrollBar, SW_HIDE); + // } + // MoveWindow(VertScrollBar, main.right - ScrollWidth - 2, 1, ScrollWidth, + // NeedHoriz ? (IoListTop - ScrollHeight - 4) : (IoListTop - 3), TRUE); + + // MoveWindow(VertScrollBar, main.right - ScrollWidth - 2, 1, ScrollWidth, + // NeedHoriz ? (IoListTop - ScrollHeight - 4) : (IoListTop - 3), TRUE); + + // InvalidateRect(MainWindow, NULL, FALSE); +} + +//----------------------------------------------------------------------------- +// Respond to a WM_VSCROLL sent to the main window, presumably by the one and +// only vertical scrollbar that it has as a child. +//----------------------------------------------------------------------------- +void VscrollProc(WPARAM wParam) +{ + // int prevY = ScrollYOffset; + // switch(LOWORD(wParam)) { + // case SB_LINEUP: + // case SB_PAGEUP: + // if(ScrollYOffset > 0) { + // ScrollYOffset--; + // } + // break; + + // case SB_LINEDOWN: + // case SB_PAGEDOWN: + // if(ScrollYOffset < ScrollYOffsetMax) { + // ScrollYOffset++; + // } + // break; + + // case SB_TOP: + // ScrollYOffset = 0; + // break; + + // case SB_BOTTOM: + // ScrollYOffset = ScrollYOffsetMax; + // break; + + // case SB_THUMBTRACK: + // case SB_THUMBPOSITION: + // ScrollYOffset = HIWORD(wParam); + // break; + // } + // if(prevY != ScrollYOffset) { + // SCROLLINFO si; + // si.cbSize = sizeof(si); + // si.fMask = SIF_POS; + // si.nPos = ScrollYOffset; + // SetScrollInfo(VertScrollBar, SB_CTL, &si, TRUE); + + // InvalidateRect(MainWindow, NULL, FALSE); + // } +} + +//----------------------------------------------------------------------------- +// Respond to a WM_HSCROLL sent to the main window, presumably by the one and +// only horizontal scrollbar that it has as a child. +//----------------------------------------------------------------------------- +void HscrollProc(WPARAM wParam) +{ + // int prevX = ScrollXOffset; + // switch(LOWORD(wParam)) { + // case SB_LINEUP: + // ScrollXOffset -= FONT_WIDTH; + // break; + + // case SB_PAGEUP: + // ScrollXOffset -= POS_WIDTH*FONT_WIDTH; + // break; + + // case SB_LINEDOWN: + // ScrollXOffset += FONT_WIDTH; + // break; + + // case SB_PAGEDOWN: + // ScrollXOffset += POS_WIDTH*FONT_WIDTH; + // break; + + // case SB_TOP: + // ScrollXOffset = 0; + // break; + + // case SB_BOTTOM: + // ScrollXOffset = ScrollXOffsetMax; + // break; + + // case SB_THUMBTRACK: + // case SB_THUMBPOSITION: + // ScrollXOffset = HIWORD(wParam); + // break; + // } + + // if(ScrollXOffset > ScrollXOffsetMax) ScrollXOffset = ScrollXOffsetMax; + // if(ScrollXOffset < 0) ScrollXOffset = 0; + + // if(prevX != ScrollXOffset) { + // SCROLLINFO si; + // si.cbSize = sizeof(si); + // si.fMask = SIF_POS; + // si.nPos = ScrollXOffset; + // SetScrollInfo(HorizScrollBar, SB_CTL, &si, TRUE); + + // InvalidateRect(MainWindow, NULL, FALSE); + // } +} + +//----------------------------------------------------------------------------- // Set up the title bar text for the main window; indicate whether we are in // simulation or editing mode, and indicate the filename. //----------------------------------------------------------------------------- diff --git a/ldmicro/miscutil.cpp b/ldmicro/miscutil.cpp index 4fddcf4..092f606 100644 --- a/ldmicro/miscutil.cpp +++ b/ldmicro/miscutil.cpp @@ -259,8 +259,9 @@ static LRESULT CALLBACK DialogProc(HWND hwnd, UINT msg, WPARAM wParam, //----------------------------------------------------------------------------- // Set the font of a control to a pretty proportional font (typ. Tahoma). //----------------------------------------------------------------------------- -void NiceFont(HWND h) +void NiceFont(HWID h) { + // gtk_widget_override_font(GTK_WIDGET(h), pango_font_description_from_string("Times New Roman")); // SendMessage(h, WM_SETFONT, (WPARAM)MyNiceFont, TRUE); } |