gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 15:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

(-setNeedsDisplay:, -setNeedsDisplayInRect:): Thread safety related fixes and cleanups.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16394 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-04-08 22:42:02 +00:00
parent 15ab06811c
commit 58a9585750
2 changed files with 64 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2003-04-09 00:38 Alexander Malmberg <alexander@malmberg.org>
* Source/NSView.m (-setNeedsDisplay:, -setNeedsDisplayInRect:):
Clean up, fix a potential issue when subclassing and thread-safety,
and clarify the documentation. (Based on discussion with David Ayers
and Pierre-Yves Rivaille.)
2003-04-08 15:33 Alexander Malmberg <alexander@malmberg.org>
* Source/NSTextView.m (-mouseDown:): Rewrite mouse tracking loop.

90
Source/NSView.m
View file

@ -2085,24 +2085,15 @@ GSSetDragTypes(NSView* obj, NSArray *types)
extern NSThread *GSAppKitThread; /* TODO */
- (void) _setNeedsDisplay_helper: (NSNumber *)v
{
[self setNeedsDisplay: [v boolValue]];
}
/*
For -setNeedsDisplay*, the real work is done in the ..._real methods, and
the actual public method simply calls it, but makes sure that the call is
in the main thread.
*/
/**
* As an exception to the general rules for threads and -gui, this
* method is thread-safe and may be called from any thread.
*/
- (void) setNeedsDisplay: (BOOL)flag
- (void) _setNeedsDisplay_real: (NSNumber *)n
{
if (GSCurrentThread() != GSAppKitThread)
{
[self performSelectorOnMainThread: @selector(_setNeedsDisplay_helper:)
withObject: [NSNumber numberWithBool: flag]
waitUntilDone: NO];
return;
}
BOOL flag = [n boolValue];
if (flag)
{
@ -2115,31 +2106,34 @@ extern NSThread *GSAppKitThread; /* TODO */
}
}
- (void) _setNeedsDisplayInRect_helper: (NSValue *)v
{
[self setNeedsDisplayInRect: [v rectValue]];
}
/**
* Inform the view system that the specified rectangle is invalid and
* requires updating. This automatically informs any superviews of
* any updating they need to do.
*
* As an exception to the general rules for threads and -gui, this
* method is thread-safe and may be called from any thread.
* method is thread-safe and may be called from any thread. Display
* will always be done in the main thread. (Note that other methods are
* in general not thread-safe; if you want to access other properties of
* views from multiple threads, you need to provide the synchronization.)
*/
- (void) setNeedsDisplayInRect: (NSRect)invalidRect
- (void) setNeedsDisplay: (BOOL)flag
{
NSView *currentView = _super_view;
NSNumber *n = [[NSNumber alloc] initWithBool: flag];
if (GSCurrentThread() != GSAppKitThread)
{
[self performSelectorOnMainThread: @selector(_setNeedsDisplayInRect_helper:)
withObject: [NSValue valueWithRect: invalidRect]
[self performSelectorOnMainThread: @selector(_setNeedsDisplay_real:)
withObject: n
waitUntilDone: NO];
return;
}
else
{
[self _setNeedsDisplay_real: n];
}
DESTROY(n);
}
- (void) _setNeedsDisplayInRect_real: (NSValue *)v
{
NSRect invalidRect = [v rectValue];
NSView *currentView = _super_view;
/*
* Limit to bounds, combine with old _invalidRect, and then check to see
@ -2176,6 +2170,36 @@ extern NSThread *GSAppKitThread; /* TODO */
}
}
/**
* Inform the view system that the specified rectangle is invalid and
* requires updating. This automatically informs any superviews of
* any updating they need to do.
*
* As an exception to the general rules for threads and -gui, this
* method is thread-safe and may be called from any thread. Display
* will always be done in the main thread. (Note that other methods are
* in general not thread-safe; if you want to access other properties of
* views from multiple threads, you need to provide the synchronization.)
*/
- (void) setNeedsDisplayInRect: (NSRect)invalidRect
{
NSValue *v = [[NSValue alloc]
initWithBytes: &invalidRect
objCType: @encode(NSRect)];
if (GSCurrentThread() != GSAppKitThread)
{
[self performSelectorOnMainThread: @selector(_setNeedsDisplayInRect_real:)
withObject: v
waitUntilDone: NO];
}
else
{
[self _setNeedsDisplayInRect_real: v];
}
DESTROY(v);
}
/*
* Scrolling
*/