Import build of Tcl/Tk 8.6.10
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
65
amd64/include/X11/DECkeysym.h
Normal file
65
amd64/include/X11/DECkeysym.h
Normal file
@@ -0,0 +1,65 @@
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1988, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
|
||||
Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
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 copyright notice and this permission notice appear in
|
||||
supporting documentation, and that the name of Digital not be
|
||||
used in advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission.
|
||||
|
||||
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
||||
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
||||
DIGITAL 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 TORTIOUS ACTION,
|
||||
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
|
||||
/*
|
||||
* DEC private keysyms
|
||||
* (29th bit set)
|
||||
*/
|
||||
|
||||
/* two-key compose sequence initiators, chosen to map to Latin1 characters */
|
||||
|
||||
#define DXK_ring_accent 0x1000FEB0
|
||||
#define DXK_circumflex_accent 0x1000FE5E
|
||||
#define DXK_cedilla_accent 0x1000FE2C
|
||||
#define DXK_acute_accent 0x1000FE27
|
||||
#define DXK_grave_accent 0x1000FE60
|
||||
#define DXK_tilde 0x1000FE7E
|
||||
#define DXK_diaeresis 0x1000FE22
|
||||
|
||||
/* special keysym for LK2** "Remove" key on editing keypad */
|
||||
|
||||
#define DXK_Remove 0x1000FF00 /* Remove */
|
||||
164
amd64/include/X11/HPkeysym.h
Normal file
164
amd64/include/X11/HPkeysym.h
Normal file
@@ -0,0 +1,164 @@
|
||||
/*
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall
|
||||
not be used in advertising or otherwise to promote the sale, use or
|
||||
other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
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 copyright notice and this permission notice appear in
|
||||
supporting documentation, and that the names of Hewlett Packard
|
||||
or Digital not be
|
||||
used in advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission.
|
||||
|
||||
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
||||
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
||||
DIGITAL 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 TORTIOUS ACTION,
|
||||
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
SOFTWARE.
|
||||
|
||||
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
|
||||
TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. Hewlett-Packard shall not be liable for errors
|
||||
contained herein or direct, indirect, special, incidental or
|
||||
consequential damages in connection with the furnishing,
|
||||
performance, or use of this material.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef _HPKEYSYM_H
|
||||
|
||||
#define _HPKEYSYM_H
|
||||
|
||||
#define hpXK_ClearLine 0x1000FF6F
|
||||
#define hpXK_InsertLine 0x1000FF70
|
||||
#define hpXK_DeleteLine 0x1000FF71
|
||||
#define hpXK_InsertChar 0x1000FF72
|
||||
#define hpXK_DeleteChar 0x1000FF73
|
||||
#define hpXK_BackTab 0x1000FF74
|
||||
#define hpXK_KP_BackTab 0x1000FF75
|
||||
#define hpXK_Modelock1 0x1000FF48
|
||||
#define hpXK_Modelock2 0x1000FF49
|
||||
#define hpXK_Reset 0x1000FF6C
|
||||
#define hpXK_System 0x1000FF6D
|
||||
#define hpXK_User 0x1000FF6E
|
||||
#define hpXK_mute_acute 0x100000A8
|
||||
#define hpXK_mute_grave 0x100000A9
|
||||
#define hpXK_mute_asciicircum 0x100000AA
|
||||
#define hpXK_mute_diaeresis 0x100000AB
|
||||
#define hpXK_mute_asciitilde 0x100000AC
|
||||
#define hpXK_lira 0x100000AF
|
||||
#define hpXK_guilder 0x100000BE
|
||||
#define hpXK_Ydiaeresis 0x100000EE
|
||||
#define hpXK_IO 0x100000EE
|
||||
#define hpXK_longminus 0x100000F6
|
||||
#define hpXK_block 0x100000FC
|
||||
|
||||
|
||||
#ifndef _OSF_Keysyms
|
||||
#define _OSF_Keysyms
|
||||
|
||||
#define osfXK_Copy 0x1004FF02
|
||||
#define osfXK_Cut 0x1004FF03
|
||||
#define osfXK_Paste 0x1004FF04
|
||||
#define osfXK_BackTab 0x1004FF07
|
||||
#define osfXK_BackSpace 0x1004FF08
|
||||
#define osfXK_Clear 0x1004FF0B
|
||||
#define osfXK_Escape 0x1004FF1B
|
||||
#define osfXK_AddMode 0x1004FF31
|
||||
#define osfXK_PrimaryPaste 0x1004FF32
|
||||
#define osfXK_QuickPaste 0x1004FF33
|
||||
#define osfXK_PageLeft 0x1004FF40
|
||||
#define osfXK_PageUp 0x1004FF41
|
||||
#define osfXK_PageDown 0x1004FF42
|
||||
#define osfXK_PageRight 0x1004FF43
|
||||
#define osfXK_Activate 0x1004FF44
|
||||
#define osfXK_MenuBar 0x1004FF45
|
||||
#define osfXK_Left 0x1004FF51
|
||||
#define osfXK_Up 0x1004FF52
|
||||
#define osfXK_Right 0x1004FF53
|
||||
#define osfXK_Down 0x1004FF54
|
||||
#define osfXK_EndLine 0x1004FF57
|
||||
#define osfXK_BeginLine 0x1004FF58
|
||||
#define osfXK_EndData 0x1004FF59
|
||||
#define osfXK_BeginData 0x1004FF5A
|
||||
#define osfXK_PrevMenu 0x1004FF5B
|
||||
#define osfXK_NextMenu 0x1004FF5C
|
||||
#define osfXK_PrevField 0x1004FF5D
|
||||
#define osfXK_NextField 0x1004FF5E
|
||||
#define osfXK_Select 0x1004FF60
|
||||
#define osfXK_Insert 0x1004FF63
|
||||
#define osfXK_Undo 0x1004FF65
|
||||
#define osfXK_Menu 0x1004FF67
|
||||
#define osfXK_Cancel 0x1004FF69
|
||||
#define osfXK_Help 0x1004FF6A
|
||||
#define osfXK_SelectAll 0x1004FF71
|
||||
#define osfXK_DeselectAll 0x1004FF72
|
||||
#define osfXK_Reselect 0x1004FF73
|
||||
#define osfXK_Extend 0x1004FF74
|
||||
#define osfXK_Restore 0x1004FF78
|
||||
#define osfXK_Delete 0x1004FFFF
|
||||
|
||||
#endif /* _OSF_Keysyms */
|
||||
|
||||
|
||||
/**************************************************************
|
||||
* The use of the following macros is deprecated.
|
||||
* They are listed below only for backwards compatibility.
|
||||
*/
|
||||
#define XK_Reset 0x1000FF6C
|
||||
#define XK_System 0x1000FF6D
|
||||
#define XK_User 0x1000FF6E
|
||||
#define XK_ClearLine 0x1000FF6F
|
||||
#define XK_InsertLine 0x1000FF70
|
||||
#define XK_DeleteLine 0x1000FF71
|
||||
#define XK_InsertChar 0x1000FF72
|
||||
#define XK_DeleteChar 0x1000FF73
|
||||
#define XK_BackTab 0x1000FF74
|
||||
#define XK_KP_BackTab 0x1000FF75
|
||||
#define XK_Ext16bit_L 0x1000FF76
|
||||
#define XK_Ext16bit_R 0x1000FF77
|
||||
#define XK_mute_acute 0x100000a8
|
||||
#define XK_mute_grave 0x100000a9
|
||||
#define XK_mute_asciicircum 0x100000aa
|
||||
#define XK_mute_diaeresis 0x100000ab
|
||||
#define XK_mute_asciitilde 0x100000ac
|
||||
#define XK_lira 0x100000af
|
||||
#define XK_guilder 0x100000be
|
||||
#ifndef XK_Ydiaeresis
|
||||
#define XK_Ydiaeresis 0x100000ee
|
||||
#endif
|
||||
#define XK_IO 0x100000ee
|
||||
#define XK_longminus 0x100000f6
|
||||
#define XK_block 0x100000fc
|
||||
|
||||
#endif /* _HPKEYSYM_H */
|
||||
106
amd64/include/X11/Sunkeysym.h
Normal file
106
amd64/include/X11/Sunkeysym.h
Normal file
@@ -0,0 +1,106 @@
|
||||
/*
|
||||
* Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
/************************************************************
|
||||
|
||||
Copyright 1991, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
***********************************************************/
|
||||
|
||||
/*
|
||||
* Floating Accent
|
||||
*/
|
||||
|
||||
#define SunXK_FA_Grave 0x1005FF00
|
||||
#define SunXK_FA_Circum 0x1005FF01
|
||||
#define SunXK_FA_Tilde 0x1005FF02
|
||||
#define SunXK_FA_Acute 0x1005FF03
|
||||
#define SunXK_FA_Diaeresis 0x1005FF04
|
||||
#define SunXK_FA_Cedilla 0x1005FF05
|
||||
|
||||
/*
|
||||
* Miscellaneous Functions
|
||||
*/
|
||||
|
||||
#define SunXK_F36 0x1005FF10 /* Labeled F11 */
|
||||
#define SunXK_F37 0x1005FF11 /* Labeled F12 */
|
||||
|
||||
#define SunXK_Sys_Req 0x1005FF60
|
||||
#define SunXK_Print_Screen 0x0000FF61 /* Same as XK_Print */
|
||||
|
||||
/*
|
||||
* International & Multi-Key Character Composition
|
||||
*/
|
||||
|
||||
#define SunXK_Compose 0x0000FF20 /* Same as XK_Multi_key */
|
||||
#define SunXK_AltGraph 0x0000FF7E /* Same as XK_Mode_switch */
|
||||
|
||||
/*
|
||||
* Cursor Control
|
||||
*/
|
||||
|
||||
#define SunXK_PageUp 0x0000FF55 /* Same as XK_Prior */
|
||||
#define SunXK_PageDown 0x0000FF56 /* Same as XK_Next */
|
||||
|
||||
/*
|
||||
* Open Look Functions
|
||||
*/
|
||||
|
||||
#define SunXK_Undo 0x0000FF65 /* Same as XK_Undo */
|
||||
#define SunXK_Again 0x0000FF66 /* Same as XK_Redo */
|
||||
#define SunXK_Find 0x0000FF68 /* Same as XK_Find */
|
||||
#define SunXK_Stop 0x0000FF69 /* Same as XK_Cancel */
|
||||
#define SunXK_Props 0x1005FF70
|
||||
#define SunXK_Front 0x1005FF71
|
||||
#define SunXK_Copy 0x1005FF72
|
||||
#define SunXK_Open 0x1005FF73
|
||||
#define SunXK_Paste 0x1005FF74
|
||||
#define SunXK_Cut 0x1005FF75
|
||||
|
||||
#define SunXK_PowerSwitch 0x1005FF76
|
||||
#define SunXK_AudioLowerVolume 0x1005FF77
|
||||
#define SunXK_AudioMute 0x1005FF78
|
||||
#define SunXK_AudioRaiseVolume 0x1005FF79
|
||||
#define SunXK_VideoDegauss 0x1005FF7A
|
||||
#define SunXK_VideoLowerBrightness 0x1005FF7B
|
||||
#define SunXK_VideoRaiseBrightness 0x1005FF7C
|
||||
#define SunXK_PowerSwitchShift 0x1005FF7D
|
||||
@@ -41,7 +41,7 @@ SOFTWARE.
|
||||
/* Resources */
|
||||
|
||||
#ifdef _WIN64
|
||||
typedef __int64 XID;
|
||||
typedef unsigned __int64 XID;
|
||||
#else
|
||||
typedef unsigned long XID;
|
||||
#endif
|
||||
@@ -73,7 +73,9 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs
|
||||
* RESERVED RESOURCE AND CONSTANT DEFINITIONS
|
||||
*****************************************************************/
|
||||
|
||||
#define None 0L /* universal null resource or null atom */
|
||||
#ifndef _WIN32
|
||||
# define None 0L /* See bug [9e31fd9449] and below */
|
||||
#endif
|
||||
|
||||
#define ParentRelative 1L /* background pixmap in CreateWindow
|
||||
and ChangeWindowAttributes */
|
||||
@@ -179,13 +181,20 @@ are reserved in the protocol for errors and replies. */
|
||||
|
||||
#define ShiftMask (1<<0)
|
||||
#define LockMask (1<<1)
|
||||
#define ControlMask (1<<2)
|
||||
#ifndef _WIN32
|
||||
# define ControlMask (1<<2) /* See bug [9e31fd9449] and below */
|
||||
#endif
|
||||
#define Mod1Mask (1<<3)
|
||||
#define Mod2Mask (1<<4)
|
||||
#define Mod3Mask (1<<5)
|
||||
#define Mod4Mask (1<<6)
|
||||
#define Mod5Mask (1<<7)
|
||||
|
||||
/* See bug [9e31fd9449], this way prevents conflicts with Win32 headers */
|
||||
#ifdef _WIN32
|
||||
enum _Bug9e31fd9449 { None = 0, ControlMask = (1<<2) };
|
||||
#endif
|
||||
|
||||
/* modifier names. Used to build a SetModifierMapping request or
|
||||
to read a GetModifierMapping request. These correspond to the
|
||||
masks defined above. */
|
||||
|
||||
230
amd64/include/X11/XF86keysym.h
Normal file
230
amd64/include/X11/XF86keysym.h
Normal file
@@ -0,0 +1,230 @@
|
||||
/*
|
||||
* XFree86 vendor specific keysyms.
|
||||
*
|
||||
* The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
|
||||
*
|
||||
* X.Org will not be adding to the XF86 set of keysyms, though they have
|
||||
* been adopted and are considered a "standard" part of X keysym definitions.
|
||||
* XFree86 never properly commented these keysyms, so we have done our
|
||||
* best to explain the semantic meaning of these keys.
|
||||
*
|
||||
* XFree86 has removed their mail archives of the period, that might have
|
||||
* shed more light on some of these definitions. Until/unless we resurrect
|
||||
* these archives, these are from memory and usage.
|
||||
*/
|
||||
|
||||
/*
|
||||
* ModeLock
|
||||
*
|
||||
* This one is old, and not really used any more since XKB offers this
|
||||
* functionality.
|
||||
*/
|
||||
|
||||
#define XF86XK_ModeLock 0x1008FF01 /* Mode Switch Lock */
|
||||
|
||||
/* Backlight controls. */
|
||||
#define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */
|
||||
#define XF86XK_MonBrightnessDown 0x1008FF03 /* Monitor/panel brightness */
|
||||
#define XF86XK_KbdLightOnOff 0x1008FF04 /* Keyboards may be lit */
|
||||
#define XF86XK_KbdBrightnessUp 0x1008FF05 /* Keyboards may be lit */
|
||||
#define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */
|
||||
#define XF86XK_MonBrightnessCycle 0x1008FF07 /* Monitor/panel brightness */
|
||||
|
||||
/*
|
||||
* Keys found on some "Internet" keyboards.
|
||||
*/
|
||||
#define XF86XK_Standby 0x1008FF10 /* System into standby mode */
|
||||
#define XF86XK_AudioLowerVolume 0x1008FF11 /* Volume control down */
|
||||
#define XF86XK_AudioMute 0x1008FF12 /* Mute sound from the system */
|
||||
#define XF86XK_AudioRaiseVolume 0x1008FF13 /* Volume control up */
|
||||
#define XF86XK_AudioPlay 0x1008FF14 /* Start playing of audio > */
|
||||
#define XF86XK_AudioStop 0x1008FF15 /* Stop playing audio */
|
||||
#define XF86XK_AudioPrev 0x1008FF16 /* Previous track */
|
||||
#define XF86XK_AudioNext 0x1008FF17 /* Next track */
|
||||
#define XF86XK_HomePage 0x1008FF18 /* Display user's home page */
|
||||
#define XF86XK_Mail 0x1008FF19 /* Invoke user's mail program */
|
||||
#define XF86XK_Start 0x1008FF1A /* Start application */
|
||||
#define XF86XK_Search 0x1008FF1B /* Search */
|
||||
#define XF86XK_AudioRecord 0x1008FF1C /* Record audio application */
|
||||
|
||||
/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
|
||||
#define XF86XK_Calculator 0x1008FF1D /* Invoke calculator program */
|
||||
#define XF86XK_Memo 0x1008FF1E /* Invoke Memo taking program */
|
||||
#define XF86XK_ToDoList 0x1008FF1F /* Invoke To Do List program */
|
||||
#define XF86XK_Calendar 0x1008FF20 /* Invoke Calendar program */
|
||||
#define XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */
|
||||
#define XF86XK_ContrastAdjust 0x1008FF22 /* Adjust screen contrast */
|
||||
#define XF86XK_RockerUp 0x1008FF23 /* Rocker switches exist up */
|
||||
#define XF86XK_RockerDown 0x1008FF24 /* and down */
|
||||
#define XF86XK_RockerEnter 0x1008FF25 /* and let you press them */
|
||||
|
||||
/* Some more "Internet" keyboard symbols */
|
||||
#define XF86XK_Back 0x1008FF26 /* Like back on a browser */
|
||||
#define XF86XK_Forward 0x1008FF27 /* Like forward on a browser */
|
||||
#define XF86XK_Stop 0x1008FF28 /* Stop current operation */
|
||||
#define XF86XK_Refresh 0x1008FF29 /* Refresh the page */
|
||||
#define XF86XK_PowerOff 0x1008FF2A /* Power off system entirely */
|
||||
#define XF86XK_WakeUp 0x1008FF2B /* Wake up system from sleep */
|
||||
#define XF86XK_Eject 0x1008FF2C /* Eject device (e.g. DVD) */
|
||||
#define XF86XK_ScreenSaver 0x1008FF2D /* Invoke screensaver */
|
||||
#define XF86XK_WWW 0x1008FF2E /* Invoke web browser */
|
||||
#define XF86XK_Sleep 0x1008FF2F /* Put system to sleep */
|
||||
#define XF86XK_Favorites 0x1008FF30 /* Show favorite locations */
|
||||
#define XF86XK_AudioPause 0x1008FF31 /* Pause audio playing */
|
||||
#define XF86XK_AudioMedia 0x1008FF32 /* Launch media collection app */
|
||||
#define XF86XK_MyComputer 0x1008FF33 /* Display "My Computer" window */
|
||||
#define XF86XK_VendorHome 0x1008FF34 /* Display vendor home web site */
|
||||
#define XF86XK_LightBulb 0x1008FF35 /* Light bulb keys exist */
|
||||
#define XF86XK_Shop 0x1008FF36 /* Display shopping web site */
|
||||
#define XF86XK_History 0x1008FF37 /* Show history of web surfing */
|
||||
#define XF86XK_OpenURL 0x1008FF38 /* Open selected URL */
|
||||
#define XF86XK_AddFavorite 0x1008FF39 /* Add URL to favorites list */
|
||||
#define XF86XK_HotLinks 0x1008FF3A /* Show "hot" links */
|
||||
#define XF86XK_BrightnessAdjust 0x1008FF3B /* Invoke brightness adj. UI */
|
||||
#define XF86XK_Finance 0x1008FF3C /* Display financial site */
|
||||
#define XF86XK_Community 0x1008FF3D /* Display user's community */
|
||||
#define XF86XK_AudioRewind 0x1008FF3E /* "rewind" audio track */
|
||||
#define XF86XK_BackForward 0x1008FF3F /* ??? */
|
||||
#define XF86XK_Launch0 0x1008FF40 /* Launch Application */
|
||||
#define XF86XK_Launch1 0x1008FF41 /* Launch Application */
|
||||
#define XF86XK_Launch2 0x1008FF42 /* Launch Application */
|
||||
#define XF86XK_Launch3 0x1008FF43 /* Launch Application */
|
||||
#define XF86XK_Launch4 0x1008FF44 /* Launch Application */
|
||||
#define XF86XK_Launch5 0x1008FF45 /* Launch Application */
|
||||
#define XF86XK_Launch6 0x1008FF46 /* Launch Application */
|
||||
#define XF86XK_Launch7 0x1008FF47 /* Launch Application */
|
||||
#define XF86XK_Launch8 0x1008FF48 /* Launch Application */
|
||||
#define XF86XK_Launch9 0x1008FF49 /* Launch Application */
|
||||
#define XF86XK_LaunchA 0x1008FF4A /* Launch Application */
|
||||
#define XF86XK_LaunchB 0x1008FF4B /* Launch Application */
|
||||
#define XF86XK_LaunchC 0x1008FF4C /* Launch Application */
|
||||
#define XF86XK_LaunchD 0x1008FF4D /* Launch Application */
|
||||
#define XF86XK_LaunchE 0x1008FF4E /* Launch Application */
|
||||
#define XF86XK_LaunchF 0x1008FF4F /* Launch Application */
|
||||
|
||||
#define XF86XK_ApplicationLeft 0x1008FF50 /* switch to application, left */
|
||||
#define XF86XK_ApplicationRight 0x1008FF51 /* switch to application, right*/
|
||||
#define XF86XK_Book 0x1008FF52 /* Launch bookreader */
|
||||
#define XF86XK_CD 0x1008FF53 /* Launch CD/DVD player */
|
||||
#define XF86XK_Calculater 0x1008FF54 /* Launch Calculater */
|
||||
#define XF86XK_Clear 0x1008FF55 /* Clear window, screen */
|
||||
#define XF86XK_Close 0x1008FF56 /* Close window */
|
||||
#define XF86XK_Copy 0x1008FF57 /* Copy selection */
|
||||
#define XF86XK_Cut 0x1008FF58 /* Cut selection */
|
||||
#define XF86XK_Display 0x1008FF59 /* Output switch key */
|
||||
#define XF86XK_DOS 0x1008FF5A /* Launch DOS (emulation) */
|
||||
#define XF86XK_Documents 0x1008FF5B /* Open documents window */
|
||||
#define XF86XK_Excel 0x1008FF5C /* Launch spread sheet */
|
||||
#define XF86XK_Explorer 0x1008FF5D /* Launch file explorer */
|
||||
#define XF86XK_Game 0x1008FF5E /* Launch game */
|
||||
#define XF86XK_Go 0x1008FF5F /* Go to URL */
|
||||
#define XF86XK_iTouch 0x1008FF60 /* Logitech iTouch- don't use */
|
||||
#define XF86XK_LogOff 0x1008FF61 /* Log off system */
|
||||
#define XF86XK_Market 0x1008FF62 /* ?? */
|
||||
#define XF86XK_Meeting 0x1008FF63 /* enter meeting in calendar */
|
||||
#define XF86XK_MenuKB 0x1008FF65 /* distinguish keyboard from PB */
|
||||
#define XF86XK_MenuPB 0x1008FF66 /* distinguish PB from keyboard */
|
||||
#define XF86XK_MySites 0x1008FF67 /* Favourites */
|
||||
#define XF86XK_New 0x1008FF68 /* New (folder, document... */
|
||||
#define XF86XK_News 0x1008FF69 /* News */
|
||||
#define XF86XK_OfficeHome 0x1008FF6A /* Office home (old Staroffice)*/
|
||||
#define XF86XK_Open 0x1008FF6B /* Open */
|
||||
#define XF86XK_Option 0x1008FF6C /* ?? */
|
||||
#define XF86XK_Paste 0x1008FF6D /* Paste */
|
||||
#define XF86XK_Phone 0x1008FF6E /* Launch phone; dial number */
|
||||
#define XF86XK_Q 0x1008FF70 /* Compaq's Q - don't use */
|
||||
#define XF86XK_Reply 0x1008FF72 /* Reply e.g., mail */
|
||||
#define XF86XK_Reload 0x1008FF73 /* Reload web page, file, etc. */
|
||||
#define XF86XK_RotateWindows 0x1008FF74 /* Rotate windows e.g. xrandr */
|
||||
#define XF86XK_RotationPB 0x1008FF75 /* don't use */
|
||||
#define XF86XK_RotationKB 0x1008FF76 /* don't use */
|
||||
#define XF86XK_Save 0x1008FF77 /* Save (file, document, state */
|
||||
#define XF86XK_ScrollUp 0x1008FF78 /* Scroll window/contents up */
|
||||
#define XF86XK_ScrollDown 0x1008FF79 /* Scrool window/contentd down */
|
||||
#define XF86XK_ScrollClick 0x1008FF7A /* Use XKB mousekeys instead */
|
||||
#define XF86XK_Send 0x1008FF7B /* Send mail, file, object */
|
||||
#define XF86XK_Spell 0x1008FF7C /* Spell checker */
|
||||
#define XF86XK_SplitScreen 0x1008FF7D /* Split window or screen */
|
||||
#define XF86XK_Support 0x1008FF7E /* Get support (??) */
|
||||
#define XF86XK_TaskPane 0x1008FF7F /* Show tasks */
|
||||
#define XF86XK_Terminal 0x1008FF80 /* Launch terminal emulator */
|
||||
#define XF86XK_Tools 0x1008FF81 /* toolbox of desktop/app. */
|
||||
#define XF86XK_Travel 0x1008FF82 /* ?? */
|
||||
#define XF86XK_UserPB 0x1008FF84 /* ?? */
|
||||
#define XF86XK_User1KB 0x1008FF85 /* ?? */
|
||||
#define XF86XK_User2KB 0x1008FF86 /* ?? */
|
||||
#define XF86XK_Video 0x1008FF87 /* Launch video player */
|
||||
#define XF86XK_WheelButton 0x1008FF88 /* button from a mouse wheel */
|
||||
#define XF86XK_Word 0x1008FF89 /* Launch word processor */
|
||||
#define XF86XK_Xfer 0x1008FF8A
|
||||
#define XF86XK_ZoomIn 0x1008FF8B /* zoom in view, map, etc. */
|
||||
#define XF86XK_ZoomOut 0x1008FF8C /* zoom out view, map, etc. */
|
||||
|
||||
#define XF86XK_Away 0x1008FF8D /* mark yourself as away */
|
||||
#define XF86XK_Messenger 0x1008FF8E /* as in instant messaging */
|
||||
#define XF86XK_WebCam 0x1008FF8F /* Launch web camera app. */
|
||||
#define XF86XK_MailForward 0x1008FF90 /* Forward in mail */
|
||||
#define XF86XK_Pictures 0x1008FF91 /* Show pictures */
|
||||
#define XF86XK_Music 0x1008FF92 /* Launch music application */
|
||||
|
||||
#define XF86XK_Battery 0x1008FF93 /* Display battery information */
|
||||
#define XF86XK_Bluetooth 0x1008FF94 /* Enable/disable Bluetooth */
|
||||
#define XF86XK_WLAN 0x1008FF95 /* Enable/disable WLAN */
|
||||
#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */
|
||||
|
||||
#define XF86XK_AudioForward 0x1008FF97 /* fast-forward audio track */
|
||||
#define XF86XK_AudioRepeat 0x1008FF98 /* toggle repeat mode */
|
||||
#define XF86XK_AudioRandomPlay 0x1008FF99 /* toggle shuffle mode */
|
||||
#define XF86XK_Subtitle 0x1008FF9A /* cycle through subtitle */
|
||||
#define XF86XK_AudioCycleTrack 0x1008FF9B /* cycle through audio tracks */
|
||||
#define XF86XK_CycleAngle 0x1008FF9C /* cycle through angles */
|
||||
#define XF86XK_FrameBack 0x1008FF9D /* video: go one frame back */
|
||||
#define XF86XK_FrameForward 0x1008FF9E /* video: go one frame forward */
|
||||
#define XF86XK_Time 0x1008FF9F /* display, or shows an entry for time seeking */
|
||||
#define XF86XK_Select 0x1008FFA0 /* Select button on joypads and remotes */
|
||||
#define XF86XK_View 0x1008FFA1 /* Show a view options/properties */
|
||||
#define XF86XK_TopMenu 0x1008FFA2 /* Go to a top-level menu in a video */
|
||||
|
||||
#define XF86XK_Red 0x1008FFA3 /* Red button */
|
||||
#define XF86XK_Green 0x1008FFA4 /* Green button */
|
||||
#define XF86XK_Yellow 0x1008FFA5 /* Yellow button */
|
||||
#define XF86XK_Blue 0x1008FFA6 /* Blue button */
|
||||
|
||||
#define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */
|
||||
#define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */
|
||||
#define XF86XK_TouchpadToggle 0x1008FFA9 /* Toggle between touchpad/trackstick */
|
||||
#define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */
|
||||
#define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */
|
||||
|
||||
#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
|
||||
|
||||
#define XF86XK_Keyboard 0x1008FFB3 /* User defined keyboard related action */
|
||||
|
||||
#define XF86XK_WWAN 0x1008FFB4 /* Toggle WWAN (LTE, UMTS, etc.) radio */
|
||||
#define XF86XK_RFKill 0x1008FFB5 /* Toggle radios on/off */
|
||||
|
||||
#define XF86XK_AudioPreset 0x1008FFB6 /* Select equalizer preset, e.g. theatre-mode */
|
||||
|
||||
#define XF86XK_RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */
|
||||
|
||||
/* Keys for special action keys (hot keys) */
|
||||
/* Virtual terminals on some operating systems */
|
||||
#define XF86XK_Switch_VT_1 0x1008FE01
|
||||
#define XF86XK_Switch_VT_2 0x1008FE02
|
||||
#define XF86XK_Switch_VT_3 0x1008FE03
|
||||
#define XF86XK_Switch_VT_4 0x1008FE04
|
||||
#define XF86XK_Switch_VT_5 0x1008FE05
|
||||
#define XF86XK_Switch_VT_6 0x1008FE06
|
||||
#define XF86XK_Switch_VT_7 0x1008FE07
|
||||
#define XF86XK_Switch_VT_8 0x1008FE08
|
||||
#define XF86XK_Switch_VT_9 0x1008FE09
|
||||
#define XF86XK_Switch_VT_10 0x1008FE0A
|
||||
#define XF86XK_Switch_VT_11 0x1008FE0B
|
||||
#define XF86XK_Switch_VT_12 0x1008FE0C
|
||||
|
||||
#define XF86XK_Ungrab 0x1008FE20 /* force ungrab */
|
||||
#define XF86XK_ClearGrab 0x1008FE21 /* kill application with grab */
|
||||
#define XF86XK_Next_VMode 0x1008FE22 /* next video mode available */
|
||||
#define XF86XK_Prev_VMode 0x1008FE23 /* prev. video mode available */
|
||||
#define XF86XK_LogWindowTree 0x1008FE24 /* print window tree to log */
|
||||
#define XF86XK_LogGrabInfo 0x1008FE25 /* print all active grabs to log */
|
||||
@@ -530,7 +530,7 @@ typedef struct _XDisplay {
|
||||
#endif
|
||||
#ifndef _XEVENT_
|
||||
|
||||
#define XMaxTransChars 4
|
||||
#define XMaxTransChars 7
|
||||
|
||||
/*
|
||||
* Definitions of specific events.
|
||||
@@ -551,7 +551,7 @@ typedef struct {
|
||||
Bool same_screen; /* same screen flag */
|
||||
char trans_chars[XMaxTransChars];
|
||||
/* translated characters */
|
||||
int nbytes;
|
||||
unsigned char nbytes;
|
||||
} XKeyEvent;
|
||||
typedef XKeyEvent XKeyPressedEvent;
|
||||
typedef XKeyEvent XKeyReleasedEvent;
|
||||
|
||||
51
amd64/include/X11/ap_keysym.h
Normal file
51
amd64/include/X11/ap_keysym.h
Normal file
@@ -0,0 +1,51 @@
|
||||
/******************************************************************
|
||||
Copyright 1987 by Apollo Computer Inc., Chelmsford, Massachusetts.
|
||||
Copyright 1989 by Hewlett-Packard Company.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
Permission to use, duplicate, change, and distribute this software and
|
||||
its documentation for any purpose and without fee is granted, provided
|
||||
that the above copyright notice appear in such copy and that this
|
||||
copyright notice appear in all supporting documentation, and that the
|
||||
names of Apollo Computer Inc., the Hewlett-Packard Company, or the X
|
||||
Consortium not be used in advertising or publicity pertaining to
|
||||
distribution of the software without written prior permission.
|
||||
|
||||
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
|
||||
TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. Hewlett-Packard shall not be liable for errors
|
||||
contained herein or direct, indirect, special, incidental or
|
||||
consequential damages in connection with the furnishing,
|
||||
performance, or use of this material.
|
||||
|
||||
This software is not subject to any license of the American
|
||||
Telephone and Telegraph Company or of the Regents of the
|
||||
University of California.
|
||||
******************************************************************/
|
||||
|
||||
#define apXK_LineDel 0x1000FF00
|
||||
#define apXK_CharDel 0x1000FF01
|
||||
#define apXK_Copy 0x1000FF02
|
||||
#define apXK_Cut 0x1000FF03
|
||||
#define apXK_Paste 0x1000FF04
|
||||
#define apXK_Move 0x1000FF05
|
||||
#define apXK_Grow 0x1000FF06
|
||||
#define apXK_Cmd 0x1000FF07
|
||||
#define apXK_Shell 0x1000FF08
|
||||
#define apXK_LeftBar 0x1000FF09
|
||||
#define apXK_RightBar 0x1000FF0A
|
||||
#define apXK_LeftBox 0x1000FF0B
|
||||
#define apXK_RightBox 0x1000FF0C
|
||||
#define apXK_UpBox 0x1000FF0D
|
||||
#define apXK_DownBox 0x1000FF0E
|
||||
#define apXK_Pop 0x1000FF0F
|
||||
#define apXK_Read 0x1000FF10
|
||||
#define apXK_Edit 0x1000FF11
|
||||
#define apXK_Save 0x1000FF12
|
||||
#define apXK_Exit 0x1000FF13
|
||||
#define apXK_Repeat 0x1000FF14
|
||||
|
||||
#define apXK_KP_parenleft 0x1000FFA8
|
||||
#define apXK_KP_parenright 0x1000FFA9
|
||||
@@ -397,6 +397,7 @@ SOFTWARE.
|
||||
#define XK_Otilde 0x0d5
|
||||
#define XK_Odiaeresis 0x0d6
|
||||
#define XK_multiply 0x0d7
|
||||
#define XK_Oslash 0x0d8
|
||||
#define XK_Ooblique 0x0d8
|
||||
#define XK_Ugrave 0x0d9
|
||||
#define XK_Uacute 0x0da
|
||||
@@ -840,6 +841,7 @@ SOFTWARE.
|
||||
#define XK_Greek_EPSILONaccent 0x7a2
|
||||
#define XK_Greek_ETAaccent 0x7a3
|
||||
#define XK_Greek_IOTAaccent 0x7a4
|
||||
#define XK_Greek_IOTAdieresis 0x7a5
|
||||
#define XK_Greek_IOTAdiaeresis 0x7a5
|
||||
#define XK_Greek_OMICRONaccent 0x7a7
|
||||
#define XK_Greek_UPSILONaccent 0x7a8
|
||||
|
||||
@@ -51,10 +51,10 @@ extern "C" {
|
||||
#define TCL_MAJOR_VERSION 8
|
||||
#define TCL_MINOR_VERSION 6
|
||||
#define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE
|
||||
#define TCL_RELEASE_SERIAL 9
|
||||
#define TCL_RELEASE_SERIAL 10
|
||||
|
||||
#define TCL_VERSION "8.6"
|
||||
#define TCL_PATCH_LEVEL "8.6.9"
|
||||
#define TCL_PATCH_LEVEL "8.6.10"
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------------
|
||||
@@ -440,7 +440,7 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt;
|
||||
#if defined(_WIN32)
|
||||
# ifdef __BORLANDC__
|
||||
typedef struct stati64 Tcl_StatBuf;
|
||||
# elif defined(_WIN64)
|
||||
# elif defined(_WIN64) || defined(_USE_64BIT_TIME_T)
|
||||
typedef struct __stat64 Tcl_StatBuf;
|
||||
# elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T)
|
||||
typedef struct _stati64 Tcl_StatBuf;
|
||||
|
||||
@@ -1816,6 +1816,25 @@ EXTERN int Tcl_FSUnloadFile(Tcl_Interp *interp,
|
||||
EXTERN void Tcl_ZlibStreamSetCompressionDictionary(
|
||||
Tcl_ZlibStream zhandle,
|
||||
Tcl_Obj *compressionDictionaryObj);
|
||||
/* Slot 631 is reserved */
|
||||
/* Slot 632 is reserved */
|
||||
/* Slot 633 is reserved */
|
||||
/* Slot 634 is reserved */
|
||||
/* Slot 635 is reserved */
|
||||
/* Slot 636 is reserved */
|
||||
/* Slot 637 is reserved */
|
||||
/* Slot 638 is reserved */
|
||||
/* Slot 639 is reserved */
|
||||
/* Slot 640 is reserved */
|
||||
/* Slot 641 is reserved */
|
||||
/* Slot 642 is reserved */
|
||||
/* Slot 643 is reserved */
|
||||
/* Slot 644 is reserved */
|
||||
/* Slot 645 is reserved */
|
||||
/* Slot 646 is reserved */
|
||||
/* Slot 647 is reserved */
|
||||
/* 648 */
|
||||
EXTERN void TclUnusedStubEntry(void);
|
||||
|
||||
typedef struct {
|
||||
const struct TclPlatStubs *tclPlatStubs;
|
||||
@@ -2482,6 +2501,24 @@ typedef struct TclStubs {
|
||||
void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */
|
||||
int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */
|
||||
void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */
|
||||
void (*reserved631)(void);
|
||||
void (*reserved632)(void);
|
||||
void (*reserved633)(void);
|
||||
void (*reserved634)(void);
|
||||
void (*reserved635)(void);
|
||||
void (*reserved636)(void);
|
||||
void (*reserved637)(void);
|
||||
void (*reserved638)(void);
|
||||
void (*reserved639)(void);
|
||||
void (*reserved640)(void);
|
||||
void (*reserved641)(void);
|
||||
void (*reserved642)(void);
|
||||
void (*reserved643)(void);
|
||||
void (*reserved644)(void);
|
||||
void (*reserved645)(void);
|
||||
void (*reserved646)(void);
|
||||
void (*reserved647)(void);
|
||||
void (*tclUnusedStubEntry) (void); /* 648 */
|
||||
} TclStubs;
|
||||
|
||||
extern const TclStubs *tclStubsPtr;
|
||||
@@ -3774,11 +3811,32 @@ extern const TclStubs *tclStubsPtr;
|
||||
(tclStubsPtr->tcl_FSUnloadFile) /* 629 */
|
||||
#define Tcl_ZlibStreamSetCompressionDictionary \
|
||||
(tclStubsPtr->tcl_ZlibStreamSetCompressionDictionary) /* 630 */
|
||||
/* Slot 631 is reserved */
|
||||
/* Slot 632 is reserved */
|
||||
/* Slot 633 is reserved */
|
||||
/* Slot 634 is reserved */
|
||||
/* Slot 635 is reserved */
|
||||
/* Slot 636 is reserved */
|
||||
/* Slot 637 is reserved */
|
||||
/* Slot 638 is reserved */
|
||||
/* Slot 639 is reserved */
|
||||
/* Slot 640 is reserved */
|
||||
/* Slot 641 is reserved */
|
||||
/* Slot 642 is reserved */
|
||||
/* Slot 643 is reserved */
|
||||
/* Slot 644 is reserved */
|
||||
/* Slot 645 is reserved */
|
||||
/* Slot 646 is reserved */
|
||||
/* Slot 647 is reserved */
|
||||
#define TclUnusedStubEntry \
|
||||
(tclStubsPtr->tclUnusedStubEntry) /* 648 */
|
||||
|
||||
#endif /* defined(USE_TCL_STUBS) */
|
||||
|
||||
/* !END!: Do not edit above this line. */
|
||||
|
||||
#undef TclUnusedStubEntry
|
||||
|
||||
#if defined(USE_TCL_STUBS)
|
||||
# undef Tcl_CreateInterp
|
||||
# undef Tcl_FindExecutable
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,6 +16,9 @@
|
||||
#define _TCLTOMMATHDECLS
|
||||
|
||||
#include "tcl.h"
|
||||
#ifndef BN_H_
|
||||
#include "tclTomMath.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define the version of the Stubs table that's exported for tommath
|
||||
@@ -32,28 +35,22 @@
|
||||
|
||||
/* MODULE_SCOPE void* TclBNAlloc( size_t ); */
|
||||
#define TclBNAlloc(s) ((void*)ckalloc((size_t)(s)))
|
||||
/* MODULE_SCOPE void* TclBNCalloc( size_t, size_t ); */
|
||||
#define TclBNCalloc(m,s) memset(ckalloc((size_t)(m)*(size_t)(s)),0,(size_t)(m)*(size_t)(s))
|
||||
/* MODULE_SCOPE void* TclBNRealloc( void*, size_t ); */
|
||||
#define TclBNRealloc(x,s) ((void*)ckrealloc((char*)(x),(size_t)(s)))
|
||||
/* MODULE_SCOPE void TclBNFree( void* ); */
|
||||
#define TclBNFree(x) (ckfree((char*)(x)))
|
||||
/* MODULE_SCOPE void* TclBNCalloc( size_t, size_t ); */
|
||||
/* unused - no macro */
|
||||
|
||||
#define XMALLOC(x) TclBNAlloc(x)
|
||||
#define XFREE(x) TclBNFree(x)
|
||||
#define XREALLOC(x,n) TclBNRealloc(x,n)
|
||||
#define XCALLOC(n,x) TclBNCalloc(n,x)
|
||||
#define MP_MALLOC(size) TclBNAlloc(size)
|
||||
#define MP_CALLOC(nmemb, size) TclBNCalloc(nmemb, size)
|
||||
#define MP_REALLOC(mem, oldsize, newsize) TclBNRealloc(mem, newsize)
|
||||
#define MP_FREE(mem, size) TclBNFree(mem)
|
||||
|
||||
|
||||
/* Rename the global symbols in libtommath to avoid linkage conflicts */
|
||||
|
||||
#define KARATSUBA_MUL_CUTOFF TclBNKaratsubaMulCutoff
|
||||
#define KARATSUBA_SQR_CUTOFF TclBNKaratsubaSqrCutoff
|
||||
#define TOOM_MUL_CUTOFF TclBNToomMulCutoff
|
||||
#define TOOM_SQR_CUTOFF TclBNToomSqrCutoff
|
||||
|
||||
#define bn_reverse TclBN_reverse
|
||||
#define fast_s_mp_mul_digs TclBN_fast_s_mp_mul_digs
|
||||
#define fast_s_mp_sqr TclBN_fast_s_mp_sqr
|
||||
#define mp_add TclBN_mp_add
|
||||
#define mp_add_d TclBN_mp_add_d
|
||||
#define mp_and TclBN_mp_and
|
||||
@@ -73,6 +70,8 @@
|
||||
#define mp_div_d TclBN_mp_div_d
|
||||
#define mp_exch TclBN_mp_exch
|
||||
#define mp_expt_d TclBN_mp_expt_d
|
||||
#define mp_expt_d_ex TclBN_mp_expt_d_ex
|
||||
#define mp_expt_u32 TclBN_mp_expt_d
|
||||
#define mp_grow TclBN_mp_grow
|
||||
#define mp_init TclBN_mp_init
|
||||
#define mp_init_copy TclBN_mp_init_copy
|
||||
@@ -80,8 +79,6 @@
|
||||
#define mp_init_set TclBN_mp_init_set
|
||||
#define mp_init_set_int TclBN_mp_init_set_int
|
||||
#define mp_init_size TclBN_mp_init_size
|
||||
#define mp_karatsuba_mul TclBN_mp_karatsuba_mul
|
||||
#define mp_karatsuba_sqr TclBN_mp_karatsuba_sqr
|
||||
#define mp_lshd TclBN_mp_lshd
|
||||
#define mp_mod TclBN_mp_mod
|
||||
#define mp_mod_2d TclBN_mp_mod_2d
|
||||
@@ -94,26 +91,43 @@
|
||||
#define mp_radix_size TclBN_mp_radix_size
|
||||
#define mp_read_radix TclBN_mp_read_radix
|
||||
#define mp_rshd TclBN_mp_rshd
|
||||
#define mp_s_rmap TclBNMpSRmap
|
||||
#define mp_set TclBN_mp_set
|
||||
#define mp_set_int TclBN_mp_set_int
|
||||
#define mp_set_int(a,b) (TclBN_mp_set_int(a,(unsigned int)(b)),MP_OKAY)
|
||||
#define mp_set_long(a,b) (TclBN_mp_set_int(a,b),MP_OKAY)
|
||||
#define mp_set_ul(a,b) (void)TclBN_mp_set_int(a,b)
|
||||
#define mp_set_ull TclBN_mp_set_ull
|
||||
#define mp_set_u64 TclBN_mp_set_ull
|
||||
#define mp_shrink TclBN_mp_shrink
|
||||
#define mp_sqr TclBN_mp_sqr
|
||||
#define mp_sqrt TclBN_mp_sqrt
|
||||
#define mp_sub TclBN_mp_sub
|
||||
#define mp_sub_d TclBN_mp_sub_d
|
||||
#define mp_signed_rsh TclBN_mp_signed_rsh
|
||||
#define mp_tc_and TclBN_mp_and
|
||||
#define mp_tc_div_2d TclBN_mp_signed_rsh
|
||||
#define mp_tc_or TclBN_mp_or
|
||||
#define mp_tc_xor TclBN_mp_xor
|
||||
#define mp_to_unsigned_bin TclBN_mp_to_unsigned_bin
|
||||
#define mp_to_unsigned_bin_n TclBN_mp_to_unsigned_bin_n
|
||||
#define mp_toom_mul TclBN_mp_toom_mul
|
||||
#define mp_toom_sqr TclBN_mp_toom_sqr
|
||||
#define mp_toradix_n TclBN_mp_toradix_n
|
||||
#define mp_unsigned_bin_size TclBN_mp_unsigned_bin_size
|
||||
#define mp_to_radix TclBN_mp_to_radix
|
||||
#define mp_to_ubin TclBN_mp_to_ubin
|
||||
#define mp_ubin_size TclBN_mp_unsigned_bin_size
|
||||
#define mp_unsigned_bin_size(a) ((int)TclBN_mp_unsigned_bin_size(a))
|
||||
#define mp_xor TclBN_mp_xor
|
||||
#define mp_zero TclBN_mp_zero
|
||||
#define s_mp_add TclBN_s_mp_add
|
||||
#define s_mp_balance_mul TclBN_mp_balance_mul
|
||||
#define s_mp_karatsuba_mul TclBN_mp_karatsuba_mul
|
||||
#define s_mp_karatsuba_sqr TclBN_mp_karatsuba_sqr
|
||||
#define s_mp_mul_digs TclBN_s_mp_mul_digs
|
||||
#define s_mp_mul_digs_fast TclBN_fast_s_mp_mul_digs
|
||||
#define s_mp_reverse TclBN_s_mp_reverse
|
||||
#define s_mp_sqr TclBN_s_mp_sqr
|
||||
#define s_mp_sqr_fast TclBN_fast_s_mp_sqr
|
||||
#define s_mp_sub TclBN_s_mp_sub
|
||||
#define s_mp_toom_mul TclBN_mp_toom_mul
|
||||
#define s_mp_toom_sqr TclBN_mp_toom_sqr
|
||||
|
||||
#undef TCL_STORAGE_CLASS
|
||||
#ifdef BUILD_tcl
|
||||
@@ -147,11 +161,14 @@ EXTERN int TclBN_epoch(void);
|
||||
/* 1 */
|
||||
EXTERN int TclBN_revision(void);
|
||||
/* 2 */
|
||||
EXTERN int TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_add(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 3 */
|
||||
EXTERN int TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_add_d(const mp_int *a, mp_digit b,
|
||||
mp_int *c);
|
||||
/* 4 */
|
||||
EXTERN int TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_and(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 5 */
|
||||
EXTERN void TclBN_mp_clamp(mp_int *a);
|
||||
/* 6 */
|
||||
@@ -159,134 +176,177 @@ EXTERN void TclBN_mp_clear(mp_int *a);
|
||||
/* 7 */
|
||||
EXTERN void TclBN_mp_clear_multi(mp_int *a, ...);
|
||||
/* 8 */
|
||||
EXTERN int TclBN_mp_cmp(const mp_int *a, const mp_int *b);
|
||||
EXTERN mp_ord TclBN_mp_cmp(const mp_int *a, const mp_int *b);
|
||||
/* 9 */
|
||||
EXTERN int TclBN_mp_cmp_d(const mp_int *a, mp_digit b);
|
||||
EXTERN mp_ord TclBN_mp_cmp_d(const mp_int *a, mp_digit b);
|
||||
/* 10 */
|
||||
EXTERN int TclBN_mp_cmp_mag(const mp_int *a, const mp_int *b);
|
||||
EXTERN mp_ord TclBN_mp_cmp_mag(const mp_int *a, const mp_int *b);
|
||||
/* 11 */
|
||||
EXTERN int TclBN_mp_copy(const mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_copy(const mp_int *a, mp_int *b);
|
||||
/* 12 */
|
||||
EXTERN int TclBN_mp_count_bits(const mp_int *a);
|
||||
/* 13 */
|
||||
EXTERN int TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q,
|
||||
mp_int *r);
|
||||
EXTERN mp_err TclBN_mp_div(const mp_int *a, const mp_int *b,
|
||||
mp_int *q, mp_int *r);
|
||||
/* 14 */
|
||||
EXTERN int TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q,
|
||||
mp_digit *r);
|
||||
EXTERN mp_err TclBN_mp_div_d(const mp_int *a, mp_digit b,
|
||||
mp_int *q, mp_digit *r);
|
||||
/* 15 */
|
||||
EXTERN int TclBN_mp_div_2(mp_int *a, mp_int *q);
|
||||
EXTERN mp_err TclBN_mp_div_2(const mp_int *a, mp_int *q);
|
||||
/* 16 */
|
||||
EXTERN int TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q,
|
||||
EXTERN mp_err TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q,
|
||||
mp_int *r);
|
||||
/* 17 */
|
||||
EXTERN int TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r);
|
||||
EXTERN mp_err TclBN_mp_div_3(const mp_int *a, mp_int *q,
|
||||
mp_digit *r);
|
||||
/* 18 */
|
||||
EXTERN void TclBN_mp_exch(mp_int *a, mp_int *b);
|
||||
/* 19 */
|
||||
EXTERN int TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_expt_d(const mp_int *a, unsigned int b,
|
||||
mp_int *c);
|
||||
/* 20 */
|
||||
EXTERN int TclBN_mp_grow(mp_int *a, int size);
|
||||
EXTERN mp_err TclBN_mp_grow(mp_int *a, int size);
|
||||
/* 21 */
|
||||
EXTERN int TclBN_mp_init(mp_int *a);
|
||||
EXTERN mp_err TclBN_mp_init(mp_int *a);
|
||||
/* 22 */
|
||||
EXTERN int TclBN_mp_init_copy(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_init_copy(mp_int *a, const mp_int *b);
|
||||
/* 23 */
|
||||
EXTERN int TclBN_mp_init_multi(mp_int *a, ...);
|
||||
EXTERN mp_err TclBN_mp_init_multi(mp_int *a, ...);
|
||||
/* 24 */
|
||||
EXTERN int TclBN_mp_init_set(mp_int *a, mp_digit b);
|
||||
EXTERN mp_err TclBN_mp_init_set(mp_int *a, mp_digit b);
|
||||
/* 25 */
|
||||
EXTERN int TclBN_mp_init_size(mp_int *a, int size);
|
||||
EXTERN mp_err TclBN_mp_init_size(mp_int *a, int size);
|
||||
/* 26 */
|
||||
EXTERN int TclBN_mp_lshd(mp_int *a, int shift);
|
||||
EXTERN mp_err TclBN_mp_lshd(mp_int *a, int shift);
|
||||
/* 27 */
|
||||
EXTERN int TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r);
|
||||
EXTERN mp_err TclBN_mp_mod(const mp_int *a, const mp_int *b,
|
||||
mp_int *r);
|
||||
/* 28 */
|
||||
EXTERN int TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r);
|
||||
EXTERN mp_err TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r);
|
||||
/* 29 */
|
||||
EXTERN int TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p);
|
||||
EXTERN mp_err TclBN_mp_mul(const mp_int *a, const mp_int *b,
|
||||
mp_int *p);
|
||||
/* 30 */
|
||||
EXTERN int TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p);
|
||||
EXTERN mp_err TclBN_mp_mul_d(const mp_int *a, mp_digit b,
|
||||
mp_int *p);
|
||||
/* 31 */
|
||||
EXTERN int TclBN_mp_mul_2(mp_int *a, mp_int *p);
|
||||
EXTERN mp_err TclBN_mp_mul_2(const mp_int *a, mp_int *p);
|
||||
/* 32 */
|
||||
EXTERN int TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p);
|
||||
EXTERN mp_err TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p);
|
||||
/* 33 */
|
||||
EXTERN int TclBN_mp_neg(const mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_neg(const mp_int *a, mp_int *b);
|
||||
/* 34 */
|
||||
EXTERN int TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_or(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 35 */
|
||||
EXTERN int TclBN_mp_radix_size(mp_int *a, int radix, int *size);
|
||||
EXTERN mp_err TclBN_mp_radix_size(const mp_int *a, int radix,
|
||||
int *size);
|
||||
/* 36 */
|
||||
EXTERN int TclBN_mp_read_radix(mp_int *a, const char *str,
|
||||
EXTERN mp_err TclBN_mp_read_radix(mp_int *a, const char *str,
|
||||
int radix);
|
||||
/* 37 */
|
||||
EXTERN void TclBN_mp_rshd(mp_int *a, int shift);
|
||||
/* 38 */
|
||||
EXTERN int TclBN_mp_shrink(mp_int *a);
|
||||
EXTERN mp_err TclBN_mp_shrink(mp_int *a);
|
||||
/* 39 */
|
||||
EXTERN void TclBN_mp_set(mp_int *a, mp_digit b);
|
||||
/* 40 */
|
||||
EXTERN int TclBN_mp_sqr(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_sqr(const mp_int *a, mp_int *b);
|
||||
/* 41 */
|
||||
EXTERN int TclBN_mp_sqrt(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_sqrt(const mp_int *a, mp_int *b);
|
||||
/* 42 */
|
||||
EXTERN int TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_sub(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 43 */
|
||||
EXTERN int TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_sub_d(const mp_int *a, mp_digit b,
|
||||
mp_int *c);
|
||||
/* 44 */
|
||||
EXTERN int TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b);
|
||||
EXTERN mp_err TclBN_mp_to_unsigned_bin(const mp_int *a,
|
||||
unsigned char *b);
|
||||
/* 45 */
|
||||
EXTERN int TclBN_mp_to_unsigned_bin_n(mp_int *a,
|
||||
EXTERN mp_err TclBN_mp_to_unsigned_bin_n(const mp_int *a,
|
||||
unsigned char *b, unsigned long *outlen);
|
||||
/* 46 */
|
||||
EXTERN int TclBN_mp_toradix_n(mp_int *a, char *str, int radix,
|
||||
int maxlen);
|
||||
EXTERN mp_err TclBN_mp_toradix_n(const mp_int *a, char *str,
|
||||
int radix, int maxlen);
|
||||
/* 47 */
|
||||
EXTERN int TclBN_mp_unsigned_bin_size(mp_int *a);
|
||||
EXTERN size_t TclBN_mp_unsigned_bin_size(const mp_int *a);
|
||||
/* 48 */
|
||||
EXTERN int TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_xor(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 49 */
|
||||
EXTERN void TclBN_mp_zero(mp_int *a);
|
||||
/* 50 */
|
||||
EXTERN void TclBN_reverse(unsigned char *s, int len);
|
||||
/* 51 */
|
||||
EXTERN int TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b,
|
||||
mp_int *c, int digs);
|
||||
EXTERN mp_err TclBN_fast_s_mp_mul_digs(const mp_int *a,
|
||||
const mp_int *b, mp_int *c, int digs);
|
||||
/* 52 */
|
||||
EXTERN int TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_fast_s_mp_sqr(const mp_int *a, mp_int *b);
|
||||
/* 53 */
|
||||
EXTERN int TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b,
|
||||
mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_karatsuba_mul(const mp_int *a,
|
||||
const mp_int *b, mp_int *c);
|
||||
/* 54 */
|
||||
EXTERN int TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_karatsuba_sqr(const mp_int *a, mp_int *b);
|
||||
/* 55 */
|
||||
EXTERN int TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_mp_toom_mul(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 56 */
|
||||
EXTERN int TclBN_mp_toom_sqr(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_mp_toom_sqr(const mp_int *a, mp_int *b);
|
||||
/* 57 */
|
||||
EXTERN int TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_s_mp_add(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 58 */
|
||||
EXTERN int TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c,
|
||||
int digs);
|
||||
EXTERN mp_err TclBN_s_mp_mul_digs(const mp_int *a, const mp_int *b,
|
||||
mp_int *c, int digs);
|
||||
/* 59 */
|
||||
EXTERN int TclBN_s_mp_sqr(mp_int *a, mp_int *b);
|
||||
EXTERN mp_err TclBN_s_mp_sqr(const mp_int *a, mp_int *b);
|
||||
/* 60 */
|
||||
EXTERN int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
|
||||
EXTERN mp_err TclBN_s_mp_sub(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 61 */
|
||||
EXTERN int TclBN_mp_init_set_int(mp_int *a, unsigned long i);
|
||||
EXTERN mp_err TclBN_mp_init_set_int(mp_int *a, unsigned long i);
|
||||
/* 62 */
|
||||
EXTERN int TclBN_mp_set_int(mp_int *a, unsigned long i);
|
||||
EXTERN mp_err TclBN_mp_set_int(mp_int *a, unsigned long i);
|
||||
/* 63 */
|
||||
EXTERN int TclBN_mp_cnt_lsb(const mp_int *a);
|
||||
/* 64 */
|
||||
EXTERN void TclBNInitBignumFromLong(mp_int *bignum, long initVal);
|
||||
EXTERN int TclBNInitBignumFromLong(mp_int *bignum, long initVal);
|
||||
/* 65 */
|
||||
EXTERN void TclBNInitBignumFromWideInt(mp_int *bignum,
|
||||
EXTERN int TclBNInitBignumFromWideInt(mp_int *bignum,
|
||||
Tcl_WideInt initVal);
|
||||
/* 66 */
|
||||
EXTERN void TclBNInitBignumFromWideUInt(mp_int *bignum,
|
||||
EXTERN int TclBNInitBignumFromWideUInt(mp_int *bignum,
|
||||
Tcl_WideUInt initVal);
|
||||
/* 67 */
|
||||
EXTERN mp_err TclBN_mp_expt_d_ex(const mp_int *a, mp_digit b,
|
||||
mp_int *c, int fast);
|
||||
/* 68 */
|
||||
EXTERN void TclBN_mp_set_ull(mp_int *a, Tcl_WideUInt i);
|
||||
/* Slot 69 is reserved */
|
||||
/* Slot 70 is reserved */
|
||||
/* Slot 71 is reserved */
|
||||
/* Slot 72 is reserved */
|
||||
/* 73 */
|
||||
EXTERN mp_err TclBN_mp_tc_and(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 74 */
|
||||
EXTERN mp_err TclBN_mp_tc_or(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 75 */
|
||||
EXTERN mp_err TclBN_mp_tc_xor(const mp_int *a, const mp_int *b,
|
||||
mp_int *c);
|
||||
/* 76 */
|
||||
EXTERN mp_err TclBN_mp_signed_rsh(const mp_int *a, int b,
|
||||
mp_int *c);
|
||||
/* Slot 77 is reserved */
|
||||
/* 78 */
|
||||
EXTERN int TclBN_mp_to_ubin(const mp_int *a, unsigned char *buf,
|
||||
size_t maxlen, size_t *written);
|
||||
/* Slot 79 is reserved */
|
||||
/* 80 */
|
||||
EXTERN int TclBN_mp_to_radix(const mp_int *a, char *str,
|
||||
size_t maxlen, size_t *written, int radix);
|
||||
|
||||
typedef struct TclTomMathStubs {
|
||||
int magic;
|
||||
@@ -294,71 +354,85 @@ typedef struct TclTomMathStubs {
|
||||
|
||||
int (*tclBN_epoch) (void); /* 0 */
|
||||
int (*tclBN_revision) (void); /* 1 */
|
||||
int (*tclBN_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 2 */
|
||||
int (*tclBN_mp_add_d) (mp_int *a, mp_digit b, mp_int *c); /* 3 */
|
||||
int (*tclBN_mp_and) (mp_int *a, mp_int *b, mp_int *c); /* 4 */
|
||||
mp_err (*tclBN_mp_add) (const mp_int *a, const mp_int *b, mp_int *c); /* 2 */
|
||||
mp_err (*tclBN_mp_add_d) (const mp_int *a, mp_digit b, mp_int *c); /* 3 */
|
||||
mp_err (*tclBN_mp_and) (const mp_int *a, const mp_int *b, mp_int *c); /* 4 */
|
||||
void (*tclBN_mp_clamp) (mp_int *a); /* 5 */
|
||||
void (*tclBN_mp_clear) (mp_int *a); /* 6 */
|
||||
void (*tclBN_mp_clear_multi) (mp_int *a, ...); /* 7 */
|
||||
int (*tclBN_mp_cmp) (const mp_int *a, const mp_int *b); /* 8 */
|
||||
int (*tclBN_mp_cmp_d) (const mp_int *a, mp_digit b); /* 9 */
|
||||
int (*tclBN_mp_cmp_mag) (const mp_int *a, const mp_int *b); /* 10 */
|
||||
int (*tclBN_mp_copy) (const mp_int *a, mp_int *b); /* 11 */
|
||||
mp_ord (*tclBN_mp_cmp) (const mp_int *a, const mp_int *b); /* 8 */
|
||||
mp_ord (*tclBN_mp_cmp_d) (const mp_int *a, mp_digit b); /* 9 */
|
||||
mp_ord (*tclBN_mp_cmp_mag) (const mp_int *a, const mp_int *b); /* 10 */
|
||||
mp_err (*tclBN_mp_copy) (const mp_int *a, mp_int *b); /* 11 */
|
||||
int (*tclBN_mp_count_bits) (const mp_int *a); /* 12 */
|
||||
int (*tclBN_mp_div) (mp_int *a, mp_int *b, mp_int *q, mp_int *r); /* 13 */
|
||||
int (*tclBN_mp_div_d) (mp_int *a, mp_digit b, mp_int *q, mp_digit *r); /* 14 */
|
||||
int (*tclBN_mp_div_2) (mp_int *a, mp_int *q); /* 15 */
|
||||
int (*tclBN_mp_div_2d) (const mp_int *a, int b, mp_int *q, mp_int *r); /* 16 */
|
||||
int (*tclBN_mp_div_3) (mp_int *a, mp_int *q, mp_digit *r); /* 17 */
|
||||
mp_err (*tclBN_mp_div) (const mp_int *a, const mp_int *b, mp_int *q, mp_int *r); /* 13 */
|
||||
mp_err (*tclBN_mp_div_d) (const mp_int *a, mp_digit b, mp_int *q, mp_digit *r); /* 14 */
|
||||
mp_err (*tclBN_mp_div_2) (const mp_int *a, mp_int *q); /* 15 */
|
||||
mp_err (*tclBN_mp_div_2d) (const mp_int *a, int b, mp_int *q, mp_int *r); /* 16 */
|
||||
mp_err (*tclBN_mp_div_3) (const mp_int *a, mp_int *q, mp_digit *r); /* 17 */
|
||||
void (*tclBN_mp_exch) (mp_int *a, mp_int *b); /* 18 */
|
||||
int (*tclBN_mp_expt_d) (mp_int *a, mp_digit b, mp_int *c); /* 19 */
|
||||
int (*tclBN_mp_grow) (mp_int *a, int size); /* 20 */
|
||||
int (*tclBN_mp_init) (mp_int *a); /* 21 */
|
||||
int (*tclBN_mp_init_copy) (mp_int *a, mp_int *b); /* 22 */
|
||||
int (*tclBN_mp_init_multi) (mp_int *a, ...); /* 23 */
|
||||
int (*tclBN_mp_init_set) (mp_int *a, mp_digit b); /* 24 */
|
||||
int (*tclBN_mp_init_size) (mp_int *a, int size); /* 25 */
|
||||
int (*tclBN_mp_lshd) (mp_int *a, int shift); /* 26 */
|
||||
int (*tclBN_mp_mod) (mp_int *a, mp_int *b, mp_int *r); /* 27 */
|
||||
int (*tclBN_mp_mod_2d) (const mp_int *a, int b, mp_int *r); /* 28 */
|
||||
int (*tclBN_mp_mul) (mp_int *a, mp_int *b, mp_int *p); /* 29 */
|
||||
int (*tclBN_mp_mul_d) (mp_int *a, mp_digit b, mp_int *p); /* 30 */
|
||||
int (*tclBN_mp_mul_2) (mp_int *a, mp_int *p); /* 31 */
|
||||
int (*tclBN_mp_mul_2d) (const mp_int *a, int d, mp_int *p); /* 32 */
|
||||
int (*tclBN_mp_neg) (const mp_int *a, mp_int *b); /* 33 */
|
||||
int (*tclBN_mp_or) (mp_int *a, mp_int *b, mp_int *c); /* 34 */
|
||||
int (*tclBN_mp_radix_size) (mp_int *a, int radix, int *size); /* 35 */
|
||||
int (*tclBN_mp_read_radix) (mp_int *a, const char *str, int radix); /* 36 */
|
||||
mp_err (*tclBN_mp_expt_d) (const mp_int *a, unsigned int b, mp_int *c); /* 19 */
|
||||
mp_err (*tclBN_mp_grow) (mp_int *a, int size); /* 20 */
|
||||
mp_err (*tclBN_mp_init) (mp_int *a); /* 21 */
|
||||
mp_err (*tclBN_mp_init_copy) (mp_int *a, const mp_int *b); /* 22 */
|
||||
mp_err (*tclBN_mp_init_multi) (mp_int *a, ...); /* 23 */
|
||||
mp_err (*tclBN_mp_init_set) (mp_int *a, mp_digit b); /* 24 */
|
||||
mp_err (*tclBN_mp_init_size) (mp_int *a, int size); /* 25 */
|
||||
mp_err (*tclBN_mp_lshd) (mp_int *a, int shift); /* 26 */
|
||||
mp_err (*tclBN_mp_mod) (const mp_int *a, const mp_int *b, mp_int *r); /* 27 */
|
||||
mp_err (*tclBN_mp_mod_2d) (const mp_int *a, int b, mp_int *r); /* 28 */
|
||||
mp_err (*tclBN_mp_mul) (const mp_int *a, const mp_int *b, mp_int *p); /* 29 */
|
||||
mp_err (*tclBN_mp_mul_d) (const mp_int *a, mp_digit b, mp_int *p); /* 30 */
|
||||
mp_err (*tclBN_mp_mul_2) (const mp_int *a, mp_int *p); /* 31 */
|
||||
mp_err (*tclBN_mp_mul_2d) (const mp_int *a, int d, mp_int *p); /* 32 */
|
||||
mp_err (*tclBN_mp_neg) (const mp_int *a, mp_int *b); /* 33 */
|
||||
mp_err (*tclBN_mp_or) (const mp_int *a, const mp_int *b, mp_int *c); /* 34 */
|
||||
mp_err (*tclBN_mp_radix_size) (const mp_int *a, int radix, int *size); /* 35 */
|
||||
mp_err (*tclBN_mp_read_radix) (mp_int *a, const char *str, int radix); /* 36 */
|
||||
void (*tclBN_mp_rshd) (mp_int *a, int shift); /* 37 */
|
||||
int (*tclBN_mp_shrink) (mp_int *a); /* 38 */
|
||||
mp_err (*tclBN_mp_shrink) (mp_int *a); /* 38 */
|
||||
void (*tclBN_mp_set) (mp_int *a, mp_digit b); /* 39 */
|
||||
int (*tclBN_mp_sqr) (mp_int *a, mp_int *b); /* 40 */
|
||||
int (*tclBN_mp_sqrt) (mp_int *a, mp_int *b); /* 41 */
|
||||
int (*tclBN_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 42 */
|
||||
int (*tclBN_mp_sub_d) (mp_int *a, mp_digit b, mp_int *c); /* 43 */
|
||||
int (*tclBN_mp_to_unsigned_bin) (mp_int *a, unsigned char *b); /* 44 */
|
||||
int (*tclBN_mp_to_unsigned_bin_n) (mp_int *a, unsigned char *b, unsigned long *outlen); /* 45 */
|
||||
int (*tclBN_mp_toradix_n) (mp_int *a, char *str, int radix, int maxlen); /* 46 */
|
||||
int (*tclBN_mp_unsigned_bin_size) (mp_int *a); /* 47 */
|
||||
int (*tclBN_mp_xor) (mp_int *a, mp_int *b, mp_int *c); /* 48 */
|
||||
mp_err (*tclBN_mp_sqr) (const mp_int *a, mp_int *b); /* 40 */
|
||||
mp_err (*tclBN_mp_sqrt) (const mp_int *a, mp_int *b); /* 41 */
|
||||
mp_err (*tclBN_mp_sub) (const mp_int *a, const mp_int *b, mp_int *c); /* 42 */
|
||||
mp_err (*tclBN_mp_sub_d) (const mp_int *a, mp_digit b, mp_int *c); /* 43 */
|
||||
mp_err (*tclBN_mp_to_unsigned_bin) (const mp_int *a, unsigned char *b); /* 44 */
|
||||
mp_err (*tclBN_mp_to_unsigned_bin_n) (const mp_int *a, unsigned char *b, unsigned long *outlen); /* 45 */
|
||||
mp_err (*tclBN_mp_toradix_n) (const mp_int *a, char *str, int radix, int maxlen); /* 46 */
|
||||
size_t (*tclBN_mp_unsigned_bin_size) (const mp_int *a); /* 47 */
|
||||
mp_err (*tclBN_mp_xor) (const mp_int *a, const mp_int *b, mp_int *c); /* 48 */
|
||||
void (*tclBN_mp_zero) (mp_int *a); /* 49 */
|
||||
void (*tclBN_reverse) (unsigned char *s, int len); /* 50 */
|
||||
int (*tclBN_fast_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 51 */
|
||||
int (*tclBN_fast_s_mp_sqr) (mp_int *a, mp_int *b); /* 52 */
|
||||
int (*tclBN_mp_karatsuba_mul) (mp_int *a, mp_int *b, mp_int *c); /* 53 */
|
||||
int (*tclBN_mp_karatsuba_sqr) (mp_int *a, mp_int *b); /* 54 */
|
||||
int (*tclBN_mp_toom_mul) (mp_int *a, mp_int *b, mp_int *c); /* 55 */
|
||||
int (*tclBN_mp_toom_sqr) (mp_int *a, mp_int *b); /* 56 */
|
||||
int (*tclBN_s_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 57 */
|
||||
int (*tclBN_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 58 */
|
||||
int (*tclBN_s_mp_sqr) (mp_int *a, mp_int *b); /* 59 */
|
||||
int (*tclBN_s_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 60 */
|
||||
int (*tclBN_mp_init_set_int) (mp_int *a, unsigned long i); /* 61 */
|
||||
int (*tclBN_mp_set_int) (mp_int *a, unsigned long i); /* 62 */
|
||||
mp_err (*tclBN_fast_s_mp_mul_digs) (const mp_int *a, const mp_int *b, mp_int *c, int digs); /* 51 */
|
||||
mp_err (*tclBN_fast_s_mp_sqr) (const mp_int *a, mp_int *b); /* 52 */
|
||||
mp_err (*tclBN_mp_karatsuba_mul) (const mp_int *a, const mp_int *b, mp_int *c); /* 53 */
|
||||
mp_err (*tclBN_mp_karatsuba_sqr) (const mp_int *a, mp_int *b); /* 54 */
|
||||
mp_err (*tclBN_mp_toom_mul) (const mp_int *a, const mp_int *b, mp_int *c); /* 55 */
|
||||
mp_err (*tclBN_mp_toom_sqr) (const mp_int *a, mp_int *b); /* 56 */
|
||||
mp_err (*tclBN_s_mp_add) (const mp_int *a, const mp_int *b, mp_int *c); /* 57 */
|
||||
mp_err (*tclBN_s_mp_mul_digs) (const mp_int *a, const mp_int *b, mp_int *c, int digs); /* 58 */
|
||||
mp_err (*tclBN_s_mp_sqr) (const mp_int *a, mp_int *b); /* 59 */
|
||||
mp_err (*tclBN_s_mp_sub) (const mp_int *a, const mp_int *b, mp_int *c); /* 60 */
|
||||
mp_err (*tclBN_mp_init_set_int) (mp_int *a, unsigned long i); /* 61 */
|
||||
mp_err (*tclBN_mp_set_int) (mp_int *a, unsigned long i); /* 62 */
|
||||
int (*tclBN_mp_cnt_lsb) (const mp_int *a); /* 63 */
|
||||
void (*tclBNInitBignumFromLong) (mp_int *bignum, long initVal); /* 64 */
|
||||
void (*tclBNInitBignumFromWideInt) (mp_int *bignum, Tcl_WideInt initVal); /* 65 */
|
||||
void (*tclBNInitBignumFromWideUInt) (mp_int *bignum, Tcl_WideUInt initVal); /* 66 */
|
||||
int (*tclBNInitBignumFromLong) (mp_int *bignum, long initVal); /* 64 */
|
||||
int (*tclBNInitBignumFromWideInt) (mp_int *bignum, Tcl_WideInt initVal); /* 65 */
|
||||
int (*tclBNInitBignumFromWideUInt) (mp_int *bignum, Tcl_WideUInt initVal); /* 66 */
|
||||
mp_err (*tclBN_mp_expt_d_ex) (const mp_int *a, mp_digit b, mp_int *c, int fast); /* 67 */
|
||||
void (*tclBN_mp_set_ull) (mp_int *a, Tcl_WideUInt i); /* 68 */
|
||||
void (*reserved69)(void);
|
||||
void (*reserved70)(void);
|
||||
void (*reserved71)(void);
|
||||
void (*reserved72)(void);
|
||||
mp_err (*tclBN_mp_tc_and) (const mp_int *a, const mp_int *b, mp_int *c); /* 73 */
|
||||
mp_err (*tclBN_mp_tc_or) (const mp_int *a, const mp_int *b, mp_int *c); /* 74 */
|
||||
mp_err (*tclBN_mp_tc_xor) (const mp_int *a, const mp_int *b, mp_int *c); /* 75 */
|
||||
mp_err (*tclBN_mp_signed_rsh) (const mp_int *a, int b, mp_int *c); /* 76 */
|
||||
void (*reserved77)(void);
|
||||
int (*tclBN_mp_to_ubin) (const mp_int *a, unsigned char *buf, size_t maxlen, size_t *written); /* 78 */
|
||||
void (*reserved79)(void);
|
||||
int (*tclBN_mp_to_radix) (const mp_int *a, char *str, size_t maxlen, size_t *written, int radix); /* 80 */
|
||||
} TclTomMathStubs;
|
||||
|
||||
extern const TclTomMathStubs *tclTomMathStubsPtr;
|
||||
@@ -507,6 +581,28 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
|
||||
(tclTomMathStubsPtr->tclBNInitBignumFromWideInt) /* 65 */
|
||||
#define TclBNInitBignumFromWideUInt \
|
||||
(tclTomMathStubsPtr->tclBNInitBignumFromWideUInt) /* 66 */
|
||||
#define TclBN_mp_expt_d_ex \
|
||||
(tclTomMathStubsPtr->tclBN_mp_expt_d_ex) /* 67 */
|
||||
#define TclBN_mp_set_ull \
|
||||
(tclTomMathStubsPtr->tclBN_mp_set_ull) /* 68 */
|
||||
/* Slot 69 is reserved */
|
||||
/* Slot 70 is reserved */
|
||||
/* Slot 71 is reserved */
|
||||
/* Slot 72 is reserved */
|
||||
#define TclBN_mp_tc_and \
|
||||
(tclTomMathStubsPtr->tclBN_mp_tc_and) /* 73 */
|
||||
#define TclBN_mp_tc_or \
|
||||
(tclTomMathStubsPtr->tclBN_mp_tc_or) /* 74 */
|
||||
#define TclBN_mp_tc_xor \
|
||||
(tclTomMathStubsPtr->tclBN_mp_tc_xor) /* 75 */
|
||||
#define TclBN_mp_signed_rsh \
|
||||
(tclTomMathStubsPtr->tclBN_mp_signed_rsh) /* 76 */
|
||||
/* Slot 77 is reserved */
|
||||
#define TclBN_mp_to_ubin \
|
||||
(tclTomMathStubsPtr->tclBN_mp_to_ubin) /* 78 */
|
||||
/* Slot 79 is reserved */
|
||||
#define TclBN_mp_to_radix \
|
||||
(tclTomMathStubsPtr->tclBN_mp_to_radix) /* 80 */
|
||||
|
||||
#endif /* defined(USE_TCL_STUBS) */
|
||||
|
||||
@@ -515,4 +611,50 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
|
||||
#undef TCL_STORAGE_CLASS
|
||||
#define TCL_STORAGE_CLASS DLLIMPORT
|
||||
|
||||
#ifdef USE_TCL_STUBS
|
||||
#undef TclBNInitBignumFromLong
|
||||
#define TclBNInitBignumFromLong(a,b) \
|
||||
do { \
|
||||
(a)->dp = NULL; \
|
||||
(void)tclTomMathStubsPtr->tclBNInitBignumFromLong((a),(b)); \
|
||||
if ((a)->dp == NULL) { \
|
||||
Tcl_Panic("initialization failure in TclBNInitBignumFromLong"); \
|
||||
} \
|
||||
} while (0)
|
||||
#undef TclBNInitBignumFromWideInt
|
||||
#define TclBNInitBignumFromWideInt(a,b) \
|
||||
do { \
|
||||
(a)->dp = NULL; \
|
||||
(void)tclTomMathStubsPtr->tclBNInitBignumFromWideInt((a),(b)); \
|
||||
if ((a)->dp == NULL) { \
|
||||
Tcl_Panic("initialization failure in TclBNInitBignumFromWideInt"); \
|
||||
} \
|
||||
} while (0)
|
||||
#undef TclBNInitBignumFromWideUInt
|
||||
#define TclBNInitBignumFromWideUInt(a,b) \
|
||||
do { \
|
||||
(a)->dp = NULL; \
|
||||
(void)tclTomMathStubsPtr->tclBNInitBignumFromWideUInt((a),(b)); \
|
||||
if ((a)->dp == NULL) { \
|
||||
Tcl_Panic("initialization failure in TclBNInitBignumFromWideUInt"); \
|
||||
} \
|
||||
} while (0)
|
||||
#define mp_init_i32(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromLong((a),(int32_t)(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_l(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromLong((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_ll(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromWideInt((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_i64(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromWideInt((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_u32(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromWideUInt((a),(uint32_t)(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_ul(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromWideUInt((a),(unsigned long)(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_ull(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromWideUInt((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_u64(a,b) (((a)->dp=NULL,tclTomMathStubsPtr->tclBNInitBignumFromWideUInt((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#else
|
||||
#define mp_init_i32(a,b) (((a)->dp=NULL,(TclBNInitBignumFromLong)((a),(int32_t)(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_l(a,b) (((a)->dp=NULL,(TclBNInitBignumFromLong)((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_ll(a,b) (((a)->dp=NULL,(TclBNInitBignumFromWideInt)((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_i64(a,b) (((a)->dp=NULL,(TclBNInitBignumFromWideInt)((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_u32(a,b) (((a)->dp=NULL,(TclBNInitBignumFromWideUInt)((a),(uint32_t)(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_ul(a,b) (((a)->dp=NULL,(TclBNInitBignumFromWideUInt)((a),(unsigned long)(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_ull(a,b) (((a)->dp=NULL,(TclBNInitBignumFromWideUInt)((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#define mp_init_u64(a,b) (((a)->dp=NULL,(TclBNInitBignumFromWideUInt)((a),(b)),(a)->dp)?MP_OKAY:MP_ERR)
|
||||
#endif /* USE_TCL_STUBS */
|
||||
#endif /* _TCLINTDECLS */
|
||||
|
||||
@@ -75,10 +75,10 @@ extern "C" {
|
||||
#define TK_MAJOR_VERSION 8
|
||||
#define TK_MINOR_VERSION 6
|
||||
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
|
||||
#define TK_RELEASE_SERIAL 9
|
||||
#define TK_RELEASE_SERIAL 10
|
||||
|
||||
#define TK_VERSION "8.6"
|
||||
#define TK_PATCH_LEVEL "8.6.9"
|
||||
#define TK_PATCH_LEVEL "8.6.10"
|
||||
|
||||
/*
|
||||
* A special definition used to allow this header file to be included from
|
||||
@@ -92,13 +92,14 @@ extern "C" {
|
||||
|
||||
#ifndef RC_INVOKED
|
||||
|
||||
#ifndef _XLIB_H
|
||||
#if !defined(_XLIB_H) && !defined(_X11_XLIB_H_)
|
||||
# include <X11/Xlib.h>
|
||||
# ifdef MAC_OSX_TK
|
||||
# include <X11/X.h>
|
||||
# endif
|
||||
#endif
|
||||
#ifdef __STDC__
|
||||
#if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \
|
||||
|| defined(__cplusplus) || defined(_MSC_VER) || defined(__ICC)
|
||||
# include <stddef.h>
|
||||
#endif
|
||||
|
||||
@@ -266,10 +267,10 @@ typedef struct Tk_ObjCustomOption {
|
||||
* Computes number of bytes from beginning of structure to a given field.
|
||||
*/
|
||||
|
||||
#ifdef offsetof
|
||||
#define Tk_Offset(type, field) ((int) offsetof(type, field))
|
||||
#else
|
||||
#define Tk_Offset(type, field) ((int) ((char *) &((type *) 0)->field))
|
||||
/* Workaround for platforms missing offsetof(), e.g. VC++ 6.0 */
|
||||
#ifndef offsetof
|
||||
# define offsetof(type, field) ((size_t) ((char *) &((type *) 0)->field))
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -676,7 +677,7 @@ typedef struct {
|
||||
* request. */
|
||||
Display *display; /* Display the event was read from. */
|
||||
Window event; /* Window on which event was requested. */
|
||||
Window root; /* Root window that the event occured on. */
|
||||
Window root; /* Root window that the event occurred on. */
|
||||
Window subwindow; /* Child window. */
|
||||
Time time; /* Milliseconds. */
|
||||
int x, y; /* Pointer x, y coordinates in event
|
||||
@@ -813,10 +814,11 @@ typedef struct Tk_FakeWin {
|
||||
int internalBorderBottom;
|
||||
int minReqWidth;
|
||||
int minReqHeight;
|
||||
char *dummy20; /* geometryMaster */
|
||||
#ifdef TK_USE_INPUT_METHODS
|
||||
int dummy21;
|
||||
int dummy20;
|
||||
#endif /* TK_USE_INPUT_METHODS */
|
||||
char *dummy21; /* geomMgrName */
|
||||
Tk_Window dummy22; /* maintainerPtr */
|
||||
} Tk_FakeWin;
|
||||
|
||||
/*
|
||||
|
||||
@@ -450,21 +450,21 @@ EXTERN Status XAllocColor(Display *d, Colormap c, XColor *xp);
|
||||
/* 13 */
|
||||
EXTERN int XBell(Display *d, int i);
|
||||
/* 14 */
|
||||
EXTERN void XChangeProperty(Display *d, Window w, Atom a1,
|
||||
EXTERN int XChangeProperty(Display *d, Window w, Atom a1,
|
||||
Atom a2, int i1, int i2,
|
||||
_Xconst unsigned char *c, int i3);
|
||||
/* 15 */
|
||||
EXTERN void XChangeWindowAttributes(Display *d, Window w,
|
||||
EXTERN int XChangeWindowAttributes(Display *d, Window w,
|
||||
unsigned long ul, XSetWindowAttributes *x);
|
||||
/* 16 */
|
||||
EXTERN void XConfigureWindow(Display *d, Window w,
|
||||
EXTERN int XConfigureWindow(Display *d, Window w,
|
||||
unsigned int i, XWindowChanges *x);
|
||||
/* 17 */
|
||||
EXTERN void XCopyArea(Display *d, Drawable dr1, Drawable dr2,
|
||||
EXTERN int XCopyArea(Display *d, Drawable dr1, Drawable dr2,
|
||||
GC g, int i1, int i2, unsigned int ui1,
|
||||
unsigned int ui2, int i3, int i4);
|
||||
/* 18 */
|
||||
EXTERN void XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
|
||||
EXTERN int XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
|
||||
GC g, int i1, int i2, unsigned int ui1,
|
||||
unsigned int ui2, int i3, int i4,
|
||||
unsigned long ul);
|
||||
@@ -475,23 +475,23 @@ EXTERN Pixmap XCreateBitmapFromData(Display *display, Drawable d,
|
||||
/* 20 */
|
||||
EXTERN int XDefineCursor(Display *d, Window w, Cursor c);
|
||||
/* 21 */
|
||||
EXTERN void XDestroyWindow(Display *d, Window w);
|
||||
EXTERN int XDestroyWindow(Display *d, Window w);
|
||||
/* 22 */
|
||||
EXTERN void XDrawArc(Display *d, Drawable dr, GC g, int i1,
|
||||
EXTERN int XDrawArc(Display *d, Drawable dr, GC g, int i1,
|
||||
int i2, unsigned int ui1, unsigned int ui2,
|
||||
int i3, int i4);
|
||||
/* 23 */
|
||||
EXTERN int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
|
||||
int i1, int i2);
|
||||
/* 24 */
|
||||
EXTERN void XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
|
||||
EXTERN int XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
|
||||
int i2, unsigned int ui1, unsigned int ui2);
|
||||
/* 25 */
|
||||
EXTERN void XFillArc(Display *d, Drawable dr, GC g, int i1,
|
||||
EXTERN int XFillArc(Display *d, Drawable dr, GC g, int i1,
|
||||
int i2, unsigned int ui1, unsigned int ui2,
|
||||
int i3, int i4);
|
||||
/* 26 */
|
||||
EXTERN void XFillPolygon(Display *d, Drawable dr, GC g,
|
||||
EXTERN int XFillPolygon(Display *d, Drawable dr, GC g,
|
||||
XPoint *x, int i1, int i2, int i3);
|
||||
/* 27 */
|
||||
EXTERN int XFillRectangles(Display *d, Drawable dr, GC g,
|
||||
@@ -523,58 +523,58 @@ EXTERN int XGrabPointer(Display *d, Window w1, Bool b,
|
||||
/* 35 */
|
||||
EXTERN KeyCode XKeysymToKeycode(Display *d, KeySym k);
|
||||
/* 36 */
|
||||
EXTERN void XMapWindow(Display *d, Window w);
|
||||
EXTERN int XMapWindow(Display *d, Window w);
|
||||
/* 37 */
|
||||
EXTERN void XMoveResizeWindow(Display *d, Window w, int i1,
|
||||
EXTERN int XMoveResizeWindow(Display *d, Window w, int i1,
|
||||
int i2, unsigned int ui1, unsigned int ui2);
|
||||
/* 38 */
|
||||
EXTERN void XMoveWindow(Display *d, Window w, int i1, int i2);
|
||||
EXTERN int XMoveWindow(Display *d, Window w, int i1, int i2);
|
||||
/* 39 */
|
||||
EXTERN Bool XQueryPointer(Display *d, Window w1, Window *w2,
|
||||
Window *w3, int *i1, int *i2, int *i3,
|
||||
int *i4, unsigned int *ui);
|
||||
/* 40 */
|
||||
EXTERN void XRaiseWindow(Display *d, Window w);
|
||||
EXTERN int XRaiseWindow(Display *d, Window w);
|
||||
/* 41 */
|
||||
EXTERN void XRefreshKeyboardMapping(XMappingEvent *x);
|
||||
EXTERN int XRefreshKeyboardMapping(XMappingEvent *x);
|
||||
/* 42 */
|
||||
EXTERN void XResizeWindow(Display *d, Window w, unsigned int ui1,
|
||||
EXTERN int XResizeWindow(Display *d, Window w, unsigned int ui1,
|
||||
unsigned int ui2);
|
||||
/* 43 */
|
||||
EXTERN void XSelectInput(Display *d, Window w, long l);
|
||||
EXTERN int XSelectInput(Display *d, Window w, long l);
|
||||
/* 44 */
|
||||
EXTERN Status XSendEvent(Display *d, Window w, Bool b, long l,
|
||||
XEvent *x);
|
||||
/* 45 */
|
||||
EXTERN void XSetIconName(Display *d, Window w, _Xconst char *c);
|
||||
EXTERN int XSetIconName(Display *d, Window w, _Xconst char *c);
|
||||
/* 46 */
|
||||
EXTERN void XSetInputFocus(Display *d, Window w, int i, Time t);
|
||||
EXTERN int XSetInputFocus(Display *d, Window w, int i, Time t);
|
||||
/* 47 */
|
||||
EXTERN int XSetSelectionOwner(Display *d, Atom a, Window w,
|
||||
Time t);
|
||||
/* 48 */
|
||||
EXTERN void XSetWindowBackground(Display *d, Window w,
|
||||
EXTERN int XSetWindowBackground(Display *d, Window w,
|
||||
unsigned long ul);
|
||||
/* 49 */
|
||||
EXTERN void XSetWindowBackgroundPixmap(Display *d, Window w,
|
||||
EXTERN int XSetWindowBackgroundPixmap(Display *d, Window w,
|
||||
Pixmap p);
|
||||
/* 50 */
|
||||
EXTERN void XSetWindowBorder(Display *d, Window w,
|
||||
EXTERN int XSetWindowBorder(Display *d, Window w,
|
||||
unsigned long ul);
|
||||
/* 51 */
|
||||
EXTERN void XSetWindowBorderPixmap(Display *d, Window w,
|
||||
EXTERN int XSetWindowBorderPixmap(Display *d, Window w,
|
||||
Pixmap p);
|
||||
/* 52 */
|
||||
EXTERN void XSetWindowBorderWidth(Display *d, Window w,
|
||||
EXTERN int XSetWindowBorderWidth(Display *d, Window w,
|
||||
unsigned int ui);
|
||||
/* 53 */
|
||||
EXTERN void XSetWindowColormap(Display *d, Window w, Colormap c);
|
||||
EXTERN int XSetWindowColormap(Display *d, Window w, Colormap c);
|
||||
/* 54 */
|
||||
EXTERN void XUngrabKeyboard(Display *d, Time t);
|
||||
EXTERN int XUngrabKeyboard(Display *d, Time t);
|
||||
/* 55 */
|
||||
EXTERN int XUngrabPointer(Display *d, Time t);
|
||||
/* 56 */
|
||||
EXTERN void XUnmapWindow(Display *d, Window w);
|
||||
EXTERN int XUnmapWindow(Display *d, Window w);
|
||||
/* 57 */
|
||||
EXTERN int TkPutImage(unsigned long *colors, int ncolors,
|
||||
Display *display, Drawable d, GC gc,
|
||||
@@ -629,7 +629,7 @@ EXTERN int XSetLineAttributes(Display *display, GC gc,
|
||||
/* 75 */
|
||||
EXTERN int _XInitImageFuncPtrs(XImage *image);
|
||||
/* 76 */
|
||||
EXTERN XIC XCreateIC(void);
|
||||
EXTERN XIC XCreateIC(XIM xim, ...);
|
||||
/* 77 */
|
||||
EXTERN XVisualInfo * XGetVisualInfo(Display *display, long vinfo_mask,
|
||||
XVisualInfo *vinfo_template,
|
||||
@@ -644,7 +644,7 @@ EXTERN Status XStringListToTextProperty(char **list, int count,
|
||||
EXTERN int XDrawSegments(Display *display, Drawable d, GC gc,
|
||||
XSegment *segments, int nsegments);
|
||||
/* 81 */
|
||||
EXTERN void XForceScreenSaver(Display *display, int mode);
|
||||
EXTERN int XForceScreenSaver(Display *display, int mode);
|
||||
/* 82 */
|
||||
EXTERN int XDrawLine(Display *d, Drawable dr, GC g, int x1,
|
||||
int y1, int x2, int y2);
|
||||
@@ -653,7 +653,7 @@ EXTERN int XFillRectangle(Display *display, Drawable d, GC gc,
|
||||
int x, int y, unsigned int width,
|
||||
unsigned int height);
|
||||
/* 84 */
|
||||
EXTERN void XClearWindow(Display *d, Window w);
|
||||
EXTERN int XClearWindow(Display *d, Window w);
|
||||
/* 85 */
|
||||
EXTERN int XDrawPoint(Display *display, Drawable d, GC gc,
|
||||
int x, int y);
|
||||
@@ -667,16 +667,72 @@ EXTERN int XWarpPointer(Display *display, Window src_w,
|
||||
unsigned int src_height, int dest_x,
|
||||
int dest_y);
|
||||
/* 88 */
|
||||
EXTERN void XQueryColor(Display *display, Colormap colormap,
|
||||
EXTERN int XQueryColor(Display *display, Colormap colormap,
|
||||
XColor *def_in_out);
|
||||
/* 89 */
|
||||
EXTERN void XQueryColors(Display *display, Colormap colormap,
|
||||
EXTERN int XQueryColors(Display *display, Colormap colormap,
|
||||
XColor *defs_in_out, int ncolors);
|
||||
/* 90 */
|
||||
EXTERN Status XQueryTree(Display *d, Window w1, Window *w2,
|
||||
Window *w3, Window **w4, unsigned int *ui);
|
||||
/* 91 */
|
||||
EXTERN int XSync(Display *display, Bool flag);
|
||||
EXTERN int XSync(Display *display, Bool discard);
|
||||
/* Slot 92 is reserved */
|
||||
/* Slot 93 is reserved */
|
||||
/* Slot 94 is reserved */
|
||||
/* Slot 95 is reserved */
|
||||
/* Slot 96 is reserved */
|
||||
/* Slot 97 is reserved */
|
||||
/* Slot 98 is reserved */
|
||||
/* Slot 99 is reserved */
|
||||
/* Slot 100 is reserved */
|
||||
/* Slot 101 is reserved */
|
||||
/* Slot 102 is reserved */
|
||||
/* Slot 103 is reserved */
|
||||
/* Slot 104 is reserved */
|
||||
/* Slot 105 is reserved */
|
||||
/* Slot 106 is reserved */
|
||||
/* 107 */
|
||||
EXTERN int XFlush(Display *display);
|
||||
/* 108 */
|
||||
EXTERN int XGrabServer(Display *display);
|
||||
/* 109 */
|
||||
EXTERN int XUngrabServer(Display *display);
|
||||
/* 110 */
|
||||
EXTERN int XFree(void *data);
|
||||
/* 111 */
|
||||
EXTERN int XNoOp(Display *display);
|
||||
/* 112 */
|
||||
EXTERN XAfterFunction XSynchronize(Display *display, Bool onoff);
|
||||
/* Slot 113 is reserved */
|
||||
/* 114 */
|
||||
EXTERN VisualID XVisualIDFromVisual(Visual *visual);
|
||||
/* Slot 115 is reserved */
|
||||
/* Slot 116 is reserved */
|
||||
/* Slot 117 is reserved */
|
||||
/* Slot 118 is reserved */
|
||||
/* Slot 119 is reserved */
|
||||
/* Slot 120 is reserved */
|
||||
/* Slot 121 is reserved */
|
||||
/* Slot 122 is reserved */
|
||||
/* Slot 123 is reserved */
|
||||
/* Slot 124 is reserved */
|
||||
/* Slot 125 is reserved */
|
||||
/* Slot 126 is reserved */
|
||||
/* Slot 127 is reserved */
|
||||
/* Slot 128 is reserved */
|
||||
/* Slot 129 is reserved */
|
||||
/* Slot 130 is reserved */
|
||||
/* Slot 131 is reserved */
|
||||
/* Slot 132 is reserved */
|
||||
/* Slot 133 is reserved */
|
||||
/* Slot 134 is reserved */
|
||||
/* Slot 135 is reserved */
|
||||
/* Slot 136 is reserved */
|
||||
/* 137 */
|
||||
EXTERN int XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
|
||||
int sx, int sy, int dx, int dy,
|
||||
unsigned int w, unsigned int h);
|
||||
#endif /* AQUA */
|
||||
|
||||
typedef struct TkIntXlibStubs {
|
||||
@@ -838,19 +894,19 @@ typedef struct TkIntXlibStubs {
|
||||
XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */
|
||||
Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */
|
||||
int (*xBell) (Display *d, int i); /* 13 */
|
||||
void (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */
|
||||
void (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */
|
||||
void (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */
|
||||
void (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */
|
||||
void (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 18 */
|
||||
int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */
|
||||
int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */
|
||||
int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */
|
||||
int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */
|
||||
int (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 18 */
|
||||
Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 19 */
|
||||
int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */
|
||||
void (*xDestroyWindow) (Display *d, Window w); /* 21 */
|
||||
void (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */
|
||||
int (*xDestroyWindow) (Display *d, Window w); /* 21 */
|
||||
int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */
|
||||
int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */
|
||||
void (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */
|
||||
void (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */
|
||||
void (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */
|
||||
int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */
|
||||
int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */
|
||||
int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */
|
||||
int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */
|
||||
int (*xFreeColormap) (Display *d, Colormap c); /* 28 */
|
||||
int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */
|
||||
@@ -860,27 +916,27 @@ typedef struct TkIntXlibStubs {
|
||||
int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 33 */
|
||||
int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 34 */
|
||||
KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 35 */
|
||||
void (*xMapWindow) (Display *d, Window w); /* 36 */
|
||||
void (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */
|
||||
void (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */
|
||||
int (*xMapWindow) (Display *d, Window w); /* 36 */
|
||||
int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */
|
||||
int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */
|
||||
Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 39 */
|
||||
void (*xRaiseWindow) (Display *d, Window w); /* 40 */
|
||||
void (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */
|
||||
void (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */
|
||||
void (*xSelectInput) (Display *d, Window w, long l); /* 43 */
|
||||
int (*xRaiseWindow) (Display *d, Window w); /* 40 */
|
||||
int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */
|
||||
int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */
|
||||
int (*xSelectInput) (Display *d, Window w, long l); /* 43 */
|
||||
Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */
|
||||
void (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */
|
||||
void (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */
|
||||
int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */
|
||||
int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */
|
||||
int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */
|
||||
void (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */
|
||||
void (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */
|
||||
void (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */
|
||||
void (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */
|
||||
void (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */
|
||||
void (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */
|
||||
void (*xUngrabKeyboard) (Display *d, Time t); /* 54 */
|
||||
int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */
|
||||
int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */
|
||||
int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */
|
||||
int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */
|
||||
int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */
|
||||
int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */
|
||||
int (*xUngrabKeyboard) (Display *d, Time t); /* 54 */
|
||||
int (*xUngrabPointer) (Display *d, Time t); /* 55 */
|
||||
void (*xUnmapWindow) (Display *d, Window w); /* 56 */
|
||||
int (*xUnmapWindow) (Display *d, Window w); /* 56 */
|
||||
int (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 57 */
|
||||
Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 58 */
|
||||
GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 59 */
|
||||
@@ -900,22 +956,68 @@ typedef struct TkIntXlibStubs {
|
||||
int (*xSetFunction) (Display *display, GC gc, int function); /* 73 */
|
||||
int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */
|
||||
int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */
|
||||
XIC (*xCreateIC) (void); /* 76 */
|
||||
XIC (*xCreateIC) (XIM xim, ...); /* 76 */
|
||||
XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */
|
||||
void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */
|
||||
Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */
|
||||
int (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */
|
||||
void (*xForceScreenSaver) (Display *display, int mode); /* 81 */
|
||||
int (*xForceScreenSaver) (Display *display, int mode); /* 81 */
|
||||
int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */
|
||||
int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */
|
||||
void (*xClearWindow) (Display *d, Window w); /* 84 */
|
||||
int (*xClearWindow) (Display *d, Window w); /* 84 */
|
||||
int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */
|
||||
int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */
|
||||
int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */
|
||||
void (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
|
||||
void (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */
|
||||
int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
|
||||
int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */
|
||||
Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */
|
||||
int (*xSync) (Display *display, Bool flag); /* 91 */
|
||||
int (*xSync) (Display *display, Bool discard); /* 91 */
|
||||
void (*reserved92)(void);
|
||||
void (*reserved93)(void);
|
||||
void (*reserved94)(void);
|
||||
void (*reserved95)(void);
|
||||
void (*reserved96)(void);
|
||||
void (*reserved97)(void);
|
||||
void (*reserved98)(void);
|
||||
void (*reserved99)(void);
|
||||
void (*reserved100)(void);
|
||||
void (*reserved101)(void);
|
||||
void (*reserved102)(void);
|
||||
void (*reserved103)(void);
|
||||
void (*reserved104)(void);
|
||||
void (*reserved105)(void);
|
||||
void (*reserved106)(void);
|
||||
int (*xFlush) (Display *display); /* 107 */
|
||||
int (*xGrabServer) (Display *display); /* 108 */
|
||||
int (*xUngrabServer) (Display *display); /* 109 */
|
||||
int (*xFree) (void *data); /* 110 */
|
||||
int (*xNoOp) (Display *display); /* 111 */
|
||||
XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
|
||||
void (*reserved113)(void);
|
||||
VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
|
||||
void (*reserved115)(void);
|
||||
void (*reserved116)(void);
|
||||
void (*reserved117)(void);
|
||||
void (*reserved118)(void);
|
||||
void (*reserved119)(void);
|
||||
void (*reserved120)(void);
|
||||
void (*reserved121)(void);
|
||||
void (*reserved122)(void);
|
||||
void (*reserved123)(void);
|
||||
void (*reserved124)(void);
|
||||
void (*reserved125)(void);
|
||||
void (*reserved126)(void);
|
||||
void (*reserved127)(void);
|
||||
void (*reserved128)(void);
|
||||
void (*reserved129)(void);
|
||||
void (*reserved130)(void);
|
||||
void (*reserved131)(void);
|
||||
void (*reserved132)(void);
|
||||
void (*reserved133)(void);
|
||||
void (*reserved134)(void);
|
||||
void (*reserved135)(void);
|
||||
void (*reserved136)(void);
|
||||
int (*xPutImage) (Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 137 */
|
||||
#endif /* AQUA */
|
||||
} TkIntXlibStubs;
|
||||
|
||||
@@ -1382,6 +1484,60 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
|
||||
(tkIntXlibStubsPtr->xQueryTree) /* 90 */
|
||||
#define XSync \
|
||||
(tkIntXlibStubsPtr->xSync) /* 91 */
|
||||
/* Slot 92 is reserved */
|
||||
/* Slot 93 is reserved */
|
||||
/* Slot 94 is reserved */
|
||||
/* Slot 95 is reserved */
|
||||
/* Slot 96 is reserved */
|
||||
/* Slot 97 is reserved */
|
||||
/* Slot 98 is reserved */
|
||||
/* Slot 99 is reserved */
|
||||
/* Slot 100 is reserved */
|
||||
/* Slot 101 is reserved */
|
||||
/* Slot 102 is reserved */
|
||||
/* Slot 103 is reserved */
|
||||
/* Slot 104 is reserved */
|
||||
/* Slot 105 is reserved */
|
||||
/* Slot 106 is reserved */
|
||||
#define XFlush \
|
||||
(tkIntXlibStubsPtr->xFlush) /* 107 */
|
||||
#define XGrabServer \
|
||||
(tkIntXlibStubsPtr->xGrabServer) /* 108 */
|
||||
#define XUngrabServer \
|
||||
(tkIntXlibStubsPtr->xUngrabServer) /* 109 */
|
||||
#define XFree \
|
||||
(tkIntXlibStubsPtr->xFree) /* 110 */
|
||||
#define XNoOp \
|
||||
(tkIntXlibStubsPtr->xNoOp) /* 111 */
|
||||
#define XSynchronize \
|
||||
(tkIntXlibStubsPtr->xSynchronize) /* 112 */
|
||||
/* Slot 113 is reserved */
|
||||
#define XVisualIDFromVisual \
|
||||
(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
|
||||
/* Slot 115 is reserved */
|
||||
/* Slot 116 is reserved */
|
||||
/* Slot 117 is reserved */
|
||||
/* Slot 118 is reserved */
|
||||
/* Slot 119 is reserved */
|
||||
/* Slot 120 is reserved */
|
||||
/* Slot 121 is reserved */
|
||||
/* Slot 122 is reserved */
|
||||
/* Slot 123 is reserved */
|
||||
/* Slot 124 is reserved */
|
||||
/* Slot 125 is reserved */
|
||||
/* Slot 126 is reserved */
|
||||
/* Slot 127 is reserved */
|
||||
/* Slot 128 is reserved */
|
||||
/* Slot 129 is reserved */
|
||||
/* Slot 130 is reserved */
|
||||
/* Slot 131 is reserved */
|
||||
/* Slot 132 is reserved */
|
||||
/* Slot 133 is reserved */
|
||||
/* Slot 134 is reserved */
|
||||
/* Slot 135 is reserved */
|
||||
/* Slot 136 is reserved */
|
||||
#define XPutImage \
|
||||
(tkIntXlibStubsPtr->xPutImage) /* 137 */
|
||||
#endif /* AQUA */
|
||||
|
||||
#endif /* defined(USE_TK_STUBS) */
|
||||
|
||||
@@ -1,995 +0,0 @@
|
||||
#if !(defined(LTM1) && defined(LTM2) && defined(LTM3))
|
||||
#if defined(LTM2)
|
||||
#define LTM3
|
||||
#endif
|
||||
#if defined(LTM1)
|
||||
#define LTM2
|
||||
#endif
|
||||
#define LTM1
|
||||
|
||||
#if defined(LTM_ALL)
|
||||
#define BN_ERROR_C
|
||||
#define BN_FAST_MP_INVMOD_C
|
||||
#define BN_FAST_MP_MONTGOMERY_REDUCE_C
|
||||
#define BN_FAST_S_MP_MUL_DIGS_C
|
||||
#define BN_FAST_S_MP_MUL_HIGH_DIGS_C
|
||||
#define BN_FAST_S_MP_SQR_C
|
||||
#define BN_MP_2EXPT_C
|
||||
#define BN_MP_ABS_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#define BN_MP_ADDMOD_C
|
||||
#define BN_MP_AND_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_CNT_LSB_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_DIV_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_DIV_3_C
|
||||
#define BN_MP_DIV_D_C
|
||||
#define BN_MP_DR_IS_MODULUS_C
|
||||
#define BN_MP_DR_REDUCE_C
|
||||
#define BN_MP_DR_SETUP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_EXPT_D_C
|
||||
#define BN_MP_EXPTMOD_C
|
||||
#define BN_MP_EXPTMOD_FAST_C
|
||||
#define BN_MP_EXTEUCLID_C
|
||||
#define BN_MP_FREAD_C
|
||||
#define BN_MP_FWRITE_C
|
||||
#define BN_MP_GCD_C
|
||||
#define BN_MP_GET_INT_C
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_INIT_SET_C
|
||||
#define BN_MP_INIT_SET_INT_C
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_INVMOD_C
|
||||
#define BN_MP_INVMOD_SLOW_C
|
||||
#define BN_MP_IS_SQUARE_C
|
||||
#define BN_MP_JACOBI_C
|
||||
#define BN_MP_KARATSUBA_MUL_C
|
||||
#define BN_MP_KARATSUBA_SQR_C
|
||||
#define BN_MP_LCM_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_MOD_2D_C
|
||||
#define BN_MP_MOD_D_C
|
||||
#define BN_MP_MONTGOMERY_CALC_NORMALIZATION_C
|
||||
#define BN_MP_MONTGOMERY_REDUCE_C
|
||||
#define BN_MP_MONTGOMERY_SETUP_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_MUL_2_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_MULMOD_C
|
||||
#define BN_MP_N_ROOT_C
|
||||
#define BN_MP_NEG_C
|
||||
#define BN_MP_OR_C
|
||||
#define BN_MP_PRIME_FERMAT_C
|
||||
#define BN_MP_PRIME_IS_DIVISIBLE_C
|
||||
#define BN_MP_PRIME_IS_PRIME_C
|
||||
#define BN_MP_PRIME_MILLER_RABIN_C
|
||||
#define BN_MP_PRIME_NEXT_PRIME_C
|
||||
#define BN_MP_PRIME_RABIN_MILLER_TRIALS_C
|
||||
#define BN_MP_PRIME_RANDOM_EX_C
|
||||
#define BN_MP_RADIX_SIZE_C
|
||||
#define BN_MP_RADIX_SMAP_C
|
||||
#define BN_MP_RAND_C
|
||||
#define BN_MP_READ_RADIX_C
|
||||
#define BN_MP_READ_SIGNED_BIN_C
|
||||
#define BN_MP_READ_UNSIGNED_BIN_C
|
||||
#define BN_MP_REDUCE_C
|
||||
#define BN_MP_REDUCE_2K_C
|
||||
#define BN_MP_REDUCE_2K_L_C
|
||||
#define BN_MP_REDUCE_2K_SETUP_C
|
||||
#define BN_MP_REDUCE_2K_SETUP_L_C
|
||||
#define BN_MP_REDUCE_IS_2K_C
|
||||
#define BN_MP_REDUCE_IS_2K_L_C
|
||||
#define BN_MP_REDUCE_SETUP_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_SET_INT_C
|
||||
#define BN_MP_SHRINK_C
|
||||
#define BN_MP_SIGNED_BIN_SIZE_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_SQRMOD_C
|
||||
#define BN_MP_SQRT_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_SUB_D_C
|
||||
#define BN_MP_SUBMOD_C
|
||||
#define BN_MP_TO_SIGNED_BIN_C
|
||||
#define BN_MP_TO_SIGNED_BIN_N_C
|
||||
#define BN_MP_TO_UNSIGNED_BIN_C
|
||||
#define BN_MP_TO_UNSIGNED_BIN_N_C
|
||||
#define BN_MP_TOOM_MUL_C
|
||||
#define BN_MP_TOOM_SQR_C
|
||||
#define BN_MP_TORADIX_C
|
||||
#define BN_MP_TORADIX_N_C
|
||||
#define BN_MP_UNSIGNED_BIN_SIZE_C
|
||||
#define BN_MP_XOR_C
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_PRIME_TAB_C
|
||||
#define BN_REVERSE_C
|
||||
#define BN_S_MP_ADD_C
|
||||
#define BN_S_MP_EXPTMOD_C
|
||||
#define BN_S_MP_MUL_DIGS_C
|
||||
#define BN_S_MP_MUL_HIGH_DIGS_C
|
||||
#define BN_S_MP_SQR_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#define BNCORE_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_ERROR_C)
|
||||
#define BN_MP_ERROR_TO_STRING_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_FAST_MP_INVMOD_C)
|
||||
#define BN_MP_ISEVEN_C
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_ISODD_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_FAST_MP_MONTGOMERY_REDUCE_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_FAST_S_MP_MUL_DIGS_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_FAST_S_MP_MUL_HIGH_DIGS_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_FAST_S_MP_SQR_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_2EXPT_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_GROW_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_ABS_C)
|
||||
#define BN_MP_COPY_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_ADD_C)
|
||||
#define BN_S_MP_ADD_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_ADD_D_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_SUB_D_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_ADDMOD_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_MOD_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_AND_C)
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CLAMP_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CLEAR_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CLEAR_MULTI_C)
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CMP_C)
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CMP_D_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CMP_MAG_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_CNT_LSB_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_COPY_C)
|
||||
#define BN_MP_GROW_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_COUNT_BITS_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DIV_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_ABS_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DIV_2_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DIV_2D_C)
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_MOD_2D_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DIV_3_C)
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DIV_D_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_DIV_3_C
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DR_IS_MODULUS_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DR_REDUCE_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_DR_SETUP_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_EXCH_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_EXPT_D_C)
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_MUL_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_EXPTMOD_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_INVMOD_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_ABS_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#define BN_MP_REDUCE_IS_2K_L_C
|
||||
#define BN_S_MP_EXPTMOD_C
|
||||
#define BN_MP_DR_IS_MODULUS_C
|
||||
#define BN_MP_REDUCE_IS_2K_C
|
||||
#define BN_MP_ISODD_C
|
||||
#define BN_MP_EXPTMOD_FAST_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_EXPTMOD_FAST_C)
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_MONTGOMERY_SETUP_C
|
||||
#define BN_FAST_MP_MONTGOMERY_REDUCE_C
|
||||
#define BN_MP_MONTGOMERY_REDUCE_C
|
||||
#define BN_MP_DR_SETUP_C
|
||||
#define BN_MP_DR_REDUCE_C
|
||||
#define BN_MP_REDUCE_2K_SETUP_C
|
||||
#define BN_MP_REDUCE_2K_C
|
||||
#define BN_MP_MONTGOMERY_CALC_NORMALIZATION_C
|
||||
#define BN_MP_MULMOD_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_EXCH_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_EXTEUCLID_C)
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_DIV_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_NEG_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_FREAD_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_S_RMAP_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#define BN_MP_CMP_D_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_FWRITE_C)
|
||||
#define BN_MP_RADIX_SIZE_C
|
||||
#define BN_MP_TORADIX_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_GCD_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_ABS_C
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_CNT_LSB_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_GET_INT_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_GROW_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INIT_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INIT_COPY_C)
|
||||
#define BN_MP_COPY_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INIT_MULTI_C)
|
||||
#define BN_MP_ERR_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INIT_SET_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_SET_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INIT_SET_INT_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_SET_INT_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INIT_SIZE_C)
|
||||
#define BN_MP_INIT_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INVMOD_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_ISODD_C
|
||||
#define BN_FAST_MP_INVMOD_C
|
||||
#define BN_MP_INVMOD_SLOW_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_INVMOD_SLOW_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_ISEVEN_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_ISODD_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_IS_SQUARE_C)
|
||||
#define BN_MP_MOD_D_C
|
||||
#define BN_MP_INIT_SET_INT_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_GET_INT_C
|
||||
#define BN_MP_SQRT_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_JACOBI_C)
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_CNT_LSB_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_KARATSUBA_MUL_C)
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_KARATSUBA_SQR_C)
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_S_MP_ADD_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_LCM_C)
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_GCD_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_DIV_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_LSHD_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_RSHD_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MOD_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_DIV_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_EXCH_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MOD_2D_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MOD_D_C)
|
||||
#define BN_MP_DIV_D_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MONTGOMERY_CALC_NORMALIZATION_C)
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_2EXPT_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_MUL_2_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MONTGOMERY_REDUCE_C)
|
||||
#define BN_FAST_MP_MONTGOMERY_REDUCE_C
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MONTGOMERY_SETUP_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MUL_C)
|
||||
#define BN_MP_TOOM_MUL_C
|
||||
#define BN_MP_KARATSUBA_MUL_C
|
||||
#define BN_FAST_S_MP_MUL_DIGS_C
|
||||
#define BN_S_MP_MUL_C
|
||||
#define BN_S_MP_MUL_DIGS_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MUL_2_C)
|
||||
#define BN_MP_GROW_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MUL_2D_C)
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MUL_D_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_MULMOD_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_MOD_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_N_ROOT_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_EXPT_D_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_DIV_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_SUB_D_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_NEG_C)
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_OR_C)
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_FERMAT_C)
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_EXPTMOD_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_IS_DIVISIBLE_C)
|
||||
#define BN_MP_MOD_D_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_IS_PRIME_C)
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_PRIME_IS_DIVISIBLE_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_PRIME_MILLER_RABIN_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_MILLER_RABIN_C)
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_SUB_D_C
|
||||
#define BN_MP_CNT_LSB_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_EXPTMOD_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_MP_SQRMOD_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_NEXT_PRIME_C)
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_SUB_D_C
|
||||
#define BN_MP_ISEVEN_C
|
||||
#define BN_MP_MOD_D_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#define BN_MP_PRIME_MILLER_RABIN_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_RABIN_MILLER_TRIALS_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_PRIME_RANDOM_EX_C)
|
||||
#define BN_MP_READ_UNSIGNED_BIN_C
|
||||
#define BN_MP_PRIME_IS_PRIME_C
|
||||
#define BN_MP_SUB_D_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_MUL_2_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_RADIX_SIZE_C)
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_DIV_D_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_RADIX_SMAP_C)
|
||||
#define BN_MP_S_RMAP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_RAND_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#define BN_MP_LSHD_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_READ_RADIX_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_S_RMAP_C
|
||||
#define BN_MP_RADIX_SMAP_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_READ_SIGNED_BIN_C)
|
||||
#define BN_MP_READ_UNSIGNED_BIN_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_READ_UNSIGNED_BIN_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_C)
|
||||
#define BN_MP_REDUCE_SETUP_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_S_MP_MUL_HIGH_DIGS_C
|
||||
#define BN_FAST_S_MP_MUL_HIGH_DIGS_C
|
||||
#define BN_MP_MOD_2D_C
|
||||
#define BN_S_MP_MUL_DIGS_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_CMP_D_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_CMP_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_2K_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_S_MP_ADD_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_2K_L_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_S_MP_ADD_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_2K_SETUP_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_2EXPT_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_2K_SETUP_L_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_2EXPT_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_IS_2K_C)
|
||||
#define BN_MP_REDUCE_2K_C
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_IS_2K_L_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_REDUCE_SETUP_C)
|
||||
#define BN_MP_2EXPT_C
|
||||
#define BN_MP_DIV_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_RSHD_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SET_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SET_INT_C)
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SHRINK_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SIGNED_BIN_SIZE_C)
|
||||
#define BN_MP_UNSIGNED_BIN_SIZE_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SQR_C)
|
||||
#define BN_MP_TOOM_SQR_C
|
||||
#define BN_MP_KARATSUBA_SQR_C
|
||||
#define BN_FAST_S_MP_SQR_C
|
||||
#define BN_S_MP_SQR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SQRMOD_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_MOD_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SQRT_C)
|
||||
#define BN_MP_N_ROOT_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_ZERO_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_DIV_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SUB_C)
|
||||
#define BN_S_MP_ADD_C
|
||||
#define BN_MP_CMP_MAG_C
|
||||
#define BN_S_MP_SUB_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SUB_D_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_ADD_D_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_SUBMOD_C)
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_MOD_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TO_SIGNED_BIN_C)
|
||||
#define BN_MP_TO_UNSIGNED_BIN_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TO_SIGNED_BIN_N_C)
|
||||
#define BN_MP_SIGNED_BIN_SIZE_C
|
||||
#define BN_MP_TO_SIGNED_BIN_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TO_UNSIGNED_BIN_C)
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_DIV_2D_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TO_UNSIGNED_BIN_N_C)
|
||||
#define BN_MP_UNSIGNED_BIN_SIZE_C
|
||||
#define BN_MP_TO_UNSIGNED_BIN_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TOOM_MUL_C)
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_MOD_2D_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_MUL_2_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_DIV_3_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TOOM_SQR_C)
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_MOD_2D_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_RSHD_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_MUL_2_C
|
||||
#define BN_MP_ADD_C
|
||||
#define BN_MP_SUB_C
|
||||
#define BN_MP_DIV_2_C
|
||||
#define BN_MP_MUL_2D_C
|
||||
#define BN_MP_MUL_D_C
|
||||
#define BN_MP_DIV_3_C
|
||||
#define BN_MP_LSHD_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TORADIX_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_DIV_D_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_S_RMAP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_TORADIX_N_C)
|
||||
#define BN_MP_ISZERO_C
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_DIV_D_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_S_RMAP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_UNSIGNED_BIN_SIZE_C)
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_XOR_C)
|
||||
#define BN_MP_INIT_COPY_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_MP_ZERO_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_PRIME_TAB_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_REVERSE_C)
|
||||
#endif
|
||||
|
||||
#if defined(BN_S_MP_ADD_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_S_MP_EXPTMOD_C)
|
||||
#define BN_MP_COUNT_BITS_C
|
||||
#define BN_MP_INIT_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#define BN_MP_REDUCE_SETUP_C
|
||||
#define BN_MP_REDUCE_C
|
||||
#define BN_MP_REDUCE_2K_SETUP_L_C
|
||||
#define BN_MP_REDUCE_2K_L_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_COPY_C
|
||||
#define BN_MP_SQR_C
|
||||
#define BN_MP_MUL_C
|
||||
#define BN_MP_SET_C
|
||||
#define BN_MP_EXCH_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_S_MP_MUL_DIGS_C)
|
||||
#define BN_FAST_S_MP_MUL_DIGS_C
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_S_MP_MUL_HIGH_DIGS_C)
|
||||
#define BN_FAST_S_MP_MUL_HIGH_DIGS_C
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_S_MP_SQR_C)
|
||||
#define BN_MP_INIT_SIZE_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#define BN_MP_EXCH_C
|
||||
#define BN_MP_CLEAR_C
|
||||
#endif
|
||||
|
||||
#if defined(BN_S_MP_SUB_C)
|
||||
#define BN_MP_GROW_C
|
||||
#define BN_MP_CLAMP_C
|
||||
#endif
|
||||
|
||||
#if defined(BNCORE_C)
|
||||
#endif
|
||||
|
||||
#ifdef LTM3
|
||||
#define LTM_LAST
|
||||
#endif
|
||||
#include <tommath_superclass.h>
|
||||
#include <tommath_class.h>
|
||||
#else
|
||||
#define LTM_LAST
|
||||
#endif
|
||||
@@ -1,72 +0,0 @@
|
||||
/* super class file for PK algos */
|
||||
|
||||
/* default ... include all MPI */
|
||||
#define LTM_ALL
|
||||
|
||||
/* RSA only (does not support DH/DSA/ECC) */
|
||||
/* #define SC_RSA_1 */
|
||||
|
||||
/* For reference.... On an Athlon64 optimizing for speed...
|
||||
|
||||
LTM's mpi.o with all functions [striped] is 142KiB in size.
|
||||
|
||||
*/
|
||||
|
||||
/* Works for RSA only, mpi.o is 68KiB */
|
||||
#ifdef SC_RSA_1
|
||||
#define BN_MP_SHRINK_C
|
||||
#define BN_MP_LCM_C
|
||||
#define BN_MP_PRIME_RANDOM_EX_C
|
||||
#define BN_MP_INVMOD_C
|
||||
#define BN_MP_GCD_C
|
||||
#define BN_MP_MOD_C
|
||||
#define BN_MP_MULMOD_C
|
||||
#define BN_MP_ADDMOD_C
|
||||
#define BN_MP_EXPTMOD_C
|
||||
#define BN_MP_SET_INT_C
|
||||
#define BN_MP_INIT_MULTI_C
|
||||
#define BN_MP_CLEAR_MULTI_C
|
||||
#define BN_MP_UNSIGNED_BIN_SIZE_C
|
||||
#define BN_MP_TO_UNSIGNED_BIN_C
|
||||
#define BN_MP_MOD_D_C
|
||||
#define BN_MP_PRIME_RABIN_MILLER_TRIALS_C
|
||||
#define BN_REVERSE_C
|
||||
#define BN_PRIME_TAB_C
|
||||
|
||||
/* other modifiers */
|
||||
#define BN_MP_DIV_SMALL /* Slower division, not critical */
|
||||
|
||||
/* here we are on the last pass so we turn things off. The functions classes are still there
|
||||
* but we remove them specifically from the build. This also invokes tweaks in functions
|
||||
* like removing support for even moduli, etc...
|
||||
*/
|
||||
#ifdef LTM_LAST
|
||||
#undef BN_MP_TOOM_MUL_C
|
||||
#undef BN_MP_TOOM_SQR_C
|
||||
#undef BN_MP_KARATSUBA_MUL_C
|
||||
#undef BN_MP_KARATSUBA_SQR_C
|
||||
#undef BN_MP_REDUCE_C
|
||||
#undef BN_MP_REDUCE_SETUP_C
|
||||
#undef BN_MP_DR_IS_MODULUS_C
|
||||
#undef BN_MP_DR_SETUP_C
|
||||
#undef BN_MP_DR_REDUCE_C
|
||||
#undef BN_MP_REDUCE_IS_2K_C
|
||||
#undef BN_MP_REDUCE_2K_SETUP_C
|
||||
#undef BN_MP_REDUCE_2K_C
|
||||
#undef BN_S_MP_EXPTMOD_C
|
||||
#undef BN_MP_DIV_3_C
|
||||
#undef BN_S_MP_MUL_HIGH_DIGS_C
|
||||
#undef BN_FAST_S_MP_MUL_HIGH_DIGS_C
|
||||
#undef BN_FAST_MP_INVMOD_C
|
||||
|
||||
/* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold
|
||||
* which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines]
|
||||
* which means roughly speaking you can handle upto 2536-bit RSA keys with these defined without
|
||||
* trouble.
|
||||
*/
|
||||
#undef BN_S_MP_MUL_DIGS_C
|
||||
#undef BN_S_MP_SQR_C
|
||||
#undef BN_MP_MONTGOMERY_REDUCE_C
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -1,7 +1,7 @@
|
||||
if {([info commands ::tcl::pkgconfig] eq "")
|
||||
|| ([info sharedlibextension] ne ".dll")} return
|
||||
if {![package vsatisfies [package provide Tcl] 8.5]} return
|
||||
if {[info sharedlibextension] != ".dll"} return
|
||||
if {[::tcl::pkgconfig get debug]} {
|
||||
package ifneeded dde 1.4.1 [list load [file join $dir tcldde14g.dll] dde]
|
||||
package ifneeded dde 1.4.2 [list load [file join $dir tcldde14g.dll] dde]
|
||||
} else {
|
||||
package ifneeded dde 1.4.1 [list load [file join $dir tcldde14.dll] dde]
|
||||
package ifneeded dde 1.4.2 [list load [file join $dir tcldde14.dll] dde]
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -643,7 +643,7 @@ SubstituteFile(
|
||||
}
|
||||
|
||||
/* debug: dump the list */
|
||||
#ifdef _DEBUG
|
||||
#ifndef NDEBUG
|
||||
{
|
||||
int n = 0;
|
||||
list_item_t *p = NULL;
|
||||
@@ -793,7 +793,7 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
|
||||
static int LocateDependency(const char *keypath)
|
||||
{
|
||||
int i, ret;
|
||||
static char *paths[] = {"..", "..\\..", "..\\..\\.."};
|
||||
static const char *paths[] = {"..", "..\\..", "..\\..\\.."};
|
||||
|
||||
for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
|
||||
ret = LocateDependencyHelper(paths[i], keypath);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# compiler switches, defining common targets and macros. The Tcl makefile
|
||||
# directly includes this. Extensions include it via "rules-ext.vc".
|
||||
#
|
||||
# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for
|
||||
# See TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md) for
|
||||
# detailed documentation.
|
||||
#
|
||||
# See the file "license.terms" for information on usage and redistribution
|
||||
@@ -24,7 +24,7 @@ _RULES_VC = 1
|
||||
# For modifications that are not backward-compatible, you *must* change
|
||||
# the major version.
|
||||
RULES_VERSION_MAJOR = 1
|
||||
RULES_VERSION_MINOR = 2
|
||||
RULES_VERSION_MINOR = 4
|
||||
|
||||
# The PROJECT macro must be defined by parent makefile.
|
||||
!if "$(PROJECT)" == ""
|
||||
@@ -162,7 +162,7 @@ MKDIR = mkdir
|
||||
# COMPATDIR - source directory that holds compatibility sources
|
||||
# DOCDIR - source directory containing documentation files
|
||||
# GENERICDIR - platform-independent source directory
|
||||
# WINDIR - Windows-specific source directory
|
||||
# WIN_DIR - Windows-specific source directory
|
||||
# TESTDIR - directory containing test files
|
||||
# TOOLSDIR - directory containing build tools
|
||||
# _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set
|
||||
@@ -215,17 +215,15 @@ DEMODIR = $(LIBDIR)\demos
|
||||
DEMODIR = $(ROOT)\demos
|
||||
!endif
|
||||
!endif # ifndef DEMODIR
|
||||
# Do NOT enclose WINDIR in a !ifndef because Windows always defines
|
||||
# WINDIR env var to point to c:\windows!
|
||||
# TBD - This is a potentially dangerous conflict, rename WINDIR to
|
||||
# something else
|
||||
WINDIR = $(ROOT)\win
|
||||
# Do NOT use WINDIR because it is Windows internal environment
|
||||
# variable to point to c:\windows!
|
||||
WIN_DIR = $(ROOT)\win
|
||||
|
||||
!ifndef RCDIR
|
||||
!if exist("$(WINDIR)\rc")
|
||||
RCDIR = $(WINDIR)\rc
|
||||
!if exist("$(WIN_DIR)\rc")
|
||||
RCDIR = $(WIN_DIR)\rc
|
||||
!else
|
||||
RCDIR = $(WINDIR)
|
||||
RCDIR = $(WIN_DIR)
|
||||
!endif
|
||||
!endif
|
||||
RCDIR = $(RCDIR:/=\)
|
||||
@@ -475,6 +473,21 @@ MACHINE = AMD64
|
||||
MACHINE=$(ARCH)
|
||||
!endif
|
||||
|
||||
#---------------------------------------------------------------
|
||||
# The PLATFORM_IDENTIFY macro matches the values returned by
|
||||
# the Tcl platform::identify command
|
||||
!if "$(MACHINE)" == "AMD64"
|
||||
PLATFORM_IDENTIFY = win32-x86_64
|
||||
!else
|
||||
PLATFORM_IDENTIFY = win32-ix86
|
||||
!endif
|
||||
|
||||
# The MULTIPLATFORM macro controls whether binary extensions are installed
|
||||
# in platform-specific directories. Intended to be set/used by extensions.
|
||||
!ifndef MULTIPLATFORM_INSTALL
|
||||
MULTIPLATFORM_INSTALL = 0
|
||||
!endif
|
||||
|
||||
#------------------------------------------------------------
|
||||
# Figure out the *host* architecture by reading the registry
|
||||
|
||||
@@ -671,6 +684,8 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg
|
||||
# USE_STUBS - 1 -> compile to use stubs interfaces, 0 -> direct linking
|
||||
# CONFIG_CHECK - 1 -> check current build configuration against Tcl
|
||||
# configuration (ignored for Tcl itself)
|
||||
# _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
|
||||
# (CRT library should support this)
|
||||
# Further, LINKERFLAGS are modified based on above.
|
||||
|
||||
# Default values for all the above
|
||||
@@ -739,6 +754,13 @@ TCL_THREADS = 1
|
||||
USE_THREAD_ALLOC= 1
|
||||
!endif
|
||||
|
||||
!if [nmakehlp -f $(OPTS) "time64bit"]
|
||||
!message *** Force 64-bit time_t
|
||||
_USE_64BIT_TIME_T = 1
|
||||
!endif
|
||||
|
||||
# Yes, it's weird that the "symbols" option controls DEBUG and
|
||||
# the "pdbs" option controls SYMBOLS. That's historical.
|
||||
!if [nmakehlp -f $(OPTS) "symbols"]
|
||||
!message *** Doing symbols
|
||||
DEBUG = 1
|
||||
@@ -970,7 +992,7 @@ VERSION = $(DOTVERSION:.=)
|
||||
# different compilers, build configurations etc.,
|
||||
#
|
||||
# Naming convention (suffixes):
|
||||
# t = full thread support.
|
||||
# t = full thread support. (Not used for Tcl >= 8.7)
|
||||
# s = static library (as opposed to an import library)
|
||||
# g = linked to the debug enabled C run-time.
|
||||
# x = special static build when it links to the dynamic C run-time.
|
||||
@@ -1028,7 +1050,7 @@ SUFX = $(SUFX:x=)
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!if !$(TCL_THREADS)
|
||||
!if !$(TCL_THREADS) || $(TCL_VERSION) > 86
|
||||
TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)
|
||||
SUFX = $(SUFX:t=)
|
||||
!endif
|
||||
@@ -1061,7 +1083,7 @@ STUBPREFIX = $(PROJECT)stub
|
||||
# Set up paths to various Tcl executables and libraries needed by extensions
|
||||
!if $(DOING_TCL)
|
||||
|
||||
TCLSHNAME = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe
|
||||
TCLSHNAME = $(PROJECT)sh$(VERSION)$(SUFX).exe
|
||||
TCLSH = $(OUT_DIR)\$(TCLSHNAME)
|
||||
TCLIMPLIB = $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
|
||||
TCLLIBNAME = $(PROJECT)$(VERSION)$(SUFX).$(EXT)
|
||||
@@ -1069,7 +1091,7 @@ TCLLIB = $(OUT_DIR)\$(TCLLIBNAME)
|
||||
|
||||
TCLSTUBLIBNAME = $(STUBPREFIX)$(VERSION).lib
|
||||
TCLSTUBLIB = $(OUT_DIR)\$(TCLSTUBLIBNAME)
|
||||
TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)"
|
||||
TCL_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
|
||||
|
||||
!else # ! $(DOING_TCL)
|
||||
|
||||
@@ -1078,20 +1100,17 @@ TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)"
|
||||
# When building extensions, we need to locate tclsh. Depending on version
|
||||
# of Tcl we are building against, this may or may not have a "t" suffix.
|
||||
# Try various possibilities in turn.
|
||||
TCLSH = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe
|
||||
!if !exist("$(TCLSH)") && $(TCL_THREADS)
|
||||
TCLSH = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe
|
||||
!endif
|
||||
!if !exist("$(TCLSH)")
|
||||
TCLSH = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
|
||||
!if !exist("$(TCLSH)")
|
||||
TCLSH = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
|
||||
!endif
|
||||
|
||||
TCLSTUBLIB = $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
|
||||
TCLIMPLIB = $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib
|
||||
TCLIMPLIB = $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib
|
||||
# When building extensions, may be linking against Tcl that does not add
|
||||
# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
|
||||
!if !exist("$(TCLIMPLIB)")
|
||||
TCLIMPLIB = $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib
|
||||
TCLIMPLIB = $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib
|
||||
!endif
|
||||
TCL_LIBRARY = $(_TCLDIR)\lib
|
||||
TCLREGLIB = $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib
|
||||
@@ -1101,19 +1120,16 @@ TCL_INCLUDES = -I"$(_TCLDIR)\include"
|
||||
|
||||
!else # Building against Tcl sources
|
||||
|
||||
TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe
|
||||
!if !exist($(TCLSH)) && $(TCL_THREADS)
|
||||
TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe
|
||||
!endif
|
||||
!if !exist($(TCLSH))
|
||||
TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
|
||||
!if !exist($(TCLSH))
|
||||
TCLSH = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
|
||||
!endif
|
||||
TCLSTUBLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
|
||||
TCLIMPLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib
|
||||
TCLIMPLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib
|
||||
# When building extensions, may be linking against Tcl that does not add
|
||||
# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
|
||||
!if !exist("$(TCLIMPLIB)")
|
||||
TCLIMPLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib
|
||||
TCLIMPLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib
|
||||
!endif
|
||||
TCL_LIBRARY = $(_TCLDIR)\library
|
||||
TCLREGLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib
|
||||
@@ -1150,7 +1166,7 @@ WISH = $(OUT_DIR)\$(WISHNAME)
|
||||
TKSTUBLIB = $(OUT_DIR)\$(TKSTUBLIBNAME)
|
||||
TKIMPLIB = $(OUT_DIR)\$(TKIMPLIBNAME)
|
||||
TKLIB = $(OUT_DIR)\$(TKLIBNAME)
|
||||
TK_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)"
|
||||
TK_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
|
||||
|
||||
!else # effectively NEED_TK
|
||||
|
||||
@@ -1226,8 +1242,13 @@ INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\include
|
||||
!else # extension other than Tk
|
||||
|
||||
PRJ_INSTALL_DIR = $(_INSTALLDIR)\$(PROJECT)$(DOTVERSION)
|
||||
!if $(MULTIPLATFORM_INSTALL)
|
||||
LIB_INSTALL_DIR = $(PRJ_INSTALL_DIR)\$(PLATFORM_IDENTIFY)
|
||||
BIN_INSTALL_DIR = $(PRJ_INSTALL_DIR)\$(PLATFORM_IDENTIFY)
|
||||
!else
|
||||
LIB_INSTALL_DIR = $(PRJ_INSTALL_DIR)
|
||||
BIN_INSTALL_DIR = $(PRJ_INSTALL_DIR)
|
||||
!endif
|
||||
DOC_INSTALL_DIR = $(PRJ_INSTALL_DIR)
|
||||
SCRIPT_INSTALL_DIR = $(PRJ_INSTALL_DIR)
|
||||
DEMO_INSTALL_DIR = $(PRJ_INSTALL_DIR)\demos
|
||||
@@ -1256,82 +1277,69 @@ INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\..\include
|
||||
# baselibs - minimum Windows libraries required. Parent makefile can
|
||||
# define PRJ_LIBS before including rules.rc if additional libs are needed
|
||||
|
||||
OPTDEFINES = -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS
|
||||
OPTDEFINES = /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
|
||||
|
||||
!if $(TCL_MEM_DEBUG)
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_MEM_DEBUG
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_MEM_DEBUG
|
||||
!endif
|
||||
!if $(TCL_COMPILE_DEBUG)
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_COMPILE_DEBUG /DTCL_COMPILE_STATS
|
||||
!endif
|
||||
!if $(TCL_THREADS)
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_THREADS=1
|
||||
!if $(USE_THREAD_ALLOC)
|
||||
OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
|
||||
!if $(TCL_THREADS) && $(TCL_VERSION) < 87
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_THREADS=1
|
||||
!if $(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87
|
||||
OPTDEFINES = $(OPTDEFINES) /DUSE_THREAD_ALLOC=1
|
||||
!endif
|
||||
!endif
|
||||
!if $(STATIC_BUILD)
|
||||
OPTDEFINES = $(OPTDEFINES) -DSTATIC_BUILD
|
||||
OPTDEFINES = $(OPTDEFINES) /DSTATIC_BUILD
|
||||
!endif
|
||||
!if $(TCL_NO_DEPRECATED)
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_NO_DEPRECATED
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_NO_DEPRECATED
|
||||
!endif
|
||||
|
||||
!if $(USE_STUBS)
|
||||
# Note we do not define USE_TCL_STUBS even when building tk since some
|
||||
# test targets in tk do not use stubs
|
||||
!if ! $(DOING_TCL)
|
||||
USE_STUBS_DEFS = -DUSE_TCL_STUBS -DUSE_TCLOO_STUBS
|
||||
USE_STUBS_DEFS = /DUSE_TCL_STUBS /DUSE_TCLOO_STUBS
|
||||
!if $(NEED_TK)
|
||||
USE_STUBS_DEFS = $(USE_STUBS_DEFS) -DUSE_TK_STUBS
|
||||
USE_STUBS_DEFS = $(USE_STUBS_DEFS) /DUSE_TK_STUBS
|
||||
!endif
|
||||
!endif
|
||||
!endif # USE_STUBS
|
||||
|
||||
!if !$(DEBUG)
|
||||
OPTDEFINES = $(OPTDEFINES) -DNDEBUG
|
||||
OPTDEFINES = $(OPTDEFINES) /DNDEBUG
|
||||
!if $(OPTIMIZING)
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_OPTIMIZED
|
||||
!endif
|
||||
!endif
|
||||
!if $(PROFILE)
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_PROFILED
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_PROFILED
|
||||
!endif
|
||||
!if "$(MACHINE)" == "AMD64"
|
||||
OPTDEFINES = $(OPTDEFINES) -DTCL_CFG_DO64BIT
|
||||
OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_DO64BIT
|
||||
!endif
|
||||
!if $(VCVERSION) < 1300
|
||||
OPTDEFINES = $(OPTDEFINES) -DNO_STRTOI64
|
||||
OPTDEFINES = $(OPTDEFINES) /DNO_STRTOI64
|
||||
!endif
|
||||
|
||||
!if "$(_USE_64BIT_TIME_T)" == "1"
|
||||
OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T
|
||||
!endif
|
||||
|
||||
# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
|
||||
COMPILERFLAGS = /D_ATL_XP_TARGETING
|
||||
|
||||
# Following is primarily for the benefit of extensions. Tcl 8.5 builds
|
||||
# Tcl without /DUNICODE, while 8.6 builds with it defined. When building
|
||||
# an extension, it is advisable (but not mandated) to use the same Windows
|
||||
# API as the Tcl build. This is accordingly defaulted below. A particular
|
||||
# extension can override this by pre-definining USE_WIDECHAR_API.
|
||||
!ifndef USE_WIDECHAR_API
|
||||
!if $(TCL_VERSION) > 85
|
||||
USE_WIDECHAR_API = 1
|
||||
!else
|
||||
USE_WIDECHAR_API = 0
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!if $(USE_WIDECHAR_API)
|
||||
COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
|
||||
!endif
|
||||
|
||||
# Like the TEA system only set this non empty for non-Tk extensions
|
||||
# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
|
||||
# so we pass both
|
||||
!if !$(DOING_TCL) && !$(DOING_TK)
|
||||
PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
|
||||
-DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
|
||||
-DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
|
||||
-DMODULE_SCOPE=extern
|
||||
PKGNAMEFLAGS = /DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
|
||||
/DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
|
||||
/DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
|
||||
/DMODULE_SCOPE=extern
|
||||
!endif
|
||||
|
||||
# crt picks the C run time based on selected OPTS
|
||||
@@ -1378,7 +1386,7 @@ cwarn = $(cwarn) -wd4311 -wd4312
|
||||
|
||||
### Common compiler options that are architecture specific
|
||||
!if "$(MACHINE)" == "ARM"
|
||||
carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
|
||||
carch = /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
|
||||
!else
|
||||
carch =
|
||||
!endif
|
||||
@@ -1390,7 +1398,7 @@ cwarn = $(cwarn) -WX
|
||||
|
||||
INCLUDES = $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES)
|
||||
!if !$(DOING_TCL) && !$(DOING_TK)
|
||||
INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)"
|
||||
INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WIN_DIR)" -I"$(COMPATDIR)"
|
||||
!endif
|
||||
|
||||
# These flags are defined roughly in the order of the pre-reform
|
||||
@@ -1406,13 +1414,13 @@ cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)
|
||||
# BUILD_$(PROJECT) macro which should be defined only for the shared
|
||||
# library *implementation* and not for its caller interface
|
||||
|
||||
appcflags = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)
|
||||
appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)
|
||||
pkgcflags = $(appcflags) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
|
||||
pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
|
||||
appcflags = $(appcflags_nostubs) $(USE_STUBS_DEFS)
|
||||
pkgcflags = $(appcflags) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT)
|
||||
pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) /DBUILD_$(PROJECT)
|
||||
|
||||
# stubscflags contains $(cflags) plus flags used for building a stubs
|
||||
# library for the package. Note: -DSTATIC_BUILD is defined in
|
||||
# library for the package. Note: /DSTATIC_BUILD is defined in
|
||||
# $(OPTDEFINES) only if the OPTS configuration indicates a static
|
||||
# library. However the stubs library is ALWAYS static hence included
|
||||
# here irrespective of the OPTS setting.
|
||||
@@ -1422,7 +1430,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
|
||||
# so we do not remove it from cflags. -GL may prevent extensions
|
||||
# compiled with one VC version to fail to link against stubs library
|
||||
# compiled with another VC version. Check for this and fix accordingly.
|
||||
stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)
|
||||
stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl /DSTATIC_BUILD $(INCLUDES) $(USE_STUBS_DEFS)
|
||||
|
||||
# Link flags
|
||||
|
||||
@@ -1499,13 +1507,13 @@ CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
|
||||
GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
|
||||
RESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
|
||||
$(TCL_INCLUDES) \
|
||||
-DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
|
||||
-DCOMMAVERSION=$(DOTVERSION:.=,),0 \
|
||||
-DDOTVERSION=\"$(DOTVERSION)\" \
|
||||
-DVERSION=\"$(VERSION)\" \
|
||||
-DSUFX=\"$(SUFX)\" \
|
||||
-DPROJECT=\"$(PROJECT)\" \
|
||||
-DPRJLIBNAME=\"$(PRJLIBNAME)\"
|
||||
/DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
|
||||
/DCOMMAVERSION=$(DOTVERSION:.=,),0 \
|
||||
/DDOTVERSION=\"$(DOTVERSION)\" \
|
||||
/DVERSION=\"$(VERSION)\" \
|
||||
/DSUFX=\"$(SUFX)\" \
|
||||
/DPROJECT=\"$(PROJECT)\" \
|
||||
/DPRJLIBNAME=\"$(PRJLIBNAME)\"
|
||||
|
||||
!ifndef DEFAULT_BUILD_TARGET
|
||||
DEFAULT_BUILD_TARGET = $(PROJECT)
|
||||
@@ -1513,9 +1521,15 @@ DEFAULT_BUILD_TARGET = $(PROJECT)
|
||||
|
||||
default-target: $(DEFAULT_BUILD_TARGET)
|
||||
|
||||
!if $(MULTIPLATFORM_INSTALL)
|
||||
default-pkgindex:
|
||||
@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
|
||||
[list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl
|
||||
!else
|
||||
default-pkgindex:
|
||||
@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
|
||||
[list load [file join $$dir $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl
|
||||
!endif
|
||||
|
||||
default-pkgindex-tea:
|
||||
@if exist $(ROOT)\pkgIndex.tcl.in nmakehlp -s << $(ROOT)\pkgIndex.tcl.in > $(OUT_DIR)\pkgIndex.tcl
|
||||
@@ -1525,15 +1539,26 @@ default-pkgindex-tea:
|
||||
@PKG_LIB_FILE@ $(PRJLIBNAME)
|
||||
<<
|
||||
|
||||
|
||||
default-install: default-install-binaries default-install-libraries
|
||||
!if $(SYMBOLS)
|
||||
default-install: default-install-pdbs
|
||||
!endif
|
||||
|
||||
# Again to deal with historical brokenness, there is some confusion
|
||||
# in terminlogy. For extensions, the "install-binaries" was used to
|
||||
# locate target directory for *binary shared libraries* and thus
|
||||
# the appropriate macro is LIB_INSTALL_DIR since BIN_INSTALL_DIR is
|
||||
# for executables (exes). On the other hand the "install-libraries"
|
||||
# target is for *scripts* and should have been called "install-scripts".
|
||||
default-install-binaries: $(PRJLIB)
|
||||
@echo Installing binaries to '$(SCRIPT_INSTALL_DIR)'
|
||||
@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"
|
||||
@$(CPY) $(PRJLIB) "$(SCRIPT_INSTALL_DIR)" >NUL
|
||||
@echo Installing binaries to '$(LIB_INSTALL_DIR)'
|
||||
@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"
|
||||
@$(CPY) $(PRJLIB) "$(LIB_INSTALL_DIR)" >NUL
|
||||
|
||||
default-install-libraries: $(OUT_DIR)\pkgIndex.tcl
|
||||
# Alias for default-install-scripts
|
||||
default-install-libraries: default-install-scripts
|
||||
|
||||
default-install-scripts: $(OUT_DIR)\pkgIndex.tcl
|
||||
@echo Installing libraries to '$(SCRIPT_INSTALL_DIR)'
|
||||
@if exist $(LIBDIR) $(CPY) $(LIBDIR)\*.tcl "$(SCRIPT_INSTALL_DIR)"
|
||||
@echo Installing package index in '$(SCRIPT_INSTALL_DIR)'
|
||||
@@ -1544,6 +1569,11 @@ default-install-stubs:
|
||||
@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"
|
||||
@$(CPY) $(PRJSTUBLIB) "$(SCRIPT_INSTALL_DIR)" >NUL
|
||||
|
||||
default-install-pdbs:
|
||||
@echo Installing PDBs to '$(LIB_INSTALL_DIR)'
|
||||
@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"
|
||||
@$(CPY) "$(OUT_DIR)\*.pdb" "$(LIB_INSTALL_DIR)\"
|
||||
|
||||
default-install-docs-html:
|
||||
@echo Installing documentation files to '$(DOC_INSTALL_DIR)'
|
||||
@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"
|
||||
@@ -1562,20 +1592,20 @@ default-install-demos:
|
||||
default-clean:
|
||||
@echo Cleaning $(TMP_DIR)\* ...
|
||||
@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
|
||||
@echo Cleaning $(WINDIR)\nmakehlp.obj, nmakehlp.exe ...
|
||||
@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
|
||||
@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
|
||||
@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out
|
||||
@echo Cleaning $(WINDIR)\nmhlp-out.txt ...
|
||||
@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt
|
||||
@echo Cleaning $(WINDIR)\_junk.pch ...
|
||||
@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch
|
||||
@echo Cleaning $(WINDIR)\vercl.x, vercl.i ...
|
||||
@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
|
||||
@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
|
||||
@echo Cleaning $(WINDIR)\versions.vc, version.vc ...
|
||||
@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc
|
||||
@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc
|
||||
@echo Cleaning $(WIN_DIR)\nmakehlp.obj, nmakehlp.exe ...
|
||||
@if exist $(WIN_DIR)\nmakehlp.obj del $(WIN_DIR)\nmakehlp.obj
|
||||
@if exist $(WIN_DIR)\nmakehlp.exe del $(WIN_DIR)\nmakehlp.exe
|
||||
@if exist $(WIN_DIR)\nmakehlp.out del $(WIN_DIR)\nmakehlp.out
|
||||
@echo Cleaning $(WIN_DIR)\nmhlp-out.txt ...
|
||||
@if exist $(WIN_DIR)\nmhlp-out.txt del $(WIN_DIR)\nmhlp-out.txt
|
||||
@echo Cleaning $(WIN_DIR)\_junk.pch ...
|
||||
@if exist $(WIN_DIR)\_junk.pch del $(WIN_DIR)\_junk.pch
|
||||
@echo Cleaning $(WIN_DIR)\vercl.x, vercl.i ...
|
||||
@if exist $(WIN_DIR)\vercl.x del $(WIN_DIR)\vercl.x
|
||||
@if exist $(WIN_DIR)\vercl.i del $(WIN_DIR)\vercl.i
|
||||
@echo Cleaning $(WIN_DIR)\versions.vc, version.vc ...
|
||||
@if exist $(WIN_DIR)\versions.vc del $(WIN_DIR)\versions.vc
|
||||
@if exist $(WIN_DIR)\version.vc del $(WIN_DIR)\version.vc
|
||||
|
||||
default-hose: default-clean
|
||||
@echo Hosing $(OUT_DIR)\* ...
|
||||
@@ -1667,7 +1697,7 @@ DISABLE_IMPLICIT_RULES = 0
|
||||
$<
|
||||
<<
|
||||
|
||||
{$(WINDIR)}.c{$(TMP_DIR)}.obj::
|
||||
{$(WIN_DIR)}.c{$(TMP_DIR)}.obj::
|
||||
$(CCPKGCMD) @<<
|
||||
$<
|
||||
<<
|
||||
@@ -1685,7 +1715,7 @@ $<
|
||||
{$(RCDIR)}.rc{$(TMP_DIR)}.res:
|
||||
$(RESCMD) $<
|
||||
|
||||
{$(WINDIR)}.rc{$(TMP_DIR)}.res:
|
||||
{$(WIN_DIR)}.rc{$(TMP_DIR)}.res:
|
||||
$(RESCMD) $<
|
||||
|
||||
{$(TMP_DIR)}.rc{$(TMP_DIR)}.res:
|
||||
@@ -1720,7 +1750,7 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
|
||||
!if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"
|
||||
!error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).
|
||||
!endif
|
||||
!if defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)
|
||||
!if $(TCL_VERSION) < 87 && defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)
|
||||
!message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)).
|
||||
!endif
|
||||
!if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
# Part of the nmake based build system for Tcl and its extensions.
|
||||
# This file defines some standard targets for the convenience of extensions
|
||||
# and can be optionally included by the extension makefile.
|
||||
# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for docs.
|
||||
# See TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md) for docs.
|
||||
|
||||
$(PROJECT): setup pkgindex $(PRJLIB)
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ CORE_MACHINE = AMD64
|
||||
CORE_DEBUG = 0
|
||||
CORE_TCL_THREADS = 1
|
||||
CORE_USE_THREAD_ALLOC = 1
|
||||
CORE_USE_WIDECHAR_API = 1
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
if {([info commands ::tcl::pkgconfig] eq "")
|
||||
|| ([info sharedlibextension] ne ".dll")} return
|
||||
if {![package vsatisfies [package provide Tcl] 8.5]} return
|
||||
if {[info sharedlibextension] != ".dll"} return
|
||||
if {[::tcl::pkgconfig get debug]} {
|
||||
package ifneeded registry 1.3.3 \
|
||||
package ifneeded registry 1.3.4 \
|
||||
[list load [file join $dir tclreg13g.dll] registry]
|
||||
} else {
|
||||
package ifneeded registry 1.3.3 \
|
||||
package ifneeded registry 1.3.4 \
|
||||
[list load [file join $dir tclreg13.dll] registry]
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -16,7 +16,7 @@
|
||||
if {[info commands package] == ""} {
|
||||
error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
|
||||
}
|
||||
package require -exact Tcl 8.6.9
|
||||
package require -exact Tcl 8.6.10
|
||||
|
||||
# Compute the auto path to use in this interpreter.
|
||||
# The values on the path come from several locations:
|
||||
@@ -668,7 +668,9 @@ proc auto_execok name {
|
||||
}
|
||||
|
||||
set path "[file dirname [info nameof]];.;"
|
||||
if {[info exists env(WINDIR)]} {
|
||||
if {[info exists env(SystemRoot)]} {
|
||||
set windir $env(SystemRoot)
|
||||
} elseif {[info exists env(WINDIR)]} {
|
||||
set windir $env(WINDIR)
|
||||
}
|
||||
if {[info exists windir]} {
|
||||
|
||||
@@ -40,5 +40,5 @@ namespace eval ::tcl::clock {
|
||||
::msgcat::mcset ja LOCALE_DATE_FORMAT "%EY\u5e74%m\u6708%d\u65e5"
|
||||
::msgcat::mcset ja LOCALE_TIME_FORMAT "%H\u6642%M\u5206%S\u79d2"
|
||||
::msgcat::mcset ja LOCALE_DATE_TIME_FORMAT "%EY\u5e74%m\u6708%d\u65e5 (%a) %H\u6642%M\u5206%S\u79d2 %z"
|
||||
::msgcat::mcset ja LOCALE_ERAS "\u007b-9223372036854775808 \u897f\u66a6 0\u007d \u007b-3061011600 \u660e\u6cbb 1867\u007d \u007b-1812186000 \u5927\u6b63 1911\u007d \u007b-1357635600 \u662d\u548c 1925\u007d \u007b600220800 \u5e73\u6210 1988\u007d"
|
||||
::msgcat::mcset ja LOCALE_ERAS "{-9223372036854775808 \u897f\u66a6 0} {-3061011600 \u660e\u6cbb 1867} {-1812186000 \u5927\u6b63 1911} {-1357635600 \u662d\u548c 1925} {600220800 \u5e73\u6210 1988} {1556668800 \u4ee4\u548c 2018}"
|
||||
}
|
||||
|
||||
@@ -73,3 +73,6 @@ set auto_index(::tcl::tm::Defaults) [list source [file join $dir tm.tcl]]
|
||||
set auto_index(::tcl::tm::UnknownHandler) [list source [file join $dir tm.tcl]]
|
||||
set auto_index(::tcl::tm::roots) [list source [file join $dir tm.tcl]]
|
||||
set auto_index(::tcl::tm::path) [list source [file join $dir tm.tcl]]
|
||||
if {[namespace exists ::tcl::unsupported]} {
|
||||
set auto_index(timerate) {namespace import ::tcl::unsupported::timerate}
|
||||
}
|
||||
|
||||
@@ -311,7 +311,7 @@ proc ::tcl::tm::UnknownHandler {original name args} {
|
||||
proc ::tcl::tm::Defaults {} {
|
||||
global env tcl_platform
|
||||
|
||||
lassign [split [info tclversion] .] major minor
|
||||
regexp {^(\d+)\.(\d+)} [package provide Tcl] - major minor
|
||||
set exe [file normalize [info nameofexecutable]]
|
||||
|
||||
# Note that we're using [::list], not [list] because [list] means
|
||||
@@ -354,7 +354,7 @@ proc ::tcl::tm::Defaults {} {
|
||||
# Calls 'path add' to paths to the list of module search paths.
|
||||
|
||||
proc ::tcl::tm::roots {paths} {
|
||||
regexp {^(\d+)\.(\d+)} [package present Tcl] - major minor
|
||||
regexp {^(\d+)\.(\d+)} [package provide Tcl] - major minor
|
||||
foreach pa $paths {
|
||||
set p [file join $pa tcl$major]
|
||||
for {set n $minor} {$n >= 0} {incr n -1} {
|
||||
|
||||
@@ -56,5 +56,147 @@ set TZData(:Africa/Casablanca) {
|
||||
{1521943200 3600 1 +00}
|
||||
{1526176800 0 0 +00}
|
||||
{1529200800 3600 1 +00}
|
||||
{1540598400 3600 0 +01}
|
||||
{1540695600 3600 0 +01}
|
||||
{1557021600 0 1 +01}
|
||||
{1560045600 3600 0 +01}
|
||||
{1587261600 0 1 +01}
|
||||
{1590285600 3600 0 +01}
|
||||
{1618106400 0 1 +01}
|
||||
{1621130400 3600 0 +01}
|
||||
{1648346400 0 1 +01}
|
||||
{1651975200 3600 0 +01}
|
||||
{1679191200 0 1 +01}
|
||||
{1682215200 3600 0 +01}
|
||||
{1710036000 0 1 +01}
|
||||
{1713060000 3600 0 +01}
|
||||
{1740276000 0 1 +01}
|
||||
{1743904800 3600 0 +01}
|
||||
{1771120800 0 1 +01}
|
||||
{1774144800 3600 0 +01}
|
||||
{1801965600 0 1 +01}
|
||||
{1804989600 3600 0 +01}
|
||||
{1832205600 0 1 +01}
|
||||
{1835229600 3600 0 +01}
|
||||
{1863050400 0 1 +01}
|
||||
{1866074400 3600 0 +01}
|
||||
{1893290400 0 1 +01}
|
||||
{1896919200 3600 0 +01}
|
||||
{1924135200 0 1 +01}
|
||||
{1927159200 3600 0 +01}
|
||||
{1954980000 0 1 +01}
|
||||
{1958004000 3600 0 +01}
|
||||
{1985220000 0 1 +01}
|
||||
{1988848800 3600 0 +01}
|
||||
{2016064800 0 1 +01}
|
||||
{2019088800 3600 0 +01}
|
||||
{2046304800 0 1 +01}
|
||||
{2049933600 3600 0 +01}
|
||||
{2077149600 0 1 +01}
|
||||
{2080173600 3600 0 +01}
|
||||
{2107994400 0 1 +01}
|
||||
{2111018400 3600 0 +01}
|
||||
{2138234400 0 1 +01}
|
||||
{2141863200 3600 0 +01}
|
||||
{2169079200 0 1 +01}
|
||||
{2172103200 3600 0 +01}
|
||||
{2199924000 0 1 +01}
|
||||
{2202948000 3600 0 +01}
|
||||
{2230164000 0 1 +01}
|
||||
{2233792800 3600 0 +01}
|
||||
{2261008800 0 1 +01}
|
||||
{2264032800 3600 0 +01}
|
||||
{2291248800 0 1 +01}
|
||||
{2294877600 3600 0 +01}
|
||||
{2322093600 0 1 +01}
|
||||
{2325117600 3600 0 +01}
|
||||
{2352938400 0 1 +01}
|
||||
{2355962400 3600 0 +01}
|
||||
{2383178400 0 1 +01}
|
||||
{2386807200 3600 0 +01}
|
||||
{2414023200 0 1 +01}
|
||||
{2417047200 3600 0 +01}
|
||||
{2444868000 0 1 +01}
|
||||
{2447892000 3600 0 +01}
|
||||
{2475108000 0 1 +01}
|
||||
{2478736800 3600 0 +01}
|
||||
{2505952800 0 1 +01}
|
||||
{2508976800 3600 0 +01}
|
||||
{2536192800 0 1 +01}
|
||||
{2539821600 3600 0 +01}
|
||||
{2567037600 0 1 +01}
|
||||
{2570061600 3600 0 +01}
|
||||
{2597882400 0 1 +01}
|
||||
{2600906400 3600 0 +01}
|
||||
{2628122400 0 1 +01}
|
||||
{2631751200 3600 0 +01}
|
||||
{2658967200 0 1 +01}
|
||||
{2661991200 3600 0 +01}
|
||||
{2689812000 0 1 +01}
|
||||
{2692836000 3600 0 +01}
|
||||
{2720052000 0 1 +01}
|
||||
{2723680800 3600 0 +01}
|
||||
{2750896800 0 1 +01}
|
||||
{2753920800 3600 0 +01}
|
||||
{2781136800 0 1 +01}
|
||||
{2784765600 3600 0 +01}
|
||||
{2811981600 0 1 +01}
|
||||
{2815005600 3600 0 +01}
|
||||
{2842826400 0 1 +01}
|
||||
{2845850400 3600 0 +01}
|
||||
{2873066400 0 1 +01}
|
||||
{2876695200 3600 0 +01}
|
||||
{2903911200 0 1 +01}
|
||||
{2906935200 3600 0 +01}
|
||||
{2934756000 0 1 +01}
|
||||
{2937780000 3600 0 +01}
|
||||
{2964996000 0 1 +01}
|
||||
{2968020000 3600 0 +01}
|
||||
{2995840800 0 1 +01}
|
||||
{2998864800 3600 0 +01}
|
||||
{3026080800 0 1 +01}
|
||||
{3029709600 3600 0 +01}
|
||||
{3056925600 0 1 +01}
|
||||
{3059949600 3600 0 +01}
|
||||
{3087770400 0 1 +01}
|
||||
{3090794400 3600 0 +01}
|
||||
{3118010400 0 1 +01}
|
||||
{3121639200 3600 0 +01}
|
||||
{3148855200 0 1 +01}
|
||||
{3151879200 3600 0 +01}
|
||||
{3179700000 0 1 +01}
|
||||
{3182724000 3600 0 +01}
|
||||
{3209940000 0 1 +01}
|
||||
{3212964000 3600 0 +01}
|
||||
{3240784800 0 1 +01}
|
||||
{3243808800 3600 0 +01}
|
||||
{3271024800 0 1 +01}
|
||||
{3274653600 3600 0 +01}
|
||||
{3301869600 0 1 +01}
|
||||
{3304893600 3600 0 +01}
|
||||
{3332714400 0 1 +01}
|
||||
{3335738400 3600 0 +01}
|
||||
{3362954400 0 1 +01}
|
||||
{3366583200 3600 0 +01}
|
||||
{3393799200 0 1 +01}
|
||||
{3396823200 3600 0 +01}
|
||||
{3424644000 0 1 +01}
|
||||
{3427668000 3600 0 +01}
|
||||
{3454884000 0 1 +01}
|
||||
{3457908000 3600 0 +01}
|
||||
{3485728800 0 1 +01}
|
||||
{3488752800 3600 0 +01}
|
||||
{3515968800 0 1 +01}
|
||||
{3519597600 3600 0 +01}
|
||||
{3546813600 0 1 +01}
|
||||
{3549837600 3600 0 +01}
|
||||
{3577658400 0 1 +01}
|
||||
{3580682400 3600 0 +01}
|
||||
{3607898400 0 1 +01}
|
||||
{3611527200 3600 0 +01}
|
||||
{3638743200 0 1 +01}
|
||||
{3641767200 3600 0 +01}
|
||||
{3669588000 0 1 +01}
|
||||
{3672612000 3600 0 +01}
|
||||
{3699828000 0 1 +01}
|
||||
{3702852000 3600 0 +01}
|
||||
}
|
||||
|
||||
@@ -45,5 +45,147 @@ set TZData(:Africa/El_Aaiun) {
|
||||
{1521943200 3600 1 +00}
|
||||
{1526176800 0 0 +00}
|
||||
{1529200800 3600 1 +00}
|
||||
{1540598400 3600 0 +01}
|
||||
{1540695600 3600 0 +01}
|
||||
{1557021600 0 1 +01}
|
||||
{1560045600 3600 0 +01}
|
||||
{1587261600 0 1 +01}
|
||||
{1590285600 3600 0 +01}
|
||||
{1618106400 0 1 +01}
|
||||
{1621130400 3600 0 +01}
|
||||
{1648346400 0 1 +01}
|
||||
{1651975200 3600 0 +01}
|
||||
{1679191200 0 1 +01}
|
||||
{1682215200 3600 0 +01}
|
||||
{1710036000 0 1 +01}
|
||||
{1713060000 3600 0 +01}
|
||||
{1740276000 0 1 +01}
|
||||
{1743904800 3600 0 +01}
|
||||
{1771120800 0 1 +01}
|
||||
{1774144800 3600 0 +01}
|
||||
{1801965600 0 1 +01}
|
||||
{1804989600 3600 0 +01}
|
||||
{1832205600 0 1 +01}
|
||||
{1835229600 3600 0 +01}
|
||||
{1863050400 0 1 +01}
|
||||
{1866074400 3600 0 +01}
|
||||
{1893290400 0 1 +01}
|
||||
{1896919200 3600 0 +01}
|
||||
{1924135200 0 1 +01}
|
||||
{1927159200 3600 0 +01}
|
||||
{1954980000 0 1 +01}
|
||||
{1958004000 3600 0 +01}
|
||||
{1985220000 0 1 +01}
|
||||
{1988848800 3600 0 +01}
|
||||
{2016064800 0 1 +01}
|
||||
{2019088800 3600 0 +01}
|
||||
{2046304800 0 1 +01}
|
||||
{2049933600 3600 0 +01}
|
||||
{2077149600 0 1 +01}
|
||||
{2080173600 3600 0 +01}
|
||||
{2107994400 0 1 +01}
|
||||
{2111018400 3600 0 +01}
|
||||
{2138234400 0 1 +01}
|
||||
{2141863200 3600 0 +01}
|
||||
{2169079200 0 1 +01}
|
||||
{2172103200 3600 0 +01}
|
||||
{2199924000 0 1 +01}
|
||||
{2202948000 3600 0 +01}
|
||||
{2230164000 0 1 +01}
|
||||
{2233792800 3600 0 +01}
|
||||
{2261008800 0 1 +01}
|
||||
{2264032800 3600 0 +01}
|
||||
{2291248800 0 1 +01}
|
||||
{2294877600 3600 0 +01}
|
||||
{2322093600 0 1 +01}
|
||||
{2325117600 3600 0 +01}
|
||||
{2352938400 0 1 +01}
|
||||
{2355962400 3600 0 +01}
|
||||
{2383178400 0 1 +01}
|
||||
{2386807200 3600 0 +01}
|
||||
{2414023200 0 1 +01}
|
||||
{2417047200 3600 0 +01}
|
||||
{2444868000 0 1 +01}
|
||||
{2447892000 3600 0 +01}
|
||||
{2475108000 0 1 +01}
|
||||
{2478736800 3600 0 +01}
|
||||
{2505952800 0 1 +01}
|
||||
{2508976800 3600 0 +01}
|
||||
{2536192800 0 1 +01}
|
||||
{2539821600 3600 0 +01}
|
||||
{2567037600 0 1 +01}
|
||||
{2570061600 3600 0 +01}
|
||||
{2597882400 0 1 +01}
|
||||
{2600906400 3600 0 +01}
|
||||
{2628122400 0 1 +01}
|
||||
{2631751200 3600 0 +01}
|
||||
{2658967200 0 1 +01}
|
||||
{2661991200 3600 0 +01}
|
||||
{2689812000 0 1 +01}
|
||||
{2692836000 3600 0 +01}
|
||||
{2720052000 0 1 +01}
|
||||
{2723680800 3600 0 +01}
|
||||
{2750896800 0 1 +01}
|
||||
{2753920800 3600 0 +01}
|
||||
{2781136800 0 1 +01}
|
||||
{2784765600 3600 0 +01}
|
||||
{2811981600 0 1 +01}
|
||||
{2815005600 3600 0 +01}
|
||||
{2842826400 0 1 +01}
|
||||
{2845850400 3600 0 +01}
|
||||
{2873066400 0 1 +01}
|
||||
{2876695200 3600 0 +01}
|
||||
{2903911200 0 1 +01}
|
||||
{2906935200 3600 0 +01}
|
||||
{2934756000 0 1 +01}
|
||||
{2937780000 3600 0 +01}
|
||||
{2964996000 0 1 +01}
|
||||
{2968020000 3600 0 +01}
|
||||
{2995840800 0 1 +01}
|
||||
{2998864800 3600 0 +01}
|
||||
{3026080800 0 1 +01}
|
||||
{3029709600 3600 0 +01}
|
||||
{3056925600 0 1 +01}
|
||||
{3059949600 3600 0 +01}
|
||||
{3087770400 0 1 +01}
|
||||
{3090794400 3600 0 +01}
|
||||
{3118010400 0 1 +01}
|
||||
{3121639200 3600 0 +01}
|
||||
{3148855200 0 1 +01}
|
||||
{3151879200 3600 0 +01}
|
||||
{3179700000 0 1 +01}
|
||||
{3182724000 3600 0 +01}
|
||||
{3209940000 0 1 +01}
|
||||
{3212964000 3600 0 +01}
|
||||
{3240784800 0 1 +01}
|
||||
{3243808800 3600 0 +01}
|
||||
{3271024800 0 1 +01}
|
||||
{3274653600 3600 0 +01}
|
||||
{3301869600 0 1 +01}
|
||||
{3304893600 3600 0 +01}
|
||||
{3332714400 0 1 +01}
|
||||
{3335738400 3600 0 +01}
|
||||
{3362954400 0 1 +01}
|
||||
{3366583200 3600 0 +01}
|
||||
{3393799200 0 1 +01}
|
||||
{3396823200 3600 0 +01}
|
||||
{3424644000 0 1 +01}
|
||||
{3427668000 3600 0 +01}
|
||||
{3454884000 0 1 +01}
|
||||
{3457908000 3600 0 +01}
|
||||
{3485728800 0 1 +01}
|
||||
{3488752800 3600 0 +01}
|
||||
{3515968800 0 1 +01}
|
||||
{3519597600 3600 0 +01}
|
||||
{3546813600 0 1 +01}
|
||||
{3549837600 3600 0 +01}
|
||||
{3577658400 0 1 +01}
|
||||
{3580682400 3600 0 +01}
|
||||
{3607898400 0 1 +01}
|
||||
{3611527200 3600 0 +01}
|
||||
{3638743200 0 1 +01}
|
||||
{3641767200 3600 0 +01}
|
||||
{3669588000 0 1 +01}
|
||||
{3672612000 3600 0 +01}
|
||||
{3699828000 0 1 +01}
|
||||
{3702852000 3600 0 +01}
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ set TZData(:Africa/Sao_Tome) {
|
||||
{-2713912016 -2205 0 LMT}
|
||||
{-1830384000 0 0 GMT}
|
||||
{1514768400 3600 0 WAT}
|
||||
{1546304400 0 0 GMT}
|
||||
}
|
||||
|
||||
@@ -93,165 +93,4 @@ set TZData(:America/Campo_Grande) {
|
||||
{1518922800 -14400 0 -04}
|
||||
{1541304000 -10800 1 -04}
|
||||
{1550372400 -14400 0 -04}
|
||||
{1572753600 -10800 1 -04}
|
||||
{1581822000 -14400 0 -04}
|
||||
{1604203200 -10800 1 -04}
|
||||
{1613876400 -14400 0 -04}
|
||||
{1636257600 -10800 1 -04}
|
||||
{1645326000 -14400 0 -04}
|
||||
{1667707200 -10800 1 -04}
|
||||
{1677380400 -14400 0 -04}
|
||||
{1699156800 -10800 1 -04}
|
||||
{1708225200 -14400 0 -04}
|
||||
{1730606400 -10800 1 -04}
|
||||
{1739674800 -14400 0 -04}
|
||||
{1762056000 -10800 1 -04}
|
||||
{1771729200 -14400 0 -04}
|
||||
{1793505600 -10800 1 -04}
|
||||
{1803178800 -14400 0 -04}
|
||||
{1825560000 -10800 1 -04}
|
||||
{1834628400 -14400 0 -04}
|
||||
{1857009600 -10800 1 -04}
|
||||
{1866078000 -14400 0 -04}
|
||||
{1888459200 -10800 1 -04}
|
||||
{1897527600 -14400 0 -04}
|
||||
{1919908800 -10800 1 -04}
|
||||
{1928977200 -14400 0 -04}
|
||||
{1951358400 -10800 1 -04}
|
||||
{1960426800 -14400 0 -04}
|
||||
{1983412800 -10800 1 -04}
|
||||
{1992481200 -14400 0 -04}
|
||||
{2014862400 -10800 1 -04}
|
||||
{2024535600 -14400 0 -04}
|
||||
{2046312000 -10800 1 -04}
|
||||
{2055380400 -14400 0 -04}
|
||||
{2077761600 -10800 1 -04}
|
||||
{2086830000 -14400 0 -04}
|
||||
{2109211200 -10800 1 -04}
|
||||
{2118884400 -14400 0 -04}
|
||||
{2140660800 -10800 1 -04}
|
||||
{2150334000 -14400 0 -04}
|
||||
{2172715200 -10800 1 -04}
|
||||
{2181783600 -14400 0 -04}
|
||||
{2204164800 -10800 1 -04}
|
||||
{2213233200 -14400 0 -04}
|
||||
{2235614400 -10800 1 -04}
|
||||
{2244682800 -14400 0 -04}
|
||||
{2267064000 -10800 1 -04}
|
||||
{2276132400 -14400 0 -04}
|
||||
{2298513600 -10800 1 -04}
|
||||
{2307582000 -14400 0 -04}
|
||||
{2329963200 -10800 1 -04}
|
||||
{2339636400 -14400 0 -04}
|
||||
{2362017600 -10800 1 -04}
|
||||
{2371086000 -14400 0 -04}
|
||||
{2393467200 -10800 1 -04}
|
||||
{2402535600 -14400 0 -04}
|
||||
{2424916800 -10800 1 -04}
|
||||
{2433985200 -14400 0 -04}
|
||||
{2456366400 -10800 1 -04}
|
||||
{2465434800 -14400 0 -04}
|
||||
{2487816000 -10800 1 -04}
|
||||
{2497489200 -14400 0 -04}
|
||||
{2519870400 -10800 1 -04}
|
||||
{2528938800 -14400 0 -04}
|
||||
{2551320000 -10800 1 -04}
|
||||
{2560388400 -14400 0 -04}
|
||||
{2582769600 -10800 1 -04}
|
||||
{2591838000 -14400 0 -04}
|
||||
{2614219200 -10800 1 -04}
|
||||
{2623287600 -14400 0 -04}
|
||||
{2645668800 -10800 1 -04}
|
||||
{2654737200 -14400 0 -04}
|
||||
{2677118400 -10800 1 -04}
|
||||
{2686791600 -14400 0 -04}
|
||||
{2709172800 -10800 1 -04}
|
||||
{2718241200 -14400 0 -04}
|
||||
{2740622400 -10800 1 -04}
|
||||
{2749690800 -14400 0 -04}
|
||||
{2772072000 -10800 1 -04}
|
||||
{2781140400 -14400 0 -04}
|
||||
{2803521600 -10800 1 -04}
|
||||
{2812590000 -14400 0 -04}
|
||||
{2834971200 -10800 1 -04}
|
||||
{2844039600 -14400 0 -04}
|
||||
{2867025600 -10800 1 -04}
|
||||
{2876094000 -14400 0 -04}
|
||||
{2898475200 -10800 1 -04}
|
||||
{2907543600 -14400 0 -04}
|
||||
{2929924800 -10800 1 -04}
|
||||
{2938993200 -14400 0 -04}
|
||||
{2961374400 -10800 1 -04}
|
||||
{2970442800 -14400 0 -04}
|
||||
{2992824000 -10800 1 -04}
|
||||
{3001892400 -14400 0 -04}
|
||||
{3024273600 -10800 1 -04}
|
||||
{3033946800 -14400 0 -04}
|
||||
{3056328000 -10800 1 -04}
|
||||
{3065396400 -14400 0 -04}
|
||||
{3087777600 -10800 1 -04}
|
||||
{3096846000 -14400 0 -04}
|
||||
{3119227200 -10800 1 -04}
|
||||
{3128295600 -14400 0 -04}
|
||||
{3150676800 -10800 1 -04}
|
||||
{3159745200 -14400 0 -04}
|
||||
{3182126400 -10800 1 -04}
|
||||
{3191194800 -14400 0 -04}
|
||||
{3213576000 -10800 1 -04}
|
||||
{3223249200 -14400 0 -04}
|
||||
{3245630400 -10800 1 -04}
|
||||
{3254698800 -14400 0 -04}
|
||||
{3277080000 -10800 1 -04}
|
||||
{3286148400 -14400 0 -04}
|
||||
{3308529600 -10800 1 -04}
|
||||
{3317598000 -14400 0 -04}
|
||||
{3339979200 -10800 1 -04}
|
||||
{3349047600 -14400 0 -04}
|
||||
{3371428800 -10800 1 -04}
|
||||
{3381102000 -14400 0 -04}
|
||||
{3403483200 -10800 1 -04}
|
||||
{3412551600 -14400 0 -04}
|
||||
{3434932800 -10800 1 -04}
|
||||
{3444001200 -14400 0 -04}
|
||||
{3466382400 -10800 1 -04}
|
||||
{3475450800 -14400 0 -04}
|
||||
{3497832000 -10800 1 -04}
|
||||
{3506900400 -14400 0 -04}
|
||||
{3529281600 -10800 1 -04}
|
||||
{3538350000 -14400 0 -04}
|
||||
{3560731200 -10800 1 -04}
|
||||
{3570404400 -14400 0 -04}
|
||||
{3592785600 -10800 1 -04}
|
||||
{3601854000 -14400 0 -04}
|
||||
{3624235200 -10800 1 -04}
|
||||
{3633303600 -14400 0 -04}
|
||||
{3655684800 -10800 1 -04}
|
||||
{3664753200 -14400 0 -04}
|
||||
{3687134400 -10800 1 -04}
|
||||
{3696202800 -14400 0 -04}
|
||||
{3718584000 -10800 1 -04}
|
||||
{3727652400 -14400 0 -04}
|
||||
{3750638400 -10800 1 -04}
|
||||
{3759706800 -14400 0 -04}
|
||||
{3782088000 -10800 1 -04}
|
||||
{3791156400 -14400 0 -04}
|
||||
{3813537600 -10800 1 -04}
|
||||
{3822606000 -14400 0 -04}
|
||||
{3844987200 -10800 1 -04}
|
||||
{3854055600 -14400 0 -04}
|
||||
{3876436800 -10800 1 -04}
|
||||
{3885505200 -14400 0 -04}
|
||||
{3907886400 -10800 1 -04}
|
||||
{3917559600 -14400 0 -04}
|
||||
{3939940800 -10800 1 -04}
|
||||
{3949009200 -14400 0 -04}
|
||||
{3971390400 -10800 1 -04}
|
||||
{3980458800 -14400 0 -04}
|
||||
{4002840000 -10800 1 -04}
|
||||
{4011908400 -14400 0 -04}
|
||||
{4034289600 -10800 1 -04}
|
||||
{4043358000 -14400 0 -04}
|
||||
{4065739200 -10800 1 -04}
|
||||
{4074807600 -14400 0 -04}
|
||||
{4097188800 -10800 1 -04}
|
||||
}
|
||||
|
||||
@@ -93,165 +93,4 @@ set TZData(:America/Cuiaba) {
|
||||
{1518922800 -14400 0 -04}
|
||||
{1541304000 -10800 1 -04}
|
||||
{1550372400 -14400 0 -04}
|
||||
{1572753600 -10800 1 -04}
|
||||
{1581822000 -14400 0 -04}
|
||||
{1604203200 -10800 1 -04}
|
||||
{1613876400 -14400 0 -04}
|
||||
{1636257600 -10800 1 -04}
|
||||
{1645326000 -14400 0 -04}
|
||||
{1667707200 -10800 1 -04}
|
||||
{1677380400 -14400 0 -04}
|
||||
{1699156800 -10800 1 -04}
|
||||
{1708225200 -14400 0 -04}
|
||||
{1730606400 -10800 1 -04}
|
||||
{1739674800 -14400 0 -04}
|
||||
{1762056000 -10800 1 -04}
|
||||
{1771729200 -14400 0 -04}
|
||||
{1793505600 -10800 1 -04}
|
||||
{1803178800 -14400 0 -04}
|
||||
{1825560000 -10800 1 -04}
|
||||
{1834628400 -14400 0 -04}
|
||||
{1857009600 -10800 1 -04}
|
||||
{1866078000 -14400 0 -04}
|
||||
{1888459200 -10800 1 -04}
|
||||
{1897527600 -14400 0 -04}
|
||||
{1919908800 -10800 1 -04}
|
||||
{1928977200 -14400 0 -04}
|
||||
{1951358400 -10800 1 -04}
|
||||
{1960426800 -14400 0 -04}
|
||||
{1983412800 -10800 1 -04}
|
||||
{1992481200 -14400 0 -04}
|
||||
{2014862400 -10800 1 -04}
|
||||
{2024535600 -14400 0 -04}
|
||||
{2046312000 -10800 1 -04}
|
||||
{2055380400 -14400 0 -04}
|
||||
{2077761600 -10800 1 -04}
|
||||
{2086830000 -14400 0 -04}
|
||||
{2109211200 -10800 1 -04}
|
||||
{2118884400 -14400 0 -04}
|
||||
{2140660800 -10800 1 -04}
|
||||
{2150334000 -14400 0 -04}
|
||||
{2172715200 -10800 1 -04}
|
||||
{2181783600 -14400 0 -04}
|
||||
{2204164800 -10800 1 -04}
|
||||
{2213233200 -14400 0 -04}
|
||||
{2235614400 -10800 1 -04}
|
||||
{2244682800 -14400 0 -04}
|
||||
{2267064000 -10800 1 -04}
|
||||
{2276132400 -14400 0 -04}
|
||||
{2298513600 -10800 1 -04}
|
||||
{2307582000 -14400 0 -04}
|
||||
{2329963200 -10800 1 -04}
|
||||
{2339636400 -14400 0 -04}
|
||||
{2362017600 -10800 1 -04}
|
||||
{2371086000 -14400 0 -04}
|
||||
{2393467200 -10800 1 -04}
|
||||
{2402535600 -14400 0 -04}
|
||||
{2424916800 -10800 1 -04}
|
||||
{2433985200 -14400 0 -04}
|
||||
{2456366400 -10800 1 -04}
|
||||
{2465434800 -14400 0 -04}
|
||||
{2487816000 -10800 1 -04}
|
||||
{2497489200 -14400 0 -04}
|
||||
{2519870400 -10800 1 -04}
|
||||
{2528938800 -14400 0 -04}
|
||||
{2551320000 -10800 1 -04}
|
||||
{2560388400 -14400 0 -04}
|
||||
{2582769600 -10800 1 -04}
|
||||
{2591838000 -14400 0 -04}
|
||||
{2614219200 -10800 1 -04}
|
||||
{2623287600 -14400 0 -04}
|
||||
{2645668800 -10800 1 -04}
|
||||
{2654737200 -14400 0 -04}
|
||||
{2677118400 -10800 1 -04}
|
||||
{2686791600 -14400 0 -04}
|
||||
{2709172800 -10800 1 -04}
|
||||
{2718241200 -14400 0 -04}
|
||||
{2740622400 -10800 1 -04}
|
||||
{2749690800 -14400 0 -04}
|
||||
{2772072000 -10800 1 -04}
|
||||
{2781140400 -14400 0 -04}
|
||||
{2803521600 -10800 1 -04}
|
||||
{2812590000 -14400 0 -04}
|
||||
{2834971200 -10800 1 -04}
|
||||
{2844039600 -14400 0 -04}
|
||||
{2867025600 -10800 1 -04}
|
||||
{2876094000 -14400 0 -04}
|
||||
{2898475200 -10800 1 -04}
|
||||
{2907543600 -14400 0 -04}
|
||||
{2929924800 -10800 1 -04}
|
||||
{2938993200 -14400 0 -04}
|
||||
{2961374400 -10800 1 -04}
|
||||
{2970442800 -14400 0 -04}
|
||||
{2992824000 -10800 1 -04}
|
||||
{3001892400 -14400 0 -04}
|
||||
{3024273600 -10800 1 -04}
|
||||
{3033946800 -14400 0 -04}
|
||||
{3056328000 -10800 1 -04}
|
||||
{3065396400 -14400 0 -04}
|
||||
{3087777600 -10800 1 -04}
|
||||
{3096846000 -14400 0 -04}
|
||||
{3119227200 -10800 1 -04}
|
||||
{3128295600 -14400 0 -04}
|
||||
{3150676800 -10800 1 -04}
|
||||
{3159745200 -14400 0 -04}
|
||||
{3182126400 -10800 1 -04}
|
||||
{3191194800 -14400 0 -04}
|
||||
{3213576000 -10800 1 -04}
|
||||
{3223249200 -14400 0 -04}
|
||||
{3245630400 -10800 1 -04}
|
||||
{3254698800 -14400 0 -04}
|
||||
{3277080000 -10800 1 -04}
|
||||
{3286148400 -14400 0 -04}
|
||||
{3308529600 -10800 1 -04}
|
||||
{3317598000 -14400 0 -04}
|
||||
{3339979200 -10800 1 -04}
|
||||
{3349047600 -14400 0 -04}
|
||||
{3371428800 -10800 1 -04}
|
||||
{3381102000 -14400 0 -04}
|
||||
{3403483200 -10800 1 -04}
|
||||
{3412551600 -14400 0 -04}
|
||||
{3434932800 -10800 1 -04}
|
||||
{3444001200 -14400 0 -04}
|
||||
{3466382400 -10800 1 -04}
|
||||
{3475450800 -14400 0 -04}
|
||||
{3497832000 -10800 1 -04}
|
||||
{3506900400 -14400 0 -04}
|
||||
{3529281600 -10800 1 -04}
|
||||
{3538350000 -14400 0 -04}
|
||||
{3560731200 -10800 1 -04}
|
||||
{3570404400 -14400 0 -04}
|
||||
{3592785600 -10800 1 -04}
|
||||
{3601854000 -14400 0 -04}
|
||||
{3624235200 -10800 1 -04}
|
||||
{3633303600 -14400 0 -04}
|
||||
{3655684800 -10800 1 -04}
|
||||
{3664753200 -14400 0 -04}
|
||||
{3687134400 -10800 1 -04}
|
||||
{3696202800 -14400 0 -04}
|
||||
{3718584000 -10800 1 -04}
|
||||
{3727652400 -14400 0 -04}
|
||||
{3750638400 -10800 1 -04}
|
||||
{3759706800 -14400 0 -04}
|
||||
{3782088000 -10800 1 -04}
|
||||
{3791156400 -14400 0 -04}
|
||||
{3813537600 -10800 1 -04}
|
||||
{3822606000 -14400 0 -04}
|
||||
{3844987200 -10800 1 -04}
|
||||
{3854055600 -14400 0 -04}
|
||||
{3876436800 -10800 1 -04}
|
||||
{3885505200 -14400 0 -04}
|
||||
{3907886400 -10800 1 -04}
|
||||
{3917559600 -14400 0 -04}
|
||||
{3939940800 -10800 1 -04}
|
||||
{3949009200 -14400 0 -04}
|
||||
{3971390400 -10800 1 -04}
|
||||
{3980458800 -14400 0 -04}
|
||||
{4002840000 -10800 1 -04}
|
||||
{4011908400 -14400 0 -04}
|
||||
{4034289600 -10800 1 -04}
|
||||
{4043358000 -14400 0 -04}
|
||||
{4065739200 -10800 1 -04}
|
||||
{4074807600 -14400 0 -04}
|
||||
{4097188800 -10800 1 -04}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,11 @@ set TZData(:America/Detroit) {
|
||||
{-757364400 -18000 0 EST}
|
||||
{-684349200 -14400 1 EDT}
|
||||
{-671047200 -18000 0 EST}
|
||||
{-80506740 -14400 0 EDT}
|
||||
{-68666400 -18000 0 EST}
|
||||
{-52938000 -14400 1 EDT}
|
||||
{-37216800 -18000 0 EST}
|
||||
{-31518000 -18000 0 EST}
|
||||
{94712400 -18000 0 EST}
|
||||
{104914800 -14400 1 EDT}
|
||||
{120636000 -18000 0 EST}
|
||||
|
||||
@@ -20,10 +20,6 @@ set TZData(:America/Edmonton) {
|
||||
{-765388800 -25200 0 MST}
|
||||
{-715791600 -21600 1 MDT}
|
||||
{-702489600 -25200 0 MST}
|
||||
{-84380400 -21600 1 MDT}
|
||||
{-68659200 -25200 0 MST}
|
||||
{-21481200 -21600 1 MDT}
|
||||
{-5760000 -25200 0 MST}
|
||||
{73472400 -21600 1 MDT}
|
||||
{89193600 -25200 0 MST}
|
||||
{104922000 -21600 1 MDT}
|
||||
|
||||
@@ -11,12 +11,6 @@ set TZData(:America/Indiana/Tell_City) {
|
||||
{-769395600 -18000 1 CPT}
|
||||
{-765392400 -21600 0 CST}
|
||||
{-757360800 -21600 0 CST}
|
||||
{-747244800 -18000 1 CDT}
|
||||
{-733942800 -21600 0 CST}
|
||||
{-526492800 -18000 1 CDT}
|
||||
{-513190800 -21600 0 CST}
|
||||
{-495043200 -18000 1 CDT}
|
||||
{-481741200 -21600 0 CST}
|
||||
{-462996000 -18000 1 CDT}
|
||||
{-450291600 -21600 0 CST}
|
||||
{-431539200 -18000 1 CDT}
|
||||
@@ -28,16 +22,18 @@ set TZData(:America/Indiana/Tell_City) {
|
||||
{-337190400 -18000 1 CDT}
|
||||
{-323888400 -21600 0 CST}
|
||||
{-305740800 -18000 1 CDT}
|
||||
{-289414800 -21600 0 CST}
|
||||
{-292438800 -21600 0 CST}
|
||||
{-273686400 -18000 1 CDT}
|
||||
{-260989200 -21600 0 CST}
|
||||
{-257965200 -21600 0 CST}
|
||||
{-242236800 -18000 1 CDT}
|
||||
{-226515600 -21600 0 CST}
|
||||
{-210787200 -18000 1 CDT}
|
||||
{-195066000 -21600 0 CST}
|
||||
{-179337600 -18000 0 EST}
|
||||
{-31518000 -18000 0 EST}
|
||||
{-21488400 -14400 1 EDT}
|
||||
{-68662800 -21600 0 CST}
|
||||
{-52934400 -18000 1 CDT}
|
||||
{-37213200 -21600 0 CST}
|
||||
{-21484800 -14400 0 EDT}
|
||||
{-5767200 -18000 0 EST}
|
||||
{9961200 -14400 1 EDT}
|
||||
{25682400 -18000 0 EST}
|
||||
|
||||
@@ -17,12 +17,9 @@ set TZData(:America/Kentucky/Louisville) {
|
||||
{-769395600 -18000 1 CPT}
|
||||
{-765392400 -21600 0 CST}
|
||||
{-757360800 -21600 0 CST}
|
||||
{-747244800 -18000 1 CDT}
|
||||
{-747251940 -18000 1 CDT}
|
||||
{-744224400 -21600 0 CST}
|
||||
{-715795200 -18000 1 CDT}
|
||||
{-684349200 -18000 1 CDT}
|
||||
{-652899600 -18000 1 CDT}
|
||||
{-620845200 -18000 1 CDT}
|
||||
{-620841600 -18000 1 CDT}
|
||||
{-608144400 -21600 0 CST}
|
||||
{-589392000 -18000 1 CDT}
|
||||
{-576090000 -21600 0 CST}
|
||||
@@ -45,7 +42,7 @@ set TZData(:America/Kentucky/Louisville) {
|
||||
{-305740800 -18000 1 CDT}
|
||||
{-289414800 -21600 0 CST}
|
||||
{-273686400 -18000 1 CDT}
|
||||
{-266432400 -18000 0 EST}
|
||||
{-266428800 -18000 0 EST}
|
||||
{-63140400 -18000 0 EST}
|
||||
{-52938000 -14400 1 EDT}
|
||||
{-37216800 -18000 0 EST}
|
||||
|
||||
@@ -46,7 +46,8 @@ set TZData(:America/Metlakatla) {
|
||||
{1489316400 -28800 1 AKDT}
|
||||
{1509876000 -32400 0 AKST}
|
||||
{1520766000 -28800 1 AKDT}
|
||||
{1541325600 -32400 0 AKST}
|
||||
{1541329200 -28800 0 PST}
|
||||
{1547978400 -32400 0 AKST}
|
||||
{1552215600 -28800 1 AKDT}
|
||||
{1572775200 -32400 0 AKST}
|
||||
{1583665200 -28800 1 AKDT}
|
||||
|
||||
@@ -94,165 +94,4 @@ set TZData(:America/Sao_Paulo) {
|
||||
{1518919200 -10800 0 -03}
|
||||
{1541300400 -7200 1 -03}
|
||||
{1550368800 -10800 0 -03}
|
||||
{1572750000 -7200 1 -03}
|
||||
{1581818400 -10800 0 -03}
|
||||
{1604199600 -7200 1 -03}
|
||||
{1613872800 -10800 0 -03}
|
||||
{1636254000 -7200 1 -03}
|
||||
{1645322400 -10800 0 -03}
|
||||
{1667703600 -7200 1 -03}
|
||||
{1677376800 -10800 0 -03}
|
||||
{1699153200 -7200 1 -03}
|
||||
{1708221600 -10800 0 -03}
|
||||
{1730602800 -7200 1 -03}
|
||||
{1739671200 -10800 0 -03}
|
||||
{1762052400 -7200 1 -03}
|
||||
{1771725600 -10800 0 -03}
|
||||
{1793502000 -7200 1 -03}
|
||||
{1803175200 -10800 0 -03}
|
||||
{1825556400 -7200 1 -03}
|
||||
{1834624800 -10800 0 -03}
|
||||
{1857006000 -7200 1 -03}
|
||||
{1866074400 -10800 0 -03}
|
||||
{1888455600 -7200 1 -03}
|
||||
{1897524000 -10800 0 -03}
|
||||
{1919905200 -7200 1 -03}
|
||||
{1928973600 -10800 0 -03}
|
||||
{1951354800 -7200 1 -03}
|
||||
{1960423200 -10800 0 -03}
|
||||
{1983409200 -7200 1 -03}
|
||||
{1992477600 -10800 0 -03}
|
||||
{2014858800 -7200 1 -03}
|
||||
{2024532000 -10800 0 -03}
|
||||
{2046308400 -7200 1 -03}
|
||||
{2055376800 -10800 0 -03}
|
||||
{2077758000 -7200 1 -03}
|
||||
{2086826400 -10800 0 -03}
|
||||
{2109207600 -7200 1 -03}
|
||||
{2118880800 -10800 0 -03}
|
||||
{2140657200 -7200 1 -03}
|
||||
{2150330400 -10800 0 -03}
|
||||
{2172711600 -7200 1 -03}
|
||||
{2181780000 -10800 0 -03}
|
||||
{2204161200 -7200 1 -03}
|
||||
{2213229600 -10800 0 -03}
|
||||
{2235610800 -7200 1 -03}
|
||||
{2244679200 -10800 0 -03}
|
||||
{2267060400 -7200 1 -03}
|
||||
{2276128800 -10800 0 -03}
|
||||
{2298510000 -7200 1 -03}
|
||||
{2307578400 -10800 0 -03}
|
||||
{2329959600 -7200 1 -03}
|
||||
{2339632800 -10800 0 -03}
|
||||
{2362014000 -7200 1 -03}
|
||||
{2371082400 -10800 0 -03}
|
||||
{2393463600 -7200 1 -03}
|
||||
{2402532000 -10800 0 -03}
|
||||
{2424913200 -7200 1 -03}
|
||||
{2433981600 -10800 0 -03}
|
||||
{2456362800 -7200 1 -03}
|
||||
{2465431200 -10800 0 -03}
|
||||
{2487812400 -7200 1 -03}
|
||||
{2497485600 -10800 0 -03}
|
||||
{2519866800 -7200 1 -03}
|
||||
{2528935200 -10800 0 -03}
|
||||
{2551316400 -7200 1 -03}
|
||||
{2560384800 -10800 0 -03}
|
||||
{2582766000 -7200 1 -03}
|
||||
{2591834400 -10800 0 -03}
|
||||
{2614215600 -7200 1 -03}
|
||||
{2623284000 -10800 0 -03}
|
||||
{2645665200 -7200 1 -03}
|
||||
{2654733600 -10800 0 -03}
|
||||
{2677114800 -7200 1 -03}
|
||||
{2686788000 -10800 0 -03}
|
||||
{2709169200 -7200 1 -03}
|
||||
{2718237600 -10800 0 -03}
|
||||
{2740618800 -7200 1 -03}
|
||||
{2749687200 -10800 0 -03}
|
||||
{2772068400 -7200 1 -03}
|
||||
{2781136800 -10800 0 -03}
|
||||
{2803518000 -7200 1 -03}
|
||||
{2812586400 -10800 0 -03}
|
||||
{2834967600 -7200 1 -03}
|
||||
{2844036000 -10800 0 -03}
|
||||
{2867022000 -7200 1 -03}
|
||||
{2876090400 -10800 0 -03}
|
||||
{2898471600 -7200 1 -03}
|
||||
{2907540000 -10800 0 -03}
|
||||
{2929921200 -7200 1 -03}
|
||||
{2938989600 -10800 0 -03}
|
||||
{2961370800 -7200 1 -03}
|
||||
{2970439200 -10800 0 -03}
|
||||
{2992820400 -7200 1 -03}
|
||||
{3001888800 -10800 0 -03}
|
||||
{3024270000 -7200 1 -03}
|
||||
{3033943200 -10800 0 -03}
|
||||
{3056324400 -7200 1 -03}
|
||||
{3065392800 -10800 0 -03}
|
||||
{3087774000 -7200 1 -03}
|
||||
{3096842400 -10800 0 -03}
|
||||
{3119223600 -7200 1 -03}
|
||||
{3128292000 -10800 0 -03}
|
||||
{3150673200 -7200 1 -03}
|
||||
{3159741600 -10800 0 -03}
|
||||
{3182122800 -7200 1 -03}
|
||||
{3191191200 -10800 0 -03}
|
||||
{3213572400 -7200 1 -03}
|
||||
{3223245600 -10800 0 -03}
|
||||
{3245626800 -7200 1 -03}
|
||||
{3254695200 -10800 0 -03}
|
||||
{3277076400 -7200 1 -03}
|
||||
{3286144800 -10800 0 -03}
|
||||
{3308526000 -7200 1 -03}
|
||||
{3317594400 -10800 0 -03}
|
||||
{3339975600 -7200 1 -03}
|
||||
{3349044000 -10800 0 -03}
|
||||
{3371425200 -7200 1 -03}
|
||||
{3381098400 -10800 0 -03}
|
||||
{3403479600 -7200 1 -03}
|
||||
{3412548000 -10800 0 -03}
|
||||
{3434929200 -7200 1 -03}
|
||||
{3443997600 -10800 0 -03}
|
||||
{3466378800 -7200 1 -03}
|
||||
{3475447200 -10800 0 -03}
|
||||
{3497828400 -7200 1 -03}
|
||||
{3506896800 -10800 0 -03}
|
||||
{3529278000 -7200 1 -03}
|
||||
{3538346400 -10800 0 -03}
|
||||
{3560727600 -7200 1 -03}
|
||||
{3570400800 -10800 0 -03}
|
||||
{3592782000 -7200 1 -03}
|
||||
{3601850400 -10800 0 -03}
|
||||
{3624231600 -7200 1 -03}
|
||||
{3633300000 -10800 0 -03}
|
||||
{3655681200 -7200 1 -03}
|
||||
{3664749600 -10800 0 -03}
|
||||
{3687130800 -7200 1 -03}
|
||||
{3696199200 -10800 0 -03}
|
||||
{3718580400 -7200 1 -03}
|
||||
{3727648800 -10800 0 -03}
|
||||
{3750634800 -7200 1 -03}
|
||||
{3759703200 -10800 0 -03}
|
||||
{3782084400 -7200 1 -03}
|
||||
{3791152800 -10800 0 -03}
|
||||
{3813534000 -7200 1 -03}
|
||||
{3822602400 -10800 0 -03}
|
||||
{3844983600 -7200 1 -03}
|
||||
{3854052000 -10800 0 -03}
|
||||
{3876433200 -7200 1 -03}
|
||||
{3885501600 -10800 0 -03}
|
||||
{3907882800 -7200 1 -03}
|
||||
{3917556000 -10800 0 -03}
|
||||
{3939937200 -7200 1 -03}
|
||||
{3949005600 -10800 0 -03}
|
||||
{3971386800 -7200 1 -03}
|
||||
{3980455200 -10800 0 -03}
|
||||
{4002836400 -7200 1 -03}
|
||||
{4011904800 -10800 0 -03}
|
||||
{4034286000 -7200 1 -03}
|
||||
{4043354400 -10800 0 -03}
|
||||
{4065735600 -7200 1 -03}
|
||||
{4074804000 -10800 0 -03}
|
||||
{4097185200 -7200 1 -03}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ set TZData(:America/Vancouver) {
|
||||
{-769395600 -25200 1 PPT}
|
||||
{-765385200 -28800 0 PST}
|
||||
{-747237600 -25200 1 PDT}
|
||||
{-732726000 -28800 0 PST}
|
||||
{-733935600 -28800 0 PST}
|
||||
{-715788000 -25200 1 PDT}
|
||||
{-702486000 -28800 0 PST}
|
||||
{-684338400 -25200 1 PDT}
|
||||
|
||||
@@ -40,6 +40,10 @@ set TZData(:Asia/Gaza) {
|
||||
{150843600 7200 0 IST}
|
||||
{167176800 10800 1 IDT}
|
||||
{178664400 7200 0 IST}
|
||||
{334015200 10800 1 IDT}
|
||||
{337644000 7200 0 IST}
|
||||
{452556000 10800 1 IDT}
|
||||
{462232800 7200 0 IST}
|
||||
{482277600 10800 1 IDT}
|
||||
{495579600 7200 0 IST}
|
||||
{516751200 10800 1 IDT}
|
||||
@@ -113,166 +117,166 @@ set TZData(:Asia/Gaza) {
|
||||
{1509141600 7200 0 EET}
|
||||
{1521846000 10800 1 EEST}
|
||||
{1540591200 7200 0 EET}
|
||||
{1553295600 10800 1 EEST}
|
||||
{1553810400 10800 1 EEST}
|
||||
{1572040800 7200 0 EET}
|
||||
{1585350000 10800 1 EEST}
|
||||
{1585260000 10800 1 EEST}
|
||||
{1604095200 7200 0 EET}
|
||||
{1616799600 10800 1 EEST}
|
||||
{1616709600 10800 1 EEST}
|
||||
{1635544800 7200 0 EET}
|
||||
{1648249200 10800 1 EEST}
|
||||
{1648159200 10800 1 EEST}
|
||||
{1666994400 7200 0 EET}
|
||||
{1679698800 10800 1 EEST}
|
||||
{1680213600 10800 1 EEST}
|
||||
{1698444000 7200 0 EET}
|
||||
{1711148400 10800 1 EEST}
|
||||
{1711663200 10800 1 EEST}
|
||||
{1729893600 7200 0 EET}
|
||||
{1742598000 10800 1 EEST}
|
||||
{1743112800 10800 1 EEST}
|
||||
{1761343200 7200 0 EET}
|
||||
{1774652400 10800 1 EEST}
|
||||
{1774562400 10800 1 EEST}
|
||||
{1793397600 7200 0 EET}
|
||||
{1806102000 10800 1 EEST}
|
||||
{1806012000 10800 1 EEST}
|
||||
{1824847200 7200 0 EET}
|
||||
{1837551600 10800 1 EEST}
|
||||
{1838066400 10800 1 EEST}
|
||||
{1856296800 7200 0 EET}
|
||||
{1869001200 10800 1 EEST}
|
||||
{1869516000 10800 1 EEST}
|
||||
{1887746400 7200 0 EET}
|
||||
{1900450800 10800 1 EEST}
|
||||
{1900965600 10800 1 EEST}
|
||||
{1919196000 7200 0 EET}
|
||||
{1931900400 10800 1 EEST}
|
||||
{1932415200 10800 1 EEST}
|
||||
{1950645600 7200 0 EET}
|
||||
{1963954800 10800 1 EEST}
|
||||
{1963864800 10800 1 EEST}
|
||||
{1982700000 7200 0 EET}
|
||||
{1995404400 10800 1 EEST}
|
||||
{1995314400 10800 1 EEST}
|
||||
{2014149600 7200 0 EET}
|
||||
{2026854000 10800 1 EEST}
|
||||
{2027368800 10800 1 EEST}
|
||||
{2045599200 7200 0 EET}
|
||||
{2058303600 10800 1 EEST}
|
||||
{2058818400 10800 1 EEST}
|
||||
{2077048800 7200 0 EET}
|
||||
{2089753200 10800 1 EEST}
|
||||
{2090268000 10800 1 EEST}
|
||||
{2108498400 7200 0 EET}
|
||||
{2121807600 10800 1 EEST}
|
||||
{2121717600 10800 1 EEST}
|
||||
{2140552800 7200 0 EET}
|
||||
{2153257200 10800 1 EEST}
|
||||
{2153167200 10800 1 EEST}
|
||||
{2172002400 7200 0 EET}
|
||||
{2184706800 10800 1 EEST}
|
||||
{2184616800 10800 1 EEST}
|
||||
{2203452000 7200 0 EET}
|
||||
{2216156400 10800 1 EEST}
|
||||
{2216671200 10800 1 EEST}
|
||||
{2234901600 7200 0 EET}
|
||||
{2247606000 10800 1 EEST}
|
||||
{2248120800 10800 1 EEST}
|
||||
{2266351200 7200 0 EET}
|
||||
{2279055600 10800 1 EEST}
|
||||
{2279570400 10800 1 EEST}
|
||||
{2297800800 7200 0 EET}
|
||||
{2311110000 10800 1 EEST}
|
||||
{2311020000 10800 1 EEST}
|
||||
{2329855200 7200 0 EET}
|
||||
{2342559600 10800 1 EEST}
|
||||
{2342469600 10800 1 EEST}
|
||||
{2361304800 7200 0 EET}
|
||||
{2374009200 10800 1 EEST}
|
||||
{2374524000 10800 1 EEST}
|
||||
{2392754400 7200 0 EET}
|
||||
{2405458800 10800 1 EEST}
|
||||
{2405973600 10800 1 EEST}
|
||||
{2424204000 7200 0 EET}
|
||||
{2436908400 10800 1 EEST}
|
||||
{2437423200 10800 1 EEST}
|
||||
{2455653600 7200 0 EET}
|
||||
{2468962800 10800 1 EEST}
|
||||
{2468872800 10800 1 EEST}
|
||||
{2487708000 7200 0 EET}
|
||||
{2500412400 10800 1 EEST}
|
||||
{2500322400 10800 1 EEST}
|
||||
{2519157600 7200 0 EET}
|
||||
{2531862000 10800 1 EEST}
|
||||
{2531772000 10800 1 EEST}
|
||||
{2550607200 7200 0 EET}
|
||||
{2563311600 10800 1 EEST}
|
||||
{2563826400 10800 1 EEST}
|
||||
{2582056800 7200 0 EET}
|
||||
{2594761200 10800 1 EEST}
|
||||
{2595276000 10800 1 EEST}
|
||||
{2613506400 7200 0 EET}
|
||||
{2626210800 10800 1 EEST}
|
||||
{2626725600 10800 1 EEST}
|
||||
{2644956000 7200 0 EET}
|
||||
{2658265200 10800 1 EEST}
|
||||
{2658175200 10800 1 EEST}
|
||||
{2677010400 7200 0 EET}
|
||||
{2689714800 10800 1 EEST}
|
||||
{2689624800 10800 1 EEST}
|
||||
{2708460000 7200 0 EET}
|
||||
{2721164400 10800 1 EEST}
|
||||
{2721679200 10800 1 EEST}
|
||||
{2739909600 7200 0 EET}
|
||||
{2752614000 10800 1 EEST}
|
||||
{2753128800 10800 1 EEST}
|
||||
{2771359200 7200 0 EET}
|
||||
{2784063600 10800 1 EEST}
|
||||
{2784578400 10800 1 EEST}
|
||||
{2802808800 7200 0 EET}
|
||||
{2815513200 10800 1 EEST}
|
||||
{2816028000 10800 1 EEST}
|
||||
{2834258400 7200 0 EET}
|
||||
{2847567600 10800 1 EEST}
|
||||
{2847477600 10800 1 EEST}
|
||||
{2866312800 7200 0 EET}
|
||||
{2879017200 10800 1 EEST}
|
||||
{2878927200 10800 1 EEST}
|
||||
{2897762400 7200 0 EET}
|
||||
{2910466800 10800 1 EEST}
|
||||
{2910981600 10800 1 EEST}
|
||||
{2929212000 7200 0 EET}
|
||||
{2941916400 10800 1 EEST}
|
||||
{2942431200 10800 1 EEST}
|
||||
{2960661600 7200 0 EET}
|
||||
{2973366000 10800 1 EEST}
|
||||
{2973880800 10800 1 EEST}
|
||||
{2992111200 7200 0 EET}
|
||||
{3005420400 10800 1 EEST}
|
||||
{3005330400 10800 1 EEST}
|
||||
{3024165600 7200 0 EET}
|
||||
{3036870000 10800 1 EEST}
|
||||
{3036780000 10800 1 EEST}
|
||||
{3055615200 7200 0 EET}
|
||||
{3068319600 10800 1 EEST}
|
||||
{3068229600 10800 1 EEST}
|
||||
{3087064800 7200 0 EET}
|
||||
{3099769200 10800 1 EEST}
|
||||
{3100284000 10800 1 EEST}
|
||||
{3118514400 7200 0 EET}
|
||||
{3131218800 10800 1 EEST}
|
||||
{3131733600 10800 1 EEST}
|
||||
{3149964000 7200 0 EET}
|
||||
{3162668400 10800 1 EEST}
|
||||
{3163183200 10800 1 EEST}
|
||||
{3181413600 7200 0 EET}
|
||||
{3194722800 10800 1 EEST}
|
||||
{3194632800 10800 1 EEST}
|
||||
{3213468000 7200 0 EET}
|
||||
{3226172400 10800 1 EEST}
|
||||
{3226082400 10800 1 EEST}
|
||||
{3244917600 7200 0 EET}
|
||||
{3257622000 10800 1 EEST}
|
||||
{3258136800 10800 1 EEST}
|
||||
{3276367200 7200 0 EET}
|
||||
{3289071600 10800 1 EEST}
|
||||
{3289586400 10800 1 EEST}
|
||||
{3307816800 7200 0 EET}
|
||||
{3320521200 10800 1 EEST}
|
||||
{3321036000 10800 1 EEST}
|
||||
{3339266400 7200 0 EET}
|
||||
{3352575600 10800 1 EEST}
|
||||
{3352485600 10800 1 EEST}
|
||||
{3371320800 7200 0 EET}
|
||||
{3384025200 10800 1 EEST}
|
||||
{3383935200 10800 1 EEST}
|
||||
{3402770400 7200 0 EET}
|
||||
{3415474800 10800 1 EEST}
|
||||
{3415384800 10800 1 EEST}
|
||||
{3434220000 7200 0 EET}
|
||||
{3446924400 10800 1 EEST}
|
||||
{3447439200 10800 1 EEST}
|
||||
{3465669600 7200 0 EET}
|
||||
{3478374000 10800 1 EEST}
|
||||
{3478888800 10800 1 EEST}
|
||||
{3497119200 7200 0 EET}
|
||||
{3509823600 10800 1 EEST}
|
||||
{3510338400 10800 1 EEST}
|
||||
{3528568800 7200 0 EET}
|
||||
{3541878000 10800 1 EEST}
|
||||
{3541788000 10800 1 EEST}
|
||||
{3560623200 7200 0 EET}
|
||||
{3573327600 10800 1 EEST}
|
||||
{3573237600 10800 1 EEST}
|
||||
{3592072800 7200 0 EET}
|
||||
{3604777200 10800 1 EEST}
|
||||
{3605292000 10800 1 EEST}
|
||||
{3623522400 7200 0 EET}
|
||||
{3636226800 10800 1 EEST}
|
||||
{3636741600 10800 1 EEST}
|
||||
{3654972000 7200 0 EET}
|
||||
{3667676400 10800 1 EEST}
|
||||
{3668191200 10800 1 EEST}
|
||||
{3686421600 7200 0 EET}
|
||||
{3699126000 10800 1 EEST}
|
||||
{3699640800 10800 1 EEST}
|
||||
{3717871200 7200 0 EET}
|
||||
{3731180400 10800 1 EEST}
|
||||
{3731090400 10800 1 EEST}
|
||||
{3749925600 7200 0 EET}
|
||||
{3762630000 10800 1 EEST}
|
||||
{3762540000 10800 1 EEST}
|
||||
{3781375200 7200 0 EET}
|
||||
{3794079600 10800 1 EEST}
|
||||
{3794594400 10800 1 EEST}
|
||||
{3812824800 7200 0 EET}
|
||||
{3825529200 10800 1 EEST}
|
||||
{3826044000 10800 1 EEST}
|
||||
{3844274400 7200 0 EET}
|
||||
{3856978800 10800 1 EEST}
|
||||
{3857493600 10800 1 EEST}
|
||||
{3875724000 7200 0 EET}
|
||||
{3889033200 10800 1 EEST}
|
||||
{3888943200 10800 1 EEST}
|
||||
{3907778400 7200 0 EET}
|
||||
{3920482800 10800 1 EEST}
|
||||
{3920392800 10800 1 EEST}
|
||||
{3939228000 7200 0 EET}
|
||||
{3951932400 10800 1 EEST}
|
||||
{3951842400 10800 1 EEST}
|
||||
{3970677600 7200 0 EET}
|
||||
{3983382000 10800 1 EEST}
|
||||
{3983896800 10800 1 EEST}
|
||||
{4002127200 7200 0 EET}
|
||||
{4014831600 10800 1 EEST}
|
||||
{4015346400 10800 1 EEST}
|
||||
{4033576800 7200 0 EET}
|
||||
{4046281200 10800 1 EEST}
|
||||
{4046796000 10800 1 EEST}
|
||||
{4065026400 7200 0 EET}
|
||||
{4078335600 10800 1 EEST}
|
||||
{4078245600 10800 1 EEST}
|
||||
{4097080800 7200 0 EET}
|
||||
}
|
||||
|
||||
@@ -40,6 +40,10 @@ set TZData(:Asia/Hebron) {
|
||||
{150843600 7200 0 IST}
|
||||
{167176800 10800 1 IDT}
|
||||
{178664400 7200 0 IST}
|
||||
{334015200 10800 1 IDT}
|
||||
{337644000 7200 0 IST}
|
||||
{452556000 10800 1 IDT}
|
||||
{462232800 7200 0 IST}
|
||||
{482277600 10800 1 IDT}
|
||||
{495579600 7200 0 IST}
|
||||
{516751200 10800 1 IDT}
|
||||
@@ -112,166 +116,166 @@ set TZData(:Asia/Hebron) {
|
||||
{1509141600 7200 0 EET}
|
||||
{1521846000 10800 1 EEST}
|
||||
{1540591200 7200 0 EET}
|
||||
{1553295600 10800 1 EEST}
|
||||
{1553810400 10800 1 EEST}
|
||||
{1572040800 7200 0 EET}
|
||||
{1585350000 10800 1 EEST}
|
||||
{1585260000 10800 1 EEST}
|
||||
{1604095200 7200 0 EET}
|
||||
{1616799600 10800 1 EEST}
|
||||
{1616709600 10800 1 EEST}
|
||||
{1635544800 7200 0 EET}
|
||||
{1648249200 10800 1 EEST}
|
||||
{1648159200 10800 1 EEST}
|
||||
{1666994400 7200 0 EET}
|
||||
{1679698800 10800 1 EEST}
|
||||
{1680213600 10800 1 EEST}
|
||||
{1698444000 7200 0 EET}
|
||||
{1711148400 10800 1 EEST}
|
||||
{1711663200 10800 1 EEST}
|
||||
{1729893600 7200 0 EET}
|
||||
{1742598000 10800 1 EEST}
|
||||
{1743112800 10800 1 EEST}
|
||||
{1761343200 7200 0 EET}
|
||||
{1774652400 10800 1 EEST}
|
||||
{1774562400 10800 1 EEST}
|
||||
{1793397600 7200 0 EET}
|
||||
{1806102000 10800 1 EEST}
|
||||
{1806012000 10800 1 EEST}
|
||||
{1824847200 7200 0 EET}
|
||||
{1837551600 10800 1 EEST}
|
||||
{1838066400 10800 1 EEST}
|
||||
{1856296800 7200 0 EET}
|
||||
{1869001200 10800 1 EEST}
|
||||
{1869516000 10800 1 EEST}
|
||||
{1887746400 7200 0 EET}
|
||||
{1900450800 10800 1 EEST}
|
||||
{1900965600 10800 1 EEST}
|
||||
{1919196000 7200 0 EET}
|
||||
{1931900400 10800 1 EEST}
|
||||
{1932415200 10800 1 EEST}
|
||||
{1950645600 7200 0 EET}
|
||||
{1963954800 10800 1 EEST}
|
||||
{1963864800 10800 1 EEST}
|
||||
{1982700000 7200 0 EET}
|
||||
{1995404400 10800 1 EEST}
|
||||
{1995314400 10800 1 EEST}
|
||||
{2014149600 7200 0 EET}
|
||||
{2026854000 10800 1 EEST}
|
||||
{2027368800 10800 1 EEST}
|
||||
{2045599200 7200 0 EET}
|
||||
{2058303600 10800 1 EEST}
|
||||
{2058818400 10800 1 EEST}
|
||||
{2077048800 7200 0 EET}
|
||||
{2089753200 10800 1 EEST}
|
||||
{2090268000 10800 1 EEST}
|
||||
{2108498400 7200 0 EET}
|
||||
{2121807600 10800 1 EEST}
|
||||
{2121717600 10800 1 EEST}
|
||||
{2140552800 7200 0 EET}
|
||||
{2153257200 10800 1 EEST}
|
||||
{2153167200 10800 1 EEST}
|
||||
{2172002400 7200 0 EET}
|
||||
{2184706800 10800 1 EEST}
|
||||
{2184616800 10800 1 EEST}
|
||||
{2203452000 7200 0 EET}
|
||||
{2216156400 10800 1 EEST}
|
||||
{2216671200 10800 1 EEST}
|
||||
{2234901600 7200 0 EET}
|
||||
{2247606000 10800 1 EEST}
|
||||
{2248120800 10800 1 EEST}
|
||||
{2266351200 7200 0 EET}
|
||||
{2279055600 10800 1 EEST}
|
||||
{2279570400 10800 1 EEST}
|
||||
{2297800800 7200 0 EET}
|
||||
{2311110000 10800 1 EEST}
|
||||
{2311020000 10800 1 EEST}
|
||||
{2329855200 7200 0 EET}
|
||||
{2342559600 10800 1 EEST}
|
||||
{2342469600 10800 1 EEST}
|
||||
{2361304800 7200 0 EET}
|
||||
{2374009200 10800 1 EEST}
|
||||
{2374524000 10800 1 EEST}
|
||||
{2392754400 7200 0 EET}
|
||||
{2405458800 10800 1 EEST}
|
||||
{2405973600 10800 1 EEST}
|
||||
{2424204000 7200 0 EET}
|
||||
{2436908400 10800 1 EEST}
|
||||
{2437423200 10800 1 EEST}
|
||||
{2455653600 7200 0 EET}
|
||||
{2468962800 10800 1 EEST}
|
||||
{2468872800 10800 1 EEST}
|
||||
{2487708000 7200 0 EET}
|
||||
{2500412400 10800 1 EEST}
|
||||
{2500322400 10800 1 EEST}
|
||||
{2519157600 7200 0 EET}
|
||||
{2531862000 10800 1 EEST}
|
||||
{2531772000 10800 1 EEST}
|
||||
{2550607200 7200 0 EET}
|
||||
{2563311600 10800 1 EEST}
|
||||
{2563826400 10800 1 EEST}
|
||||
{2582056800 7200 0 EET}
|
||||
{2594761200 10800 1 EEST}
|
||||
{2595276000 10800 1 EEST}
|
||||
{2613506400 7200 0 EET}
|
||||
{2626210800 10800 1 EEST}
|
||||
{2626725600 10800 1 EEST}
|
||||
{2644956000 7200 0 EET}
|
||||
{2658265200 10800 1 EEST}
|
||||
{2658175200 10800 1 EEST}
|
||||
{2677010400 7200 0 EET}
|
||||
{2689714800 10800 1 EEST}
|
||||
{2689624800 10800 1 EEST}
|
||||
{2708460000 7200 0 EET}
|
||||
{2721164400 10800 1 EEST}
|
||||
{2721679200 10800 1 EEST}
|
||||
{2739909600 7200 0 EET}
|
||||
{2752614000 10800 1 EEST}
|
||||
{2753128800 10800 1 EEST}
|
||||
{2771359200 7200 0 EET}
|
||||
{2784063600 10800 1 EEST}
|
||||
{2784578400 10800 1 EEST}
|
||||
{2802808800 7200 0 EET}
|
||||
{2815513200 10800 1 EEST}
|
||||
{2816028000 10800 1 EEST}
|
||||
{2834258400 7200 0 EET}
|
||||
{2847567600 10800 1 EEST}
|
||||
{2847477600 10800 1 EEST}
|
||||
{2866312800 7200 0 EET}
|
||||
{2879017200 10800 1 EEST}
|
||||
{2878927200 10800 1 EEST}
|
||||
{2897762400 7200 0 EET}
|
||||
{2910466800 10800 1 EEST}
|
||||
{2910981600 10800 1 EEST}
|
||||
{2929212000 7200 0 EET}
|
||||
{2941916400 10800 1 EEST}
|
||||
{2942431200 10800 1 EEST}
|
||||
{2960661600 7200 0 EET}
|
||||
{2973366000 10800 1 EEST}
|
||||
{2973880800 10800 1 EEST}
|
||||
{2992111200 7200 0 EET}
|
||||
{3005420400 10800 1 EEST}
|
||||
{3005330400 10800 1 EEST}
|
||||
{3024165600 7200 0 EET}
|
||||
{3036870000 10800 1 EEST}
|
||||
{3036780000 10800 1 EEST}
|
||||
{3055615200 7200 0 EET}
|
||||
{3068319600 10800 1 EEST}
|
||||
{3068229600 10800 1 EEST}
|
||||
{3087064800 7200 0 EET}
|
||||
{3099769200 10800 1 EEST}
|
||||
{3100284000 10800 1 EEST}
|
||||
{3118514400 7200 0 EET}
|
||||
{3131218800 10800 1 EEST}
|
||||
{3131733600 10800 1 EEST}
|
||||
{3149964000 7200 0 EET}
|
||||
{3162668400 10800 1 EEST}
|
||||
{3163183200 10800 1 EEST}
|
||||
{3181413600 7200 0 EET}
|
||||
{3194722800 10800 1 EEST}
|
||||
{3194632800 10800 1 EEST}
|
||||
{3213468000 7200 0 EET}
|
||||
{3226172400 10800 1 EEST}
|
||||
{3226082400 10800 1 EEST}
|
||||
{3244917600 7200 0 EET}
|
||||
{3257622000 10800 1 EEST}
|
||||
{3258136800 10800 1 EEST}
|
||||
{3276367200 7200 0 EET}
|
||||
{3289071600 10800 1 EEST}
|
||||
{3289586400 10800 1 EEST}
|
||||
{3307816800 7200 0 EET}
|
||||
{3320521200 10800 1 EEST}
|
||||
{3321036000 10800 1 EEST}
|
||||
{3339266400 7200 0 EET}
|
||||
{3352575600 10800 1 EEST}
|
||||
{3352485600 10800 1 EEST}
|
||||
{3371320800 7200 0 EET}
|
||||
{3384025200 10800 1 EEST}
|
||||
{3383935200 10800 1 EEST}
|
||||
{3402770400 7200 0 EET}
|
||||
{3415474800 10800 1 EEST}
|
||||
{3415384800 10800 1 EEST}
|
||||
{3434220000 7200 0 EET}
|
||||
{3446924400 10800 1 EEST}
|
||||
{3447439200 10800 1 EEST}
|
||||
{3465669600 7200 0 EET}
|
||||
{3478374000 10800 1 EEST}
|
||||
{3478888800 10800 1 EEST}
|
||||
{3497119200 7200 0 EET}
|
||||
{3509823600 10800 1 EEST}
|
||||
{3510338400 10800 1 EEST}
|
||||
{3528568800 7200 0 EET}
|
||||
{3541878000 10800 1 EEST}
|
||||
{3541788000 10800 1 EEST}
|
||||
{3560623200 7200 0 EET}
|
||||
{3573327600 10800 1 EEST}
|
||||
{3573237600 10800 1 EEST}
|
||||
{3592072800 7200 0 EET}
|
||||
{3604777200 10800 1 EEST}
|
||||
{3605292000 10800 1 EEST}
|
||||
{3623522400 7200 0 EET}
|
||||
{3636226800 10800 1 EEST}
|
||||
{3636741600 10800 1 EEST}
|
||||
{3654972000 7200 0 EET}
|
||||
{3667676400 10800 1 EEST}
|
||||
{3668191200 10800 1 EEST}
|
||||
{3686421600 7200 0 EET}
|
||||
{3699126000 10800 1 EEST}
|
||||
{3699640800 10800 1 EEST}
|
||||
{3717871200 7200 0 EET}
|
||||
{3731180400 10800 1 EEST}
|
||||
{3731090400 10800 1 EEST}
|
||||
{3749925600 7200 0 EET}
|
||||
{3762630000 10800 1 EEST}
|
||||
{3762540000 10800 1 EEST}
|
||||
{3781375200 7200 0 EET}
|
||||
{3794079600 10800 1 EEST}
|
||||
{3794594400 10800 1 EEST}
|
||||
{3812824800 7200 0 EET}
|
||||
{3825529200 10800 1 EEST}
|
||||
{3826044000 10800 1 EEST}
|
||||
{3844274400 7200 0 EET}
|
||||
{3856978800 10800 1 EEST}
|
||||
{3857493600 10800 1 EEST}
|
||||
{3875724000 7200 0 EET}
|
||||
{3889033200 10800 1 EEST}
|
||||
{3888943200 10800 1 EEST}
|
||||
{3907778400 7200 0 EET}
|
||||
{3920482800 10800 1 EEST}
|
||||
{3920392800 10800 1 EEST}
|
||||
{3939228000 7200 0 EET}
|
||||
{3951932400 10800 1 EEST}
|
||||
{3951842400 10800 1 EEST}
|
||||
{3970677600 7200 0 EET}
|
||||
{3983382000 10800 1 EEST}
|
||||
{3983896800 10800 1 EEST}
|
||||
{4002127200 7200 0 EET}
|
||||
{4014831600 10800 1 EEST}
|
||||
{4015346400 10800 1 EEST}
|
||||
{4033576800 7200 0 EET}
|
||||
{4046281200 10800 1 EEST}
|
||||
{4046796000 10800 1 EEST}
|
||||
{4065026400 7200 0 EET}
|
||||
{4078335600 10800 1 EEST}
|
||||
{4078245600 10800 1 EEST}
|
||||
{4097080800 7200 0 EET}
|
||||
}
|
||||
|
||||
@@ -2,25 +2,25 @@
|
||||
|
||||
set TZData(:Asia/Hong_Kong) {
|
||||
{-9223372036854775808 27402 0 LMT}
|
||||
{-2056693002 28800 0 HKT}
|
||||
{-907389000 32400 1 HKST}
|
||||
{-891667800 28800 0 HKT}
|
||||
{-884246400 32400 0 JST}
|
||||
{-766746000 28800 0 HKT}
|
||||
{-747981000 32400 1 HKST}
|
||||
{-728544600 28800 0 HKT}
|
||||
{-2056690800 28800 0 HKT}
|
||||
{-900910800 32400 1 HKST}
|
||||
{-891579600 30600 1 HKWT}
|
||||
{-884248200 32400 0 JST}
|
||||
{-761209200 28800 0 HKT}
|
||||
{-747907200 32400 1 HKST}
|
||||
{-728541000 28800 0 HKT}
|
||||
{-717049800 32400 1 HKST}
|
||||
{-694503000 28800 0 HKT}
|
||||
{-697091400 28800 0 HKT}
|
||||
{-683785800 32400 1 HKST}
|
||||
{-668064600 28800 0 HKT}
|
||||
{-668061000 28800 0 HKT}
|
||||
{-654755400 32400 1 HKST}
|
||||
{-636615000 28800 0 HKT}
|
||||
{-636611400 28800 0 HKT}
|
||||
{-623305800 32400 1 HKST}
|
||||
{-605165400 28800 0 HKT}
|
||||
{-605161800 28800 0 HKT}
|
||||
{-591856200 32400 1 HKST}
|
||||
{-573715800 28800 0 HKT}
|
||||
{-573712200 28800 0 HKT}
|
||||
{-559801800 32400 1 HKST}
|
||||
{-542352600 28800 0 HKT}
|
||||
{-541657800 28800 0 HKT}
|
||||
{-528352200 32400 1 HKST}
|
||||
{-510211800 28800 0 HKT}
|
||||
{-498112200 32400 1 HKST}
|
||||
|
||||
@@ -39,6 +39,10 @@ set TZData(:Asia/Jerusalem) {
|
||||
{150843600 7200 0 IST}
|
||||
{167176800 10800 1 IDT}
|
||||
{178664400 7200 0 IST}
|
||||
{334015200 10800 1 IDT}
|
||||
{337644000 7200 0 IST}
|
||||
{452556000 10800 1 IDT}
|
||||
{462232800 7200 0 IST}
|
||||
{482277600 10800 1 IDT}
|
||||
{495579600 7200 0 IST}
|
||||
{516751200 10800 1 IDT}
|
||||
|
||||
58
amd64/lib/tcl8.6/tzdata/Asia/Qostanay
Normal file
58
amd64/lib/tcl8.6/tzdata/Asia/Qostanay
Normal file
@@ -0,0 +1,58 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
|
||||
set TZData(:Asia/Qostanay) {
|
||||
{-9223372036854775808 15268 0 LMT}
|
||||
{-1441167268 14400 0 +04}
|
||||
{-1247544000 18000 0 +05}
|
||||
{354913200 21600 1 +06}
|
||||
{370720800 21600 0 +06}
|
||||
{386445600 18000 0 +05}
|
||||
{386449200 21600 1 +05}
|
||||
{402256800 18000 0 +05}
|
||||
{417985200 21600 1 +05}
|
||||
{433792800 18000 0 +05}
|
||||
{449607600 21600 1 +05}
|
||||
{465339600 18000 0 +05}
|
||||
{481064400 21600 1 +05}
|
||||
{496789200 18000 0 +05}
|
||||
{512514000 21600 1 +05}
|
||||
{528238800 18000 0 +05}
|
||||
{543963600 21600 1 +05}
|
||||
{559688400 18000 0 +05}
|
||||
{575413200 21600 1 +05}
|
||||
{591138000 18000 0 +05}
|
||||
{606862800 21600 1 +05}
|
||||
{622587600 18000 0 +05}
|
||||
{638312400 21600 1 +05}
|
||||
{654642000 18000 0 +05}
|
||||
{670366800 14400 0 +04}
|
||||
{670370400 18000 1 +04}
|
||||
{686095200 14400 0 +04}
|
||||
{695772000 18000 0 +05}
|
||||
{701816400 21600 1 +05}
|
||||
{717541200 18000 0 +05}
|
||||
{733266000 21600 1 +05}
|
||||
{748990800 18000 0 +05}
|
||||
{764715600 21600 1 +05}
|
||||
{780440400 18000 0 +05}
|
||||
{796165200 21600 1 +05}
|
||||
{811890000 18000 0 +05}
|
||||
{828219600 21600 1 +05}
|
||||
{846363600 18000 0 +05}
|
||||
{859669200 21600 1 +05}
|
||||
{877813200 18000 0 +05}
|
||||
{891118800 21600 1 +05}
|
||||
{909262800 18000 0 +05}
|
||||
{922568400 21600 1 +05}
|
||||
{941317200 18000 0 +05}
|
||||
{954018000 21600 1 +05}
|
||||
{972766800 18000 0 +05}
|
||||
{985467600 21600 1 +05}
|
||||
{1004216400 18000 0 +05}
|
||||
{1017522000 21600 1 +05}
|
||||
{1035666000 18000 0 +05}
|
||||
{1048971600 21600 1 +05}
|
||||
{1067115600 18000 0 +05}
|
||||
{1080421200 21600 1 +05}
|
||||
{1099170000 21600 0 +06}
|
||||
}
|
||||
@@ -54,4 +54,5 @@ set TZData(:Asia/Qyzylorda) {
|
||||
{1067115600 18000 0 +05}
|
||||
{1080421200 21600 1 +05}
|
||||
{1099170000 21600 0 +06}
|
||||
{1545328800 18000 0 +05}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,14 @@ set TZData(:Asia/Seoul) {
|
||||
{-1948782472 30600 0 KST}
|
||||
{-1830414600 32400 0 JST}
|
||||
{-767350800 32400 0 KST}
|
||||
{-681210000 36000 1 KDT}
|
||||
{-672228000 32400 0 KST}
|
||||
{-654771600 36000 1 KDT}
|
||||
{-640864800 32400 0 KST}
|
||||
{-623408400 36000 1 KDT}
|
||||
{-609415200 32400 0 KST}
|
||||
{-588848400 36000 1 KDT}
|
||||
{-577965600 32400 0 KST}
|
||||
{-498128400 30600 0 KST}
|
||||
{-462702600 34200 1 KDT}
|
||||
{-451733400 30600 0 KST}
|
||||
|
||||
@@ -102,106 +102,106 @@ set TZData(:Asia/Tehran) {
|
||||
{2105551800 12600 0 +0330}
|
||||
{2121193800 16200 1 +0330}
|
||||
{2137087800 12600 0 +0330}
|
||||
{2152729800 16200 1 +0330}
|
||||
{2168623800 12600 0 +0330}
|
||||
{2184265800 16200 1 +0330}
|
||||
{2200159800 12600 0 +0330}
|
||||
{2152816200 16200 1 +0330}
|
||||
{2168710200 12600 0 +0330}
|
||||
{2184352200 16200 1 +0330}
|
||||
{2200246200 12600 0 +0330}
|
||||
{2215888200 16200 1 +0330}
|
||||
{2231782200 12600 0 +0330}
|
||||
{2247424200 16200 1 +0330}
|
||||
{2263318200 12600 0 +0330}
|
||||
{2278960200 16200 1 +0330}
|
||||
{2294854200 12600 0 +0330}
|
||||
{2310496200 16200 1 +0330}
|
||||
{2326390200 12600 0 +0330}
|
||||
{2279046600 16200 1 +0330}
|
||||
{2294940600 12600 0 +0330}
|
||||
{2310582600 16200 1 +0330}
|
||||
{2326476600 12600 0 +0330}
|
||||
{2342118600 16200 1 +0330}
|
||||
{2358012600 12600 0 +0330}
|
||||
{2373654600 16200 1 +0330}
|
||||
{2389548600 12600 0 +0330}
|
||||
{2405190600 16200 1 +0330}
|
||||
{2421084600 12600 0 +0330}
|
||||
{2436726600 16200 1 +0330}
|
||||
{2452620600 12600 0 +0330}
|
||||
{2405277000 16200 1 +0330}
|
||||
{2421171000 12600 0 +0330}
|
||||
{2436813000 16200 1 +0330}
|
||||
{2452707000 12600 0 +0330}
|
||||
{2468349000 16200 1 +0330}
|
||||
{2484243000 12600 0 +0330}
|
||||
{2499885000 16200 1 +0330}
|
||||
{2515779000 12600 0 +0330}
|
||||
{2531421000 16200 1 +0330}
|
||||
{2547315000 12600 0 +0330}
|
||||
{2562957000 16200 1 +0330}
|
||||
{2578851000 12600 0 +0330}
|
||||
{2531507400 16200 1 +0330}
|
||||
{2547401400 12600 0 +0330}
|
||||
{2563043400 16200 1 +0330}
|
||||
{2578937400 12600 0 +0330}
|
||||
{2594579400 16200 1 +0330}
|
||||
{2610473400 12600 0 +0330}
|
||||
{2626115400 16200 1 +0330}
|
||||
{2642009400 12600 0 +0330}
|
||||
{2657651400 16200 1 +0330}
|
||||
{2673545400 12600 0 +0330}
|
||||
{2689187400 16200 1 +0330}
|
||||
{2705081400 12600 0 +0330}
|
||||
{2657737800 16200 1 +0330}
|
||||
{2673631800 12600 0 +0330}
|
||||
{2689273800 16200 1 +0330}
|
||||
{2705167800 12600 0 +0330}
|
||||
{2720809800 16200 1 +0330}
|
||||
{2736703800 12600 0 +0330}
|
||||
{2752345800 16200 1 +0330}
|
||||
{2768239800 12600 0 +0330}
|
||||
{2783881800 16200 1 +0330}
|
||||
{2799775800 12600 0 +0330}
|
||||
{2815417800 16200 1 +0330}
|
||||
{2831311800 12600 0 +0330}
|
||||
{2783968200 16200 1 +0330}
|
||||
{2799862200 12600 0 +0330}
|
||||
{2815504200 16200 1 +0330}
|
||||
{2831398200 12600 0 +0330}
|
||||
{2847040200 16200 1 +0330}
|
||||
{2862934200 12600 0 +0330}
|
||||
{2878576200 16200 1 +0330}
|
||||
{2894470200 12600 0 +0330}
|
||||
{2910112200 16200 1 +0330}
|
||||
{2926006200 12600 0 +0330}
|
||||
{2941648200 16200 1 +0330}
|
||||
{2957542200 12600 0 +0330}
|
||||
{2941734600 16200 1 +0330}
|
||||
{2957628600 12600 0 +0330}
|
||||
{2973270600 16200 1 +0330}
|
||||
{2989164600 12600 0 +0330}
|
||||
{3004806600 16200 1 +0330}
|
||||
{3020700600 12600 0 +0330}
|
||||
{3036342600 16200 1 +0330}
|
||||
{3052236600 12600 0 +0330}
|
||||
{3067878600 16200 1 +0330}
|
||||
{3083772600 12600 0 +0330}
|
||||
{3067965000 16200 1 +0330}
|
||||
{3083859000 12600 0 +0330}
|
||||
{3099501000 16200 1 +0330}
|
||||
{3115395000 12600 0 +0330}
|
||||
{3131037000 16200 1 +0330}
|
||||
{3146931000 12600 0 +0330}
|
||||
{3162573000 16200 1 +0330}
|
||||
{3178467000 12600 0 +0330}
|
||||
{3194109000 16200 1 +0330}
|
||||
{3210003000 12600 0 +0330}
|
||||
{3194195400 16200 1 +0330}
|
||||
{3210089400 12600 0 +0330}
|
||||
{3225731400 16200 1 +0330}
|
||||
{3241625400 12600 0 +0330}
|
||||
{3257267400 16200 1 +0330}
|
||||
{3273161400 12600 0 +0330}
|
||||
{3288803400 16200 1 +0330}
|
||||
{3304697400 12600 0 +0330}
|
||||
{3320339400 16200 1 +0330}
|
||||
{3336233400 12600 0 +0330}
|
||||
{3320425800 16200 1 +0330}
|
||||
{3336319800 12600 0 +0330}
|
||||
{3351961800 16200 1 +0330}
|
||||
{3367855800 12600 0 +0330}
|
||||
{3383497800 16200 1 +0330}
|
||||
{3399391800 12600 0 +0330}
|
||||
{3415033800 16200 1 +0330}
|
||||
{3430927800 12600 0 +0330}
|
||||
{3446569800 16200 1 +0330}
|
||||
{3462463800 12600 0 +0330}
|
||||
{3446656200 16200 1 +0330}
|
||||
{3462550200 12600 0 +0330}
|
||||
{3478192200 16200 1 +0330}
|
||||
{3494086200 12600 0 +0330}
|
||||
{3509728200 16200 1 +0330}
|
||||
{3525622200 12600 0 +0330}
|
||||
{3541264200 16200 1 +0330}
|
||||
{3557158200 12600 0 +0330}
|
||||
{3572800200 16200 1 +0330}
|
||||
{3588694200 12600 0 +0330}
|
||||
{3572886600 16200 1 +0330}
|
||||
{3588780600 12600 0 +0330}
|
||||
{3604422600 16200 1 +0330}
|
||||
{3620316600 12600 0 +0330}
|
||||
{3635958600 16200 1 +0330}
|
||||
{3651852600 12600 0 +0330}
|
||||
{3667494600 16200 1 +0330}
|
||||
{3683388600 12600 0 +0330}
|
||||
{3699030600 16200 1 +0330}
|
||||
{3714924600 12600 0 +0330}
|
||||
{3699117000 16200 1 +0330}
|
||||
{3715011000 12600 0 +0330}
|
||||
{3730653000 16200 1 +0330}
|
||||
{3746547000 12600 0 +0330}
|
||||
{3762189000 16200 1 +0330}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
|
||||
set TZData(:Etc/UCT) {
|
||||
{-9223372036854775808 0 0 UCT}
|
||||
if {![info exists TZData(Etc/UTC)]} {
|
||||
LoadTimeZoneFile Etc/UTC
|
||||
}
|
||||
set TZData(:Etc/UCT) $TZData(:Etc/UTC)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
set TZData(:Europe/Brussels) {
|
||||
{-9223372036854775808 1050 0 LMT}
|
||||
{-2840141850 1050 0 BMT}
|
||||
{-2450953050 0 0 WET}
|
||||
{-2450995200 0 0 WET}
|
||||
{-1740355200 3600 0 CET}
|
||||
{-1693702800 7200 0 CEST}
|
||||
{-1680483600 3600 0 CET}
|
||||
|
||||
@@ -16,13 +16,11 @@ set TZData(:Europe/Istanbul) {
|
||||
{-1428030000 7200 0 EET}
|
||||
{-1409709600 10800 1 EEST}
|
||||
{-1396494000 7200 0 EET}
|
||||
{-931140000 10800 1 EEST}
|
||||
{-922762800 7200 0 EET}
|
||||
{-931053600 10800 1 EEST}
|
||||
{-922676400 7200 0 EET}
|
||||
{-917834400 10800 1 EEST}
|
||||
{-892436400 7200 0 EET}
|
||||
{-875844000 10800 1 EEST}
|
||||
{-857358000 7200 0 EET}
|
||||
{-781063200 10800 1 EEST}
|
||||
{-764737200 7200 0 EET}
|
||||
{-744343200 10800 1 EEST}
|
||||
{-733806000 7200 0 EET}
|
||||
@@ -32,45 +30,32 @@ set TZData(:Europe/Istanbul) {
|
||||
{-670474800 7200 0 EET}
|
||||
{-654141600 10800 1 EEST}
|
||||
{-639025200 7200 0 EET}
|
||||
{-621828000 10800 1 EEST}
|
||||
{-622087200 10800 1 EEST}
|
||||
{-606970800 7200 0 EET}
|
||||
{-590032800 10800 1 EEST}
|
||||
{-575434800 7200 0 EET}
|
||||
{-575521200 7200 0 EET}
|
||||
{-235620000 10800 1 EEST}
|
||||
{-228279600 7200 0 EET}
|
||||
{-194842800 7200 0 EET}
|
||||
{-177732000 10800 1 EEST}
|
||||
{-165726000 7200 0 EET}
|
||||
{10533600 10800 1 EEST}
|
||||
{23835600 7200 0 EET}
|
||||
{41983200 10800 1 EEST}
|
||||
{55285200 7200 0 EET}
|
||||
{74037600 10800 1 EEST}
|
||||
{87339600 7200 0 EET}
|
||||
{107910000 10800 1 EEST}
|
||||
{121219200 7200 0 EET}
|
||||
{121215600 7200 0 EET}
|
||||
{133920000 10800 1 EEST}
|
||||
{152676000 7200 0 EET}
|
||||
{165362400 10800 1 EEST}
|
||||
{183502800 7200 0 EET}
|
||||
{202428000 10800 1 EEST}
|
||||
{215557200 7200 0 EET}
|
||||
{228866400 10800 1 EEST}
|
||||
{245797200 7200 0 EET}
|
||||
{260316000 10800 1 EEST}
|
||||
{277246800 14400 0 +04}
|
||||
{291769200 14400 1 +04}
|
||||
{308779200 10800 0 +03}
|
||||
{323827200 14400 1 +04}
|
||||
{340228800 10800 0 +03}
|
||||
{354672000 14400 1 +04}
|
||||
{371678400 10800 0 +03}
|
||||
{386121600 14400 1 +04}
|
||||
{403128000 10800 0 +03}
|
||||
{428446800 14400 1 +04}
|
||||
{433886400 10800 0 +03}
|
||||
{482792400 7200 0 EET}
|
||||
{482796000 10800 1 EEST}
|
||||
{496702800 7200 0 EET}
|
||||
{152665200 7200 0 EET}
|
||||
{164678400 10800 1 EEST}
|
||||
{184114800 7200 0 EET}
|
||||
{196214400 10800 1 EEST}
|
||||
{215564400 7200 0 EET}
|
||||
{228873600 10800 1 EEST}
|
||||
{245804400 7200 0 EET}
|
||||
{260323200 10800 1 EEST}
|
||||
{267919200 10800 0 +03}
|
||||
{277254000 10800 0 +03}
|
||||
{428454000 14400 1 +04}
|
||||
{433893600 10800 0 +03}
|
||||
{468111600 7200 0 EET}
|
||||
{482799600 10800 1 EEST}
|
||||
{496710000 7200 0 EET}
|
||||
{512521200 10800 1 EEST}
|
||||
{528246000 7200 0 EET}
|
||||
{543970800 10800 1 EEST}
|
||||
|
||||
@@ -15,10 +15,11 @@ set TZData(:Europe/Kaliningrad) {
|
||||
{-828226800 3600 0 CET}
|
||||
{-812502000 7200 1 CEST}
|
||||
{-796777200 3600 0 CET}
|
||||
{-788922000 7200 0 CET}
|
||||
{-778730400 10800 1 CEST}
|
||||
{-762663600 7200 0 CET}
|
||||
{-757389600 10800 0 MSD}
|
||||
{-781052400 7200 1 CEST}
|
||||
{-780368400 7200 0 EET}
|
||||
{-778730400 10800 1 EEST}
|
||||
{-762663600 7200 0 EET}
|
||||
{-749095200 10800 0 MSD}
|
||||
{354920400 14400 1 MSD}
|
||||
{370728000 10800 0 MSK}
|
||||
{386456400 14400 1 MSD}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
set TZData(:Europe/Rome) {
|
||||
{-9223372036854775808 2996 0 LMT}
|
||||
{-3259097396 2996 0 RMT}
|
||||
{-3252098996 2996 0 RMT}
|
||||
{-2403565200 3600 0 CET}
|
||||
{-1690765200 7200 1 CEST}
|
||||
{-1680487200 3600 0 CET}
|
||||
|
||||
@@ -22,7 +22,7 @@ set TZData(:Europe/Vienna) {
|
||||
{-780188400 3600 0 CET}
|
||||
{-757386000 3600 0 CET}
|
||||
{-748479600 7200 1 CEST}
|
||||
{-733359600 3600 0 CET}
|
||||
{-733273200 3600 0 CET}
|
||||
{-717634800 7200 1 CEST}
|
||||
{-701910000 3600 0 CET}
|
||||
{-684975600 7200 1 CEST}
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
|
||||
set TZData(:Pacific/Chuuk) {
|
||||
{-9223372036854775808 36428 0 LMT}
|
||||
{-9223372036854775808 -49972 0 LMT}
|
||||
{-3944628428 36428 0 LMT}
|
||||
{-2177489228 36000 0 +10}
|
||||
{-1743674400 32400 0 +09}
|
||||
{-1606813200 36000 0 +10}
|
||||
{-907408800 32400 0 +09}
|
||||
{-770634000 36000 0 +10}
|
||||
}
|
||||
|
||||
@@ -27,165 +27,165 @@ set TZData(:Pacific/Fiji) {
|
||||
{1515852000 43200 0 +12}
|
||||
{1541253600 46800 1 +12}
|
||||
{1547301600 43200 0 +12}
|
||||
{1572703200 46800 1 +12}
|
||||
{1579356000 43200 0 +12}
|
||||
{1604152800 46800 1 +12}
|
||||
{1573308000 46800 1 +12}
|
||||
{1578751200 43200 0 +12}
|
||||
{1604757600 46800 1 +12}
|
||||
{1610805600 43200 0 +12}
|
||||
{1636207200 46800 1 +12}
|
||||
{1636812000 46800 1 +12}
|
||||
{1642255200 43200 0 +12}
|
||||
{1667656800 46800 1 +12}
|
||||
{1668261600 46800 1 +12}
|
||||
{1673704800 43200 0 +12}
|
||||
{1699106400 46800 1 +12}
|
||||
{1699711200 46800 1 +12}
|
||||
{1705154400 43200 0 +12}
|
||||
{1730556000 46800 1 +12}
|
||||
{1737208800 43200 0 +12}
|
||||
{1762005600 46800 1 +12}
|
||||
{1731160800 46800 1 +12}
|
||||
{1736604000 43200 0 +12}
|
||||
{1762610400 46800 1 +12}
|
||||
{1768658400 43200 0 +12}
|
||||
{1793455200 46800 1 +12}
|
||||
{1794060000 46800 1 +12}
|
||||
{1800108000 43200 0 +12}
|
||||
{1825509600 46800 1 +12}
|
||||
{1826114400 46800 1 +12}
|
||||
{1831557600 43200 0 +12}
|
||||
{1856959200 46800 1 +12}
|
||||
{1857564000 46800 1 +12}
|
||||
{1863007200 43200 0 +12}
|
||||
{1888408800 46800 1 +12}
|
||||
{1889013600 46800 1 +12}
|
||||
{1894456800 43200 0 +12}
|
||||
{1919858400 46800 1 +12}
|
||||
{1926511200 43200 0 +12}
|
||||
{1951308000 46800 1 +12}
|
||||
{1920463200 46800 1 +12}
|
||||
{1925906400 43200 0 +12}
|
||||
{1951912800 46800 1 +12}
|
||||
{1957960800 43200 0 +12}
|
||||
{1983362400 46800 1 +12}
|
||||
{1983967200 46800 1 +12}
|
||||
{1989410400 43200 0 +12}
|
||||
{2014812000 46800 1 +12}
|
||||
{2015416800 46800 1 +12}
|
||||
{2020860000 43200 0 +12}
|
||||
{2046261600 46800 1 +12}
|
||||
{2046866400 46800 1 +12}
|
||||
{2052309600 43200 0 +12}
|
||||
{2077711200 46800 1 +12}
|
||||
{2078316000 46800 1 +12}
|
||||
{2083759200 43200 0 +12}
|
||||
{2109160800 46800 1 +12}
|
||||
{2109765600 46800 1 +12}
|
||||
{2115813600 43200 0 +12}
|
||||
{2140610400 46800 1 +12}
|
||||
{2141215200 46800 1 +12}
|
||||
{2147263200 43200 0 +12}
|
||||
{2172664800 46800 1 +12}
|
||||
{2173269600 46800 1 +12}
|
||||
{2178712800 43200 0 +12}
|
||||
{2204114400 46800 1 +12}
|
||||
{2204719200 46800 1 +12}
|
||||
{2210162400 43200 0 +12}
|
||||
{2235564000 46800 1 +12}
|
||||
{2236168800 46800 1 +12}
|
||||
{2241612000 43200 0 +12}
|
||||
{2267013600 46800 1 +12}
|
||||
{2273666400 43200 0 +12}
|
||||
{2298463200 46800 1 +12}
|
||||
{2267618400 46800 1 +12}
|
||||
{2273061600 43200 0 +12}
|
||||
{2299068000 46800 1 +12}
|
||||
{2305116000 43200 0 +12}
|
||||
{2329912800 46800 1 +12}
|
||||
{2330517600 46800 1 +12}
|
||||
{2336565600 43200 0 +12}
|
||||
{2361967200 46800 1 +12}
|
||||
{2362572000 46800 1 +12}
|
||||
{2368015200 43200 0 +12}
|
||||
{2393416800 46800 1 +12}
|
||||
{2394021600 46800 1 +12}
|
||||
{2399464800 43200 0 +12}
|
||||
{2424866400 46800 1 +12}
|
||||
{2425471200 46800 1 +12}
|
||||
{2430914400 43200 0 +12}
|
||||
{2456316000 46800 1 +12}
|
||||
{2462968800 43200 0 +12}
|
||||
{2487765600 46800 1 +12}
|
||||
{2456920800 46800 1 +12}
|
||||
{2462364000 43200 0 +12}
|
||||
{2488370400 46800 1 +12}
|
||||
{2494418400 43200 0 +12}
|
||||
{2519820000 46800 1 +12}
|
||||
{2520424800 46800 1 +12}
|
||||
{2525868000 43200 0 +12}
|
||||
{2551269600 46800 1 +12}
|
||||
{2551874400 46800 1 +12}
|
||||
{2557317600 43200 0 +12}
|
||||
{2582719200 46800 1 +12}
|
||||
{2583324000 46800 1 +12}
|
||||
{2588767200 43200 0 +12}
|
||||
{2614168800 46800 1 +12}
|
||||
{2620821600 43200 0 +12}
|
||||
{2645618400 46800 1 +12}
|
||||
{2614773600 46800 1 +12}
|
||||
{2620216800 43200 0 +12}
|
||||
{2646223200 46800 1 +12}
|
||||
{2652271200 43200 0 +12}
|
||||
{2677068000 46800 1 +12}
|
||||
{2677672800 46800 1 +12}
|
||||
{2683720800 43200 0 +12}
|
||||
{2709122400 46800 1 +12}
|
||||
{2709727200 46800 1 +12}
|
||||
{2715170400 43200 0 +12}
|
||||
{2740572000 46800 1 +12}
|
||||
{2741176800 46800 1 +12}
|
||||
{2746620000 43200 0 +12}
|
||||
{2772021600 46800 1 +12}
|
||||
{2772626400 46800 1 +12}
|
||||
{2778069600 43200 0 +12}
|
||||
{2803471200 46800 1 +12}
|
||||
{2810124000 43200 0 +12}
|
||||
{2834920800 46800 1 +12}
|
||||
{2804076000 46800 1 +12}
|
||||
{2809519200 43200 0 +12}
|
||||
{2835525600 46800 1 +12}
|
||||
{2841573600 43200 0 +12}
|
||||
{2866975200 46800 1 +12}
|
||||
{2867580000 46800 1 +12}
|
||||
{2873023200 43200 0 +12}
|
||||
{2898424800 46800 1 +12}
|
||||
{2899029600 46800 1 +12}
|
||||
{2904472800 43200 0 +12}
|
||||
{2929874400 46800 1 +12}
|
||||
{2930479200 46800 1 +12}
|
||||
{2935922400 43200 0 +12}
|
||||
{2961324000 46800 1 +12}
|
||||
{2961928800 46800 1 +12}
|
||||
{2967372000 43200 0 +12}
|
||||
{2992773600 46800 1 +12}
|
||||
{2993378400 46800 1 +12}
|
||||
{2999426400 43200 0 +12}
|
||||
{3024223200 46800 1 +12}
|
||||
{3024828000 46800 1 +12}
|
||||
{3030876000 43200 0 +12}
|
||||
{3056277600 46800 1 +12}
|
||||
{3056882400 46800 1 +12}
|
||||
{3062325600 43200 0 +12}
|
||||
{3087727200 46800 1 +12}
|
||||
{3088332000 46800 1 +12}
|
||||
{3093775200 43200 0 +12}
|
||||
{3119176800 46800 1 +12}
|
||||
{3119781600 46800 1 +12}
|
||||
{3125224800 43200 0 +12}
|
||||
{3150626400 46800 1 +12}
|
||||
{3157279200 43200 0 +12}
|
||||
{3182076000 46800 1 +12}
|
||||
{3151231200 46800 1 +12}
|
||||
{3156674400 43200 0 +12}
|
||||
{3182680800 46800 1 +12}
|
||||
{3188728800 43200 0 +12}
|
||||
{3213525600 46800 1 +12}
|
||||
{3214130400 46800 1 +12}
|
||||
{3220178400 43200 0 +12}
|
||||
{3245580000 46800 1 +12}
|
||||
{3246184800 46800 1 +12}
|
||||
{3251628000 43200 0 +12}
|
||||
{3277029600 46800 1 +12}
|
||||
{3277634400 46800 1 +12}
|
||||
{3283077600 43200 0 +12}
|
||||
{3308479200 46800 1 +12}
|
||||
{3309084000 46800 1 +12}
|
||||
{3314527200 43200 0 +12}
|
||||
{3339928800 46800 1 +12}
|
||||
{3346581600 43200 0 +12}
|
||||
{3371378400 46800 1 +12}
|
||||
{3340533600 46800 1 +12}
|
||||
{3345976800 43200 0 +12}
|
||||
{3371983200 46800 1 +12}
|
||||
{3378031200 43200 0 +12}
|
||||
{3403432800 46800 1 +12}
|
||||
{3404037600 46800 1 +12}
|
||||
{3409480800 43200 0 +12}
|
||||
{3434882400 46800 1 +12}
|
||||
{3435487200 46800 1 +12}
|
||||
{3440930400 43200 0 +12}
|
||||
{3466332000 46800 1 +12}
|
||||
{3466936800 46800 1 +12}
|
||||
{3472380000 43200 0 +12}
|
||||
{3497781600 46800 1 +12}
|
||||
{3504434400 43200 0 +12}
|
||||
{3529231200 46800 1 +12}
|
||||
{3498386400 46800 1 +12}
|
||||
{3503829600 43200 0 +12}
|
||||
{3529836000 46800 1 +12}
|
||||
{3535884000 43200 0 +12}
|
||||
{3560680800 46800 1 +12}
|
||||
{3561285600 46800 1 +12}
|
||||
{3567333600 43200 0 +12}
|
||||
{3592735200 46800 1 +12}
|
||||
{3593340000 46800 1 +12}
|
||||
{3598783200 43200 0 +12}
|
||||
{3624184800 46800 1 +12}
|
||||
{3624789600 46800 1 +12}
|
||||
{3630232800 43200 0 +12}
|
||||
{3655634400 46800 1 +12}
|
||||
{3656239200 46800 1 +12}
|
||||
{3661682400 43200 0 +12}
|
||||
{3687084000 46800 1 +12}
|
||||
{3693736800 43200 0 +12}
|
||||
{3718533600 46800 1 +12}
|
||||
{3687688800 46800 1 +12}
|
||||
{3693132000 43200 0 +12}
|
||||
{3719138400 46800 1 +12}
|
||||
{3725186400 43200 0 +12}
|
||||
{3750588000 46800 1 +12}
|
||||
{3751192800 46800 1 +12}
|
||||
{3756636000 43200 0 +12}
|
||||
{3782037600 46800 1 +12}
|
||||
{3782642400 46800 1 +12}
|
||||
{3788085600 43200 0 +12}
|
||||
{3813487200 46800 1 +12}
|
||||
{3814092000 46800 1 +12}
|
||||
{3819535200 43200 0 +12}
|
||||
{3844936800 46800 1 +12}
|
||||
{3845541600 46800 1 +12}
|
||||
{3850984800 43200 0 +12}
|
||||
{3876386400 46800 1 +12}
|
||||
{3876991200 46800 1 +12}
|
||||
{3883039200 43200 0 +12}
|
||||
{3907836000 46800 1 +12}
|
||||
{3908440800 46800 1 +12}
|
||||
{3914488800 43200 0 +12}
|
||||
{3939890400 46800 1 +12}
|
||||
{3940495200 46800 1 +12}
|
||||
{3945938400 43200 0 +12}
|
||||
{3971340000 46800 1 +12}
|
||||
{3971944800 46800 1 +12}
|
||||
{3977388000 43200 0 +12}
|
||||
{4002789600 46800 1 +12}
|
||||
{4003394400 46800 1 +12}
|
||||
{4008837600 43200 0 +12}
|
||||
{4034239200 46800 1 +12}
|
||||
{4040892000 43200 0 +12}
|
||||
{4065688800 46800 1 +12}
|
||||
{4034844000 46800 1 +12}
|
||||
{4040287200 43200 0 +12}
|
||||
{4066293600 46800 1 +12}
|
||||
{4072341600 43200 0 +12}
|
||||
{4097138400 46800 1 +12}
|
||||
{4097743200 46800 1 +12}
|
||||
}
|
||||
|
||||
@@ -4,5 +4,23 @@ set TZData(:Pacific/Guam) {
|
||||
{-9223372036854775808 -51660 0 LMT}
|
||||
{-3944626740 34740 0 LMT}
|
||||
{-2177487540 36000 0 GST}
|
||||
{-885549600 32400 0 +09}
|
||||
{-802256400 36000 0 GST}
|
||||
{-331891200 39600 1 GDT}
|
||||
{-281610000 36000 0 GST}
|
||||
{-73728000 39600 1 GDT}
|
||||
{-29415540 36000 0 GST}
|
||||
{-16704000 39600 1 GDT}
|
||||
{-10659600 36000 0 GST}
|
||||
{9907200 39600 1 GDT}
|
||||
{21394800 36000 0 GST}
|
||||
{41356800 39600 1 GDT}
|
||||
{52844400 36000 0 GST}
|
||||
{124819200 39600 1 GDT}
|
||||
{130863600 36000 0 GST}
|
||||
{201888000 39600 1 GDT}
|
||||
{209487660 36000 0 GST}
|
||||
{230659200 39600 1 GDT}
|
||||
{241542000 36000 0 GST}
|
||||
{977493600 36000 0 ChST}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
|
||||
set TZData(:Pacific/Kosrae) {
|
||||
{-9223372036854775808 39116 0 LMT}
|
||||
{-9223372036854775808 -47284 0 LMT}
|
||||
{-3944631116 39116 0 LMT}
|
||||
{-2177491916 39600 0 +11}
|
||||
{-1743678000 32400 0 +09}
|
||||
{-1606813200 39600 0 +11}
|
||||
{-1041418800 36000 0 +10}
|
||||
{-907408800 32400 0 +09}
|
||||
{-770634000 39600 0 +11}
|
||||
{-7988400 43200 0 +12}
|
||||
{915105600 39600 0 +11}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
set TZData(:Pacific/Kwajalein) {
|
||||
{-9223372036854775808 40160 0 LMT}
|
||||
{-2177492960 39600 0 +11}
|
||||
{-1041418800 36000 0 +10}
|
||||
{-907408800 32400 0 +09}
|
||||
{-817462800 39600 0 +11}
|
||||
{-7988400 -43200 0 -12}
|
||||
{745848000 43200 0 +12}
|
||||
{745934400 43200 0 +12}
|
||||
}
|
||||
|
||||
@@ -3,5 +3,10 @@
|
||||
set TZData(:Pacific/Majuro) {
|
||||
{-9223372036854775808 41088 0 LMT}
|
||||
{-2177493888 39600 0 +11}
|
||||
{-1743678000 32400 0 +09}
|
||||
{-1606813200 39600 0 +11}
|
||||
{-1041418800 36000 0 +10}
|
||||
{-907408800 32400 0 +09}
|
||||
{-818067600 39600 0 +11}
|
||||
{-7988400 43200 0 +12}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
set TZData(:Pacific/Nauru) {
|
||||
{-9223372036854775808 40060 0 LMT}
|
||||
{-1545131260 41400 0 +1130}
|
||||
{-877347000 32400 0 +09}
|
||||
{-800960400 41400 0 +1130}
|
||||
{294323400 43200 0 +12}
|
||||
{-862918200 32400 0 +09}
|
||||
{-767350800 41400 0 +1130}
|
||||
{287418600 43200 0 +12}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,168 @@ set TZData(:Pacific/Norfolk) {
|
||||
{-2177493112 40320 0 +1112}
|
||||
{-599656320 41400 0 +1130}
|
||||
{152029800 45000 1 +1230}
|
||||
{162912600 41400 0 +1130}
|
||||
{162916200 41400 0 +1130}
|
||||
{1443882600 39600 0 +11}
|
||||
{1561899600 39600 0 +12}
|
||||
{1570287600 43200 1 +12}
|
||||
{1586012400 39600 0 +12}
|
||||
{1601737200 43200 1 +12}
|
||||
{1617462000 39600 0 +12}
|
||||
{1633186800 43200 1 +12}
|
||||
{1648911600 39600 0 +12}
|
||||
{1664636400 43200 1 +12}
|
||||
{1680361200 39600 0 +12}
|
||||
{1696086000 43200 1 +12}
|
||||
{1712415600 39600 0 +12}
|
||||
{1728140400 43200 1 +12}
|
||||
{1743865200 39600 0 +12}
|
||||
{1759590000 43200 1 +12}
|
||||
{1775314800 39600 0 +12}
|
||||
{1791039600 43200 1 +12}
|
||||
{1806764400 39600 0 +12}
|
||||
{1822489200 43200 1 +12}
|
||||
{1838214000 39600 0 +12}
|
||||
{1853938800 43200 1 +12}
|
||||
{1869663600 39600 0 +12}
|
||||
{1885993200 43200 1 +12}
|
||||
{1901718000 39600 0 +12}
|
||||
{1917442800 43200 1 +12}
|
||||
{1933167600 39600 0 +12}
|
||||
{1948892400 43200 1 +12}
|
||||
{1964617200 39600 0 +12}
|
||||
{1980342000 43200 1 +12}
|
||||
{1996066800 39600 0 +12}
|
||||
{2011791600 43200 1 +12}
|
||||
{2027516400 39600 0 +12}
|
||||
{2043241200 43200 1 +12}
|
||||
{2058966000 39600 0 +12}
|
||||
{2075295600 43200 1 +12}
|
||||
{2091020400 39600 0 +12}
|
||||
{2106745200 43200 1 +12}
|
||||
{2122470000 39600 0 +12}
|
||||
{2138194800 43200 1 +12}
|
||||
{2153919600 39600 0 +12}
|
||||
{2169644400 43200 1 +12}
|
||||
{2185369200 39600 0 +12}
|
||||
{2201094000 43200 1 +12}
|
||||
{2216818800 39600 0 +12}
|
||||
{2233148400 43200 1 +12}
|
||||
{2248873200 39600 0 +12}
|
||||
{2264598000 43200 1 +12}
|
||||
{2280322800 39600 0 +12}
|
||||
{2296047600 43200 1 +12}
|
||||
{2311772400 39600 0 +12}
|
||||
{2327497200 43200 1 +12}
|
||||
{2343222000 39600 0 +12}
|
||||
{2358946800 43200 1 +12}
|
||||
{2374671600 39600 0 +12}
|
||||
{2390396400 43200 1 +12}
|
||||
{2406121200 39600 0 +12}
|
||||
{2422450800 43200 1 +12}
|
||||
{2438175600 39600 0 +12}
|
||||
{2453900400 43200 1 +12}
|
||||
{2469625200 39600 0 +12}
|
||||
{2485350000 43200 1 +12}
|
||||
{2501074800 39600 0 +12}
|
||||
{2516799600 43200 1 +12}
|
||||
{2532524400 39600 0 +12}
|
||||
{2548249200 43200 1 +12}
|
||||
{2563974000 39600 0 +12}
|
||||
{2579698800 43200 1 +12}
|
||||
{2596028400 39600 0 +12}
|
||||
{2611753200 43200 1 +12}
|
||||
{2627478000 39600 0 +12}
|
||||
{2643202800 43200 1 +12}
|
||||
{2658927600 39600 0 +12}
|
||||
{2674652400 43200 1 +12}
|
||||
{2690377200 39600 0 +12}
|
||||
{2706102000 43200 1 +12}
|
||||
{2721826800 39600 0 +12}
|
||||
{2737551600 43200 1 +12}
|
||||
{2753276400 39600 0 +12}
|
||||
{2769606000 43200 1 +12}
|
||||
{2785330800 39600 0 +12}
|
||||
{2801055600 43200 1 +12}
|
||||
{2816780400 39600 0 +12}
|
||||
{2832505200 43200 1 +12}
|
||||
{2848230000 39600 0 +12}
|
||||
{2863954800 43200 1 +12}
|
||||
{2879679600 39600 0 +12}
|
||||
{2895404400 43200 1 +12}
|
||||
{2911129200 39600 0 +12}
|
||||
{2926854000 43200 1 +12}
|
||||
{2942578800 39600 0 +12}
|
||||
{2958908400 43200 1 +12}
|
||||
{2974633200 39600 0 +12}
|
||||
{2990358000 43200 1 +12}
|
||||
{3006082800 39600 0 +12}
|
||||
{3021807600 43200 1 +12}
|
||||
{3037532400 39600 0 +12}
|
||||
{3053257200 43200 1 +12}
|
||||
{3068982000 39600 0 +12}
|
||||
{3084706800 43200 1 +12}
|
||||
{3100431600 39600 0 +12}
|
||||
{3116761200 43200 1 +12}
|
||||
{3132486000 39600 0 +12}
|
||||
{3148210800 43200 1 +12}
|
||||
{3163935600 39600 0 +12}
|
||||
{3179660400 43200 1 +12}
|
||||
{3195385200 39600 0 +12}
|
||||
{3211110000 43200 1 +12}
|
||||
{3226834800 39600 0 +12}
|
||||
{3242559600 43200 1 +12}
|
||||
{3258284400 39600 0 +12}
|
||||
{3274009200 43200 1 +12}
|
||||
{3289734000 39600 0 +12}
|
||||
{3306063600 43200 1 +12}
|
||||
{3321788400 39600 0 +12}
|
||||
{3337513200 43200 1 +12}
|
||||
{3353238000 39600 0 +12}
|
||||
{3368962800 43200 1 +12}
|
||||
{3384687600 39600 0 +12}
|
||||
{3400412400 43200 1 +12}
|
||||
{3416137200 39600 0 +12}
|
||||
{3431862000 43200 1 +12}
|
||||
{3447586800 39600 0 +12}
|
||||
{3463311600 43200 1 +12}
|
||||
{3479641200 39600 0 +12}
|
||||
{3495366000 43200 1 +12}
|
||||
{3511090800 39600 0 +12}
|
||||
{3526815600 43200 1 +12}
|
||||
{3542540400 39600 0 +12}
|
||||
{3558265200 43200 1 +12}
|
||||
{3573990000 39600 0 +12}
|
||||
{3589714800 43200 1 +12}
|
||||
{3605439600 39600 0 +12}
|
||||
{3621164400 43200 1 +12}
|
||||
{3636889200 39600 0 +12}
|
||||
{3653218800 43200 1 +12}
|
||||
{3668943600 39600 0 +12}
|
||||
{3684668400 43200 1 +12}
|
||||
{3700393200 39600 0 +12}
|
||||
{3716118000 43200 1 +12}
|
||||
{3731842800 39600 0 +12}
|
||||
{3747567600 43200 1 +12}
|
||||
{3763292400 39600 0 +12}
|
||||
{3779017200 43200 1 +12}
|
||||
{3794742000 39600 0 +12}
|
||||
{3810466800 43200 1 +12}
|
||||
{3826191600 39600 0 +12}
|
||||
{3842521200 43200 1 +12}
|
||||
{3858246000 39600 0 +12}
|
||||
{3873970800 43200 1 +12}
|
||||
{3889695600 39600 0 +12}
|
||||
{3905420400 43200 1 +12}
|
||||
{3921145200 39600 0 +12}
|
||||
{3936870000 43200 1 +12}
|
||||
{3952594800 39600 0 +12}
|
||||
{3968319600 43200 1 +12}
|
||||
{3984044400 39600 0 +12}
|
||||
{4000374000 43200 1 +12}
|
||||
{4016098800 39600 0 +12}
|
||||
{4031823600 43200 1 +12}
|
||||
{4047548400 39600 0 +12}
|
||||
{4063273200 43200 1 +12}
|
||||
{4078998000 39600 0 +12}
|
||||
{4094722800 43200 1 +12}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
|
||||
set TZData(:Pacific/Palau) {
|
||||
{-9223372036854775808 32276 0 LMT}
|
||||
{-9223372036854775808 -54124 0 LMT}
|
||||
{-3944624276 32276 0 LMT}
|
||||
{-2177485076 32400 0 +09}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
|
||||
set TZData(:Pacific/Pohnpei) {
|
||||
{-9223372036854775808 37972 0 LMT}
|
||||
{-9223372036854775808 -48428 0 LMT}
|
||||
{-3944629972 37972 0 LMT}
|
||||
{-2177490772 39600 0 +11}
|
||||
{-1743678000 32400 0 +09}
|
||||
{-1606813200 39600 0 +11}
|
||||
{-1041418800 36000 0 +10}
|
||||
{-907408800 32400 0 +09}
|
||||
{-770634000 39600 0 +11}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# created by tools/tclZIC.tcl - do not edit
|
||||
if {![info exists TZData(Etc/UCT)]} {
|
||||
LoadTimeZoneFile Etc/UCT
|
||||
if {![info exists TZData(Etc/UTC)]} {
|
||||
LoadTimeZoneFile Etc/UTC
|
||||
}
|
||||
set TZData(:UCT) $TZData(:Etc/UCT)
|
||||
set TZData(:UCT) $TZData(:Etc/UTC)
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace eval tcltest {
|
||||
# When the version number changes, be sure to update the pkgIndex.tcl file,
|
||||
# and the install directory in the Makefiles. When the minor version
|
||||
# changes (new feature) be sure to update the man page as well.
|
||||
variable Version 2.5.0
|
||||
variable Version 2.5.1
|
||||
|
||||
# Compatibility support for dumb variables defined in tcltest 1
|
||||
# Do not use these. Call [package provide Tcl] and [info patchlevel]
|
||||
@@ -3072,7 +3072,12 @@ proc tcltest::removeFile {name {directory ""}} {
|
||||
Warn "removeFile removing \"$fullName\":\n not a file"
|
||||
}
|
||||
}
|
||||
return [file delete -- $fullName]
|
||||
if {[catch {file delete -- $fullName} msg ]} {
|
||||
DebugDo 1 {
|
||||
Warn "removeFile removing \"$fullName\":\n failed: $msg"
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
# tcltest::makeDirectory --
|
||||
@@ -11,7 +11,7 @@
|
||||
package require Tcl 8.6-
|
||||
# Keep this in sync with pkgIndex.tcl and with the install directories in
|
||||
# Makefiles
|
||||
package provide http 2.9.0
|
||||
package provide http 2.9.1
|
||||
|
||||
namespace eval http {
|
||||
# Allow resourcing to not clobber existing data
|
||||
@@ -2978,7 +2978,7 @@ proc http::IsBinaryContentType {type} {
|
||||
# and so on.
|
||||
if {$major eq "application"} {
|
||||
set minor [string trimright $minor]
|
||||
if {$minor in {"xml" "xml-external-parsed-entity" "xml-dtd"}} {
|
||||
if {$minor in {"json" "xml" "xml-external-parsed-entity" "xml-dtd"}} {
|
||||
return false
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -15,21 +15,21 @@ TCL_DLL_FILE="tcl86t.dll"
|
||||
TCL_VERSION='8.6'
|
||||
TCL_MAJOR_VERSION='8'
|
||||
TCL_MINOR_VERSION='6'
|
||||
TCL_PATCH_LEVEL='8.6.9'
|
||||
TCL_PATCH_LEVEL='8.6.10'
|
||||
|
||||
# C compiler to use for compilation.
|
||||
TCL_CC='cl'
|
||||
|
||||
# -D flags for use with the C compiler.
|
||||
TCL_DEFS='-nologo -c /D_ATL_XP_TARGETING /DUNICODE /D_UNICODE -W3 -wd4311 -wd4312 -wd4311 -wd4312 -FpC:\_work\11\b\tcl-core-8.6.9.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -fp:strict -O2 -GS -GL -MD -I"C:\_work\11\b\tcl-core-8.6.9.0\win\..\win" -I"C:\_work\11\b\tcl-core-8.6.9.0\win\..\generic" -I"C:\_work\11\b\tcl-core-8.6.9.0\win\..\libtommath" -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DTCL_CFGVAL_ENCODING=\"cp1252\" -DSTDC_HEADERS -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DNDEBUG -DTCL_CFG_OPTIMIZED -DTCL_CFG_DO64BIT -DBUILD_tcl'
|
||||
TCL_DEFS='-nologo -c /D_ATL_XP_TARGETING -W3 -wd4311 -wd4312 -wd4311 -wd4312 -FpC:\A\32\b\tcl-core-8.6.10.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -fp:strict -O2 -GS -GL -MD -I"C:\A\32\b\tcl-core-8.6.10.0\win\..\win" -I"C:\A\32\b\tcl-core-8.6.10.0\win\..\generic" -I"C:\A\32\b\tcl-core-8.6.10.0\win\..\libtommath" /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DMP_NO_STDINT /DTCL_CFGVAL_ENCODING=\"cp1252\" /DSTDC_HEADERS /DTCL_THREADS=1 /DUSE_THREAD_ALLOC=1 /DNDEBUG /DTCL_CFG_OPTIMIZED /DTCL_CFG_DO64BIT /DBUILD_tcl'
|
||||
|
||||
# If TCL was built with debugging symbols, generated libraries contain
|
||||
# this string at the end of the library name (before the extension).
|
||||
TCL_DBGX=t
|
||||
|
||||
# Default flags used in an optimized and debuggable build, respectively.
|
||||
TCL_CFLAGS_DEBUG='-nologo -c -W3 -YX -FpC:\_work\11\b\tcl-core-8.6.9.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MDd'
|
||||
TCL_CFLAGS_OPTIMIZE='-nologo -c -W3 -YX -FpC:\_work\11\b\tcl-core-8.6.9.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MD'
|
||||
TCL_CFLAGS_DEBUG='-nologo -c -W3 -YX -FpC:\A\32\b\tcl-core-8.6.10.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MDd'
|
||||
TCL_CFLAGS_OPTIMIZE='-nologo -c -W3 -YX -FpC:\A\32\b\tcl-core-8.6.10.0\win\Release_AMD64_VC13\tcl_ThreadedDynamic\ -MD'
|
||||
|
||||
# Default linker flags used in an optimized and debuggable build, respectively.
|
||||
TCL_LDFLAGS_DEBUG='-nologo -machine:AMD64 -debug -debugtype:cv'
|
||||
@@ -55,11 +55,11 @@ TCL_LIBS='kernel32.lib advapi32.lib netapi32.lib user32.lib userenv.lib ws2_32.l
|
||||
|
||||
# Top-level directory in which Tcl's platform-independent files are
|
||||
# installed.
|
||||
TCL_PREFIX='C:\_work\11\b\tcltk-8.6.9.0\amd64'
|
||||
TCL_PREFIX='C:\A\32\b\tcltk-8.6.10.0\amd64'
|
||||
|
||||
# Top-level directory in which Tcl's platform-specific files (e.g.
|
||||
# executables) are installed.
|
||||
TCL_EXEC_PREFIX='C:\_work\11\b\tcltk-8.6.9.0\amd64\bin'
|
||||
TCL_EXEC_PREFIX='C:\A\32\b\tcltk-8.6.10.0\amd64\bin'
|
||||
|
||||
# Flags to pass to cc when compiling the components of a shared library:
|
||||
TCL_SHLIB_CFLAGS=''
|
||||
@@ -115,11 +115,11 @@ TCL_BUILD_LIB_SPEC=''
|
||||
|
||||
# String to pass to linker to pick up the Tcl library from its
|
||||
# installed directory.
|
||||
TCL_LIB_SPEC='C:\_work\11\b\tcltk-8.6.9.0\amd64\lib\tcl86t.lib'
|
||||
TCL_LIB_SPEC='C:\A\32\b\tcltk-8.6.10.0\amd64\lib\tcl86t.lib'
|
||||
|
||||
# String to pass to the compiler so that an extension can
|
||||
# find installed Tcl headers.
|
||||
TCL_INCLUDE_SPEC='-IC:\_work\11\b\tcltk-8.6.9.0\amd64\include'
|
||||
TCL_INCLUDE_SPEC='-IC:\A\32\b\tcltk-8.6.10.0\amd64\include'
|
||||
|
||||
# Indicates whether a version numbers should be used in -l switches
|
||||
# ("ok" means it's safe to use switches like -ltcl7.5; "nodots" means
|
||||
@@ -146,7 +146,7 @@ TCL_UNSHARED_LIB_SUFFIX='86t.lib'
|
||||
# different place than the directory containing the source files, this
|
||||
# points to the location of the sources, not the location where Tcl was
|
||||
# compiled.
|
||||
TCL_SRC_DIR='C:\_work\11\b\tcl-core-8.6.9.0\win\..'
|
||||
TCL_SRC_DIR='C:\A\32\b\tcl-core-8.6.10.0\win\..'
|
||||
|
||||
# List of standard directories in which to look for packages during
|
||||
# "package require" commands. Contains the "prefix" directory plus also
|
||||
@@ -164,17 +164,17 @@ TCL_STUB_LIB_FLAG='tclstub86.lib'
|
||||
|
||||
# String to pass to linker to pick up the Tcl stub library from its
|
||||
# build directory.
|
||||
TCL_BUILD_STUB_LIB_SPEC='-LC:\_work\11\b\tcl-core-8.6.9.0\win\Release_AMD64_VC13 tclstub86.lib'
|
||||
TCL_BUILD_STUB_LIB_SPEC='-LC:\A\32\b\tcl-core-8.6.10.0\win\Release_AMD64_VC13 tclstub86.lib'
|
||||
|
||||
# String to pass to linker to pick up the Tcl stub library from its
|
||||
# installed directory.
|
||||
TCL_STUB_LIB_SPEC='-LC:\_work\11\b\tcltk-8.6.9.0\amd64\lib tclstub86.lib'
|
||||
TCL_STUB_LIB_SPEC='-LC:\A\32\b\tcltk-8.6.10.0\amd64\lib tclstub86.lib'
|
||||
|
||||
# Path to the Tcl stub library in the build directory.
|
||||
TCL_BUILD_STUB_LIB_PATH='C:\_work\11\b\tcl-core-8.6.9.0\win\Release_AMD64_VC13\tclstub86.lib'
|
||||
TCL_BUILD_STUB_LIB_PATH='C:\A\32\b\tcl-core-8.6.10.0\win\Release_AMD64_VC13\tclstub86.lib'
|
||||
|
||||
# Path to the Tcl stub library in the install directory.
|
||||
TCL_STUB_LIB_PATH='C:\_work\11\b\tcltk-8.6.9.0\amd64\lib\tclstub86.lib'
|
||||
TCL_STUB_LIB_PATH='C:\A\32\b\tcltk-8.6.10.0\amd64\lib\tclstub86.lib'
|
||||
|
||||
# Flag, 1: we built Tcl with threads enabled, 0 we didn't
|
||||
TCL_THREADS=1
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -21,7 +21,8 @@ namespace eval ::tk::dialog::error {
|
||||
if {[tk windowingsystem] eq "aqua"} {
|
||||
option add *ErrorDialog*background systemAlertBackgroundActive \
|
||||
widgetDefault
|
||||
option add *ErrorDialog*info.text.background white widgetDefault
|
||||
option add *ErrorDialog*info.text.background \
|
||||
systemTextBackgroundColor widgetDefault
|
||||
option add *ErrorDialog*Button.highlightBackground \
|
||||
systemAlertBackgroundActive widgetDefault
|
||||
}
|
||||
@@ -97,7 +98,7 @@ proc ::tk::dialog::error::ReturnInDetails w {
|
||||
# Arguments:
|
||||
# err - The error message.
|
||||
#
|
||||
proc ::tk::dialog::error::bgerror err {
|
||||
proc ::tk::dialog::error::bgerror {err {flag 1}} {
|
||||
global errorInfo
|
||||
variable button
|
||||
|
||||
@@ -106,15 +107,21 @@ proc ::tk::dialog::error::bgerror err {
|
||||
set ret [catch {::tkerror $err} msg];
|
||||
if {$ret != 1} {return -code $ret $msg}
|
||||
|
||||
# Ok the application's tkerror either failed or was not found
|
||||
# we use the default dialog then :
|
||||
# The application's tkerror either failed or was not found
|
||||
# so we use the default dialog. But on Aqua we cannot display
|
||||
# the dialog if the background error occurs in an idle task
|
||||
# being processed inside of [NSView drawRect]. In that case
|
||||
# we post the dialog as an after task instead.
|
||||
set windowingsystem [tk windowingsystem]
|
||||
if {$windowingsystem eq "aqua"} {
|
||||
set ok [mc Ok]
|
||||
} else {
|
||||
set ok [mc OK]
|
||||
if $flag {
|
||||
set errorInfo $info
|
||||
after 500 [list bgerror "$err" 0]
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
set ok [mc OK]
|
||||
# Truncate the message if it is too wide (>maxLine characters) or
|
||||
# too tall (>4 lines). Truncation occurs at the first point at
|
||||
# which one of those conditions is met.
|
||||
|
||||
@@ -748,12 +748,16 @@ proc ::tk::CheckLeave {w} {
|
||||
$w configure -state normal
|
||||
}
|
||||
|
||||
# Restore the original button "selected" color; assume that the user
|
||||
# wasn't monkeying around with things too much.
|
||||
# Restore the original button "selected" color; but only if the user
|
||||
# has not changed it in the meantime.
|
||||
|
||||
if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {
|
||||
if {[$w cget -selectcolor] eq $Priv($w,selectcolor)
|
||||
|| ([info exist Priv($w,aselectcolor)] &&
|
||||
[$w cget -selectcolor] eq $Priv($w,aselectcolor))} {
|
||||
$w configure -selectcolor $Priv($w,selectcolor)
|
||||
}
|
||||
}
|
||||
unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor)
|
||||
|
||||
# Restore the original button relief if it was changed by Tk. That is
|
||||
|
||||
@@ -135,9 +135,13 @@ set demo_arrowInfo(y) 150
|
||||
set demo_arrowInfo(smallTips) {5 5 2}
|
||||
set demo_arrowInfo(count) 0
|
||||
if {[winfo depth $c] > 1} {
|
||||
set demo_arrowInfo(bigLineStyle) "-fill SkyBlue1"
|
||||
set demo_arrowInfo(boxStyle) "-fill {} -outline black -width 1"
|
||||
set demo_arrowInfo(activeStyle) "-fill red -outline black -width 1"
|
||||
if {[tk windowingsystem] eq "aqua"} {
|
||||
set demo_arrowInfo(bigLineStyle) "-fill systemSelectedTextBackgroundColor"
|
||||
} else {
|
||||
set demo_arrowInfo(bigLineStyle) "-fill LightSeaGreen"
|
||||
}
|
||||
set demo_arrowInfo(boxStyle) "-fill {} -width 1"
|
||||
set demo_arrowInfo(activeStyle) "-fill red -width 1"
|
||||
} else {
|
||||
# Main widget program sets variable tk_demoDirectory
|
||||
set demo_arrowInfo(bigLineStyle) "-fill black \
|
||||
|
||||
@@ -47,7 +47,7 @@ for {set i 0} {$i < 20} {incr i} {
|
||||
set x [expr {-10 + 3*$i}]
|
||||
for {set j 0; set y -10} {$j < 10} {incr j; incr y 3} {
|
||||
$c create rect ${x}c ${y}c [expr {$x+2}]c [expr {$y+2}]c \
|
||||
-outline black -fill $bg -tags rect
|
||||
-fill $bg -tags rect
|
||||
$c create text [expr {$x+1}]c [expr {$y+1}]c -text "$i,$j" \
|
||||
-anchor center -tags text
|
||||
}
|
||||
@@ -71,7 +71,42 @@ if {[tk windowingsystem] eq "aqua"} {
|
||||
bind $c <Shift-Option-MouseWheel> {
|
||||
%W xview scroll [expr {-10 * (%D)}] units
|
||||
}
|
||||
} else {
|
||||
bind $c <MouseWheel> {
|
||||
%W yview scroll [expr {-(%D / 30)}] units
|
||||
}
|
||||
bind $c <Shift-MouseWheel> {
|
||||
%W xview scroll [expr {-(%D / 30)}] units
|
||||
}
|
||||
}
|
||||
|
||||
if {[tk windowingsystem] eq "x11"} {
|
||||
# Support for mousewheels on Linux/Unix commonly comes through mapping
|
||||
# the wheel to the extended buttons. If you have a mousewheel, find
|
||||
# Linux configuration info at:
|
||||
# http://linuxreviews.org/howtos/xfree/mouse/
|
||||
bind $c <4> {
|
||||
if {!$tk_strictMotif} {
|
||||
%W yview scroll -5 units
|
||||
}
|
||||
}
|
||||
bind $c <Shift-4> {
|
||||
if {!$tk_strictMotif} {
|
||||
%W xview scroll -5 units
|
||||
}
|
||||
}
|
||||
bind $c <5> {
|
||||
if {!$tk_strictMotif} {
|
||||
%W yview scroll 5 units
|
||||
}
|
||||
}
|
||||
bind $c <Shift-5> {
|
||||
if {!$tk_strictMotif} {
|
||||
%W xview scroll 5 units
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
proc scrollEnter canvas {
|
||||
global oldFill
|
||||
@@ -81,10 +116,11 @@ proc scrollEnter canvas {
|
||||
}
|
||||
set oldFill [lindex [$canvas itemconfig $id -fill] 4]
|
||||
if {[winfo depth $canvas] > 1} {
|
||||
$canvas itemconfigure $id -fill SeaGreen1
|
||||
if {[tk windowingsystem] eq "aqua"} {
|
||||
$canvas itemconfigure $id -fill systemSelectedTextBackgroundColor
|
||||
} else {
|
||||
$canvas itemconfigure $id -fill black
|
||||
$canvas itemconfigure [expr {$id+1}] -fill white
|
||||
$canvas itemconfigure $id -fill LightSeaGreen
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,11 +131,9 @@ proc scrollLeave canvas {
|
||||
set id [expr {$id-1}]
|
||||
}
|
||||
$canvas itemconfigure $id -fill $oldFill
|
||||
$canvas itemconfigure [expr {$id+1}] -fill black
|
||||
}
|
||||
|
||||
proc scrollButton canvas {
|
||||
global oldFill
|
||||
set id [$canvas find withtag current]
|
||||
if {[lsearch [$canvas gettags current] text] < 0} {
|
||||
set id [expr {$id+1}]
|
||||
|
||||
@@ -40,7 +40,7 @@ $c create rectangle 245 195 255 205 -outline black -fill red
|
||||
|
||||
# First, create the text item and give it bindings so it can be edited.
|
||||
|
||||
$c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left]
|
||||
$c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left]
|
||||
$c bind text <1> "textB1Press $c %x %y"
|
||||
$c bind text <B1-Motion> "textB1Move $c %x %y"
|
||||
$c bind text <Shift-1> "$c select adjust current @%x,%y"
|
||||
|
||||
@@ -2,8 +2,16 @@
|
||||
#
|
||||
# This demonstration script creates a dialog box with a local grab.
|
||||
|
||||
interp create slave
|
||||
load {} Tk slave
|
||||
slave eval {
|
||||
wm title . slave
|
||||
wm geometry . +700+30
|
||||
pack [text .t -width 30 -height 10]
|
||||
}
|
||||
|
||||
after idle {.dialog1.msg configure -wraplength 4i}
|
||||
set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box. It uses Tk's "grab" command to create a "local grab" on the dialog box. The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below. However, you can still interact with other applications.} \
|
||||
set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box. It uses Tk's "grab" command to create a "local grab" on the dialog box. The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below. However, you can still interact with other applications. For example, you should be able to edit text in the window named "slave" which was created by a slave interpreter.} \
|
||||
info 0 OK Cancel {Show Code}]
|
||||
|
||||
switch $i {
|
||||
@@ -11,3 +19,7 @@ switch $i {
|
||||
1 {puts "You pressed Cancel"}
|
||||
2 {showCode .dialog1}
|
||||
}
|
||||
|
||||
if {[interp exists slave]} {
|
||||
interp delete slave
|
||||
}
|
||||
|
||||
@@ -8,7 +8,8 @@ after idle {
|
||||
after 100 {
|
||||
grab -global .dialog2
|
||||
}
|
||||
set i [tk_dialog .dialog2 "Dialog with global grab" {This dialog box uses a global grab, so it prevents you from interacting with anything on your display until you invoke one of the buttons below. Global grabs are almost always a bad idea; don't use them unless you're truly desperate.} warning 0 OK Cancel {Show Code}]
|
||||
set i [tk_dialog .dialog2 "Dialog with global grab" {This dialog box uses a global grab. If you are using an X11 window manager you will be prevented from interacting with anything on your display until you invoke one of the buttons below. This is almost always a bad idea; don't use global grabs with X11 unless you're truly desperate. On macOS systems you will not be able to interact with any window belonging to this process, but interaction with other macOS Applications will still be possible.}\
|
||||
warning 0 OK Cancel {Show Code}]
|
||||
|
||||
switch $i {
|
||||
0 {puts "You pressed OK"}
|
||||
|
||||
@@ -99,7 +99,7 @@ proc roomChanged {w args} {
|
||||
}
|
||||
set new [eval \
|
||||
"$w create polygon [$w coords $item] -fill $colors(active) \
|
||||
-tags highlight"]
|
||||
-outline {} -tags highlight"]
|
||||
$w raise $new marker
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ proc roomChanged {w args} {
|
||||
# outline - Color to use for the floor's outline.
|
||||
|
||||
proc bg1 {w fill outline} {
|
||||
$w create poly 347 80 349 82 351 84 353 85 363 92 375 99 386 104 \
|
||||
$w create polygon 347 80 349 82 351 84 353 85 363 92 375 99 386 104 \
|
||||
386 129 398 129 398 162 484 162 484 129 559 129 559 133 725 \
|
||||
133 725 129 802 129 802 389 644 389 644 391 559 391 559 327 \
|
||||
508 327 508 311 484 311 484 278 395 278 395 288 400 288 404 \
|
||||
@@ -127,7 +127,7 @@ proc bg1 {w fill outline} {
|
||||
22 223 17 227 13 231 8 236 4 242 2 246 0 260 0 283 1 300 5 \
|
||||
321 14 335 22 348 25 365 29 363 39 358 48 352 56 337 70 \
|
||||
344 76 347 80 \
|
||||
-tags {floor1 bg} -fill $fill
|
||||
-tags {floor1 bg} -fill $fill -outline {}
|
||||
$w create line 386 129 398 129 -fill $outline -tags {floor1 bg}
|
||||
$w create line 258 355 258 387 -fill $outline -tags {floor1 bg}
|
||||
$w create line 60 387 60 391 -fill $outline -tags {floor1 bg}
|
||||
@@ -239,12 +239,12 @@ proc bg1 {w fill outline} {
|
||||
# outline - Color to use for the floor's outline.
|
||||
|
||||
proc bg2 {w fill outline} {
|
||||
$w create poly 559 129 484 129 484 162 398 162 398 129 315 129 \
|
||||
$w create polygon 559 129 484 129 484 162 398 162 398 129 315 129 \
|
||||
315 133 176 133 176 129 96 129 96 133 3 133 3 339 0 339 0 391 \
|
||||
60 391 60 387 258 387 258 329 350 329 350 311 395 311 395 280 \
|
||||
484 280 484 311 508 311 508 327 558 327 558 391 644 391 644 \
|
||||
367 802 367 802 129 725 129 725 133 559 133 559 129 \
|
||||
-tags {floor2 bg} -fill $fill
|
||||
-tags {floor2 bg} -fill $fill -outline {}
|
||||
$w create line 350 311 350 329 -fill $outline -tags {floor2 bg}
|
||||
$w create line 398 129 398 162 -fill $outline -tags {floor2 bg}
|
||||
$w create line 802 367 802 129 -fill $outline -tags {floor2 bg}
|
||||
@@ -294,12 +294,12 @@ proc bg2 {w fill outline} {
|
||||
# outline - Color to use for the floor's outline.
|
||||
|
||||
proc bg3 {w fill outline} {
|
||||
$w create poly 159 300 107 300 107 248 159 248 159 129 96 129 96 \
|
||||
$w create polygon 159 300 107 300 107 248 159 248 159 129 96 129 96 \
|
||||
133 21 133 21 331 0 331 0 391 60 391 60 370 159 370 159 300 \
|
||||
-tags {floor3 bg} -fill $fill
|
||||
$w create poly 258 370 258 329 350 329 350 311 399 311 399 129 \
|
||||
-tags {floor3 bg} -fill $fill -outline {}
|
||||
$w create polygon 258 370 258 329 350 329 350 311 399 311 399 129 \
|
||||
315 129 315 133 176 133 176 129 159 129 159 370 258 370 \
|
||||
-tags {floor3 bg} -fill $fill
|
||||
-tags {floor3 bg} -fill $fill -outline {}
|
||||
$w create line 96 133 96 129 -fill $outline -tags {floor3 bg}
|
||||
$w create line 176 129 96 129 -fill $outline -tags {floor3 bg}
|
||||
$w create line 176 129 176 133 -fill $outline -tags {floor3 bg}
|
||||
@@ -333,195 +333,195 @@ proc bg3 {w fill outline} {
|
||||
|
||||
proc fg1 {w color} {
|
||||
global floorLabels floorItems
|
||||
set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 375 246 375 172 341 172 341 246 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 101
|
||||
set {floorItems(101)} $i
|
||||
$w create text 358 209 -text 101 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 307 240 339 240 339 206 307 206 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) {Pub Lift1}
|
||||
set {floorItems(Pub Lift1)} $i
|
||||
$w create text 323 223 -text {Pub Lift1} -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 339 205 307 205 307 171 339 171 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) {Priv Lift1}
|
||||
set {floorItems(Priv Lift1)} $i
|
||||
$w create text 323 188 -text {Priv Lift1} -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 42 389 42 337 1 337 1 389 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 42 389 42 337 1 337 1 389 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 110
|
||||
set {floorItems(110)} $i
|
||||
$w create text 21.5 363 -text 110 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 109
|
||||
set {floorItems(109)} $i
|
||||
$w create text 67 363 -text 109 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 51 300 51 253 6 253 6 300 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 51 300 51 253 6 253 6 300 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 111
|
||||
set {floorItems(111)} $i
|
||||
$w create text 28.5 276.5 -text 111 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 98 248 98 309 79 309 79 248 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 98 248 98 309 79 309 79 248 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 117B
|
||||
set {floorItems(117B)} $i
|
||||
$w create text 88.5 278.5 -text 117B -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 51 251 51 204 6 204 6 251 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 51 251 51 204 6 204 6 251 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 112
|
||||
set {floorItems(112)} $i
|
||||
$w create text 28.5 227.5 -text 112 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 6 156 51 156 51 203 6 203 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 6 156 51 156 51 203 6 203 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 113
|
||||
set {floorItems(113)} $i
|
||||
$w create text 28.5 179.5 -text 113 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 85 169 79 169 79 192 85 192 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 85 169 79 169 79 192 85 192 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 117A
|
||||
set {floorItems(117A)} $i
|
||||
$w create text 82 180.5 -text 117A -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 77 302 77 168 53 168 53 302 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 77 302 77 168 53 168 53 302 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 117
|
||||
set {floorItems(117)} $i
|
||||
$w create text 65 235 -text 117 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 51 155 51 115 6 115 6 155 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 51 155 51 115 6 115 6 155 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 114
|
||||
set {floorItems(114)} $i
|
||||
$w create text 28.5 135 -text 114 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 95 115 53 115 53 168 95 168 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 95 115 53 115 53 168 95 168 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 115
|
||||
set {floorItems(115)} $i
|
||||
$w create text 74 141.5 -text 115 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 87 113 87 27 10 27 10 113 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 87 113 87 27 10 27 10 113 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 116
|
||||
set {floorItems(116)} $i
|
||||
$w create text 48.5 70 -text 116 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 89 91 128 91 128 113 89 113 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 89 91 128 91 128 113 89 113 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 118
|
||||
set {floorItems(118)} $i
|
||||
$w create text 108.5 102 -text 118 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 120
|
||||
set {floorItems(120)} $i
|
||||
$w create text 189.5 111.5 -text 120 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 79 193 87 193 87 169 136 169 136 192 156 192 156 169 175 169 175 246 79 246 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 79 193 87 193 87 169 136 169 136 192 156 192 156 169 175 169 175 246 79 246 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 122
|
||||
set {floorItems(122)} $i
|
||||
$w create text 131 207.5 -text 122 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 138 169 154 169 154 191 138 191 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 138 169 154 169 154 191 138 191 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 121
|
||||
set {floorItems(121)} $i
|
||||
$w create text 146 180 -text 121 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 99 300 126 300 126 309 99 309 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 99 300 126 300 126 309 99 309 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 106A
|
||||
set {floorItems(106A)} $i
|
||||
$w create text 112.5 304.5 -text 106A -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 105
|
||||
set {floorItems(105)} $i
|
||||
$w create text 124.5 278.5 -text 105 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 174 309 174 300 152 300 152 309 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 174 309 174 300 152 300 152 309 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 106B
|
||||
set {floorItems(106B)} $i
|
||||
$w create text 163 304.5 -text 106B -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 104
|
||||
set {floorItems(104)} $i
|
||||
$w create text 184 278.5 -text 104 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 138 385 138 337 91 337 91 385 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 138 385 138 337 91 337 91 385 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 108
|
||||
set {floorItems(108)} $i
|
||||
$w create text 114.5 361 -text 108 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 256 337 140 337 140 385 256 385 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 256 337 140 337 140 385 256 385 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 107
|
||||
set {floorItems(107)} $i
|
||||
$w create text 198 361 -text 107 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 300 353 300 329 260 329 260 353 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 300 353 300 329 260 329 260 353 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) Smoking
|
||||
set {floorItems(Smoking)} $i
|
||||
$w create text 280 341 -text Smoking -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 123
|
||||
set {floorItems(123)} $i
|
||||
$w create text 245.5 190.5 -text 123 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 103
|
||||
set {floorItems(103)} $i
|
||||
$w create text 259 287 -text 103 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 124
|
||||
set {floorItems(124)} $i
|
||||
$w create text 356 150 -text 124 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 125
|
||||
set {floorItems(125)} $i
|
||||
$w create text 392 217.5 -text 125 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 126
|
||||
set {floorItems(126)} $i
|
||||
$w create text 436.5 185.5 -text 126 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 127
|
||||
set {floorItems(127)} $i
|
||||
$w create text 436.5 231 -text 127 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) MShower
|
||||
set {floorItems(MShower)} $i
|
||||
$w create text 488.5 184 -text MShower -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) Closet
|
||||
set {floorItems(Closet)} $i
|
||||
$w create text 502.5 190 -text Closet -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) WShower
|
||||
set {floorItems(WShower)} $i
|
||||
$w create text 494.5 230 -text WShower -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 486 131 558 131 558 135 724 135 724 166 697 166 697 275 553 275 531 254 515 254 515 174 503 174 503 161 486 161 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 486 131 558 131 558 135 724 135 724 166 697 166 697 275 553 275 531 254 515 254 515 174 503 174 503 161 486 161 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 130
|
||||
set {floorItems(130)} $i
|
||||
$w create text 638.5 205 -text 130 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 308 242 339 242 339 248 342 248 342 246 397 246 397 276 393 276 393 309 300 309 300 248 308 248 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 308 242 339 242 339 248 342 248 342 246 397 246 397 276 393 276 393 309 300 309 300 248 308 248 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 102
|
||||
set {floorItems(102)} $i
|
||||
$w create text 367.5 278.5 -text 102 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 397 255 486 255 486 276 397 276 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 397 255 486 255 486 276 397 276 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 128
|
||||
set {floorItems(128)} $i
|
||||
$w create text 441.5 265.5 -text 128 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 129
|
||||
set {floorItems(129)} $i
|
||||
$w create text 535.5 293 -text 129 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 133
|
||||
set {floorItems(133)} $i
|
||||
$w create text 628.5 335 -text 133 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 742 387 742 281 800 281 800 387 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 742 387 742 281 800 281 800 387 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 132
|
||||
set {floorItems(132)} $i
|
||||
$w create text 771 334 -text 132 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 800 168 800 280 699 280 699 168 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 800 168 800 280 699 280 699 168 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 134
|
||||
set {floorItems(134)} $i
|
||||
$w create text 749.5 224 -text 134 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 726 131 726 166 800 166 800 131 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 726 131 726 166 800 166 800 131 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 135
|
||||
set {floorItems(135)} $i
|
||||
$w create text 763 148.5 -text 135 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 340 360 335 363 331 365 326 366 304 366 304 312 396 312 396 288 400 288 404 288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 342 331 347 332 351 334 354 336 357 341 359 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 340 360 335 363 331 365 326 366 304 366 304 312 396 312 396 288 400 288 404 288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 342 331 347 332 351 334 354 336 357 341 359 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) {Ramona Stair}
|
||||
set {floorItems(Ramona Stair)} $i
|
||||
$w create text 368 323 -text {Ramona Stair} -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 30 23 30 5 93 5 98 5 104 7 110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 87 90 87 90 23 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 30 23 30 5 93 5 98 5 104 7 110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 87 90 87 90 23 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) {University Stair}
|
||||
set {floorItems(University Stair)} $i
|
||||
$w create text 155 77.5 -text {University Stair} -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 282 37 295 40 312 49 323 56 337 70 352 56 358 48 363 39 365 29 348 25 335 22 321 14 300 5 283 1 260 0 246 0 242 2 236 4 231 8 227 13 223 17 221 22 220 34 260 34 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 282 37 295 40 312 49 323 56 337 70 352 56 358 48 363 39 365 29 348 25 335 22 321 14 300 5 283 1 260 0 246 0 242 2 236 4 231 8 227 13 223 17 221 22 220 34 260 34 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) {Plaza Stair}
|
||||
set {floorItems(Plaza Stair)} $i
|
||||
$w create text 317.5 28.5 -text {Plaza Stair} -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 220 34 260 34 282 37 295 40 312 49 323 56 337 70 350 83 365 94 377 100 386 104 386 128 220 128 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 220 34 260 34 282 37 295 40 312 49 323 56 337 70 350 83 365 94 377 100 386 104 386 128 220 128 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) {Plaza Deck}
|
||||
set {floorItems(Plaza Deck)} $i
|
||||
$w create text 303 81 -text {Plaza Deck} -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 106
|
||||
set {floorItems(106)} $i
|
||||
$w create text 131.5 318.5 -text 106 -fill $color -anchor c -tags {floor1 label}
|
||||
set i [$w create polygon 146 110 162 110 162 91 130 91 130 115 95 115 95 128 114 128 114 151 157 151 157 153 112 153 112 130 97 130 97 168 175 168 175 131 146 131 -fill {} -tags {floor1 room}]
|
||||
set i [$w create polygon 146 110 162 110 162 91 130 91 130 115 95 115 95 128 114 128 114 151 157 151 157 153 112 153 112 130 97 130 97 168 175 168 175 131 146 131 -outline {} -tags {floor1 room}]
|
||||
set floorLabels($i) 119
|
||||
set {floorItems(119)} $i
|
||||
$w create text 143.5 133 -text 119 -fill $color -anchor c -tags {floor1 label}
|
||||
@@ -696,207 +696,207 @@ proc fg1 {w color} {
|
||||
|
||||
proc fg2 {w color} {
|
||||
global floorLabels floorItems
|
||||
set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 238
|
||||
set {floorItems(238)} $i
|
||||
$w create text 774 195 -text 238 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 237
|
||||
set {floorItems(237)} $i
|
||||
$w create text 763 148.5 -text 237 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 497 187 497 204 559 204 559 324 641 324 643 324 643 291 641 291 641 205 696 205 696 291 694 291 694 314 715 314 715 291 715 205 755 205 755 190 724 190 724 187 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 497 187 497 204 559 204 559 324 641 324 643 324 643 291 641 291 641 205 696 205 696 291 694 291 694 314 715 314 715 291 715 205 755 205 755 190 724 190 724 187 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 246
|
||||
set {floorItems(246)} $i
|
||||
$w create text 600 264 -text 246 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 694 279 643 279 643 314 694 314 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 694 279 643 279 643 314 694 314 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 247
|
||||
set {floorItems(247)} $i
|
||||
$w create text 668.5 296.5 -text 247 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 232 250 308 250 308 242 339 242 339 246 397 246 397 255 476 255 476 250 482 250 559 250 559 274 482 274 482 278 396 278 396 274 232 274 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 232 250 308 250 308 242 339 242 339 246 397 246 397 255 476 255 476 250 482 250 559 250 559 274 482 274 482 278 396 278 396 274 232 274 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 202
|
||||
set {floorItems(202)} $i
|
||||
$w create text 285.5 260 -text 202 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 53 228 53 338 176 338 233 338 233 196 306 196 306 180 175 180 175 169 156 169 156 196 176 196 176 228 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 53 228 53 338 176 338 233 338 233 196 306 196 306 180 175 180 175 169 156 169 156 196 176 196 176 228 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 206
|
||||
set {floorItems(206)} $i
|
||||
$w create text 143 267 -text 206 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 51 277 6 277 6 338 51 338 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 51 277 6 277 6 338 51 338 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 212
|
||||
set {floorItems(212)} $i
|
||||
$w create text 28.5 307.5 -text 212 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 245
|
||||
set {floorItems(245)} $i
|
||||
$w create text 521.5 300.5 -text 245 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 560 389 599 389 599 326 560 326 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 560 389 599 389 599 326 560 326 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 244
|
||||
set {floorItems(244)} $i
|
||||
$w create text 579.5 357.5 -text 244 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 601 389 601 326 643 326 643 389 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 601 389 601 326 643 326 643 389 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 243
|
||||
set {floorItems(243)} $i
|
||||
$w create text 622 357.5 -text 243 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 688 316 645 316 645 365 688 365 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 688 316 645 316 645 365 688 365 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 242
|
||||
set {floorItems(242)} $i
|
||||
$w create text 666.5 340.5 -text 242 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 802 367 759 367 759 226 802 226 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 802 367 759 367 759 226 802 226 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) {Barbecue Deck}
|
||||
set {floorItems(Barbecue Deck)} $i
|
||||
$w create text 780.5 296.5 -text {Barbecue Deck} -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 755 262 755 314 717 314 717 262 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 755 262 755 314 717 314 717 262 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 240
|
||||
set {floorItems(240)} $i
|
||||
$w create text 736 288 -text 240 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 755 316 689 316 689 365 755 365 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 755 316 689 316 689 365 755 365 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 241
|
||||
set {floorItems(241)} $i
|
||||
$w create text 722 340.5 -text 241 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 755 206 717 206 717 261 755 261 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 755 206 717 206 717 261 755 261 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 239
|
||||
set {floorItems(239)} $i
|
||||
$w create text 736 233.5 -text 239 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 695 277 643 277 643 206 695 206 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 695 277 643 277 643 206 695 206 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 248
|
||||
set {floorItems(248)} $i
|
||||
$w create text 669 241.5 -text 248 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 676 135 676 185 724 185 724 135 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 676 135 676 185 724 185 724 135 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 236
|
||||
set {floorItems(236)} $i
|
||||
$w create text 700 160 -text 236 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 235
|
||||
set {floorItems(235)} $i
|
||||
$w create text 651.5 160 -text 235 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 234
|
||||
set {floorItems(234)} $i
|
||||
$w create text 606 160 -text 234 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 233
|
||||
set {floorItems(233)} $i
|
||||
$w create text 552.5 158 -text 233 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 476 249 557 249 557 205 476 205 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 476 249 557 249 557 205 476 205 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 230
|
||||
set {floorItems(230)} $i
|
||||
$w create text 516.5 227 -text 230 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 232
|
||||
set {floorItems(232)} $i
|
||||
$w create text 500.5 158 -text 232 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 476 186 495 186 495 204 476 204 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 476 186 495 186 495 204 476 204 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 229
|
||||
set {floorItems(229)} $i
|
||||
$w create text 485.5 195 -text 229 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 227
|
||||
set {floorItems(227)} $i
|
||||
$w create text 436.5 185.5 -text 227 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 228
|
||||
set {floorItems(228)} $i
|
||||
$w create text 436.5 231 -text 228 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 226
|
||||
set {floorItems(226)} $i
|
||||
$w create text 392 217.5 -text 226 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 225
|
||||
set {floorItems(225)} $i
|
||||
$w create text 356.5 150 -text 225 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 234 198 306 198 306 249 234 249 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 234 198 306 198 306 249 234 249 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 224
|
||||
set {floorItems(224)} $i
|
||||
$w create text 270 223.5 -text 224 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 223
|
||||
set {floorItems(223)} $i
|
||||
$w create text 292 157 -text 223 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 268 179 221 179 221 135 268 135 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 268 179 221 179 221 135 268 135 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 222
|
||||
set {floorItems(222)} $i
|
||||
$w create text 244.5 157 -text 222 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 177 179 219 179 219 135 177 135 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 177 179 219 179 219 135 177 135 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 221
|
||||
set {floorItems(221)} $i
|
||||
$w create text 198 157 -text 221 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 204
|
||||
set {floorItems(204)} $i
|
||||
$w create text 324 301.5 -text 204 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 205
|
||||
set {floorItems(205)} $i
|
||||
$w create text 265.5 307 -text 205 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 256 385 256 340 212 340 212 385 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 256 385 256 340 212 340 212 385 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 207
|
||||
set {floorItems(207)} $i
|
||||
$w create text 234 362.5 -text 207 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 210 340 164 340 164 385 210 385 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 210 340 164 340 164 385 210 385 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 208
|
||||
set {floorItems(208)} $i
|
||||
$w create text 187 362.5 -text 208 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 115 340 162 340 162 385 115 385 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 115 340 162 340 162 385 115 385 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 209
|
||||
set {floorItems(209)} $i
|
||||
$w create text 138.5 362.5 -text 209 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 89 228 89 156 53 156 53 228 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 89 228 89 156 53 156 53 228 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 217
|
||||
set {floorItems(217)} $i
|
||||
$w create text 71 192 -text 217 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 89 169 97 169 97 190 89 190 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 89 169 97 169 97 190 89 190 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 217A
|
||||
set {floorItems(217A)} $i
|
||||
$w create text 93 179.5 -text 217A -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 216
|
||||
set {floorItems(216)} $i
|
||||
$w create text 71 145.5 -text 216 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 51 179 51 135 6 135 6 179 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 51 179 51 135 6 135 6 179 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 215
|
||||
set {floorItems(215)} $i
|
||||
$w create text 28.5 157 -text 215 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 51 227 6 227 6 180 51 180 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 51 227 6 227 6 180 51 180 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 214
|
||||
set {floorItems(214)} $i
|
||||
$w create text 28.5 203.5 -text 214 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 51 275 6 275 6 229 51 229 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 51 275 6 275 6 229 51 229 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 213
|
||||
set {floorItems(213)} $i
|
||||
$w create text 28.5 252 -text 213 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 114 340 67 340 67 385 114 385 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 114 340 67 340 67 385 114 385 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 210
|
||||
set {floorItems(210)} $i
|
||||
$w create text 90.5 362.5 -text 210 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 211
|
||||
set {floorItems(211)} $i
|
||||
$w create text 33 364.5 -text 211 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 203
|
||||
set {floorItems(203)} $i
|
||||
$w create text 367.5 292.5 -text 203 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 99 191 91 191 91 226 174 226 174 198 154 198 154 192 109 192 109 169 99 169 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 99 191 91 191 91 226 174 226 174 198 154 198 154 192 109 192 109 169 99 169 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 220
|
||||
set {floorItems(220)} $i
|
||||
$w create text 132.5 208.5 -text 220 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 339 205 307 205 307 171 339 171 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) {Priv Lift2}
|
||||
set {floorItems(Priv Lift2)} $i
|
||||
$w create text 323 188 -text {Priv Lift2} -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 307 240 339 240 339 206 307 206 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) {Pub Lift 2}
|
||||
set {floorItems(Pub Lift 2)} $i
|
||||
$w create text 323 223 -text {Pub Lift 2} -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 175 168 97 168 97 131 175 131 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 218
|
||||
set {floorItems(218)} $i
|
||||
$w create text 136 149.5 -text 218 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 154 191 111 191 111 169 154 169 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 219
|
||||
set {floorItems(219)} $i
|
||||
$w create text 132.5 180 -text 219 -fill $color -anchor c -tags {floor2 label}
|
||||
set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor2 room}]
|
||||
set i [$w create polygon 375 246 375 172 341 172 341 246 -outline {} -tags {floor2 room}]
|
||||
set floorLabels($i) 201
|
||||
set {floorItems(201)} $i
|
||||
$w create text 358 209 -text 201 -fill $color -anchor c -tags {floor2 label}
|
||||
@@ -1066,135 +1066,135 @@ proc fg2 {w color} {
|
||||
|
||||
proc fg3 {w color} {
|
||||
global floorLabels floorItems
|
||||
set i [$w create polygon 89 228 89 180 70 180 70 228 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 89 228 89 180 70 180 70 228 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 316
|
||||
set {floorItems(316)} $i
|
||||
$w create text 79.5 204 -text 316 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 115 368 162 368 162 323 115 323 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 115 368 162 368 162 323 115 323 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 309
|
||||
set {floorItems(309)} $i
|
||||
$w create text 138.5 345.5 -text 309 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 164 323 164 368 211 368 211 323 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 164 323 164 368 211 368 211 323 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 308
|
||||
set {floorItems(308)} $i
|
||||
$w create text 187.5 345.5 -text 308 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 256 368 212 368 212 323 256 323 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 256 368 212 368 212 323 256 323 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 307
|
||||
set {floorItems(307)} $i
|
||||
$w create text 234 345.5 -text 307 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 305
|
||||
set {floorItems(305)} $i
|
||||
$w create text 270.5 301.5 -text 305 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 251 219 251 203 244 203 244 219 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 251 219 251 203 244 203 244 219 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 324B
|
||||
set {floorItems(324B)} $i
|
||||
$w create text 247.5 211 -text 324B -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 251 249 244 249 244 232 251 232 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 251 249 244 249 244 232 251 232 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 324A
|
||||
set {floorItems(324A)} $i
|
||||
$w create text 247.5 240.5 -text 324A -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 223 135 223 179 177 179 177 135 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 223 135 223 179 177 179 177 135 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 320
|
||||
set {floorItems(320)} $i
|
||||
$w create text 200 157 -text 320 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 114 368 114 323 67 323 67 368 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 114 368 114 323 67 323 67 368 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 310
|
||||
set {floorItems(310)} $i
|
||||
$w create text 90.5 345.5 -text 310 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 23 277 23 321 68 321 68 277 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 23 277 23 321 68 321 68 277 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 312
|
||||
set {floorItems(312)} $i
|
||||
$w create text 45.5 299 -text 312 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 23 229 68 229 68 275 23 275 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 23 229 68 229 68 275 23 275 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 313
|
||||
set {floorItems(313)} $i
|
||||
$w create text 45.5 252 -text 313 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 68 227 23 227 23 180 68 180 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 68 227 23 227 23 180 68 180 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 314
|
||||
set {floorItems(314)} $i
|
||||
$w create text 45.5 203.5 -text 314 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 95 179 95 135 23 135 23 179 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 95 179 95 135 23 135 23 179 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 315
|
||||
set {floorItems(315)} $i
|
||||
$w create text 59 157 -text 315 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 99 226 99 204 91 204 91 226 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 99 226 99 204 91 204 91 226 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 316B
|
||||
set {floorItems(316B)} $i
|
||||
$w create text 95 215 -text 316B -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 91 202 99 202 99 180 91 180 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 91 202 99 202 99 180 91 180 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 316A
|
||||
set {floorItems(316A)} $i
|
||||
$w create text 95 191 -text 316A -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 97 169 109 169 109 192 154 192 154 198 174 198 174 226 101 226 101 179 97 179 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 97 169 109 169 109 192 154 192 154 198 174 198 174 226 101 226 101 179 97 179 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 319
|
||||
set {floorItems(319)} $i
|
||||
$w create text 141.5 209 -text 319 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 311
|
||||
set {floorItems(311)} $i
|
||||
$w create text 29.5 361 -text 311 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 154 191 111 191 111 169 154 169 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 318
|
||||
set {floorItems(318)} $i
|
||||
$w create text 132.5 180 -text 318 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 175 168 97 168 97 131 175 131 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 317
|
||||
set {floorItems(317)} $i
|
||||
$w create text 136 149.5 -text 317 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 274 194 274 221 306 221 306 194 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 274 194 274 221 306 221 306 194 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 323
|
||||
set {floorItems(323)} $i
|
||||
$w create text 290 207.5 -text 323 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 306 222 274 222 274 249 306 249 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 306 222 274 222 274 249 306 249 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 325
|
||||
set {floorItems(325)} $i
|
||||
$w create text 290 235.5 -text 325 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 263 179 224 179 224 135 263 135 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 263 179 224 179 224 135 263 135 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 321
|
||||
set {floorItems(321)} $i
|
||||
$w create text 243.5 157 -text 321 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 322
|
||||
set {floorItems(322)} $i
|
||||
$w create text 293.5 163.5 -text 322 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 307 240 339 240 339 206 307 206 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) {Pub Lift3}
|
||||
set {floorItems(Pub Lift3)} $i
|
||||
$w create text 323 223 -text {Pub Lift3} -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 339 205 307 205 307 171 339 171 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) {Priv Lift3}
|
||||
set {floorItems(Priv Lift3)} $i
|
||||
$w create text 323 188 -text {Priv Lift3} -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 303
|
||||
set {floorItems(303)} $i
|
||||
$w create text 373.5 292.5 -text 303 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 324
|
||||
set {floorItems(324)} $i
|
||||
$w create text 262 226 -text 324 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 304
|
||||
set {floorItems(304)} $i
|
||||
$w create text 324 301.5 -text 304 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 375 246 375 172 341 172 341 246 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 301
|
||||
set {floorItems(301)} $i
|
||||
$w create text 358 209 -text 301 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 397 246 377 246 377 185 397 185 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 397 246 377 246 377 185 397 185 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 327
|
||||
set {floorItems(327)} $i
|
||||
$w create text 387 215.5 -text 327 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 326
|
||||
set {floorItems(326)} $i
|
||||
$w create text 356.5 150 -text 326 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 308 251 242 251 242 274 342 274 342 282 375 282 375 274 397 274 397 248 339 248 339 242 308 242 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 308 251 242 251 242 274 342 274 342 282 375 282 375 274 397 274 397 248 339 248 339 242 308 242 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 302
|
||||
set {floorItems(302)} $i
|
||||
$w create text 319.5 261 -text 302 -fill $color -anchor c -tags {floor3 label}
|
||||
set i [$w create polygon 70 321 242 321 242 200 259 200 259 203 272 203 272 193 263 180 242 180 175 180 175 169 156 169 156 196 177 196 177 228 107 228 70 228 70 275 107 275 107 248 160 248 160 301 107 301 107 275 70 275 -fill {} -tags {floor3 room}]
|
||||
set i [$w create polygon 70 321 242 321 242 200 259 200 259 203 272 203 272 193 263 180 242 180 175 180 175 169 156 169 156 196 177 196 177 228 107 228 70 228 70 275 107 275 107 248 160 248 160 301 107 301 107 275 70 275 -outline {} -tags {floor3 room}]
|
||||
set floorLabels($i) 306
|
||||
set {floorItems(306)} $i
|
||||
$w create text 200.5 284.5 -text 306 -fill $color -anchor c -tags {floor3 label}
|
||||
|
||||
@@ -95,13 +95,13 @@ $c create line 12c 6c 13.5c 4.5c 16.5c 7.5c 18c 6c \
|
||||
$c create text 25c .2c -text Polygons -anchor n
|
||||
$c create polygon 21c 1.0c 22.5c 1.75c 24c 1.0c 23.25c 2.5c \
|
||||
24c 4.0c 22.5c 3.25c 21c 4.0c 21.75c 2.5c -fill $green \
|
||||
-outline black -width 4 -tags item
|
||||
-outline {} -width 4 -tags item
|
||||
$c create polygon 25c 4c 25c 4c 25c 1c 26c 1c 27c 4c 28c 1c \
|
||||
29c 1c 29c 4c 29c 4c -fill $red -smooth on -tags item
|
||||
29c 1c 29c 4c 29c 4c -fill $red -outline {} -smooth on -tags item
|
||||
$c create polygon 22c 4.5c 25c 4.5c 25c 6.75c 28c 6.75c \
|
||||
28c 5.25c 24c 5.25c 24c 6.0c 26c 6c 26c 7.5c 22c 7.5c \
|
||||
-stipple @[file join $tk_demoDirectory images gray25.xbm] \
|
||||
-outline black -tags item
|
||||
-fill $blue -outline {} -tags item
|
||||
|
||||
$c create text 5c 8.2c -text Rectangles -anchor n
|
||||
$c create rectangle 1c 9.5c 4c 12.5c -outline $red -width 3m -tags item
|
||||
@@ -126,8 +126,10 @@ $c create text 25.5c 11c -anchor w -font $font1 -fill $blue \
|
||||
-text "Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge." \
|
||||
-justify center -tags item
|
||||
$c create rectangle 24.9c 13.9c 25.1c 14.1c
|
||||
catch {
|
||||
$c create text 25c 14c -font $font2 -anchor c -fill $red -angle 15 \
|
||||
-text "Angled characters" -tags item
|
||||
}
|
||||
|
||||
$c create text 5c 16.2c -text Arcs -anchor n
|
||||
$c create arc 0.5c 17c 7c 20c -fill $green -outline black \
|
||||
@@ -140,13 +142,15 @@ $c create arc 0.5c 20c 9.5c 24c -width 4m -style pieslice \
|
||||
$c create arc 5.5c 20.5c 9.5c 23.5c -width 4m -style chord \
|
||||
-fill $blue -outline {} -start 45 -extent 270 -tags item
|
||||
|
||||
$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n
|
||||
catch {
|
||||
image create photo items.ousterhout \
|
||||
-file [file join $tk_demoDirectory images ouster.png]
|
||||
image create photo items.ousterhout.active -format "png -alpha 0.5" \
|
||||
-file [file join $tk_demoDirectory images ouster.png]
|
||||
$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n
|
||||
$c create image 13c 20c -tags item -image items.ousterhout \
|
||||
-activeimage items.ousterhout.active
|
||||
}
|
||||
$c create bitmap 17c 18.5c -tags item \
|
||||
-bitmap @[file join $tk_demoDirectory images noletter.xbm]
|
||||
$c create bitmap 17c 21.5c -tags item \
|
||||
|
||||
@@ -175,7 +175,7 @@ proc CreateGUI {} {
|
||||
wm withdraw $dlg
|
||||
set f [ttk::frame $dlg.f]
|
||||
set c [canvas $f.c -width 240 -height 240]
|
||||
text $f.txt -width 10 -height 1 -background white \
|
||||
text $f.txt -width 10 -height 1 \
|
||||
-yscrollcommand [list $f.vs set] -font {Arial 8}
|
||||
ttk::scrollbar $f.vs -command [list $f.txt yview]
|
||||
|
||||
@@ -200,7 +200,7 @@ proc CreateGUI {} {
|
||||
set coords [list [expr {$col * 30 + 4}] [expr {$row * 30 + 4}] \
|
||||
[expr {$col * 30 + 30}] [expr {$row * 30 + 30}]]
|
||||
$c create rectangle $coords -fill $fill -disabledfill $dfill \
|
||||
-width 2 -state disabled
|
||||
-width 2 -state disabled -outline black
|
||||
}
|
||||
}
|
||||
if {[tk windowingsystem] ne "x11"} {
|
||||
|
||||
@@ -26,7 +26,7 @@ pack $btns -side bottom -fill x
|
||||
panedwindow $w.pane
|
||||
pack $w.pane -side top -expand yes -fill both -pady 2 -padx 2m
|
||||
|
||||
label $w.pane.left -text "This is the\nleft side" -bg yellow
|
||||
label $w.pane.right -text "This is the\nright side" -bg cyan
|
||||
label $w.pane.left -text "This is the\nleft side" -fg black -bg yellow
|
||||
label $w.pane.right -text "This is the\nright side" -fg black -bg cyan
|
||||
|
||||
$w.pane add $w.pane.left $w.pane.right
|
||||
|
||||
@@ -126,16 +126,16 @@ bind $w.c <ButtonRelease-1> {
|
||||
}
|
||||
bind $w.c <Configure> {
|
||||
%W coords plate 0 25 %w 25
|
||||
set home [expr %w/2]
|
||||
%W coords pivot [expr $home-5] 20 [expr $home+5] 30
|
||||
set home [expr {%w/2}]
|
||||
%W coords pivot [expr {$home-5}] 20 [expr {$home+5}] 30
|
||||
}
|
||||
bind $w.k <Configure> {
|
||||
set psh [expr %h/2]
|
||||
set psw [expr %w/2]
|
||||
%W coords x_axis 2 $psh [expr %w-2] $psh
|
||||
%W coords y_axis $psw [expr %h-2] $psw 2
|
||||
%W coords label_dtheta [expr $psw-4] 6
|
||||
%W coords label_theta [expr %w-6] [expr $psh+4]
|
||||
set psh [expr {%h/2}]
|
||||
set psw [expr {%w/2}]
|
||||
%W coords x_axis 2 $psh [expr {%w-2}] $psh
|
||||
%W coords y_axis $psw [expr {%h-2}] $psw 2
|
||||
%W coords label_dtheta [expr {$psw-4}] 6
|
||||
%W coords label_theta [expr {%w-6}] [expr {$psh+4}]
|
||||
}
|
||||
|
||||
# This procedure is the "business" part of the simulation that does
|
||||
|
||||
@@ -73,7 +73,7 @@ for {set i 0} {$i < 15} {set i [expr {$i+1}]} {
|
||||
set num [lindex $order $i]
|
||||
set xpos($num) [expr {($i%4)*.25}]
|
||||
set ypos($num) [expr {($i/4)*.25}]
|
||||
button $w.frame.$num -relief raised -text $num -highlightthickness 0 \
|
||||
button $w.frame.$num -relief raised -text $num -bd 0 -highlightthickness 0 \
|
||||
-command "puzzleSwitch $w $num"
|
||||
place $w.frame.$num -relx $xpos($num) -rely $ypos($num) \
|
||||
-relwidth .25 -relheight .25
|
||||
|
||||
@@ -19,8 +19,13 @@ package require Tk
|
||||
|
||||
proc rulerMkTab {c x y} {
|
||||
upvar #0 demo_rulerInfo v
|
||||
$c create polygon $x $y [expr {$x+$v(size)}] [expr {$y+$v(size)}] \
|
||||
[expr {$x-$v(size)}] [expr {$y+$v(size)}]
|
||||
set newTab [$c create polygon $x $y \
|
||||
[expr {$x+$v(size)}] [expr {$y+$v(size)}] \
|
||||
[expr {$x-$v(size)}] [expr {$y+$v(size)}]]
|
||||
set fill [$c itemcget $newTab -outline]
|
||||
$c itemconfigure $newTab -fill $fill -outline {}
|
||||
set v(normalStyle) "-fill $fill"
|
||||
return $newTab
|
||||
}
|
||||
|
||||
set w .ruler
|
||||
@@ -47,7 +52,6 @@ set demo_rulerInfo(right) [winfo fpixels $c 13c]
|
||||
set demo_rulerInfo(top) [winfo fpixels $c 1c]
|
||||
set demo_rulerInfo(bottom) [winfo fpixels $c 1.5c]
|
||||
set demo_rulerInfo(size) [winfo fpixels $c .2c]
|
||||
set demo_rulerInfo(normalStyle) "-fill black"
|
||||
# Main widget program sets variable tk_demoDirectory
|
||||
if {[winfo depth $c] > 1} {
|
||||
set demo_rulerInfo(activeStyle) "-fill red -stipple {}"
|
||||
@@ -69,7 +73,7 @@ for {set i 0} {$i < 12} {incr i} {
|
||||
$c create text $x.15c .75c -text $i -anchor sw
|
||||
}
|
||||
$c addtag well withtag [$c create rect 13.2c 1c 13.8c 0.5c \
|
||||
-outline black -fill [lindex [$c config -bg] 4]]
|
||||
-fill [lindex [$c config -bg] 4]]
|
||||
$c addtag well withtag [rulerMkTab $c [winfo pixels $c 13.5c] \
|
||||
[winfo pixels $c .65c]]
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ focus .s
|
||||
|
||||
proc center {x y} {
|
||||
set a [.s size]
|
||||
.s position [expr $x-($a/2)] [expr $y-($a/2)]
|
||||
.s position [expr {$x-($a/2)}] [expr {$y-($a/2)}]
|
||||
}
|
||||
|
||||
# The procedures below provide a simple form of animation where
|
||||
|
||||
@@ -31,7 +31,7 @@ ttk::separator $w.sep
|
||||
ttk::frame $t.tearoff -cursor fleur
|
||||
ttk::separator $t.tearoff.to -orient vertical
|
||||
ttk::separator $t.tearoff.to2 -orient vertical
|
||||
pack $t.tearoff.to -fill y -expand 1 -padx 2 -side left
|
||||
pack $t.tearoff.to -fill y -expand 1 -padx 4 -side left
|
||||
pack $t.tearoff.to2 -fill y -expand 1 -side left
|
||||
ttk::frame $t.contents
|
||||
grid $t.tearoff $t.contents -sticky nsew
|
||||
@@ -79,7 +79,7 @@ text $w.txt -width 40 -height 10
|
||||
interp alias {} doInsert {} $w.txt insert end ;# Make bindings easy to write
|
||||
|
||||
## Arrange contents
|
||||
grid $t.button $t.check $t.menu $t.combo -in $t.contents -padx 2 -sticky ns
|
||||
grid $t.button $t.check $t.menu $t.combo -in $t.contents -padx 2 -pady 4 -sticky ns
|
||||
grid $t -sticky ew
|
||||
grid $w.sep -sticky ew
|
||||
grid $w.msg -sticky ew
|
||||
|
||||
@@ -75,7 +75,7 @@ ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
|
||||
ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
|
||||
$w.tree heading \#0 -text "Directory Structure"
|
||||
$w.tree heading size -text "File Size"
|
||||
$w.tree column size -stretch 0 -width 70
|
||||
$w.tree column size -width 70
|
||||
populateRoots $w.tree
|
||||
bind $w.tree <<TreeviewOpen>> {populateTree %W [%W focus]}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new
|
||||
pack $w.msg -side top -fill x
|
||||
|
||||
## See Code / Dismiss
|
||||
pack [addSeeDismiss $w.seeDismiss $w {enabled cheese tomato basil oregano happyness}]\
|
||||
pack [addSeeDismiss $w.seeDismiss $w {enabled cheese tomato basil oregano happiness}]\
|
||||
-side bottom -fill x
|
||||
|
||||
## Add buttons for setting the theme
|
||||
@@ -69,11 +69,11 @@ pack $w.checks.e $w.checks.sep1 $w.checks.c1 $w.checks.c2 $w.checks.sep2 \
|
||||
|
||||
## Set up the radiobutton group
|
||||
ttk::labelframe $w.radios -text "Radiobuttons"
|
||||
ttk::radiobutton $w.radios.r1 -text "Great" -variable happyness -value great
|
||||
ttk::radiobutton $w.radios.r2 -text "Good" -variable happyness -value good
|
||||
ttk::radiobutton $w.radios.r3 -text "OK" -variable happyness -value ok
|
||||
ttk::radiobutton $w.radios.r4 -text "Poor" -variable happyness -value poor
|
||||
ttk::radiobutton $w.radios.r5 -text "Awful" -variable happyness -value awful
|
||||
ttk::radiobutton $w.radios.r1 -text "Great" -variable happiness -value great
|
||||
ttk::radiobutton $w.radios.r2 -text "Good" -variable happiness -value good
|
||||
ttk::radiobutton $w.radios.r3 -text "OK" -variable happiness -value ok
|
||||
ttk::radiobutton $w.radios.r4 -text "Poor" -variable happiness -value poor
|
||||
ttk::radiobutton $w.radios.r5 -text "Awful" -variable happiness -value awful
|
||||
pack $w.radios.r1 $w.radios.r2 $w.radios.r3 $w.radios.r4 $w.radios.r5 \
|
||||
-fill x -padx 3 -pady 2
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ if {[tk windowingsystem] ne "aqua"} {
|
||||
pack $w.outer -fill both -expand 1
|
||||
} else {
|
||||
text $w.txt -wrap word -yscroll "$w.sb set" -width 30 -borderwidth 0
|
||||
scrollbar $w.sb -orient vertical -command "$w.txt yview"
|
||||
ttk::scrollbar $w.sb -orient vertical -command "$w.txt yview"
|
||||
pack $w.sb -side right -fill y -in $w.outer.inRight.bot
|
||||
pack $w.txt -fill both -expand 1 -in $w.outer.inRight.bot
|
||||
pack $w.outer -fill both -expand 1 -padx 10 -pady {6 10}
|
||||
|
||||
@@ -9,6 +9,14 @@ if {![info exists widgetDemo]} {
|
||||
|
||||
package require Tk
|
||||
|
||||
# Make an Aqua button's fill color match its parent's background
|
||||
proc blend {bt} {
|
||||
if {[tk windowingsystem] eq "aqua"} {
|
||||
$bt configure -highlightbackground [[winfo parent $bt] cget -background]
|
||||
}
|
||||
return $bt
|
||||
}
|
||||
|
||||
set w .twind
|
||||
catch {destroy $w}
|
||||
toplevel $w
|
||||
@@ -53,17 +61,19 @@ $t insert end "it. These are called \"embedded windows\", "
|
||||
$t insert end "and they can consist of arbitrary widgets. "
|
||||
$t insert end "For example, here are two embedded button "
|
||||
$t insert end "widgets. You can click on the first button to "
|
||||
$t window create end -window $t.on
|
||||
$t window create end -window [blend $t.on]
|
||||
$t insert end " horizontal scrolling, which also turns off "
|
||||
$t insert end "word wrapping. Or, you can click on the second "
|
||||
$t insert end "button to\n"
|
||||
$t window create end -window $t.off
|
||||
$t window create end -window [blend $t.off]
|
||||
$t insert end " horizontal scrolling and turn back on word wrapping.\n\n"
|
||||
|
||||
$t insert end "Or, here is another example. If you "
|
||||
$t window create end -create {
|
||||
button %W.click -text "Click Here" -command "textWindPlot %W" \
|
||||
-cursor top_left_arrow}
|
||||
-cursor top_left_arrow
|
||||
blend %W.click
|
||||
}
|
||||
|
||||
$t insert end " a canvas displaying an x-y plot will appear right here."
|
||||
$t mark set plot insert
|
||||
@@ -73,6 +83,7 @@ $t insert end "or you can click here to "
|
||||
$t window create end -create {
|
||||
button %W.delete -text "Delete" -command "textWindDel %W" \
|
||||
-cursor top_left_arrow
|
||||
blend %W.delete
|
||||
}
|
||||
$t insert end " the plot again.\n\n"
|
||||
|
||||
@@ -80,7 +91,8 @@ $t insert end "You can also create multiple text widgets each of which "
|
||||
$t insert end "display the same underlying text. Click this button to "
|
||||
$t window create end \
|
||||
-create {button %W.peer -text "Make A Peer" -command "textMakePeer %W" \
|
||||
-cursor top_left_arrow} -padx 3
|
||||
-cursor top_left_arrow
|
||||
blend %W.peer} -padx 3
|
||||
$t insert end " widget. Notice how peer widgets can have different "
|
||||
$t insert end "font settings, and by default contain all the images "
|
||||
$t insert end "of the 'parent', but that the embedded windows, "
|
||||
@@ -92,7 +104,8 @@ $t insert end "designed to show up in all peers.) A good use of "
|
||||
$t insert end "peers is for "
|
||||
$t window create end \
|
||||
-create {button %W.split -text "Split Windows" -command "textSplitWindow %W" \
|
||||
-cursor top_left_arrow} -padx 3
|
||||
-cursor top_left_arrow
|
||||
blend %W.split} -padx 3
|
||||
$t insert end " \n\n"
|
||||
|
||||
$t insert end "Users of previous versions of Tk will also be interested "
|
||||
@@ -128,11 +141,11 @@ foreach color {AntiqueWhite3 Bisque1 Bisque2 Bisque3 Bisque4
|
||||
DarkSlateGray1 Aquamarine2 DarkSeaGreen2 SeaGreen1
|
||||
Yellow1 IndianRed1 IndianRed2 Tan1 Tan4} {
|
||||
button $t.color$i -text $color -cursor top_left_arrow -command \
|
||||
"$t configure -bg $color"
|
||||
$t window create end -window $t.color$i -padx 3 -pady 2
|
||||
"changeBg $t $color"
|
||||
$t window create end -window [blend $t.color$i] -padx 3 -pady 2
|
||||
incr i
|
||||
}
|
||||
$t tag add buttons $t.default end
|
||||
$t tag add buttons [blend $t.default] end
|
||||
|
||||
button $t.bigB -text "Big borders" -command "textWindBigB $t" \
|
||||
-cursor top_left_arrow
|
||||
@@ -153,12 +166,12 @@ set text_normal(pad) [$t cget -padx]
|
||||
|
||||
$t insert end "\nYou can also change the usual border width and "
|
||||
$t insert end "highlightthickness and padding.\n"
|
||||
$t window create end -window $t.bigB
|
||||
$t window create end -window $t.smallB
|
||||
$t window create end -window $t.bigH
|
||||
$t window create end -window $t.smallH
|
||||
$t window create end -window $t.bigP
|
||||
$t window create end -window $t.smallP
|
||||
$t window create end -window [blend $t.bigB]
|
||||
$t window create end -window [blend $t.smallB]
|
||||
$t window create end -window [blend $t.bigH]
|
||||
$t window create end -window [blend $t.smallH]
|
||||
$t window create end -window [blend $t.bigP]
|
||||
$t window create end -window [blend $t.smallP]
|
||||
|
||||
$t insert end "\n\nFinally, images fit comfortably in text widgets too:"
|
||||
|
||||
@@ -189,7 +202,6 @@ proc textWindSmallP w {
|
||||
$w configure -padx $::text_normal(pad) -pady $::text_normal(pad)
|
||||
}
|
||||
|
||||
|
||||
proc textWindOn w {
|
||||
catch {destroy $w.scroll2}
|
||||
set t $w.f.text
|
||||
@@ -290,8 +302,20 @@ proc textWindDel t {
|
||||
}
|
||||
}
|
||||
|
||||
proc changeBg {t c} {
|
||||
$t configure -background $c
|
||||
if {[tk windowingsystem] eq "aqua"} {
|
||||
foreach b [$t window names] {
|
||||
if {[winfo class $b] eq "Button"} {
|
||||
$b configure -highlightbackground $c
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
proc embDefBg t {
|
||||
$t configure -background [lindex [$t configure -background] 3]
|
||||
set bg [lindex [$t configure -background] 3]
|
||||
changeBg $t $bg
|
||||
}
|
||||
|
||||
proc textMakePeer {parent} {
|
||||
|
||||
@@ -131,6 +131,10 @@ addSample $w Japanese \
|
||||
addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
|
||||
addSample $w Russian \
|
||||
"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
|
||||
if {[tk windowingsystem] ne "x11"} {
|
||||
addSample $w Emoji \
|
||||
"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
|
||||
}
|
||||
|
||||
## We're done processing, so change things back to normal running...
|
||||
destroy $w.wait
|
||||
|
||||
@@ -92,13 +92,14 @@ image create photo ::img::new -format GIF -data [mc {
|
||||
}]
|
||||
|
||||
#----------------------------------------------------------------
|
||||
# The code below create the main window, consisting of a menu bar and a text
|
||||
# The code below creates the main window, consisting of a menu bar and a text
|
||||
# widget that explains how to use the program, plus lists all of the demos as
|
||||
# hypertext items.
|
||||
#----------------------------------------------------------------
|
||||
|
||||
menu .menuBar -tearoff 0
|
||||
|
||||
# On Aqua, just use the default menu.
|
||||
if {[tk windowingsystem] ne "aqua"} {
|
||||
# This is a tk-internal procedure to make i18n easier
|
||||
::tk::AmpMenuArgs .menuBar add cascade -label [mc "&File"] \
|
||||
@@ -118,9 +119,8 @@ if {[tk windowingsystem] ne "aqua"} {
|
||||
-command {exit} -accelerator [mc "Meta-Q"]
|
||||
bind . <[mc "Meta-q"]> {exit}
|
||||
}
|
||||
}
|
||||
|
||||
. configure -menu .menuBar
|
||||
}
|
||||
|
||||
ttk::frame .statusBar
|
||||
ttk::label .statusBar.lab -text " " -anchor w
|
||||
|
||||
@@ -44,11 +44,6 @@ proc ::tk_dialog {w title text bitmap default args} {
|
||||
}
|
||||
|
||||
set windowingsystem [tk windowingsystem]
|
||||
if {$windowingsystem eq "aqua"} {
|
||||
option add *Dialog*background systemDialogBackgroundActive widgetDefault
|
||||
option add *Dialog*Button.highlightBackground \
|
||||
systemDialogBackgroundActive widgetDefault
|
||||
}
|
||||
|
||||
# 1. Create the top-level window and divide it into top
|
||||
# and bottom parts.
|
||||
|
||||
@@ -272,6 +272,25 @@ bind Entry <Meta-Delete> {
|
||||
}
|
||||
}
|
||||
|
||||
# Bindings for IME text input and accents.
|
||||
|
||||
bind Entry <<TkStartIMEMarkedText>> {
|
||||
dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
|
||||
}
|
||||
bind Entry <<TkEndIMEMarkedText>> {
|
||||
if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
|
||||
bell
|
||||
} else {
|
||||
%W selection range $mark insert
|
||||
}
|
||||
}
|
||||
bind Entry <<TkClearIMEMarkedText>> {
|
||||
%W delete [dict get $::tk::Priv(IMETextMark) "%W"] [%W index insert]
|
||||
}
|
||||
bind Entry <<TkAccentBackspace>> {
|
||||
tk::EntryBackspace %W
|
||||
}
|
||||
|
||||
# A few additional bindings of my own.
|
||||
|
||||
bind Entry <2> {
|
||||
@@ -652,3 +671,12 @@ proc ::tk::EntryGetSelection {w} {
|
||||
}
|
||||
return $entryString
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user