Skip to content
Snippets Groups Projects
Commit 6e76938c authored by George Nachman's avatar George Nachman
Browse files

Log debugging info for cursor

parent c6678d8b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -6866,6 +6866,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 
- (void)_drawCursorTo:(NSPoint*)toOrigin
{
NSLog(@"Draw cursor at %d, %d", [dataSource cursorX]-1, [dataSource cursorY]-1);
int WIDTH, HEIGHT;
screen_char_t* theLine;
int yStart, x1;
Loading
Loading
@@ -6884,9 +6885,11 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
int lastVisibleLine = docVisibleRect.origin.y / [self lineHeight] + HEIGHT;
int cursorLine = [dataSource numberOfLines] - [dataSource height] + [dataSource cursorY] - [dataSource scrollbackOverflow];
if (cursorLine > lastVisibleLine) {
NSLog(@"Cursor line %d > lastVisibleLine %d", cursorLine, lastVisibleLine);
return;
}
if (cursorLine < 0) {
NSLog(@"Cursor line %d < 0", cursorLine);
return;
}
 
Loading
Loading
@@ -6910,6 +6913,21 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
showCursor = YES;
}
 
NSLog(@"blinking=%d isKey=%d tab is active=%d x changed=%d y changed=%d blinkshow=%d showCursor=%d hasMarkedText=%d CURSOR=%d x1=%d yStart=%d WIDTH=%d HEIGHT=%d",
(int)([self blinkingCursor]),
(int)([[self window] isKeyWindow]),
(int)([[[dataSource session] tab] activeSession] == [dataSource session]),
(int)(x1 == oldCursorX),
(int)(yStart == oldCursorY),
(int)blinkShow,
(int)showCursor,
(int)[self hasMarkedText],
(int)CURSOR,
(int)x1,
(int)yStart,
(int)WIDTH,
(int)HEIGHT);
// Draw the regular cursor only if there's not an IME open as it draws its
// own cursor.
if (![self hasMarkedText] && CURSOR) {
Loading
Loading
@@ -6994,8 +7012,10 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
}
 
BOOL frameOnly;
NSLog(@"cursorType_ = %d", (int)cursorType_);
switch (cursorType_) {
case CURSOR_BOX:
NSLog(@"Draw a box");
// draw the box
if ([[self window] isKeyWindow] &&
[[[dataSource session] tab] activeSession] == [dataSource session]) {
Loading
Loading
@@ -7102,10 +7122,15 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
break;
 
case CURSOR_VERTICAL:
NSLog(@"Draw vertical");
NSRectFill(NSMakeRect(curX, curY, 1, cursorHeight));
break;
 
case CURSOR_UNDERLINE:
NSLog(@"Draw underline rect %@", [NSValue valueWithRect:NSMakeRect(curX,
curY + lineHeight - 2,
ceil(cursorWidth * (double_width ? 2 : 1)),
2)]);
NSRectFill(NSMakeRect(curX,
curY + lineHeight - 2,
ceil(cursorWidth * (double_width ? 2 : 1)),
Loading
Loading
Loading
Loading
@@ -1990,11 +1990,7 @@
BB024D37096EE4080021E793 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
x86_64,
ppc,
);
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Loading
Loading
@@ -2003,7 +1999,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = 4.2;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_MISSING_PARENTHESES = YES;
Loading
Loading
@@ -2036,11 +2032,7 @@
BB024D38096EE4080021E793 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
ppc,
x86_64,
i386,
);
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment