src/Tools/jEdit/patches/extended_styles
author wenzelm
Wed, 10 Jun 2020 19:59:12 +0200
changeset 71932 65fd0f032a75
parent 69838 4419d4d675c3
child 72247 c06260b7152c
permissions -rw-r--r--
updated to jedit-5.6pre1 (repository version 25349);
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     1
diff -ru 5.6pre1/jEdit-orig/org/gjt/sp/jedit/syntax/Chunk.java 5.6pre1/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     2
--- 5.6pre1/jEdit-orig/org/gjt/sp/jedit/syntax/Chunk.java	2020-06-09 17:01:03.000000000 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     3
+++ 5.6pre1/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java	2020-06-10 15:38:59.771992636 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     4
@@ -332,9 +332,9 @@
50306
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
     5
 	//{{{ Package private members
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
     6
 
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
     7
 	//{{{ Instance variables
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
     8
-	SyntaxStyle style;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
     9
+	public SyntaxStyle style;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    10
 	// set up after init()
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    11
-	float width;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    12
+	public float width;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    13
 	//}}}
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    14
 
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    15
 	//{{{ Chunk constructor
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    16
@@ -585,7 +585,7 @@
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    17
 	// styles[defaultID].getBackgroundColor()
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    18
 	private Color background;
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    19
-	private char[] chars;
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    20
-	private String str;
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    21
+	public char[] chars;
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    22
+	public String str;
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    23
 	private GlyphData glyphData;
50306
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    24
 	//}}}
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset
    25
 
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    26
diff -ru 5.6pre1/jEdit-orig/org/gjt/sp/jedit/textarea/TextArea.java 5.6pre1/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    27
--- 5.6pre1/jEdit-orig/org/gjt/sp/jedit/textarea/TextArea.java	2020-05-20 11:10:10.000000000 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    28
+++ 5.6pre1/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java	2020-06-10 15:38:03.605353644 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    29
@@ -914,6 +914,11 @@
61511
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    30
 		return chunkCache.getLineInfo(screenLine).physicalLine;
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    31
 	} //}}}
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    32
 
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    33
+        public Chunk getChunksOfScreenLine(int screenLine)
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    34
+        {
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    35
+                return chunkCache.getLineInfo(screenLine).chunks;
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    36
+        }
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    37
+
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    38
 	//{{{ getScreenLineOfOffset() method
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    39
 	/**
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents: 59571
diff changeset
    40
 	 * Returns the screen (wrapped) line containing the specified offset.
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    41
diff -ru 5.6pre1/jEdit-orig/org/gjt/sp/util/SyntaxUtilities.java 5.6pre1/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    42
--- 5.6pre1/jEdit-orig/org/gjt/sp/util/SyntaxUtilities.java	2020-05-20 11:10:13.000000000 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    43
+++ 5.6pre1/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java	2020-06-10 16:10:50.165837982 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    44
@@ -344,8 +344,28 @@
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    45
 			}
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    46
 		}
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    47
 
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    48
-		return styles;
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    49
+		styles[0] =
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    50
+			new SyntaxStyle(org.gjt.sp.jedit.jEdit.getColorProperty("view.fgColor", Color.BLACK),
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    51
+				null, new Font(family, 0, size));
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    52
+		return _styleExtender.extendStyles(styles);
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    53
 	} //}}}
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    54
 
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    55
+	/**
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    56
+	 * Extended styles derived from the user-specified style array.
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    57
+	 */
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    58
+
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    59
+	public static class StyleExtender
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    60
+	{
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    61
+		public SyntaxStyle[] extendStyles(SyntaxStyle[] styles)
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    62
+		{
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    63
+			return styles;
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    64
+		}
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    65
+	}
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    66
+	volatile private static StyleExtender _styleExtender = new StyleExtender();
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    67
+	public static void setStyleExtender(StyleExtender ext)
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    68
+	{
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    69
+		_styleExtender = ext;
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    70
+	}
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    71
+
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    72
 	private SyntaxUtilities(){}
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset
    73
 }