X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionTable.java;h=6ffc93e28abadf3348ad840271542385a041d264;hb=327ae273a10d9adc305cf4045322c6107dd70fb4;hp=936ba5c49a1b4bc69439c45d6f08dfe0db7a80ba;hpb=363c9377b3c542c87fc5e7f57674751439246dbd;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
index 936ba5c4..6ffc93e2 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
@@ -3,14 +3,23 @@ package net.mograsim.plugin.tables.mi;
 import java.util.Arrays;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
 import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TableViewerFocusCellManager;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.ui.themes.IThemeManager;
 
 import net.mograsim.machine.mi.MicroInstructionDefinition;
 import net.mograsim.machine.mi.MicroInstructionMemory;
@@ -22,22 +31,44 @@ import net.mograsim.plugin.tables.LazyTableViewer;
 
 public class InstructionTable
 {
-	protected DisplaySettings displaySettings;
-	protected LazyTableViewer viewer;
+	protected final DisplaySettings displaySettings;
+	protected final LazyTableViewer viewer;
 	private TableViewerColumn[] columns = new TableViewerColumn[0];
 	private MicroInstructionDefinition miDef;
 	private MicroInstructionMemory memory;
 	private InstructionTableContentProvider provider;
+	private final RowHighlighter highlighter;
+	private final FontAndColorHelper cProv;
 
-	public InstructionTable(Composite parent, DisplaySettings displaySettings)
+	public InstructionTable(Composite parent, DisplaySettings displaySettings, IThemeManager themeManager)
 	{
-		viewer = new LazyTableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
+		viewer = new LazyTableViewer(parent, SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
 		this.displaySettings = displaySettings;
+		this.cProv = new FontAndColorHelper(viewer, themeManager);
+		this.highlighter = new RowHighlighter(viewer, cProv);
 
 		Table table = viewer.getTable();
 		table.setHeaderVisible(true);
 		table.setLinesVisible(true);
 		viewer.setUseHashlookup(true);
+		table.addDisposeListener(e -> dispose());
+
+		TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(viewer, new FocusCellOwnerDrawHighlighter(viewer));
+
+		ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(viewer)
+		{
+			@Override
+			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event)
+			{
+				return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+						|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
+						|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR)
+						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
+			}
+		};
+		int features = ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
+				| ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION;
+		TableViewerEditor.create(viewer, focusCellManager, actSupport, features);
 
 		GridData viewerData = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
 		viewerData.horizontalSpan = 3;
@@ -54,12 +85,33 @@ public class InstructionTable
 
 	private void createColumns()
 	{
+		viewer.getTable().setVisible(false);
+
 		int size = miDef.size();
 		columns = new TableViewerColumn[size + 1];
 
 		TableViewerColumn col = createTableViewerColumn("Address");
 		columns[0] = col;
-		col.setLabelProvider(new AddressLabelProvider());
+		col.setLabelProvider(new AddressLabelProvider()
+		{
+			@Override
+			public Color getBackground(Object element)
+			{
+				return cProv.getBackground(element, -1);
+			}
+
+			@Override
+			public Color getForeground(Object element)
+			{
+				return cProv.getForeground(element, -1);
+			}
+
+			@Override
+			public Font getFont(Object element)
+			{
+				return cProv.getFont(element, -1);
+			}
+		});
 
 		String[] columnTitles = new String[size];
 
@@ -97,6 +149,8 @@ public class InstructionTable
 			}
 			calculateOptimalColumnSize(i + 1, columnTitles[i], longestPossibleContents);
 		}
+
+		viewer.getTable().setVisible(true);
 	}
 
 	private static String calculateColumnTitle(int startBit, int endBit)
@@ -130,16 +184,15 @@ public class InstructionTable
 		{
 		case BOOLEAN_IMMEDIATE:
 			support = new BooleanEditingSupport(viewer, miDef, index);
-			provider = new ParameterLabelProvider(index);
+			provider = new ParameterLabelProvider(cProv, index);
 			break;
 		case INTEGER_IMMEDIATE:
 			support = new IntegerEditingSupport(viewer, miDef, index, displaySettings, this.provider);
-			provider = new IntegerColumnLabelProvider(displaySettings, index);
+			provider = new IntegerColumnLabelProvider(displaySettings, cProv, index);
 			break;
 		case MNEMONIC:
-//			viewerColumn.setEditingSupport(editingSupport)
 			support = new MnemonicEditingSupport(viewer, miDef, index, this.provider);
-			provider = new ParameterLabelProvider(index);
+			provider = new ParameterLabelProvider(cProv, index);
 			break;
 		default:
 			throw new IllegalStateException(
@@ -204,4 +257,15 @@ public class InstructionTable
 	{
 		Display.getDefault().asyncExec(() -> viewer.refresh());
 	}
+
+	private void dispose()
+	{
+		cProv.dispose();
+		viewer.getTable().dispose();
+	}
+
+	public void highlight(int row)
+	{
+		highlighter.highlight(row);
+	}
 }