Mercurial > dwindows

comparison mac/dw.m @ 1819:d784b85b632e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size()
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 19 Oct 2012 22:35:23 +0000
parents 5efaea897310
children 69f9aa1e1b1e
comparison
equal deleted inserted replaced
1818:09a7202edb53 1819:d784b85b632e
1320 _event_handler(self, DW_INT_TO_POINTER([page pageid]), 15); 1320 _event_handler(self, DW_INT_TO_POINTER([page pageid]), 15);
1321 } 1321 }
1322 -(void)keyDown:(NSEvent *)theEvent 1322 -(void)keyDown:(NSEvent *)theEvent
1323 { 1323 {
1324 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; 1324 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
1325 1325
1326 if(vk == NSTabCharacter || vk == NSBackTabCharacter) 1326 if(vk == NSTabCharacter || vk == NSBackTabCharacter)
1327 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]]; 1327 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
1328 else if(vk == NSLeftArrowFunctionKey) 1328 else if(vk == NSLeftArrowFunctionKey)
1329 { 1329 {
1330 NSArray *pages = [self tabViewItems]; 1330 NSArray *pages = [self tabViewItems];
1331 DWNotebookPage *page = (DWNotebookPage *)[self selectedTabViewItem]; 1331 DWNotebookPage *page = (DWNotebookPage *)[self selectedTabViewItem];
1332 NSUInteger index = [pages indexOfObject:page]; 1332 NSUInteger index = [pages indexOfObject:page];
1333 1333
1334 if(index != NSNotFound) 1334 if(index != NSNotFound)
1335 { 1335 {
1336 if(index > 0) 1336 if(index > 0)
1337 [self selectTabViewItem:[pages objectAtIndex:(index-1)]]; 1337 [self selectTabViewItem:[pages objectAtIndex:(index-1)]];
1338 else 1338 else
1339 [self selectTabViewItem:[pages objectAtIndex:0]]; 1339 [self selectTabViewItem:[pages objectAtIndex:0]];
1340 1340
1341 } 1341 }
1342 } 1342 }
1343 else if(vk == NSRightArrowFunctionKey) 1343 else if(vk == NSRightArrowFunctionKey)
1344 { 1344 {
1345 NSArray *pages = [self tabViewItems]; 1345 NSArray *pages = [self tabViewItems];
1346 DWNotebookPage *page = (DWNotebookPage *)[self selectedTabViewItem]; 1346 DWNotebookPage *page = (DWNotebookPage *)[self selectedTabViewItem];
1347 NSUInteger index = [pages indexOfObject:page]; 1347 NSUInteger index = [pages indexOfObject:page];
1348 NSUInteger count = [pages count]; 1348 NSUInteger count = [pages count];
1349 1349
1350 if(index != NSNotFound) 1350 if(index != NSNotFound)
1351 { 1351 {
1352 if(index + 1 < count) 1352 if(index + 1 < count)
1353 [self selectTabViewItem:[pages objectAtIndex:(index+1)]]; 1353 [self selectTabViewItem:[pages objectAtIndex:(index+1)]];
1354 else 1354 else
1355 [self selectTabViewItem:[pages objectAtIndex:(count-1)]]; 1355 [self selectTabViewItem:[pages objectAtIndex:(count-1)]];
1356 1356
1357 } 1357 }
1358 } 1358 }
1359 [super keyDown:theEvent]; 1359 [super keyDown:theEvent];
1360 } 1360 }
1361 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; } 1361 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
2140 return nil; 2140 return nil;
2141 } 2141 }
2142 -(void)keyDown:(NSEvent *)theEvent 2142 -(void)keyDown:(NSEvent *)theEvent
2143 { 2143 {
2144 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; 2144 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
2145 2145
2146 if(vk == NSTabCharacter || vk == NSBackTabCharacter) 2146 if(vk == NSTabCharacter || vk == NSBackTabCharacter)
2147 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]]; 2147 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
2148 [super keyDown:theEvent]; 2148 [super keyDown:theEvent];
2149 } 2149 }
2150 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; } 2150 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
2385 } 2385 }
2386 -(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; } 2386 -(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; }
2387 -(void)keyDown:(NSEvent *)theEvent 2387 -(void)keyDown:(NSEvent *)theEvent
2388 { 2388 {
2389 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; 2389 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
2390 2390
2391 if(vk == NSTabCharacter || vk == NSBackTabCharacter) 2391 if(vk == NSTabCharacter || vk == NSBackTabCharacter)
2392 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]]; 2392 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
2393 [super keyDown:theEvent]; 2393 [super keyDown:theEvent];
2394 } 2394 }
2395 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; } 2395 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
5300 for(index=0, numberOfLines=0; index < stringLength; numberOfLines++) 5300 for(index=0, numberOfLines=0; index < stringLength; numberOfLines++)
5301 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]); 5301 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
5302 5302
5303 *lines = numberOfLines; 5303 *lines = numberOfLines;
5304 } 5304 }
5305 DW_MUTEX_LOCK; 5305 DW_MUTEX_UNLOCK;
5306 } 5306 }
5307 5307
5308 /* 5308 /*
5309 * Deletes text from an MLE box. 5309 * Deletes text from an MLE box.
5310 * Parameters: 5310 * Parameters: