From bda7aeba79a0279f58ff5b3dd4ee2c128aced994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 23 Nov 2014 08:54:56 +0100
Subject: [PATCH] Issue #635,#726 jsyntaxpane - Fixed placing cursor inside
 Unicode characters

---
 lib/jsyntaxpane-0.9.5.jar                     | Bin 558263 -> 558366 bytes
 .../src/main/java/jsyntaxpane/SyntaxView.java |   2 +-
 .../src/main/java/jsyntaxpane/UniTools.java   | 313 +++++++++---------
 3 files changed, 160 insertions(+), 155 deletions(-)

diff --git a/lib/jsyntaxpane-0.9.5.jar b/lib/jsyntaxpane-0.9.5.jar
index 567e90d4da39dcc260fa0bc5493bb4f1237bfe47..a1c100c87deaa00eea9a7ce89046ef0d802fa571 100644
GIT binary patch
delta 11180
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

delta 10967
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

diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/SyntaxView.java b/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/SyntaxView.java
index fcebf67b3..c885237d9 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/SyntaxView.java
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/SyntaxView.java
@@ -134,7 +134,7 @@ public class SyntaxView extends PlainView {
                 graphics.setColor(rightMarginColor);
                 graphics.drawLine(m_x, y, m_x, y - h);
             }
-            return super.drawUnselectedText(graphics, x, y, p0, p1);
+            return drawUnselectedText(graphics, x, y, p0, p1);
         } else {
             return drawUnselectedText(graphics, x, y, p0, p1);
         }
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/UniTools.java b/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/UniTools.java
index 3bfb0821f..16048ecfa 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/UniTools.java
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/UniTools.java
@@ -1,154 +1,159 @@
-package jsyntaxpane;
-
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GraphicsEnvironment;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.swing.JLabel;
-import javax.swing.text.Segment;
-import javax.swing.text.TabExpander;
-import javax.swing.text.Utilities;
-import javax.swing.text.View;
-
-/**
- *
- * @author JPEXS
- */
-public class UniTools {
-    
-    private static List<String> backupFonts =new ArrayList<String>();
-    
-    private static boolean fontExists(String name){
-        GraphicsEnvironment g=GraphicsEnvironment.getLocalGraphicsEnvironment();
-        List<String> availFonts=Arrays.asList(g.getAvailableFontFamilyNames());
-        for(int i=0;i<availFonts.size();i++){
-            availFonts.set(i, availFonts.get(i).toLowerCase());
-        }
-        return availFonts.contains(name.toLowerCase());
-    }
-    
-   
-    private static String backupCandidates[] = new String[]{"Unifont","Arial Unicode MS"};
-    
-    
-    private static Font defaultUniFont=null;
-    static {
-        for(String bc:backupCandidates){
-            if(fontExists(bc)){
-                defaultUniFont = new Font(bc,Font.PLAIN,10);                
-            }
-        }
-        if(defaultUniFont==null){
-            defaultUniFont = new JLabel().getFont();
-        }
-    }
-    
-    public static int getTabbedTextOffset(Segment segment, FontMetrics metrics, int tabBase,int x,TabExpander e, int startOffset){
-        List<Segment> segments=new ArrayList<Segment>();
-        List<Boolean> unis=new ArrayList<Boolean>();
-        
-        Font origFont=metrics.getFont();
-        getSegments(origFont, segment, segments, unis);
-        Graphics g=new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getGraphics();
-        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
-        int ret=0;
-        int pos=0;
-        for(int i=0;i<segments.size();i++){
-            Segment seg=segments.get(i);
-            ret += Utilities.getTabbedTextOffset(seg, g.getFontMetrics(unis.get(i)?uniFont:origFont), tabBase,x, e, startOffset+pos);     
-            pos += seg.length();
-        }
-        return ret;
-    }
-    
-    private static void getSegments(Font f,Segment segment,List<Segment> segments,List<Boolean> unis){
-       
-        int start=0;
-        int len=0;
-        boolean uni=false;
-        for(int i=0;i<segment.length();i++){
-            boolean newuni=false;
-            if(!f.canDisplay(segment.charAt(i))){               
-                newuni=true;
-            }
-            if(i>0 && uni!=newuni){
-                Segment s =new Segment(segment.array, segment.offset+start, len);
-                segments.add(s);
-                unis.add(uni);
-                start = i;
-                len=0;
-            }
-            uni=newuni;
-            len++;
-        }
-        if(len>0){
-            Segment s =new Segment(segment.array, segment.offset+start, len);
-            segments.add(s);
-            unis.add(uni);                
-        }  
-    }
-    
-    public static int getTabbedTextWidth(Segment segment,FontMetrics f,int x,TabExpander e, int startOffset){
-        Graphics g=new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getGraphics();
-        g.setFont(f.getFont());
-        return getTabbedTextWidth(g,segment,x,e,startOffset);
-    }
-    
-    public static int getTabbedTextWidth(Graphics g,Segment segment,int x,TabExpander e, int startOffset){
-        List<Segment> segments=new ArrayList<Segment>();
-        List<Boolean> unis=new ArrayList<Boolean>();
-        getSegments(g.getFont(), segment, segments, unis);
-        Font origFont=g.getFont();
-        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
-        int ret=0;
-        int pos=0;
-        for(int i=0;i<segments.size();i++){
-            Segment seg=segments.get(i);
-            ret += Utilities.getTabbedTextWidth(seg, g.getFontMetrics(unis.get(i)?uniFont:origFont), 0, e, startOffset+pos);     
-            pos += seg.length();
-        }
-        return ret;       
-    }
-    
-    public static int drawTabbedText(Segment segment, int x, int y, Graphics g, TabExpander e, int startOffset){
-        
-        List<Segment> segments=new ArrayList<Segment>();
-        List<Boolean> unis=new ArrayList<Boolean>();
-        getSegments(g.getFont(), segment, segments, unis);
-        Font origFont=g.getFont();
-        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
-        int ret=x;
-        int pos=0;
-        for(int i=0;i<segments.size();i++){
-            Segment seg=segments.get(i);
-            if(unis.get(i)){
-                g.setFont(uniFont);
-            }else{
-                g.setFont(origFont);
-            }
-            ret = Utilities.drawTabbedText(seg, ret, y, g, e, startOffset+pos);   
-            pos += seg.length();
-        }
-        g.setFont(origFont);
-        return ret;         
-    }
-    
-    public static int stringWidth(Graphics g,String string){
-        List<Segment> segments=new ArrayList<Segment>();
-        List<Boolean> unis=new ArrayList<Boolean>();
-        Segment segment=new Segment(string.toCharArray(), 0, string.length());
-        getSegments(g.getFont(), segment, segments, unis);
-        Font origFont=g.getFont();
-        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
-        int ret=0;
-        for(int i=0;i<segments.size();i++){
-            Segment seg=segments.get(i);
-            ret+=g.getFontMetrics(unis.get(i)?uniFont:origFont).stringWidth(seg.toString());
-        }
-        return ret;
-    }
-}
+package jsyntaxpane;
+
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.GraphicsEnvironment;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.swing.JLabel;
+import javax.swing.text.Segment;
+import javax.swing.text.TabExpander;
+import javax.swing.text.Utilities;
+import javax.swing.text.View;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class UniTools {
+    
+    private static List<String> backupFonts =new ArrayList<String>();
+    
+    private static boolean fontExists(String name){
+        GraphicsEnvironment g=GraphicsEnvironment.getLocalGraphicsEnvironment();
+        List<String> availFonts=Arrays.asList(g.getAvailableFontFamilyNames());
+        for(int i=0;i<availFonts.size();i++){
+            availFonts.set(i, availFonts.get(i).toLowerCase());
+        }
+        return availFonts.contains(name.toLowerCase());
+    }
+    
+   
+    private static String backupCandidates[] = new String[]{"Unifont","Arial Unicode MS"};
+    
+    
+    private static Font defaultUniFont=null;
+    static {
+        for(String bc:backupCandidates){
+            if(fontExists(bc)){
+                defaultUniFont = new Font(bc,Font.PLAIN,10);                
+            }
+        }
+        if(defaultUniFont==null){
+            defaultUniFont = new JLabel().getFont();
+        }
+    }
+    
+    public static int getTabbedTextOffset(Segment segment, FontMetrics metrics, int tabBase,int x,TabExpander e, int startOffset){
+        List<Segment> segments=new ArrayList<Segment>();
+        List<Boolean> unis=new ArrayList<Boolean>();
+        
+        Font origFont=metrics.getFont();
+        getSegments(origFont, segment, segments, unis);
+        Graphics g=new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getGraphics();
+        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());       
+        int ofs=0;
+        int totalto = 0;
+        for(int i=0;i<segments.size();i++){
+            Segment seg=segments.get(i);
+            FontMetrics fm=unis.get(i)?g.getFontMetrics(uniFont):metrics;
+            int to = Utilities.getTabbedTextOffset(seg, fm, tabBase+ofs,x, e, startOffset);
+            totalto += to;
+            ofs+=fm.stringWidth(seg.toString());
+            if(to<seg.length()){
+                break;
+            }            
+        }        
+        return totalto;
+    }
+    
+    private static void getSegments(Font f,Segment segment,List<Segment> segments,List<Boolean> unis){
+       
+        int start=0;
+        int len=0;
+        boolean uni=false;
+        for(int i=0;i<segment.length();i++){
+            boolean newuni=false;
+            if(!f.canDisplay(segment.charAt(i))){               
+                newuni=true;
+            }
+            if(i>0 && uni!=newuni){
+                Segment s =new Segment(segment.array, segment.offset+start, len);
+                segments.add(s);
+                unis.add(uni);
+                start = i;
+                len=0;
+            }
+            uni=newuni;
+            len++;
+        }
+        if(len>0){
+            Segment s =new Segment(segment.array, segment.offset+start, len);
+            segments.add(s);
+            unis.add(uni);                
+        }  
+    }
+    
+    public static int getTabbedTextWidth(Segment segment,FontMetrics f,int x,TabExpander e, int startOffset){
+        Graphics g=new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getGraphics();
+        g.setFont(f.getFont());
+        return getTabbedTextWidth(g,segment,x,e,startOffset);
+    }
+    
+    public static int getTabbedTextWidth(Graphics g,Segment segment,int x,TabExpander e, int startOffset){
+        List<Segment> segments=new ArrayList<Segment>();
+        List<Boolean> unis=new ArrayList<Boolean>();
+        getSegments(g.getFont(), segment, segments, unis);
+        Font origFont=g.getFont();
+        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
+        int ret=0;
+        int pos=0;
+        for(int i=0;i<segments.size();i++){
+            Segment seg=segments.get(i);
+            ret += Utilities.getTabbedTextWidth(seg, g.getFontMetrics(unis.get(i)?uniFont:origFont), 0, e, startOffset+pos);     
+            pos += seg.length();
+        }
+        return ret;       
+    }
+    
+    public static int drawTabbedText(Segment segment, int x, int y, Graphics g, TabExpander e, int startOffset){
+        
+        List<Segment> segments=new ArrayList<Segment>();
+        List<Boolean> unis=new ArrayList<Boolean>();
+        getSegments(g.getFont(), segment, segments, unis);
+        Font origFont=g.getFont();
+        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
+        int ret=x;
+        int pos=0;
+        for(int i=0;i<segments.size();i++){
+            Segment seg=segments.get(i);
+            if(unis.get(i)){
+                g.setFont(uniFont);
+            }else{
+                g.setFont(origFont);
+            }
+            ret = Utilities.drawTabbedText(seg, ret, y, g, e, startOffset+pos);   
+            pos += seg.length();
+        }
+        g.setFont(origFont);
+        return ret;         
+    }
+    
+    public static int stringWidth(Graphics g,String string){
+        List<Segment> segments=new ArrayList<Segment>();
+        List<Boolean> unis=new ArrayList<Boolean>();
+        Segment segment=new Segment(string.toCharArray(), 0, string.length());
+        getSegments(g.getFont(), segment, segments, unis);
+        Font origFont=g.getFont();
+        Font uniFont = defaultUniFont.deriveFont(origFont.getStyle(),origFont.getSize2D());
+        int ret=0;
+        for(int i=0;i<segments.size();i++){
+            Segment seg=segments.get(i);
+            ret+=g.getFontMetrics(unis.get(i)?uniFont:origFont).stringWidth(seg.toString());
+        }
+        return ret;
+    }
+}