Mostly rewritten - should no longer crash with new internals, and be quite

better


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14675 72102866-910b-0410-8b05-ffd578937521

Source/NSSecureTextField.m

@@ -7,6 +7,9 @@
    Author: Gregory John Casamento <borgheron@yahoo.com>
    Date: 2000
 
+   Author: Nicola Pero <nicola@brainstorm.co.uk>
+   Date: October 2002
+
    This file is part of the GNUstep GUI Library.
 
    This library is free software; you can redistribute it and/or
@@ -35,243 +38,157 @@
 #include <AppKit/NSEvent.h>
 #include "GSSimpleLayoutManager.h"
 
-/* Other secure subclasses */
+/* 'Secure' subclasses */
 @interface NSSecureTextView : NSTextView
-{
+{}
-}
 @end
 
 @interface GSSimpleSecureLayoutManager : GSSimpleLayoutManager
-{
+{}
-}
 @end
 
 @implementation NSSecureTextField
 
-/*
-==============
-+initialize
-==============
-*/
 + (void) initialize
 {
-  if (self == [NSSecureTextField class]) {
+  if (self == [NSSecureTextField class])
-	[self setVersion:1];
+    {
+      [self setVersion:2];
     }
 }
 
-/*
-============
-+ cellClass
-============
-*/
 + (Class) cellClass
 {
-  // Hard code here to make sure no other class can be used.
+  /* Hard code here to make sure no other class is used.  */
   return [NSSecureTextFieldCell class];
 }
 
-/*
-============
-+ setCellClass
-============
-*/
 + (void) setCellClass: (Class)factoryId
 {
-  // Ward off interlopers with a stern message.
+  /* Ward off interlopers with a stern message.  */
   [NSException raise: NSInvalidArgumentException
-	      format: @"NSSecureTextField can only use NSSecureTextFieldCells in order to ensure security."];
+	       format: @"NSSecureTextField only uses NSSecureTextFieldCells."];
 }
 
-/*
-==============
--initWithFrame:
-==============
-*/
 - (id) initWithFrame:(NSRect)frameRect
 {
-  [super initWithFrame: frameRect];
+  self = [super initWithFrame: frameRect];
-  [_cell setEchosBullets: YES];
+  [self setEchosBullets: YES];
 
   return self;
 }
 
-/*
+- (void) setEchosBullets: (BOOL)flag
-==============
--initWithCoder:
-==============
-*/
-- (id) initWithCoder:(NSCoder *)decoder
 {
-  BOOL echosBullets = YES;
+  [_cell setEchosBullets: flag];
-
-  [super initWithCoder: decoder];
-  [decoder decodeValueOfObjCType: @encode(BOOL) at: &echosBullets];
-  [_cell setEchosBullets: echosBullets];
-
-  return self;
 }
 
-- (void) textDidEndEditing: (NSNotification *)aNotification
+- (BOOL) echosBullets
 {
-  [_text_object setText: [[aNotification object] text]]; 
+  return [_cell echosBullets];
-  [super textDidEndEditing: aNotification];
 }
+
 @end /* NSSecureTextField */
 
 @implementation NSSecureTextFieldCell
-/*
+
-==============
-+initialize
-==============
-*/
 + (void)initialize
 {
   if (self == [NSSecureTextFieldCell class])
-	[self setVersion:1];
-}
-
-/*
-==================================
-+_sharedSecureFieldEditorInstance
-==================================
-*/
-+ (id)_sharedSecureFieldEditorInstance
     {
-  static NSSecureTextView *secureView = nil;
+      [self setVersion:2];
-
+    }
-  if( secureView == nil )
-    {
-      secureView = [[NSSecureTextView alloc] init];
-      [secureView setFieldEditor: YES];
-      [secureView setText: @""];
 }
 
-  return secureView; 
-}
-
-/*
-===============
--echosBullets
-===============
-*/
 - (BOOL) echosBullets
 {
-  return i_echosBullets;
+  return _echosBullets;
 }
 
-/*
+/* Functionality not implemented.  */
-================
-+setEchosBullets:
-================
-*/
 - (void) setEchosBullets: (BOOL)flag
 {
-  i_echosBullets = flag;
+  _echosBullets = flag;
 }
 
-/*
+- (void) drawInteriorWithFrame: (NSRect)cellFrame 
-===============
--drawInteriorWithFrame:
-===============
-*/
-- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
-{
-  // do nothing....
-}
-
-/*
- * Editing Text
- */
-- (void) editWithFrame: (NSRect)aRect
 			inView: (NSView *)controlView
-		editor: (NSText*)textObject 
-	      delegate: (id)anObject
-		 event: (NSEvent*)theEvent
 {
-  id l_editor = [NSSecureTextFieldCell _sharedSecureFieldEditorInstance];
+  /* Do nothing.  */
-
-  [l_editor setText: [textObject text]];
-  [super editWithFrame: aRect
-		inView: controlView
-		editor: l_editor
-	      delegate: anObject
-		 event: theEvent];
 }
 
-- (void) selectWithFrame: (NSRect)aRect
+- (NSText *) setUpFieldEditorAttributes: (NSText *)textObject
-		  inView: (NSView*)controlView
-		  editor: (NSText*)textObject
-		delegate: (id)anObject
-		   start: (int)selStart
-		  length: (int)selLength
 {
-  id l_editor = [NSSecureTextFieldCell _sharedSecureFieldEditorInstance];
+  /* Replace the text object with a secure instance.  It's not shared.  */
+  textObject = [NSSecureTextView new];
+  AUTORELEASE (textObject);
 
-  [l_editor setText: [textObject text]];
+  return [super setUpFieldEditorAttributes: textObject];
-  [super selectWithFrame: aRect
-		  inView: controlView
-                  editor: l_editor
-		delegate: anObject
-		   start: selStart
-                  length: selLength];
 }
+
+- (id) initWithCoder:(NSCoder *)decoder
+{
+  [super initWithCoder: decoder];
+  [decoder decodeValueOfObjCType: @encode(BOOL) at: &_echosBullets];
+
+  return self;
+}
+
+- (void) encodeWithCoder: (NSCoder *)aCoder
+{
+  [super encodeWithCoder: aCoder];
+  [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_echosBullets];
+}
+
 @end
 
 @implementation GSSimpleSecureLayoutManager
 - (void) drawGlyphsForGlyphRange: (NSRange)glyphRange
 			 atPoint: (NSPoint)containerOrigin
 {
-  // do nothing...  
+  /* Do nothing.  */
 }
 @end
 
 @implementation NSSecureTextView
-/* Class methods */
-+ (void) initialize
-{
-  if ([self class] == [NSSecureTextView class])
-    {
-      [self setVersion: 1];
-      [self registerForServices];
-    }
-}
 
 - (id) initWithFrame: (NSRect)frameRect
+       textContainer: (NSTextContainer*)aTextContainer
 {
-  NSTextContainer *aTextContainer = 
+  GSSimpleSecureLayoutManager *m;
-      [[NSTextContainer alloc] initWithContainerSize: frameRect.size];
-  GSSimpleSecureLayoutManager *layoutManager = [[GSSimpleSecureLayoutManager alloc] init];
 
-  [super initWithFrame: frameRect];
+  /* Perform the normal init.  */
-  [layoutManager addTextContainer: aTextContainer];
+  [super initWithFrame: frameRect  textContainer: aTextContainer];
-  RELEASE(aTextContainer);
 
-  _textStorage = [[NSTextStorage alloc] init];
+  /* Then, replace the layout manager with a
-  [_textStorage addLayoutManager: layoutManager];
+   * GSSimpleSecureLayoutManager.  */
-  RELEASE(layoutManager);
+  m = [[GSSimpleSecureLayoutManager alloc] init];
+  AUTORELEASE (m);
+  [[self textContainer] replaceLayoutManager: m];
 
-  return [self initWithFrame: frameRect textContainer: aTextContainer];
+  [self setFieldEditor: YES];
+
+  return self;
 }
 
 - (void) copy: (id)sender
 {
-  // Do nothing since copying from a NSSecureTextView is *not* permitted.
+  /* Do nothing since copying from a NSSecureTextView is not permitted.  */
 }
 
 - (BOOL) writeSelectionToPasteboard: (NSPasteboard*)pboard
 			      types: (NSArray*)types
 {
-  /* Returns NO since the selection should never be 
+  /* Return NO since the selection should never be written to the
-     written to the pasteboard */
+   * pasteboard */
   return NO;
 }
 
 - (id) validRequestorForSendType: (NSString*) sendType
 		      returnType: (NSString*) returnType
 {
-  /* return "nil" to indicate that no type can be sent to the pasteboard for
+  /* Return nil to indicate that no type can be sent to the pasteboard
-     an object of this class */
+   * for an object of this class.  */
   return nil;
 }
 @end