Changeset 213:36f5cb12e1a2 for dwt/custom/StyledText.d

Timestamp:

05/17/08 11:34:28 (8 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Update to SWT 3.4M7

Files:

• dwt/custom/StyledText.d (modified) (43 diffs)

dwt/custom/StyledText.d

@@ -57 +57 @@
-import dwt.widgets.Display;
-import dwt.widgets.Event;
+import dwt.widgets.IME;
-import dwt.widgets.Label;
-import dwt.widgets.Listener;
@@ -197 +198 @@
-    bool editable = true;
-    bool wordWrap = false;
- 
- 
+
+
-    int textLimit = -1;                 // limits the number of characters the user can type in the widget. Unlimited by default.
-    int[int] keyActionMap;
@@ -214 +215 @@
-    int lastLineBottom;                 // the bottom pixel of the last line been replaced
-    bool isMirrored_;
- 
+
-    Image leftCaretBitmap = null;
-    Image rightCaretBitmap = null;
-    int caretDirection = DWT.NULL;
+    int caretWidth = 0;
-    Caret defaultCaret = null;
-    bool updateCaretDirection = true;
-    bool fixedLineHeight;
-    bool dragDetect_ = true;
+    IME ime;
-
-    int alignment;
@@ -261 +264 @@
-        int startLine;                                  // first (wrapped) line to print
-        int endLine;                                    // last (wrapped) line to print
-
+   
-        Point selection = null;                 // selected text
- 
+
-        int lineSpacing;
-        int printMargin;
@@ -527 +530 @@
-        }
-        if (printOptions.printLineNumbers) {
+            int numberingWidth = 0;
-            int count = endLine - startLine + 1;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (numberingWidth > width) numberingWidth = width;
-            paintX += numberingWidth;
@@ -569 +585 @@
-                    //draw paragraph top in the current page and paragraph bottom in the next
-                    int height = paragraphBottom - paintY;
-paintX, paintY, 
+clientArea.x, paintY, clientArea.
-                    printLine(paintX, paintY, gc, foreground, lineBackground, layout, printLayout, i);
+                    gc.setClipping(cast(Rectangle)null);
-                    printDecoration(page, false, printLayout);
-                    printer.endPage();
@@ -579 +596 @@
-                        paintY = clientArea.y - height;
-                        int layoutHeight = layout.getBounds().height;
-paintX, clientArea.y, 
+clientArea.x, clientArea.y, clientArea.
-                        printLine(paintX, paintY, gc, foreground, lineBackground, layout, printLayout, i);
+                        gc.setClipping(cast(Rectangle)null);
-                        paintY += layoutHeight;
-                    }
-                    gc.setClipping(cast(Rectangle)null);
-                }
-            }
-            printerRenderer.disposeTextLayout(layout);
-        }
-
+ge <= endPage && pa
-            // close partial page
-            printDecoration(page, false, printLayout);
@@ -675 +692 @@
-        if (printOptions.printLineNumbers) {
-            FontMetrics metrics = layout.getLineMetrics(0);
-Descent
+Leading
-            printLayout.setDescent(metrics.getDescent());
-
+
+
+
+
+
+
+
+
+
+
-            int paintX = x - printMargin - printLayout.getBounds().width;
-            printLayout.draw(gc, paintX, y);
@@ -1313 +1339 @@
-    renderer.setContent(content);
-    renderer.setFont(getFont(), tabLength);
-
+
+
-    if ((style & DWT.WRAP) !is 0) {
-        setWordWrap(true);
@@ -1328 +1355 @@
-            }
-        };
-handle
+this
-    }
-    setCaret(defaultCaret);
@@ -1752 +1779 @@
-        for (int lineIndex = 0; lineIndex < lineCount; lineIndex++) {
-            TextLayout layout = renderer.getTextLayout(lineIndex);
+            int wrapWidth = layout.getWidth();
-            if (wordWrap) layout.setWidth(wHint is 0 ? 1 : wHint);
-            Rectangle rect = layout.getBounds();
-            height += rect.height;
-            width = Math.max(width, rect.width);
+            layout.setWidth(wrapWidth);
-            renderer.disposeTextLayout(layout);
-            if (isFixedLineHeight() && height > maxHeight) break;
@@ -1944 +1973 @@
-    }
-    if (selection.x is selection.y) return false;
-
-offset > selection.x
+, null, true
+selection.x <= offset
-        return dragDetect(event);
-    }
@@ -2237 +2266 @@
- */
-void doContent(char key) {
-    if (textLimit > 0 &&
-        content.getCharCount() - (selection.y - selection.x) >= textLimit) {
-        return;
-    }
-    Event event = new Event();
-    event.start = selection.x;
@@ -2267 +2292 @@
-    }
-    if (event.text !is null) {
+        if (textLimit > 0 && content.getCharCount() - (event.end - event.start) >= textLimit) {
+            return;
+        }
-        sendKeyEvent(event);
-    }
@@ -2531 +2559 @@
-    int newCaretOffset = getOffsetAtPoint(x, y);
-
-
-
+
-        newCaretOffset = doMouseWordSelect(x, newCaretOffset, line);
-    }
@@ -3247 +3274 @@
-Rectangle getBoundsAtOffset(int offset) {
-    int lineIndex = content.getLineAtOffset(offset);
+    int lineOffset = content.getOffsetAtLine(lineIndex);
-    String line = content.getLine(lineIndex);
-    Rectangle bounds;
-    if (line.length !is 0) {
-content.getOffsetAtLine(lineIndex)
+lineOffset
-        TextLayout layout = renderer.getTextLayout(lineIndex);
-        bounds = layout.getBounds(offsetInLine, offsetInLine);
@@ -3257 +3285 @@
-        bounds = new Rectangle (0, 0, 0, renderer.getLineHeight());
-    }
+    if (offset is caretOffset) {
+        int lineEnd = lineOffset + line.length;
+        if (offset is lineEnd && caretAlignment is PREVIOUS_OFFSET_TRAILING) {
+            bounds.width += getCaretWidth();
+        }
+    }
-    bounds.x += leftMargin - horizontalScrollOffset;
-    bounds.y += getLinePixel(lineIndex);
-    return bounds;
-}
-
-/**
- * Returns the caret position relative to the start of the text.
@@ -3308 +3341 @@
-}
-/**
-
- or null if no user defined content implementation has been set.
-
-@return content implementation that is used for text storage or null
-if no user defined 
+.
+
+ @return content the user defined content implementation that is used for
+text storage or the default content implementation if no user defined
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -3467 +3500 @@
-    checkWidget();
-    return content.getCharCount();
+}
+/**
+ * Returns the line at the given line index without delimiters.
+ * Index 0 is the first line of the content. When there are not
+ * any lines, getLine(0) is a valid call that answers an empty string.
+ * <p>
+ *
+ * @param lineIndex index of the line to return.
+ * @return the line text without delimiters
+ *
+ * @exception DWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception IllegalArgumentException <ul>
+ *   <li>ERROR_INVALID_RANGE when the line index is outside the valid range (< 0 or >= getLineCount())</li>
+ * </ul>
+ * @since 3.4
+ */
+public String getLine(int lineIndex) {
+    checkWidget();
+    if (lineIndex < 0 ||
+        (lineIndex > 0 && lineIndex >= content.getLineCount())) {
+        DWT.error(DWT.ERROR_INVALID_RANGE);
+    }
+    return content.getLine(lineIndex);
-}
-/**
@@ -3860 +3919 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
-offset is outside the valid range (< 0 or > getChar
+line index is outside the valid range (< 0 or >= getLine
- * </ul>
- * @since 2.0
@@ -3900 +3959 @@
-        DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    }
-
-
+
+
+
-        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-int getOffsetAtPoint(int x, int y) {
@@ -3948 +3987 @@
-    if (trailing[0] !is 0) {
-        int lineInParagraph = layout.getLineIndex(offsetInLine + trailing[0]);
-        //TODO handle bidi text
-        int lineStart = layout.getLineOffsets()[lineInParagraph];
-        if (offsetInLine + trailing[0] is lineStart) {
@@ -3975 +4013 @@
-    return offsetInLine + content.getOffsetAtLine(lineIndex);
-}
+int getOffsetAtPoint(int x, int y, int[] trailing, bool inTextOnly) {
+    if (inTextOnly && y + getVerticalScrollOffset() < 0 || x + horizontalScrollOffset < 0) {
+        return -1;
+    }
+    int bottomIndex = getPartialBottomIndex();
+    int height = getLinePixel(bottomIndex + 1);
+    if (inTextOnly && y > height) {
+        return -1;
+    }
+    int lineIndex = getLineIndex(y);
+    int lineOffset = content.getOffsetAtLine(lineIndex);
+    TextLayout layout = renderer.getTextLayout(lineIndex);
+    x += horizontalScrollOffset - leftMargin ;
+    y -= getLinePixel(lineIndex);
+    int offset = layout.getOffset(x, y, trailing);
+    Rectangle rect = layout.getLineBounds(layout.getLineIndex(offset));
+    renderer.disposeTextLayout(layout);
+    if (inTextOnly && !(rect.x  <= x && x <=  rect.x + rect.width)) {
+        return -1;
+    }
+    return offset + lineOffset;
+}
-/**
- * Returns the orientation of the receiver.
@@ -4000 +4060 @@
-        int lineHeight = renderer.getLineHeight();
-        int partialLineCount = Compatibility.ceil(clientAreaHeight, lineHeight);
-in(content.getLineCount(), topIndex + partialLineCount) - 1
+ax(0, Math.min(content.getLineCount(), topIndex + partialLineCount) - 1)
-    }
-    return getLineIndex(clientAreaHeight - bottomMargin);
@@ -4597 +4657 @@
-        int lineOffset = content.getOffsetAtLine(i);
-        TextLayout layout = renderer.getTextLayout(i);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            } else if (i is lineEnd) {
-                rect = layout.getBounds(0, end - lineOffset);
@@ -4727 +4790 @@
-int getCaretDirection() {
-    if (!isBidiCaret()) return DWT.DEFAULT;
+    if (ime.getCompositionOffset() !is -1) return DWT.DEFAULT;
-    if (!updateCaretDirection && caretDirection !is DWT.NULL) return caretDirection;
-    updateCaretDirection = false;
@@ -4754 +4818 @@
-int getWrapWidth () {
-    if (wordWrap && !isSingleLine()) {
-
+ - getCaretWidth()
-        return width > 0 ? width : 1;
-    }
@@ -4935 +4999 @@
-    addListener(DWT.Resize, listener);
-    addListener(DWT.Traverse, listener);
+    ime.addListener(DWT.ImeComposition, new class () Listener {
+        public void handleEvent(Event event) {
+            switch (event.detail) {
+                case DWT.COMPOSITION_SELECTION: handleCompositionSelection(event); break;
+                case DWT.COMPOSITION_CHANGED: handleCompositionChanged(event); break;
+                case DWT.COMPOSITION_OFFSET: handleCompositionOffset(event); break;
+            }
+        }
+    });
-    if (verticalBar !is null) {
-        verticalBar.addListener(DWT.Selection, new class() Listener {
@@ -5038 +5111 @@
-    }
-}
+void handleCompositionOffset (Event event) {
+    int[] trailing = new int [1];
+    event.index = getOffsetAtPoint(event.x, event.y, trailing, true);
+    event.count = trailing[0];
+}
+void handleCompositionSelection (Event event) {
+    event.start = selection.x;
+    event.end = selection.y;
+    event.text = getSelectionText();
+}
+void handleCompositionChanged(Event event) {
+    String text = event.text;
+    int start = event.start;
+    int end = event.end;
+    int length = text.length;
+    if (length is ime.getCommitCount()) {
+        content.replaceTextRange(start, end - start, "");
+        caretOffset = start;
+        caretWidth = 0;
+        caretDirection = DWT.NULL;
+    } else {
+        content.replaceTextRange(start, end - start, text);
+        caretOffset = ime.getCaretOffset();
+        if (ime.getWideCaret()) {
+            int lineIndex = getCaretLine();
+            int lineOffset = content.getOffsetAtLine(lineIndex);
+            TextLayout layout = renderer.getTextLayout(lineIndex);
+            caretWidth = layout.getBounds(start - lineOffset, start + length - 1 - lineOffset).width;
+            renderer.disposeTextLayout(layout);
+        }
+    }
+    showCaret();
+}
-/**
- * Frees resources.
@@ -5068 +5174 @@
-    }
-    if (isBidiCaret()) {
-handle
+this
-    }
-    selectionBackground = null;
@@ -5250 +5356 @@
-                end = lineEnd;
-            }
-selection.x = selection.y
-selectionAnchor = -1
+caretOffset
+resetSelection()
-            caretOffset = end;
-            showCaret();
@@ -5396 +5502 @@
- */
-void handleTextChanged(TextChangedEvent event) {
+    int offset = ime.getCompositionOffset();
+    if (offset !is -1 && lastTextChangeStart < offset) {
+        ime.setCompositionOffset(offset + lastTextChangeNewCharCount - lastTextChangeReplaceCharCount);
+    }
-    int firstLine = content.getLineAtOffset(lastTextChangeStart);
-    resetCache(firstLine, 0);
@@ -5786 +5896 @@
- */
-bool isBidi() {
-
+IS_CARBON || 
-}
-bool isBidiCaret() {
@@ -6513 +6623 @@
-    }
-    horizontalScrollOffset += pixels;
-    int oldColumnX = columnX;
-    setCaretLocation();
-    columnX = oldColumnX;
-    return true;
-}
@@ -6568 +6676 @@
-        super.redraw();
-    }
-    int oldColumnX = columnX;
-    setCaretLocation();
-    columnX = oldColumnX;
-    return true;
-}
@@ -6705 +6811 @@
- * Sets the alignment of the widget. The argument should be one of <code>DWT.LEFT</code>,
- * <code>DWT.CENTER</code> or <code>DWT.RIGHT</code>. The alignment applies for all lines.
+ * </p><p>
+ * Note that if <code>DWT.MULTI</code> is set, then <code>DWT.WRAP</code> must also be set
+ * in order to stabilize the right edge before setting alignment.
+ * </p>
- *
- * @param alignment the new alignment
@@ -6732 +6842 @@
-    checkWidget();
-    background = color;
+    super.setBackground(color);
-    super.redraw();
-}
@@ -6801 +6912 @@
-        }
-        if (isDefaultCaret) {
-0
+caretWidth
-        } else {
-            caret.setLocation(location);
@@ -6855 +6966 @@
-            caretOffset = offset;
-        }
+        caretAlignment = PREVIOUS_OFFSET_TRAILING;
-        // clear the selection if the caret is moved.
-        // don't notify listeners about the selection change.
@@ -7184 +7296 @@
- * Sets the alignment of the specified lines. The argument should be one of <code>DWT.LEFT</code>,
- * <code>DWT.CENTER</code> or <code>DWT.RIGHT</code>.
-
+
+
+
+
- * Should not be called if a LineStyleListener has been set since the listener
- * maintains the line attributes.
@@ -7490 +7605 @@
-        return;
-    }
-handle
+this
-        return;
-    }
@@ -7706 +7821 @@
-            caretOffset = selection.y = end;
-        }
+        caretAlignment = PREVIOUS_OFFSET_TRAILING;
-        internalRedrawRange(selection.x, selection.y - selection.x);
-    }
@@ -8005 +8121 @@
-    tabLength = tabs;
-    renderer.setFont(null, tabs);
-    if (caretOffset > 0) {
-        caretOffset = 0;
-        showCaret();
-        clearSelection(false);
-    }
-    resetCache(0, content.getLineCount());
+    setCaretLocation();
-    super.redraw();
-}