gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* NSApplication.m: polish, eliminate a couple of compiler warnings.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3423 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Felipe A. Rodriguez 1998-12-09 05:32:07 +00:00
parent 3a0de0df6c
commit 872ab1e340
4 changed files with 219 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -6,6 +6,7 @@ Tue Dec 8 1998 Felipe A. Rodriguez <far@ix.netcom.com>
displayIfNeededIgnoringOpacity: rewrite to fix obscure bugs in auto
display. Minor tweaks in other display methods for same reasons.
* NSView.h rename invalidatedRectangle to invalidRect.
* NSApplication.m: polish, eliminate a couple of compiler warnings.
Tue Dec 8 20:50:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>

2
Source/GNUServicesManager.m
View file

@ -1083,6 +1083,6 @@ NSSetShowsServicesMenuItem(NSString *name, BOOL enabled)
BOOL
NSShowsServicesMenuItem(NSString * name)
{
return [[GNUServicesManager manager] showsServicesMenuItem: itemName];
return [[GNUServicesManager manager] showsServicesMenuItem: name];
}

404
Source/NSApplication.m
View file

@ -57,21 +57,13 @@
#include <AppKit/NSMenu.h>
#include <AppKit/NSMenuItem.h>
#include <AppKit/NSCursor.h>
#include <AppKit/GNUServicesManager.h>
#include <AppKit/IMLoading.h>
#define CONVEY(a, b) [b retain]; \
[a release]; \
a = b;
#include <AppKit/GNUServicesManager.h>
//*****************************************************************************
//
// NSApplication
//
//*****************************************************************************
//
// Types
//
@ -89,6 +81,8 @@ static NSEvent *null_event;
static id NSApp;
static NSString *NSAbortModalException = @"NSAbortModalException";
@implementation NSApplication
//
@ -120,10 +114,6 @@ static NSString *NSAbortModalException = @"NSAbortModalException";
//
// Instance methods
//
//
// Creating and initializing the NSApplication
//
- init
{
[super init];
@ -191,26 +181,24 @@ NSString* mainModelFile;
- (void) dealloc
{
NSDebugLog(@"Freeing NSApplication\n");
// Let ourselves know we
// are within dealloc
gnustep_gui_app_is_in_dealloc = YES;
NSDebugLog(@"Freeing NSApplication\n");
// Let ourselves know we
gnustep_gui_app_is_in_dealloc = YES; // are within dealloc
[listener release];
[window_list release];
[event_queue release];
[current_event release];
/*
* We may need to tidy up nested modal session structures.
*/
while (session != 0)
{
NSModalSession tmp = session;
[listener release];
[window_list release];
[event_queue release];
[current_event release];
session = tmp->previous;
NSZoneFree(NSDefaultMallocZone(), tmp);
}
[super dealloc];
while (session != 0) // We may need to tidy up
{ // nested modal session
NSModalSession tmp = session; // structures.
session = tmp->previous;
NSZoneFree(NSDefaultMallocZone(), tmp);
}
[super dealloc];
}
//
@ -226,68 +214,11 @@ NSString* mainModelFile;
app_is_active = NO;
}
- (BOOL)isActive
{
return app_is_active;
}
- (BOOL)isActive { return app_is_active; }
//
// Running the event loop
// Running the main event loop
//
- (void) abortModal
{
if (session == 0)
[NSException raise: NSAbortModalException
format: @"abortModal when not in a modal session"];
[NSException raise: NSAbortModalException
format: @"abortModal"];
}
- (NSModalSession) beginModalSessionForWindow: (NSWindow*)theWindow
{
NSModalSession theSession;
theSession = (NSModalSession)NSZoneMalloc(NSDefaultMallocZone(),
sizeof(struct _NSModalSession));
theSession->runState = NSRunContinuesResponse;
theSession->window = theWindow;
theSession->previous = session;
session = theSession;
return theSession;
}
- (void) endModalSession: (NSModalSession)theSession
{
NSModalSession tmp = session;
if (theSession == 0)
[NSException raise: NSInvalidArgumentException
format: @"null pointer passed to endModalSession:"];
/*
* Remove this session from the linked list of sessions.
*/
while (tmp && tmp != theSession)
tmp = tmp->previous;
if (tmp == 0)
[NSException raise: NSInvalidArgumentException
format: @"unknown session passed to endModalSession:"];
while (session != theSession)
{
tmp = session;
session = tmp->previous;
NSZoneFree(NSDefaultMallocZone(), tmp);
}
session = session->previous;
NSZoneFree(NSDefaultMallocZone(), session);
}
- (BOOL)isRunning
{
return app_is_running;
}
- (void)run
{
NSEvent *e;
@ -322,113 +253,201 @@ NSAutoreleasePool* pool;
NSDebugLog(@"NSApplication end of run loop\n");
}
- (BOOL)isRunning
{
return app_is_running;
}
//
// Running modal event loops
//
- (void) abortModal
{
if (session == 0)
[NSException raise: NSAbortModalException
format:@"abortModal called while not in a modal session"];
[NSException raise: NSAbortModalException format: @"abortModal"];
}
- (NSModalSession) beginModalSessionForWindow: (NSWindow*)theWindow
{
NSModalSession theSession;
theSession = (NSModalSession)NSZoneMalloc(NSDefaultMallocZone(),
sizeof(struct _NSModalSession));
theSession->runState = NSRunContinuesResponse;
theSession->window = theWindow;
theSession->previous = session;
session = theSession;
return theSession;
}
- (void) endModalSession: (NSModalSession)theSession
{
NSModalSession tmp = session;
if (theSession == 0)
[NSException raise: NSInvalidArgumentException
format: @"null pointer passed to endModalSession:"];
while (tmp && tmp != theSession) // Remove this session from
tmp = tmp->previous; // linked list of sessions.
if (tmp == 0)
[NSException raise: NSInvalidArgumentException
format: @"unknown session passed to endModalSession:"];
while (session != theSession)
{
tmp = session;
session = tmp->previous;
NSZoneFree(NSDefaultMallocZone(), tmp);
}
session = session->previous;
NSZoneFree(NSDefaultMallocZone(), session);
}
- (int) runModalForWindow: (NSWindow*)theWindow
{
NSModalSession theSession;
int code = NSRunContinuesResponse;
static NSModalSession theSession;
static int code;
NS_DURING
{
theSession = [self beginModalSessionForWindow:theWindow];
while (code == NSRunContinuesResponse)
{
code = [self runModalSession: theSession];
}
[self endModalSession: theSession];
}
NS_HANDLER
{
if (theSession)
{
[self endModalSession: theSession];
}
if ([[localException name] isEqual: NSAbortModalException] == NO)
[localException raise];
code = NSRunAbortedResponse;
}
NS_ENDHANDLER
return code;
theSession = NULL;
code = NSRunContinuesResponse;
NS_DURING
{
theSession = [self beginModalSessionForWindow:theWindow];
while (code == NSRunContinuesResponse)
{
code = [self runModalSession: theSession];
}
[self endModalSession: theSession];
}
NS_HANDLER
{
if (theSession)
{
[self endModalSession: theSession];
}
if ([[localException name] isEqual: NSAbortModalException] == NO)
[localException raise];
code = NSRunAbortedResponse;
}
NS_ENDHANDLER
return code;
}
- (int) runModalSession: (NSModalSession)theSession
{
BOOL found;
NSEvent *event;
unsigned count;
unsigned i;
BOOL found = NO;
NSEvent *event;
unsigned count;
unsigned i;
if (theSession != session)
[NSException raise: NSInvalidArgumentException
format: @"runModalSession: with wrong session"];
if (theSession != session)
[NSException raise: NSInvalidArgumentException
format: @"runModalSession: with wrong session"];
theSession->runState = NSRunContinuesResponse;
[theSession->window display];
[theSession->window makeKeyAndOrderFront: self];
theSession->runState = NSRunContinuesResponse;
[theSession->window display];
[theSession->window makeKeyAndOrderFront: self];
/*
* First we make sure that there is an event.
*/
do
{
count = [event_queue count];
for (i = 0; i < count; i++)
{
event = [event_queue objectAtIndex: i];
if ([event window] == theSession->window)
{
found = YES;
break;
}
}
do { // First we make sure
count = [event_queue count]; // that there is an
for (i = 0; i < count; i++) // event.
{
event = [event_queue objectAtIndex: i];
if ([event window] == theSession->window)
{
found = YES;
break;
}
}
if (found == NO)
{
NSDate *limitDate = [NSDate distantFuture];
if (found == NO)
{
NSDate *limitDate = [NSDate distantFuture];
[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
beforeDate: limitDate];
}
}
while (found == NO && theSession->runState == NSRunContinuesResponse);
[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
beforeDate: limitDate];
}
}
while (found == NO && theSession->runState == NSRunContinuesResponse);
/*
* Now we deal with all the events in the queue.
*/
while (found == YES && theSession->runState == NSRunContinuesResponse)
{
NSAutoreleasePool *pool = [NSAutoreleasePool new];
// Deal with the events
// in the queue.
while (found == YES && theSession->runState == NSRunContinuesResponse)
{
NSAutoreleasePool *pool = [NSAutoreleasePool new];
found = NO;
count = [event_queue count];
for (i = 0; i < count; i++)
{
event = [event_queue objectAtIndex: i];
if ([event window] == theSession->window)
{
ASSIGN(current_event, event);
[event_queue removeObjectAtIndex: i];
found = YES;
break;
}
}
found = NO;
count = [event_queue count];
for (i = 0; i < count; i++)
{
event = [event_queue objectAtIndex: i];
if ([event window] == theSession->window)
{
ASSIGN(current_event, event);
[event_queue removeObjectAtIndex: i];
found = YES;
if (found == YES)
{
[self sendEvent: current_event];
break;
}
}
if (windows_need_update)
[self updateWindows];
if (found == YES)
{
[self sendEvent: current_event];
/* xxx should we update the services menu? */
[listener updateServicesMenu];
}
[pool release];
}
if (windows_need_update)
[self updateWindows];
/* xxx should we update the services menu? */
[listener updateServicesMenu];
}
NSAssert(session == theSession, @"Session was changed while running");
return theSession->runState;
[pool release];
}
NSAssert(session == theSession, @"Session was changed while running");
return theSession->runState;
}
- (void) stop: (id)sender
{
if (session)
[self stopModal];
else
app_is_running = NO;
}
- (void) stopModal
{
[self stopModalWithCode: NSRunStoppedResponse];
}
- (void) stopModalWithCode: (int)returnCode
{
if (session == 0)
[NSException raise: NSInvalidArgumentException
format:@"stopModalWithCode: when not in a modal session"];
else
if (returnCode == NSRunContinuesResponse)
[NSException raise: NSInvalidArgumentException
format: @"stopModalWithCode: with NSRunContinuesResponse"];
session->runState = returnCode;
}
//
// Getting, removing, and posting events
//
- (void)sendEvent:(NSEvent *)theEvent
{
if (theEvent == null_event) // Don't send null event
@ -488,35 +507,6 @@ NSAutoreleasePool* pool;
}
}
- (void) stop: (id)sender
{
if (session)
[self stopModal];
else
app_is_running = NO;
}
- (void) stopModal
{
[self stopModalWithCode: NSRunStoppedResponse];
}
- (void) stopModalWithCode: (int)returnCode
{
if (session == 0)
[NSException raise: NSInvalidArgumentException
format: @"stopModalWithCode: when not in a modal session"];
else if (returnCode == NSRunContinuesResponse)
[NSException raise: NSInvalidArgumentException
format: @"stopModalWithCode: with NSRunContinuesResponse"];
session->runState = returnCode;
}
//
// Getting, removing, and posting events
//
- (NSEvent *)currentEvent;
{
return current_event;

59
Source/NSPanel.m
View file

@ -29,6 +29,8 @@
#include <gnustep/gui/config.h>
#include <AppKit/NSPanel.h>
@implementation NSPanel
//
@ -36,56 +38,35 @@
//
+ (void)initialize
{
if (self == [NSPanel class])
{
// Initial version
[self setVersion:1];
}
if (self == [NSPanel class])
[self setVersion:1];
}
//
//
// Instance methods
//
- init
{
int style;
int style = NSTitledWindowMask | NSClosableWindowMask;
style = NSTitledWindowMask | NSClosableWindowMask;
return [self initWithContentRect:NSZeroRect styleMask:style
backing:NSBackingStoreBuffered defer:NO];
return [self initWithContentRect:NSZeroRect
styleMask:style
backing:NSBackingStoreBuffered
defer:NO];
}
//
// Determining the Panel Behavior
// Determining the Panel's Behavior
//
- (BOOL)becomesKeyOnlyIfNeeded
{
return _becomesKeyOnlyIfNeeded;
}
- (BOOL)isFloatingPanel
{
return _isFloatingPanel;
}
- (BOOL)isFloatingPanel { return _isFloatingPanel; }
- (void)setFloatingPanel:(BOOL)flag { _isFloatingPanel = flag; }
- (BOOL)worksWhenModal { return _worksWhenModal; }
- (void)setWorksWhenModal:(BOOL)flag { _worksWhenModal = flag; }
- (BOOL)becomesKeyOnlyIfNeeded { return _becomesKeyOnlyIfNeeded; }
- (void)setBecomesKeyOnlyIfNeeded:(BOOL)flag
{
_becomesKeyOnlyIfNeeded = flag;
}
- (void)setFloatingPanel:(BOOL)flag
{
_isFloatingPanel = flag;
}
- (void)setWorksWhenModal:(BOOL)flag
{
_worksWhenModal = flag;
}
- (BOOL)worksWhenModal
{
return _worksWhenModal;
_becomesKeyOnlyIfNeeded = flag;
}
//
@ -93,14 +74,14 @@
//
- (void)encodeWithCoder:aCoder
{
[super encodeWithCoder:aCoder];
[super encodeWithCoder:aCoder];
}
- initWithCoder:aDecoder
{
[super initWithCoder:aDecoder];
[super initWithCoder:aDecoder];
return self;
return self;
}
@end