From: Takuo Yasunaga Date: Mon, 9 Mar 2015 06:53:05 +0000 (+0900) Subject: ticket: #34971 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d772e329d4018da94fbcbdea2c08cc1a8d0b5804;p=eos%2FhostdependX86LINUX64.git ticket: #34971 rebuild: tcl/tk for execution of Display2 modified: util/X86LINUX64/lib/libtclstub8.4.a modified: util/X86LINUX64/lib/libtkstub8.4.a new file: util/X86LINUX64/lib/tk8.4/demos/tclIndex modified: util/X86LINUX64/man/mann/bitmap.n --- diff --git a/util/X86LINUX64/lib/libtclstub8.4.a b/util/X86LINUX64/lib/libtclstub8.4.a index abd4886a6c..ca5d0f7918 100644 Binary files a/util/X86LINUX64/lib/libtclstub8.4.a and b/util/X86LINUX64/lib/libtclstub8.4.a differ diff --git a/util/X86LINUX64/lib/libtkstub8.4.a b/util/X86LINUX64/lib/libtkstub8.4.a index bd424068fb..e7f3bc6e53 100644 Binary files a/util/X86LINUX64/lib/libtkstub8.4.a and b/util/X86LINUX64/lib/libtkstub8.4.a differ diff --git a/util/X86LINUX64/lib/tk8.4/demos/tclIndex b/util/X86LINUX64/lib/tk8.4/demos/tclIndex new file mode 100644 index 0000000000..86a72e2443 --- /dev/null +++ b/util/X86LINUX64/lib/tk8.4/demos/tclIndex @@ -0,0 +1,67 @@ +# Tcl autoload index file, version 2.0 +# This file is generated by the "auto_mkindex" command +# and sourced to set up indexing information for one or +# more commands. Typically each line is a command that +# sets an element in the auto_index array, where the +# element name is the name of a command and the value is +# a script that loads the command. + +set auto_index(arrowSetup) [list source [file join $dir arrow.tcl]] +set auto_index(arrowMove1) [list source [file join $dir arrow.tcl]] +set auto_index(arrowMove2) [list source [file join $dir arrow.tcl]] +set auto_index(arrowMove3) [list source [file join $dir arrow.tcl]] +set auto_index(textLoadFile) [list source [file join $dir search.tcl]] +set auto_index(textSearch) [list source [file join $dir search.tcl]] +set auto_index(textToggle) [list source [file join $dir search.tcl]] +set auto_index(itemEnter) [list source [file join $dir items.tcl]] +set auto_index(itemLeave) [list source [file join $dir items.tcl]] +set auto_index(itemMark) [list source [file join $dir items.tcl]] +set auto_index(itemStroke) [list source [file join $dir items.tcl]] +set auto_index(itemsUnderArea) [list source [file join $dir items.tcl]] +set auto_index(itemStartDrag) [list source [file join $dir items.tcl]] +set auto_index(itemDrag) [list source [file join $dir items.tcl]] +set auto_index(butPress) [list source [file join $dir items.tcl]] +set auto_index(loadDir) [list source [file join $dir image2.tcl]] +set auto_index(loadImage) [list source [file join $dir image2.tcl]] +set auto_index(rulerMkTab) [list source [file join $dir ruler.tcl]] +set auto_index(rulerNewTab) [list source [file join $dir ruler.tcl]] +set auto_index(rulerSelectTab) [list source [file join $dir ruler.tcl]] +set auto_index(rulerMoveTab) [list source [file join $dir ruler.tcl]] +set auto_index(rulerReleaseTab) [list source [file join $dir ruler.tcl]] +set auto_index(mkTextConfig) [list source [file join $dir ctext.tcl]] +set auto_index(textEnter) [list source [file join $dir ctext.tcl]] +set auto_index(textInsert) [list source [file join $dir ctext.tcl]] +set auto_index(textPaste) [list source [file join $dir ctext.tcl]] +set auto_index(textB1Press) [list source [file join $dir ctext.tcl]] +set auto_index(textB1Move) [list source [file join $dir ctext.tcl]] +set auto_index(textBs) [list source [file join $dir ctext.tcl]] +set auto_index(textDel) [list source [file join $dir ctext.tcl]] +set auto_index(bitmapRow) [list source [file join $dir bitmap.tcl]] +set auto_index(scrollEnter) [list source [file join $dir cscroll.tcl]] +set auto_index(scrollLeave) [list source [file join $dir cscroll.tcl]] +set auto_index(scrollButton) [list source [file join $dir cscroll.tcl]] +set auto_index(textWindOn) [list source [file join $dir twind.tcl]] +set auto_index(textWindOff) [list source [file join $dir twind.tcl]] +set auto_index(textWindPlot) [list source [file join $dir twind.tcl]] +set auto_index(embPlotDown) [list source [file join $dir twind.tcl]] +set auto_index(embPlotMove) [list source [file join $dir twind.tcl]] +set auto_index(textWindDel) [list source [file join $dir twind.tcl]] +set auto_index(embDefBg) [list source [file join $dir twind.tcl]] +set auto_index(floorDisplay) [list source [file join $dir floor.tcl]] +set auto_index(newRoom) [list source [file join $dir floor.tcl]] +set auto_index(roomChanged) [list source [file join $dir floor.tcl]] +set auto_index(bg1) [list source [file join $dir floor.tcl]] +set auto_index(bg2) [list source [file join $dir floor.tcl]] +set auto_index(bg3) [list source [file join $dir floor.tcl]] +set auto_index(fg1) [list source [file join $dir floor.tcl]] +set auto_index(fg2) [list source [file join $dir floor.tcl]] +set auto_index(fg3) [list source [file join $dir floor.tcl]] +set auto_index(setWidth) [list source [file join $dir hscale.tcl]] +set auto_index(plotDown) [list source [file join $dir plot.tcl]] +set auto_index(plotMove) [list source [file join $dir plot.tcl]] +set auto_index(puzzleSwitch) [list source [file join $dir puzzle.tcl]] +set auto_index(setHeight) [list source [file join $dir vscale.tcl]] +set auto_index(showMessageBox) [list source [file join $dir msgbox.tcl]] +set auto_index(setColor) [list source [file join $dir clrpick.tcl]] +set auto_index(setColor_helper) [list source [file join $dir clrpick.tcl]] +set auto_index(fileDialog) [list source [file join $dir filebox.tcl]] diff --git a/util/X86LINUX64/man/mann/bitmap.n b/util/X86LINUX64/man/mann/bitmap.n index 266d700869..be6252facf 100644 --- a/util/X86LINUX64/man/mann/bitmap.n +++ b/util/X86LINUX64/man/mann/bitmap.n @@ -1,24 +1,12 @@ '\" -'\" Copyright 1991-2001 by Bell Labs Innovations for Lucent Technologies. -'\" -'\" Permission to use, copy, modify, and distribute this software and its -'\" documentation for any purpose and without fee is hereby granted, provided -'\" that the above copyright notice appear in all copies and that both that the -'\" copyright notice and warranty disclaimer appear in supporting documentation, -'\" and that the names of Lucent Technologies any of their entities not be used -'\" in advertising or publicity pertaining to distribution of the software -'\" without specific, written prior permission. -'\" -'\" Lucent Technologies disclaims all warranties with regard to this software, -'\" including all implied warranties of merchantability and fitness. In no event -'\" shall Lucent Technologies be liable for any special, indirect or -'\" consequential damages or any damages whatsoever resulting from loss of use, -'\" data or profits, whether in an action of contract, negligence or other -'\" tortuous action, arising out of or in connection with the use or performance -'\" of this software. -'\" -'\" Bitmap command created by George Howlett. +'\" Copyright (c) 1994 The Regents of the University of California. +'\" Copyright (c) 1994-1996 Sun Microsystems, Inc. '\" +'\" See the file "license.terms" for information on usage and redistribution +'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. +'\" +'\" RCS: @(#) $Id: bitmap.n,v 1.2 1998/09/14 18:22:54 stanton Exp $ +'\" '\" The definitions below are for supplemental macros used in Tcl/Tk '\" manual entries. '\" @@ -80,7 +68,7 @@ '\" .UL arg1 arg2 '\" Print arg1 underlined, then print arg2 normally. '\" -'\" RCS: @(#) $Id: man.macros,v 1.3 2001/02/17 07:46:19 ghowlett Exp $ +'\" RCS: @(#) $Id: man.macros,v 1.4 2000/08/25 06:18:32 ericm Exp $ '\" '\" # Set up traps and other miscellaneous stuff for Tcl/Tk man pages. .if t .wh -1.3i ^B @@ -220,7 +208,7 @@ .SH "STANDARD OPTIONS" .LP .nf -.ta 4c 8c 12c +.ta 5.5c 11c .ft B .. '\" # SE - end of list of standard options @@ -246,214 +234,116 @@ Database Class: \\fB\\$3\\fR .RS .nf .ta .25i .5i .75i 1i -.ft CW -.sp .. '\" # CE - end code excerpt .de CE .fi .RE -.ft R -.sp .. .de UL \\$1\l'|0\(ul'\\$2 .. -.TH bitmap n 2.4 BLT "BLT Built-In Commands" +.TH bitmap n 4.0 Tk "Tk Built-In Commands" .BS '\" Note: do not modify the .SH NAME line immediately below! .SH NAME -bitmap \- Define a new bitmap from a Tcl script +bitmap \- Images that display two colors .SH SYNOPSIS -\fBbitmap define \fIbitmapName data\fR ?\fIoption value\fR?... -.sp -\fBbitmap compose \fIbitmapName text\fR ?\fIoption value\fR?... -.sp -\fBbitmap exists \fIbitmapName\fR -.sp -\fBbitmap source \fIbitmapName\fR -.sp -\fBbitmap data \fIbitmapName\fR -.sp -\fBbitmap height \fIbitmapName\fR -.sp -\fBbitmap width \fIbitmapName\fR +\fBimage create bitmap \fR?\fIname\fR? ?\fIoptions\fR? .BE + .SH DESCRIPTION -The \fBbitmap\fR command lets you create new bitmaps directly from your -Tcl script. The bitmap can be specified as a list of data or a text string -which is converted into a bitmap. You can arbitrarily scale -or rotate the bitmap too. -.SH INTRODUCTION -Bitmaps are commonly used within Tk. In label and button widgets, you -display bitmaps them instead of text strings and in the canvas and -text widgets, they're used for stippling. But Tk let's you can create -new bitmaps only by reading the bitmap data from a file. This makes -bitmaps cumbersome to manage, especially in packaging the program as a -\fBwish\fR script, since each bitmap must be its own file. It would -be nicer if you could create new bitmaps directly from your Tcl script. .PP -The \fBbitmap\fR command lets you do just that. You can specify the -bitmap as in various formats (such as the X11 bitmap format). You can -also compose a bitmap from a text string. The \fBbitmap\fR command -also lets you and arbitrarily rotate or scale the bitmap. For example, you -could use this to create button widgets with the text label rotated 90 -degrees. -.SH EXAMPLE -<<<<<<< bitmap.mann -You can define a new bitmap with the \fBdefine\fR operation. For -example, let's say you are using the X11 bitmap "gray1". Normally to -use it, you would specify the location of the file. -.CS -label .l -bitmap @/usr/X11R6/include/X11/bitmaps/gray1 -.CE -But you can simply cut and paste the contents of "gray1" into the -\fBbitmap\fR command. -.CS -bitmap define gray1 { - #define gray1_width 2 - #define gray1_height 2 - static char gray1_bits[] = { - 0x01, 0x02}; -} -label .l -bitmap gray1 -.CE -Tk will recognize "gray1" as a bitmap which can now be used with any -widget that accepts bitmaps. -.CS -.barchart element configure elem1 -stipple gray1 -.CE -The bitmap data can be specified in a mulitude of forms. -The following commands are all equivalent. -.CS -bitmap define gray1 { - #define gray1_width 2 - #define gray1_height 2 - static char gray1_bits[] = { - 0x01, 0x02}; -} -bitmap define gray1 { { 2 2 } { 0x01, 0x02 } } -bitmap define gray1 { { 2 2 } { 0x01 0x02 } } -bitmap define gray1 { { 2 2 } { 1 2 } } -.CE -Either the data is in the standard X11 bitmap form, or it's a list of -two lists. The first list contains the height and width of the bitmap. -The second list is the bitmap source data. Each element of that list -is an hexadecimal number specifying which pixels are foreground (1) -and which are background (0) of the bitmap. Note that the format of -the source data is exactly that of the XBM format. -.P -You can scale or rotate the bitmap as you create it, by using the -\fB-scale\fR or\fB-rotate\fR options. -.CS -bitmap define gray1 { - #define gray1_width 2 - #define gray1_height 2 - static char gray1_bits[] = { - 0x01, 0x02}; -} -scale 2.0 -rotate 90.0 -.CE -In addition, you can compose bitmaps from text strings. This makes it -easy to create rotated buttons or labels. The text string can have -multi-line. -.CS -bitmap compose rot_text "This is rotated\\ntext" \\ - -rotate 90.0 -font fixed -.CE -There are also a number of ways to query bitmaps. This isn't limited -to bitmaps that you create, but any bitmap. -.CS -bitmap exists rot_text -bitmap width rot_text -bitmap height rot_text -bitmap data rot_text -bitmap source rot_text -.CE -The \fBexists\fR operation indicates if a bitmap by that name is -defined. You can query the dimensions of the bitmap using the -\fBwidth\fR and \fBheight\fR operations. The \fBdata\fR operation -returns the list of the data used to create the bitmap. -For example, you could query the data of a bitmap and \fBsend\fR -it across the network to another Tk application. -.CS -set data [bitmap data @/usr/X11R6/include/X11/bitmaps/ghost.xbm] -send {wish #2} bitmap define ghost $data -.CE -.SH OPERATIONS -The following operations are available for \fBbitmap\fR: -.TP -\fBbitmap compose \fIbitmapName text \fR?\fIoption value\fR?... -Creates a bitmap \fIbitmapName\fR from the text string \fItext\fR. -A bitmap \fIbitmapName\fR can not already exist. -The following options are available. -.RS -.TP -\fB\-font \fIfontName\fR -Specifies a font to use when drawing text into the bitmap. -If this option isn't specified then \fIfontName\fR defaults to -\f(CW*-Helvetica-Bold-R-Normal-*-140-*\fR. -.TP -\fB\-rotate \fItheta\fR -Specifies the angle of rotation of the text in the bitmap. -\fITheta\fR is a real number representing the angle in degrees. -It defaults to \f(CW0.0\fR degrees. -.TP -\fB\-scale \fIvalue\fR -Specifies the scale of the bitmap. -\fIValue\fR is a real number representing the scale. A scale -of 1.0 indicates no scaling is necessary, while 2.0 would -double the size of the bitmap. There is no way to specify -differents scales for the width and height of the bitmap. -The default scale is \f(CW1.0\fR. -.RE +A bitmap is an image whose pixels can display either of two colors +or be transparent. +A bitmap image is defined by four things: a background color, +a foreground color, and two bitmaps, called the \fIsource\fR +and the \fImask\fR. +Each of the bitmaps specifies 0/1 values for a rectangular +array of pixels, and the two bitmaps must have the same +dimensions. +For pixels where the mask is zero, the image displays nothing, +producing a transparent effect. +For other pixels, the image displays the foreground color if +the source data is one and the background color if the source +data is zero. + +.SH "CREATING BITMAPS" +.PP +Like all images, bitmaps are created using the \fBimage create\fR +command. +Bitmaps support the following \fIoptions\fR: .TP -\fBbitmap data \fIbitmapName\fR -Returns a list of both the -dimensions of the bitmap \fIbitmapName\fR and its source data. +\fB\-background \fIcolor\fR +Specifies a background color for the image in any of the standard +ways accepted by Tk. If this option is set to an empty string +then the background pixels will be transparent. This effect +is achieved by using the source bitmap as the mask bitmap, ignoring +any \fB\-maskdata\fR or \fB\-maskfile\fR options. .TP -\fBbitmap define \fIbitmapName data\fR \fR?\fIoption value\fR?... -Associates \fIbitmapName\fR with in-memory bitmap data so that -\fIbitmapName\fR can be used in later calls to \fBTk_GetBitmap\fR. -The \fIbitmapName\fR argument is the name of the bitmap; it must not -previously have been defined in either a call to Tk_DefineBitmap or -\fBbitmap\fR. The argument \fIdata\fP describes the bitmap to -be created. It is either the X11 bitmap format (a C structure) or -a list of two lists: the dimensions and source data. The dimensions -are a list of two numbers which are the width -and height of the bitmap. The source data is a list of hexadecimal -values in a format similar to the X11 or X10 bitmap format. The -values may be optionally separated by commas and do not need to be -prefixed with "0x". The following options are available. -.RS +\fB\-data \fIstring\fR +Specifies the contents of the source bitmap as a string. +The string must adhere to X11 bitmap format (e.g., as generated +by the \fBbitmap\fR program). +If both the \fB\-data\fR and \fB\-file\fR options are specified, +the \fB\-data\fR option takes precedence. .TP -\fB\-rotate \fItheta\fR -Specifies how many degrees to rotate the bitmap. -\fITheta\fR is a real number representing the angle. -The default is \f(CW0.0\fR degrees. +\fB\-file \fIname\fR +\fIname\fR gives the name of a file whose contents define the +source bitmap. +The file must adhere to X11 bitmap format (e.g., as generated +by the \fBbitmap\fR program). .TP -\fB\-scale \fIvalue\fR -Specifies how to scale the bitmap. -\fIValue\fR is a real number representing the scale. A scale -of 1.0 indicates no scaling is necessary, while 2.0 would -double the size of the bitmap. There is no way to specify -differents scales for the width and height of the bitmap. -The default scale is \f(CW1.0\fR. -.RE +\fB\-foreground \fIcolor\fR +Specifies a foreground color for the image in any of the standard +ways accepted by Tk. .TP -\fBbitmap exists \fIbitmapName\fR -Returns \f(CW1\fR if a bitmap \fIbitmapName\fR exists, otherwise \f(CW0\fR. +\fB\-maskdata \fIstring\fR +Specifies the contents of the mask as a string. +The string must adhere to X11 bitmap format (e.g., as generated +by the \fBbitmap\fR program). +If both the \fB\-maskdata\fR and \fB\-maskfile\fR options are specified, +the \fB\-maskdata\fR option takes precedence. .TP -\fBbitmap height \fIbitmapName\fR -Returns the height in pixels of the bitmap \fIbitmapName\fR. +\fB\-maskfile \fIname\fR +\fIname\fR gives the name of a file whose contents define the +mask. +The file must adhere to X11 bitmap format (e.g., as generated +by the \fBbitmap\fR program). + +.SH "IMAGE COMMAND" +.PP +When a bitmap image is created, Tk also creates a new command +whose name is the same as the image. +This command may be used to invoke various operations +on the image. +It has the following general form: +.CS +\fIimageName option \fR?\fIarg arg ...\fR? +.CE +\fIOption\fR and the \fIarg\fRs +determine the exact behavior of the command. The following +commands are possible for bitmap images: .TP -\fBbitmap source \fIbitmapName\fR -Returns the source data of the bitmap \fIbitmapName\fR. The source data is a -list of the hexadecimal values. +\fIimageName \fBcget\fR \fIoption\fR +Returns the current value of the configuration option given +by \fIoption\fR. +\fIOption\fR may have any of the values accepted by the +\fBimage create bitmap\fR command. .TP -\fBbitmap width \fIbitmapName\fR -Returns the width in pixels of the bitmap \fIbitmapName\fR. -.SH LIMITATIONS -Tk currently offers no way of destroying bitmaps. Once a bitmap is -created, it exists until the application terminates. +\fIimageName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR? +Query or modify the configuration options for the image. +If no \fIoption\fR is specified, returns a list describing all of +the available options for \fIimageName\fR (see \fBTk_ConfigureInfo\fR for +information on the format of this list). If \fIoption\fR is specified +with no \fIvalue\fR, then the command returns a list describing the +one named option (this list will be identical to the corresponding +sublist of the value returned if no \fIoption\fR is specified). If +one or more \fIoption\-value\fR pairs are specified, then the command +modifies the given option(s) to have the given value(s); in +this case the command returns an empty string. +\fIOption\fR may have any of the values accepted by the +\fBimage create bitmap\fR command. + .SH KEYWORDS -bitmap +bitmap, image