mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GT-3105_dragonmacher_PR-451_Escapingbug_Fix_horizontal_scrolling_in_Field_Panels'

Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java
This commit is contained in:
ghidra1
2019-08-23 19:18:03 -04:00
parent b4b836c8a9 cc138893a1
commit f5a366fa5c
3 changed files with 97 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm
View File

@@ -128,7 +128,7 @@
dialog.</P>
</BLOCKQUOTE>
<H2>Keyboard Controls</H2>
<H2><A NAME="Keyboard_Controls">Keyboard Controls</H2>
<BLOCKQUOTE>
<P>The following key mappings are used by the Listing:</P>
@@ -198,6 +198,39 @@
<TD width="79%">Move the cursor to the right one position. If at the end of a line,
move the cursor to first position of the next line.</TD>
</TR>
<TR>
<A NAME="Keyboard_Controls_Shift">
<TD width="21%" valign="top">&lt;Shift&gt;</TD>
<TD width="79%">Press shift when using the mouse scroll wheel to perform
horizontal scrolling. This will only work when the horizontal scroll
bar is visible.
<BLOCKQUOTE>
<P>
<IMG border="0" src="../../shared/note.png" alt="">
<SPAN style="font-size: 0.8em;">
You can disable horizontal scrolling in the Listing (and all other
Field Panels) via the Tool Options at
<B>Edit
<IMG alt="" border="0" src="../../shared/arrow.gif">
Tool Options...
<IMG alt="" border="0" src="../../shared/arrow.gif">
Listing Fields
<IMG alt="" border="0" src="../../shared/arrow.gif">
Mouse
<IMG alt="" border="0" src="../../shared/arrow.gif">
Horizontal Scrolling
</B>
</SPAN>
</P>
</BLOCKQUOTE>
</TD>
</TR>
</TBODY>
</TABLE>
</CENTER>

35
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java
View File

@@ -101,6 +101,7 @@ public class CodeBrowserPlugin extends Plugin
private static final String CURSOR_COLOR = "Cursor.Cursor Color - Focused";
private static final String UNFOCUSED_CURSOR_COLOR = "Cursor.Cursor Color - Unfocused";
private static final String BLINK_CURSOR = "Cursor.Blink Cursor";
private static final String MOUSE_WHEEL_HORIZONTAL_SCROLLING = "Mouse.Horizontal Scrolling";
// - Icon -
private ImageIcon CURSOR_LOC_ICON =
@@ -621,16 +622,19 @@ public class CodeBrowserPlugin extends Plugin
public void optionsChanged(ToolOptions options, String optionName, Object oldValue,
Object newValue) {
ListingPanel listingPanel = connectedProvider.getListingPanel();
if (options.getName().equals(GhidraOptions.CATEGORY_BROWSER_DISPLAY)) {
if (optionName.equals(OptionsGui.BACKGROUND.getColorOptionName())) {
Color c = (Color) newValue;
connectedProvider.getListingPanel().setTextBackgroundColor(c);
listingPanel.setTextBackgroundColor(c);
}
}
else if (options.getName().equals(GhidraOptions.CATEGORY_BROWSER_FIELDS)) {
FieldPanel fieldPanel = listingPanel.getFieldPanel();
if (optionName.equals(GhidraOptions.OPTION_SELECTION_COLOR)) {
Color color = ((Color) newValue);
connectedProvider.getListingPanel().getFieldPanel().setSelectionColor(color);
fieldPanel.setSelectionColor(color);
MarkerSet selectionMarkers = getSelectionMarkers(currentProgram);
if (selectionMarkers != null) {
selectionMarkers.setMarkerColor(color);
@@ -642,7 +646,7 @@ public class CodeBrowserPlugin extends Plugin
}
else if (optionName.equals(GhidraOptions.OPTION_HIGHLIGHT_COLOR)) {
Color color = ((Color) newValue);
connectedProvider.getListingPanel().getFieldPanel().setHighlightColor(color);
fieldPanel.setHighlightColor(color);
MarkerSet highlightMarkers = getHighlightMarkers(currentProgram);
if (highlightMarkers != null) {
highlightMarkers.setMarkerColor(color);
@@ -650,15 +654,15 @@ public class CodeBrowserPlugin extends Plugin
}
else if (optionName.equals(CURSOR_COLOR)) {
Color color = ((Color) newValue);
connectedProvider.getListingPanel().getFieldPanel().setFocusedCursorColor(color);
fieldPanel.setFocusedCursorColor(color);
}
else if (optionName.equals(UNFOCUSED_CURSOR_COLOR)) {
Color color = ((Color) newValue);
connectedProvider.getListingPanel().getFieldPanel().setNonFocusCursorColor(color);
fieldPanel.setNonFocusCursorColor(color);
}
else if (optionName.equals(BLINK_CURSOR)) {
Boolean isBlinkCursor = ((Boolean) newValue);
connectedProvider.getListingPanel().getFieldPanel().setBlinkCursor(isBlinkCursor);
fieldPanel.setBlinkCursor(isBlinkCursor);
}
else if (optionName.equals(GhidraOptions.HIGHLIGHT_CURSOR_LINE_COLOR)) {
cursorHighlightColor = (Color) newValue;
@@ -672,6 +676,10 @@ public class CodeBrowserPlugin extends Plugin
currentCursorMarkers.setColoringBackground(isHighlightCursorLine);
}
}
else if (optionName.equals(MOUSE_WHEEL_HORIZONTAL_SCROLLING)) {
fieldPanel.setHorizontalScrollingEnabled((Boolean) newValue);
}
connectedProvider.fieldOptionChanged(optionName, newValue);
}
@@ -833,6 +841,11 @@ public class CodeBrowserPlugin extends Plugin
fieldOptions.registerOption(GhidraOptions.HIGHLIGHT_CURSOR_LINE, true, helpLocation,
"Toggles highlighting background color of line containing the cursor");
helpLocation = new HelpLocation(getName(), "Keyboard_Controls_Shift");
fieldOptions.registerOption(MOUSE_WHEEL_HORIZONTAL_SCROLLING, true, helpLocation,
"Enables horizontal scrolling by holding the Shift key while " +
"using the mouse scroll wheel");
Color color = fieldOptions.getColor(GhidraOptions.OPTION_SELECTION_COLOR,
GhidraOptions.DEFAULT_SELECTION_COLOR);
@@ -860,6 +873,10 @@ public class CodeBrowserPlugin extends Plugin
Boolean isBlinkCursor = fieldOptions.getBoolean(BLINK_CURSOR, true);
fieldPanel.setBlinkCursor(isBlinkCursor);
boolean horizontalScrollingEnabled =
fieldOptions.getBoolean(MOUSE_WHEEL_HORIZONTAL_SCROLLING, true);
fieldPanel.setHorizontalScrollingEnabled(horizontalScrollingEnabled);
cursorHighlightColor =
fieldOptions.getColor(GhidraOptions.HIGHLIGHT_CURSOR_LINE_COLOR, CURSOR_LINE_COLOR);
@@ -922,6 +939,12 @@ public class CodeBrowserPlugin extends Plugin
"SelectUtils"));
tableFromSelectionAction.setHelpLocation(
new HelpLocation("CodeBrowserPlugin", "Selection_Table"));
// don't add the actions initially if the service isn't there
TableService tableService = tool.getService(TableService.class);
if (tableService != null) {
tool.addAction(tableFromSelectionAction);
}
}
private GhidraProgramTableModel<Address> createTableModel(CodeUnitIterator iterator,

48
Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanel.java
View File

@@ -58,6 +58,7 @@ public class FieldPanel extends JPanel
private KeyHandler keyHandler = new KeyHandler();
private HoverHandler hoverHandler;
private SelectionHandler selectionHandler = new SelectionHandler();
private boolean horizontalScrollingEnabled = true;
private FieldLocation cursorPosition = new FieldLocation();
private FieldSelection selection = new FieldSelection();
@@ -380,6 +381,14 @@ public class FieldPanel extends JPanel
cursorHandler.setBlinkCursor(blinkCursor);
}
public void enableSelection(boolean b) {
selectionHandler.enableSelection(b);
}
public void setHorizontalScrollingEnabled(boolean enabled) {
horizontalScrollingEnabled = enabled;
}
/**
* Returns the default background color.
*/
@@ -1222,15 +1231,11 @@ public class FieldPanel extends JPanel
private JViewport getViewport() {
Container c = getParent();
if (c == null) {
return null;
}
if (c instanceof JViewport) {
return (JViewport) c;
}
c = c.getParent();
if (c instanceof JViewport) {
return (JViewport) c;
while (c != null) {
if (c instanceof JViewport) {
return (JViewport) c;
}
c = c.getParent();
}
return null;
}
@@ -1479,10 +1484,29 @@ public class FieldPanel extends JPanel
}
else {
hoverHandler.stopHover();
scrollView(scrollAmount);
if (e.isShiftDown() && horizontalScrollingEnabled) {
scrollViewHorizontally(scrollAmount);
}
else {
scrollView(scrollAmount);
}
}
e.consume();
}
private void scrollViewHorizontally(int scrollAmount) {
JViewport vp = getViewport();
if (vp == null) {
// this will happen for Field Panels not placed inside of scroll panes
return;
}
// horizontal scroll (only move viewport)
Point pos = vp.getViewPosition();
vp.setViewPosition(new Point(Math.max(0, pos.x + scrollAmount), pos.y));
}
}
public class MouseHandler implements ActionListener {
@@ -2101,8 +2125,4 @@ public class FieldPanel extends JPanel
}
}
}
public void enableSelection(boolean b) {
selectionHandler.enableSelection(b);
}
}