From 902527511b277539c4ca99daaa79427f521ff69a Mon Sep 17 00:00:00 2001 From: fedor Date: Fri, 7 Dec 2001 22:52:42 +0000 Subject: [PATCH] Draw image background even when clear git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11654 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 + Documentation/gsdoc/DefaultsSummary.gsdoc | 60 ++++- Documentation/gsdoc/DefaultsSummary.html | 74 +++++- Documentation/gsdoc/Gui.gsdoc | 1 - Documentation/gsdoc/Gui.html | 1 - Documentation/gsdoc/NSDPSContext.gsdoc | 264 -------------------- Documentation/gsdoc/NSDPSContext.html | 281 ---------------------- Source/NSApplication.m | 9 +- Source/NSImage.m | 2 +- 9 files changed, 138 insertions(+), 564 deletions(-) delete mode 100644 Documentation/gsdoc/NSDPSContext.gsdoc delete mode 100644 Documentation/gsdoc/NSDPSContext.html diff --git a/ChangeLog b/ChangeLog index 1208cbc6d..27d74e122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-12-07 Adam Fedor + + * Source/NSImage.m (-drawRepresentation:inRect:): Draw + background even when alpha == 0. + + * Source/NSApplication.m (-sendEvent:): Simplify NSDebugLog. + + * Documentation/gsdoc/DefaultsSummary.gsdoc: Update + * Documentation/gsdoc/Gui.gsdoc: Remove NSDPSContext. + 2001-12-07 Pierre-Yves Rivaille * Headers/gnustep/gui/NSTableColumn.h: diff --git a/Documentation/gsdoc/DefaultsSummary.gsdoc b/Documentation/gsdoc/DefaultsSummary.gsdoc index ec6a746de..741dd8dc8 100644 --- a/Documentation/gsdoc/DefaultsSummary.gsdoc +++ b/Documentation/gsdoc/DefaultsSummary.gsdoc @@ -163,12 +163,13 @@ limit the range of red, green, and blue values that could be used.

- XGPS-Shm + GSBorderedBorderlessWindows

- A boolean value which defaults to YES (as long as shared - memory is available). If set to NO, shared memory is not - used for various display specific operations. + A boolean value which defaults to NO. Some Window + Managers and/or X servers put a border around windows that are + supposed to be borderless. Set this to YES if you + have odd problems of menus/windows moving when you click on them.

GSFontAntiAlias @@ -190,8 +191,59 @@ recommended anyway, particularly on fast systems.

+ Keyboard Modifiers + +

+ The OPENstep specification requires 3 main different + keyboard modifiers: CONTROL, + COMMAND and ALTERNATE. Some systems + may not have these set up correctly. You can changed the defaults + with the default keys. +

+ + GSFirstControlKey + GSSecondControlKey + GSFirstCommandKey + GSSecondCommandKey + GSFirstAlternateKey + GSSecondAlternateKey + +

+ Default values are respectively: +

+ + Control_L + Control_R + Alt_L + NoSymbol + Alt_R + NoSymbol + +

+ This is described more completely in the GUI documentation. +

+ + UseWindowMakerIcons + +

+ A boolean value which defaults to YES. If set to + YES then icon windows are controlled by the + window manager, otherwise they are controlled by the GNUstep + application. +

+ + XGPS-Shm + +

+ A boolean value which defaults to YES (as long as shared + memory is available). If set to NO, shared memory is not + used for various display specific operations. +

+ + + diff --git a/Documentation/gsdoc/DefaultsSummary.html b/Documentation/gsdoc/DefaultsSummary.html index 914bc769d..f6336d166 100644 --- a/Documentation/gsdoc/DefaultsSummary.html +++ b/Documentation/gsdoc/DefaultsSummary.html @@ -89,8 +89,8 @@

- An interface style specific to menu operation. See - NSInterfaceStyleDefault. + An interface style specific to menu operation. If not set + the NSInterfaceStyleDefault value is used.

@@ -186,13 +186,14 @@

-
XGPS-Shm +
GSBorderedBorderlessWindows

- A boolean value which defaults to YES (as long as shared - memory is available). If set to NO, shared memory is not - used for various display specific operations. + A boolean value which defaults to NO. Some Window + Managers and/or X servers put a border around windows that are + supposed to be borderless. Set this to YES if you + have odd problems of menus/windows moving when you click on them.

@@ -219,6 +220,67 @@

+
Keyboard Modifiers +
+

+ + The OPENstep specification requires 3 main different + keyboard modifiers: CONTROL, + COMMAND and ALTERNATE. Some systems + may not have these set up correctly. You can changed the defaults + with the default keys. +

+ +
    +
  • GSFirstControlKey +
  • GSSecondControlKey +
  • GSFirstCommandKey +
  • GSSecondCommandKey +
  • GSFirstAlternateKey +
  • GSSecondAlternateKey +
+ +

+ + Default values are respectively: +

+ +
    +
  • Control_L +
  • Control_R +
  • Alt_L +
  • NoSymbol +
  • Alt_R +
  • NoSymbol +
+ +

+ + This is described more completely in the GUI documentation. +

+ + +
UseWindowMakerIcons +
+

+ + A boolean value which defaults to YES. If set to + YES then icon windows are controlled by the + window manager, otherwise they are controlled by the GNUstep + application. +

+ + +
XGPS-Shm +
+

+ + A boolean value which defaults to YES (as long as shared + memory is available). If set to NO, shared memory is not + used for various display specific operations. +

+ + diff --git a/Documentation/gsdoc/Gui.gsdoc b/Documentation/gsdoc/Gui.gsdoc index 504755937..8e7b67e88 100644 --- a/Documentation/gsdoc/Gui.gsdoc +++ b/Documentation/gsdoc/Gui.gsdoc @@ -51,7 +51,6 @@ NSControl NSCursor NSCustomImageRep - NSDPSContext NSDocument NSDocumentController NSEPSImageRep diff --git a/Documentation/gsdoc/Gui.html b/Documentation/gsdoc/Gui.html index 32034f834..9cf2116b2 100644 --- a/Documentation/gsdoc/Gui.html +++ b/Documentation/gsdoc/Gui.html @@ -51,7 +51,6 @@
  • NSControl
  • NSCursor
  • NSCustomImageRep -
  • NSDPSContext
  • NSDocument
  • NSDocumentController
  • NSEPSImageRep diff --git a/Documentation/gsdoc/NSDPSContext.gsdoc b/Documentation/gsdoc/NSDPSContext.gsdoc deleted file mode 100644 index 3f108b752..000000000 --- a/Documentation/gsdoc/NSDPSContext.gsdoc +++ /dev/null @@ -1,264 +0,0 @@ - - - - - NSDPSContext - - - - - $Revision$ - $Date$ - - - - NSDPSContext - - Gui/NSDPSContext.h - NSObject - - - - areAllContextsOutputTraced - - - - - areAllContextsSynchronized - - - - - currentContext - - - - - setAllContextsOutputTraced: - flag - - - - - setAllContextsSynchronized: - flag - - - - - setCurrentContext: - context - - - - - stringForDPSError: - error - - - - - DPSContext - - - - - awaitReturnValues - - - - - chainChildContext: - child - - - - - childContext - - - - - errorProc - - - - - flush - - - - - - - - - - interruptExecution - - - - - isDrawingToScreen - - - - - isOutputTraced - - - - - isSynchronized - - - - - isWaitCursorEnabled - - - - - mutableData - - - - - notifyObjectWhenFinishedExecuting: - object - - - - - parentContext - - - - - printFormat: - format,... - - - - - printFormat: - format - arguments: - argList - - - - - resetCommunication - - - - - setErrorProc: - proc - - - - - setOutputTraced: - flag - - - - - setSynchronized: - flag - - - - - setTextProc: - proc - - - - - setWaitCursorEnabled: - flag - - - - - startWaitCursorTimer - - - - - textProc - - - - - unchainContext - - - - - updateNameMap - - - - - wait - - - - - writeBOSArray: - data - count: - items - ofType: - type - - - - - writeBOSNumString: - data - length: - count - ofType - type - scale: - scale - - - - - writeBOSString: - data - length: - bytes - - - - - writeBinaryObjectSequence: - data - length: - bytes - - - - - writeData: - buf - - - - - writePostScriptWithLanguageEncodingConversion: - buf - - - - - - - diff --git a/Documentation/gsdoc/NSDPSContext.html b/Documentation/gsdoc/NSDPSContext.html deleted file mode 100644 index 644af0026..000000000 --- a/Documentation/gsdoc/NSDPSContext.html +++ /dev/null @@ -1,281 +0,0 @@ - - NSDPSContext - - -[Previous] -[Up] -[Next] -

    NSDPSContext

    -

    Authors

    -
    -
    Richard Frith-Macdonald -
    -
    -

    Version: $Revision$

    -

    Date: $Date$

    -

    NSDPSContext

    -

    NSDPSContext

    -

    Declared in: Gui/NSDPSContext.h

    -

    Inherits from: NSGraphicsContext

    -

    Conforms to: NSObject -

    -
    - - -

    Instance Variables

    -
      -
    -

    Methods

    - -

    Class Methods

    -

    areAllContextsOutputTraced

    -+ (BOOL) areAllContextsOutputTraced;
    - - -
    -

    areAllContextsSynchronized

    -+ (BOOL) areAllContextsSynchronized;
    - - -
    -

    currentContext

    -+ (id) currentContext;
    - - -
    -

    setAllContextsOutputTraced:

    -+ (void) setAllContextsOutputTraced: (BOOL)flag;
    - - -
    -

    setAllContextsSynchronized:

    -+ (void) setAllContextsSynchronized: (BOOL)flag;
    - - -
    -

    setCurrentContext:

    -+ (void) setCurrentContext: (NSGraphicsContext*)context;
    - - -
    -

    stringForDPSError:

    -+ (NSString*) stringForDPSError: (constDPSBinObjSeqRec*)error;
    - - -
    -

    Instances Methods

    -

    DPSContext

    -- (DPSContext) DPSContext;
    - - -
    -

    awaitReturnValues

    -- (void) awaitReturnValues;
    - - -
    -

    chainChildContext:

    -- (void) chainChildContext: (NSDPSContext*)child;
    - - -
    -

    childContext

    -- (NSDPSContext*) childContext;
    - - -
    -

    errorProc

    -- (DPSErrorProc) errorProc;
    - - -
    -

    flush

    -- (void) flush;
    - - -
    -

    -- (id) ;
    - - -
    -

    interruptExecution

    -- (void) interruptExecution;
    - - -
    -

    isDrawingToScreen

    -- (BOOL) isDrawingToScreen;
    - - -
    -

    isOutputTraced

    -- (BOOL) isOutputTraced;
    - - -
    -

    isSynchronized

    -- (BOOL) isSynchronized;
    - - -
    -

    isWaitCursorEnabled

    -- (BOOL) isWaitCursorEnabled;
    - - -
    -

    mutableData

    -- (NSMutableData*) mutableData;
    - - -
    -

    notifyObjectWhenFinishedExecuting:

    -- (void) notifyObjectWhenFinishedExecuting: (id<NSDPSContextNotification>)object;
    - - -
    -

    parentContext

    -- (NSDPSContext*) parentContext;
    - - -
    -

    printFormat:

    -- (void) printFormat: (NSString*)format,...;
    - - -
    -

    printFormat:arguments:

    -- (void) printFormat: (NSString*)format arguments: (va_list)argList;
    - - -
    -

    resetCommunication

    -- (void) resetCommunication;
    - - -
    -

    setErrorProc:

    -- (void) setErrorProc: (DPSErrorProc)proc;
    - - -
    -

    setOutputTraced:

    -- (void) setOutputTraced: (BOOL)flag;
    - - -
    -

    setSynchronized:

    -- (void) setSynchronized: (BOOL)flag;
    - - -
    -

    setTextProc:

    -- (void) setTextProc: (DPSTextProc)proc;
    - - -
    -

    setWaitCursorEnabled:

    -- (void) setWaitCursorEnabled: (BOOL)flag;
    - - -
    -

    startWaitCursorTimer

    -- (void) startWaitCursorTimer;
    - - -
    -

    textProc

    -- (DPSTextProc) textProc;
    - - -
    -

    unchainContext

    -- (void) unchainContext;
    - - -
    -

    updateNameMap

    -- (void) updateNameMap;
    - - -
    -

    wait

    -- (void) wait;
    - - -
    -

    writeBOSArray:count:ofType:

    -- (void) writeBOSArray: (constvoid*)data count: (unsigned int)items ofType: (DPSDefinedType)type;
    - - -
    -

    writeBOSNumString:length:ofTypescale:

    -- (void) writeBOSNumString: (constvoid*)data length: (unsigned int)count ofType (DPSDefinedType)type scale: (int)scale;
    - - -
    -

    writeBOSString:length:

    -- (void) writeBOSString: (constvoid*)data length: (unsigned int)bytes;
    - - -
    -

    writeBinaryObjectSequence:length:

    -- (void) writeBinaryObjectSequence: (constvoid*)data length: (unsigned int)bytes;
    - - -
    -

    writeData:

    -- (void) writeData: (NSData*)buf;
    - - -
    -

    writePostScriptWithLanguageEncodingConversion:

    -- (void) writePostScriptWithLanguageEncodingConversion: (NSData*)buf;
    - - -
    - - - diff --git a/Source/NSApplication.m b/Source/NSApplication.m index 408fa3a18..b674e5d33 100644 --- a/Source/NSApplication.m +++ b/Source/NSApplication.m @@ -311,7 +311,7 @@ static NSCell* tileCell = nil; } - (void) drawRect: (NSRect)rect -{ +{ [tileCell drawWithFrame: NSMakeRect(0,0,64,64) inView: self]; [dragCell drawWithFrame: NSMakeRect(8,8,48,48) inView: self]; } @@ -1248,15 +1248,12 @@ static NSCell* tileCell = nil; if (!theEvent) NSDebugLLog(@"NSEvent", @"NSEvent is nil!\n"); - NSDebugLLog(@"NSEvent", @"NSEvent type: %d", type); - NSDebugLLog(@"NSEvent", @"send event to window"); - NSDebugLLog(@"NSEvent", [window description]); + NSDebugLLog(@"NSEvent", @"Send NSEvent type: %d to window %@", + type, (window) ? window : @"No window"); if (window) [window sendEvent: theEvent]; else if (type == NSRightMouseDown) [self rightMouseDown: theEvent]; - else - NSDebugLLog(@"NSEvent", @"no window"); } } } diff --git a/Source/NSImage.m b/Source/NSImage.m index e484a3197..c0ced4f77 100644 --- a/Source/NSImage.m +++ b/Source/NSImage.m @@ -796,7 +796,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) - (BOOL) drawRepresentation: (NSImageRep *)imageRep inRect: (NSRect)aRect { - if (_color != nil && [_color alphaComponent] != 0.0) + if (_color != nil) { [_color set]; NSRectFill(aRect);