diff options
| author | das <das> | 2006-09-10 17:06:31 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-10 17:06:31 (GMT) |
| commit | 41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0 (patch) | |
| tree | 13ad5944ad3d007fdcb67d4af43aa55cb42e1470 /macosx/tkMacOSXXStubs.c | |
| parent | b0768715132b6b828aa0ec352e5c4669097307f9 (diff) | |
| download | tk-41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0.zip tk-41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0.tar.gz tk-41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0.tar.bz2 | |
* macosx/tkMacOSXColor.c (TkSetMacColor, TkpGetColor): use AppearanceMgr
* macosx/tkMacOSXDefault.h: to retrieve platform std colors for text
* macosx/tkMacOSXPort.h: selections, add "systemHighlightSecondary"
color name for standard color of inactive selections, use this color as
default for text widget -inactiveselectbackground to implement platform
standard look for inactive text selections.
* library/text.tcl (aqua): remove focus bindings to set selection color.
* generic/tkTextBTree.c (TkTextIsElided): on TkAqua, don't show inactive
* generic/tkTextDisp.c (GetStyle): text selection when text
widget is in disabled state.
* generic/tkEntry.c (DisplayEntry): change default TkAqua selection
* macosx/tkMacOSXDefault.h: relief to "flat" (platform std).
* generic/tkText.c (CreateWidget): fix bug leading to default text
selection relief string DEF_TEXT_SELECT_RELIEF being ignored.
* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): allow mouse
event delivery to background windows with kWindowNoActivatesAttribute
(e.g. overrideredirect windows), as these never come to the foreground
they would not receive any mouse events otherwise. [Bug 1472624]
* macosx/tkMacOSXWindowEvent.c (TkMacOSXGenerateFocusEvent): do not
send focus events to any windows with kWindowNoActivatesAttribute.
* macosx/tkMacOSXXStubs.c (XQueryColor, XQueryColors): implement basic
XColor computation from pixel values, enough to make tkImg's window.c
happy, fixes img::window failures reported on tcl-mac.
* macosx/tkMacOSXMenu.c (DrawMenuEntryLabel): fix leak. [Bug 1554672]
* macosx/GNUmakefile: workaround bug in 'cp -pRH' on Darwin 6 and
earlier, fixes 'make embedded' failure reported on tcl-mac; fix error
from 'make deploy' with same build tree as previous 'make embedded'.
* macosx/Wish.xcodeproj/project.pbxproj: add new tclUnixCompat.c file.
* macosx/tkMacOSXEntry.c (TkpDrawEntryBorderAndFocus): fix typo.
* unix/tcl.m4: sync with tcl/unix/tcl.m4.
* unix/configure: autoconf-2.59
Diffstat (limited to 'macosx/tkMacOSXXStubs.c')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index a556531..ab81fb3 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.15 2006/03/24 14:58:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.16 2006/09/10 17:06:32 das Exp $ */ #include "tkMacOSXInt.h" @@ -656,6 +656,19 @@ XQueryColor( Colormap colormap, XColor* def_in_out) { + unsigned long p; + unsigned char r, g, b; + XColor *d = def_in_out; + + p = d->pixel; + r = (p & 0x00FF0000) >> 16; + g = (p & 0x0000FF00) >> 8; + b = (p & 0x000000FF); + d->red = (r << 8) | r; + d->green = (g << 8) | g; + d->blue = (b << 8) | b; + d->flags = DoRed|DoGreen|DoBlue; + d->pad = 0; } void @@ -665,6 +678,22 @@ XQueryColors( XColor* defs_in_out, int ncolors) { + int i; + unsigned long p; + unsigned char r, g, b; + XColor *d = defs_in_out; + + for (i = 0; i < ncolors; i++, d++) { + p = d->pixel; + r = (p & 0x00FF0000) >> 16; + g = (p & 0x0000FF00) >> 8; + b = (p & 0x000000FF); + d->red = (r << 8) | r; + d->green = (g << 8) | g; + d->blue = (b << 8) | b; + d->flags = DoRed|DoGreen|DoBlue; + d->pad = 0; + } } int |