Bug 694273 - Patch to support NSTextInputClient in text widgets

Provides an input module for native OSX input methods. Based on a patch by Hiroyuki Yamamoto (http://www.sraoss.jp/sylpheed/sylpheed/macosx/gtk+-2.24.0-macosx-textinputclient_ja-test1.patch). Adjustments for Gtk3 by Matthew Francis <gnomebugs@newsheffield.co.uk>
2013-05-20 10:48:32 -07:00
parent 9b9a0b71eb
commit 155caad426
5 changed files with 939 additions and 25 deletions
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@ -1,6 +1,7 @@
 /* GdkQuartzView.m
 *
 * Copyright (C) 2005-2007 Imendio AB
+ * Copyright (C) 2011 Hiroyuki Yamamoto
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@ -23,18 +24,507 @@

@implementation GdkQuartzView

+-(id)initWithFrame: (NSRect)frameRect
+{
+  if ((self = [super initWithFrame: frameRect]))
+    {
+      markedRange = NSMakeRange (NSNotFound, 0);
+      selectedRange = NSMakeRange (NSNotFound, 0);
+    }
+
+  return self;
+}
+
+-(BOOL)acceptsFirstResponder
+{
+  GDK_NOTE (EVENTS, g_print ("acceptsFirstResponder\n"));
+  return YES;
+}
+
+-(BOOL)becomeFirstResponder
+{
+  GDK_NOTE (EVENTS, g_print ("becomeFirstResponder\n"));
+  return YES;
+}
+
+-(BOOL)resignFirstResponder
+{
+  GDK_NOTE (EVENTS, g_print ("resignFirstResponder\n"));
+  return YES;
+}
+
+-(void) keyDown: (NSEvent *) theEvent
+{
+  GDK_NOTE (EVENTS, g_print ("keyDown\n"));
+  [self interpretKeyEvents: [NSArray arrayWithObject: theEvent]];
+}
+
+-(void)flagsChanged: (NSEvent *) theEvent
+{
+}
+
+-(NSUInteger)characterIndexForPoint: (NSPoint)aPoint
+{
+  GDK_NOTE (EVENTS, g_print ("characterIndexForPoint\n"));
+  return 0;
+}
+
+-(NSRect)firstRectForCharacterRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
+{
+  GDK_NOTE (EVENTS, g_print ("firstRectForCharacterRange\n"));
+  gint ns_x, ns_y;
+  GdkRectangle *rect;
+
+  rect = g_object_get_data (G_OBJECT (gdk_window), GIC_CURSOR_RECT);
+  if (rect)
+    {
+      _gdk_quartz_window_gdk_xy_to_xy (rect->x, rect->y + rect->height,
+				       &ns_x, &ns_y);
+
+      return NSMakeRect (ns_x, ns_y, rect->width, rect->height);
+    }
+  else
+    {
+      return NSMakeRect (0, 0, 0, 0);
+    }
+}
+
+-(NSArray *)validAttributesForMarkedText
+{
+  GDK_NOTE (EVENTS, g_print ("validAttributesForMarkedText\n"));
+  return [NSArray arrayWithObjects: NSUnderlineStyleAttributeName, nil];
+}
+
+-(NSAttributedString *)attributedSubstringForProposedRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
+{
+  GDK_NOTE (EVENTS, g_print ("attributedSubstringForProposedRange\n"));
+  return nil;
+}
+
+-(BOOL)hasMarkedText
+{
+  GDK_NOTE (EVENTS, g_print ("hasMarkedText\n"));
+  return markedRange.location != NSNotFound && markedRange.length != 0;
+}
+
+-(NSRange)markedRange
+{
+  GDK_NOTE (EVENTS, g_print ("markedRange\n"));
+  return markedRange;
+}
+
+-(NSRange)selectedRange
+{
+  GDK_NOTE (EVENTS, g_print ("selectedRange\n"));
+  return selectedRange;
+}
+
+-(void)unmarkText
+{
+  GDK_NOTE (EVENTS, g_print ("unmarkText\n"));
+  markedRange = selectedRange = NSMakeRange (NSNotFound, 0);
+}
+
+-(void)setMarkedText: (id)aString selectedRange: (NSRange)newSelection replacementRange: (NSRange)replacementRange
+{
+  GDK_NOTE (EVENTS, g_print ("setMarkedText\n"));
+  const char *str;
+  char *prev_str;
+
+  if (replacementRange.location == NSNotFound)
+    {
+      markedRange = NSMakeRange (newSelection.location, [aString length]);
+      selectedRange = NSMakeRange (newSelection.location, newSelection.length);
+    }
+  else {
+      markedRange = NSMakeRange (replacementRange.location, [aString length]);
+      selectedRange = NSMakeRange (replacementRange.location + newSelection.location, newSelection.length);
+    }
+
+  if ([aString isKindOfClass: [NSAttributedString class]])
+    {
+      str = [[aString string] UTF8String];
+    }
+  else {
+      str = [aString UTF8String];
+    }
+
+  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
+  if (prev_str)
+    g_free (prev_str);
+  g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, g_strdup (str));
+  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_POS,
+		     GUINT_TO_POINTER (selectedRange.location));
+  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_LEN,
+		     GUINT_TO_POINTER (selectedRange.length));
+
+  GDK_NOTE (EVENTS, g_print ("setMarkedText: set %s (%p, nsview %p): %s\n",
+			     TIC_MARKED_TEXT, gdk_window, self,
+			     str ? str : "(empty)"));
+}
+
+-(void)doCommandBySelector: (SEL)aSelector
+{
+  GDK_NOTE (EVENTS, g_print ("doCommandBySelector\n"));
+  [super doCommandBySelector: aSelector];
+}
+
+-(void)insertText: (id)aString replacementRange: (NSRange)replacementRange
+{
+  GDK_NOTE (EVENTS, g_print ("insertText\n"));
+  const char *str;
+  char *prev_str;
+
+  if ([self hasMarkedText])
+    [self unmarkText];
+
+  if ([aString isKindOfClass: [NSAttributedString class]])
+    {
+      str = [[aString string] UTF8String];
+    }
+  else
+    {
+      str = [aString UTF8String];
+    }
+
+  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT);
+  if (prev_str)
+    g_free (prev_str);
+  g_object_set_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT, g_strdup (str));
+  GDK_NOTE (EVENTS, g_print ("insertText: set %s (%p, nsview %p): %s\n",
+			     TIC_INSERT_TEXT, gdk_window, self,
+			     str ? str : "(empty)"));
+
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_FILTERED));
+}
+
+-(void)deleteBackward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("deleteBackward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)deleteForward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("deleteForward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)deleteToBeginningOfLine: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("deleteToBeginningOfLine\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)deleteToEndOfLine: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("deleteToEndOfLine\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)deleteWordBackward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("deleteWordBackward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)deleteWordForward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("deleteWordForward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)insertBacktab: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("insertBacktab\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)insertNewline: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("insertNewline\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY, GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)insertTab: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("insertTab\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveBackward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveBackward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveBackwardAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveBackwardAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveDown: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveDown\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveDownAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveDownAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveForward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveForward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveForwardAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveForwardAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveLeft: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveLeft\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveLeftAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveLeftAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveRight: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveRight\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveRightAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveRightAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToBeginningOfDocument: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocument\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToBeginningOfDocumentAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocumentAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToBeginningOfLine: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLine\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToBeginningOfLineAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLineAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToEndOfDocument: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocument\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToEndOfDocumentAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocumentAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToEndOfLine: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToEndOfLine\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveToEndOfLineAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveToEndOfLineAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveUp: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveUp\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveUpAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveUpAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordBackward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordBackward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordBackwardAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordBackwardAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordForward: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordForward\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordForwardAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordForwardAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordLeft: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordLeft\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordLeftAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordLeftAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordRight: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordRight\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)moveWordRightAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("moveWordRightAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)pageDown: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("pageDown\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)pageDownAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("pageDownAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)pageUp: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("pageUp\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)pageUpAndModifySelection: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("pageUpAndModifySelection\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)selectAll: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("selectAll\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)selectLine: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("selectLine\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)selectWord: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("selectWord\n"));
+  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
+		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
+}
+
+-(void)noop: (id)sender
+{
+  GDK_NOTE (EVENTS, g_print ("noop\n"));
+}
+
+/* --------------------------------------------------------------- */
+
 -(void)dealloc
 {
  if (trackingRect)
    {
-      [self removeTrackingRect:trackingRect];
+      [self removeTrackingRect: trackingRect];
      trackingRect = 0;
    }

  [super dealloc];
 }

-(void)setGdkWindow:(GdkWindow *)window
+-(void)setGdkWindow: (GdkWindow *)window
 {
  gdk_window = window;
 }
@ -60,10 +550,11 @@
    return YES;

  /* A view is opaque if its GdkWindow doesn't have the RGBA visual */
-  return gdk_window_get_visual (gdk_window) != gdk_screen_get_rgba_visual (_gdk_screen);
+  return gdk_window_get_visual (gdk_window) !=
+    gdk_screen_get_rgba_visual (_gdk_screen);
 }

-(void)drawRect:(NSRect)rect 
+-(void)drawRect: (NSRect)rect
 {
  GdkRectangle gdk_rect;
  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
@ -75,7 +566,7 @@
  if (GDK_WINDOW_DESTROYED (gdk_window))
    return;

-  if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK))
+  if (! (gdk_window->event_mask & GDK_EXPOSURE_MASK))
    return;

  if (NSEqualRects (rect, NSZeroRect))
@ -93,7 +584,7 @@
      [NSGraphicsContext saveGraphicsState];

      [[NSColor windowBackgroundColor] setFill];
-      [NSBezierPath fillRect:rect];
+      [NSBezierPath fillRect: rect];

      [NSGraphicsContext restoreGraphicsState];

@ -107,9 +598,9 @@
      impl->needs_display_region = NULL;
    }

-  [self getRectsBeingDrawn:&drawn_rects count:&count];
+  [self getRectsBeingDrawn: &drawn_rects count: &count];
  region = cairo_region_create ();
-  
+
  for (i = 0; i < count; i++)
    {
      gdk_rect.x = drawn_rects[i].origin.x;
@ -133,7 +624,7 @@
    }
 }

-(void)setNeedsInvalidateShadow:(BOOL)invalidate
+-(void)setNeedsInvalidateShadow: (BOOL)invalidate
 {
  needsInvalidateShadow = invalidate;
 }
@ -151,7 +642,7 @@

  if (trackingRect)
    {
-      [self removeTrackingRect:trackingRect];
+      [self removeTrackingRect: trackingRect];
      trackingRect = 0;
    }

@ -163,32 +654,32 @@
   */

  rect = [self bounds];
-  trackingRect = [self addTrackingRect:rect
-                                 owner:self
-                              userData:nil
-                          assumeInside:NO];
+  trackingRect = [self addTrackingRect: rect
+		  owner: self
+		  userData: nil
+		  assumeInside: NO];
 }

 -(void)viewDidMoveToWindow
 {
  if (![self window]) /* We are destroyed already */
-      return;
+    return;

  [self updateTrackingRect];
 }

-(void)viewWillMoveToWindow:(NSWindow *)newWindow
+-(void)viewWillMoveToWindow: (NSWindow *)newWindow
 {
  if (newWindow == nil && trackingRect)
    {
-      [self removeTrackingRect:trackingRect];
+      [self removeTrackingRect: trackingRect];
      trackingRect = 0;
    }
 }

-(void)setFrame:(NSRect)frame
+-(void)setFrame: (NSRect)frame
 {
-  [super setFrame:frame];
+  [super setFrame: frame];

  if ([self window])
    [self updateTrackingRect];