summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--ldmicro/CMakeLists.txt2
-rw-r--r--ldmicro/includes/ldmicro.h11
-rw-r--r--ldmicro/ldmicro.cpp43
-rw-r--r--ldmicro/lib/linuxUI/linuxLD.h1
-rw-r--r--ldmicro/lib/linuxUI/linuxUI.h4
-rw-r--r--ldmicro/maincontrols.cpp1336
7 files changed, 629 insertions, 769 deletions
diff --git a/.gitignore b/.gitignore
index 8ccb061..3bc69a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/ldmicro/testMain.cpp
/ldmicro/reg/results/*
/ldmicro/includes/testMain.h
+LDMicro-linux-Workspace.code-workspace
diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt
index 7ded52c..49668a3 100644
--- a/ldmicro/CMakeLists.txt
+++ b/ldmicro/CMakeLists.txt
@@ -149,4 +149,4 @@ IF(UNIX)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/reg
COMMAND perl run-tests.pl)
-ENDIF(UNIX) \ No newline at end of file
+ENDIF(UNIX)
diff --git a/ldmicro/includes/ldmicro.h b/ldmicro/includes/ldmicro.h
index caa154d..8dd8127 100644
--- a/ldmicro/includes/ldmicro.h
+++ b/ldmicro/includes/ldmicro.h
@@ -48,6 +48,8 @@ typedef signed long SDWORD;
// Constants for the GUI. We have drop-down menus, a listview for the I/Os,
// etc.
+#define NUM_SUPPORTED_MCUS 16
+
// Menu IDs
extern HMENU MNU_NEW;
extern HMENU MNU_OPEN;
@@ -106,7 +108,8 @@ extern HMENU MNU_MAKE_RESET_ONLY;
extern HMENU MNU_INSERT_PWL;
extern HMENU MNU_MCU_SETTINGS;
-extern HMENU MNU_PROCESSOR_0;
+extern HMENU MNU_PROCESSOR[NUM_SUPPORTED_MCUS+1];
+extern HMENU MNU_MICRO_CONTROLLER;
extern HMENU MNU_SIMULATION_MODE;
extern HMENU MNU_START_SIMULATION;
@@ -499,8 +502,6 @@ typedef struct McuIoInfoTag {
DWORD configurationWord;
} McuIoInfo;
-#define NUM_SUPPORTED_MCUS 16
-
//-----------------------------------------------
// Function prototypes
@@ -542,7 +543,7 @@ void UpdateMainWindowTitleBar(void);
extern int ScrollWidth;
extern int ScrollHeight;
extern BOOL NeedHoriz;
-extern HWND IoList;
+extern HLIST IoList;
extern int IoListTop;
extern int IoListHeight;
@@ -727,6 +728,7 @@ extern BOOL DialogCancel;
// lang.cpp
char *_(char *in);
+
// simulate.cpp
void SimulateOneCycle(BOOL forceRefresh);
void CALLBACK PlcCycleTimer(HWND hwnd, UINT msg, UINT_PTR id, DWORD time);
@@ -741,6 +743,7 @@ SWORD GetAdcShadow(char *name);
void DestroyUartSimulationWindow(void);
void ShowUartSimulationWindow(void);
extern BOOL InSimulationMode;
+
extern BOOL SimulateRedrawAfterNextCycle;
// compilecommon.cpp
diff --git a/ldmicro/ldmicro.cpp b/ldmicro/ldmicro.cpp
index 37e35a1..6bb39d2 100644
--- a/ldmicro/ldmicro.cpp
+++ b/ldmicro/ldmicro.cpp
@@ -195,7 +195,7 @@ static void CompileProgram(BOOL compileAs)
default: oops();
}
-// IntDumpListing("t.pl");
+ IntDumpListing("t.pl");
}
//-----------------------------------------------------------------------------
@@ -1026,7 +1026,13 @@ static void CompileProgram(BOOL compileAs)
// return RegisterClassEx(&wc);
// }
+void LDMicro_close(HWND window)
+{
+ FreezeWindowPos(MainWindow);
+ FreezeDWORD(IoListHeight);
+ gtk_main_quit();
+}
//-----------------------------------------------------------------------------
// Entry point into the program.
//-----------------------------------------------------------------------------
@@ -1098,11 +1104,36 @@ int main(int argc, char** argv)
MainWindow=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(MainWindow), "LDMicro");
+ g_signal_connect (MainWindow, "delete_event", G_CALLBACK (LDMicro_close), NULL);
+ gtk_window_set_default_size (GTK_WINDOW (MainWindow), 600, 400);
+ gtk_window_resize (GTK_WINDOW (MainWindow), 600, 400);
+
+ ThawWindowPos(MainWindow);
+ ThawDWORD(IoListHeight);
+
gtk_widget_show(MainWindow);
+
+ // Title bar
+ UpdateMainWindowTitleBar();
- /// BODY
+ // Splitting the window
+ MakeMainWindowControls();
+
+ // Calling the Simulation functions
+
+ StartSimulation();
+ SetMenusEnabled(true, true, false,
+ true, false, false, false,
+ true, true, true);
+ // ToggleSimulationMode();
+ // GenerateIoListDontLoseSelection();
+ StopSimulation();
+
+ // Displaying the window
+ gtk_widget_show_all(MainWindow);
gtk_main();
+
// /// ~~~
// Instance = hInstance; /// parent window
@@ -1182,8 +1213,6 @@ int main(int argc, char** argv)
// TranslateMessage(&msg);
// DispatchMessage(&msg);
// }
- // FreezeWindowPos(MainWindow);
- // FreezeDWORD(IoListHeight);
-
- return 0;
-}
+
+ return EXIT_SUCCESS;
+} \ No newline at end of file
diff --git a/ldmicro/lib/linuxUI/linuxLD.h b/ldmicro/lib/linuxUI/linuxLD.h
index e204c63..831a7c5 100644
--- a/ldmicro/lib/linuxUI/linuxLD.h
+++ b/ldmicro/lib/linuxUI/linuxLD.h
@@ -61,6 +61,7 @@ typedef HANDLE HDC;
typedef GtkWidget *HWID;
typedef GtkWidget *HMENU;
typedef GtkWindow *HWND;
+typedef GtkListStore *HLIST;
typedef GtkApplication *HAPP;
/// Check if system is x64 or x86
diff --git a/ldmicro/lib/linuxUI/linuxUI.h b/ldmicro/lib/linuxUI/linuxUI.h
index 09aa981..7cb4d55 100644
--- a/ldmicro/lib/linuxUI/linuxUI.h
+++ b/ldmicro/lib/linuxUI/linuxUI.h
@@ -43,8 +43,8 @@ extern const UINT MF_CHECKED;
extern const UINT MF_UNCHECKED;
/// ListStore
-extern GtkWidget* view;
-extern GtkTreeViewColumn* column;
+extern GtkWidget *view;
+extern GtkTreeViewColumn *column;
/// data types
typedef struct OpenFileInfoData {
diff --git a/ldmicro/maincontrols.cpp b/ldmicro/maincontrols.cpp
index 06143ad..330d5e1 100644
--- a/ldmicro/maincontrols.cpp
+++ b/ldmicro/maincontrols.cpp
@@ -23,6 +23,7 @@
// Jonathan Westhues, Nov 2004
//-----------------------------------------------------------------------------
#include "linuxUI.h"
+#include <typeinfo>
//#include <commctrl.h>
//#include <commdlg.h>
#include <stdio.h>
@@ -87,7 +88,8 @@ HMENU MNU_MAKE_RESET_ONLY;
HMENU MNU_INSERT_PWL;
HMENU MNU_MCU_SETTINGS;
-HMENU MNU_PROCESSOR_0;
+HMENU MNU_PROCESSOR[NUM_SUPPORTED_MCUS+1];
+HMENU MNU_MICRO_CONTROLLER; // Item for Microcontroller
HMENU MNU_SIMULATION_MODE;
HMENU MNU_START_SIMULATION;
@@ -103,123 +105,396 @@ HMENU MNU_ABOUT;
// scrollbars for the ladder logic area
// static HWND HorizScrollBar;
// static HWND VertScrollBar;
-int ScrollWidth;
-int ScrollHeight;
-BOOL NeedHoriz;
+// int ScrollWidth;
+// int ScrollHeight;
+// BOOL NeedHoriz;
// status bar at the bottom of the screen, to display settings
-// static HWND StatusBar;
+static HMENU StatusBar;
// have to get back to the menus to gray/ungray, check/uncheck things
-// static HMENU FileMenu;
-// static HMENU EditMenu;
-// static HMENU InstructionMenu;
-// static HMENU ProcessorMenu;
-// static HMENU SimulateMenu;
-// static HMENU TopMenu;
+static HMENU FileMenu;
+static HMENU EditMenu;
+static HMENU InstructionMenu;
+static HMENU ProcessorMenu;
+static HMENU SimulateMenu;
+static HMENU TopMenu; // Menu Bar
+static HMENU settings;
+static HMENU compile;
+static HMENU help;
+static HMENU ScrollWindow;
// listview used to maintain the list of I/O pins with symbolic names, plus
// the internal relay too
-// HWND IoList;
+HLIST IoList;
static int IoListSelectionPoint;
static BOOL IoListOutOfSync;
int IoListHeight;
int IoListTop;
+GtkTreeIter* iter = new GtkTreeIter;
+GtkTreeModel **IoListPtr = (GtkTreeModel**)GTK_TREE_MODEL (IoList);
// whether the simulation is running in real time
static BOOL RealTimeSimulationRunning;
//-----------------------------------------------------------------------------
+// Create the top-level menu bar for the main window. Mostly static, but we
+// create the "select processor" menu from the list in mcutable.h dynamically.
+//-----------------------------------------------------------------------------
+HMENU MakeMainWindowMenus(void)
+{
+ HMENU MenuBox; // Box for alignment
+ HMENU PackedMenuBox; // Stores the packed box
+ HMENU TopMenu; // Menu Bar
+ HWID FileLabel; // File menu label
+ HWID EditLabel; // Edit menu label
+ HWID InstructionLabel; // Instruction menu label
+ HWID SettingsLabel; // Settings menu label
+ HWID CompileLabel; // Compile menu label
+ HWID HelpLabel; // Help menu label
+ HWID SimulateLabel; // Simulate menu label
+ HMENU ProcessorMenuItems; // Processor menu items
+ HMENU FileMenuSeparator; // File menu separator
+ HMENU EditMenuSeparator; // Edit menu separator
+ HMENU InstructionMenuSeparator; // Instruction menu separator
+ HMENU SimulateMenuSeparator; // Simulate menu separator
+
+ int i;
+ // Creating a box for desired orientation
+ MenuBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+
+ // Create new menu bar to hold menu and add it to window
+ TopMenu = gtk_menu_bar_new();
+
+ // Creating various menus
+ FileMenu = gtk_menu_new();
+ EditMenu = gtk_menu_new();
+ settings = gtk_menu_new();
+ ProcessorMenu = gtk_menu_new();
+ InstructionMenu = gtk_menu_new();
+ SimulateMenu = gtk_menu_new();
+ compile = gtk_menu_new();
+ help = gtk_menu_new();
+
+ // Creating labels for each menu
+ FileLabel = gtk_menu_item_new_with_label("File");
+ EditLabel = gtk_menu_item_new_with_label("Edit");
+ SettingsLabel = gtk_menu_item_new_with_label("Settings");
+ InstructionLabel = gtk_menu_item_new_with_label("Instructions");
+ SimulateLabel = gtk_menu_item_new_with_label("Simulate");
+ CompileLabel = gtk_menu_item_new_with_label("Compile");
+ HelpLabel = gtk_menu_item_new_with_label("Help");
+
+ // Creating labels for File Menu
+ MNU_NEW = gtk_menu_item_new_with_label("New");
+ MNU_OPEN = gtk_menu_item_new_with_label("Open");
+ MNU_SAVE = gtk_menu_item_new_with_label("Save");
+ MNU_SAVE_AS = gtk_menu_item_new_with_label("Save As");
+ MNU_EXPORT = gtk_menu_item_new_with_label("Export As Text");
+ MNU_EXIT = gtk_menu_item_new_with_label("Exit");
+
+ // Appending menu items (labels) to File menu and adding separators
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_NEW); // Appending menu items
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_OPEN);
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE);
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE_AS);
+ FileMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXPORT);
+ FileMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
+ gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXIT);
+
+ // Creating labels for Edit Menu
+ MNU_UNDO = gtk_menu_item_new_with_label("Undo");
+ MNU_REDO = gtk_menu_item_new_with_label("Redo");
+ MNU_INSERT_RUNG_BEFORE = gtk_menu_item_new_with_label("Insert rung Before");
+ MNU_INSERT_RUNG_AFTER = gtk_menu_item_new_with_label("Insert Rung After");
+ MNU_PUSH_RUNG_UP = gtk_menu_item_new_with_label("Move Selected Rung Up");
+ MNU_PUSH_RUNG_DOWN = gtk_menu_item_new_with_label("Move Selected Rung Down");
+ MNU_DELETE_ELEMENT = gtk_menu_item_new_with_label("Delete Selected Element");
+ MNU_DELETE_RUNG = gtk_menu_item_new_with_label("Delete Rung");
+
+ // Appending menu items to Edit menu and adding separators
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_UNDO);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_REDO);
+ EditMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_BEFORE);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_AFTER);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_UP);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_DOWN);
+ EditMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_ELEMENT);
+ gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_RUNG);
+
+ // Creating labels for Settings Menu
+ MNU_MCU_SETTINGS = gtk_menu_item_new_with_label ("MCU Parameters...");
+ MNU_MICRO_CONTROLLER = gtk_menu_item_new_with_label ("Microcontroller");
+
+ // Appending menu items to Settings menu
+ gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_MCU_SETTINGS);
+ gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_MICRO_CONTROLLER);
+
+ // Appending the microcontroller names to "Microcontroller" item
+ for (i = 0; i < NUM_SUPPORTED_MCUS; i++){
+ MNU_PROCESSOR[i] = gtk_check_menu_item_new_with_label (SupportedMcus[i].mcuName);
+ gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), MNU_PROCESSOR[i]);
+ }
+
+ MNU_PROCESSOR[NUM_SUPPORTED_MCUS] = gtk_check_menu_item_new_with_label ("(no microcontroller)");
+ gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), MNU_PROCESSOR[NUM_SUPPORTED_MCUS]);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(MNU_MICRO_CONTROLLER), ProcessorMenu);
+
+ // Creating labels for Instruction Menu and adding separators
+ MNU_INSERT_COMMENT = gtk_menu_item_new_with_label("Insert Comment");
+ MNU_INSERT_CONTACTS = gtk_menu_item_new_with_label("Insert Contacts");
+ MNU_INSERT_OSR = gtk_menu_item_new_with_label("Insert OSR (One Shot Rising)");
+ MNU_INSERT_OSF = gtk_menu_item_new_with_label("Insert OSF (One Shot Falling)");
+ MNU_INSERT_TON = gtk_menu_item_new_with_label("Insert TON (Delayed Turn On)");
+ MNU_INSERT_TOF = gtk_menu_item_new_with_label("Insert TOF (Delayed Turn Off)");
+ MNU_INSERT_RTO = gtk_menu_item_new_with_label("Insert RTO (Retentive Delayed Turn On)");
+ MNU_INSERT_CTU = gtk_menu_item_new_with_label("Insert CTU (Count Up)");
+ MNU_INSERT_CTD = gtk_menu_item_new_with_label("Insert CTD (Count Down)");
+ MNU_INSERT_CTC = gtk_menu_item_new_with_label("Insert CTC (Count Circular)");
+ MNU_INSERT_EQU = gtk_menu_item_new_with_label("Insert EQU (Compare for Equals)");
+ MNU_INSERT_NEQ = gtk_menu_item_new_with_label("Insert NEQ (Compare for Not Equals)");
+ MNU_INSERT_GRT = gtk_menu_item_new_with_label("Insert GRT (Compare for Greater Than)");
+ MNU_INSERT_GEQ = gtk_menu_item_new_with_label("Insert GEQ (Compare for Greater Than or Equal)");
+ MNU_INSERT_LES = gtk_menu_item_new_with_label("Insert LES (Compare for Less Than)");
+ MNU_INSERT_LEQ = gtk_menu_item_new_with_label("Insert LEQ (Compare for Less Than or Equal)");
+ MNU_INSERT_OPEN = gtk_menu_item_new_with_label("Insert Open Circuit");
+ MNU_INSERT_SHORT = gtk_menu_item_new_with_label("Insert Short Circuit");
+ MNU_INSERT_MASTER_RLY = gtk_menu_item_new_with_label("Insert Master Control Relay");
+ MNU_INSERT_COIL = gtk_menu_item_new_with_label("Insert Coil");
+ MNU_INSERT_RES = gtk_menu_item_new_with_label("Insert RES (Counter/RTO Reset)");
+ MNU_INSERT_MOV = gtk_menu_item_new_with_label("Insert MOV (Move)");
+ MNU_INSERT_ADD = gtk_menu_item_new_with_label("Insert ADD (16-bit Integer Ad)");
+ MNU_INSERT_SUB = gtk_menu_item_new_with_label("Insert SUB (16-bit Integer Subtract)");
+ MNU_INSERT_MUL = gtk_menu_item_new_with_label("Insert MUL (16-bit Integer Multiply)");
+ MNU_INSERT_DIV = gtk_menu_item_new_with_label("Insert DIV (16-bit Integer Division)");
+ MNU_INSERT_SHIFT_REG = gtk_menu_item_new_with_label("Insert Shift Register");
+ MNU_INSERT_LUT = gtk_menu_item_new_with_label("Insert Look-Up Table");
+ MNU_INSERT_PWL = gtk_menu_item_new_with_label("Insert Piecewise Linear");
+ MNU_INSERT_FMTD_STR = gtk_menu_item_new_with_label("Insert Formatted String Over UART");
+ MNU_INSERT_UART_SEND = gtk_menu_item_new_with_label("Insert UART Send");
+ MNU_INSERT_UART_RECV = gtk_menu_item_new_with_label("Insert UART Receive");
+ MNU_INSERT_SET_PWM = gtk_menu_item_new_with_label("Insert Set PWM Output");
+ MNU_INSERT_READ_ADC = gtk_menu_item_new_with_label("Insert A/D Converter Read");
+ MNU_INSERT_PERSIST = gtk_menu_item_new_with_label("Insert Make Persistent");
+ MNU_MAKE_NORMAL = gtk_menu_item_new_with_label("Make Normal");
+ MNU_NEGATE = gtk_menu_item_new_with_label("Make Negated");
+ MNU_MAKE_SET_ONLY = gtk_menu_item_new_with_label("Make Set-Only");
+ MNU_MAKE_RESET_ONLY = gtk_menu_item_new_with_label("Make Reset-Only");
+
+ // Appending menu items to Instruction menu and adding separators
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COMMENT);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CONTACTS);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSR);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSF);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TON);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TOF);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RTO);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTU);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTD);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTC);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_EQU);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_NEQ);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GRT);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GEQ);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LES);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LEQ);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OPEN);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHORT);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MASTER_RLY);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COIL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RES);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MOV);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_ADD);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SUB);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MUL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_DIV);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHIFT_REG);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LUT);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PWL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_FMTD_STR);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_SEND);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_RECV);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SET_PWM);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_READ_ADC);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PERSIST);
+ InstructionMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_NORMAL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_NEGATE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_SET_ONLY);
+ gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_RESET_ONLY);
+
+ // Creating labels for Simulation Menu
+ MNU_COMPILE = gtk_menu_item_new_with_label("Compile");
+ MNU_COMPILE_AS = gtk_menu_item_new_with_label("Compile As...");
+
+ // Appending menu items to Compile menu
+ gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE);
+ gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE_AS);
+
+ // Creating labels for Simulation Menu
+ MNU_MANUAL = gtk_menu_item_new_with_label("Manual...");
+ MNU_ABOUT = gtk_menu_item_new_with_label("About...");
+
+ // Appending menu items to Help menu
+ gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_MANUAL);
+ gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_ABOUT);
+
+ // Creating labels for Simulation Menu
+ MNU_SIMULATION_MODE = gtk_check_menu_item_new_with_label("Simulation Mode");
+ MNU_START_SIMULATION = gtk_menu_item_new_with_label("Start Real-Time Simulation");
+ MNU_STOP_SIMULATION = gtk_menu_item_new_with_label("Halt Simulation");
+ MNU_SINGLE_CYCLE = gtk_menu_item_new_with_label("Single Cycle");
+
+ // Appending menu items to Simulate menu and adding separators
+ gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SIMULATION_MODE);
+ gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_START_SIMULATION);
+ gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_STOP_SIMULATION);
+ gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SINGLE_CYCLE);
+ SimulateMenuSeparator = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(SimulateMenu), SimulateMenuSeparator);
+
+ // Creating submenus for each menu
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(FileLabel), FileMenu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(EditLabel), EditMenu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(SettingsLabel), settings);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(InstructionLabel), InstructionMenu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(SimulateLabel), SimulateMenu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(CompileLabel), compile);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(HelpLabel), help);
+
+ // Appending the menu item to the menu bar
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), FileLabel);
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), EditLabel);
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SettingsLabel);
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), InstructionLabel);
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SimulateLabel);
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), CompileLabel);
+ gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), HelpLabel);
+
+ // Packing the menu bar into the box for alignment
+ gtk_box_pack_start(GTK_BOX(MenuBox), TopMenu, FALSE, FALSE, 0);
+
+ return MenuBox;
+}
+
+//-----------------------------------------------------------------------------
// Create the standard Windows controls used in the main window: a Listview
// for the I/O list, and a status bar for settings.
//-----------------------------------------------------------------------------
void MakeMainWindowControls(void)
{
- // GtkWidget* PackBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- // GtkWidget* grid = gtk_grid_new();
- // GtkWidget* pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- // GtkListStore* IoList = gtk_list_store_new (5,
- // G_TYPE_STRING,
- // G_TYPE_STRING,
- // G_TYPE_STRING,
- // G_TYPE_STRING,
- // G_TYPE_STRING);
- // GtkWidget* view;
- // GtkTreeViewColumn* column;
-
- // int typeWidth = 85;
- // int pinWidth = 100;
- // int portWidth = 90;
-
- // // Creating a list
- // view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(IoList));
- // gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (IoList));
-
- // column = gtk_tree_view_column_new_with_attributes("Name",
- // gtk_cell_renderer_text_new(),
- // "text", LV_IO_NAME,
- // NULL);
- // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
- // gtk_tree_view_column_set_min_width (column, 250);
-
- // column = gtk_tree_view_column_new_with_attributes("Type",
- // gtk_cell_renderer_spin_new(),
- // "text", LV_IO_TYPE,
- // NULL);
- // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
- // gtk_tree_view_column_set_min_width (column, typeWidth);
-
- // column = gtk_tree_view_column_new_with_attributes("State",
- // gtk_cell_renderer_text_new(),
- // "text", LV_IO_STATE,
- // NULL);
- // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
- // gtk_tree_view_column_set_min_width (column, 100);
-
- // column = gtk_tree_view_column_new_with_attributes("Pin on Processor",
- // gtk_cell_renderer_text_new(),
- // "text", LV_IO_PIN,
- // NULL);
- // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
- // gtk_tree_view_column_set_min_width (column, pinWidth);
-
- // column = gtk_tree_view_column_new_with_attributes("MCU Port",
- // gtk_cell_renderer_text_new(),
- // "text", LV_IO_PORT,
- // NULL);
- // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
- // gtk_tree_view_column_set_min_width (column, portWidth);
-
- // // Appending Menus to grid
- // gtk_grid_attach (GTK_GRID (grid), MakeMainWindowMenus(), 0, 0, 1, 1);
-
- // // Creating Scrolled Window
- // GtkWidget* ScrollWindow = gtk_scrolled_window_new (NULL, NULL);
- // gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ScrollWindow),
- // GTK_POLICY_AUTOMATIC,
- // GTK_POLICY_ALWAYS);
-
- // // Creating a pane to separate Scrolled Window and other widgets
- // gtk_paned_add1 (GTK_PANED (pane), ScrollWindow);
- // gtk_paned_set_position (GTK_PANED (pane), 0);
- // gtk_widget_set_vexpand (ScrollWindow, TRUE);
- // gtk_widget_set_hexpand (ScrollWindow, TRUE);
-
- // // Appending tree view to pane and pane to grid
- // gtk_paned_add2 (GTK_PANED(pane), view);
- // gtk_paned_set_position (GTK_PANED (pane), 250);
- // gtk_grid_attach (GTK_GRID (grid), pane, 0, 0, 1, 1);
-
- // // Creating Status Bar and attaching to grid
- // StatusBar = gtk_statusbar_new();
- // gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
- // gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "Introduction"),
- // "LDMicro Started");
-
- // // Appneding Status Bar to box which is then added to Main Window
- // gtk_box_pack_start(GTK_BOX(PackBox), grid, TRUE, TRUE, 0);
- // gtk_box_pack_start(GTK_BOX(PackBox), StatusBar, FALSE, FALSE, 0);
- // gtk_container_add(GTK_CONTAINER(MainWindow), PackBox);
+ GtkWidget* PackBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ GtkWidget* grid = gtk_grid_new();
+ GtkWidget* pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+
+ IoList = gtk_list_store_new (5,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING);
+
+ int typeWidth = 85;
+ int pinWidth = 100;
+ int portWidth = 90;
+
+ // Creating a list
+ view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(IoList));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (IoList));
+
+ column = gtk_tree_view_column_new_with_attributes("Name",
+ gtk_cell_renderer_text_new(),
+ "text", LV_IO_NAME,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+ gtk_tree_view_column_set_min_width (column, 250);
+
+ column = gtk_tree_view_column_new_with_attributes("Type",
+ gtk_cell_renderer_spin_new(),
+ "text", LV_IO_TYPE,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+ gtk_tree_view_column_set_min_width (column, typeWidth);
+
+ column = gtk_tree_view_column_new_with_attributes("State",
+ gtk_cell_renderer_text_new(),
+ "text", LV_IO_STATE,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+ gtk_tree_view_column_set_min_width (column, 100);
+
+ column = gtk_tree_view_column_new_with_attributes("Pin on Processor",
+ gtk_cell_renderer_text_new(),
+ "text", LV_IO_PIN,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+ gtk_tree_view_column_set_min_width (column, pinWidth);
+
+ column = gtk_tree_view_column_new_with_attributes("MCU Port",
+ gtk_cell_renderer_text_new(),
+ "text", LV_IO_PORT,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+ gtk_tree_view_column_set_min_width (column, portWidth);
+
+ // Appending Menus to grid
+ gtk_grid_attach (GTK_GRID (grid), MakeMainWindowMenus(), 0, 0, 1, 1);
+
+ // Creating Scrolled Window
+ ScrollWindow = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ScrollWindow),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
+
+ // Creating a pane to separate Scrolled Window and other widgets
+ gtk_paned_add1 (GTK_PANED (pane), ScrollWindow);
+ gtk_paned_set_position (GTK_PANED (pane), 0);
+ gtk_widget_set_vexpand (ScrollWindow, TRUE);
+ gtk_widget_set_hexpand (ScrollWindow, TRUE);
+
+ // Appending tree view to pane and pane to grid
+ gtk_paned_pack2 (GTK_PANED(pane), view, FALSE, FALSE);
+ gtk_paned_set_position (GTK_PANED (pane), 250);
+ gtk_grid_attach (GTK_GRID (grid), pane, 0, 0, 1, 1);
+
+ // Creating Status Bar and attaching to grid
+ StatusBar = gtk_statusbar_new();
+ gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
+ gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "Introduction"),
+ "LDMicro Started");
+
+ // Appneding Status Bar to box which is then added to Main Window
+ gtk_box_pack_start(GTK_BOX(PackBox), grid, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(PackBox), StatusBar, FALSE, FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(MainWindow), PackBox);
}
//-----------------------------------------------------------------------------
@@ -228,23 +503,23 @@ void MakeMainWindowControls(void)
//-----------------------------------------------------------------------------
void UpdateMainWindowTitleBar(void)
{
-// char line[PATH_MAX+100];
-// if(InSimulationMode) {
-// if(RealTimeSimulationRunning) {
-// strcpy(line, "LDmicro - Simulation (Running)");
-// } else {
-// strcpy(line, "LDmicro - Simulation (Stopped)");
-// }
-// } else {
-// strcpy(line, "LDmicro - Program Editor");
-// }
-// if(strlen(CurrentSaveFile) > 0) {
-// sprintf(line+strlen(line), " - %s", CurrentSaveFile);
-// } else {
-// strcat(line, " - (not yet saved)");
-// }
+ char line[PATH_MAX+100];
+ if(InSimulationMode) {
+ if(RealTimeSimulationRunning) {
+ strcpy(line, "LDmicro - Simulation (Running)");
+ } else {
+ strcpy(line, "LDmicro - Simulation (Stopped)");
+ }
+ } else {
+ strcpy(line, "LDmicro - Program Editor");
+ }
+ if(strlen(CurrentSaveFile) > 0) {
+ sprintf(line+strlen(line), " - %s", CurrentSaveFile);
+ } else {
+ strcat(line, " - (not yet saved)");
+ }
-// gtk_window_set_title (GTK_WINDOW (window), line);
+ gtk_window_set_title (GTK_WINDOW (MainWindow), line);
}
//-----------------------------------------------------------------------------
@@ -255,66 +530,66 @@ void SetMenusEnabled(BOOL canNegate, BOOL canNormal, BOOL canResetOnly,
BOOL canSetOnly, BOOL canDelete, BOOL canInsertEnd, BOOL canInsertOther,
BOOL canPushDown, BOOL canPushUp, BOOL canInsertComment)
{
- // EnableMenuItem(EditMenu, MNU_PUSH_RUNG_UP,
- // canPushUp ? MF_ENABLED : MF_GRAYED);
- // EnableMenuItem(EditMenu, MNU_PUSH_RUNG_DOWN,
- // canPushDown ? MF_ENABLED : MF_GRAYED);
- // EnableMenuItem(EditMenu, MNU_DELETE_RUNG,
- // (Prog.numRungs > 1) ? MF_ENABLED : MF_GRAYED);
-
- // EnableMenuItem(InstructionMenu, MNU_NEGATE,
- // canNegate ? MF_ENABLED : MF_GRAYED);
- // EnableMenuItem(InstructionMenu, MNU_MAKE_NORMAL,
- // canNormal ? MF_ENABLED : MF_GRAYED);
- // EnableMenuItem(InstructionMenu, MNU_MAKE_RESET_ONLY,
- // canResetOnly ? MF_ENABLED : MF_GRAYED);
- // EnableMenuItem(InstructionMenu, MNU_MAKE_SET_ONLY,
- // canSetOnly ? MF_ENABLED : MF_GRAYED);
-
- // EnableMenuItem(InstructionMenu, MNU_INSERT_COMMENT,
- // canInsertComment ? MF_ENABLED : MF_GRAYED);
-
- // EnableMenuItem(EditMenu, MNU_DELETE_ELEMENT,
- // canDelete ? MF_ENABLED : MF_GRAYED);
-
- // int t;
- // t = canInsertEnd ? MF_ENABLED : MF_GRAYED;
- // EnableMenuItem(InstructionMenu, MNU_INSERT_COIL, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_RES, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_MOV, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_ADD, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_SUB, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_MUL, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_DIV, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_CTC, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_PERSIST, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_READ_ADC, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_SET_PWM, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_MASTER_RLY, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_SHIFT_REG, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_LUT, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_PWL, t);
-
- // t = canInsertOther ? MF_ENABLED : MF_GRAYED;
- // EnableMenuItem(InstructionMenu, MNU_INSERT_TON, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_TOF, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_OSR, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_OSF, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_RTO, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_CONTACTS, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_CTU, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_CTD, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_EQU, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_NEQ, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_GRT, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_GEQ, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_LES, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_LEQ, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_SHORT, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_OPEN, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_UART_SEND, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_UART_RECV, t);
- // EnableMenuItem(InstructionMenu, MNU_INSERT_FMTD_STR, t);
+ EnableMenuItem(EditMenu, MNU_PUSH_RUNG_UP,
+ canPushUp ? MF_ENABLED : MF_GRAYED);
+ EnableMenuItem(EditMenu, MNU_PUSH_RUNG_DOWN,
+ canPushDown ? MF_ENABLED : MF_GRAYED);
+ EnableMenuItem(EditMenu, MNU_DELETE_RUNG,
+ (Prog.numRungs > 1) ? MF_ENABLED : MF_GRAYED);
+
+ EnableMenuItem(InstructionMenu, MNU_NEGATE,
+ canNegate ? MF_ENABLED : MF_GRAYED);
+ EnableMenuItem(InstructionMenu, MNU_MAKE_NORMAL,
+ canNormal ? MF_ENABLED : MF_GRAYED);
+ EnableMenuItem(InstructionMenu, MNU_MAKE_RESET_ONLY,
+ canResetOnly ? MF_ENABLED : MF_GRAYED);
+ EnableMenuItem(InstructionMenu, MNU_MAKE_SET_ONLY,
+ canSetOnly ? MF_ENABLED : MF_GRAYED);
+
+ EnableMenuItem(InstructionMenu, MNU_INSERT_COMMENT,
+ canInsertComment ? MF_ENABLED : MF_GRAYED);
+
+ EnableMenuItem(EditMenu, MNU_DELETE_ELEMENT,
+ canDelete ? MF_ENABLED : MF_GRAYED);
+
+ int t;
+ t = canInsertEnd ? MF_ENABLED : MF_GRAYED;
+ EnableMenuItem(InstructionMenu, MNU_INSERT_COIL, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_RES, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_MOV, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_ADD, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_SUB, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_MUL, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_DIV, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_CTC, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_PERSIST, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_READ_ADC, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_SET_PWM, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_MASTER_RLY, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_SHIFT_REG, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_LUT, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_PWL, t);
+
+ t = canInsertOther ? MF_ENABLED : MF_GRAYED;
+ EnableMenuItem(InstructionMenu, MNU_INSERT_TON, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_TOF, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_OSR, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_OSF, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_RTO, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_CONTACTS, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_CTU, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_CTD, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_EQU, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_NEQ, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_GRT, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_GEQ, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_LES, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_LEQ, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_SHORT, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_OPEN, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_UART_SEND, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_UART_RECV, t);
+ EnableMenuItem(InstructionMenu, MNU_INSERT_FMTD_STR, t);
}
//-----------------------------------------------------------------------------
@@ -327,407 +602,63 @@ void SetUndoEnabled(BOOL undoEnabled, BOOL redoEnabled)
}
//-----------------------------------------------------------------------------
-// Create the top-level menu bar for the main window. Mostly static, but we
-// create the "select processor" menu from the list in mcutable.h dynamically.
-//-----------------------------------------------------------------------------
-HMENU MakeMainWindowMenus(void)
-{
- // HMENU MenuBox; // Box for alignment
- // HMENU PackedMenuBox; // Stores the packed box
- // HMENU TopMenu; // Menu Bar
- // HWID FileLabel; // File menu label
- // HWID EditLabel; // Edit menu label
- // HWID InstructionLabel; // Instruction menu label
- // HWID SettingsLabel; // Settings menu label
- // HWID CompileLabel; // Compile menu label
- // HWID HelpLabel; // Help menu label
- // HWID SimulateLabel; // Simulate menu label
- // // HMENU file_menu_items; // File menu item
- // // HMENU edit_menu_items; // Edit menu item
- // // HMENU instruction_menu_items; // Instruction menu item
- // // HMENU settings_menu_items; // Settings menu item
- // HMENU ProcessorMenuItems; // Processor menu items
- // // HMENU compile_menu_items; // Compile menu item
- // // HMENU help_menu_items; // Help menu item
- // // HMENU simulate_menu_items; // Simulate menu item
- // HMENU FileMenuSeparator; // File menu separator
- // HMENU EditMenuSeparator; // Edit menu separator
- // HMENU InstructionMenuSeparator; // Instruction menu separator
- // HMENU SimulateMenuSeparator; // Simulate menu separator
-
- // int i;
- // // Creating a box for desired orientation
- // MenuBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-
- // // Create new menu bar to hold menu and add it to window
- // TopMenu = gtk_menu_bar_new();
-
- // // Creating various menus
- // FileMenu = gtk_menu_new();
- // EditMenu = gtk_menu_new();
- // settings = gtk_menu_new();
- // ProcessorMenu = gtk_menu_new();
- // InstructionMenu = gtk_menu_new();
- // SimulateMenu = gtk_menu_new();
- // compile = gtk_menu_new();
- // help = gtk_menu_new();
-
- // // Creating labels for each menu
- // FileLabel = gtk_menu_item_new_with_label("File");
- // EditLabel = gtk_menu_item_new_with_label("Edit");
- // SettingsLabel = gtk_menu_item_new_with_label("Settings");
- // InstructionLabel = gtk_menu_item_new_with_label("Instructions");
- // SimulateLabel = gtk_menu_item_new_with_label("Simulate");
- // CompileLabel = gtk_menu_item_new_with_label("Compile");
- // HelpLabel = gtk_menu_item_new_with_label("Help");
-
- // // Creating labels for File Menu
- // MNU_NEW = gtk_menu_item_new_with_label("New");
- // MNU_OPEN = gtk_menu_item_new_with_label("Open");
- // MNU_SAVE = gtk_menu_item_new_with_label("Save");
- // MNU_SAVE_AS = gtk_menu_item_new_with_label("Save As");
- // MNU_EXPORT = gtk_menu_item_new_with_label("Export As Text");
- // MNU_EXIT = gtk_menu_item_new_with_label("Exit");
-
- // // Appending menu items (labels) to File menu and adding separators
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_NEW); // Appending menu items
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_OPEN);
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE);
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE_AS);
- // FileMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXPORT);
- // FileMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
- // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXIT);
-
- // // Creating labels for Edit Menu
- // MNU_UNDO = gtk_menu_item_new_with_label("Undo");
- // MNU_REDO = gtk_menu_item_new_with_label("Redo");
- // MNU_INSERT_RUNG_BEFORE = gtk_menu_item_new_with_label("Insert rung Before");
- // MNU_INSERT_RUNG_AFTER = gtk_menu_item_new_with_label("Insert Rung After");
- // MNU_PUSH_RUNG_UP = gtk_menu_item_new_with_label("Move Selected Rung Up");
- // MNU_PUSH_RUNG_DOWN = gtk_menu_item_new_with_label("Move Selected Rung Down");
- // MNU_DELETE_ELEMENT = gtk_menu_item_new_with_label("Delete Selected Element");
- // MNU_DELETE_RUNG = gtk_menu_item_new_with_label("Delete Rung");
-
- // // Appending menu items to Edit menu and adding separators
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_UNDO);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_REDO);
- // EditMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_BEFORE);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_AFTER);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_UP);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_DOWN);
- // EditMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_ELEMENT);
- // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_RUNG);
-
- // // Creating labels for Settings Menu
- // MNU_MCU_SETTINGS = gtk_menu_item_new_with_label ("MCU Parameters...");
- // MNU_PROCESSOR_0 = gtk_menu_item_new_with_label ("Microcontroller");
-
- // // Appending menu items to Settings menu
- // gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_MCU_SETTINGS);
- // gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_PROCESSOR_0);
-
- // for (i = 0; i < NUM_SUPPORTED_MCUS; i++){
- // ProcessorMenuItems = gtk_check_menu_item_new_with_label (SupportedMcus[i].mcuName);
- // gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), ProcessorMenuItems);
- // }
-
- // ProcessorMenuItems = gtk_check_menu_item_new_with_label ("(no microcontroller)");
- // gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), ProcessorMenuItems);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(MNU_PROCESSOR_0), ProcessorMenu);
-
- // // Creating labels for Instruction Menu and adding separators
- // MNU_INSERT_COMMENT = gtk_menu_item_new_with_label("Insert Comment");
- // MNU_INSERT_CONTACTS = gtk_menu_item_new_with_label("Insert Contacts");
- // MNU_INSERT_OSR = gtk_menu_item_new_with_label("Insert OSR (One Shot Rising)");
- // MNU_INSERT_OSF = gtk_menu_item_new_with_label("Insert OSF (One Shot Falling)");
- // MNU_INSERT_TON = gtk_menu_item_new_with_label("Insert TON (Delayed Turn On)");
- // MNU_INSERT_TOF = gtk_menu_item_new_with_label("Insert TOF (Delayed Turn Off)");
- // MNU_INSERT_RTO = gtk_menu_item_new_with_label("Insert RTO (Retentive Delayed Turn On)");
- // MNU_INSERT_CTU = gtk_menu_item_new_with_label("Insert CTU (Count Up)");
- // MNU_INSERT_CTD = gtk_menu_item_new_with_label("Insert CTD (Count Down)");
- // MNU_INSERT_CTC = gtk_menu_item_new_with_label("Insert CTC (Count Circular)");
- // MNU_INSERT_EQU = gtk_menu_item_new_with_label("Insert EQU (Compare for Equals)");
- // MNU_INSERT_NEQ = gtk_menu_item_new_with_label("Insert NEQ (Compare for Not Equals)");
- // MNU_INSERT_GRT = gtk_menu_item_new_with_label("Insert GRT (Compare for Greater Than)");
- // MNU_INSERT_GEQ = gtk_menu_item_new_with_label("Insert GEQ (Compare for Greater Than or Equal)");
- // MNU_INSERT_LES = gtk_menu_item_new_with_label("Insert LES (Compare for Less Than)");
- // MNU_INSERT_LEQ = gtk_menu_item_new_with_label("Insert LEQ (Compare for Less Than or Equal)");
- // MNU_INSERT_OPEN = gtk_menu_item_new_with_label("Insert Open Circuit");
- // MNU_INSERT_SHORT = gtk_menu_item_new_with_label("Insert Short Circuit");
- // MNU_INSERT_MASTER_RLY = gtk_menu_item_new_with_label("Insert Master Control Relay");
- // MNU_INSERT_COIL = gtk_menu_item_new_with_label("Insert Coil");
- // MNU_INSERT_RES = gtk_menu_item_new_with_label("Insert RES (Counter/RTO Reset)");
- // MNU_INSERT_MOV = gtk_menu_item_new_with_label("Insert MOV (Move)");
- // MNU_INSERT_ADD = gtk_menu_item_new_with_label("Insert ADD (16-bit Integer Ad)");
- // MNU_INSERT_SUB = gtk_menu_item_new_with_label("Insert SUB (16-bit Integer Subtract)");
- // MNU_INSERT_MUL = gtk_menu_item_new_with_label("Insert MUL (16-bit Integer Multiply)");
- // MNU_INSERT_DIV = gtk_menu_item_new_with_label("Insert DIV (16-bit Integer Division)");
- // MNU_INSERT_SHIFT_REG = gtk_menu_item_new_with_label("Insert Shift Register");
- // MNU_INSERT_LUT = gtk_menu_item_new_with_label("Insert Look-Up Table");
- // MNU_INSERT_PWL = gtk_menu_item_new_with_label("Insert Piecewise Linear");
- // MNU_INSERT_FMTD_STR = gtk_menu_item_new_with_label("Insert Formatted String Over UART");
- // MNU_INSERT_UART_SEND = gtk_menu_item_new_with_label("Insert UART Send");
- // MNU_INSERT_UART_RECV = gtk_menu_item_new_with_label("Insert UART Receive");
- // MNU_INSERT_SET_PWM = gtk_menu_item_new_with_label("Insert Set PWM Output");
- // MNU_INSERT_READ_ADC = gtk_menu_item_new_with_label("Insert A/D Converter Read");
- // MNU_INSERT_PERSIST = gtk_menu_item_new_with_label("Insert Make Persistent");
- // MNU_MAKE_NORMAL = gtk_menu_item_new_with_label("Make Normal");
- // MNU_NEGATE = gtk_menu_item_new_with_label("Make Negated");
- // MNU_MAKE_SET_ONLY = gtk_menu_item_new_with_label("Make Set-Only");
- // MNU_MAKE_RESET_ONLY = gtk_menu_item_new_with_label("Make Reset-Only");
-
- // // Appending menu items to Instruction menu and adding separators
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COMMENT);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CONTACTS);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSR);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSF);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TON);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TOF);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RTO);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTU);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTD);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTC);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_EQU);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_NEQ);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GRT);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GEQ);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LES);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LEQ);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OPEN);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHORT);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MASTER_RLY);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COIL);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RES);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MOV);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_ADD);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SUB);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MUL);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_DIV);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHIFT_REG);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LUT);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PWL);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_FMTD_STR);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_SEND);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_RECV);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SET_PWM);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_READ_ADC);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PERSIST);
- // InstructionMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_NORMAL);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_NEGATE);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_SET_ONLY);
- // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_RESET_ONLY);
-
- // // Creating labels for Simulation Menu
- // MNU_COMPILE = gtk_menu_item_new_with_label("Compile");
- // MNU_COMPILE_AS = gtk_menu_item_new_with_label("Compile As...");
-
- // // Appending menu items to Compile menu
- // gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE);
- // gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE_AS);
-
- // // Creating labels for Simulation Menu
- // MNU_MANUAL = gtk_menu_item_new_with_label("Manual...");
- // MNU_ABOUT = gtk_menu_item_new_with_label("About...");
-
- // // Appending menu items to Help menu
- // gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_MANUAL);
- // gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_ABOUT);
-
- // // Creating labels for Simulation Menu
- // MNU_SIMULATION_MODE = gtk_check_menu_item_new_with_label("Simulation Mode");
- // MNU_START_SIMULATION = gtk_menu_item_new_with_label("Start Real-Time Simulation");
- // MNU_STOP_SIMULATION = gtk_menu_item_new_with_label("Halt Simulation");
- // MNU_SINGLE_CYCLE = gtk_menu_item_new_with_label("Single Cycle");
-
- // // Appending menu items to Simulate menu and adding separators
- // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SIMULATION_MODE);
- // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_START_SIMULATION);
- // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_STOP_SIMULATION);
- // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SINGLE_CYCLE);
- // SimulateMenuSeparator = gtk_separator_menu_item_new();
- // gtk_menu_shell_append(GTK_MENU_SHELL(SimulateMenu), SimulateMenuSeparator);
-
- // // Creating submenus for each menu
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(FileLabel), FileMenu);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(EditLabel), EditMenu);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(SettingsLabel), settings);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(InstructionLabel), InstructionMenu);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(SimulateLabel), SimulateMenu);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(CompileLabel), compile);
- // gtk_menu_item_set_submenu(GTK_MENU_ITEM(HelpLabel), help);
-
- // // Appending the menu item to the menu bar
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), FileLabel);
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), EditLabel);
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SettingsLabel);
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), InstructionLabel);
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SimulateLabel);
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), CompileLabel);
- // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), HelpLabel);
-
- // // Packing the menu bar into the box for alignment
- // gtk_box_pack_start(GTK_BOX(MenuBox), TopMenu, FALSE, FALSE, 0);
-
- // return MenuBox;
-}
-
-//-----------------------------------------------------------------------------
-// Adjust the size and visibility of the scrollbars as necessary, either due
-// to a change in the size of the program or a change in the size of the
-// window.
-//-----------------------------------------------------------------------------
-void RefreshScrollbars(void)
-{
- // SCROLLINFO vert, horiz;
- // SetUpScrollbars(&NeedHoriz, &horiz, &vert);
- // SetScrollInfo(HorizScrollBar, SB_CTL, &horiz, TRUE);
- // SetScrollInfo(VertScrollBar, SB_CTL, &vert, TRUE);
-
- // RECT main;
- // GetClientRect(MainWindow, &main);
-
- // if(NeedHoriz) {
- // MoveWindow(HorizScrollBar, 0, IoListTop - ScrollHeight - 2,
- // main.right - ScrollWidth - 2, ScrollHeight, TRUE);
- // ShowWindow(HorizScrollBar, SW_SHOW);
- // EnableWindow(HorizScrollBar, TRUE);
- // } else {
- // ShowWindow(HorizScrollBar, SW_HIDE);
- // }
- // MoveWindow(VertScrollBar, main.right - ScrollWidth - 2, 1, ScrollWidth,
- // NeedHoriz ? (IoListTop - ScrollHeight - 4) : (IoListTop - 3), TRUE);
-
- // MoveWindow(VertScrollBar, main.right - ScrollWidth - 2, 1, ScrollWidth,
- // NeedHoriz ? (IoListTop - ScrollHeight - 4) : (IoListTop - 3), TRUE);
-
- // InvalidateRect(MainWindow, NULL, FALSE);
-}
-
-//-----------------------------------------------------------------------------
-// Respond to a WM_VSCROLL sent to the main window, presumably by the one and
-// only vertical scrollbar that it has as a child.
-//-----------------------------------------------------------------------------
-void VscrollProc(WPARAM wParam)
-{
- // int prevY = ScrollYOffset;
- // switch(LOWORD(wParam)) {
- // case SB_LINEUP:
- // case SB_PAGEUP:
- // if(ScrollYOffset > 0) {
- // ScrollYOffset--;
- // }
- // break;
-
- // case SB_LINEDOWN:
- // case SB_PAGEDOWN:
- // if(ScrollYOffset < ScrollYOffsetMax) {
- // ScrollYOffset++;
- // }
- // break;
-
- // case SB_TOP:
- // ScrollYOffset = 0;
- // break;
-
- // case SB_BOTTOM:
- // ScrollYOffset = ScrollYOffsetMax;
- // break;
-
- // case SB_THUMBTRACK:
- // case SB_THUMBPOSITION:
- // ScrollYOffset = HIWORD(wParam);
- // break;
- // }
- // if(prevY != ScrollYOffset) {
- // SCROLLINFO si;
- // si.cbSize = sizeof(si);
- // si.fMask = SIF_POS;
- // si.nPos = ScrollYOffset;
- // SetScrollInfo(VertScrollBar, SB_CTL, &si, TRUE);
-
- // InvalidateRect(MainWindow, NULL, FALSE);
- // }
-}
-
-//-----------------------------------------------------------------------------
-// Respond to a WM_HSCROLL sent to the main window, presumably by the one and
-// only horizontal scrollbar that it has as a child.
+// Toggle whether we are in simulation mode. A lot of options are only
+// available in one mode or the other.
//-----------------------------------------------------------------------------
-void HscrollProc(WPARAM wParam)
+void ToggleSimulationMode(void)
{
- // int prevX = ScrollXOffset;
- // switch(LOWORD(wParam)) {
- // case SB_LINEUP:
- // ScrollXOffset -= FONT_WIDTH;
- // break;
-
- // case SB_PAGEUP:
- // ScrollXOffset -= POS_WIDTH*FONT_WIDTH;
- // break;
-
- // case SB_LINEDOWN:
- // ScrollXOffset += FONT_WIDTH;
- // break;
-
- // case SB_PAGEDOWN:
- // ScrollXOffset += POS_WIDTH*FONT_WIDTH;
- // break;
-
- // case SB_TOP:
- // ScrollXOffset = 0;
- // break;
-
- // case SB_BOTTOM:
- // ScrollXOffset = ScrollXOffsetMax;
- // break;
-
- // case SB_THUMBTRACK:
- // case SB_THUMBPOSITION:
- // ScrollXOffset = HIWORD(wParam);
- // break;
- // }
-
- // if(ScrollXOffset > ScrollXOffsetMax) ScrollXOffset = ScrollXOffsetMax;
- // if(ScrollXOffset < 0) ScrollXOffset = 0;
-
- // if(prevX != ScrollXOffset) {
- // SCROLLINFO si;
- // si.cbSize = sizeof(si);
- // si.fMask = SIF_POS;
- // si.nPos = ScrollXOffset;
- // SetScrollInfo(HorizScrollBar, SB_CTL, &si, TRUE);
-
- // InvalidateRect(MainWindow, NULL, FALSE);
- // }
+ InSimulationMode = !InSimulationMode;
+ if(InSimulationMode) {
+ EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
+ EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_ENABLED);
+
+ EnableMenuItem(FileMenu, MNU_OPEN, MF_GRAYED);
+ EnableMenuItem(FileMenu, MNU_SAVE, MF_GRAYED);
+ EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_GRAYED);
+ EnableMenuItem(FileMenu, MNU_NEW, MF_GRAYED);
+ EnableMenuItem(FileMenu, MNU_EXPORT, MF_GRAYED);
+
+ EnableMenuItem(TopMenu, EditMenu, MF_GRAYED);
+ EnableMenuItem(TopMenu, settings, MF_GRAYED);
+ EnableMenuItem(TopMenu, InstructionMenu, MF_GRAYED);
+ EnableMenuItem(TopMenu, compile, MF_GRAYED);
+
+ CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_CHECKED);
+
+ // ClearSimulationData(); // simulation.cpp, ldmicro.h
+ // Recheck InSimulationMode, because there could have been a compile
+ // error, which would have kicked us out of simulation mode.
+ // if(UartFunctionUsed() && InSimulationMode) {
+ // ShowUartSimulationWindow(); // simulate.cpp
+ // }
+ }
+ else {
+ RealTimeSimulationRunning = FALSE;
+ // KillTimer(MainWindow, TIMER_SIMULATE);
+
+ EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
+ EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
+ EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_GRAYED);
+
+ EnableMenuItem(FileMenu, MNU_OPEN, MF_ENABLED);
+ EnableMenuItem(FileMenu, MNU_SAVE, MF_ENABLED);
+ EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_ENABLED);
+ EnableMenuItem(FileMenu, MNU_NEW, MF_ENABLED);
+ EnableMenuItem(FileMenu, MNU_EXPORT, MF_ENABLED);
+
+ EnableMenuItem(TopMenu, EditMenu, MF_ENABLED);
+ EnableMenuItem(TopMenu, settings, MF_ENABLED);
+ EnableMenuItem(TopMenu, InstructionMenu, MF_ENABLED);
+ EnableMenuItem(TopMenu, compile, MF_ENABLED);
+
+ CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_UNCHECKED);
+
+ // if(UartFunctionUsed()) {
+ // DestroyUartSimulationWindow();
+ // }
+ }
+
+ UpdateMainWindowTitleBar();
}
//-----------------------------------------------------------------------------
@@ -737,73 +668,52 @@ void HscrollProc(WPARAM wParam)
// how many elements to populate.
//-----------------------------------------------------------------------------
void RefreshControlsToSettings(void)
-{
- // int i;
-
- // if(!IoListOutOfSync) {
- // IoListSelectionPoint = -1;
- // for(i = 0; i < Prog.io.count; i++) {
- // if(ListView_GetItemState(IoList, i, LVIS_SELECTED)) {
- // IoListSelectionPoint = i;
- // break;
- // }
- // }
- // }
-
- // ListView_DeleteAllItems(IoList);
- // for(i = 0; i < Prog.io.count; i++) {
- // LVITEM lvi;
- // lvi.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE;
- // lvi.state = lvi.stateMask = 0;
- // lvi.iItem = i;
- // lvi.iSubItem = 0;
- // lvi.pszText = LPSTR_TEXTCALLBACK;
- // lvi.lParam = i;
-
- // if(ListView_InsertItem(IoList, &lvi) < 0) oops();
- // }
- // if(IoListSelectionPoint >= 0) {
- // for(i = 0; i < Prog.io.count; i++) {
- // ListView_SetItemState(IoList, i, 0, LVIS_SELECTED);
- // }
- // ListView_SetItemState(IoList, IoListSelectionPoint, LVIS_SELECTED,
- // LVIS_SELECTED);
- // ListView_EnsureVisible(IoList, IoListSelectionPoint, FALSE);
- // }
- // IoListOutOfSync = FALSE;
-
- // if(Prog.mcu) {
- // SendMessage(StatusBar, SB_SETTEXT, 0, (LPARAM)Prog.mcu->mcuName);
- // } else {
- // SendMessage(StatusBar, SB_SETTEXT, 0, (LPARAM)_("no MCU selected"));
- // }
- // char buf[256];
- // sprintf(buf, _("cycle time %.2f ms"), (double)Prog.cycleTime/1000.0);
- // SendMessage(StatusBar, SB_SETTEXT, 1, (LPARAM)buf);
-
- // if(Prog.mcu && (Prog.mcu->whichIsa == ISA_ANSIC ||
- // Prog.mcu->whichIsa == ISA_INTERPRETED))
- // {
- // strcpy(buf, "");
- // } else {
- // sprintf(buf, _("processor clock %.4f MHz"),
- // (double)Prog.mcuClock/1000000.0);
- // }
- // SendMessage(StatusBar, SB_SETTEXT, 2, (LPARAM)buf);
-
- // for(i = 0; i < NUM_SUPPORTED_MCUS; i++) {
- // if(&SupportedMcus[i] == Prog.mcu) {
- // CheckMenuItem(ProcessorMenu, MNU_PROCESSOR_0+i, MF_CHECKED);
- // } else {
- // CheckMenuItem(ProcessorMenu, MNU_PROCESSOR_0+i, MF_UNCHECKED);
- // }
- // }
- // // `(no microcontroller)' setting
- // if(!Prog.mcu) {
- // CheckMenuItem(ProcessorMenu, MNU_PROCESSOR_0+i, MF_CHECKED);
- // } else {
- // CheckMenuItem(ProcessorMenu, MNU_PROCESSOR_0+i, MF_UNCHECKED);
- // }
+{
+ int i;
+ gtk_tree_model_get_iter_first (GTK_TREE_MODEL(IoList), iter);
+ gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+ GTK_SELECTION_SINGLE);
+ if(!IoListOutOfSync) {
+ IoListSelectionPoint = -1;
+ for(i = 0; i < Prog.io.count; i++) {
+ gtk_tree_model_iter_next (GTK_TREE_MODEL(IoList), iter);
+ if(gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+ IoListPtr, iter)) {
+ IoListSelectionPoint = i;
+ break;
+ }
+ }
+ }
+ gtk_list_store_clear (IoList);
+ IoListOutOfSync = FALSE;
+
+ if(Prog.mcu) {
+ gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
+ gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "MCU Name"),
+ (gchar*)Prog.mcu->mcuName);
+ // SendMessage(StatusBar, SB_SETTEXT, 0, (LPARAM)Prog.mcu->mcuName);
+ }
+ else {
+ // SendMessage(StatusBar, SB_SETTEXT, 0, (LPARAM)_("no MCU selected"));
+ gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
+ gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "MCU Name"),
+ "no MCU selected");
+ }
+ for(i = 0; i < NUM_SUPPORTED_MCUS; i++) {
+ if(&SupportedMcus[i] == Prog.mcu) {
+ CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[i], MF_CHECKED);
+ }
+ else {
+ CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[i], MF_UNCHECKED);
+ }
+ }
+ // `(no microcontroller)' setting
+ if (!Prog.mcu){
+ CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[NUM_SUPPORTED_MCUS], MF_CHECKED);
+ }
+ else {
+ CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[NUM_SUPPORTED_MCUS], MF_UNCHECKED);
+ }
}
//-----------------------------------------------------------------------------
@@ -812,24 +722,26 @@ void RefreshControlsToSettings(void)
//-----------------------------------------------------------------------------
void GenerateIoListDontLoseSelection(void)
{
- // int i;
- // GtkTreeIter* iter;
- // GtkTreeModel **IoListPtr = (GtkTreeModel**)GTK_TREE_MODEL (IoList);
- // gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
- // GTK_SELECTION_SINGLE);
- // IoListSelectionPoint = -1;
- // for(i = 0; i < Prog.io.count; i++) {
- // if(gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
- // IoListPtr, iter)) {
- // IoListSelectionPoint = i;
- // break;
- // }
- // }
+ int i;
+ gtk_tree_model_get_iter_first (GTK_TREE_MODEL(IoList), iter);
+ gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+ GTK_SELECTION_SINGLE);
+ IoListSelectionPoint = -1;
+ for(i = 0; i < Prog.io.count; i++) {
+ gtk_tree_model_iter_next (GTK_TREE_MODEL (IoList), iter);
+ if(gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+ IoListPtr, iter)) {
+ IoListSelectionPoint = i;
+ break;
+ }
+ }
// IoListSelectionPoint = GenerateIoList(IoListSelectionPoint);
- // // can't just update the listview index; if I/O has been added then the
- // // new selection point might be out of range till we refill it
- // IoListOutOfSync = TRUE;
- // RefreshControlsToSettings();
+
+ // can't just update the listview index; if I/O has been added then the
+ // new selection point might be out of range till we refill it
+
+ IoListOutOfSync = TRUE;
+ RefreshControlsToSettings();
}
//-----------------------------------------------------------------------------
@@ -838,96 +750,10 @@ void GenerateIoListDontLoseSelection(void)
//-----------------------------------------------------------------------------
void MainWindowResized(void)
{
- // RECT main;
- // GetClientRect(MainWindow, &main);
-
- // RECT status;
- // GetWindowRect(StatusBar, &status);
- // int statusHeight = status.bottom - status.top;
-
- // MoveWindow(StatusBar, 0, main.bottom - statusHeight, main.right,
- // statusHeight, TRUE);
-
- // // Make sure that the I/O list can't disappear entirely.
- // if(IoListHeight < 30) {
- // IoListHeight = 30;
- // }
- // IoListTop = main.bottom - IoListHeight - statusHeight;
- // // Make sure that we can't drag the top of the I/O list above the
- // // bottom of the menu bar, because it then becomes inaccessible.
- // if(IoListTop < 5) {
- // IoListHeight = main.bottom - statusHeight - 5;
- // IoListTop = main.bottom - IoListHeight - statusHeight;
- // }
- // MoveWindow(IoList, 0, IoListTop, main.right, IoListHeight, TRUE);
-
- // RefreshScrollbars();
-
- // InvalidateRect(MainWindow, NULL, FALSE);
-}
-
-//-----------------------------------------------------------------------------
-// Toggle whether we are in simulation mode. A lot of options are only
-// available in one mode or the other.
-//-----------------------------------------------------------------------------
-void ToggleSimulationMode(void)
-{
- // InSimulationMode = !InSimulationMode;
-
- // if(InSimulationMode) {
- // EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
- // EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_ENABLED);
-
- // EnableMenuItem(FileMenu, MNU_OPEN, MF_GRAYED);
- // EnableMenuItem(FileMenu, MNU_SAVE, MF_GRAYED);
- // EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_GRAYED);
- // EnableMenuItem(FileMenu, MNU_NEW, MF_GRAYED);
- // EnableMenuItem(FileMenu, MNU_EXPORT, MF_GRAYED);
-
- // EnableMenuItem(TopMenu, 1, MF_GRAYED | MF_BYPOSITION);
- // EnableMenuItem(TopMenu, 2, MF_GRAYED | MF_BYPOSITION);
- // EnableMenuItem(TopMenu, 3, MF_GRAYED | MF_BYPOSITION);
- // EnableMenuItem(TopMenu, 5, MF_GRAYED | MF_BYPOSITION);
-
- // CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_CHECKED);
-
- // ClearSimulationData();
- // // Recheck InSimulationMode, because there could have been a compile
- // // error, which would have kicked us out of simulation mode.
- // if(UartFunctionUsed() && InSimulationMode) {
- // ShowUartSimulationWindow();
- // }
- // } else {
- // RealTimeSimulationRunning = FALSE;
- // KillTimer(MainWindow, TIMER_SIMULATE);
-
- // EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
- // EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
- // EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_GRAYED);
-
- // EnableMenuItem(FileMenu, MNU_OPEN, MF_ENABLED);
- // EnableMenuItem(FileMenu, MNU_SAVE, MF_ENABLED);
- // EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_ENABLED);
- // EnableMenuItem(FileMenu, MNU_NEW, MF_ENABLED);
- // EnableMenuItem(FileMenu, MNU_EXPORT, MF_ENABLED);
-
- // EnableMenuItem(TopMenu, 1, MF_ENABLED | MF_BYPOSITION);
- // EnableMenuItem(TopMenu, 2, MF_ENABLED | MF_BYPOSITION);
- // EnableMenuItem(TopMenu, 3, MF_ENABLED | MF_BYPOSITION);
- // EnableMenuItem(TopMenu, 5, MF_ENABLED | MF_BYPOSITION);
-
- // CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_UNCHECKED);
-
- // if(UartFunctionUsed()) {
- // DestroyUartSimulationWindow();
- // }
- // }
-
- // UpdateMainWindowTitleBar();
-
- // DrawMenuBar(MainWindow);
- // InvalidateRect(MainWindow, NULL, FALSE);
- // ListView_RedrawItems(IoList, 0, Prog.io.count - 1);
+ // Make sure that the I/O list can't disappear entirely.
+ if(IoListHeight < 30) {
+ IoListHeight = 30;
+ }
}
//-----------------------------------------------------------------------------
@@ -936,11 +762,11 @@ void ToggleSimulationMode(void)
//-----------------------------------------------------------------------------
void StartSimulation(void)
{
- // RealTimeSimulationRunning = TRUE;
- // EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
- // EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_ENABLED);
+ RealTimeSimulationRunning = TRUE;
+ EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
+ EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_ENABLED);
// StartSimulationTimer();
- // UpdateMainWindowTitleBar();
+ UpdateMainWindowTitleBar();
}
//-----------------------------------------------------------------------------
@@ -949,11 +775,11 @@ void StartSimulation(void)
//-----------------------------------------------------------------------------
void StopSimulation(void)
{
- // RealTimeSimulationRunning = FALSE;
+ RealTimeSimulationRunning = FALSE;
- // EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
- // EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
+ EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
+ EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
// KillTimer(MainWindow, TIMER_SIMULATE);
- // UpdateMainWindowTitleBar();
-}
+ UpdateMainWindowTitleBar();
+} \ No newline at end of file
generated by cgit (git 2.34.1) at 2024-12-19 14:53:14 +0000