Since draw_rect_area() changes the foreground color anyway, added foreground color...

[screensavers] / hacks / NEDsim / NEDsim.c

diff --git a/hacks/NEDsim/NEDsim.c b/hacks/NEDsim/NEDsim.c
index f710105..7192cce 100644 (file)
--- a/hacks/NEDsim/NEDsim.c
+++ b/hacks/NEDsim/NEDsim.c
@@ -186,6 +186,9 @@ static struct color_scheme color_list[] = {
 /* Helper Functions                                                           */
 /* -------------------------------------------------------------------------- */
 
 /* Helper Functions                                                           */
 /* -------------------------------------------------------------------------- */
 

+// Fill in boilerplate when selecting colors.
+#define COLOR(X) &color_list[nedsim->color_index].X
+

 // Set foreground color for the current graphics context.
 static void
 set_color(struct NEDsim * nedsim, struct color_rgb * color)
 // Set foreground color for the current graphics context.
 static void
 set_color(struct NEDsim * nedsim, struct color_rgb * color)


@@ -276,7 +279,8 @@ get_text_size(struct NEDsim * nedsim, const char * text, int * x_size, int * y_s
 // in units of 'cells'.  Also, be aware that this function alters the
 // foreground color.
 static void
 // in units of 'cells'.  Also, be aware that this function alters the
 // foreground color.
 static void

-draw_rect_area(struct NEDsim * nedsim, size_t x_origin, size_t y_origin, size_t x_size, size_t y_size,
+draw_rect_area(struct NEDsim * nedsim, struct color_rgb * color,
+               size_t x_origin, size_t y_origin, size_t x_size, size_t y_size,

                Bool bord_top, Bool bord_bottom, Bool bord_left, Bool bord_right)
 {
     // First fill in the rectangular area...
                Bool bord_top, Bool bord_bottom, Bool bord_left, Bool bord_right)
 {
     // First fill in the rectangular area...


@@ -286,10 +290,11 @@ draw_rect_area(struct NEDsim * nedsim, size_t x_origin, size_t y_origin, size_t
     y_origin += nedsim->origin_y_offset;
     x_size *= nedsim->cell_size;
     y_size *= nedsim->cell_size;
     y_origin += nedsim->origin_y_offset;
     x_size *= nedsim->cell_size;
     y_size *= nedsim->cell_size;

+    set_color(nedsim, color);

     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, x_origin, y_origin, x_size, y_size);
 
     // ...then give it a border, if requested.
     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, x_origin, y_origin, x_size, y_size);
 
     // ...then give it a border, if requested.

-    set_color(nedsim, &color_list[nedsim->color_index].border);
+    set_color(nedsim, COLOR(border));

     if (bord_top) {
         XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc,
                 x_origin, y_origin, x_size, nedsim->border_size);
     if (bord_top) {
         XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc,
                 x_origin, y_origin, x_size, nedsim->border_size);


@@ -344,7 +349,7 @@ draw_circular_area(struct NEDsim * nedsim, size_t x, size_t y, double diameter)
 static void
 draw_text(struct NEDsim * nedsim, const char * text, int x_origin, int y_origin, int x_size, int y_size, Bool horizontally_center)
 {
 static void
 draw_text(struct NEDsim * nedsim, const char * text, int x_origin, int y_origin, int x_size, int y_size, Bool horizontally_center)
 {

-    set_color(nedsim, &color_list[nedsim->color_index].text);
+    set_color(nedsim, COLOR(text));

 
     int text_x_size, text_y_size;
     get_text_size(nedsim, text, &text_x_size, &text_y_size);
 
     int text_x_size, text_y_size;
     get_text_size(nedsim, text, &text_x_size, &text_y_size);


@@ -363,11 +368,11 @@ static void
 draw_panel(struct NEDsim * nedsim)
 {
     // Draw background color over entire window.
 draw_panel(struct NEDsim * nedsim)
 {
     // Draw background color over entire window.

-    set_color(nedsim, &color_list[nedsim->color_index].panel_bg);
+    set_color(nedsim, COLOR(panel_bg));

     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, 0, 0, nedsim->dpy_width, nedsim->dpy_height);
 
     // Draw NED panel in foreground color.
     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, 0, 0, nedsim->dpy_width, nedsim->dpy_height);
 
     // Draw NED panel in foreground color.

-    set_color(nedsim, &color_list[nedsim->color_index].panel_fg);
+    set_color(nedsim, COLOR(panel_fg));

     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc,
             nedsim->origin_x_offset,
             nedsim->origin_y_offset,
     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc,
             nedsim->origin_x_offset,
             nedsim->origin_y_offset,


@@ -376,7 +381,7 @@ draw_panel(struct NEDsim * nedsim)
     );
 
     // Give the panel rounded corners by first deleting the four right-angle corners...
     );
 
     // Give the panel rounded corners by first deleting the four right-angle corners...

-    set_color(nedsim, &color_list[nedsim->color_index].panel_bg);
+    set_color(nedsim, COLOR(panel_bg));

     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc,
             nedsim->origin_x_offset,
             nedsim->origin_y_offset,
     XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc,
             nedsim->origin_x_offset,
             nedsim->origin_y_offset,


@@ -402,7 +407,7 @@ draw_panel(struct NEDsim * nedsim)
             nedsim->cell_size
     );
     // ...and then replacing them with filled arcs, forming rounded corners.
             nedsim->cell_size
     );
     // ...and then replacing them with filled arcs, forming rounded corners.

-    set_color(nedsim, &color_list[nedsim->color_index].panel_fg);
+    set_color(nedsim, COLOR(panel_fg));

     XFillArc(nedsim->dpy, nedsim->panel, nedsim->gc,
             nedsim->origin_x_offset,
             nedsim->origin_y_offset,
     XFillArc(nedsim->dpy, nedsim->panel, nedsim->gc,
             nedsim->origin_x_offset,
             nedsim->origin_y_offset,


@@ -434,10 +439,8 @@ static void
 draw_logo(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the logo area.
 draw_logo(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the logo area.

-    set_color(nedsim, &color_list[nedsim->color_index].primary);
-    draw_rect_area(nedsim, LOGO_X_OFFSET, LOGO_Y_OFFSET, LOGO_WIDTH, LOGO_NAME_HEIGHT, True, True, False, False);
-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, LOGO_X_OFFSET, LOGO_Y_OFFSET+LOGO_NAME_HEIGHT, LOGO_WIDTH, LOGO_WEBSITE_HEIGHT, False, True, False, False);
+    draw_rect_area(nedsim, COLOR(primary), LOGO_X_OFFSET, LOGO_Y_OFFSET, LOGO_WIDTH, LOGO_NAME_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), LOGO_X_OFFSET, LOGO_Y_OFFSET+LOGO_NAME_HEIGHT, LOGO_WIDTH, LOGO_WEBSITE_HEIGHT, False, True, False, False);

 
     // Now draw the 'NED' text in the top box.
     set_font_size(nedsim, LOGO_NAME_HEIGHT);
 
     // Now draw the 'NED' text in the top box.
     set_font_size(nedsim, LOGO_NAME_HEIGHT);


@@ -453,10 +456,8 @@ static void
 draw_halt(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the halt area.
 draw_halt(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the halt area.

-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, HALT_X_OFFSET, HALT_Y_OFFSET, HALT_WIDTH, HALT_LIGHT_HEIGHT, True, True, False, False);
-    set_color(nedsim, &color_list[nedsim->color_index].secondary);
-    draw_rect_area(nedsim, HALT_X_OFFSET, HALT_Y_OFFSET+HALT_LIGHT_HEIGHT, HALT_WIDTH, HALT_LABEL_HEIGHT, False, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), HALT_X_OFFSET, HALT_Y_OFFSET, HALT_WIDTH, HALT_LIGHT_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(secondary), HALT_X_OFFSET, HALT_Y_OFFSET+HALT_LIGHT_HEIGHT, HALT_WIDTH, HALT_LABEL_HEIGHT, False, True, False, False);

 
     // And finally, draw the label.
     draw_text(nedsim, "HALT", HALT_X_OFFSET, HALT_Y_OFFSET+HALT_LIGHT_HEIGHT, HALT_WIDTH, HALT_LABEL_HEIGHT, True);
 
     // And finally, draw the label.
     draw_text(nedsim, "HALT", HALT_X_OFFSET, HALT_Y_OFFSET+HALT_LIGHT_HEIGHT, HALT_WIDTH, HALT_LABEL_HEIGHT, True);


@@ -470,9 +471,9 @@ draw_wordline_lights(struct NEDsim * nedsim, uint32_t word, int x, int y)
 {
     for (int i = 0; i < WORDLINE_WIDTH; i++) {
         if (word & (1<<(WORDLINE_WIDTH-1-i))) {
 {
     for (int i = 0; i < WORDLINE_WIDTH; i++) {
         if (word & (1<<(WORDLINE_WIDTH-1-i))) {

-            set_color(nedsim, &color_list[nedsim->color_index].light_on);
+            set_color(nedsim, COLOR(light_on));

         } else {
         } else {

-            set_color(nedsim, &color_list[nedsim->color_index].light_off);
+            set_color(nedsim, COLOR(light_off));

         }
         draw_circular_area(nedsim, x+i, y, WORDLINE_HEIGHT);
     }
         }
         draw_circular_area(nedsim, x+i, y, WORDLINE_HEIGHT);
     }


@@ -486,19 +487,13 @@ static void
 draw_wordline(struct NEDsim * nedsim, int x, int y)
 {
     // First, draw a solid box in the primary color over the entire wordline area.
 draw_wordline(struct NEDsim * nedsim, int x, int y)
 {
     // First, draw a solid box in the primary color over the entire wordline area.

-    set_color(nedsim, &color_list[nedsim->color_index].primary);
-    draw_rect_area(nedsim, x, y, WORDLINE_WIDTH, WORDLINE_HEIGHT, False, True, False, False);
+    draw_rect_area(nedsim, COLOR(primary), x, y, WORDLINE_WIDTH, WORDLINE_HEIGHT, False, True, False, False);

 
     // Now, draw stripes in the secondary color.
 
     // Now, draw stripes in the secondary color.

-    int i;
-    for (i = 0; i < (WORDLINE_WIDTH/(2*WORDLINE_BITS_PER_STRIPE)); i++) {
-        set_color(nedsim, &color_list[nedsim->color_index].secondary);
-        draw_rect_area(nedsim, (x+(i*(WORDLINE_WIDTH/WORDLINE_BITS_PER_STRIPE))), y,
+    for (int i = 0; i < (WORDLINE_WIDTH/(2*WORDLINE_BITS_PER_STRIPE)); i++) {
+        draw_rect_area(nedsim, COLOR(secondary), (x+(i*(WORDLINE_WIDTH/WORDLINE_BITS_PER_STRIPE))), y,

                 WORDLINE_BITS_PER_STRIPE, WORDLINE_HEIGHT, False, True, False, False);
     }
                 WORDLINE_BITS_PER_STRIPE, WORDLINE_HEIGHT, False, True, False, False);
     }

-
-    // Finally, draw the lights.
-    draw_wordline_lights(nedsim, 0, x, y);

 }
 
 // Draw the Program Counter area (but don't populate it yet).
 }
 
 // Draw the Program Counter area (but don't populate it yet).


@@ -506,8 +501,7 @@ static void
 draw_pc(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the PC area.
 draw_pc(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the PC area.

-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, PC_X_OFFSET, PC_Y_OFFSET, PC_WIDTH, PC_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), PC_X_OFFSET, PC_Y_OFFSET, PC_WIDTH, PC_LABEL_HEIGHT, True, True, False, False);

     draw_wordline(nedsim, PC_X_OFFSET, PC_Y_OFFSET+PC_LABEL_HEIGHT);
 
     // Now draw the label text "PC".
     draw_wordline(nedsim, PC_X_OFFSET, PC_Y_OFFSET+PC_LABEL_HEIGHT);
 
     // Now draw the label text "PC".


@@ -519,10 +513,8 @@ static void
 draw_sc(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the SC area.
 draw_sc(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the SC area.

-    set_color(nedsim, &color_list[nedsim->color_index].secondary);
-    draw_rect_area(nedsim, SC_X_OFFSET, SC_Y_OFFSET, SC_WIDTH, SC_LABEL_HEIGHT, True, True, False, False);
-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, SC_X_OFFSET, SC_Y_OFFSET+SC_LABEL_HEIGHT, SC_WIDTH, SC_LIGHT_HEIGHT, False, True, False, False);
+    draw_rect_area(nedsim, COLOR(secondary), SC_X_OFFSET, SC_Y_OFFSET, SC_WIDTH, SC_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), SC_X_OFFSET, SC_Y_OFFSET+SC_LABEL_HEIGHT, SC_WIDTH, SC_LIGHT_HEIGHT, False, True, False, False);

 
     // Now draw the label text "SC".
     draw_text(nedsim, "SC", SC_X_OFFSET, SC_Y_OFFSET, SC_WIDTH, SC_LABEL_HEIGHT, True);
 
     // Now draw the label text "SC".
     draw_text(nedsim, "SC", SC_X_OFFSET, SC_Y_OFFSET, SC_WIDTH, SC_LABEL_HEIGHT, True);


@@ -533,14 +525,10 @@ static void
 draw_psw(struct NEDsim * nedsim)
 {
     // First draw the four colored boxes that comprise the two PSW areas.
 draw_psw(struct NEDsim * nedsim)
 {
     // First draw the four colored boxes that comprise the two PSW areas.

-    set_color(nedsim, &color_list[nedsim->color_index].secondary);
-    draw_rect_area(nedsim, PSW_N_X_OFFSET, PSW_Y_OFFSET, PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True, True, False, False);
-    set_color(nedsim, &color_list[nedsim->color_index].secondary);
-    draw_rect_area(nedsim, PSW_Z_X_OFFSET, PSW_Y_OFFSET, PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True, True, False, False);
-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, (PSW_N_X_OFFSET + 1), PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_WIDTH, PSW_LIGHT_HEIGHT, False, True, False, False);
-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, (PSW_Z_X_OFFSET + 1), PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_WIDTH, PSW_LIGHT_HEIGHT, False, True, False, False);
+    draw_rect_area(nedsim, COLOR(secondary), PSW_N_X_OFFSET, PSW_Y_OFFSET, PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(secondary), PSW_Z_X_OFFSET, PSW_Y_OFFSET, PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), (PSW_N_X_OFFSET + 1), PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_WIDTH, PSW_LIGHT_HEIGHT, False, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), (PSW_Z_X_OFFSET + 1), PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_WIDTH, PSW_LIGHT_HEIGHT, False, True, False, False);

 
     // Now draw the label text.
     draw_text(nedsim, "N", PSW_N_X_OFFSET, PSW_Y_OFFSET, PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True);
 
     // Now draw the label text.
     draw_text(nedsim, "N", PSW_N_X_OFFSET, PSW_Y_OFFSET, PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True);


@@ -552,8 +540,7 @@ static void
 draw_stack(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the stack area.
 draw_stack(struct NEDsim * nedsim)
 {
     // First draw the two colored boxes that comprise the stack area.

-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, STACK_X_OFFSET, STACK_Y_OFFSET, STACK_WIDTH, STACK_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), STACK_X_OFFSET, STACK_Y_OFFSET, STACK_WIDTH, STACK_LABEL_HEIGHT, True, True, False, False);

     for (int i = 0; i < nedsim->num_data_rows; i++) {
         draw_wordline(nedsim, STACK_X_OFFSET, STACK_Y_OFFSET+STACK_LABEL_HEIGHT+i);
     }
     for (int i = 0; i < nedsim->num_data_rows; i++) {
         draw_wordline(nedsim, STACK_X_OFFSET, STACK_Y_OFFSET+STACK_LABEL_HEIGHT+i);
     }


@@ -570,8 +557,7 @@ draw_heap(struct NEDsim * nedsim)
 #define HEAP_START_ADDRESS 0x20000000
 
     // First draw the two colored boxes that comprise the heap area.
 #define HEAP_START_ADDRESS 0x20000000
 
     // First draw the two colored boxes that comprise the heap area.

-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, HEAP_X_OFFSET, HEAP_Y_OFFSET, HEAP_WIDTH, HEAP_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), HEAP_X_OFFSET, HEAP_Y_OFFSET, HEAP_WIDTH, HEAP_LABEL_HEIGHT, True, True, False, False);

     for (int i = 0; i < nedsim->num_data_rows; i++) {
         draw_wordline(nedsim, HEAP_X_OFFSET, HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT+i);
     }
     for (int i = 0; i < nedsim->num_data_rows; i++) {
         draw_wordline(nedsim, HEAP_X_OFFSET, HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT+i);
     }


@@ -593,36 +579,35 @@ update_display(struct NEDsim * nedsim)
 {
     // Draw the halt indicator.
     if (nedsim->nedstate->halted) {
 {
     // Draw the halt indicator.
     if (nedsim->nedstate->halted) {

-        set_color(nedsim, &color_list[nedsim->color_index].error_on);
+        set_color(nedsim, COLOR(error_on));

     } else {
     } else {

-        set_color(nedsim, &color_list[nedsim->color_index].error_off);
+        set_color(nedsim, COLOR(error_off));

     }
     draw_circular_area(nedsim, HALT_X_OFFSET, HALT_Y_OFFSET, HALT_WIDTH);
 
     // Draw the PSW "N" light.
     if (nedsim->nedstate->active_thread->psw->negative) {
     }
     draw_circular_area(nedsim, HALT_X_OFFSET, HALT_Y_OFFSET, HALT_WIDTH);
 
     // Draw the PSW "N" light.
     if (nedsim->nedstate->active_thread->psw->negative) {

-        set_color(nedsim, &color_list[nedsim->color_index].light_on);
+        set_color(nedsim, COLOR(light_on));

     } else {
     } else {

-        set_color(nedsim, &color_list[nedsim->color_index].light_off);
+        set_color(nedsim, COLOR(light_off));

     }
     draw_circular_area(nedsim, PSW_N_X_OFFSET+1, PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_HEIGHT);
 
     // Draw the PSW "Z" light.
     if (nedsim->nedstate->active_thread->psw->zero) {
     }
     draw_circular_area(nedsim, PSW_N_X_OFFSET+1, PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_HEIGHT);
 
     // Draw the PSW "Z" light.
     if (nedsim->nedstate->active_thread->psw->zero) {

-        set_color(nedsim, &color_list[nedsim->color_index].light_on);
+        set_color(nedsim, COLOR(light_on));

     } else {
     } else {

-        set_color(nedsim, &color_list[nedsim->color_index].light_off);
+        set_color(nedsim, COLOR(light_off));

     }
     draw_circular_area(nedsim, PSW_Z_X_OFFSET+1, PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_HEIGHT);
 
 
     // Draw the SC.
     }
     draw_circular_area(nedsim, PSW_Z_X_OFFSET+1, PSW_Y_OFFSET+PSW_LABEL_HEIGHT, PSW_LIGHT_HEIGHT);
 
 
     // Draw the SC.

-    int i;
-    for (i = 0; i < SC_WIDTH; i++) {
+    for (int i = 0; i < SC_WIDTH; i++) {

         if ((SC_WIDTH-1-i) == nedsim->nedstate->active_thread->sc) {
         if ((SC_WIDTH-1-i) == nedsim->nedstate->active_thread->sc) {

-            set_color(nedsim, &color_list[nedsim->color_index].light_on);
+            set_color(nedsim, COLOR(light_on));

         } else {
         } else {

-            set_color(nedsim, &color_list[nedsim->color_index].light_off);
+            set_color(nedsim, COLOR(light_off));

         }
         draw_circular_area(nedsim, SC_X_OFFSET+i, SC_Y_OFFSET+SC_LABEL_HEIGHT, SC_LIGHT_HEIGHT);
     }
         }
         draw_circular_area(nedsim, SC_X_OFFSET+i, SC_Y_OFFSET+SC_LABEL_HEIGHT, SC_LIGHT_HEIGHT);
     }


@@ -632,7 +617,7 @@ update_display(struct NEDsim * nedsim)
 
     // Draw the stack lights.
     int64_t top_of_stack = ((int64_t)nedsim->nedstate->active_thread->sp) - 1;
 
     // Draw the stack lights.
     int64_t top_of_stack = ((int64_t)nedsim->nedstate->active_thread->sp) - 1;

-    for (i = 0; i < nedsim->num_data_rows; i++) {
+    for (int i = 0; i < nedsim->num_data_rows; i++) {

         if ((top_of_stack-i) >= 0) {
             draw_wordline_lights(nedsim, nedsim->nedstate->active_thread->stack[top_of_stack-i], STACK_X_OFFSET, STACK_Y_OFFSET+STACK_LABEL_HEIGHT+i);
         } else {
         if ((top_of_stack-i) >= 0) {
             draw_wordline_lights(nedsim, nedsim->nedstate->active_thread->stack[top_of_stack-i], STACK_X_OFFSET, STACK_Y_OFFSET+STACK_LABEL_HEIGHT+i);
         } else {


@@ -641,14 +626,13 @@ update_display(struct NEDsim * nedsim)
     }
 
     // Draw the stack size in text.
     }
 
     // Draw the stack size in text.

-    set_color(nedsim, &color_list[nedsim->color_index].tertiary);
-    draw_rect_area(nedsim, STACK_X_OFFSET+(STACK_WIDTH/2), STACK_Y_OFFSET, STACK_WIDTH/2, STACK_LABEL_HEIGHT, True, True, False, False);
+    draw_rect_area(nedsim, COLOR(tertiary), STACK_X_OFFSET+(STACK_WIDTH/2), STACK_Y_OFFSET, STACK_WIDTH/2, STACK_LABEL_HEIGHT, True, True, False, False);

     char stack_size[11];
     snprintf(stack_size, sizeof(stack_size), "0x%08X", nedsim->nedstate->active_thread->sp);
     draw_text(nedsim, stack_size, (STACK_X_OFFSET+(STACK_WIDTH/2)+1), STACK_Y_OFFSET, STACK_WIDTH, STACK_LABEL_HEIGHT, False);
 
     // Draw the heap lights.
     char stack_size[11];
     snprintf(stack_size, sizeof(stack_size), "0x%08X", nedsim->nedstate->active_thread->sp);
     draw_text(nedsim, stack_size, (STACK_X_OFFSET+(STACK_WIDTH/2)+1), STACK_Y_OFFSET, STACK_WIDTH, STACK_LABEL_HEIGHT, False);
 
     // Draw the heap lights.

-    for (i = 0; i < nedsim->num_data_rows; i++) {
+    for (int i = 0; i < nedsim->num_data_rows; i++) {

         draw_wordline_lights(nedsim, ram_r_word(nedsim->nedstate, HEAP_START_ADDRESS+(i*BPW)), HEAP_X_OFFSET, HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT+i);
     }
 }
         draw_wordline_lights(nedsim, ram_r_word(nedsim->nedstate, HEAP_START_ADDRESS+(i*BPW)), HEAP_X_OFFSET, HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT+i);
     }
 }


@@ -803,7 +787,7 @@ NEDsim_draw(Display * dpy, Window win, void * closure)
         nedsim->nedstate = run_simulator(nedsim->nedstate);
         update_display(nedsim);
     } else {
         nedsim->nedstate = run_simulator(nedsim->nedstate);
         update_display(nedsim);
     } else {

-        set_color(nedsim, &color_list[nedsim->color_index].error_on);
+        set_color(nedsim, COLOR(error_on));

         XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, 0, 0, nedsim->dpy_width, nedsim->dpy_height);
     }
 
         XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, 0, 0, nedsim->dpy_width, nedsim->dpy_height);
     }