Menu
▾
▴
interfacewm-cvs
|
From: <co...@us...> - 2003-11-18 03:40:15
|
Update of /cvsroot/interfacewm/interfacewm
In directory sc8-pr-cvs1:/tmp/cvs-serv16219
Modified Files:
IWMController.m IWMDebug.h IWMDebug.m
Log Message:
removed IWMPool macros, cleanup, correct Id tags
Index: IWMController.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMController.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IWMController.m 24 Sep 2003 19:14:07 -0000 1.3
--- IWMController.m 18 Nov 2003 03:40:12 -0000 1.4
***************
*** 50,55 ****
#if 1
! IWMPoolStart
! {
IWMOptionParser *parser = nil;
char *prog = IWMFetchRight(1, argv[0], NULL);
--- 50,54 ----
#if 1
! NSAutoreleasePool *_pool = [[NSAutoreleasePool alloc] init];
IWMOptionParser *parser = nil;
char *prog = IWMFetchRight(1, argv[0], NULL);
***************
*** 62,75 ****
while( -1 != (c = [parser parse]) )
! switch( c )
! {
! case 'd' :
! display = (char *) [parser argument];
! break;
!
! case 'h' :
! default :
! usage(prog);
! }
argc -= [parser index];
--- 61,74 ----
while( -1 != (c = [parser parse]) )
! switch( c )
! {
! case 'd' :
! display = (char *) [parser argument];
! break;
!
! case 'h' :
! default :
! usage(prog);
! }
argc -= [parser index];
***************
*** 79,121 ****
if( *argv )
! usage(prog);
else
{
! NSString *dpyName = nil;
!
!
! dpyName = [NSString stringWithCString:
! ( display ? display : getenv("DISPLAY") )];
!
! GlobalIWM = [[IWMWindowManager alloc] initWithDisplayName: dpyName];
! {
! [GlobalIWM run];
! }
! [GlobalIWM release];
}
! }
! IWMPoolEnd;
!
! return EXIT_SUCCESS;
#else /* 1 */
! NSAutoreleasePool *pool;
char *display = malloc(100);
int i;
BOOL showHelp = YES;
!
! pool = [NSAutoreleasePool new];
!
// default display name
strcpy(display, ":0");
-
// parse the command line arguments
for (i = 1; i < argc; i++)
{
if (((strcmp(argv[i], "-display") == 0) ||
! (strcmp(argv[i], "-d") == 0)) &&
! ((i + 1) < argc))
{
display = argv[++i];
--- 78,117 ----
if( *argv )
! usage(prog);
else
{
! NSString *dpyName = nil;
!
!
! dpyName = [NSString stringWithCString:
! ( display ? display : getenv("DISPLAY") )];
!
! GlobalIWM = [[IWMWindowManager alloc] initWithDisplayName: dpyName];
! {
! [GlobalIWM run];
! }
! [GlobalIWM release];
}
!
! [_pool release];
!
! return EXIT_SUCCESS;
#else /* 1 */
! NSAutoreleasePool *_pool = [[NSAutoreleasePool alloc] init];
char *display = malloc(100);
int i;
BOOL showHelp = YES;
!
// default display name
strcpy(display, ":0");
// parse the command line arguments
for (i = 1; i < argc; i++)
{
if (((strcmp(argv[i], "-display") == 0) ||
! (strcmp(argv[i], "-d") == 0)) &&
! ((i + 1) < argc))
{
display = argv[++i];
***************
*** 130,147 ****
}
! if( showHelp )
{
! printf("Usage: interface [-display]\n");
!
! return EXIT_FAILURE;
}
!
(IWMWindowManager *)GlobalIWM = [[IWMWindowManager alloc]
initWithDisplayName:[NSString stringWithCString:display]];
!
[GlobalIWM run];
! [pool release];
!
return EXIT_SUCCESS;
#endif /* 1 */
--- 126,143 ----
}
! if (showHelp)
{
! printf("Usage: interface [-display]\n");
!
! return EXIT_FAILURE;
}
!
(IWMWindowManager *)GlobalIWM = [[IWMWindowManager alloc]
initWithDisplayName:[NSString stringWithCString:display]];
!
[GlobalIWM run];
! [_pool release];
!
return EXIT_SUCCESS;
#endif /* 1 */
Index: IWMDebug.h
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMDebug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IWMDebug.h 4 Sep 2003 16:30:43 -0000 1.4
--- IWMDebug.h 18 Nov 2003 03:40:12 -0000 1.5
***************
*** 1,5 ****
/*
! * $Id:
*
* This file is part of Interface WM.
--- 1,5 ----
/*
! * $Id$
*
* This file is part of Interface WM.
***************
*** 24,52 ****
#ifndef _IWMDEBUG_H_
#define _IWMDEBUG_H_ 1
- /***************************************************************************/
#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSDebug.h>
- /***************************************************************************/
-
- /*!
- * @method IWMPoolStart
- * @abstract Creates a uniq autorelease pool.
- */
-
- #define IWMPoolStart \
- do { \
- NSAutoreleasePool * _iwm_pool; \
- _iwm_pool = [[NSAutoreleasePool alloc] init]; { \
-
- /*!
- * @method IWMPoolEnd
- * @abstract Destroys the autorelease pool created with IWMPoolStart()
- */
-
- #define IWMPoolEnd \
- } [_iwm_pool release]; \
- } while( 0 );
/*!
--- 24,31 ----
***************
*** 55,59 ****
* instance.
*/
-
#define IS_CLASS(anObject) ( (anObject) && object_is_class((anObject)) )
--- 34,37 ----
***************
*** 89,92 ****
#endif /* DEBUG */
- /***************************************************************************/
#endif /* _IWMDEBUG_H_ */
--- 67,70 ----
#endif /* DEBUG */
#endif /* _IWMDEBUG_H_ */
+
Index: IWMDebug.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMDebug.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IWMDebug.m 8 Sep 2003 16:38:16 -0000 1.6
--- IWMDebug.m 18 Nov 2003 03:40:12 -0000 1.7
***************
*** 1,5 ****
/*
! * $Id:
*
* This file is part of Interface WM.
--- 1,5 ----
/*
! * $Id$
*
* This file is part of Interface WM.
***************
*** 22,29 ****
*/
- //
- // Include
- //
-
#include "IWMDebug.h"
--- 22,25 ----
***************
*** 34,39 ****
#include <string.h>
- /***************************************************************************/
-
/*
* If DEBUG is defined during compile-time, this function dumps a formatted
--- 30,33 ----
***************
*** 56,190 ****
void IWMLog(int level, NSString *format, ...)
{
! //
! // Check the level
! //
!
! if( GSDebugSet(@"verbose") )
! {
! //
! // If --GNU-Debug=trace isn't set explicitly, return
! //
!
! if( (level == IWM_Trace) && ! GSDebugSet(@"trace") )
! return;
! }
! else
! {
! if( ! GSDebugSet(@"all") )
! {
! switch( level )
! {
! case IWM_Fatal :
! // Always print Fatal errors
! break;
!
! case IWM_Error :
! if( ! GSDebugSet(@"error") )
! return;
! break;
!
! case IWM_Warn :
! if( ! GSDebugSet(@"warn") )
! return;
! break;
!
! case IWM_Note :
! if( ! GSDebugSet(@"note") )
! return;
! break;
!
! case IWM_Debug :
! if( ! GSDebugSet(@"debug") )
! return;
! break;
!
! case IWM_Trace :
! if( ! GSDebugSet(@"trace") )
! return;
! break;
! }
! }
! }
!
! //
! // Now create the message
! //
!
! {
! va_list
! ap;
! NSMutableString
! *temp;
!
! //
! // Create a temporary string that holds the complete message
! //
!
! va_start(ap, format);
{
! temp = [[NSMutableString allocWithZone: NSDefaultMallocZone()]
! initWithFormat: format
! arguments: ap];
}
! va_end(ap);
!
! //
! // If we're tracing, check whether we got a C function and add '()'
! // otherwise indicate the debug level
! //
!
! switch( level )
{
! case IWM_Fatal :
! [temp insertString: @"Fatal: " atIndex: 0];
! break;
!
! case IWM_Error :
! [temp insertString: @"(E) " atIndex: 0];
! break;
!
! case IWM_Warn :
! [temp insertString: @"(W) " atIndex: 0];
! break;
!
! case IWM_Note :
! [temp insertString: @"(N) " atIndex: 0];
! break;
!
! case IWM_Debug :
! [temp insertString: @"(D) " atIndex: 0];
! break;
!
! case IWM_Trace :
! if( 0 == [temp rangeOfString: @"["].length )
! [temp appendString: @"()"];
! break;
}
! //
! // Dump it and clean up
! //
!
{
! NSLog(@"%@", temp);
! [temp release];
}
! //
! // abort() if it's fatal
! //
!
! if( level <= IWM_Fatal )
! abort();
! }
!
! //
! // That's it
! //
!
! return;
}
#endif /* DEBUG */
- /***************************************************************************/
--- 50,155 ----
void IWMLog(int level, NSString *format, ...)
{
! // Check the level
! if( GSDebugSet(@"verbose") )
{
! // If --GNU-Debug=trace isn't set explicitly, return
! if( (level == IWM_Trace) && ! GSDebugSet(@"trace") )
! return (void)0x0;
}
! else
{
! if( ! GSDebugSet(@"all") )
! {
! switch( level )
! {
! case IWM_Fatal :
! // Always print Fatal errors
! break;
!
! case IWM_Error :
! if( ! GSDebugSet(@"error") )
! return;
! break;
!
! case IWM_Warn :
! if( ! GSDebugSet(@"warn") )
! return;
! break;
!
! case IWM_Note :
! if( ! GSDebugSet(@"note") )
! return;
! break;
!
! case IWM_Debug :
! if( ! GSDebugSet(@"debug") )
! return;
! break;
!
! case IWM_Trace :
! if( ! GSDebugSet(@"trace") )
! return;
! break;
! }
! }
}
! // Now create the message
{
! va_list ap;
! NSMutableString *temp = nil;
!
! // Create a temporary string that holds the complete message
! va_start(ap, format);
! {
! temp = [[NSMutableString allocWithZone:NSDefaultMallocZone()]
! initWithFormat:format arguments:ap];
! }
! va_end(ap);
!
! // If we're tracing, check whether we got a C function and add '()'
! // otherwise indicate the debug level
! switch (level)
! {
! case IWM_Fatal :
! [temp insertString: @"Fatal: " atIndex: 0];
! break;
!
! case IWM_Error :
! [temp insertString: @"[ERROR] " atIndex: 0];
! break;
!
! case IWM_Warn :
! [temp insertString: @"[WARNING] " atIndex: 0];
! break;
!
! case IWM_Note :
! [temp insertString: @"[NOTE] " atIndex: 0];
! break;
!
! case IWM_Debug :
! [temp insertString: @"[DEBUG] " atIndex: 0];
! break;
!
! case IWM_Trace :
! if( 0 == [temp rangeOfString: @"["].length )
! [temp appendString: @"()"];
! break;
! }
!
! // Dump it and clean up
! {
! NSLog(@"%@", temp);
! [temp release];
! }
!
! // abort() if it's fatal
! if( level <= IWM_Fatal )
! abort();
}
! return (void)0x0;
}
#endif /* DEBUG */
|
Thanks for helping keep SourceForge clean.
X