X-Git-Url: http://git.subgeniuskitty.com/screensavers/.git/blobdiff_plain/2c7168aee9615d18be64807d9524ea47ac0bfaf4..b73247cfaa571f5f162eca6e55ee7ea803d31dd7:/hacks/NEDsim/NEDsim.c diff --git a/hacks/NEDsim/NEDsim.c b/hacks/NEDsim/NEDsim.c index 71e4b99..9b5ceef 100644 --- a/hacks/NEDsim/NEDsim.c +++ b/hacks/NEDsim/NEDsim.c @@ -3,6 +3,67 @@ #include "screenhack.h" #include "simulator.h" +#include "ned_programs/embedded_ned_program_declarations.h" + +/* -------------------------------------------------------------------------- */ +/* Front Panel Layout */ +/* -------------------------------------------------------------------------- */ + +// All of these values are in units of 'cells', not 'pixels'. Where applicable, +// coordinates refer to the upper-left corner of a cell. See the files +// `layout_reference.*` for details. + +#define OVERALL_WIDTH_IN_CELLS 70 +#define HEADER_HEIGHT_IN_CELLS 14 +#define FOOTER_HEIGHT_IN_CELLS 2 + +#define LOGO_X_OFFSET 2 +#define LOGO_Y_OFFSET 2 +#define LOGO_WIDTH 20 +#define LOGO_NAME_HEIGHT 6 +#define LOGO_WEBSITE_HEIGHT 2 + +#define HALT_X_OFFSET 26 +#define HALT_Y_OFFSET 2 +#define HALT_WIDTH 6 +#define HALT_LIGHT_HEIGHT 6 +#define HALT_LABEL_HEIGHT 2 + +#define WORDLINE_BITS_PER_STRIPE 4 +#define WORDLINE_WIDTH 32 +#define WORDLINE_HEIGHT 1 + +#define PC_X_OFFSET 36 +#define PC_Y_OFFSET 7 +#define PC_WIDTH 32 +#define PC_LABEL_HEIGHT 2 +#define PC_LIGHT_HEIGHT 1 + +#define SC_X_OFFSET 42 +#define SC_Y_OFFSET 2 +#define SC_WIDTH 5 +#define SC_LABEL_HEIGHT 2 +#define SC_LIGHT_HEIGHT 1 + +#define PSW_N_X_OFFSET 51 +#define PSW_Z_X_OFFSET 58 +#define PSW_Y_OFFSET 2 +#define PSW_LABEL_WIDTH 3 +#define PSW_LABEL_HEIGHT 2 +#define PSW_LIGHT_WIDTH 1 +#define PSW_LIGHT_HEIGHT 1 + +#define STACK_X_OFFSET 2 +#define STACK_Y_OFFSET 12 +#define STACK_WIDTH 32 +#define STACK_LABEL_HEIGHT 2 +#define STACK_LIGHT_HEIGHT 1 + +#define HEAP_X_OFFSET 36 +#define HEAP_Y_OFFSET 12 +#define HEAP_WIDTH 32 +#define HEAP_LABEL_HEIGHT 2 +#define HEAP_LIGHT_HEIGHT 1 /* -------------------------------------------------------------------------- */ /* Data Structures */ @@ -59,6 +120,11 @@ struct NEDsim { // if the display were using a 72 point helvetica font without emphasis. char * current_font; + // Contains the address of the top of the heap window. In total, the heap + // window will display from `heap_window_offset` to + // `heap_window_offset+num_data_rows`. + uint32_t heap_window_offset; + // This struct contains all machine state for the simulated NED computer. struct NEDstate * nedstate; }; @@ -122,11 +188,32 @@ static struct color_scheme color_list[] = { } }; +// Each instance of this struct will describe a single NED1 program embedded in +// NEDsim as a binary blob. See `ned_programs/README.md` for details. +struct ned_program { + const uint8_t * binary_blob; // Pointer to raw NED1 machine code + const size_t * blob_size; // Size of raw NED1 machine code + uint32_t heap_window_offset; // Location of window into NED system RAM +}; + +// All NED1 programs embedded in NEDsim should be manually added to this array. +// See `ned_programs/README.md` for details. +static struct ned_program ned_programs[] = { + { + integer_stack, + &integer_stack_size, + 0x20000000 + } +}; + /* -------------------------------------------------------------------------- */ /* Helper Functions */ /* -------------------------------------------------------------------------- */ -// TODO: Explain +// 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) { @@ -143,9 +230,9 @@ set_color(struct NEDsim * nedsim, struct color_rgb * color) XSetForeground(nedsim->dpy, nedsim->gc, temp.pixel); } -// TODO: Explain -// TODO: Make this a lot faster. -// Input: size in 'cells', and sets font to fill that size, minus border and padding room. +// Set font size to fill 'size' cells vertically, minus space for border and +// padding. There is probably a better way to do this. The current method is +// horribly slow. Call this function as few times as possible. static void set_font_size(struct NEDsim * nedsim, int size) { @@ -155,9 +242,11 @@ set_font_size(struct NEDsim * nedsim, int size) const char * font_size_prefix = "-*-helvetica-*-r-*-*-"; const char * font_size_suffix = "-*-*-*-*-*-*-*"; - size_t buffer_size = strlen(font_size_prefix) + strlen(font_size_suffix) + 100; // '100' since nobody needs font with size in 'points' greater than 100 decimal digits long. + // In the buffer, we reserve 100 DIGITS for the font size integer. + size_t buffer_size = strlen(font_size_prefix) + strlen(font_size_suffix) + 100; char * font_full_name = malloc(buffer_size); - int font_size_in_points = 2; // Start with a 2 pt font and work our way up. + // Start with a 2pt font and work our way up. + int font_size_in_points = 2; while (1) { // Load the font. @@ -199,8 +288,9 @@ set_font_size(struct NEDsim * nedsim, int size) nedsim->current_font = font_full_name; } -// TODO: Explain -// TODO: Explain that this returns result in pixels so we can track fractional cell usage. +// Unlike most functions in this program that input/output in units of 'cells', +// this function uses units of 'pixels' so the caller can track fractional cell +// usage (e.g. for centering the text). static void get_text_size(struct NEDsim * nedsim, const char * text, int * x_size, int * y_size) { @@ -212,40 +302,56 @@ get_text_size(struct NEDsim * nedsim, const char * text, int * x_size, int * y_s *y_size = overall.ascent - overall.descent; } -// TODO: Explain -// TODO: Note that this might leave the foreground color changed. -// Argument coordinates are in 'cells', not pixels. +// When specifying the rectangular area to draw, all coordinates and sizes are +// in units of 'cells'. 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... x_origin *= nedsim->cell_size; x_origin += nedsim->origin_x_offset; y_origin *= nedsim->cell_size; y_origin += nedsim->origin_y_offset; x_size *= nedsim->cell_size; y_size *= nedsim->cell_size; - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, x_origin, y_origin, x_size, y_size); + set_color(nedsim, color); + XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, + x_origin, y_origin, x_size, y_size + ); - set_color(nedsim, &color_list[nedsim->color_index].border); + // ...then give it a border, if requested. + set_color(nedsim, COLOR(border)); if (bord_top) { - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, x_origin, y_origin, x_size, nedsim->border_size); + XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, + x_origin, y_origin, + x_size, nedsim->border_size + ); } if (bord_bottom) { - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, x_origin, (y_origin + y_size - nedsim->border_size), x_size, nedsim->border_size); + XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, + x_origin, (y_origin + y_size - nedsim->border_size), + x_size, nedsim->border_size + ); } if (bord_left) { - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, x_origin, y_origin, nedsim->border_size, y_size); + XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, + x_origin, y_origin, + nedsim->border_size, y_size + ); } if (bord_right) { - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, (x_origin + x_size - nedsim->border_size), y_origin, nedsim->border_size, y_size); + XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, + (x_origin + x_size - nedsim->border_size), y_origin, + nedsim->border_size, y_size + ); } } -// TODO: Explain -// Arguments are in units of 'cells', not pixels. -// Will leave foreground color changed. -// Draws filled circle with upper left corner at x,y. +// Draws filled circle in a square area with upper left corner at x,y. When +// specifying the location and size to draw, all values are in units of +// 'cells'. static void draw_circular_area(struct NEDsim * nedsim, size_t x, size_t y, double diameter) { @@ -273,56 +379,185 @@ draw_circular_area(struct NEDsim * nedsim, size_t x, size_t y, double diameter) XFillArc(nedsim->dpy, nedsim->panel, nedsim->gc, x, y, diameter, diameter, 0, 360*64); } -// TODO: Explain +// Draws text in a square area with upper left corner at (x_origin,y_origin). +// Requires that set_font_size() has been run at least once. All values are in +// units of 'cells'. +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(text)); + + int text_x_size, text_y_size; + get_text_size(nedsim, text, &text_x_size, &text_y_size); + + int local_y_offset = ((y_size * nedsim->cell_size) - text_y_size) / 2; + int local_x_offset = 0; + if (horizontally_center) local_x_offset = ((x_size * nedsim->cell_size) - text_x_size) / 2; + + XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, + (x_origin * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), + ((y_origin + y_size) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), + text, strlen(text) + ); +} + +/* -------------------------------------------------------------------------- */ +/* Dynamic Panel Functions */ +/* -------------------------------------------------------------------------- */ + +// Draw the 32 lights corresponding to 'word' at coordinates ('x','y'). +// Note that this function ONLY draws the lights and is used each frame for +// updating the panel. To draw the wordline area itself, use draw_wordline(). +static void +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))) { + set_color(nedsim, COLOR(light_on)); + } else { + set_color(nedsim, COLOR(light_off)); + } + draw_circular_area(nedsim, x+i, y, WORDLINE_HEIGHT); + } +} + +// After the static front panel has been drawn at least once, this function +// updates all the dynamic parts of the panel (lights + text values) and is +// called every frame. +static void +update_display(struct NEDsim * nedsim) +{ + // Draw the halt indicator. + if (nedsim->nedstate->halted) { + set_color(nedsim, COLOR(error_on)); + } else { + 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) { + set_color(nedsim, COLOR(light_on)); + } else { + 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) { + set_color(nedsim, COLOR(light_on)); + } else { + 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. + for (int i = 0; i < SC_WIDTH; i++) { + if ((SC_WIDTH-1-i) == nedsim->nedstate->active_thread->sc) { + set_color(nedsim, COLOR(light_on)); + } else { + set_color(nedsim, COLOR(light_off)); + } + draw_circular_area(nedsim, + SC_X_OFFSET+i, SC_Y_OFFSET+SC_LABEL_HEIGHT, SC_LIGHT_HEIGHT + ); + } + + // Draw the PC. + draw_wordline_lights(nedsim, nedsim->nedstate->active_thread->pc, + PC_X_OFFSET, PC_Y_OFFSET+PC_LABEL_HEIGHT + ); + + // Draw the stack lights. + int64_t top_of_stack = ((int64_t)nedsim->nedstate->active_thread->sp) - 1; + 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 { + draw_wordline_lights(nedsim, 0, + STACK_X_OFFSET, STACK_Y_OFFSET+STACK_LABEL_HEIGHT+i + ); + } + } + + // Draw the stack size in text. + 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. + for (int i = 0; i < nedsim->num_data_rows; i++) { + draw_wordline_lights(nedsim, + ram_r_word(nedsim->nedstate, nedsim->heap_window_offset+(i*BPW)), + HEAP_X_OFFSET, HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT+i + ); + } +} + +/* -------------------------------------------------------------------------- */ +/* Static Panel Functions */ +/* -------------------------------------------------------------------------- */ + +// Draws the panel itself. Not the lights/labels/etc, but the flat sheet of +// metal that is the front panel. static void draw_panel(struct NEDsim * nedsim) { -// TODO: Collect all relevant #defines somewhere. -#define OVERALL_WIDTH_IN_CELLS 70 -#define HEADER_HEIGHT_IN_CELLS 14 -#define FOOTER_HEIGHT_IN_CELLS 2 + size_t overall_height_in_cells = HEADER_HEIGHT_IN_CELLS + nedsim->num_data_rows + FOOTER_HEIGHT_IN_CELLS; // 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. - set_color(nedsim, &color_list[nedsim->color_index].panel_fg); - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, - nedsim->origin_x_offset, - nedsim->origin_y_offset, - nedsim->cell_size * OVERALL_WIDTH_IN_CELLS, - nedsim->cell_size * (HEADER_HEIGHT_IN_CELLS + nedsim->num_data_rows + FOOTER_HEIGHT_IN_CELLS) + draw_rect_area(nedsim, COLOR(panel_fg), + 0, 0, + OVERALL_WIDTH_IN_CELLS, overall_height_in_cells, + False, False, False, False ); // Give the panel rounded corners by first deleting the four right-angle corners... - set_color(nedsim, &color_list[nedsim->color_index].panel_bg); - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, - nedsim->origin_x_offset, - nedsim->origin_y_offset, - nedsim->cell_size, - nedsim->cell_size + draw_rect_area(nedsim, COLOR(panel_bg), + 0, 0, + 1, 1, + False, False, False, False ); - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, - nedsim->origin_x_offset + (nedsim->cell_size * (OVERALL_WIDTH_IN_CELLS-1)), - nedsim->origin_y_offset, - nedsim->cell_size, - nedsim->cell_size + draw_rect_area(nedsim, COLOR(panel_bg), + OVERALL_WIDTH_IN_CELLS-1, 0, + 1, 1, + False, False, False, False ); - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, - nedsim->origin_x_offset, - nedsim->origin_y_offset + (nedsim->cell_size * (HEADER_HEIGHT_IN_CELLS + nedsim->num_data_rows + FOOTER_HEIGHT_IN_CELLS - 1)), - nedsim->cell_size, - nedsim->cell_size + draw_rect_area(nedsim, COLOR(panel_bg), + 0, overall_height_in_cells-1, + 1, 1, + False, False, False, False ); - XFillRectangle(nedsim->dpy, nedsim->panel, nedsim->gc, - nedsim->origin_x_offset + (nedsim->cell_size * (OVERALL_WIDTH_IN_CELLS-1)), - nedsim->origin_y_offset + (nedsim->cell_size * (HEADER_HEIGHT_IN_CELLS + nedsim->num_data_rows + FOOTER_HEIGHT_IN_CELLS - 1)), - nedsim->cell_size, - nedsim->cell_size + draw_rect_area(nedsim, COLOR(panel_bg), + OVERALL_WIDTH_IN_CELLS-1, overall_height_in_cells-1, + 1, 1, + False, False, False, False ); // ...and then replacing them with filled arcs, forming rounded corners. - set_color(nedsim, &color_list[nedsim->color_index].panel_fg); + // Note that we use XFillArc() instead of draw_circular_area() since we do + // not desire any padding. + set_color(nedsim, COLOR(panel_fg)); XFillArc(nedsim->dpy, nedsim->panel, nedsim->gc, nedsim->origin_x_offset, nedsim->origin_y_offset, @@ -337,341 +572,176 @@ draw_panel(struct NEDsim * nedsim) ); XFillArc(nedsim->dpy, nedsim->panel, nedsim->gc, nedsim->origin_x_offset, - nedsim->origin_y_offset + (nedsim->cell_size * (HEADER_HEIGHT_IN_CELLS + nedsim->num_data_rows + FOOTER_HEIGHT_IN_CELLS - 2)), + nedsim->origin_y_offset + (nedsim->cell_size * (overall_height_in_cells-2)), nedsim->cell_size * 2, nedsim->cell_size * 2, 180*64, 90*64 ); XFillArc(nedsim->dpy, nedsim->panel, nedsim->gc, nedsim->origin_x_offset + (nedsim->cell_size * (OVERALL_WIDTH_IN_CELLS-2)), - nedsim->origin_y_offset + (nedsim->cell_size * (HEADER_HEIGHT_IN_CELLS + nedsim->num_data_rows + FOOTER_HEIGHT_IN_CELLS - 2)), + nedsim->origin_y_offset + (nedsim->cell_size * (overall_height_in_cells-2)), nedsim->cell_size * 2, nedsim->cell_size * 2, 0, -90*64 ); } -// TODO: Explain static void draw_logo(struct NEDsim * nedsim) { -#define LOGO_X_OFFSET 2 -#define LOGO_Y_OFFSET 2 -#define LOGO_WIDTH 20 -#define LOGO_NAME_HEIGHT 6 -#define LOGO_WEBSITE_HEIGHT 2 - - // 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); - - // Now draw the 'NED' text in the top box. - set_color(nedsim, &color_list[nedsim->color_index].text); + 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 + ); set_font_size(nedsim, LOGO_NAME_HEIGHT); - int text_x_size, text_y_size; - get_text_size(nedsim, "NED", &text_x_size, &text_y_size); - int local_x_offset = ((LOGO_WIDTH * nedsim->cell_size) - text_x_size) / 2; - int local_y_offset = ((LOGO_NAME_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (LOGO_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((LOGO_Y_OFFSET+LOGO_NAME_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "NED", 3); - - // And draw the 'subgeniuskitty.com' text in the bottom box. + draw_text(nedsim, "NED", LOGO_X_OFFSET, LOGO_Y_OFFSET, + LOGO_WIDTH, LOGO_NAME_HEIGHT, True + ); set_font_size(nedsim, LOGO_WEBSITE_HEIGHT); - get_text_size(nedsim, "subgeniuskitty.com", &text_x_size, &text_y_size); - local_x_offset = ((LOGO_WIDTH * nedsim->cell_size) - text_x_size) / 2; - local_y_offset = ((LOGO_WEBSITE_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (LOGO_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((LOGO_Y_OFFSET+LOGO_NAME_HEIGHT+LOGO_WEBSITE_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "subgeniuskitty.com", 18); + draw_text(nedsim, "subgeniuskitty.com", LOGO_X_OFFSET, LOGO_Y_OFFSET+LOGO_NAME_HEIGHT, + LOGO_WIDTH, LOGO_WEBSITE_HEIGHT, True + ); } -// TODO: Explain static void draw_halt(struct NEDsim * nedsim) { -#define HALT_X_OFFSET 26 -#define HALT_Y_OFFSET 2 -#define HALT_WIDTH 6 -#define HALT_LIGHT_HEIGHT 6 -#define HALT_LABEL_HEIGHT 2 - - // 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); - - // And finally, draw the label. - set_color(nedsim, &color_list[nedsim->color_index].text); - int text_x_size, text_y_size; - get_text_size(nedsim, "HALT", &text_x_size, &text_y_size); - int local_x_offset = ((HALT_WIDTH * nedsim->cell_size) - text_x_size) / 2; - int local_y_offset = ((HALT_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (HALT_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((HALT_Y_OFFSET+HALT_LIGHT_HEIGHT+HALT_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "HALT", 4); -} - -// TODO: Explain -static void -draw_wordline_lights(struct NEDsim * nedsim, uint32_t word, int x, int y) -{ -#define WORDLINE_BITS_PER_STRIPE 4 -#define WORDLINE_WIDTH 32 -#define WORDLINE_HEIGHT 1 - - 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); - } else { - set_color(nedsim, &color_list[nedsim->color_index].light_off); - } - draw_circular_area(nedsim, x+i, y, WORDLINE_HEIGHT); - } + 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 + ); + draw_text(nedsim, "HALT", HALT_X_OFFSET, HALT_Y_OFFSET+HALT_LIGHT_HEIGHT, + HALT_WIDTH, HALT_LABEL_HEIGHT, True + ); } -// TODO: Explain +// Draw a single 32-bit NED word line at coordinates ('x','y'). To update with +// a specific value, call draw_wordline_lights() after drawing the wordline +// area at least once. 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. - 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. - 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, - WORDLINE_BITS_PER_STRIPE, WORDLINE_HEIGHT, False, True, False, False); + 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 + ); } - - // Finally, draw the lights. - draw_wordline_lights(nedsim, 0, x, y); } -// TODO: Explain static void draw_pc(struct NEDsim * nedsim) { -// TODO: Note that all #defines use units of 'cells', not 'pixels', etc. -#define PC_X_OFFSET 36 -#define PC_Y_OFFSET 7 -#define PC_WIDTH 32 -#define PC_LABEL_HEIGHT 2 -#define PC_LIGHT_HEIGHT 1 - - // 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". - set_color(nedsim, &color_list[nedsim->color_index].text); - int text_x_size, text_y_size; - get_text_size(nedsim, "PC", &text_x_size, &text_y_size); - int local_x_offset = ((PC_WIDTH * nedsim->cell_size) - text_x_size) / 2; - int local_y_offset = ((PC_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (PC_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((PC_Y_OFFSET+PC_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "PC", 2); + draw_text(nedsim, "PC", PC_X_OFFSET, PC_Y_OFFSET, PC_WIDTH, PC_LABEL_HEIGHT, True); } -// TODO: Explain static void draw_sc(struct NEDsim * nedsim) { -#define SC_X_OFFSET 42 -#define SC_Y_OFFSET 2 -#define SC_WIDTH 5 -#define SC_LABEL_HEIGHT 2 -#define SC_LIGHT_HEIGHT 1 - - // 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); - - // Now draw the label text "SC". - set_color(nedsim, &color_list[nedsim->color_index].text); - int text_x_size, text_y_size; - get_text_size(nedsim, "SC", &text_x_size, &text_y_size); - int local_x_offset = ((SC_WIDTH * nedsim->cell_size) - text_x_size) / 2; - int local_y_offset = ((SC_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (SC_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((SC_Y_OFFSET+SC_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "SC", 2); + 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 + ); + draw_text(nedsim, "SC", SC_X_OFFSET, SC_Y_OFFSET, SC_WIDTH, SC_LABEL_HEIGHT, True); } -// TODO: Explain static void draw_psw(struct NEDsim * nedsim) { -#define PSW_N_X_OFFSET 51 -#define PSW_Z_X_OFFSET 58 -#define PSW_Y_OFFSET 2 -#define PSW_LABEL_WIDTH 3 -#define PSW_LABEL_HEIGHT 2 -#define PSW_LIGHT_WIDTH 1 -#define PSW_LIGHT_HEIGHT 1 - - // 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); - - // Now draw the label text "N". - set_color(nedsim, &color_list[nedsim->color_index].text); - int text_x_size, text_y_size; - get_text_size(nedsim, "N", &text_x_size, &text_y_size); - int local_x_offset = ((PSW_LABEL_WIDTH * nedsim->cell_size) - text_x_size) / 2; - int local_y_offset = ((PSW_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (PSW_N_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((PSW_Y_OFFSET+PSW_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "N", 1); - - // Now draw the label text "Z". - set_color(nedsim, &color_list[nedsim->color_index].text); - get_text_size(nedsim, "Z", &text_x_size, &text_y_size); - local_x_offset = ((PSW_LABEL_WIDTH * nedsim->cell_size) - text_x_size) / 2; - local_y_offset = ((PSW_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, (PSW_Z_X_OFFSET * nedsim->cell_size + nedsim->origin_x_offset + local_x_offset), - ((PSW_Y_OFFSET+PSW_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "Z", 1); + 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 + ); + draw_text(nedsim, "N", PSW_N_X_OFFSET, PSW_Y_OFFSET, + PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True + ); + draw_text(nedsim, "Z", PSW_Z_X_OFFSET, PSW_Y_OFFSET, + PSW_LABEL_WIDTH, PSW_LABEL_HEIGHT, True + ); } -// TODO: Explain static void draw_stack(struct NEDsim * nedsim) { -#define STACK_X_OFFSET 2 -#define STACK_Y_OFFSET 12 -#define STACK_WIDTH 32 -#define STACK_LABEL_HEIGHT 2 -#define STACK_LIGHT_HEIGHT 1 - - // 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); } - - // Now draw the label text "Stack Size:". - set_color(nedsim, &color_list[nedsim->color_index].text); - int text_x_size, text_y_size; - get_text_size(nedsim, "Stack Size:", &text_x_size, &text_y_size); - int local_y_offset = ((STACK_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, ((STACK_X_OFFSET + 1) * nedsim->cell_size + nedsim->origin_x_offset), - ((STACK_Y_OFFSET+STACK_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "Stack Size:", 11); + draw_text(nedsim, "Stack Size:", STACK_X_OFFSET+1, STACK_Y_OFFSET, + STACK_WIDTH, STACK_LABEL_HEIGHT, False + ); } -// TODO: Explain static void draw_heap(struct NEDsim * nedsim) { -#define HEAP_X_OFFSET 36 -#define HEAP_Y_OFFSET 12 -#define HEAP_WIDTH 32 -#define HEAP_LABEL_HEIGHT 2 -#define HEAP_LIGHT_HEIGHT 1 -// TODO: What should I do about this define? I would like to be able to specify the address so I can do things like display the code itself if nothign interesting happens in RAM. -#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); } - - // Now draw the label text "RAM Base:". - set_color(nedsim, &color_list[nedsim->color_index].text); - int text_x_size, text_y_size; - get_text_size(nedsim, "RAM Base:", &text_x_size, &text_y_size); - int local_y_offset = ((HEAP_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, ((HEAP_X_OFFSET + 1) * nedsim->cell_size + nedsim->origin_x_offset), - ((HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), "RAM Base:", 9); - - // Now draw the address text. - set_color(nedsim, &color_list[nedsim->color_index].text); + draw_text(nedsim, "RAM Base:", HEAP_X_OFFSET+1, HEAP_Y_OFFSET, + HEAP_WIDTH, HEAP_LABEL_HEIGHT, False + ); char address[11]; - snprintf(address, sizeof(address), "0x%08X", HEAP_START_ADDRESS); - get_text_size(nedsim, address, &text_x_size, &text_y_size); - local_y_offset = ((HEAP_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, ((HEAP_X_OFFSET + 1 + (HEAP_WIDTH / 2)) * nedsim->cell_size + nedsim->origin_x_offset), - ((HEAP_Y_OFFSET+HEAP_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), address, strlen(address)); -} - -// TODO: Explain -static void -update_display(struct NEDsim * nedsim) -{ - // Draw the halt indicator. - if (nedsim->nedstate->halted) { - set_color(nedsim, &color_list[nedsim->color_index].error_on); - } else { - set_color(nedsim, &color_list[nedsim->color_index].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) { - set_color(nedsim, &color_list[nedsim->color_index].light_on); - } else { - set_color(nedsim, &color_list[nedsim->color_index].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) { - set_color(nedsim, &color_list[nedsim->color_index].light_on); - } else { - set_color(nedsim, &color_list[nedsim->color_index].light_off); - } - 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++) { - if ((SC_WIDTH-1-i) == nedsim->nedstate->active_thread->sc) { - set_color(nedsim, &color_list[nedsim->color_index].light_on); - } else { - set_color(nedsim, &color_list[nedsim->color_index].light_off); - } - draw_circular_area(nedsim, SC_X_OFFSET+i, SC_Y_OFFSET+SC_LABEL_HEIGHT, SC_LIGHT_HEIGHT); - } - - // Draw the PC. - draw_wordline_lights(nedsim, nedsim->nedstate->active_thread->pc, PC_X_OFFSET, PC_Y_OFFSET+PC_LABEL_HEIGHT); - - // 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++) { - 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 { - draw_wordline_lights(nedsim, 0, STACK_X_OFFSET, STACK_Y_OFFSET+STACK_LABEL_HEIGHT+i); - } - } - - // 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); - set_color(nedsim, &color_list[nedsim->color_index].text); - char stack_size[11]; - snprintf(stack_size, sizeof(stack_size), "0x%08X", nedsim->nedstate->active_thread->sp); - int text_x_size, text_y_size; - get_text_size(nedsim, stack_size, &text_x_size, &text_y_size); - int local_y_offset = ((STACK_LABEL_HEIGHT * nedsim->cell_size) - text_y_size) / 2; - XDrawString(nedsim->dpy, nedsim->panel, nedsim->gc, ((STACK_X_OFFSET + 1 + (STACK_WIDTH / 2)) * nedsim->cell_size + nedsim->origin_x_offset), - ((STACK_Y_OFFSET+STACK_LABEL_HEIGHT) * nedsim->cell_size + nedsim->origin_y_offset - local_y_offset), stack_size, strlen(stack_size)); - - // Draw the heap lights. - for (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); - } + snprintf(address, sizeof(address), "0x%08X", nedsim->heap_window_offset); + draw_text(nedsim, address, (HEAP_X_OFFSET+(HEAP_WIDTH/2)+1), HEAP_Y_OFFSET, + HEAP_WIDTH, HEAP_LABEL_HEIGHT, False + ); } /* -------------------------------------------------------------------------- */ @@ -696,7 +766,6 @@ NEDsim_free(Display * dpy, Window win, void * closure) free(nedsim->nedstate); } - // TODO: Replace all this with proper code to free everything related to the screensaver itself. XFreeGC(nedsim->dpy, nedsim->gc); XFreePixmap(nedsim->dpy, nedsim->panel); free(nedsim); @@ -705,9 +774,7 @@ NEDsim_free(Display * dpy, Window win, void * closure) static void * NEDsim_init(Display * dpy, Window win) { - // ========================================================================= - // Basic Setup - // ========================================================================= + // Basic Setup --------------------------------------------------------------------------------- struct NEDsim * nedsim; @@ -730,9 +797,7 @@ NEDsim_init(Display * dpy, Window win) nedsim->panel = XCreatePixmap(nedsim->dpy, nedsim->win, nedsim->dpy_width, nedsim->dpy_height, xgwa.depth); - // ========================================================================= - // Process User Requests - // ========================================================================= + // Process User Requests ----------------------------------------------------------------------- nedsim->delay = get_integer_resource(nedsim->dpy, "delay", "Integer"); nedsim->delay *= 1000; /* Turn milliseconds into microseconds. */ @@ -741,10 +806,18 @@ NEDsim_init(Display * dpy, Window win) // of the included programs. char * input_file = get_string_resource(nedsim->dpy, "binary", "String"); if (input_file == NULL) { - // TODO: Need to include some default programs and randomly select one to load into RAM. - nedsim->nedstate = init_simulator("./test.out"); + size_t id = random() % sizeof(ned_programs)/sizeof(ned_programs[0]); + nedsim->nedstate = init_simulator(NULL, ned_programs[id].binary_blob, ned_programs[id].blob_size); + nedsim->heap_window_offset = ned_programs[id].heap_window_offset; } else { - nedsim->nedstate = init_simulator(input_file); + nedsim->nedstate = init_simulator(input_file, NULL, 0); + // Note: Since we're accepting this as a runtime CLI option, we really + // should verify that `heap_window_offset+num_data_rows` doesn't exceed + // the limits of NED's simulated RAM. However, since the RAM size is a + // #define located in the simulator itself, and since I mostly plan to + // use this screensaver with built-in programs, for now we'll just let + // it segfault if the user requests a window outside simulated RAM. + nedsim->heap_window_offset = get_integer_resource(nedsim->dpy, "heapwindow", "Integer"); } // If the user did not select a color scheme, select one randomly. @@ -756,9 +829,7 @@ NEDsim_init(Display * dpy, Window win) nedsim->color_index = 0; } - // ========================================================================= - // Scale Panel To Screen - // ========================================================================= + // Scale Panel To Screen ----------------------------------------------------------------------- // We desire to make the panel as wide as possible while also making the // cell size an integer pixel size. @@ -779,8 +850,8 @@ NEDsim_init(Display * dpy, Window win) int available_space_for_data_rows = nedsim->dpy_height - (nedsim->cell_size * (HEADER_HEIGHT_IN_CELLS + FOOTER_HEIGHT_IN_CELLS)); for (int i = 0; ; i++) { - if ((nedsim->cell_size * (1 << i)) > available_space_for_data_rows) { - nedsim->num_data_rows = (1 << --i); + if ((nedsim->cell_size * i) > available_space_for_data_rows) { + nedsim->num_data_rows = --i; break; } } @@ -796,9 +867,7 @@ NEDsim_init(Display * dpy, Window win) // Scale border relative to cell_size in a 1:10 relationship. nedsim->border_size = nedsim->cell_size / 10; - // ========================================================================= - // Draw Initial Panel - // ========================================================================= + // Draw Initial Panel -------------------------------------------------------------------------- draw_panel(nedsim); draw_logo(nedsim); @@ -824,7 +893,7 @@ NEDsim_draw(Display * dpy, Window win, void * closure) 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); } @@ -856,7 +925,8 @@ NEDsim_reshape(Display * dpy, Window win, void * closure, unsigned int w, unsign static const char * NEDsim_defaults[] = { "*delay: 250", - "*color: -1", + "*color: -1", + "*heapwindow: 0x20000000", 0 }; @@ -864,6 +934,7 @@ static XrmOptionDescRec NEDsim_options[] = { { "-delay", ".delay", XrmoptionSepArg, 0 }, { "-binary", ".binary", XrmoptionSepArg, 0 }, { "-color", ".color", XrmoptionSepArg, 0 }, + { "-heapwindow", ".heapwindow", XrmoptionSepArg, 0 }, { 0, 0, 0, 0 } };