Updated window painting, ported draw.cpp, fixed cont char* error

8 files changed, 979 insertions, 946 deletions

diff --git a/ldmicro/circuit.cpp b/ldmicro/circuit.cpp
index 1d9d3d7..ad9c791 100644
--- a/ldmicro/circuit.cpp
+++ b/ldmicro/circuit.cpp
@@ -815,7 +815,7 @@ void NewProgram(void)
 {
     UndoFlush();
     FreeEntireProgram();
-
+    
     Prog.numRungs = 1;
     Prog.rungs[0] = AllocEmptyRung();
 }
diff --git a/ldmicro/draw.cpp b/ldmicro/draw.cpp
index a231745..ad8259d 100644
--- a/ldmicro/draw.cpp
+++ b/ldmicro/draw.cpp
@@ -55,19 +55,19 @@ BOOL ThisHighlighted;
 // warn the user and undo their changes if they created something too wide.
 // This is not very clean.
 //-----------------------------------------------------------------------------
-// static BOOL CheckBoundsUndoIfFails(int gx, int gy)
-// {
-//     if(gx >= DISPLAY_MATRIX_X_SIZE || gx < 0 ||
-//        gy >= DISPLAY_MATRIX_Y_SIZE || gy < 0)
-//     {
-//         if(CanUndo()) {
-//             UndoUndo();
-//             Error(_("Too many elements in subcircuit!"));
-//             return TRUE;
-//         }
-//     }
-//     return FALSE;
-// }
+static BOOL CheckBoundsUndoIfFails(int gx, int gy)
+{
+    if(gx >= DISPLAY_MATRIX_X_SIZE || gx < 0 ||
+       gy >= DISPLAY_MATRIX_Y_SIZE || gy < 0)
+    {
+        if(CanUndo()) {
+            UndoUndo();
+            Error(_("Too many elements in subcircuit!"));
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
 
 //-----------------------------------------------------------------------------
 // Determine the width, in leaf element units, of a particular subcircuit.
@@ -250,671 +250,671 @@ int ProgCountWidestRow(void)
 // Draw a vertical wire one leaf element unit high up from (cx, cy), where cx
 // and cy are in charcter units.
 //-----------------------------------------------------------------------------
-// static void VerticalWire(int cx, int cy)
-// {
-//     int j;
-//     for(j = 1; j < POS_HEIGHT; j++) {
-//         DrawChars(cx, cy + (POS_HEIGHT/2 - j), "|");
-//     }
-//     DrawChars(cx, cy + (POS_HEIGHT/2), "+");
-//     DrawChars(cx, cy + (POS_HEIGHT/2 - POS_HEIGHT), "+");
-// }
+static void VerticalWire(int cx, int cy)
+{
+    int j;
+    for(j = 1; j < POS_HEIGHT; j++) {
+        DrawChars(cx, cy + (POS_HEIGHT/2 - j), "|");
+    }
+    DrawChars(cx, cy + (POS_HEIGHT/2), "+");
+    DrawChars(cx, cy + (POS_HEIGHT/2 - POS_HEIGHT), "+");
+}
 
 //-----------------------------------------------------------------------------
 // Convenience functions for making the text colors pretty, for DrawElement.
 //-----------------------------------------------------------------------------
-// static void NormText(void)
-// {
-//     SetTextColor(Hdc, InSimulationMode ? HighlightColours.simOff :
-//         HighlightColours.def);
-//     SelectObject(Hdc, FixedWidthFont);
-// }
-
-// static void EmphText(void)
-// {
-//     SetTextColor(Hdc, InSimulationMode ? HighlightColours.simOn :
-//         HighlightColours.selected);
-//     SelectObject(Hdc, FixedWidthFontBold);
-// }
-
-// static void NameText(void)
-// {
-//     if(!InSimulationMode && !ThisHighlighted) {
-//         SetTextColor(Hdc, HighlightColours.name);
-//     }
-// }
-
-// static void BodyText(void)
-// {
-//     if(!InSimulationMode && !ThisHighlighted) {
-//         SetTextColor(Hdc, HighlightColours.def);
-//     }
-// }
-
-// static void PoweredText(BOOL powered)
-// {
-//     if(InSimulationMode) {
-//         if(powered)
-//             EmphText();
-//         else
-//             NormText();
-//     }
-// }
+static void NormText(void)
+{
+    SetTextColor(Hdc, InSimulationMode ? HighlightColours.simOff :
+        HighlightColours.def);
+    SelectObject(Hdc, FixedWidthFont);
+}
+
+static void EmphText(void)
+{
+    SetTextColor(Hdc, InSimulationMode ? HighlightColours.simOn :
+        HighlightColours.selected);
+    SelectObject(Hdc, FixedWidthFontBold);
+}
+
+static void NameText(void)
+{
+    if(!InSimulationMode && !ThisHighlighted) {
+        SetTextColor(Hdc, HighlightColours.name);
+    }
+}
+
+static void BodyText(void)
+{
+    if(!InSimulationMode && !ThisHighlighted) {
+        SetTextColor(Hdc, HighlightColours.def);
+    }
+}
+
+static void PoweredText(BOOL powered)
+{
+    if(InSimulationMode) {
+        if(powered)
+            EmphText();
+        else
+            NormText();
+    }
+}
 
 //-----------------------------------------------------------------------------
 // Count the length of a string, in characters. Nonstandard because the
 // string may contain special characters to indicate formatting (syntax
 // highlighting).
 //-----------------------------------------------------------------------------
-// static int FormattedStrlen(char *str)
-// {
-//     int l = 0;
-//     while(*str) {
-//         if(*str > 10) {
-//             l++;
-//         }
-//         str++;
-//     }
-//     return l;
-// }
+static int FormattedStrlen(const char *str)
+{
+    int l = 0;
+    while(*str) {
+        if(*str > 10) {
+            l++;
+        }
+        str++;
+    }
+    return l;
+}
 
 //-----------------------------------------------------------------------------
 // Draw a string, centred in the space of a single position, with spaces on
 // the left and right. Draws on the upper line of the position.
 //-----------------------------------------------------------------------------
-// static void CenterWithSpaces(int cx, int cy, char *str, BOOL powered,
-//     BOOL isName)
-// {
-//     int extra = POS_WIDTH - FormattedStrlen(str);
-//     PoweredText(powered);
-//     if(isName) NameText();
-//     DrawChars(cx + (extra/2), cy + (POS_HEIGHT/2) - 1, str);
-//     if(isName) BodyText();
-// }
+static void CenterWithSpaces(int cx, int cy, char *str, BOOL powered,
+    BOOL isName)
+{
+    int extra = POS_WIDTH - FormattedStrlen(str);
+    PoweredText(powered);
+    if(isName) NameText();
+    DrawChars(cx + (extra/2), cy + (POS_HEIGHT/2) - 1, str);
+    if(isName) BodyText();
+}
 
 //-----------------------------------------------------------------------------
 // Like CenterWithWires, but for an arbitrary width position (e.g. for ADD
 // and SUB, which are double-width).
 //-----------------------------------------------------------------------------
-// static void CenterWithWiresWidth(int cx, int cy, char *str, BOOL before,
-//     BOOL after, int totalWidth)
-// {
-//     int extra = totalWidth - FormattedStrlen(str);
-
-//     PoweredText(after);
-//     DrawChars(cx + (extra/2), cy + (POS_HEIGHT/2), str);
-
-//     PoweredText(before);
-//     int i;
-//     for(i = 0; i < (extra/2); i++) {
-//         DrawChars(cx + i, cy + (POS_HEIGHT/2), "-");
-//     }
-//     PoweredText(after);
-//     for(i = FormattedStrlen(str)+(extra/2); i < totalWidth; i++) {
-//         DrawChars(cx + i, cy + (POS_HEIGHT/2), "-");
-//     }
-// }
+static void CenterWithWiresWidth(int cx, int cy,const char *str, BOOL before,
+    BOOL after, int totalWidth)
+{
+    int extra = totalWidth - FormattedStrlen(str);
+
+    PoweredText(after);
+    DrawChars(cx + (extra/2), cy + (POS_HEIGHT/2), str);
+
+    PoweredText(before);
+    int i;
+    for(i = 0; i < (extra/2); i++) {
+        DrawChars(cx + i, cy + (POS_HEIGHT/2), "-");
+    }
+    PoweredText(after);
+    for(i = FormattedStrlen(str)+(extra/2); i < totalWidth; i++) {
+        DrawChars(cx + i, cy + (POS_HEIGHT/2), "-");
+    }
+}
 
 //-----------------------------------------------------------------------------
 // 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);
-// }
+static void CenterWithWires(int cx, int cy, const 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;
-// }
+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 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;
-// }
+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, std::min<size_t>(strlen(srcStr), (size_t)(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
@@ -928,125 +928,125 @@ int ProgCountWidestRow(void)
 //-----------------------------------------------------------------------------
 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;
+    BOOL poweredAfter;
+
+    int cx0 = *cx, cy0 = *cy;
+    ElemLeaf *leaf = (ElemLeaf *)elem;
+
+    SetBkColor(DrawWindow,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;
 }
 
 //-----------------------------------------------------------------------------
@@ -1055,16 +1055,16 @@ BOOL DrawElement(int which, void *elem, int *cx, int *cy, BOOL poweredBefore)
 //-----------------------------------------------------------------------------
 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), "-");
-//     }
+    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 c9a75d3..3dfeeff 100644
--- a/ldmicro/draw_outputdev.cpp
+++ b/ldmicro/draw_outputdev.cpp
@@ -31,7 +31,7 @@
 
 #include "ldmicro.h"
 
-void (*DrawChars)(int, int, char *);
+void (*DrawChars)(int, int, const char *);
 
 // After an undo all the memory addresses change but make an effort to put
 // the cursor roughly where it should be.
@@ -109,79 +109,79 @@ void CALLBACK BlinkCursor(HWND hwnd, UINT msg, UINT_PTR id, DWORD time)
 // Output a string to the screen at a particular location, in character-
 // sized units.
 //-----------------------------------------------------------------------------
-static void DrawCharsToScreen(int cx, int cy, char *str)
+static void DrawCharsToScreen(int cx, int cy, const char *str)
 {
-    // cy -= ScrollYOffset*POS_HEIGHT;
-    // if(cy < -2) return;
-    // if(cy*FONT_HEIGHT + Y_PADDING > IoListTop) return;
-
-    // COLORREF prev;
-    // BOOL firstTime = TRUE;
-    // BOOL inNumber = FALSE;
-    // BOOL inComment = FALSE;
-    // int inBrace = 0;
-    // for(; *str; str++, cx++) {
-    //     int x = cx*FONT_WIDTH + X_PADDING;
-    //     int y = cy*FONT_HEIGHT + Y_PADDING;
-
-    //     BOOL hiOk = !(InSimulationMode || ThisHighlighted);
-
-    //     if(strchr("{}[]", *str) && hiOk && !inComment)  {
-    //         if(*str == '{' || *str == '[') inBrace++;
-    //         if(inBrace == 1) {
-    //             prev = GetTextColor(Hdc);
-    //             SetTextColor(Hdc, HighlightColours.punct);
-    //             TextOut(Hdc, x, y, str, 1);
-    //             SetTextColor(Hdc, prev);
-    //         } else {
-    //             TextOut(Hdc, x, y, str, 1);
-    //         }
-    //         if(*str == ']' || *str == '}') inBrace--;
-    //     } else if((
-    //         (isdigit(*str) && (firstTime || isspace(str[-1]) 
-    //             || str[-1] == ':' || str[-1] == '[')) ||
-    //         (*str == '-' && isdigit(str[1]))) && hiOk && !inComment)
-    //     {
-    //         prev = GetTextColor(Hdc);
-    //         SetTextColor(Hdc, HighlightColours.lit);
-    //         TextOut(Hdc, x, y, str, 1);
-    //         SetTextColor(Hdc, prev);
-    //         inNumber = TRUE;
-    //     } else if(*str == '\x01') {
-    //         cx--;
-    //         if(hiOk) {
-    //             prev = GetTextColor(Hdc);
-    //             SetTextColor(Hdc, HighlightColours.op);
-    //         }
-    //     } else if(*str == '\x02') {
-    //         cx--;
-    //         if(hiOk) {
-    //             SetTextColor(Hdc, prev);
-    //             inComment = FALSE;
-    //         }
-    //     } else if(*str == '\x03') {
-    //         cx--;
-    //         if(hiOk) {
-    //             prev = GetTextColor(Hdc);
-    //             SetTextColor(Hdc, HighlightColours.comment);
-    //             inComment = TRUE;
-    //         }
-    //     } else if(inNumber) {
-    //         if(isdigit(*str) || *str == '.') {
-    //             prev = GetTextColor(Hdc);
-    //             SetTextColor(Hdc, HighlightColours.lit);
-    //             TextOut(Hdc, x, y, str, 1);
-    //             SetTextColor(Hdc, prev);
-    //         } else {
-    //             TextOut(Hdc, x, y, str, 1);
-    //             inNumber = FALSE;
-    //         }
-    //     } else {
-    //         TextOut(Hdc, x, y, str, 1);
-    //     }
+    cy -= ScrollYOffset*POS_HEIGHT;
+    if(cy < -2) return;
+    if(cy*FONT_HEIGHT + Y_PADDING > IoListTop) return;
+
+    COLORREF prev;
+    BOOL firstTime = TRUE;
+    BOOL inNumber = FALSE;
+    BOOL inComment = FALSE;
+    int inBrace = 0;
+    for(; *str; str++, cx++) {
+        int x = cx*FONT_WIDTH + X_PADDING;
+        int y = cy*FONT_HEIGHT + Y_PADDING;
+
+        BOOL hiOk = !(InSimulationMode || ThisHighlighted);
+
+        if(strchr("{}[]", *str) && hiOk && !inComment)  {
+            if(*str == '{' || *str == '[') inBrace++;
+            if(inBrace == 1) {
+                prev = GetTextColor(Hdc);
+                SetTextColor(Hdc, HighlightColours.punct);
+                TextOut(Hdc, x, y, str, 1);
+                SetTextColor(Hdc, prev);
+            } else {
+                TextOut(Hdc, x, y, str, 1);
+            }
+            if(*str == ']' || *str == '}') inBrace--;
+        } else if((
+            (isdigit(*str) && (firstTime || isspace(str[-1]) 
+                || str[-1] == ':' || str[-1] == '[')) ||
+            (*str == '-' && isdigit(str[1]))) && hiOk && !inComment)
+        {
+            prev = GetTextColor(Hdc);
+            SetTextColor(Hdc, HighlightColours.lit);
+            TextOut(Hdc, x, y, str, 1);
+            SetTextColor(Hdc, prev);
+            inNumber = TRUE;
+        } else if(*str == '\x01') {
+            cx--;
+            if(hiOk) {
+                prev = GetTextColor(Hdc);
+                SetTextColor(Hdc, HighlightColours.op);
+            }
+        } else if(*str == '\x02') {
+            cx--;
+            if(hiOk) {
+                SetTextColor(Hdc, prev);
+                inComment = FALSE;
+            }
+        } else if(*str == '\x03') {
+            cx--;
+            if(hiOk) {
+                prev = GetTextColor(Hdc);
+                SetTextColor(Hdc, HighlightColours.comment);
+                inComment = TRUE;
+            }
+        } else if(inNumber) {
+            if(isdigit(*str) || *str == '.') {
+                prev = GetTextColor(Hdc);
+                SetTextColor(Hdc, HighlightColours.lit);
+                TextOut(Hdc, x, y, str, 1);
+                SetTextColor(Hdc, prev);
+            } else {
+                TextOut(Hdc, x, y, str, 1);
+                inNumber = FALSE;
+            }
+        } else {
+            TextOut(Hdc, x, y, str, 1);
+        }
 
-    //     firstTime = FALSE;
-    // }
+        firstTime = FALSE;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -218,7 +218,7 @@ 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(HCRDC hcr)
+void PaintWindow()
 {
     /*
     cairo_set_source_rgb(cr, Cairo_R, Cairo_G, Cairo_G); 
@@ -235,15 +235,16 @@ void PaintWindow(HCRDC hcr)
     cairo_fill (cr);
     */
     
-    SetBkColor(DrawWindow, hcr, InSimulationMode ? HighlightColours.simBg :
-        HighlightColours.bg);
+    // SetBkColor(DrawWindow, hcr, InSimulationMode ? HighlightColours.simBg :
+    //     HighlightColours.bg);
     
-    SetTextColor(hcr, InSimulationMode ? HighlightColours.simRungNum :
-        HighlightColours.rungNum);
+    // SetTextColor(hcr, InSimulationMode ? HighlightColours.simRungNum :
+    //     HighlightColours.rungNum);
     
-    SelectObject(hcr, FixedWidthFont);
+    // SelectObject(hcr, FixedWidthFont);
     
-    TextOut(hcr, 5, 100, "-------] [-------------------------------------------------------------------------------------------------------------------------------------------------{RES}-------", 14);
+    // TextOut(hcr, 5, 100, "-------] [-------------------------------------------------------------------------------------------------------------------------------------------------{RES}-------", 14);
+
     // static HBITMAP BackBitmap;
     // static HDC BackDc;
     // static int BitmapWidth;
@@ -300,11 +301,11 @@ void PaintWindow(HCRDC hcr)
         if(((cy + thisHeight) >= (ScrollYOffset - 8)*POS_HEIGHT) &&
             (cy < (ScrollYOffset + rowsAvailable + 8)*POS_HEIGHT))
         {
-            SetBkColor(DrawWindow, hcr, InSimulationMode ? HighlightColours.simBg :
+            SetBkColor(DrawWindow, Hdc, InSimulationMode ? HighlightColours.simBg :
                 HighlightColours.bg);
-            SetTextColor(hcr, InSimulationMode ? HighlightColours.simRungNum :
+            SetTextColor(Hdc, InSimulationMode ? HighlightColours.simRungNum :
                 HighlightColours.rungNum);
-            SelectObject(hcr, FixedWidthFont);
+            SelectObject(Hdc, FixedWidthFont);
             int rung = i + 1;
             int y = Y_PADDING + FONT_HEIGHT*cy;
             int yp = y + FONT_HEIGHT*(POS_HEIGHT/2) - 
@@ -312,67 +313,67 @@ void PaintWindow(HCRDC hcr)
 
             if(rung < 10) {
                 char r[1] = { rung + '0' };
-                TextOut(hcr, 8 + FONT_WIDTH, yp, r, 1);
+                TextOut(Hdc, 8 + FONT_WIDTH, yp, r, 1);
             } else {
                 char r[2] = { (rung / 10) + '0', (rung % 10) + '0' };
-                TextOut(hcr, 8, yp, r, 2);
+                TextOut(Hdc, 8, yp, r, 2);
             }
 
-            // int cx = 0;
-    //         // DrawElement(ELEM_SERIES_SUBCKT, Prog.rungs[i], &cx, &cy, 
-    //             // Prog.rungPowered[i]);
+            int cx = 0;
+            DrawElement(ELEM_SERIES_SUBCKT, Prog.rungs[i], &cx, &cy, 
+                Prog.rungPowered[i]); 
         }
 
         cy += thisHeight;
         cy += POS_HEIGHT;
     }
-    // cy -= 2;
-    // // DrawEndRung(0, cy);
-
-    // if(SelectedGxAfterNextPaint >= 0) {
-    //     // 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);
-    // } else {
-    //     if(!SelectionActive) {
-    //         if(Prog.numRungs > 0) {
-    //             // if(MoveCursorTopLeft()) {
-    //             //     InvalidateRect(MainWindow, NULL, FALSE);
-    //             // }
-    //         }
-    //     }
-    // }
+    cy -= 2;
+    DrawEndRung(0, cy);
+
+    if(SelectedGxAfterNextPaint >= 0) {
+        MoveCursorNear(SelectedGxAfterNextPaint, SelectedGyAfterNextPaint);
+        InvalidateRect(DrawWindow, NULL, FALSE);
+        SelectedGxAfterNextPaint = -1;
+        SelectedGyAfterNextPaint = -1;
+    } else if(ScrollSelectedIntoViewAfterNextPaint && Selected) {
+        SelectElement(-1, -1, Selected->selectedState);
+        ScrollSelectedIntoViewAfterNextPaint = FALSE;
+        InvalidateRect(DrawWindow, NULL, FALSE);
+    } else {
+        if(!SelectionActive) {
+            if(Prog.numRungs > 0) {
+                if(MoveCursorTopLeft()) {
+                    InvalidateRect(DrawWindow, 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;
+    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;
-    // ok();
+    // Hdc = paintDc;
+    ok();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/ldmicro/includes/ldmicro.h b/ldmicro/includes/ldmicro.h
index 257a8be..e69adb4 100644
--- a/ldmicro/includes/ldmicro.h
+++ b/ldmicro/includes/ldmicro.h
@@ -558,9 +558,9 @@ extern BOOL SelectionActive;
 extern BOOL ThisHighlighted;
 
 // draw_outputdev.cpp
-extern void (*DrawChars)(int, int, char *);
+extern void (*DrawChars)(int, int, const char *);
 void CALLBACK BlinkCursor(HWND hwnd, UINT msg, UINT_PTR id, DWORD time);
-void PaintWindow(cairo_t *cr);
+void PaintWindow();
 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 2806cfa..5e4c7af 100644
--- a/ldmicro/ldmicro.cpp
+++ b/ldmicro/ldmicro.cpp
@@ -1093,10 +1093,10 @@ gboolean LD_WM_Paint_call(HWID widget, HCRDC cr, gpointer data)
 
     
     // PAINTSTRUCT ps;
-    // Hdc = BeginPaint(hwnd, &ps);
+    Hdc = cr;//BeginPaint(hwnd, &ps);
 
     /// This draws the schematic.
-    PaintWindow(cr);
+    PaintWindow();
 
     // RECT r;
     // // Fill around the scroll bars
@@ -1172,18 +1172,17 @@ int main(int argc, char** argv)
     /// Check if we're running in non-interactive mode; in that case we should
     /// load the file, compile, and exit.
 
-    if(argc >= 2) {
+    if(argc >= 2 && !(argc < 4) ) {
         RunningInBatchMode = TRUE;
 
         char *err =
             "Bad command line arguments: run 'ldmicro /c src.ld dest.hex'";
 
-        if (argc < 4)
-        { 
-            printf("throwing error...\n");
-            Error(err); 
-            exit(-1);
-        }
+        // if (argc < 4)
+        // {
+        //     Error(err); 
+        //     exit(-1);
+        // }
 
         char *source = (char*)malloc(strlen(argv[2]) + strlen(argv[3]) + 2);
         sprintf(source, "%s %s", argv[2], argv[3]);
@@ -1304,37 +1303,39 @@ int main(int argc, char** argv)
     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, "");
+    NewProgram();
+    strcpy(CurrentSaveFile, "");
 
     // We are running interactively, or we would already have exited. We
     // can therefore show the window now, and otherwise set up the GUI.
 
-    // ShowWindow(MainWindow, SW_SHOW);
+    // Displaying the window
+    gtk_widget_show_all(MainWindow);
     // SetTimer(MainWindow, TIMER_BLINK_CURSOR, 800, BlinkCursor);
     
-    // if(strlen(lpCmdLine) > 0) {
-    //     char line[MAX_PATH];
-    //     if(*lpCmdLine == '"') { 
-    //         strcpy(line, lpCmdLine+1);
-    //     } else {
-    //         strcpy(line, lpCmdLine);
-    //     }
-    //     if(strchr(line, '"')) *strchr(line, '"') = '\0';
-
-    //     char *s;
-    //     GetFullPathName(line, sizeof(CurrentSaveFile), CurrentSaveFile, &s);
-    //     if(!LoadProjectFromFile(CurrentSaveFile)) {
-    //         NewProgram();
-    //         Error(_("Couldn't open '%s'."), CurrentSaveFile);
-    //         CurrentSaveFile[0] = '\0';
-    //     }
-    //     UndoFlush();
-    // }
+    if(argc >= 2) {
+        // g_print("load prog: %s\n", argv[1]);
+        char line[MAX_PATH];
+        if(*argv[1] == '"') { 
+            strcpy(line, argv[1]+1);
+        } else {
+            strcpy(line, argv[1]);
+        }
+        if(strchr(line, '"')) *strchr(line, '"') = '\0';
+        
+        realpath(line, CurrentSaveFile);
+        // g_print("resolved path: %s\n", CurrentSaveFile);
+        if(!LoadProjectFromFile(CurrentSaveFile)) {
+            NewProgram();
+            Error(_("Couldn't open '%s'."), CurrentSaveFile);
+            CurrentSaveFile[0] = '\0';
+        }
+        UndoFlush();
+    }
 
-    // GenerateIoListDontLoseSelection(); ~
+    GenerateIoListDontLoseSelection(); //~
     // RefreshScrollbars();
-    // UpdateMainWindowTitleBar(); ~
+    UpdateMainWindowTitleBar(); //~
 
     // MSG msg;
     // DWORD ret;
@@ -1357,9 +1358,6 @@ int main(int argc, char** argv)
     //     TranslateMessage(&msg);
     //     DispatchMessage(&msg);
     // }
-
-    // Displaying the window
-    gtk_widget_show_all(MainWindow);
     
     gtk_main();
     return EXIT_SUCCESS;
diff --git a/ldmicro/lib/linuxUI/linuxLD.h b/ldmicro/lib/linuxUI/linuxLD.h
index 5f8e0e7..c593ba6 100644
--- a/ldmicro/lib/linuxUI/linuxLD.h
+++ b/ldmicro/lib/linuxUI/linuxLD.h
@@ -24,6 +24,7 @@
 
 /// Macro functions
 #define max(_A, _B) std::max(_A, _B)
+// #define min(_A, _B) std::min(_A, _B)
 
 /// Typedefs
 //typedef int64_t __int64;
@@ -73,6 +74,9 @@ typedef GtkListStore *HLIST;
 typedef GtkApplication *HAPP;
 typedef GtkTreeViewColumn *HTVC;
 typedef GdkPixbuf *HICON;
+typedef GdkRectangle RECT;
+typedef GdkRectangle *PRECT;
+
 /// Check if system is x64 or x86
 #if defined(__UNIX64)
 typedef uint64_t UINT_PTR;
diff --git a/ldmicro/lib/linuxUI/linuxUI.cpp b/ldmicro/lib/linuxUI/linuxUI.cpp
index 70866f9..5206ce1 100644
--- a/ldmicro/lib/linuxUI/linuxUI.cpp
+++ b/ldmicro/lib/linuxUI/linuxUI.cpp
@@ -1,5 +1,8 @@
 #include "linuxUI.h"
 
+/// Variable to current text color
+COLORREF HdcCurrentTextColor;
+
 /// EnableMenuItem Variables
 const UINT MF_ENABLED = 0;
 const UINT MF_GRAYED = 1;
@@ -203,18 +206,18 @@ void SelectObject(HCRDC hcr, HFONT hfont)
 
     cairo_rotate(hcr, hfont->nOrientation);
 
-    // cairo_text_extents_t extents;
-    // cairo_text_extents (hcr, "H", &extents);
+    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_matrix_t matrix;
+    cairo_matrix_init_scale (&matrix,
+                    (double)hfont->nWidth * 1.6,
+                    (double)hfont->nHeight * 1.4);
  
-    // cairo_set_font_matrix (hcr, &matrix);
+    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);
+    // cairo_set_font_size(hcr, 15);
 }
 
 HBRUSH CreateBrushIndirect(PLOGBRUSH plb)
@@ -262,6 +265,7 @@ void SetBkColor(HWID widget, HCRDC hcr, COLORREF bkCol)
 
 void SetTextColor(HCRDC hcr, COLORREF color)
 {
+    HdcCurrentTextColor = color;
     gdk_cairo_set_source_rgba (hcr, &color);
 }
 
@@ -272,4 +276,20 @@ void TextOut(HCRDC hcr, int nXStart, int nYStart, LPCTSTR lpString, int cchStrin
 
     cairo_fill (hcr);
 }
-   
+
+COLORREF GetTextColor(HCRDC Hdc)
+{
+    // COLORREF col;
+    // gtk_style_context_get_color (Hdc,
+    //                             gtk_style_context_get_state (Hdc),
+    //                             &col);
+    
+    return HdcCurrentTextColor;
+}
+
+BOOL InvalidateRect(HWID hWid, const RECT *lpRect, BOOL bErase)
+{
+    // gtk_widget_queue_draw(hWid);
+    gdk_window_invalidate_rect (gtk_widget_get_window (hWid), lpRect, bErase);
+}
+
diff --git a/ldmicro/lib/linuxUI/linuxUI.h b/ldmicro/lib/linuxUI/linuxUI.h
index 552a6af..0fb0067 100644
--- a/ldmicro/lib/linuxUI/linuxUI.h
+++ b/ldmicro/lib/linuxUI/linuxUI.h
@@ -59,7 +59,7 @@ extern const UINT MF_UNCHECKED;
 extern GtkWidget *view;
 extern GtkTreeViewColumn *column;
 
-/// data types
+/// Structures
 typedef struct OpenFileInfoData {
     DWORD         lStructSize;
     HWID          parentWindow;
@@ -71,6 +71,9 @@ typedef struct OpenFileInfoData {
     LPCTSTR       lpstrDefExt;
 } OPENFILENAME;
 
+/// Variables
+extern COLORREF HdcCurrentTextColor;
+
 /// functions
 BOOL isFocus(HWID window);
 
@@ -120,4 +123,11 @@ void TextOut(HCRDC hcr,
    LPCTSTR lpString,
    int     cchString);
 
+COLORREF GetTextColor(HCRDC Hdc);
+
+BOOL InvalidateRect(
+    HWID hWId,
+    const RECT *lpRect,
+    BOOL bErase);
+
 #endif
\ No newline at end of file