projects/dwt-mac: dwt/widgets/Text.d comparison

comparison dwt/widgets/Text.d @ 139:86fc761a24ae

Fixes #11

author	Jacob Carlborg <doob@me.com>
date	Thu, 04 Jun 2009 23:23:10 +0200
parents	3d9eb62cd2e3
children	834420cb1486

comparison

equal deleted inserted replaced

-:3d9eb62cd2e3
+:86fc761a24ae
 import dwt.widgets.Composite;
 import dwt.widgets.Event;
 import dwt.widgets.Scrollable;
 import dwt.widgets.TypedListener;
-import mambo.io;
 /**
 * Instances of this class are selectable user interface
 * objects that allow the user to enter and modify text.
 * Text controls can be either single or multi-line.
 * When a text control is created with a border, the
 alias Scrollable.setFont setFont;
 alias Scrollable.setForeground setForeground;
 alias Scrollable.translateTraversal translateTraversal;
 int textLimit, tabs = 8;
-char echoCharacter;
+wchar echoCharacter;
 bool doubleClick, receivingFocus;
 wchar[] hiddenText, message;
 NSRange* selectionRange;
 NSRange selectionRangeStruct;
 /**
 * The delimiter used by multi-line text widgets.  When text
 * is queried and from the widget, it will be delimited using
 * this delimiter.
 */
-	public static const String DELIMITER;
+	public static const wchar[] DELIMITER;
 	static const wchar PASSWORD = '\u2022';
 	/*
 * These values can be different on different platforms.
 * Therefore they are not initialized in the declaration
 * @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>
 */
-public void append (String string) {
+public void append (String stri) {
+wchar[] string = stri.toString16();
 checkWidget ();
 //if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 int charCount = getCharCount ();
 string = verifyText (string, charCount, charCount, null);
 if (string is null) return;
 }
-NSString str = NSString.stringWith (string);
+NSString str = NSString.stringWith16 (string);
 if ((style & DWT.SINGLE) !is 0) {
 setSelection (getCharCount ());
 insertEditText (string);
 } else {
 NSTextView widget = cast(NSTextView) view;
 */
 public void cut () {
 checkWidget ();
 if ((style & DWT.READ_ONLY) !is 0) return;
 bool cut = true;
-char [] oldText = null;
+wchar [] oldText = null;
 Point oldSelection = getSelection ();
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 if (oldSelection.x !is oldSelection.y) {
 oldText = getEditText (oldSelection.x, oldSelection.y - 1);
-String newText = verifyText ("", oldSelection.x, oldSelection.y, null);
+wchar[] newText = verifyText ("", oldSelection.x, oldSelection.y, null);
 if (newText is null) return;
 if (newText.length () !is 0) {
 copyToClipboard (oldText);
 if ((style & DWT.SINGLE) !is 0) {
 insertEditText (newText);
 } else {
 NSTextView widget = cast(NSTextView) view;
-widget.replaceCharactersInRange (widget.selectedRange (), NSString.stringWith (newText));
+widget.replaceCharactersInRange (widget.selectedRange (), NSString.stringWith16 (newText));
 }
 cut = false;
 }
 }
 }
 *
 * @see #setEchoChar
 */
 public char getEchoChar () {
 checkWidget ();
-return echoCharacter;
+return toChar(echoCharacter);
 }
 /**
 * Returns the editable state.
 *
 public bool getEditable () {
 checkWidget ();
 return (style & DWT.READ_ONLY) is 0;
 }
-char [] getEditText () {
+wchar [] getEditText () {
 NSString str = null;
 if ((style & DWT.SINGLE) !is 0) {
 str = (new NSTextFieldCell ((cast(NSTextField) view).cell ())).title ();
 } else {
 str = (cast(NSTextView)view).textStorage().string();
 } else {
 NSRange range = NSRange ();
 range.length = length_;
 str.getCharacters (buffer.ptr, range);
 }
-return dwt.dwthelper.utils.toString(buffer);
+return buffer;//.fromString16();
 }
-char [] getEditText (int start, int end) {
+wchar [] getEditText (int start, int end) {
 NSString str = null;
 if ((style & DWT.SINGLE) !is 0) {
 str = (new NSTextFieldCell ((cast(NSTextField) view).cell ())).title ();
 } else {
 str = (cast(NSTextView)view).textStorage().string();
 }
 int length = cast(int)/*64*/str.length ();
 end = Math.min (end, length - 1);
-if (start > end) return new char [0];
+if (start > end) return new wchar [0];
 start = Math.max (0, start);
 NSRange range = NSRange ();
 range.location = start;
 range.length = Math.max (0, end - start + 1);
 wchar [] buffer = new wchar [range.length];
 if (hiddenText !is null) {
 hiddenText.getChars (cast(int)/*64*/range.location, cast(int)/*64*/(range.location + range.length), buffer, 0);
 } else {
 str.getCharacters (buffer.ptr, range);
 }
-return dwt.dwthelper.utils.toString(buffer);
+return buffer;//.fromString16();
 }
 /**
 * Returns the number of lines.
 *
 *
 * @see #DELIMITER
 */
 public String getLineDelimiter () {
 checkWidget ();
-return DELIMITER;
+return DELIMITER.fromString16();
 }
 /**
 * Returns the height of a line.
 *
 *
 * @since 3.3
 */
 public String getMessage () {
 checkWidget ();
-return dwt.dwthelper.utils.toString(message);
+return message.fromString16();
 }
 int getPosition (int x, int y) {
 //  checkWidget ();
 //TODO
 public String getSelectionText () {
 checkWidget ();
 if ((style & DWT.SINGLE) !is 0) {
 Point selection = getSelection ();
 if (selection.x is selection.y) return "";
-return new_String (getEditText (selection.x, selection.y - 1));
+return new_String (getEditText (selection.x, selection.y - 1).fromString16());
 } else {
 NSTextView widget = cast(NSTextView) view;
 NSRange range = widget.selectedRange ();
 NSString str = widget.textStorage ().string ();
 wchar[] buffer = new wchar [range.length];
 str.getCharacters (buffer.ptr, range);
-return dwt.dwthelper.utils.toString(buffer);
+return buffer.fromString16();
 }
 }
 /**
 * Returns the number of tabs.
 */
 public String getText () {
 checkWidget ();
 NSString str;
 if ((style & DWT.SINGLE) !is 0) {
-return new_String (getEditText ());
+return new_String (getEditText ().fromString16());
 } else {
 str = (cast(NSTextView)view).textStorage ().string ();
 }
 return str.getString();
+}
+private wchar[] getText16 () {
+checkWidget ();
+NSString str;
+if ((style & DWT.SINGLE) !is 0) {
+return getEditText ().dup;
+} else {
+str = (cast(NSTextView)view).textStorage ().string ();
+}
+return str.getString16();
 }
 /**
 * Returns a range of text.  Returns an empty string if the
 * start of the range is greater than the end.
 */
 public String getText (int start, int end) {
 checkWidget ();
 if (!(start <= end && 0 <= end)) return ""; //$NON-NLS-1$
 if ((style & DWT.SINGLE) !is 0) {
-return new_String (getEditText (start, end));
+return new_String (getEditText (start, end).fromString16());
 }
 NSTextStorage storage = (cast(NSTextView) view).textStorage ();
 end = Math.min (end, cast(int)/*64*/storage.length () - 1);
 if (start > end) return ""; //$NON-NLS-1$
 start = Math.max (0, start);
 * @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>
 */
-public void insert (String string) {
+public void insert (String stri) {
+wchar[] string = stri.toString16();
 checkWidget ();
 //if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 Point selection = getSelection ();
 string = verifyText (string, selection.x, selection.y, null);
 if (string is null) return;
 }
 if ((style & DWT.SINGLE) !is 0) {
 insertEditText (string);
 } else {
-NSString str = NSString.stringWith (string);
+NSString str = NSString.stringWith16 (string);
 NSTextView widget = cast(NSTextView) view;
 NSRange range = widget.selectedRange ();
 widget.textStorage ().replaceCharactersInRange (range, str);
 }
 if (string.length () !is 0) sendEvent (DWT.Modify);
 }
-void insertEditText (String string) {
+void insertEditText (wchar[] string) {
 int length_ = string.length ();
 Point selection = getSelection ();
 if (hasFocus () && hiddenText is null) {
 if (textLimit !is LIMIT) {
 int charCount = getCharCount();
 if (charCount - (selection.y - selection.x) + length_ > textLimit) {
 length_ = textLimit - charCount + (selection.y - selection.x);
 }
 }
-char [] buffer = new char [length_];
+wchar [] buffer = new wchar [length_];
 string.getChars (0, buffer.length, buffer, 0);
-NSString nsstring = NSString.stringWithCharacters (buffer.toString16().ptr, buffer.length);
+NSString nsstring = NSString.stringWithCharacters (buffer.ptr, buffer.length);
 NSText editor = (cast(NSTextField) view).currentEditor ();
 editor.replaceCharactersInRange (editor.selectedRange (), nsstring);
 selectionRange = null;
 } else {
-String oldText = getText ();
+wchar[] oldText = getText16 ();
 if (textLimit !is LIMIT) {
 int charCount = oldText.length ();
 if (charCount - (selection.y - selection.x) + length_ > textLimit) {
 string = string.substring(0, textLimit - charCount + (selection.y - selection.x));
 }
 }
-String newText = oldText.substring (0, selection.x) ~ string ~ oldText.substring (selection.y);
+wchar[] newText = oldText.substring (0, selection.x) ~ string ~ oldText.substring (selection.y);
 setEditText (newText);
 setSelection (selection.x + string.length ());
 }
 }
 */
 public void paste () {
 checkWidget ();
 if ((style & DWT.READ_ONLY) !is 0) return;
 bool paste = true;
-String oldText = null;
+wchar[] oldText = null;
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
-oldText = getClipboardText ();
+oldText = getClipboardText16 ();
 if (oldText !is null) {
 Point selection = getSelection ();
-String newText = verifyText (oldText, selection.x, selection.y, null);
+wchar[] newText = verifyText (oldText, selection.x, selection.y, null);
 if (newText is null) return;
 if (!newText.equals (oldText)) {
 if ((style & DWT.SINGLE) !is 0) {
 insertEditText (newText);
 } else {
 NSTextView textView = cast(NSTextView) view;
-textView.replaceCharactersInRange (textView.selectedRange (), NSString.stringWith (newText));
+textView.replaceCharactersInRange (textView.selectedRange (), NSString.stringWith16 (newText));
 }
 paste = false;
 }
 }
 }
 if (paste) {
 if ((style & DWT.SINGLE) !is 0) {
-if (oldText is null) oldText = getClipboardText ();
+if (oldText is null) oldText = getClipboardText16 ();
 insertEditText (oldText);
 } else {
 //TODO check text limit
 (cast(NSTextView) view).paste (null);
 }
 postEvent (DWT.DefaultSelection);
 default:
 }
 }
 if ((stateMask & DWT.COMMAND) !is 0) return result;
-String oldText = "";
+wchar[] oldText = "";
 int charCount = getCharCount ();
 Point selection = getSelection ();
 int start = selection.x, end = selection.y;
 ushort keyCode = nsEvent.keyCode ();
 NSString characters = nsEvent.charactersIgnoringModifiers();
-char character = cast(char) characters.characterAtIndex(0);
+wchar character = characters.characterAtIndex(0);
 switch (keyCode) {
 case 51: /* Backspace */
 if (start is end) {
 if (start is 0) return true;
 start = Math.max (0, start - 1);
 break;
 default:
 if (character !is '\t' && character < 0x20) return true;
 oldText = new_String ([character]);
 }
-String newText = verifyText (oldText, start, end, nsEvent);
+wchar[] newText = verifyText (oldText, start, end, nsEvent);
 if (newText is null) return false;
 if (charCount - (end - start) + newText.length () > textLimit) {
 return false;
 }
 result = newText is oldText;
 if (newText !is oldText || hiddenText !is null) {
 if ((style & DWT.SINGLE) !is 0) {
 insertEditText (newText);
 } else {
-NSString str = NSString.stringWith (newText);
+NSString str = NSString.stringWith16 (newText);
 NSTextView widget = cast(NSTextView) view;
 NSRange range = widget.selectedRange ();
 widget.textStorage ().replaceCharactersInRange (range, str);
 }
 if (newText.length () !is 0) sendEvent (DWT.Modify);
 //          setSelection (selection);
 //      }
 //  } else {
 //      OS.TXNEchoMode (txnObject, echo, OS.kTextEncodingMacUnicode, echo !is '\0');
 //  }
-echoCharacter = echo;
+echoCharacter = toWChar(echo);
 }
 /**
 * Sets the editable state.
 *
 } else {
 (cast(NSTextView) view).setEditable (editable);
 }
 }
-void setEditText (String string) {
+void setEditText (wchar[] string) {
-char [] buffer;
+wchar [] buffer;
-if ((style & DWT.PASSWORD) is 0 && echoCharacter !is '\0') {
+if ((style & DWT.PASSWORD) && echoCharacter !is '\0') {
-hiddenText = string.toString16();
+hiddenText = string;
-buffer = new char [Math.min(hiddenText.length (), textLimit)];
+buffer = new wchar [Math.min(hiddenText.length (), textLimit)];
 for (int i = 0; i < buffer.length; i++) buffer [i] = echoCharacter;
 } else {
 hiddenText = null;
-buffer = new char [Math.min(string.length (), textLimit)];
+buffer = new wchar [Math.min(string.length (), textLimit)];
 string.getChars (0, buffer.length, buffer, 0);
 }
-NSString nsstring = NSString.stringWithCharacters (buffer.toString16().ptr, buffer.length);
+NSString nsstring = NSString.stringWithCharacters (buffer.ptr, buffer.length);
 (new NSCell ((cast(NSTextField) view).cell ())).setTitle (nsstring);
 selectionRange = null;
 }
 void setFont(NSFont font) {
 * @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>
 */
-public void setText (String string) {
+public void setText (String stri) {
+wchar[] string = stri.toString16();
 checkWidget ();
 //if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (hooks (DWT.Verify) || filters (DWT.Verify)) {
 string = verifyText (string, 0, getCharCount (), null);
 if (string is null) return;
 }
 if ((style & DWT.SINGLE) !is 0) {
 setEditText (string);
 } else {
-NSString str = NSString.stringWith (string);
+NSString str = NSString.stringWith16 (string);
 (cast(NSTextView) view).setString (str);
 }
 sendEvent (DWT.Modify);
 }
 }
 }
 return bits;
 }
-String verifyText (String string, int start, int end, NSEvent keyEvent) {
+wchar[] verifyText (wchar[] string, int start, int end, NSEvent keyEvent) {
 Event event = new Event ();
 if (keyEvent !is null) setKeyState(event, DWT.MouseDown, keyEvent);
-event.text = string;
+event.text = string.fromString16();
 event.start = start;
 event.end = end;
 /*
 * It is possible (but unlikely), that application
 * code could have disposed the widget in the verify
 * event.  If this happens, answer null to cancel
 * the operation.
 */
 sendEvent (DWT.Verify, event);
 if (!event.doit || isDisposed ()) return null;
-return event.text;
+return event.text.toString16();
 }
 }

Mercurial > projects > dwt-mac

comparison dwt/widgets/Text.d @ 139:86fc761a24ae