Mercurial > projects > dwt2

diff org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Sat, 09 Jul 2011 15:50:20 +0300
parents c01d033c633a
children
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d	Sat Jul 09 15:50:20 2011 +0300
@@ -39,14 +39,7 @@
 import org.eclipse.swt.custom.StyledTextEvent;
 
 import java.lang.all;
-
-version(Tango){
-    static import tango.text.Util;
-    static import tango.text.convert.Utf;
-    import tango.util.Convert;
-} else { // Phobos
-    import std.conv;
-}
+import java.nonstandard.UnsafeUtf;
 
 /**
  * A StyledTextRenderer renders the content of a StyledText widget.
@@ -365,7 +358,7 @@
     int type = bullet.type & (ST.BULLET_DOT|ST.BULLET_NUMBER|ST.BULLET_LETTER_LOWER|ST.BULLET_LETTER_UPPER);
     switch (type) {
         case ST.BULLET_DOT: string = "\u2022"; break;
-        case ST.BULLET_NUMBER: string = to!(String)(index); break;
+        case ST.BULLET_NUMBER: string = String_valueOf(index); break;
         case ST.BULLET_LETTER_LOWER: string = [cast(char) (index % 26 + 97)]; break;
         case ST.BULLET_LETTER_UPPER: string = [cast(char) (index % 26 + 65)]; break;
         default:
@@ -406,7 +399,7 @@
         styledText.drawBackground(gc, client.x, paintY, client.width, height);
     }
     gc.setForeground(widgetForeground);
-    if (selectionStart is selectionEnd || (selectionEnd <= 0 && selectionStart > lineLength - 1)) {
+    if (selectionStart is selectionEnd || (selectionEnd <= 0 && selectionStart >= lineLength)) {
         layout.draw(gc, paintX, paintY);
     } else {
         int start = Math.max(0, selectionStart);
@@ -422,7 +415,7 @@
         if (selectionStart <= lineLength && lineLength < selectionEnd ) {
             flags |= SWT.LAST_LINE_SELECTION;
         }
-        layout.draw(gc, paintX, paintY, start, end - 1, selectionFg, selectionBg, flags);
+        layout.draw(gc, paintX, paintY, start, end > 0 ? line.offsetBefore(end) : end - 1, selectionFg, selectionBg, flags);
     }
 
     // draw objects
@@ -603,7 +596,7 @@
 }
 int[] getRanges(int start, int length) {
     int[] newRanges;
-    int end = start + length - 1;
+    int end = start + length - 1; //not a valid index, but OK
     if (ranges !is null) {
         int rangeCount = styleCount << 1;
         int rangeStart = getRangeIndex(start, -1, rangeCount);
@@ -635,7 +628,7 @@
 }
 StyleRange[] getStyleRanges(int start, int length, bool includeRanges) {
     StyleRange[] newStyles;
-    int end = start + length - 1;
+    int end = start + length - 1; //not a valid index, but OK
     if (ranges !is null) {
         int rangeCount = styleCount << 1;
         int rangeStart = getRangeIndex(start, -1, rangeCount);
@@ -854,7 +847,7 @@
                 }
                 if (start >= length) break;
                 if (lastOffset < start) {
-                    layout.setStyle(null, lastOffset, start - 1);
+                    layout.setStyle(null, lastOffset, line.offsetBefore(start));
                 }
                 layout.setStyle(getStyleRange(styles[i >> 1]), start, end);
                 lastOffset = Math.max(lastOffset, end);
@@ -871,7 +864,7 @@
                 }
                 if (start >= length) break;
                 if (lastOffset < start) {
-                    layout.setStyle(null, lastOffset, start - 1);
+                    layout.setStyle(null, lastOffset, line.offsetBefore(start));
                 }
                 layout.setStyle(getStyleRange(styles[i]), start, end);
                 lastOffset = Math.max(lastOffset, end);
@@ -912,11 +905,11 @@
                         }
                     } else {
                         int start = compositionOffset - lineOffset;
-                        int end = start + compositionLength - 1;
+                        int end = line.offsetBefore(start + compositionLength);
                         TextStyle userStyle = layout.getStyle(start);
                         if (userStyle is null) {
-                            if (start > 0) userStyle = layout.getStyle(start - 1);
-                            if (userStyle is null && end + 1 < length) userStyle = layout.getStyle(end + 1);
+                            if (start > 0) userStyle = layout.getStyle(line.offsetBefore(start));
+                            if (userStyle is null && line.offsetAfter(end) < length) userStyle = layout.getStyle(line.offsetAfter(end));
                             if (userStyle !is null) {
                                 TextStyle newStyle = new TextStyle();
                                 newStyle.font = userStyle.font;