iterm-commits — Keep up to date with the latest subversion development

[iterm-commits] SF.net SVN: iterm:[1805] trunk/PTYTextView.m

[<de...@us...>]

Revision: 1805
          http://iterm.svn.sourceforge.net/iterm/?rev=1805&view=rev
Author:   delx
Date:     2009-09-17 23:57:47 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
Fixed debug statements

Modified Paths:
--------------
    trunk/PTYTextView.m

Modified: trunk/PTYTextView.m
===================================================================
--- trunk/PTYTextView.m	2009-09-17 17:55:10 UTC (rev 1804)
+++ trunk/PTYTextView.m	2009-09-17 23:57:47 UTC (rev 1805)
@@ -869,7 +869,7 @@
 - (void) otherMouseDown: (NSEvent *) event
 {
 #if DEBUG_METHOD_TRACE
-    NSLog(@"%s: %@]", __PRETTY_FUNCTION__, sender );
+	NSLog(@"%s: %@]", __PRETTY_FUNCTION__, event);
 #endif
 
     NSPoint locationInWindow, locationInTextView;
@@ -989,7 +989,7 @@
 - (void) rightMouseDown: (NSEvent *) event
 {
 #if DEBUG_METHOD_TRACE
-    NSLog(@"%s: %@]", __PRETTY_FUNCTION__, sender );
+	NSLog(@"%s: %@]", __PRETTY_FUNCTION__, event);
 #endif
 	
     NSPoint locationInWindow, locationInTextView;
@@ -1099,7 +1099,7 @@
 - (void)scrollWheel:(NSEvent *)event
 {
 #if DEBUG_METHOD_TRACE
-    NSLog(@"%s: %@]", __PRETTY_FUNCTION__, sender );
+	NSLog(@"%s: %@]", __PRETTY_FUNCTION__, event);
 #endif
 	
     NSPoint locationInWindow, locationInTextView;
@@ -1623,7 +1623,7 @@
 {
 	
 #if DEBUG_METHOD_TRACE
-    NSLog(@"%s(%d):-[PTYTextView copy:%@]", __FILE__, __LINE__, sender );
+	NSLog(@"%s(%d):-[PTYTextView content]", __FILE__, __LINE__);
 #endif
     	
 	return [self contentFromX:0 Y:0 ToX:[dataSource width]-1 Y:[dataSource numberOfLines]-1 pad: NO];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[iterm-commits] SF.net SVN: iterm:[1804] trunk

[<de...@us...>]

Revision: 1804
          http://iterm.svn.sourceforge.net/iterm/?rev=1804&view=rev
Author:   delx
Date:     2009-09-17 17:55:10 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
Formatting changes - to test iterm-commits list

Modified Paths:
--------------
    trunk/PTYSession.m
    trunk/VT100Screen.m

Modified: trunk/PTYSession.m
===================================================================
--- trunk/PTYSession.m	2009-09-17 14:39:20 UTC (rev 1803)
+++ trunk/PTYSession.m	2009-09-17 17:55:10 UTC (rev 1804)
@@ -298,25 +298,23 @@
 	parent = nil;
 }
 
-- (void)writeTask:(NSData *)data
+- (void)writeTask:(NSData*)data
 {
 	// check if we want to send this input to all the sessions
-    if([parent sendInputToAllSessions] == NO)
-    {
+	if([parent sendInputToAllSessions] == NO) {
 		if (!EXIT) {
 			[self setBell: NO];
-			PTYScroller *ptys=(PTYScroller *)[SCROLLVIEW verticalScroller];
+			PTYScroller* ptys=(PTYScroller*)[SCROLLVIEW verticalScroller];
 			[SHELL writeTask: data];
 			// Make sure we scroll down to the end
 			[TEXTVIEW scrollEnd];
 			[ptys setUserScroll: NO];
 		}
-    }
-    else
-    {
+	}
+	else {
 		// send to all sessions
 		[parent sendInputToAllSessions: data];
-    }
+	}
 }
 
 - (void)readTask:(NSData*)data

Modified: trunk/VT100Screen.m
===================================================================
--- trunk/VT100Screen.m	2009-09-17 14:39:20 UTC (rev 1803)
+++ trunk/VT100Screen.m	2009-09-17 17:55:10 UTC (rev 1804)
@@ -1026,21 +1026,18 @@
 	[self setDirty];
 }
 
-- (void) saveBuffer
-{	
-	int size=REAL_WIDTH*HEIGHT;
-	
+- (void)saveBuffer
+{
 #if DEBUG_METHOD_TRACE
 	NSLog(@"%s", __PRETTY_FUNCTION__);
-#endif	
-	
-	if (temp_buffer) 
-		free(temp_buffer);
-	
+#endif
+
+	if(temp_buffer) free(temp_buffer);
+
+	int size=REAL_WIDTH*HEIGHT;
 	int n = (screen_top - buffer_lines)/REAL_WIDTH - max_scrollback_lines;
-	
-	temp_buffer=(screen_char_t *)malloc(size*(sizeof(screen_char_t)));
-	if (n <= 0)
+	temp_buffer = (screen_char_t*)malloc(size*(sizeof(screen_char_t)));
+	if(n <= 0)
 		memcpy(temp_buffer, screen_top, size*sizeof(screen_char_t));
 	else {
 		memcpy(temp_buffer, screen_top, (HEIGHT-n)*REAL_WIDTH*sizeof(screen_char_t));
@@ -1048,28 +1045,24 @@
 	}
 }
 
-- (void) restoreBuffer
-{	
-	
+- (void)restoreBuffer
+{
 #if DEBUG_METHOD_TRACE
 	NSLog(@"%s", __PRETTY_FUNCTION__);
-#endif	
-	
-	if (!temp_buffer) 
-		return;
+#endif
 
-	int n = (screen_top - buffer_lines)/REAL_WIDTH - max_scrollback_lines;
+	if(!temp_buffer) return;
 
-	if (n<=0)
+	int n = (screen_top - buffer_lines)/REAL_WIDTH - max_scrollback_lines;
+	if(n <= 0)
 		memcpy(screen_top, temp_buffer, REAL_WIDTH*HEIGHT*sizeof(screen_char_t));
 	else {
 		memcpy(screen_top, temp_buffer, (HEIGHT-n)*REAL_WIDTH*sizeof(screen_char_t));
 		memcpy(buffer_lines, temp_buffer+(HEIGHT-n)*REAL_WIDTH, n*REAL_WIDTH*sizeof(screen_char_t));
 	}
-	
-		
+
 	[self setDirty];
-	
+
 	free(temp_buffer);
 	temp_buffer = NULL;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.