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



 *  A copy of the GNU General Public License is available via WWW at
 *  http://www.gnu.org/copyleft/gpl.html.  You can also obtain it by
 *  writing to the Free Software Foundation, Inc., 59 Temple Place,
 *  Suite 330, Boston, MA  02111-1307  USA.
 *
 *  $Id: RController.m 1603 2005-06-20 16:50:33Z urbaneks $
 */
 
#import "RGUI.h"
#include <R.h>
#include <Rversion.h>

	NSTextStorage *ts = [aNotification object];
	NSString *s = [ts string];
	NSRange sr = [RTextView selectedRange];
 
	// check for a typed (
	if (argsHints && sr.location>committedLength && sr.length==0 && sr.location>0 && sr.location<[s length] && [s characterAtIndex:sr.location]=='(') {
		int i = sr.location-1;
		unichar c = [s characterAtIndex:i];
		BOOL hasLit = NO;
		while ((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='.' || c=='_') {
			if (!hasLit && ((c>='a' && c<='z') || (c>='A' && c<='Z'))) hasLit=YES;

		SLog(@" - releasing %@", textFont);
		[textFont release];
		SLog(@" - using new %@", textFont);
		textFont = [newFont retain];
	}
 
	argsHints=[Preferences flagForKey:prefShowArgsHints withDefault:YES];
 
	{
		int i = 0, ccs = [consoleColorsKeys count];
		while (i<ccs) {
			NSColor *c = [Preferences unarchivedObjectForKey: [consoleColorsKeys objectAtIndex:i] withDefault: [consoleColors objectAtIndex:i]];
			if (c != [consoleColors objectAtIndex:i]) {

Rev 1562	Rev 1603
Line 24...	Line 24...
24	`* A copy of the GNU General Public License is available via WWW at`	24	`* A copy of the GNU General Public License is available via WWW at`
25	`* http://www.gnu.org/copyleft/gpl.html. You can also obtain it by`	25	`* http://www.gnu.org/copyleft/gpl.html. You can also obtain it by`
26	`* writing to the Free Software Foundation, Inc., 59 Temple Place,`	26	`* writing to the Free Software Foundation, Inc., 59 Temple Place,`
27	`* Suite 330, Boston, MA 02111-1307 USA.`	27	`* Suite 330, Boston, MA 02111-1307 USA.`
28	`*`	28	`*`
29	`* $Id: RController.m 1562 2005-05-30 20:12:38Z urbaneks $`	29	`* $Id: RController.m 1603 2005-06-20 16:50:33Z urbaneks $`
30	`*/`	30	`*/`
31		31
32	`#import "RGUI.h"`	32	`#import "RGUI.h"`
33	`#include <R.h>`	33	`#include <R.h>`
34	`#include <Rversion.h>`	34	`#include <Rversion.h>`
Line 1349...	Line 1349...
1349	`NSTextStorage *ts = [aNotification object];`	1349	`NSTextStorage *ts = [aNotification object];`
1350	`NSString *s = [ts string];`	1350	`NSString *s = [ts string];`
1351	`NSRange sr = [RTextView selectedRange];`	1351	`NSRange sr = [RTextView selectedRange];`
1352		1352
1353	`// check for a typed (`	1353	`// check for a typed (`
1354	`if (sr.location>committedLength && sr.length==0 && sr.location>0 && sr.location<[s length] && [s characterAtIndex:sr.location]=='(') {`	1354	`if (argsHints && sr.location>committedLength && sr.length==0 && sr.location>0 && sr.location<[s length] && [s characterAtIndex:sr.location]=='(') {`
1355	`int i = sr.location-1;`	1355	`int i = sr.location-1;`
1356	`unichar c = [s characterAtIndex:i];`	1356	`unichar c = [s characterAtIndex:i];`
1357	`BOOL hasLit = NO;`	1357	`BOOL hasLit = NO;`
1358	`while ((c>='0' && c<='9') \|\| (c>='a' && c<='z') \|\| (c>='A' && c<='Z') \|\| c=='.' \|\| c=='_') {`	1358	`while ((c>='0' && c<='9') \|\| (c>='a' && c<='z') \|\| (c>='A' && c<='Z') \|\| c=='.' \|\| c=='_') {`
1359	`if (!hasLit && ((c>='a' && c<='z') \|\| (c>='A' && c<='Z'))) hasLit=YES;`	1359	`if (!hasLit && ((c>='a' && c<='z') \|\| (c>='A' && c<='Z'))) hasLit=YES;`
Line 2229...	Line 2229...
2229	`SLog(@" - releasing %@", textFont);`	2229	`SLog(@" - releasing %@", textFont);`
2230	`[textFont release];`	2230	`[textFont release];`
2231	`SLog(@" - using new %@", textFont);`	2231	`SLog(@" - using new %@", textFont);`
2232	`textFont = [newFont retain];`	2232	`textFont = [newFont retain];`
2233	`}`	2233	`}`
-		2234
-		2235	`argsHints=[Preferences flagForKey:prefShowArgsHints withDefault:YES];`
2234		2236
2235	`{`	2237	`{`
2236	`int i = 0, ccs = [consoleColorsKeys count];`	2238	`int i = 0, ccs = [consoleColorsKeys count];`
2237	`while (i<ccs) {`	2239	`while (i<ccs) {`
2238	`NSColor *c = [Preferences unarchivedObjectForKey: [consoleColorsKeys objectAtIndex:i] withDefault: [consoleColors objectAtIndex:i]];`	2240	`NSColor *c = [Preferences unarchivedObjectForKey: [consoleColorsKeys objectAtIndex:i] withDefault: [consoleColors objectAtIndex:i]];`
2239	`if (c != [consoleColors objectAtIndex:i]) {`	2241	`if (c != [consoleColors objectAtIndex:i]) {`

The R Project SVN R-packages

(root)/trunk/Mac-GUI/RController.m – Rev 1562 → 1603