The R Project SVN – R-packages – Diff – /trunk/Mac-GUI/RDocumentWinCtrl.m

 	if (!SPNSStringGetUTF8String) SPNSStringGetUTF8String = (SPUTF8StringMethodPtr)[NSString instanceMethodForSelector:@selector(UTF8String)];
 	const char* to_return = SPNSStringGetUTF8String(self, @selector(UTF8String));
 	return to_return;
+}
-static inline int RPARSERCONTEXTFORPOSITION (RTextView* self, NSUInteger index)
-{
-	typedef int (*RPARSERCONTEXTFORPOSITIONMethodPtr)(RTextView*, SEL, NSUInteger);
-	static RPARSERCONTEXTFORPOSITIONMethodPtr _RPARSERCONTEXTFORPOSITION;
-	if (!_RPARSERCONTEXTFORPOSITION) _RPARSERCONTEXTFORPOSITION = (RPARSERCONTEXTFORPOSITIONMethodPtr)[self methodForSelector:@selector(parserContextForPosition:)];
-	int r = _RPARSERCONTEXTFORPOSITION(self, @selector(parserContextForPosition:), index);
-	return r;
-}
 @implementation RDocumentWinCtrl
 //- (id)init { // NOTE: init is *not* used! put any initialization in windowDidLoad
 static RDocumentWinCtrl *staticCodedRWC = nil;
 	argsHints = [Preferences flagForKey:prefShowArgsHints withDefault:YES];
 	[[NSUserDefaults standardUserDefaults] addObserver:self forKeyPath:showBraceHighlightingKey options:NSKeyValueObservingOptionNew context:NULL];
 	[[NSUserDefaults standardUserDefaults] addObserver:self forKeyPath:prefShowArgsHints options:NSKeyValueObservingOptionNew context:NULL];
+    // FIXME: we did we use this?
-	[[self window] setBackgroundColor:[NSColor clearColor]];
+    //[[self window] setBackgroundColor:[NSColor clearColor]];
-	[[self window] setOpaque:NO];
+	//[[self window] setOpaque:NO];
 	SLog(@" - load document contents into textView");
 	[(RDocument*)[self document] loadInitialContents];
 	// If not line wrapping update textView explicitly in order to set scrollView correctly
 		[[textView enclosingScrollView] setHasVerticalRuler:YES];
 		[[textView enclosingScrollView] setRulersVisible:YES];
 		[theRulerView release];
 		[(NoodleLineNumberView*)[[textView enclosingScrollView] verticalRulerView] setLineWrappingMode:[Preferences flagForKey:enableLineWrappingKey withDefault: YES]];
+        [[self window] makeFirstResponder:theRulerView];
+	}
 	[self functionReset];
 	// Needed for showing tooltips of folded items
 	[[self window] setAcceptsMouseMovedEvents:YES];
+	// FIXME: this is a hack for layout issues in Big Sur
+	// by forcing re-size we force layout to be updated - is there a better way?
+	NSRect clRect = [[self window] contentLayoutRect];
+	clRect.size.width += 1;
+	[[self window] setContentSize:clRect.size];
+	clRect.size.width -= 1;
+	[[self window] setContentSize:clRect.size];
+	// Make the text view fist responder so the user can start typing
+	[[self window] makeFirstResponder:textView];
 	SLog(@" - windowDidLoad is done");
 	return;
 			int li = r.location-1;
 			unichar fc;
 			while (li>0 && ((fc=CFStringGetCharacterAtIndex((CFStringRef)s, li)) ==' ' || fc=='\t' || fc=='\r' || fc=='\n')) li--;
-			if(RPARSERCONTEXTFORPOSITION(textView, (li+2)) == pcComment)
+			if([textView parserContextForPosition: li + 2] == pcComment)
 				continue; // section declaration is commented out
 			// due to finial bracket decrease range length by 1
 			r.length--;
 			fn = [s substringWithRange:r];
 	NSInteger cursorLocation = selRange.location;
 	cursorLocation += shift; // add any shift as cursor movement guys need it
 	if (cursorLocation < 0 || cursorLocation >= completeStringLength) return;
 	// bail if current character is in quotes or comments
-	if(RPARSERCONTEXTFORPOSITION(textView, cursorLocation) != pcExpression) return;
+	if([textView parserContextForPosition:cursorLocation] != pcExpression) return;
 	unichar characterToCheck;
 	unichar openingChar = 0;
 	characterToCheck = CFStringGetCharacterAtIndex((CFStringRef)completeString, cursorLocation);
 	int skipMatchingBrace = 0;
 	NSInteger breakCounter = 3000;
 	// well, this is rather simple so far, because it ignores cross-quoting, but for a first shot it's not too bad ;)
 	if (openingChar) {
 		while (cursorLocation--) {
 			if(!breakCounter--) return;
-			if(RPARSERCONTEXTFORPOSITION(textView, cursorLocation) == pcExpression) {
+			if([textView parserContextForPosition:cursorLocation] == pcExpression) {
 				c = CFStringGetCharacterAtIndex((CFStringRef)completeString, cursorLocation);
 				if (c == openingChar) {
 					if (!skipMatchingBrace) {
 						[textView performSelector:@selector(highlightCharacter:) withObject:[NSNumber numberWithInt:cursorLocation] afterDelay:0.01];
 						return;
 		else if (characterToCheck == '[') openingChar=']';
 		else if (characterToCheck == '{') openingChar='}';
 		if (openingChar) {
 			while ((++cursorLocation)<maxLimit) {
 				if(!breakCounter--) return;
-				if(RPARSERCONTEXTFORPOSITION(textView, cursorLocation) == pcExpression) {
+				if([textView parserContextForPosition:cursorLocation] == pcExpression) {
 					c = CFStringGetCharacterAtIndex((CFStringRef)completeString, cursorLocation);
 					if (c == openingChar) {
 						if (!skipMatchingBrace) {
 							[textView performSelector:@selector(highlightCharacter:) withObject:[NSNumber numberWithInt:cursorLocation] afterDelay:0.01];
 							return;
 					NSInteger lastClosedP = -1;
 					BOOL oneBlock = YES;
 					BOOL firstRun = YES;
 					unichar c;
 					for(i=0; i<[line length]; i++) {
-						if(RPARSERCONTEXTFORPOSITION(textView, i) == pcExpression) {
+						if([textView parserContextForPosition: i] == pcExpression) {
 							c=CFStringGetCharacterAtIndex((CFStringRef)line,i);
 							if(c==')') {
 								cntP--;
 								lastClosedP = i;
+							}
 	while(1) {
 		fr = [rtvstr rangeOfString:@"#" options:0 range:searchRange];
 		if(!fr.length) break;
 		r = [rtvstr rangeOfRegex:comre options:0 inRange:NSMakeRange(fr.location, [rtvstr length]-fr.location) capture:1L error:nil];
 		// check if first # is a comment character i.e. not quoted
-		if(r.location+1 < [rtvstr length] && RPARSERCONTEXTFORPOSITION(rtv, r.location+1) == pcComment) {
+		if(r.location+1 < [rtvstr length] && [rtv parserContextForPosition: r.location + 1] == pcComment) {
 			rs = [rtvstr substringWithRange:[rtvstr rangeOfRegex:comre options:0 inRange:NSMakeRange(fr.location, [rtvstr length]-fr.location) capture:2L error:nil]];
 			rs = [rs stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
 			rstr = [NSString stringWithFormat:@";c=\"@__@_@_@%@\"", rs];
 			[rtv replaceCharactersInRange:r withString:rstr];
 			[rtvstr flushCachedRegexData];

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RDocumentWinCtrl.m – Rev 6408 → 7927