Attachment #165264 for bug #309660

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 144-147 Link Here

(-)src/org/eclipse/ui/internal/editors/text/TextEditorMessages.java (+1 lines)
144	public static String LinkedModeConfigurationBlock_labels_showIn;	144	public static String LinkedModeConfigurationBlock_labels_showIn;
145	public static String LinkedModeConfigurationBlock_color;	145	public static String LinkedModeConfigurationBlock_color;
146	public static String LinkedModeConfigurationBlock_linking_title;	146	public static String LinkedModeConfigurationBlock_linking_title;
		147	public static String TextEditorPreferencePage_cursorColor;
147	}	148	}

Lines 44-49 Link Here

(-)src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties (+1 lines)
44		44
45	TextEditorPreferencePage_overwriteMode= Disable &overwrite typing mode	45	TextEditorPreferencePage_overwriteMode= Disable &overwrite typing mode
46		46
		47	TextEditorPreferencePage_cursorColor= Cursor color
47	TextEditorPreferencePage_selectionForegroundColor= Selection foreground color	48	TextEditorPreferencePage_selectionForegroundColor= Selection foreground color
48	TextEditorPreferencePage_selectionBackgroundColor= Selection background color	49	TextEditorPreferencePage_selectionBackgroundColor= Selection background color
49	TextEditorPreferencePage_systemDefault= System De&fault	50	TextEditorPreferencePage_systemDefault= System De&fault

Lines 182-187 Link Here

(-)src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java (+9 lines)
182	*/	182	*/
183	private final static String CURRENT_LINE_COLOR= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;	183	private final static String CURRENT_LINE_COLOR= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
184	/**	184	/**
		185	* Preference key for system default cursor.
		186	*/
		187	private final static String CURSOR_SYSTEM_DEFAULT = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURSOR_SYSTEM_DEFAULT;
		188	/**
		189	* Preference key for customized cursor color.
		190	*/
		191	private final static String CUSTOM_CURSOR_COLOR= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CUSTOM_CURSOR_COLOR;
		192	/**
185	* Preference key for showing print margin ruler.	193	* Preference key for showing print margin ruler.
186	*/	194	*/
187	private final static String PRINT_MARGIN= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN;	195	private final static String PRINT_MARGIN= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN;
Lines 421-426 Link Here
421	support.setAnnotationPreference((AnnotationPreference) e.next());	429	support.setAnnotationPreference((AnnotationPreference) e.next());
422		430
423	support.setCursorLinePainterPreferenceKeys(CURRENT_LINE, CURRENT_LINE_COLOR);	431	support.setCursorLinePainterPreferenceKeys(CURRENT_LINE, CURRENT_LINE_COLOR);
		432	support.setCursorColorPreferenceKeys(CURSOR_SYSTEM_DEFAULT, CUSTOM_CURSOR_COLOR);
424	support.setMarginPainterPreferenceKeys(PRINT_MARGIN, PRINT_MARGIN_COLOR, PRINT_MARGIN_COLUMN);	433	support.setMarginPainterPreferenceKeys(PRINT_MARGIN, PRINT_MARGIN_COLOR, PRINT_MARGIN_COLUMN);
425	support.setSymbolicFontName(getFontPropertyPreferenceKey());	434	support.setSymbolicFontName(getFontPropertyPreferenceKey());
426	}	435	}




	public final static String EDITOR_CURRENT_LINE_COLOR= "currentLineColor"; //$NON-NLS-1$

	/**
	 * A named preference that holds the custom color used for editor cursor. 
	 * (value <code>"customCursorColor"</code>).
	 * <p>
	 * The preference value is of type <code>String</code>. A RGB color value encoded as a string
	 * using class <code>PreferenceConverter</code>.
	 * </p>
	 * @see org.eclipse.jface.resource.StringConverter
	 * @see PreferenceConverter
	 */
	public final static String EDITOR_CUSTOM_CURSOR_COLOR= "customCursorColor"; //$NON-NLS-1$
	
	/**
	 * A named preference that controls whether uses system default cursor.
	 * (value <code>"cursorColor.SystemDefault"</code>).
	 * <p>
	 * The preference value is of type <code>Boolean</code>.
	 * </p>
	 */
	public final static String EDITOR_CURSOR_SYSTEM_DEFAULT= "cursorColor.SystemDefault"; //$NON-NLS-1$
	
	/**
	 * A named preference that holds the number of spaces used per tab in the text editor.
	 * <p>
	 * Value is of type <code>int</code>: positive int value specifying the number of

		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_ANNOTATIONS_PREFERENCE_PAGE, false);
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_QUICK_DIFF_PREFERENCE_PAGE, false);

		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);		
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURSOR_SYSTEM_DEFAULT, true);

		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4);
		store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Daoen Pan <pan.daoen@consideo.com>
 *******************************************************************************/
package org.eclipse.ui.internal.texteditor;

import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.PaletteData;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;

import org.eclipse.ui.PlatformUI;

/**
 * Helper class to create and dispose a mono-color I-Beam cursor with 16x16 dimension.
 * 
 * The color of the cursor can be changed by the method <code>setRGB(RGB)</code>. The cursor is
 * returned with the method <code>getCursor()</code>.
 */
public class MonoColorIBeamCursor {

	private static byte[] ibeamShape= { (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)1, (byte)1,
			(byte)0, (byte)0, (byte)0, (byte)1, (byte)1, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)1, (byte)0,
			(byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)1,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)1, (byte)1, (byte)1, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)1,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)1,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)1, (byte)0, (byte)1, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)1, (byte)1, (byte)0, (byte)0,
			(byte)0, (byte)1, (byte)1, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
			(byte)0, (byte)0, (byte)0, (byte)0, (byte)0 };

	private Cursor cursor;

	/**
	 * Constructs an instance of MonoColorIBeamCursor with given color.
	 * 
	 * @param rgb cursor color
	 */
	public MonoColorIBeamCursor(RGB rgb) {
		createCursor(rgb);
	}

	/**
	 * Dispose the cursor if necessary
	 */
	public void dispose() {
		if (cursor != null) {
			cursor.dispose();
			cursor= null;
		}
	}

	/**
	 * Return the colored I-Beam cursor or null.
	 * 
	 * @return the cursor
	 */
	public Cursor getCursor() {
		return cursor;
	}

	/**
	 * Set the color of the I-Beam cursor
	 * 
	 * @param rgb a new color
	 */
	public void setRGB(RGB rgb) {
		dispose();
		if (rgb != null)
			createCursor(rgb);
	}

	/**
	 * Create a I-Beam cursor with given color
	 * 
	 * @param rgb the cursor color
	 */
	private void createCursor(RGB rgb) {
		Display display= PlatformUI.getWorkbench().getDisplay();
		if (display != null && !display.isDisposed()) {
			RGB[] colors= { new RGB(0, 0, 0), new RGB(rgb.red, rgb.green, rgb.blue) };
			PaletteData palette= new PaletteData(colors);
			ImageData cursorData= new ImageData(16, 16, 8, palette, 4, ibeamShape);
			cursorData.transparentPixel= 0;
			cursor= new Cursor(display, cursorData, 8, 8);
		}
	}
}

Lines 16-21 Link Here

(-)src/org/eclipse/ui/internal/texteditor/TextEditorPlugin.java (+27 lines)
16		16
17	import org.osgi.framework.BundleContext;	17	import org.osgi.framework.BundleContext;
18		18
		19	import org.eclipse.swt.graphics.Cursor;
		20	import org.eclipse.swt.graphics.RGB;
19	import org.eclipse.core.runtime.Assert;	21	import org.eclipse.core.runtime.Assert;
20	import org.eclipse.core.runtime.IRegistryChangeEvent;	22	import org.eclipse.core.runtime.IRegistryChangeEvent;
21	import org.eclipse.core.runtime.IRegistryChangeListener;	23	import org.eclipse.core.runtime.IRegistryChangeListener;
Lines 63-68 Link Here
63	private SpellingEngineRegistry fSpellingEngineRegistry;	65	private SpellingEngineRegistry fSpellingEngineRegistry;
64		66
65	/**	67	/**
		68	* The shared I-Beam cursor for text based editors
		69	*/
		70	private MonoColorIBeamCursor sharedIBeamCursor;
		71
		72	/**
66	* Creates a plug-in instance.	73	* Creates a plug-in instance.
67	*/	74	*/
68	public TextEditorPlugin() {	75	public TextEditorPlugin() {
Lines 164-169 Link Here
164	Platform.getExtensionRegistry().removeRegistryChangeListener(this);	171	Platform.getExtensionRegistry().removeRegistryChangeListener(this);
165	fQuickDiffExtensionRegistry= null;	172	fQuickDiffExtensionRegistry= null;
166	fSpellingEngineRegistry= null;	173	fSpellingEngineRegistry= null;
		174	if (sharedIBeamCursor != null) {
		175	sharedIBeamCursor.dispose();
		176	sharedIBeamCursor= null;
		177	}
167	super.stop(context);	178	super.stop(context);
168	}	179	}
169		180
Lines 197-200 Link Here
197	public SpellingEngineRegistry getSpellingEngineRegistry() {	208	public SpellingEngineRegistry getSpellingEngineRegistry() {
198	return fSpellingEngineRegistry;	209	return fSpellingEngineRegistry;
199	}	210	}
		211
		212	/**
		213	* Return the I-Beam cursor with the given color.
		214	*
		215	* @param rgb the cursor color
		216	* @return an I-Beam cursor
		217	*/
		218	public Cursor getSharedIBeamCursor(RGB rgb) {
		219	if (rgb == null)
		220	return null;
		221	if (sharedIBeamCursor == null)
		222	sharedIBeamCursor= new MonoColorIBeamCursor(rgb);
		223	else
		224	sharedIBeamCursor.setRGB(rgb);
		225	return sharedIBeamCursor.getCursor();
		226	}
200	}	227	}




import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.RGB;

import org.eclipse.jface.text.MarginPainter;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.AnnotationPainter;
import org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy;
import org.eclipse.jface.text.source.AnnotationPainter.ITextStyleStrategy;
import org.eclipse.jface.text.source.IAnnotationAccess;
import org.eclipse.jface.text.source.ICharacterPairMatcher;
import org.eclipse.jface.text.source.IOverviewRuler;
import org.eclipse.jface.text.source.ISharedTextColors;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.MatchingCharacterPainter;
import org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy;
import org.eclipse.jface.text.source.AnnotationPainter.ITextStyleStrategy;

import org.eclipse.ui.internal.texteditor.TextEditorPlugin;




	private String fCursorLinePainterEnableKey;
	/** Preference key for the cursor line background color */
	private String fCursorLinePainterColorKey;
	/** preference key for the enabling cursor color */
	private String fCursorColorDefaultKey;
	/** preference key for the cursor color */
	private String fCursorColorKey;
	/** Preference key for the margin painter */
	private String fMarginPainterEnableKey;
	/** Preference key for the margin painter color */

			showMargin();
		else
			hideMargin();
		
		updateCursorColor();

		Iterator e= fAnnotationTypeKeyMap.keySet().iterator();
		while (e.hasNext()) {

		fCursorLinePainterEnableKey= enableKey;
		fCursorLinePainterColorKey= colorKey;
	}
	
	/**
	 * Sets the preference keys for the cursor color.
	 * @param defaultKey the preference key for the enabling cursor color
	 * @param colorKey the preference key for the cursor color
	 */
	public void setCursorColorPreferenceKeys(String defaultKey, String colorKey) {
		fCursorColorDefaultKey= defaultKey;
		fCursorColorKey= colorKey;
	}

	/**
	 * Sets the preference keys for the margin painter.

				hideCursorLine();
			return;
		}
		
		if (fCursorColorDefaultKey != null && fCursorColorKey != null) {
			if (fCursorColorDefaultKey.equals(p) || fCursorColorKey.equals(p))
				updateCursorColor();
		}

		if (fCursorLinePainterColorKey != null && fCursorLinePainterColorKey.equals(p)) {
			if (fCursorLinePainter != null) {

			fOverviewRuler.update();
		}
	}
	
	/**
	 * Update the cursor color for the editor
	 */
	private void updateCursorColor() {
		StyledText textWidget= fSourceViewer.getTextWidget();
		if (fPreferenceStore.getBoolean(fCursorColorDefaultKey)) {
			textWidget.setCursor(null);
		} else {
			RGB rgb= PreferenceConverter.getColor(fPreferenceStore, fCursorColorKey);
			Cursor cursor= TextEditorPlugin.getDefault().getSharedIBeamCursor(rgb);
			textWidget.setCursor(cursor);
		}
	}
}

Return to bug 309660

Lines 372-377 Link Here

(-)src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java (-1 / +4 lines)
372	private final String[][] fAppearanceColorListModel= new String[][] {	372	private final String[][] fAppearanceColorListModel= new String[][] {
373	{TextEditorMessages.TextEditorPreferencePage_lineNumberForegroundColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, null},	373	{TextEditorMessages.TextEditorPreferencePage_lineNumberForegroundColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, null},
374	{TextEditorMessages.TextEditorPreferencePage_currentLineHighlighColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, null},	374	{TextEditorMessages.TextEditorPreferencePage_currentLineHighlighColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, null},
		375	{TextEditorMessages.TextEditorPreferencePage_cursorColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CUSTOM_CURSOR_COLOR, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURSOR_SYSTEM_DEFAULT},
375	{TextEditorMessages.TextEditorPreferencePage_printMarginColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, null},	376	{TextEditorMessages.TextEditorPreferencePage_printMarginColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, null},
376	{TextEditorMessages.TextEditorPreferencePage_findScopeColor, AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE, null},	377	{TextEditorMessages.TextEditorPreferencePage_findScopeColor, AbstractTextEditor.PREFERENCE_COLOR_FIND_SCOPE, null},
377	{TextEditorMessages.TextEditorPreferencePage_selectionForegroundColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_COLOR, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR},	378	{TextEditorMessages.TextEditorPreferencePage_selectionForegroundColor, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_COLOR, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR},
Lines 451-457 Link Here
451	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TEXT_DRAG_AND_DROP_ENABLED));	452	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TEXT_DRAG_AND_DROP_ENABLED));
452	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));	453	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
453	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HOVER_ENRICH_MODE));	454	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HOVER_ENRICH_MODE));
454		455	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CUSTOM_CURSOR_COLOR));
		456	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURSOR_SYSTEM_DEFAULT));
		457
455	OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];	458	OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
456	overlayKeys.toArray(keys);	459	overlayKeys.toArray(keys);
457	return new OverlayPreferenceStore(getPreferenceStore(), keys);	460	return new OverlayPreferenceStore(getPreferenceStore(), keys);

Lines 68-73 Link Here

(-)src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditorPreferenceConstants.java (-1 / +23 lines)
68	public final static String EDITOR_CURRENT_LINE_COLOR= "currentLineColor"; //$NON-NLS-1$	68	public final static String EDITOR_CURRENT_LINE_COLOR= "currentLineColor"; //$NON-NLS-1$
69		69
70	/**	70	/**
		71	* A named preference that holds the custom color used for editor cursor.
		72	* (value <code>"customCursorColor"</code>).
		73	* <p>
		74	* The preference value is of type <code>String</code>. A RGB color value encoded as a string
		75	* using class <code>PreferenceConverter</code>.
		76	* </p>
		77	* @see org.eclipse.jface.resource.StringConverter
		78	* @see PreferenceConverter
		79	*/
		80	public final static String EDITOR_CUSTOM_CURSOR_COLOR= "customCursorColor"; //$NON-NLS-1$
		81
		82	/**
		83	* A named preference that controls whether uses system default cursor.
		84	* (value <code>"cursorColor.SystemDefault"</code>).
		85	* <p>
		86	* The preference value is of type <code>Boolean</code>.
		87	* </p>
		88	*/
		89	public final static String EDITOR_CURSOR_SYSTEM_DEFAULT= "cursorColor.SystemDefault"; //$NON-NLS-1$
		90
		91	/**
71	* A named preference that holds the number of spaces used per tab in the text editor.	92	* A named preference that holds the number of spaces used per tab in the text editor.
72	* <p>	93	* <p>
73	* Value is of type <code>int</code>: positive int value specifying the number of	94	* Value is of type <code>int</code>: positive int value specifying the number of
Lines 498-504 Link Here
498	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_ANNOTATIONS_PREFERENCE_PAGE, false);	519	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_ANNOTATIONS_PREFERENCE_PAGE, false);
499	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_QUICK_DIFF_PREFERENCE_PAGE, false);	520	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.USE_QUICK_DIFF_PREFERENCE_PAGE, false);
500		521
501	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);	522	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
		523	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURSOR_SYSTEM_DEFAULT, true);
502		524
503	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4);	525	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_TAB_WIDTH, 4);
504	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);	526	store.setDefault(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SPACES_FOR_TABS, false);

Added Link Here

(-)src/org/eclipse/ui/internal/texteditor/MonoColorIBeamCursor.java (+129 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Daoen Pan <pan.daoen@consideo.com>
10	*******************************************************************************/
11	package org.eclipse.ui.internal.texteditor;
12
13	import org.eclipse.swt.graphics.Cursor;
14	import org.eclipse.swt.graphics.ImageData;
15	import org.eclipse.swt.graphics.PaletteData;
16	import org.eclipse.swt.graphics.RGB;
17	import org.eclipse.swt.widgets.Display;
18
19	import org.eclipse.ui.PlatformUI;
20
21	/**
22	* Helper class to create and dispose a mono-color I-Beam cursor with 16x16 dimension.
23	*
24	* The color of the cursor can be changed by the method <code>setRGB(RGB)</code>. The cursor is
25	* returned with the method <code>getCursor()</code>.
26	*/
27	public class MonoColorIBeamCursor {
28
29	private static byte[] ibeamShape= { (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
30	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
31	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
32	(byte)0, (byte)0, (byte)0, (byte)0, (byte)1, (byte)1,
33	(byte)0, (byte)0, (byte)0, (byte)1, (byte)1, (byte)0,
34	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
35	(byte)0, (byte)0, (byte)0, (byte)0, (byte)1, (byte)0,
36	(byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
37	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
38	(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
39	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
40	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
41	(byte)0, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0,
42	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
43	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)1,
44	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
45	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
46	(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
47	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
48	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
49	(byte)1, (byte)1, (byte)1, (byte)0, (byte)0, (byte)0,
50	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
51	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)1,
52	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
53	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
54	(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
55	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
56	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
57	(byte)0, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0,
58	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
59	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)1,
60	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
61	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
62	(byte)0, (byte)0, (byte)0, (byte)1, (byte)0, (byte)0,
63	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
64	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
65	(byte)1, (byte)0, (byte)1, (byte)0, (byte)0, (byte)0,
66	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
67	(byte)0, (byte)0, (byte)1, (byte)1, (byte)0, (byte)0,
68	(byte)0, (byte)1, (byte)1, (byte)0, (byte)0, (byte)0,
69	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
70	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0,
71	(byte)0, (byte)0, (byte)0, (byte)0, (byte)0 };
72
73	private Cursor cursor;
74
75	/**
76	* Constructs an instance of MonoColorIBeamCursor with given color.
77	*
78	* @param rgb cursor color
79	*/
80	public MonoColorIBeamCursor(RGB rgb) {
81	createCursor(rgb);
82	}
83
84	/**
85	* Dispose the cursor if necessary
86	*/
87	public void dispose() {
88	if (cursor != null) {
89	cursor.dispose();
90	cursor= null;
91	}
92	}
93
94	/**
95	* Return the colored I-Beam cursor or null.
96	*
97	* @return the cursor
98	*/
99	public Cursor getCursor() {
100	return cursor;
101	}
102
103	/**
104	* Set the color of the I-Beam cursor
105	*
106	* @param rgb a new color
107	*/
108	public void setRGB(RGB rgb) {
109	dispose();
110	if (rgb != null)
111	createCursor(rgb);
112	}
113
114	/**
115	* Create a I-Beam cursor with given color
116	*
117	* @param rgb the cursor color
118	*/
119	private void createCursor(RGB rgb) {
120	Display display= PlatformUI.getWorkbench().getDisplay();
121	if (display != null && !display.isDisposed()) {
122	RGB[] colors= { new RGB(0, 0, 0), new RGB(rgb.red, rgb.green, rgb.blue) };
123	PaletteData palette= new PaletteData(colors);
124	ImageData cursorData= new ImageData(16, 16, 8, palette, 4, ibeamShape);
125	cursorData.transparentPixel= 0;
126	cursor= new Cursor(display, cursorData, 8, 8);
127	}
128	}
129	}

Lines 17-22 Link Here

(-)src/org/eclipse/ui/texteditor/SourceViewerDecorationSupport.java (-2 / +39 lines)
17	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.custom.StyledText;	18	import org.eclipse.swt.custom.StyledText;
19	import org.eclipse.swt.graphics.Color;	19	import org.eclipse.swt.graphics.Color;
		20	import org.eclipse.swt.graphics.Cursor;
20	import org.eclipse.swt.graphics.GC;	21	import org.eclipse.swt.graphics.GC;
21	import org.eclipse.swt.graphics.Point;	22	import org.eclipse.swt.graphics.Point;
22	import org.eclipse.swt.graphics.RGB;	23	import org.eclipse.swt.graphics.RGB;
Lines 34-48 Link Here
34	import org.eclipse.jface.text.MarginPainter;	35	import org.eclipse.jface.text.MarginPainter;
35	import org.eclipse.jface.text.source.Annotation;	36	import org.eclipse.jface.text.source.Annotation;
36	import org.eclipse.jface.text.source.AnnotationPainter;	37	import org.eclipse.jface.text.source.AnnotationPainter;
		38	import org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy;
		39	import org.eclipse.jface.text.source.AnnotationPainter.ITextStyleStrategy;
37	import org.eclipse.jface.text.source.IAnnotationAccess;	40	import org.eclipse.jface.text.source.IAnnotationAccess;
38	import org.eclipse.jface.text.source.ICharacterPairMatcher;	41	import org.eclipse.jface.text.source.ICharacterPairMatcher;
39	import org.eclipse.jface.text.source.IOverviewRuler;	42	import org.eclipse.jface.text.source.IOverviewRuler;
40	import org.eclipse.jface.text.source.ISharedTextColors;	43	import org.eclipse.jface.text.source.ISharedTextColors;
41	import org.eclipse.jface.text.source.ISourceViewer;	44	import org.eclipse.jface.text.source.ISourceViewer;
42	import org.eclipse.jface.text.source.MatchingCharacterPainter;	45	import org.eclipse.jface.text.source.MatchingCharacterPainter;
43	import org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy;
44	import org.eclipse.jface.text.source.AnnotationPainter.ITextStyleStrategy;
45		46
		47	import org.eclipse.ui.internal.texteditor.TextEditorPlugin;
46		48
47		49
48		50
Lines 229-234 Link Here
229	private String fCursorLinePainterEnableKey;	231	private String fCursorLinePainterEnableKey;
230	/** Preference key for the cursor line background color */	232	/** Preference key for the cursor line background color */
231	private String fCursorLinePainterColorKey;	233	private String fCursorLinePainterColorKey;
		234	/** preference key for the enabling cursor color */
		235	private String fCursorColorDefaultKey;
		236	/** preference key for the cursor color */
		237	private String fCursorColorKey;
232	/** Preference key for the margin painter */	238	/** Preference key for the margin painter */
233	private String fMarginPainterEnableKey;	239	private String fMarginPainterEnableKey;
234	/** Preference key for the margin painter color */	240	/** Preference key for the margin painter color */
Lines 309-314 Link Here
309	showMargin();	315	showMargin();
310	else	316	else
311	hideMargin();	317	hideMargin();
		318
		319	updateCursorColor();
312		320
313	Iterator e= fAnnotationTypeKeyMap.keySet().iterator();	321	Iterator e= fAnnotationTypeKeyMap.keySet().iterator();
314	while (e.hasNext()) {	322	while (e.hasNext()) {
Lines 445-450 Link Here
445	fCursorLinePainterEnableKey= enableKey;	453	fCursorLinePainterEnableKey= enableKey;
446	fCursorLinePainterColorKey= colorKey;	454	fCursorLinePainterColorKey= colorKey;
447	}	455	}
		456
		457	/**
		458	* Sets the preference keys for the cursor color.
		459	* @param defaultKey the preference key for the enabling cursor color
		460	* @param colorKey the preference key for the cursor color
		461	*/
		462	public void setCursorColorPreferenceKeys(String defaultKey, String colorKey) {
		463	fCursorColorDefaultKey= defaultKey;
		464	fCursorColorKey= colorKey;
		465	}
448		466
449	/**	467	/**
450	* Sets the preference keys for the margin painter.	468	* Sets the preference keys for the margin painter.
Lines 526-531 Link Here
526	hideCursorLine();	544	hideCursorLine();
527	return;	545	return;
528	}	546	}
		547
		548	if (fCursorColorDefaultKey != null && fCursorColorKey != null) {
		549	if (fCursorColorDefaultKey.equals(p) \|\| fCursorColorKey.equals(p))
		550	updateCursorColor();
		551	}
529		552
530	if (fCursorLinePainterColorKey != null && fCursorLinePainterColorKey.equals(p)) {	553	if (fCursorLinePainterColorKey != null && fCursorLinePainterColorKey.equals(p)) {
531	if (fCursorLinePainter != null) {	554	if (fCursorLinePainter != null) {
Lines 967-970 Link Here
967	fOverviewRuler.update();	990	fOverviewRuler.update();
968	}	991	}
969	}	992	}
		993
		994	/**
		995	* Update the cursor color for the editor
		996	*/
		997	private void updateCursorColor() {
		998	StyledText textWidget= fSourceViewer.getTextWidget();
		999	if (fPreferenceStore.getBoolean(fCursorColorDefaultKey)) {
		1000	textWidget.setCursor(null);
		1001	} else {
		1002	RGB rgb= PreferenceConverter.getColor(fPreferenceStore, fCursorColorKey);
		1003	Cursor cursor= TextEditorPlugin.getDefault().getSharedIBeamCursor(rgb);
		1004	textWidget.setCursor(cursor);
		1005	}
		1006	}
970	}	1007	}