diff --git a/mingw32/bin/tk86.dll b/mingw32/bin/tk86.dll index a63358103d0..0792a7dd8fa 100644 Binary files a/mingw32/bin/tk86.dll and b/mingw32/bin/tk86.dll differ diff --git a/mingw32/bin/wish.exe b/mingw32/bin/wish.exe index f3e6894bba4..4a1b21041f8 100644 Binary files a/mingw32/bin/wish.exe and b/mingw32/bin/wish.exe differ diff --git a/mingw32/bin/wish86.exe b/mingw32/bin/wish86.exe index f3e6894bba4..4a1b21041f8 100644 Binary files a/mingw32/bin/wish86.exe and b/mingw32/bin/wish86.exe differ diff --git a/mingw32/include/X11/HPkeysym.h b/mingw32/include/X11/HPkeysym.h index 4a0655a2376..d41ed388389 100644 --- a/mingw32/include/X11/HPkeysym.h +++ b/mingw32/include/X11/HPkeysym.h @@ -46,7 +46,7 @@ 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 +TO THIS SOFTWARE, 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 diff --git a/mingw32/include/X11/XF86keysym.h b/mingw32/include/X11/XF86keysym.h index dd287e2493e..e8a9fb8cb78 100644 --- a/mingw32/include/X11/XF86keysym.h +++ b/mingw32/include/X11/XF86keysym.h @@ -3,8 +3,10 @@ * * 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. + * The XF86 set of keysyms is a catch-all set of defines for keysyms found + * on various multimedia keyboards. Originally specific to XFree86 they have + * been been adopted over time 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. * @@ -207,6 +209,8 @@ #define XF86XK_RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */ +#define XF86XK_FullScreen 0x1008FFB8 /* Toggle fullscreen */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 @@ -228,3 +232,238 @@ #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 */ + + +/* + * Reserved range for evdev symbols: 0x10081000-0x10081FFF + * + * Key syms within this range must match the Linux kernel + * input-event-codes.h file in the format: + * XF86XK_CamelCaseKernelName _EVDEVK(kernel value) + * For example, the kernel + * #define KEY_MACRO_RECORD_START 0x2b0 + * effectively ends up as: + * #define XF86XK_MacroRecordStart 0x100812b0 + * + * For historical reasons, some keysyms within the reserved range will be + * missing, most notably all "normal" keys that are mapped through default + * XKB layouts (e.g. KEY_Q). + * + * CamelCasing is done with a human control as last authority, e.g. see VOD + * instead of Vod for the Video on Demand key. + * + * The format for #defines is strict: + * + * #define XF86XK_FOO_EVDEVK(0xABC) |* kver KEY_FOO *| + * + * Where + * - alignment by tabs + * - the _EVDEVK macro must be used + * - the hex code must be in uppercase hex + * - the kernel version (kver) is in the form v5.10 + * - kver and key name are within a slash-star comment (a pipe is used in + * this example for technical reasons) + * These #defines are parsed by scripts. Do not stray from the given format. + * + * Where the evdev keycode is mapped to a different symbol, please add a + * comment line starting with Use: but otherwise the same format, e.g. + * Use: XF86XK_RotationLockToggle _EVDEVK(0x231) v4.16 KEY_ROTATE_LOCK_TOGGLE + * + */ +#define _EVDEVK(_v) (0x10081000 + _v) +/* Use: XF86XK_Eject _EVDEVK(0x0A2) KEY_EJECTCLOSECD */ +/* Use: XF86XK_New _EVDEVK(0x0B5) v2.6.14 KEY_NEW */ +/* Use: XK_Redo _EVDEVK(0x0B6) v2.6.14 KEY_REDO */ +/* KEY_DASHBOARD has been mapped to LaunchB in xkeyboard-config since 2011 */ +/* Use: XF86XK_LaunchB _EVDEVK(0x0CC) v2.6.28 KEY_DASHBOARD */ +/* Use: XF86XK_Display _EVDEVK(0x0E3) v2.6.12 KEY_SWITCHVIDEOMODE */ +/* Use: XF86XK_KbdLightOnOff _EVDEVK(0x0E4) v2.6.12 KEY_KBDILLUMTOGGLE */ +/* Use: XF86XK_KbdBrightnessDown _EVDEVK(0x0E5) v2.6.12 KEY_KBDILLUMDOWN */ +/* Use: XF86XK_KbdBrightnessUp _EVDEVK(0x0E6) v2.6.12 KEY_KBDILLUMUP */ +/* Use: XF86XK_Send _EVDEVK(0x0E7) v2.6.14 KEY_SEND */ +/* Use: XF86XK_Reply _EVDEVK(0x0E8) v2.6.14 KEY_REPLY */ +/* Use: XF86XK_MailForward _EVDEVK(0x0E9) v2.6.14 KEY_FORWARDMAIL */ +/* Use: XF86XK_Save _EVDEVK(0x0EA) v2.6.14 KEY_SAVE */ +/* Use: XF86XK_Documents _EVDEVK(0x0EB) v2.6.14 KEY_DOCUMENTS */ +/* Use: XF86XK_Battery _EVDEVK(0x0EC) v2.6.17 KEY_BATTERY */ +/* Use: XF86XK_Bluetooth _EVDEVK(0x0ED) v2.6.19 KEY_BLUETOOTH */ +/* Use: XF86XK_WLAN _EVDEVK(0x0EE) v2.6.19 KEY_WLAN */ +/* Use: XF86XK_UWB _EVDEVK(0x0EF) v2.6.24 KEY_UWB */ +/* Use: XF86XK_Next_VMode _EVDEVK(0x0F1) v2.6.23 KEY_VIDEO_NEXT */ +/* Use: XF86XK_Prev_VMode _EVDEVK(0x0F2) v2.6.23 KEY_VIDEO_PREV */ +/* Use: XF86XK_MonBrightnessCycle _EVDEVK(0x0F3) v2.6.23 KEY_BRIGHTNESS_CYCLE */ +#define XF86XK_BrightnessAuto _EVDEVK(0x0F4) /* v3.16 KEY_BRIGHTNESS_AUTO */ +#define XF86XK_DisplayOff _EVDEVK(0x0F5) /* v2.6.23 KEY_DISPLAY_OFF */ +/* Use: XF86XK_WWAN _EVDEVK(0x0F6) v3.13 KEY_WWAN */ +/* Use: XF86XK_RFKill _EVDEVK(0x0F7) v2.6.33 KEY_RFKILL */ +/* Use: XF86XK_AudioMicMute _EVDEVK(0x0F8) v3.1 KEY_MICMUTE */ +#define XF86XK_Info _EVDEVK(0x166) /* KEY_INFO */ +/* Use: XF86XK_CycleAngle _EVDEVK(0x173) KEY_ANGLE */ +/* Use: XF86XK_FullScreen _EVDEVK(0x174) v5.1 KEY_FULL_SCREEN */ +#define XF86XK_AspectRatio _EVDEVK(0x177) /* v5.1 KEY_ASPECT_RATIO */ +#define XF86XK_DVD _EVDEVK(0x185) /* KEY_DVD */ +#define XF86XK_Audio _EVDEVK(0x188) /* KEY_AUDIO */ +/* Use: XF86XK_Video _EVDEVK(0x189) KEY_VIDEO */ +/* Use: XF86XK_Calendar _EVDEVK(0x18D) KEY_CALENDAR */ +#define XF86XK_ChannelUp _EVDEVK(0x192) /* KEY_CHANNELUP */ +#define XF86XK_ChannelDown _EVDEVK(0x193) /* KEY_CHANNELDOWN */ +/* Use: XF86XK_AudioRandomPlay _EVDEVK(0x19A) KEY_SHUFFLE */ +#define XF86XK_Break _EVDEVK(0x19B) /* KEY_BREAK */ +#define XF86XK_VideoPhone _EVDEVK(0x1A0) /* v2.6.20 KEY_VIDEOPHONE */ +/* Use: XF86XK_Game _EVDEVK(0x1A1) v2.6.20 KEY_GAMES */ +/* Use: XF86XK_ZoomIn _EVDEVK(0x1A2) v2.6.20 KEY_ZOOMIN */ +/* Use: XF86XK_ZoomOut _EVDEVK(0x1A3) v2.6.20 KEY_ZOOMOUT */ +#define XF86XK_ZoomReset _EVDEVK(0x1A4) /* v2.6.20 KEY_ZOOMRESET */ +/* Use: XF86XK_Word _EVDEVK(0x1A5) v2.6.20 KEY_WORDPROCESSOR */ +#define XF86XK_Editor _EVDEVK(0x1A6) /* v2.6.20 KEY_EDITOR */ +/* Use: XF86XK_Excel _EVDEVK(0x1A7) v2.6.20 KEY_SPREADSHEET */ +#define XF86XK_GraphicsEditor _EVDEVK(0x1A8) /* v2.6.20 KEY_GRAPHICSEDITOR */ +#define XF86XK_Presentation _EVDEVK(0x1A9) /* v2.6.20 KEY_PRESENTATION */ +#define XF86XK_Database _EVDEVK(0x1AA) /* v2.6.20 KEY_DATABASE */ +/* Use: XF86XK_News _EVDEVK(0x1AB) v2.6.20 KEY_NEWS */ +#define XF86XK_Voicemail _EVDEVK(0x1AC) /* v2.6.20 KEY_VOICEMAIL */ +#define XF86XK_Addressbook _EVDEVK(0x1AD) /* v2.6.20 KEY_ADDRESSBOOK */ +/* Use: XF86XK_Messenger _EVDEVK(0x1AE) v2.6.20 KEY_MESSENGER */ +#define XF86XK_DisplayToggle _EVDEVK(0x1AF) /* v2.6.20 KEY_DISPLAYTOGGLE */ +#define XF86XK_SpellCheck _EVDEVK(0x1B0) /* v2.6.24 KEY_SPELLCHECK */ +/* Use: XF86XK_LogOff _EVDEVK(0x1B1) v2.6.24 KEY_LOGOFF */ +/* Use: XK_dollar _EVDEVK(0x1B2) v2.6.24 KEY_DOLLAR */ +/* Use: XK_EuroSign _EVDEVK(0x1B3) v2.6.24 KEY_EURO */ +/* Use: XF86XK_FrameBack _EVDEVK(0x1B4) v2.6.24 KEY_FRAMEBACK */ +/* Use: XF86XK_FrameForward _EVDEVK(0x1B5) v2.6.24 KEY_FRAMEFORWARD */ +#define XF86XK_ContextMenu _EVDEVK(0x1B6) /* v2.6.24 KEY_CONTEXT_MENU */ +#define XF86XK_MediaRepeat _EVDEVK(0x1B7) /* v2.6.26 KEY_MEDIA_REPEAT */ +#define XF86XK_10ChannelsUp _EVDEVK(0x1B8) /* v2.6.38 KEY_10CHANNELSUP */ +#define XF86XK_10ChannelsDown _EVDEVK(0x1B9) /* v2.6.38 KEY_10CHANNELSDOWN */ +#define XF86XK_Images _EVDEVK(0x1BA) /* v2.6.39 KEY_IMAGES */ +#define XF86XK_NotificationCenter _EVDEVK(0x1BC) /* v5.10 KEY_NOTIFICATION_CENTER */ +#define XF86XK_PickupPhone _EVDEVK(0x1BD) /* v5.10 KEY_PICKUP_PHONE */ +#define XF86XK_HangupPhone _EVDEVK(0x1BE) /* v5.10 KEY_HANGUP_PHONE */ +#define XF86XK_Fn _EVDEVK(0x1D0) /* KEY_FN */ +#define XF86XK_Fn_Esc _EVDEVK(0x1D1) /* KEY_FN_ESC */ +#define XF86XK_FnRightShift _EVDEVK(0x1E5) /* v5.10 KEY_FN_RIGHT_SHIFT */ +/* Use: XK_braille_dot_1 _EVDEVK(0x1F1) v2.6.17 KEY_BRL_DOT1 */ +/* Use: XK_braille_dot_2 _EVDEVK(0x1F2) v2.6.17 KEY_BRL_DOT2 */ +/* Use: XK_braille_dot_3 _EVDEVK(0x1F3) v2.6.17 KEY_BRL_DOT3 */ +/* Use: XK_braille_dot_4 _EVDEVK(0x1F4) v2.6.17 KEY_BRL_DOT4 */ +/* Use: XK_braille_dot_5 _EVDEVK(0x1F5) v2.6.17 KEY_BRL_DOT5 */ +/* Use: XK_braille_dot_6 _EVDEVK(0x1F6) v2.6.17 KEY_BRL_DOT6 */ +/* Use: XK_braille_dot_7 _EVDEVK(0x1F7) v2.6.17 KEY_BRL_DOT7 */ +/* Use: XK_braille_dot_8 _EVDEVK(0x1F8) v2.6.17 KEY_BRL_DOT8 */ +/* Use: XK_braille_dot_9 _EVDEVK(0x1F9) v2.6.23 KEY_BRL_DOT9 */ +/* Use: XK_braille_dot_1 _EVDEVK(0x1FA) v2.6.23 KEY_BRL_DOT10 */ +#define XF86XK_Numeric0 _EVDEVK(0x200) /* v2.6.28 KEY_NUMERIC_0 */ +#define XF86XK_Numeric1 _EVDEVK(0x201) /* v2.6.28 KEY_NUMERIC_1 */ +#define XF86XK_Numeric2 _EVDEVK(0x202) /* v2.6.28 KEY_NUMERIC_2 */ +#define XF86XK_Numeric3 _EVDEVK(0x203) /* v2.6.28 KEY_NUMERIC_3 */ +#define XF86XK_Numeric4 _EVDEVK(0x204) /* v2.6.28 KEY_NUMERIC_4 */ +#define XF86XK_Numeric5 _EVDEVK(0x205) /* v2.6.28 KEY_NUMERIC_5 */ +#define XF86XK_Numeric6 _EVDEVK(0x206) /* v2.6.28 KEY_NUMERIC_6 */ +#define XF86XK_Numeric7 _EVDEVK(0x207) /* v2.6.28 KEY_NUMERIC_7 */ +#define XF86XK_Numeric8 _EVDEVK(0x208) /* v2.6.28 KEY_NUMERIC_8 */ +#define XF86XK_Numeric9 _EVDEVK(0x209) /* v2.6.28 KEY_NUMERIC_9 */ +#define XF86XK_NumericStar _EVDEVK(0x20A) /* v2.6.28 KEY_NUMERIC_STAR */ +#define XF86XK_NumericPound _EVDEVK(0x20B) /* v2.6.28 KEY_NUMERIC_POUND */ +#define XF86XK_NumericA _EVDEVK(0x20C) /* v4.1 KEY_NUMERIC_A */ +#define XF86XK_NumericB _EVDEVK(0x20D) /* v4.1 KEY_NUMERIC_B */ +#define XF86XK_NumericC _EVDEVK(0x20E) /* v4.1 KEY_NUMERIC_C */ +#define XF86XK_NumericD _EVDEVK(0x20F) /* v4.1 KEY_NUMERIC_D */ +#define XF86XK_CameraFocus _EVDEVK(0x210) /* v2.6.33 KEY_CAMERA_FOCUS */ +#define XF86XK_WPSButton _EVDEVK(0x211) /* v2.6.34 KEY_WPS_BUTTON */ +/* Use: XF86XK_TouchpadToggle _EVDEVK(0x212) v2.6.37 KEY_TOUCHPAD_TOGGLE */ +/* Use: XF86XK_TouchpadOn _EVDEVK(0x213) v2.6.37 KEY_TOUCHPAD_ON */ +/* Use: XF86XK_TouchpadOff _EVDEVK(0x214) v2.6.37 KEY_TOUCHPAD_OFF */ +#define XF86XK_CameraZoomIn _EVDEVK(0x215) /* v2.6.39 KEY_CAMERA_ZOOMIN */ +#define XF86XK_CameraZoomOut _EVDEVK(0x216) /* v2.6.39 KEY_CAMERA_ZOOMOUT */ +#define XF86XK_CameraUp _EVDEVK(0x217) /* v2.6.39 KEY_CAMERA_UP */ +#define XF86XK_CameraDown _EVDEVK(0x218) /* v2.6.39 KEY_CAMERA_DOWN */ +#define XF86XK_CameraLeft _EVDEVK(0x219) /* v2.6.39 KEY_CAMERA_LEFT */ +#define XF86XK_CameraRight _EVDEVK(0x21A) /* v2.6.39 KEY_CAMERA_RIGHT */ +#define XF86XK_AttendantOn _EVDEVK(0x21B) /* v3.10 KEY_ATTENDANT_ON */ +#define XF86XK_AttendantOff _EVDEVK(0x21C) /* v3.10 KEY_ATTENDANT_OFF */ +#define XF86XK_AttendantToggle _EVDEVK(0x21D) /* v3.10 KEY_ATTENDANT_TOGGLE */ +#define XF86XK_LightsToggle _EVDEVK(0x21E) /* v3.10 KEY_LIGHTS_TOGGLE */ +#define XF86XK_ALSToggle _EVDEVK(0x230) /* v3.13 KEY_ALS_TOGGLE */ +/* Use: XF86XK_RotationLockToggle _EVDEVK(0x231) v4.16 KEY_ROTATE_LOCK_TOGGLE */ +#define XF86XK_Buttonconfig _EVDEVK(0x240) /* v3.16 KEY_BUTTONCONFIG */ +#define XF86XK_Taskmanager _EVDEVK(0x241) /* v3.16 KEY_TASKMANAGER */ +#define XF86XK_Journal _EVDEVK(0x242) /* v3.16 KEY_JOURNAL */ +#define XF86XK_ControlPanel _EVDEVK(0x243) /* v3.16 KEY_CONTROLPANEL */ +#define XF86XK_AppSelect _EVDEVK(0x244) /* v3.16 KEY_APPSELECT */ +#define XF86XK_Screensaver _EVDEVK(0x245) /* v3.16 KEY_SCREENSAVER */ +#define XF86XK_VoiceCommand _EVDEVK(0x246) /* v3.16 KEY_VOICECOMMAND */ +#define XF86XK_Assistant _EVDEVK(0x247) /* v4.13 KEY_ASSISTANT */ +/* Use: XK_ISO_Next_Group _EVDEVK(0x248) v5.2 KEY_KBD_LAYOUT_NEXT */ +#define XF86XK_EmojiPicker _EVDEVK(0x249) /* v5.13 KEY_EMOJI_PICKER */ +#define XF86XK_Dictate _EVDEVK(0x24A) /* v5.17 KEY_DICTATE */ +#define XF86XK_BrightnessMin _EVDEVK(0x250) /* v3.16 KEY_BRIGHTNESS_MIN */ +#define XF86XK_BrightnessMax _EVDEVK(0x251) /* v3.16 KEY_BRIGHTNESS_MAX */ +#define XF86XK_KbdInputAssistPrev _EVDEVK(0x260) /* v3.18 KEY_KBDINPUTASSIST_PREV */ +#define XF86XK_KbdInputAssistNext _EVDEVK(0x261) /* v3.18 KEY_KBDINPUTASSIST_NEXT */ +#define XF86XK_KbdInputAssistPrevgroup _EVDEVK(0x262) /* v3.18 KEY_KBDINPUTASSIST_PREVGROUP */ +#define XF86XK_KbdInputAssistNextgroup _EVDEVK(0x263) /* v3.18 KEY_KBDINPUTASSIST_NEXTGROUP */ +#define XF86XK_KbdInputAssistAccept _EVDEVK(0x264) /* v3.18 KEY_KBDINPUTASSIST_ACCEPT */ +#define XF86XK_KbdInputAssistCancel _EVDEVK(0x265) /* v3.18 KEY_KBDINPUTASSIST_CANCEL */ +#define XF86XK_RightUp _EVDEVK(0x266) /* v4.7 KEY_RIGHT_UP */ +#define XF86XK_RightDown _EVDEVK(0x267) /* v4.7 KEY_RIGHT_DOWN */ +#define XF86XK_LeftUp _EVDEVK(0x268) /* v4.7 KEY_LEFT_UP */ +#define XF86XK_LeftDown _EVDEVK(0x269) /* v4.7 KEY_LEFT_DOWN */ +#define XF86XK_RootMenu _EVDEVK(0x26A) /* v4.7 KEY_ROOT_MENU */ +#define XF86XK_MediaTopMenu _EVDEVK(0x26B) /* v4.7 KEY_MEDIA_TOP_MENU */ +#define XF86XK_Numeric11 _EVDEVK(0x26C) /* v4.7 KEY_NUMERIC_11 */ +#define XF86XK_Numeric12 _EVDEVK(0x26D) /* v4.7 KEY_NUMERIC_12 */ +#define XF86XK_AudioDesc _EVDEVK(0x26E) /* v4.7 KEY_AUDIO_DESC */ +#define XF86XK_3DMode _EVDEVK(0x26F) /* v4.7 KEY_3D_MODE */ +#define XF86XK_NextFavorite _EVDEVK(0x270) /* v4.7 KEY_NEXT_FAVORITE */ +#define XF86XK_StopRecord _EVDEVK(0x271) /* v4.7 KEY_STOP_RECORD */ +#define XF86XK_PauseRecord _EVDEVK(0x272) /* v4.7 KEY_PAUSE_RECORD */ +#define XF86XK_VOD _EVDEVK(0x273) /* v4.7 KEY_VOD */ +#define XF86XK_Unmute _EVDEVK(0x274) /* v4.7 KEY_UNMUTE */ +#define XF86XK_FastReverse _EVDEVK(0x275) /* v4.7 KEY_FASTREVERSE */ +#define XF86XK_SlowReverse _EVDEVK(0x276) /* v4.7 KEY_SLOWREVERSE */ +#define XF86XK_Data _EVDEVK(0x277) /* v4.7 KEY_DATA */ +#define XF86XK_OnScreenKeyboard _EVDEVK(0x278) /* v4.12 KEY_ONSCREEN_KEYBOARD */ +#define XF86XK_PrivacyScreenToggle _EVDEVK(0x279) /* v5.5 KEY_PRIVACY_SCREEN_TOGGLE */ +#define XF86XK_SelectiveScreenshot _EVDEVK(0x27A) /* v5.6 KEY_SELECTIVE_SCREENSHOT */ +#define XF86XK_Macro1 _EVDEVK(0x290) /* v5.5 KEY_MACRO1 */ +#define XF86XK_Macro2 _EVDEVK(0x291) /* v5.5 KEY_MACRO2 */ +#define XF86XK_Macro3 _EVDEVK(0x292) /* v5.5 KEY_MACRO3 */ +#define XF86XK_Macro4 _EVDEVK(0x293) /* v5.5 KEY_MACRO4 */ +#define XF86XK_Macro5 _EVDEVK(0x294) /* v5.5 KEY_MACRO5 */ +#define XF86XK_Macro6 _EVDEVK(0x295) /* v5.5 KEY_MACRO6 */ +#define XF86XK_Macro7 _EVDEVK(0x296) /* v5.5 KEY_MACRO7 */ +#define XF86XK_Macro8 _EVDEVK(0x297) /* v5.5 KEY_MACRO8 */ +#define XF86XK_Macro9 _EVDEVK(0x298) /* v5.5 KEY_MACRO9 */ +#define XF86XK_Macro10 _EVDEVK(0x299) /* v5.5 KEY_MACRO10 */ +#define XF86XK_Macro11 _EVDEVK(0x29A) /* v5.5 KEY_MACRO11 */ +#define XF86XK_Macro12 _EVDEVK(0x29B) /* v5.5 KEY_MACRO12 */ +#define XF86XK_Macro13 _EVDEVK(0x29C) /* v5.5 KEY_MACRO13 */ +#define XF86XK_Macro14 _EVDEVK(0x29D) /* v5.5 KEY_MACRO14 */ +#define XF86XK_Macro15 _EVDEVK(0x29E) /* v5.5 KEY_MACRO15 */ +#define XF86XK_Macro16 _EVDEVK(0x29F) /* v5.5 KEY_MACRO16 */ +#define XF86XK_Macro17 _EVDEVK(0x2A0) /* v5.5 KEY_MACRO17 */ +#define XF86XK_Macro18 _EVDEVK(0x2A1) /* v5.5 KEY_MACRO18 */ +#define XF86XK_Macro19 _EVDEVK(0x2A2) /* v5.5 KEY_MACRO19 */ +#define XF86XK_Macro20 _EVDEVK(0x2A3) /* v5.5 KEY_MACRO20 */ +#define XF86XK_Macro21 _EVDEVK(0x2A4) /* v5.5 KEY_MACRO21 */ +#define XF86XK_Macro22 _EVDEVK(0x2A5) /* v5.5 KEY_MACRO22 */ +#define XF86XK_Macro23 _EVDEVK(0x2A6) /* v5.5 KEY_MACRO23 */ +#define XF86XK_Macro24 _EVDEVK(0x2A7) /* v5.5 KEY_MACRO24 */ +#define XF86XK_Macro25 _EVDEVK(0x2A8) /* v5.5 KEY_MACRO25 */ +#define XF86XK_Macro26 _EVDEVK(0x2A9) /* v5.5 KEY_MACRO26 */ +#define XF86XK_Macro27 _EVDEVK(0x2AA) /* v5.5 KEY_MACRO27 */ +#define XF86XK_Macro28 _EVDEVK(0x2AB) /* v5.5 KEY_MACRO28 */ +#define XF86XK_Macro29 _EVDEVK(0x2AC) /* v5.5 KEY_MACRO29 */ +#define XF86XK_Macro30 _EVDEVK(0x2AD) /* v5.5 KEY_MACRO30 */ +#define XF86XK_MacroRecordStart _EVDEVK(0x2B0) /* v5.5 KEY_MACRO_RECORD_START */ +#define XF86XK_MacroRecordStop _EVDEVK(0x2B1) /* v5.5 KEY_MACRO_RECORD_STOP */ +#define XF86XK_MacroPresetCycle _EVDEVK(0x2B2) /* v5.5 KEY_MACRO_PRESET_CYCLE */ +#define XF86XK_MacroPreset1 _EVDEVK(0x2B3) /* v5.5 KEY_MACRO_PRESET1 */ +#define XF86XK_MacroPreset2 _EVDEVK(0x2B4) /* v5.5 KEY_MACRO_PRESET2 */ +#define XF86XK_MacroPreset3 _EVDEVK(0x2B5) /* v5.5 KEY_MACRO_PRESET3 */ +#define XF86XK_KbdLcdMenu1 _EVDEVK(0x2B8) /* v5.5 KEY_KBD_LCD_MENU1 */ +#define XF86XK_KbdLcdMenu2 _EVDEVK(0x2B9) /* v5.5 KEY_KBD_LCD_MENU2 */ +#define XF86XK_KbdLcdMenu3 _EVDEVK(0x2BA) /* v5.5 KEY_KBD_LCD_MENU3 */ +#define XF86XK_KbdLcdMenu4 _EVDEVK(0x2BB) /* v5.5 KEY_KBD_LCD_MENU4 */ +#define XF86XK_KbdLcdMenu5 _EVDEVK(0x2BC) /* v5.5 KEY_KBD_LCD_MENU5 */ +#undef _EVDEVK diff --git a/mingw32/include/X11/Xfuncproto.h b/mingw32/include/X11/Xfuncproto.h index 6d63002efea..f6890736023 100644 --- a/mingw32/include/X11/Xfuncproto.h +++ b/mingw32/include/X11/Xfuncproto.h @@ -1,16 +1,26 @@ -/* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */ /* - * Copyright 1989, 1991 by the Massachusetts Institute of Technology * - * 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 M.I.T. not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. M.I.T. makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. +Copyright 1989, 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. * */ @@ -24,7 +34,7 @@ #endif /* NeedFunctionPrototypes */ #ifndef NeedVarargsPrototypes -#define NeedVarargsPrototypes 0 +#define NeedVarargsPrototypes 1 #endif /* NeedVarargsPrototypes */ #if NeedFunctionPrototypes @@ -37,6 +47,15 @@ #define _Xconst const #endif /* _Xconst */ +/* Function prototype configuration (see configure for more info) */ +#if !defined(NARROWPROTO) && \ + (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) +#define NARROWPROTO +#endif +#ifndef FUNCPROTO +#define FUNCPROTO 15 +#endif + #ifndef NeedWidePrototypes #ifdef NARROWPROTO #define NeedWidePrototypes 0 @@ -47,14 +66,164 @@ #endif /* NeedFunctionPrototypes */ -#ifdef __cplusplus -#define _XFUNCPROTOBEGIN extern "C" { -#define _XFUNCPROTOEND } -#endif - #ifndef _XFUNCPROTOBEGIN +#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */ +#define _XFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */ +#define _XFUNCPROTOEND } +#else #define _XFUNCPROTOBEGIN #define _XFUNCPROTOEND +#endif #endif /* _XFUNCPROTOBEGIN */ +/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */ +#ifndef __has_attribute +# define __has_attribute(x) 0 /* Compatibility with non-clang compilers. */ +#endif +#ifndef __has_feature +# define __has_feature(x) 0 /* Compatibility with non-clang compilers. */ +#endif +#ifndef __has_extension +# define __has_extension(x) 0 /* Compatibility with non-clang compilers. */ +#endif + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4)) +# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x))) +#else +# define _X_SENTINEL(x) +#endif /* GNUC >= 4 */ + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if (__has_attribute(visibility) || (defined(__GNUC__) && (__GNUC__ >= 4))) \ + && !defined(__CYGWIN__) && !defined(__MINGW32__) +# define _X_EXPORT __attribute__((visibility("default"))) +# define _X_HIDDEN __attribute__((visibility("hidden"))) +# define _X_INTERNAL __attribute__((visibility("internal"))) +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) +# define _X_EXPORT __global +# define _X_HIDDEN __hidden +# define _X_INTERNAL __hidden +#else /* not gcc >= 4 and not Sun Studio >= 8 */ +# define _X_EXPORT +# define _X_HIDDEN +# define _X_INTERNAL +#endif /* GNUC >= 4 */ + +/* Branch prediction hints for individual conditionals */ +/* requires xproto >= 7.0.9 */ +#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) +# define _X_LIKELY(x) __builtin_expect(!!(x), 1) +# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0) +#else /* not gcc >= 3.3 */ +# define _X_LIKELY(x) (x) +# define _X_UNLIKELY(x) (x) +#endif + +/* Bulk branch prediction hints via marking error path functions as "cold" */ +/* requires xproto >= 7.0.25 */ +#if __has_attribute(__cold__) || \ + (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */ +# define _X_COLD __attribute__((__cold__)) +#else +# define _X_COLD /* nothing */ +#endif + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if __has_attribute(deprecated) \ + || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130)) +# define _X_DEPRECATED __attribute__((deprecated)) +#else /* not gcc >= 3.1 */ +# define _X_DEPRECATED +#endif + +/* requires xproto >= 7.0.30 */ +#if __has_extension(attribute_deprecated_with_message) || \ + (defined(__GNUC__) && ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg))) +#else +# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED +#endif + +/* requires xproto >= 7.0.17 */ +#if __has_attribute(noreturn) \ + || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define _X_NORETURN __attribute((noreturn)) +#else +# define _X_NORETURN +#endif /* GNUC */ + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if __has_attribute(__format__) \ + || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203) +# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y))) +#else /* not gcc >= 2.3 */ +# define _X_ATTRIBUTE_PRINTF(x,y) +#endif + +/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable + argument macros, must be only used inside #ifdef _X_NONNULL guards, as + many legacy X clients are compiled in C89 mode still. */ +#if __has_attribute(nonnull) \ + && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ +#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) +#elif __has_attribute(nonnull) \ + || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) +#define _X_NONNULL(args...) __attribute__((nonnull(args))) +#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ +#define _X_NONNULL(...) /* */ +#endif + +/* requires xproto >= 7.0.22 */ +#if __has_attribute(__unused__) \ + || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) +#define _X_UNUSED __attribute__((__unused__)) +#else +#define _X_UNUSED /* */ +#endif + +/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */ +/* requires xproto >= 7.0.9 + (introduced in 7.0.8 but didn't support all compilers until 7.0.9) */ +#if defined(inline) /* assume autoconf set it correctly */ || \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \ + (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)) +# define _X_INLINE inline +#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */ +# define _X_INLINE __inline__ +#else +# define _X_INLINE +#endif + +/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */ +/* requires xproto >= 7.0.21 */ +#ifndef _X_RESTRICT_KYWD +# if defined(restrict) /* assume autoconf set it correctly */ || \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \ + && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */ +# define _X_RESTRICT_KYWD restrict +# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */ +# define _X_RESTRICT_KYWD __restrict__ +# else +# define _X_RESTRICT_KYWD +# endif +#endif + +/* requires xproto >= 7.0.30 */ +#if __has_attribute(no_sanitize_thread) +# define _X_NOTSAN __attribute__((no_sanitize_thread)) +#else +# define _X_NOTSAN +#endif + +/* Mark a char array/pointer as not containing a NUL-terminated string */ +/* requires xproto >= 7.0.33 */ +#if __has_attribute(nonstring) +# define _X_NONSTRING __attribute__((nonstring)) +#else +# define _X_NONSTRING +#endif + #endif /* _XFUNCPROTO_H_ */ diff --git a/mingw32/include/X11/Xutil.h b/mingw32/include/X11/Xutil.h index bf372fb0f06..f377e2b5b94 100644 --- a/mingw32/include/X11/Xutil.h +++ b/mingw32/include/X11/Xutil.h @@ -1,8 +1,30 @@ -/* $XConsortium: Xutil.h,v 11.73 91/07/30 16:21:37 rws Exp $ */ /*********************************************************** -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, -and the Massachusetts Institute of Technology, Cambridge, Massachusetts. + +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 @@ -10,7 +32,7 @@ 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 Digital or MIT not be +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. @@ -24,10 +46,20 @@ SOFTWARE. ******************************************************************/ -#ifndef _XUTIL_H_ -#define _XUTIL_H_ +#ifndef _X11_XUTIL_H_ +#define _X11_XUTIL_H_ /* You must include before including this file */ +#include +#include + +/* The Xlib structs are full of implicit padding to properly align members. + We can't clean that up without breaking ABI, so tell clang not to bother + complaining about it. */ +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpadded" +#endif #if defined(MAC_OSX_TK) # define Region XRegion @@ -112,6 +144,7 @@ typedef struct { #define WindowGroupHint (1L << 6) #define AllHints (InputHint|StateHint|IconPixmapHint|IconWindowHint| \ IconPositionHint|IconMaskHint|WindowGroupHint) +#define XUrgencyHint (1L << 8) /* definitions for initial window state */ #define WithdrawnState 0 /* for windows that are not mapped */ @@ -146,7 +179,9 @@ typedef enum { XStringStyle, /* STRING */ XCompoundTextStyle, /* COMPOUND_TEXT */ XTextStyle, /* text in owner's encoding (current locale)*/ - XStdICCTextStyle /* STRING, else COMPOUND_TEXT */ + XStdICCTextStyle, /* STRING, else COMPOUND_TEXT */ + /* The following is an XFree86 extension, introduced in November 2000 */ + XUTF8StringStyle /* UTF8_STRING */ } XICCEncodingStyle; typedef struct { @@ -160,6 +195,24 @@ typedef struct { char *res_class; } XClassHint; +#ifdef XUTIL_DEFINE_FUNCTIONS +extern int XDestroyImage( + XImage *ximage); +extern unsigned long XGetPixel( + XImage *ximage, + int x, int y); +extern int XPutPixel( + XImage *ximage, + int x, int y, + unsigned long pixel); +extern XImage *XSubImage( + XImage *ximage, + int x, int y, + unsigned int width, unsigned int height); +extern int XAddPixel( + XImage *ximage, + long value); +#else /* * These macros are used to give some sugar to the image routines so that * naive people are more comfortable with them. @@ -174,6 +227,7 @@ typedef struct { ((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height))) #define XAddPixel(ximage, value) \ ((*((ximage)->f.add_pixel))((ximage), (value))) +#endif /* * Compose sequence status structure, used in calling XLookupString. @@ -189,6 +243,9 @@ typedef struct _XComposeStatus { #define IsKeypadKey(keysym) \ (((unsigned)(keysym) >= XK_KP_Space) && ((unsigned)(keysym) <= XK_KP_Equal)) +#define IsPrivateKeypadKey(keysym) \ + (((unsigned)(keysym) >= 0x11000000) && ((unsigned)(keysym) <= 0x1100FFFF)) + #define IsCursorKey(keysym) \ (((unsigned)(keysym) >= XK_Home) && ((unsigned)(keysym) < XK_Select)) @@ -201,10 +258,19 @@ typedef struct _XComposeStatus { #define IsMiscFunctionKey(keysym) \ (((unsigned)(keysym) >= XK_Select) && ((unsigned)(keysym) <= XK_Break)) +#ifdef XK_XKB_KEYS +#define IsModifierKey(keysym) \ + ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \ + || (((unsigned)(keysym) >= XK_ISO_Lock) && \ + ((unsigned)(keysym) <= XK_ISO_Level5_Lock)) \ + || ((unsigned)(keysym) == XK_Mode_switch) \ + || ((unsigned)(keysym) == XK_Num_Lock)) +#else #define IsModifierKey(keysym) \ ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \ || ((unsigned)(keysym) == XK_Mode_switch) \ || ((unsigned)(keysym) == XK_Num_Lock)) +#endif /* * opaque reference to Region data type */ @@ -302,328 +368,250 @@ _XFUNCPROTOBEGIN /* The following declarations are alphabetized. */ extern XClassHint *XAllocClassHint ( -#if NeedFunctionPrototypes void -#endif ); extern XIconSize *XAllocIconSize ( -#if NeedFunctionPrototypes void -#endif ); extern XSizeHints *XAllocSizeHints ( -#if NeedFunctionPrototypes void -#endif ); extern XStandardColormap *XAllocStandardColormap ( -#if NeedFunctionPrototypes void -#endif ); extern XWMHints *XAllocWMHints ( -#if NeedFunctionPrototypes void -#endif ); -extern void XClipBox( -#if NeedFunctionPrototypes +extern int XClipBox( Region /* r */, XRectangle* /* rect_return */ -#endif ); extern Region XCreateRegion( -#if NeedFunctionPrototypes void -#endif ); -extern char *XDefaultString( -#if NeedFunctionPrototypes - void -#endif -); +extern const char *XDefaultString (void); extern int XDeleteContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */ -#endif ); -extern void XDestroyRegion( -#if NeedFunctionPrototypes +extern int XDestroyRegion( Region /* r */ -#endif ); -extern Bool XEmptyRegion( -#if NeedFunctionPrototypes +extern int XEmptyRegion( Region /* r */ -#endif ); -extern Bool XEqualRegion( -#if NeedFunctionPrototypes +extern int XEqualRegion( Region /* r1 */, Region /* r2 */ -#endif ); extern int XFindContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */, XPointer* /* data_return */ -#endif ); extern Status XGetClassHint( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XClassHint* /* class_hints_return */ -#endif ); extern Status XGetIconSizes( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XIconSize** /* size_list_return */, int* /* count_return */ -#endif ); extern Status XGetNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */ -#endif ); extern Status XGetRGBColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap** /* stdcmap_return */, int* /* count_return */, Atom /* property */ -#endif ); extern Status XGetSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, Atom /* property */ -#endif ); extern Status XGetStandardColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, Atom /* property */ -#endif ); extern Status XGetTextProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, XTextProperty* /* text_prop_return */, Atom /* property */ -#endif ); - extern Status XGetWMClientMachine( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern XWMHints *XGetWMHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern Status XGetWMIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern Status XGetWMName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern Status XGetWMNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */ -#endif ); extern Status XGetWMSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */, Atom /* property */ -#endif ); extern Status XGetZoomHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* zhints_return */ -#endif ); -extern void XIntersectRegion( -#if NeedFunctionPrototypes +extern int XIntersectRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif +); + +extern void XConvertCase( + KeySym /* sym */, + KeySym* /* lower */, + KeySym* /* upper */ ); extern int XLookupString( -#if NeedFunctionPrototypes XKeyEvent* /* event_struct */, char* /* buffer_return */, int /* bytes_buffer */, KeySym* /* keysym_return */, XComposeStatus* /* status_in_out */ -#endif ); extern Status XMatchVisualInfo( -#if NeedFunctionPrototypes Display* /* display */, int /* screen */, int /* depth */, int /* class */, XVisualInfo* /* vinfo_return */ -#endif ); extern int XOffsetRegion( -#if NeedFunctionPrototypes Region /* r */, int /* dx */, int /* dy */ -#endif ); extern Bool XPointInRegion( -#if NeedFunctionPrototypes Region /* r */, int /* x */, int /* y */ -#endif ); extern Region XPolygonRegion( -#if NeedFunctionPrototypes XPoint* /* points */, int /* n */, int /* fill_rule */ -#endif ); extern int XRectInRegion( -#if NeedFunctionPrototypes Region /* r */, int /* x */, int /* y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XSaveContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */, _Xconst char* /* data */ -#endif ); -extern void XSetClassHint( -#if NeedFunctionPrototypes +extern int XSetClassHint( Display* /* display */, Window /* w */, XClassHint* /* class_hints */ -#endif ); -extern void XSetIconSizes( -#if NeedFunctionPrototypes +extern int XSetIconSizes( Display* /* display */, Window /* w */, XIconSize* /* size_list */, int /* count */ -#endif ); -extern void XSetNormalHints( -#if NeedFunctionPrototypes +extern int XSetNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */ -#endif ); extern void XSetRGBColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* stdcmaps */, int /* count */, Atom /* property */ -#endif ); -extern void XSetSizeHints( -#if NeedFunctionPrototypes +extern int XSetSizeHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ -#endif ); -extern void XSetStandardProperties( -#if NeedFunctionPrototypes +extern int XSetStandardProperties( Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -632,52 +620,40 @@ extern void XSetStandardProperties( char** /* argv */, int /* argc */, XSizeHints* /* hints */ -#endif ); extern void XSetTextProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */, Atom /* property */ -#endif ); -extern void XSetWMHints( -#if NeedFunctionPrototypes +extern int XSetWMHints( Display* /* display */, Window /* w */, XWMHints* /* wm_hints */ -#endif ); extern void XSetWMIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern void XSetWMName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern void XSetWMNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */ -#endif ); extern void XSetWMProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* window_name */, @@ -687,11 +663,9 @@ extern void XSetWMProperties( XSizeHints* /* normal_hints */, XWMHints* /* wm_hints */, XClassHint* /* class_hints */ -#endif ); extern void XmbSetWMProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -701,129 +675,126 @@ extern void XmbSetWMProperties( XSizeHints* /* normal_hints */, XWMHints* /* wm_hints */, XClassHint* /* class_hints */ -#endif +); + +extern void Xutf8SetWMProperties( + Display* /* display */, + Window /* w */, + _Xconst char* /* window_name */, + _Xconst char* /* icon_name */, + char** /* argv */, + int /* argc */, + XSizeHints* /* normal_hints */, + XWMHints* /* wm_hints */, + XClassHint* /* class_hints */ ); extern void XSetWMSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ -#endif ); -extern void XSetRegion( -#if NeedFunctionPrototypes +extern int XSetRegion( Display* /* display */, GC /* gc */, Region /* r */ -#endif ); extern void XSetStandardColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap */, Atom /* property */ -#endif ); -extern void XSetZoomHints( -#if NeedFunctionPrototypes +extern int XSetZoomHints( Display* /* display */, Window /* w */, XSizeHints* /* zhints */ -#endif ); -extern void XShrinkRegion( -#if NeedFunctionPrototypes +extern int XShrinkRegion( Region /* r */, int /* dx */, int /* dy */ -#endif ); -extern void XSubtractRegion( -#if NeedFunctionPrototypes +extern int XSubtractRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern int XmbTextListToTextProperty( -#if NeedFunctionPrototypes - Display* /* display */, - char** /* list */, - int /* count */, - XICCEncodingStyle /* style */, - XTextProperty* /* text_prop_return */ -#endif + Display* display, + char** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return ); extern int XwcTextListToTextProperty( -#if NeedFunctionPrototypes - Display* /* display */, - wchar_t** /* list */, - int /* count */, - XICCEncodingStyle /* style */, - XTextProperty* /* text_prop_return */ -#endif + Display* display, + wchar_t** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return +); + +extern int Xutf8TextListToTextProperty( + Display* display, + char** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return ); extern void XwcFreeStringList( -#if NeedFunctionPrototypes - wchar_t** /* list */ -#endif + wchar_t** list ); extern Status XTextPropertyToStringList( -#if NeedFunctionPrototypes XTextProperty* /* text_prop */, char*** /* list_return */, int* /* count_return */ -#endif ); extern int XmbTextPropertyToTextList( -#if NeedFunctionPrototypes - Display* /* display */, - XTextProperty* /* text_prop */, - char*** /* list_return */, - int* /* count_return */ -#endif + Display* display, + const XTextProperty* text_prop, + char*** list_return, + int* count_return ); extern int XwcTextPropertyToTextList( -#if NeedFunctionPrototypes - Display* /* display */, - XTextProperty* /* text_prop */, - wchar_t*** /* list_return */, - int* /* count_return */ -#endif + Display* display, + const XTextProperty* text_prop, + wchar_t*** list_return, + int* count_return +); + +extern int Xutf8TextPropertyToTextList( + Display* display, + const XTextProperty* text_prop, + char*** list_return, + int* count_return ); -extern void XUnionRectWithRegion( -#if NeedFunctionPrototypes +extern int XUnionRectWithRegion( XRectangle* /* rectangle */, Region /* src_region */, Region /* dest_region_return */ -#endif ); extern int XUnionRegion( -#if NeedFunctionPrototypes Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern int XWMGeometry( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */, _Xconst char* /* user_geometry */, @@ -835,21 +806,22 @@ extern int XWMGeometry( int* /* width_return */, int* /* height_return */, int* /* gravity_return */ -#endif ); -extern void XXorRegion( -#if NeedFunctionPrototypes +extern int XXorRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + _XFUNCPROTOEND #if defined(MAC_OSX_TK) # undef Region #endif -#endif /* _XUTIL_H_ */ +#endif /* _X11_XUTIL_H_ */ diff --git a/mingw32/include/X11/ap_keysym.h b/mingw32/include/X11/ap_keysym.h index 76cbde2d053..601f1e58692 100644 --- a/mingw32/include/X11/ap_keysym.h +++ b/mingw32/include/X11/ap_keysym.h @@ -13,7 +13,7 @@ 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 +TO THIS SOFTWARE, 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 diff --git a/mingw32/include/X11/cursorfont.h b/mingw32/include/X11/cursorfont.h index 617274fa806..c69d508f491 100644 --- a/mingw32/include/X11/cursorfont.h +++ b/mingw32/include/X11/cursorfont.h @@ -1,4 +1,34 @@ -/* $XConsortium: cursorfont.h,v 1.2 88/09/06 16:44:27 jim Exp $ */ +/* + +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. + +*/ + +#ifndef _X11_CURSORFONT_H_ +#define _X11_CURSORFONT_H_ + #define XC_num_glyphs 154 #define XC_X_cursor 0 #define XC_arrow 2 @@ -77,3 +107,5 @@ #define XC_ur_angle 148 #define XC_watch 150 #define XC_xterm 152 + +#endif /* _X11_CURSORFONT_H_ */ diff --git a/mingw32/include/X11/keysym.h b/mingw32/include/X11/keysym.h index 2547abede3f..0ffdde4a5ae 100644 --- a/mingw32/include/X11/keysym.h +++ b/mingw32/include/X11/keysym.h @@ -47,16 +47,28 @@ SOFTWARE. /* default keysyms */ #define XK_MISCELLANY +#define XK_XKB_KEYS #define XK_LATIN1 #define XK_LATIN2 #define XK_LATIN3 #define XK_LATIN4 +#define XK_LATIN8 #define XK_LATIN9 +#define XK_CAUCASUS #define XK_GREEK #define XK_KATAKANA #define XK_ARABIC #define XK_CYRILLIC #define XK_HEBREW +#define XK_THAI +#define XK_KOREAN +#define XK_ARMENIAN +#define XK_GEORGIAN +#define XK_VIETNAMESE +#define XK_CURRENCY +#define XK_MATHEMATICAL +#define XK_BRAILLE +#define XK_SINHALA #include diff --git a/mingw32/include/X11/keysymdef.h b/mingw32/include/X11/keysymdef.h index 5c13c61d43a..31110e05721 100644 --- a/mingw32/include/X11/keysymdef.h +++ b/mingw32/include/X11/keysymdef.h @@ -161,6 +161,11 @@ SOFTWARE. #define XK_Kana_Shift 0xff2e /* Kana Shift */ #define XK_Eisu_Shift 0xff2f /* Alphanumeric Shift */ #define XK_Eisu_toggle 0xff30 /* Alphanumeric toggle */ +#define XK_Kanji_Bangou 0xff37 /* Codeinput */ +#define XK_Zen_Koho 0xff3d /* Multiple/All Candidate(s) */ +#define XK_Mae_Koho 0xff3e /* Previous Candidate */ + +/* 0xff31 thru 0xff3f are under XK_KOREAN */ /* Cursor control & motion */ @@ -330,6 +335,212 @@ SOFTWARE. #define XK_Hyper_R 0xffee /* Right hyper */ #endif /* XK_MISCELLANY */ +/* + * Keyboard (XKB) Extension function and modifier keys + * (from Appendix C of "The X Keyboard Extension: Protocol Specification") + * Byte 3 = 0xfe + */ + +#ifdef XK_XKB_KEYS +#define XK_ISO_Lock 0xfe01 +#define XK_ISO_Level2_Latch 0xfe02 +#define XK_ISO_Level3_Shift 0xfe03 +#define XK_ISO_Level3_Latch 0xfe04 +#define XK_ISO_Level3_Lock 0xfe05 +#define XK_ISO_Level5_Shift 0xfe11 +#define XK_ISO_Level5_Latch 0xfe12 +#define XK_ISO_Level5_Lock 0xfe13 +#define XK_ISO_Group_Shift 0xff7e /* Alias for mode_switch */ +#define XK_ISO_Group_Latch 0xfe06 +#define XK_ISO_Group_Lock 0xfe07 +#define XK_ISO_Next_Group 0xfe08 +#define XK_ISO_Next_Group_Lock 0xfe09 +#define XK_ISO_Prev_Group 0xfe0a +#define XK_ISO_Prev_Group_Lock 0xfe0b +#define XK_ISO_First_Group 0xfe0c +#define XK_ISO_First_Group_Lock 0xfe0d +#define XK_ISO_Last_Group 0xfe0e +#define XK_ISO_Last_Group_Lock 0xfe0f + +#define XK_ISO_Left_Tab 0xfe20 +#define XK_ISO_Move_Line_Up 0xfe21 +#define XK_ISO_Move_Line_Down 0xfe22 +#define XK_ISO_Partial_Line_Up 0xfe23 +#define XK_ISO_Partial_Line_Down 0xfe24 +#define XK_ISO_Partial_Space_Left 0xfe25 +#define XK_ISO_Partial_Space_Right 0xfe26 +#define XK_ISO_Set_Margin_Left 0xfe27 +#define XK_ISO_Set_Margin_Right 0xfe28 +#define XK_ISO_Release_Margin_Left 0xfe29 +#define XK_ISO_Release_Margin_Right 0xfe2a +#define XK_ISO_Release_Both_Margins 0xfe2b +#define XK_ISO_Fast_Cursor_Left 0xfe2c +#define XK_ISO_Fast_Cursor_Right 0xfe2d +#define XK_ISO_Fast_Cursor_Up 0xfe2e +#define XK_ISO_Fast_Cursor_Down 0xfe2f +#define XK_ISO_Continuous_Underline 0xfe30 +#define XK_ISO_Discontinuous_Underline 0xfe31 +#define XK_ISO_Emphasize 0xfe32 +#define XK_ISO_Center_Object 0xfe33 +#define XK_ISO_Enter 0xfe34 + +#define XK_dead_grave 0xfe50 +#define XK_dead_acute 0xfe51 +#define XK_dead_circumflex 0xfe52 +#define XK_dead_tilde 0xfe53 +#define XK_dead_perispomeni 0xfe53 /* alias for dead_tilde */ +#define XK_dead_macron 0xfe54 +#define XK_dead_breve 0xfe55 +#define XK_dead_abovedot 0xfe56 +#define XK_dead_diaeresis 0xfe57 +#define XK_dead_abovering 0xfe58 +#define XK_dead_doubleacute 0xfe59 +#define XK_dead_caron 0xfe5a +#define XK_dead_cedilla 0xfe5b +#define XK_dead_ogonek 0xfe5c +#define XK_dead_iota 0xfe5d +#define XK_dead_voiced_sound 0xfe5e +#define XK_dead_semivoiced_sound 0xfe5f +#define XK_dead_belowdot 0xfe60 +#define XK_dead_hook 0xfe61 +#define XK_dead_horn 0xfe62 +#define XK_dead_stroke 0xfe63 +#define XK_dead_abovecomma 0xfe64 +#define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */ +#define XK_dead_abovereversedcomma 0xfe65 +#define XK_dead_dasia 0xfe65 /* alias for dead_abovereversedcomma */ +#define XK_dead_doublegrave 0xfe66 +#define XK_dead_belowring 0xfe67 +#define XK_dead_belowmacron 0xfe68 +#define XK_dead_belowcircumflex 0xfe69 +#define XK_dead_belowtilde 0xfe6a +#define XK_dead_belowbreve 0xfe6b +#define XK_dead_belowdiaeresis 0xfe6c +#define XK_dead_invertedbreve 0xfe6d +#define XK_dead_belowcomma 0xfe6e +#define XK_dead_currency 0xfe6f + +/* extra dead elements for German T3 layout */ +#define XK_dead_lowline 0xfe90 +#define XK_dead_aboveverticalline 0xfe91 +#define XK_dead_belowverticalline 0xfe92 +#define XK_dead_longsolidusoverlay 0xfe93 + +/* dead vowels for universal syllable entry */ +#define XK_dead_a 0xfe80 +#define XK_dead_A 0xfe81 +#define XK_dead_e 0xfe82 +#define XK_dead_E 0xfe83 +#define XK_dead_i 0xfe84 +#define XK_dead_I 0xfe85 +#define XK_dead_o 0xfe86 +#define XK_dead_O 0xfe87 +#define XK_dead_u 0xfe88 +#define XK_dead_U 0xfe89 +#define XK_dead_small_schwa 0xfe8a +#define XK_dead_capital_schwa 0xfe8b + +#define XK_dead_greek 0xfe8c + +#define XK_First_Virtual_Screen 0xfed0 +#define XK_Prev_Virtual_Screen 0xfed1 +#define XK_Next_Virtual_Screen 0xfed2 +#define XK_Last_Virtual_Screen 0xfed4 +#define XK_Terminate_Server 0xfed5 + +#define XK_AccessX_Enable 0xfe70 +#define XK_AccessX_Feedback_Enable 0xfe71 +#define XK_RepeatKeys_Enable 0xfe72 +#define XK_SlowKeys_Enable 0xfe73 +#define XK_BounceKeys_Enable 0xfe74 +#define XK_StickyKeys_Enable 0xfe75 +#define XK_MouseKeys_Enable 0xfe76 +#define XK_MouseKeys_Accel_Enable 0xfe77 +#define XK_Overlay1_Enable 0xfe78 +#define XK_Overlay2_Enable 0xfe79 +#define XK_AudibleBell_Enable 0xfe7a + +#define XK_Pointer_Left 0xfee0 +#define XK_Pointer_Right 0xfee1 +#define XK_Pointer_Up 0xfee2 +#define XK_Pointer_Down 0xfee3 +#define XK_Pointer_UpLeft 0xfee4 +#define XK_Pointer_UpRight 0xfee5 +#define XK_Pointer_DownLeft 0xfee6 +#define XK_Pointer_DownRight 0xfee7 +#define XK_Pointer_Button_Dflt 0xfee8 +#define XK_Pointer_Button1 0xfee9 +#define XK_Pointer_Button2 0xfeea +#define XK_Pointer_Button3 0xfeeb +#define XK_Pointer_Button4 0xfeec +#define XK_Pointer_Button5 0xfeed +#define XK_Pointer_DblClick_Dflt 0xfeee +#define XK_Pointer_DblClick1 0xfeef +#define XK_Pointer_DblClick2 0xfef0 +#define XK_Pointer_DblClick3 0xfef1 +#define XK_Pointer_DblClick4 0xfef2 +#define XK_Pointer_DblClick5 0xfef3 +#define XK_Pointer_Drag_Dflt 0xfef4 +#define XK_Pointer_Drag1 0xfef5 +#define XK_Pointer_Drag2 0xfef6 +#define XK_Pointer_Drag3 0xfef7 +#define XK_Pointer_Drag4 0xfef8 +#define XK_Pointer_Drag5 0xfefd + +#define XK_Pointer_EnableKeys 0xfef9 +#define XK_Pointer_Accelerate 0xfefa +#define XK_Pointer_DfltBtnNext 0xfefb +#define XK_Pointer_DfltBtnPrev 0xfefc + +/* Single-Stroke Multiple-Character N-Graph Keysyms For The X Input Method */ + +#define XK_ch 0xfea0 +#define XK_Ch 0xfea1 +#define XK_CH 0xfea2 +#define XK_c_h 0xfea3 +#define XK_C_h 0xfea4 +#define XK_C_H 0xfea5 + +#endif /* XK_XKB_KEYS */ + +/* + * 3270 Terminal Keys + * Byte 3 = 0xfd + */ + +#ifdef XK_3270 +#define XK_3270_Duplicate 0xfd01 +#define XK_3270_FieldMark 0xfd02 +#define XK_3270_Right2 0xfd03 +#define XK_3270_Left2 0xfd04 +#define XK_3270_BackTab 0xfd05 +#define XK_3270_EraseEOF 0xfd06 +#define XK_3270_EraseInput 0xfd07 +#define XK_3270_Reset 0xfd08 +#define XK_3270_Quit 0xfd09 +#define XK_3270_PA1 0xfd0a +#define XK_3270_PA2 0xfd0b +#define XK_3270_PA3 0xfd0c +#define XK_3270_Test 0xfd0d +#define XK_3270_Attn 0xfd0e +#define XK_3270_CursorBlink 0xfd0f +#define XK_3270_AltCursor 0xfd10 +#define XK_3270_KeyClick 0xfd11 +#define XK_3270_Jump 0xfd12 +#define XK_3270_Ident 0xfd13 +#define XK_3270_Rule 0xfd14 +#define XK_3270_Copy 0xfd15 +#define XK_3270_Play 0xfd16 +#define XK_3270_Setup 0xfd17 +#define XK_3270_Record 0xfd18 +#define XK_3270_ChangeScreen 0xfd19 +#define XK_3270_DeleteWord 0xfd1a +#define XK_3270_ExSelect 0xfd1b +#define XK_3270_CursorSelect 0xfd1c +#define XK_3270_PrintScreen 0xfd1d +#define XK_3270_Enter 0xfd1e +#endif /* XK_3270 */ + /* * Latin 1 * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF) @@ -1282,6 +1493,246 @@ SOFTWARE. #define XK_Hebrew_switch 0xff7e /* Alias for mode_switch */ #endif /* XK_HEBREW */ +/* + * Thai + * Byte 3 = 0x0d + */ + +#ifdef XK_THAI +#define XK_Thai_kokai 0x0da1 /* U+0E01 THAI CHARACTER KO KAI */ +#define XK_Thai_khokhai 0x0da2 /* U+0E02 THAI CHARACTER KHO KHAI */ +#define XK_Thai_khokhuat 0x0da3 /* U+0E03 THAI CHARACTER KHO KHUAT */ +#define XK_Thai_khokhwai 0x0da4 /* U+0E04 THAI CHARACTER KHO KHWAI */ +#define XK_Thai_khokhon 0x0da5 /* U+0E05 THAI CHARACTER KHO KHON */ +#define XK_Thai_khorakhang 0x0da6 /* U+0E06 THAI CHARACTER KHO RAKHANG */ +#define XK_Thai_ngongu 0x0da7 /* U+0E07 THAI CHARACTER NGO NGU */ +#define XK_Thai_chochan 0x0da8 /* U+0E08 THAI CHARACTER CHO CHAN */ +#define XK_Thai_choching 0x0da9 /* U+0E09 THAI CHARACTER CHO CHING */ +#define XK_Thai_chochang 0x0daa /* U+0E0A THAI CHARACTER CHO CHANG */ +#define XK_Thai_soso 0x0dab /* U+0E0B THAI CHARACTER SO SO */ +#define XK_Thai_chochoe 0x0dac /* U+0E0C THAI CHARACTER CHO CHOE */ +#define XK_Thai_yoying 0x0dad /* U+0E0D THAI CHARACTER YO YING */ +#define XK_Thai_dochada 0x0dae /* U+0E0E THAI CHARACTER DO CHADA */ +#define XK_Thai_topatak 0x0daf /* U+0E0F THAI CHARACTER TO PATAK */ +#define XK_Thai_thothan 0x0db0 /* U+0E10 THAI CHARACTER THO THAN */ +#define XK_Thai_thonangmontho 0x0db1 /* U+0E11 THAI CHARACTER THO NANGMONTHO */ +#define XK_Thai_thophuthao 0x0db2 /* U+0E12 THAI CHARACTER THO PHUTHAO */ +#define XK_Thai_nonen 0x0db3 /* U+0E13 THAI CHARACTER NO NEN */ +#define XK_Thai_dodek 0x0db4 /* U+0E14 THAI CHARACTER DO DEK */ +#define XK_Thai_totao 0x0db5 /* U+0E15 THAI CHARACTER TO TAO */ +#define XK_Thai_thothung 0x0db6 /* U+0E16 THAI CHARACTER THO THUNG */ +#define XK_Thai_thothahan 0x0db7 /* U+0E17 THAI CHARACTER THO THAHAN */ +#define XK_Thai_thothong 0x0db8 /* U+0E18 THAI CHARACTER THO THONG */ +#define XK_Thai_nonu 0x0db9 /* U+0E19 THAI CHARACTER NO NU */ +#define XK_Thai_bobaimai 0x0dba /* U+0E1A THAI CHARACTER BO BAIMAI */ +#define XK_Thai_popla 0x0dbb /* U+0E1B THAI CHARACTER PO PLA */ +#define XK_Thai_phophung 0x0dbc /* U+0E1C THAI CHARACTER PHO PHUNG */ +#define XK_Thai_fofa 0x0dbd /* U+0E1D THAI CHARACTER FO FA */ +#define XK_Thai_phophan 0x0dbe /* U+0E1E THAI CHARACTER PHO PHAN */ +#define XK_Thai_fofan 0x0dbf /* U+0E1F THAI CHARACTER FO FAN */ +#define XK_Thai_phosamphao 0x0dc0 /* U+0E20 THAI CHARACTER PHO SAMPHAO */ +#define XK_Thai_moma 0x0dc1 /* U+0E21 THAI CHARACTER MO MA */ +#define XK_Thai_yoyak 0x0dc2 /* U+0E22 THAI CHARACTER YO YAK */ +#define XK_Thai_rorua 0x0dc3 /* U+0E23 THAI CHARACTER RO RUA */ +#define XK_Thai_ru 0x0dc4 /* U+0E24 THAI CHARACTER RU */ +#define XK_Thai_loling 0x0dc5 /* U+0E25 THAI CHARACTER LO LING */ +#define XK_Thai_lu 0x0dc6 /* U+0E26 THAI CHARACTER LU */ +#define XK_Thai_wowaen 0x0dc7 /* U+0E27 THAI CHARACTER WO WAEN */ +#define XK_Thai_sosala 0x0dc8 /* U+0E28 THAI CHARACTER SO SALA */ +#define XK_Thai_sorusi 0x0dc9 /* U+0E29 THAI CHARACTER SO RUSI */ +#define XK_Thai_sosua 0x0dca /* U+0E2A THAI CHARACTER SO SUA */ +#define XK_Thai_hohip 0x0dcb /* U+0E2B THAI CHARACTER HO HIP */ +#define XK_Thai_lochula 0x0dcc /* U+0E2C THAI CHARACTER LO CHULA */ +#define XK_Thai_oang 0x0dcd /* U+0E2D THAI CHARACTER O ANG */ +#define XK_Thai_honokhuk 0x0dce /* U+0E2E THAI CHARACTER HO NOKHUK */ +#define XK_Thai_paiyannoi 0x0dcf /* U+0E2F THAI CHARACTER PAIYANNOI */ +#define XK_Thai_saraa 0x0dd0 /* U+0E30 THAI CHARACTER SARA A */ +#define XK_Thai_maihanakat 0x0dd1 /* U+0E31 THAI CHARACTER MAI HAN-AKAT */ +#define XK_Thai_saraaa 0x0dd2 /* U+0E32 THAI CHARACTER SARA AA */ +#define XK_Thai_saraam 0x0dd3 /* U+0E33 THAI CHARACTER SARA AM */ +#define XK_Thai_sarai 0x0dd4 /* U+0E34 THAI CHARACTER SARA I */ +#define XK_Thai_saraii 0x0dd5 /* U+0E35 THAI CHARACTER SARA II */ +#define XK_Thai_saraue 0x0dd6 /* U+0E36 THAI CHARACTER SARA UE */ +#define XK_Thai_sarauee 0x0dd7 /* U+0E37 THAI CHARACTER SARA UEE */ +#define XK_Thai_sarau 0x0dd8 /* U+0E38 THAI CHARACTER SARA U */ +#define XK_Thai_sarauu 0x0dd9 /* U+0E39 THAI CHARACTER SARA UU */ +#define XK_Thai_phinthu 0x0dda /* U+0E3A THAI CHARACTER PHINTHU */ +#define XK_Thai_maihanakat_maitho 0x0dde +#define XK_Thai_baht 0x0ddf /* U+0E3F THAI CURRENCY SYMBOL BAHT */ +#define XK_Thai_sarae 0x0de0 /* U+0E40 THAI CHARACTER SARA E */ +#define XK_Thai_saraae 0x0de1 /* U+0E41 THAI CHARACTER SARA AE */ +#define XK_Thai_sarao 0x0de2 /* U+0E42 THAI CHARACTER SARA O */ +#define XK_Thai_saraaimaimuan 0x0de3 /* U+0E43 THAI CHARACTER SARA AI MAIMUAN */ +#define XK_Thai_saraaimaimalai 0x0de4 /* U+0E44 THAI CHARACTER SARA AI MAIMALAI */ +#define XK_Thai_lakkhangyao 0x0de5 /* U+0E45 THAI CHARACTER LAKKHANGYAO */ +#define XK_Thai_maiyamok 0x0de6 /* U+0E46 THAI CHARACTER MAIYAMOK */ +#define XK_Thai_maitaikhu 0x0de7 /* U+0E47 THAI CHARACTER MAITAIKHU */ +#define XK_Thai_maiek 0x0de8 /* U+0E48 THAI CHARACTER MAI EK */ +#define XK_Thai_maitho 0x0de9 /* U+0E49 THAI CHARACTER MAI THO */ +#define XK_Thai_maitri 0x0dea /* U+0E4A THAI CHARACTER MAI TRI */ +#define XK_Thai_maichattawa 0x0deb /* U+0E4B THAI CHARACTER MAI CHATTAWA */ +#define XK_Thai_thanthakhat 0x0dec /* U+0E4C THAI CHARACTER THANTHAKHAT */ +#define XK_Thai_nikhahit 0x0ded /* U+0E4D THAI CHARACTER NIKHAHIT */ +#define XK_Thai_leksun 0x0df0 /* U+0E50 THAI DIGIT ZERO */ +#define XK_Thai_leknung 0x0df1 /* U+0E51 THAI DIGIT ONE */ +#define XK_Thai_leksong 0x0df2 /* U+0E52 THAI DIGIT TWO */ +#define XK_Thai_leksam 0x0df3 /* U+0E53 THAI DIGIT THREE */ +#define XK_Thai_leksi 0x0df4 /* U+0E54 THAI DIGIT FOUR */ +#define XK_Thai_lekha 0x0df5 /* U+0E55 THAI DIGIT FIVE */ +#define XK_Thai_lekhok 0x0df6 /* U+0E56 THAI DIGIT SIX */ +#define XK_Thai_lekchet 0x0df7 /* U+0E57 THAI DIGIT SEVEN */ +#define XK_Thai_lekpaet 0x0df8 /* U+0E58 THAI DIGIT EIGHT */ +#define XK_Thai_lekkao 0x0df9 /* U+0E59 THAI DIGIT NINE */ +#endif /* XK_THAI */ + +/* + * Korean + * Byte 3 = 0x0e + */ + +#ifdef XK_KOREAN + +#define XK_Hangul 0xff31 /* Hangul start/stop(toggle) */ +#define XK_Hangul_Start 0xff32 /* Hangul start */ +#define XK_Hangul_End 0xff33 /* Hangul end, English start */ +#define XK_Hangul_Hanja 0xff34 /* Start Hangul->Hanja Conversion */ +#define XK_Hangul_Jamo 0xff35 /* Hangul Jamo mode */ +#define XK_Hangul_Romaja 0xff36 /* Hangul Romaja mode */ +#define XK_Hangul_Codeinput 0xff37 /* Hangul code input mode */ +#define XK_Hangul_Jeonja 0xff38 /* Jeonja mode */ +#define XK_Hangul_Banja 0xff39 /* Banja mode */ +#define XK_Hangul_PreHanja 0xff3a /* Pre Hanja conversion */ +#define XK_Hangul_PostHanja 0xff3b /* Post Hanja conversion */ +#define XK_Hangul_SingleCandidate 0xff3c /* Single candidate */ +#define XK_Hangul_MultipleCandidate 0xff3d /* Multiple candidate */ +#define XK_Hangul_PreviousCandidate 0xff3e /* Previous candidate */ +#define XK_Hangul_Special 0xff3f /* Special symbols */ +#define XK_Hangul_switch 0xff7e /* Alias for mode_switch */ + +/* Hangul Consonant Characters */ +#define XK_Hangul_Kiyeog 0x0ea1 /* U+3131 HANGUL LETTER KIYEOK */ +#define XK_Hangul_SsangKiyeog 0x0ea2 /* U+3132 HANGUL LETTER SSANGKIYEOK */ +#define XK_Hangul_KiyeogSios 0x0ea3 /* U+3133 HANGUL LETTER KIYEOK-SIOS */ +#define XK_Hangul_Nieun 0x0ea4 /* U+3134 HANGUL LETTER NIEUN */ +#define XK_Hangul_NieunJieuj 0x0ea5 /* U+3135 HANGUL LETTER NIEUN-CIEUC */ +#define XK_Hangul_NieunHieuh 0x0ea6 /* U+3136 HANGUL LETTER NIEUN-HIEUH */ +#define XK_Hangul_Dikeud 0x0ea7 /* U+3137 HANGUL LETTER TIKEUT */ +#define XK_Hangul_SsangDikeud 0x0ea8 /* U+3138 HANGUL LETTER SSANGTIKEUT */ +#define XK_Hangul_Rieul 0x0ea9 /* U+3139 HANGUL LETTER RIEUL */ +#define XK_Hangul_RieulKiyeog 0x0eaa /* U+313A HANGUL LETTER RIEUL-KIYEOK */ +#define XK_Hangul_RieulMieum 0x0eab /* U+313B HANGUL LETTER RIEUL-MIEUM */ +#define XK_Hangul_RieulPieub 0x0eac /* U+313C HANGUL LETTER RIEUL-PIEUP */ +#define XK_Hangul_RieulSios 0x0ead /* U+313D HANGUL LETTER RIEUL-SIOS */ +#define XK_Hangul_RieulTieut 0x0eae /* U+313E HANGUL LETTER RIEUL-THIEUTH */ +#define XK_Hangul_RieulPhieuf 0x0eaf /* U+313F HANGUL LETTER RIEUL-PHIEUPH */ +#define XK_Hangul_RieulHieuh 0x0eb0 /* U+3140 HANGUL LETTER RIEUL-HIEUH */ +#define XK_Hangul_Mieum 0x0eb1 /* U+3141 HANGUL LETTER MIEUM */ +#define XK_Hangul_Pieub 0x0eb2 /* U+3142 HANGUL LETTER PIEUP */ +#define XK_Hangul_SsangPieub 0x0eb3 /* U+3143 HANGUL LETTER SSANGPIEUP */ +#define XK_Hangul_PieubSios 0x0eb4 /* U+3144 HANGUL LETTER PIEUP-SIOS */ +#define XK_Hangul_Sios 0x0eb5 /* U+3145 HANGUL LETTER SIOS */ +#define XK_Hangul_SsangSios 0x0eb6 /* U+3146 HANGUL LETTER SSANGSIOS */ +#define XK_Hangul_Ieung 0x0eb7 /* U+3147 HANGUL LETTER IEUNG */ +#define XK_Hangul_Jieuj 0x0eb8 /* U+3148 HANGUL LETTER CIEUC */ +#define XK_Hangul_SsangJieuj 0x0eb9 /* U+3149 HANGUL LETTER SSANGCIEUC */ +#define XK_Hangul_Cieuc 0x0eba /* U+314A HANGUL LETTER CHIEUCH */ +#define XK_Hangul_Khieuq 0x0ebb /* U+314B HANGUL LETTER KHIEUKH */ +#define XK_Hangul_Tieut 0x0ebc /* U+314C HANGUL LETTER THIEUTH */ +#define XK_Hangul_Phieuf 0x0ebd /* U+314D HANGUL LETTER PHIEUPH */ +#define XK_Hangul_Hieuh 0x0ebe /* U+314E HANGUL LETTER HIEUH */ + +/* Hangul Vowel Characters */ +#define XK_Hangul_A 0x0ebf /* U+314F HANGUL LETTER A */ +#define XK_Hangul_AE 0x0ec0 /* U+3150 HANGUL LETTER AE */ +#define XK_Hangul_YA 0x0ec1 /* U+3151 HANGUL LETTER YA */ +#define XK_Hangul_YAE 0x0ec2 /* U+3152 HANGUL LETTER YAE */ +#define XK_Hangul_EO 0x0ec3 /* U+3153 HANGUL LETTER EO */ +#define XK_Hangul_E 0x0ec4 /* U+3154 HANGUL LETTER E */ +#define XK_Hangul_YEO 0x0ec5 /* U+3155 HANGUL LETTER YEO */ +#define XK_Hangul_YE 0x0ec6 /* U+3156 HANGUL LETTER YE */ +#define XK_Hangul_O 0x0ec7 /* U+3157 HANGUL LETTER O */ +#define XK_Hangul_WA 0x0ec8 /* U+3158 HANGUL LETTER WA */ +#define XK_Hangul_WAE 0x0ec9 /* U+3159 HANGUL LETTER WAE */ +#define XK_Hangul_OE 0x0eca /* U+315A HANGUL LETTER OE */ +#define XK_Hangul_YO 0x0ecb /* U+315B HANGUL LETTER YO */ +#define XK_Hangul_U 0x0ecc /* U+315C HANGUL LETTER U */ +#define XK_Hangul_WEO 0x0ecd /* U+315D HANGUL LETTER WEO */ +#define XK_Hangul_WE 0x0ece /* U+315E HANGUL LETTER WE */ +#define XK_Hangul_WI 0x0ecf /* U+315F HANGUL LETTER WI */ +#define XK_Hangul_YU 0x0ed0 /* U+3160 HANGUL LETTER YU */ +#define XK_Hangul_EU 0x0ed1 /* U+3161 HANGUL LETTER EU */ +#define XK_Hangul_YI 0x0ed2 /* U+3162 HANGUL LETTER YI */ +#define XK_Hangul_I 0x0ed3 /* U+3163 HANGUL LETTER I */ + +/* Hangul syllable-final (JongSeong) Characters */ +#define XK_Hangul_J_Kiyeog 0x0ed4 /* U+11A8 HANGUL JONGSEONG KIYEOK */ +#define XK_Hangul_J_SsangKiyeog 0x0ed5 /* U+11A9 HANGUL JONGSEONG SSANGKIYEOK */ +#define XK_Hangul_J_KiyeogSios 0x0ed6 /* U+11AA HANGUL JONGSEONG KIYEOK-SIOS */ +#define XK_Hangul_J_Nieun 0x0ed7 /* U+11AB HANGUL JONGSEONG NIEUN */ +#define XK_Hangul_J_NieunJieuj 0x0ed8 /* U+11AC HANGUL JONGSEONG NIEUN-CIEUC */ +#define XK_Hangul_J_NieunHieuh 0x0ed9 /* U+11AD HANGUL JONGSEONG NIEUN-HIEUH */ +#define XK_Hangul_J_Dikeud 0x0eda /* U+11AE HANGUL JONGSEONG TIKEUT */ +#define XK_Hangul_J_Rieul 0x0edb /* U+11AF HANGUL JONGSEONG RIEUL */ +#define XK_Hangul_J_RieulKiyeog 0x0edc /* U+11B0 HANGUL JONGSEONG RIEUL-KIYEOK */ +#define XK_Hangul_J_RieulMieum 0x0edd /* U+11B1 HANGUL JONGSEONG RIEUL-MIEUM */ +#define XK_Hangul_J_RieulPieub 0x0ede /* U+11B2 HANGUL JONGSEONG RIEUL-PIEUP */ +#define XK_Hangul_J_RieulSios 0x0edf /* U+11B3 HANGUL JONGSEONG RIEUL-SIOS */ +#define XK_Hangul_J_RieulTieut 0x0ee0 /* U+11B4 HANGUL JONGSEONG RIEUL-THIEUTH */ +#define XK_Hangul_J_RieulPhieuf 0x0ee1 /* U+11B5 HANGUL JONGSEONG RIEUL-PHIEUPH */ +#define XK_Hangul_J_RieulHieuh 0x0ee2 /* U+11B6 HANGUL JONGSEONG RIEUL-HIEUH */ +#define XK_Hangul_J_Mieum 0x0ee3 /* U+11B7 HANGUL JONGSEONG MIEUM */ +#define XK_Hangul_J_Pieub 0x0ee4 /* U+11B8 HANGUL JONGSEONG PIEUP */ +#define XK_Hangul_J_PieubSios 0x0ee5 /* U+11B9 HANGUL JONGSEONG PIEUP-SIOS */ +#define XK_Hangul_J_Sios 0x0ee6 /* U+11BA HANGUL JONGSEONG SIOS */ +#define XK_Hangul_J_SsangSios 0x0ee7 /* U+11BB HANGUL JONGSEONG SSANGSIOS */ +#define XK_Hangul_J_Ieung 0x0ee8 /* U+11BC HANGUL JONGSEONG IEUNG */ +#define XK_Hangul_J_Jieuj 0x0ee9 /* U+11BD HANGUL JONGSEONG CIEUC */ +#define XK_Hangul_J_Cieuc 0x0eea /* U+11BE HANGUL JONGSEONG CHIEUCH */ +#define XK_Hangul_J_Khieuq 0x0eeb /* U+11BF HANGUL JONGSEONG KHIEUKH */ +#define XK_Hangul_J_Tieut 0x0eec /* U+11C0 HANGUL JONGSEONG THIEUTH */ +#define XK_Hangul_J_Phieuf 0x0eed /* U+11C1 HANGUL JONGSEONG PHIEUPH */ +#define XK_Hangul_J_Hieuh 0x0eee /* U+11C2 HANGUL JONGSEONG HIEUH */ + +/* Ancient Hangul Consonant Characters */ +#define XK_Hangul_RieulYeorinHieuh 0x0eef /* U+316D HANGUL LETTER RIEUL-YEORINHIEUH */ +#define XK_Hangul_SunkyeongeumMieum 0x0ef0 /* U+3171 HANGUL LETTER KAPYEOUNMIEUM */ +#define XK_Hangul_SunkyeongeumPieub 0x0ef1 /* U+3178 HANGUL LETTER KAPYEOUNPIEUP */ +#define XK_Hangul_PanSios 0x0ef2 /* U+317F HANGUL LETTER PANSIOS */ +#define XK_Hangul_KkogjiDalrinIeung 0x0ef3 /* U+3181 HANGUL LETTER YESIEUNG */ +#define XK_Hangul_SunkyeongeumPhieuf 0x0ef4 /* U+3184 HANGUL LETTER KAPYEOUNPHIEUPH */ +#define XK_Hangul_YeorinHieuh 0x0ef5 /* U+3186 HANGUL LETTER YEORINHIEUH */ + +/* Ancient Hangul Vowel Characters */ +#define XK_Hangul_AraeA 0x0ef6 /* U+318D HANGUL LETTER ARAEA */ +#define XK_Hangul_AraeAE 0x0ef7 /* U+318E HANGUL LETTER ARAEAE */ + +/* Ancient Hangul syllable-final (JongSeong) Characters */ +#define XK_Hangul_J_PanSios 0x0ef8 /* U+11EB HANGUL JONGSEONG PANSIOS */ +#define XK_Hangul_J_KkogjiDalrinIeung 0x0ef9 /* U+11F0 HANGUL JONGSEONG YESIEUNG */ +#define XK_Hangul_J_YeorinHieuh 0x0efa /* U+11F9 HANGUL JONGSEONG YEORINHIEUH */ + +/* Korean currency symbol */ +#define XK_Korean_Won 0x0eff /*(U+20A9 WON SIGN)*/ + +#endif /* XK_KOREAN */ + +#ifdef XK_CURRENCY +#define XK_EuroSign 0x20ac /* U+20AC EURO SIGN */ +#endif /* XK_CURRENCY */ + +#ifdef XK_BRAILLE +#define XK_braille_dot_1 0xfff1 +#define XK_braille_dot_2 0xfff2 +#define XK_braille_dot_3 0xfff3 +#define XK_braille_dot_4 0xfff4 +#define XK_braille_dot_5 0xfff5 +#define XK_braille_dot_6 0xfff6 +#define XK_braille_dot_7 0xfff7 +#define XK_braille_dot_8 0xfff8 +#define XK_braille_dot_9 0xfff9 +#define XK_braille_dot_10 0xfffa +#endif /* XK_BRAILLE */ + /* Multimedia keys, defined same as on Linux * /usr/include/pkg/libxkbcommon/xkbcommon/xkbcommon-keysyms.h */ diff --git a/mingw32/include/tk.h b/mingw32/include/tk.h index d3c24663f49..66db0c564ae 100644 --- a/mingw32/include/tk.h +++ b/mingw32/include/tk.h @@ -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 12 +#define TK_RELEASE_SERIAL 13 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6.12" +#define TK_PATCH_LEVEL "8.6.13" /* * A special definition used to allow this header file to be included from @@ -1012,12 +1012,12 @@ typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Item *itemPtr, int argc, char **argv); #else typedef int (Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); typedef int (Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[], + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[], int flags); typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const argv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); #endif /* USE_OLD_CANVAS */ typedef void (Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr, Display *display); diff --git a/mingw32/include/tk8.6/tk-private/generic/ks_names.h b/mingw32/include/tk8.6/tk-private/generic/ks_names.h index 8d3702d7cf2..729436b92ed 100644 --- a/mingw32/include/tk8.6/tk-private/generic/ks_names.h +++ b/mingw32/include/tk8.6/tk-private/generic/ks_names.h @@ -38,10 +38,21 @@ { "Kana_Shift", 0xFF2E }, { "Eisu_Shift", 0xFF2F }, { "Eisu_toggle", 0xFF30 }, +{ "Hangul", 0xFF31 }, +{ "Hangul_Start", 0xFF32 }, +{ "Hangul_End", 0xFF33 }, +{ "Hangul_Hanja", 0xFF34 }, +{ "Hangul_Jamo", 0xFF35 }, +{ "Hangul_Romaja", 0xFF36 }, { "Codeinput", 0xFF37 }, +{ "Hangul_Jeonja", 0xFF38 }, +{ "Hangul_Banja", 0xFF39 }, +{ "Hangul_PreHanja", 0xFF3A }, +{ "Hangul_PostHanja", 0xFF3B }, { "SingleCandidate", 0xFF3C }, { "MultipleCandidate", 0xFF3D }, { "PreviousCandidate", 0xFF3E }, +{ "Hangul_Special", 0xFF3F }, { "Home", 0xFF50 }, { "Left", 0xFF51 }, { "Up", 0xFF52 }, @@ -185,7 +196,160 @@ { "Super_R", 0xFFEC }, { "Hyper_L", 0xFFED }, { "Hyper_R", 0xFFEE }, +{ "braille_dot_1", 0xFFF1 }, +{ "braille_dot_2", 0xFFF2 }, +{ "braille_dot_3", 0xFFF3 }, +{ "braille_dot_4", 0xFFF4 }, +{ "braille_dot_5", 0xFFF5 }, +{ "braille_dot_6", 0xFFF6 }, +{ "braille_dot_7", 0xFFF7 }, +{ "braille_dot_8", 0xFFF8 }, +{ "braille_dot_9", 0xFFF9 }, +{ "braille_dot_10", 0xFFFA }, { "Delete", 0xFFFF }, +{ "ISO_Lock", 0xFE01 }, +{ "ISO_Level2_Latch", 0xFE02 }, +{ "ISO_Level3_Shift", 0xFE03 }, +{ "ISO_Level3_Latch", 0xFE04 }, +{ "ISO_Level3_Lock", 0xFE05 }, +{ "ISO_Group_Latch", 0xFE06 }, +{ "ISO_Group_Lock", 0xFE07 }, +{ "ISO_Next_Group", 0xFE08 }, +{ "ISO_Next_Group_Lock", 0xFE09 }, +{ "ISO_Prev_Group", 0xFE0A }, +{ "ISO_Prev_Group_Lock", 0xFE0B }, +{ "ISO_First_Group", 0xFE0C }, +{ "ISO_First_Group_Lock", 0xFE0D }, +{ "ISO_Last_Group", 0xFE0E }, +{ "ISO_Last_Group_Lock", 0xFE0F }, +{ "ISO_Level5_Shift", 0xFE11 }, +{ "ISO_Level5_Latch", 0xFE12 }, +{ "ISO_Level5_Lock", 0xFE13 }, +{ "ISO_Left_Tab", 0xFE20 }, +{ "ISO_Move_Line_Up", 0xFE21 }, +{ "ISO_Move_Line_Down", 0xFE22 }, +{ "ISO_Partial_Line_Up", 0xFE23 }, +{ "ISO_Partial_Line_Down", 0xFE24 }, +{ "ISO_Partial_Space_Left", 0xFE25 }, +{ "ISO_Partial_Space_Right", 0xFE26 }, +{ "ISO_Set_Margin_Left", 0xFE27 }, +{ "ISO_Set_Margin_Right", 0xFE28 }, +{ "ISO_Release_Margin_Left", 0xFE29 }, +{ "ISO_Release_Margin_Right", 0xFE2A }, +{ "ISO_Release_Both_Margins", 0xFE2B }, +{ "ISO_Fast_Cursor_Left", 0xFE2C }, +{ "ISO_Fast_Cursor_Right", 0xFE2D }, +{ "ISO_Fast_Cursor_Up", 0xFE2E }, +{ "ISO_Fast_Cursor_Down", 0xFE2F }, +{ "ISO_Continuous_Underline", 0xFE30 }, +{ "ISO_Discontinuous_Underline", 0xFE31 }, +{ "ISO_Emphasize", 0xFE32 }, +{ "ISO_Center_Object", 0xFE33 }, +{ "ISO_Enter", 0xFE34 }, +{ "dead_grave", 0xFE50 }, +{ "dead_acute", 0xFE51 }, +{ "dead_circumflex", 0xFE52 }, +{ "dead_tilde", 0xFE53 }, +{ "dead_perispomeni", 0xFE53 }, +{ "dead_macron", 0xFE54 }, +{ "dead_breve", 0xFE55 }, +{ "dead_abovedot", 0xFE56 }, +{ "dead_diaeresis", 0xFE57 }, +{ "dead_abovering", 0xFE58 }, +{ "dead_doubleacute", 0xFE59 }, +{ "dead_caron", 0xFE5A }, +{ "dead_cedilla", 0xFE5B }, +{ "dead_ogonek", 0xFE5C }, +{ "dead_iota", 0xFE5D }, +{ "dead_voiced_sound", 0xFE5E }, +{ "dead_semivoiced_sound", 0xFE5F }, +{ "dead_belowdot", 0xFE60 }, +{ "dead_hook", 0xFE61 }, +{ "dead_horn", 0xFE62 }, +{ "dead_stroke", 0xFE63 }, +{ "dead_abovecomma", 0xFE64 }, +{ "dead_psili", 0xFE64 }, +{ "dead_abovereversedcomma", 0xFE65 }, +{ "dead_dasia", 0xFE65 }, +{ "dead_doublegrave", 0xFE66 }, +{ "dead_belowring", 0xFE67 }, +{ "dead_belowmacron", 0xFE68 }, +{ "dead_belowcircumflex", 0xFE69 }, +{ "dead_belowtilde", 0xFE6A }, +{ "dead_belowbreve", 0xFE6B }, +{ "dead_belowdiaeresis", 0xFE6C }, +{ "dead_invertedbreve", 0xFE6D }, +{ "dead_belowcomma", 0xFE6E }, +{ "dead_currency", 0xFE6F }, +{ "AccessX_Enable", 0xFE70 }, +{ "AccessX_Feedback_Enable", 0xFE71 }, +{ "RepeatKeys_Enable", 0xFE72 }, +{ "SlowKeys_Enable", 0xFE73 }, +{ "BounceKeys_Enable", 0xFE74 }, +{ "StickyKeys_Enable", 0xFE75 }, +{ "MouseKeys_Enable", 0xFE76 }, +{ "MouseKeys_Accel_Enable", 0xFE77 }, +{ "Overlay1_Enable", 0xFE78 }, +{ "Overlay2_Enable", 0xFE79 }, +{ "AudibleBell_Enable", 0xFE7A }, +{ "dead_a", 0xFE80 }, +{ "dead_A", 0xFE81 }, +{ "dead_e", 0xFE82 }, +{ "dead_E", 0xFE83 }, +{ "dead_i", 0xFE84 }, +{ "dead_I", 0xFE85 }, +{ "dead_o", 0xFE86 }, +{ "dead_O", 0xFE87 }, +{ "dead_u", 0xFE88 }, +{ "dead_U", 0xFE89 }, +{ "dead_small_schwa", 0xFE8A }, +{ "dead_capital_schwa", 0xFE8B }, +{ "dead_greek", 0xFE8C }, +{ "dead_lowline", 0xFE90 }, +{ "dead_aboveverticalline", 0xFE91 }, +{ "dead_belowverticalline", 0xFE92 }, +{ "dead_longsolidusoverlay", 0xFE93 }, +{ "ch", 0xFEA0 }, +{ "Ch", 0xFEA1 }, +{ "CH", 0xFEA2 }, +{ "c_h", 0xFEA3 }, +{ "C_h", 0xFEA4 }, +{ "C_H", 0xFEA5 }, +{ "First_Virtual_Screen", 0xFED0 }, +{ "Prev_Virtual_Screen", 0xFED1 }, +{ "Next_Virtual_Screen", 0xFED2 }, +{ "Last_Virtual_Screen", 0xFED4 }, +{ "Terminate_Server", 0xFED5 }, +{ "Pointer_Left", 0xFEE0 }, +{ "Pointer_Right", 0xFEE1 }, +{ "Pointer_Up", 0xFEE2 }, +{ "Pointer_Down", 0xFEE3 }, +{ "Pointer_UpLeft", 0xFEE4 }, +{ "Pointer_UpRight", 0xFEE5 }, +{ "Pointer_DownLeft", 0xFEE6 }, +{ "Pointer_DownRight", 0xFEE7 }, +{ "Pointer_Button_Dflt", 0xFEE8 }, +{ "Pointer_Button1", 0xFEE9 }, +{ "Pointer_Button2", 0xFEEA }, +{ "Pointer_Button3", 0xFEEB }, +{ "Pointer_Button4", 0xFEEC }, +{ "Pointer_Button5", 0xFEED }, +{ "Pointer_DblClick_Dflt", 0xFEEE }, +{ "Pointer_DblClick1", 0xFEEF }, +{ "Pointer_DblClick2", 0xFEF0 }, +{ "Pointer_DblClick3", 0xFEF1 }, +{ "Pointer_DblClick4", 0xFEF2 }, +{ "Pointer_DblClick5", 0xFEF3 }, +{ "Pointer_Drag_Dflt", 0xFEF4 }, +{ "Pointer_Drag1", 0xFEF5 }, +{ "Pointer_Drag2", 0xFEF6 }, +{ "Pointer_Drag3", 0xFEF7 }, +{ "Pointer_Drag4", 0xFEF8 }, +{ "Pointer_EnableKeys", 0xFEF9 }, +{ "Pointer_Accelerate", 0xFEFA }, +{ "Pointer_DfltBtnNext", 0xFEFB }, +{ "Pointer_DfltBtnPrev", 0xFEFC }, +{ "Pointer_Drag5", 0xFEFD }, { "space", 0x20 }, { "exclam", 0x21 }, { "quotedbl", 0x22 }, @@ -1019,6 +1183,181 @@ { "hebrew_shin", 0xCF9 }, { "hebrew_taw", 0xCFA }, { "hebrew_taf", 0xCFA }, +{ "Thai_kokai", 0xDA1 }, +{ "Thai_khokhai", 0xDA2 }, +{ "Thai_khokhuat", 0xDA3 }, +{ "Thai_khokhwai", 0xDA4 }, +{ "Thai_khokhon", 0xDA5 }, +{ "Thai_khorakhang", 0xDA6 }, +{ "Thai_ngongu", 0xDA7 }, +{ "Thai_chochan", 0xDA8 }, +{ "Thai_choching", 0xDA9 }, +{ "Thai_chochang", 0xDAA }, +{ "Thai_soso", 0xDAB }, +{ "Thai_chochoe", 0xDAC }, +{ "Thai_yoying", 0xDAD }, +{ "Thai_dochada", 0xDAE }, +{ "Thai_topatak", 0xDAF }, +{ "Thai_thothan", 0xDB0 }, +{ "Thai_thonangmontho", 0xDB1 }, +{ "Thai_thophuthao", 0xDB2 }, +{ "Thai_nonen", 0xDB3 }, +{ "Thai_dodek", 0xDB4 }, +{ "Thai_totao", 0xDB5 }, +{ "Thai_thothung", 0xDB6 }, +{ "Thai_thothahan", 0xDB7 }, +{ "Thai_thothong", 0xDB8 }, +{ "Thai_nonu", 0xDB9 }, +{ "Thai_bobaimai", 0xDBA }, +{ "Thai_popla", 0xDBB }, +{ "Thai_phophung", 0xDBC }, +{ "Thai_fofa", 0xDBD }, +{ "Thai_phophan", 0xDBE }, +{ "Thai_fofan", 0xDBF }, +{ "Thai_phosamphao", 0xDC0 }, +{ "Thai_moma", 0xDC1 }, +{ "Thai_yoyak", 0xDC2 }, +{ "Thai_rorua", 0xDC3 }, +{ "Thai_ru", 0xDC4 }, +{ "Thai_loling", 0xDC5 }, +{ "Thai_lu", 0xDC6 }, +{ "Thai_wowaen", 0xDC7 }, +{ "Thai_sosala", 0xDC8 }, +{ "Thai_sorusi", 0xDC9 }, +{ "Thai_sosua", 0xDCA }, +{ "Thai_hohip", 0xDCB }, +{ "Thai_lochula", 0xDCC }, +{ "Thai_oang", 0xDCD }, +{ "Thai_honokhuk", 0xDCE }, +{ "Thai_paiyannoi", 0xDCF }, +{ "Thai_saraa", 0xDD0 }, +{ "Thai_maihanakat", 0xDD1 }, +{ "Thai_saraaa", 0xDD2 }, +{ "Thai_saraam", 0xDD3 }, +{ "Thai_sarai", 0xDD4 }, +{ "Thai_saraii", 0xDD5 }, +{ "Thai_saraue", 0xDD6 }, +{ "Thai_sarauee", 0xDD7 }, +{ "Thai_sarau", 0xDD8 }, +{ "Thai_sarauu", 0xDD9 }, +{ "Thai_phinthu", 0xDDA }, +{ "Thai_maihanakat_maitho", 0xDDE }, +{ "Thai_baht", 0xDDF }, +{ "Thai_sarae", 0xDE0 }, +{ "Thai_saraae", 0xDE1 }, +{ "Thai_sarao", 0xDE2 }, +{ "Thai_saraaimaimuan", 0xDE3 }, +{ "Thai_saraaimaimalai", 0xDE4 }, +{ "Thai_lakkhangyao", 0xDE5 }, +{ "Thai_maiyamok", 0xDE6 }, +{ "Thai_maitaikhu", 0xDE7 }, +{ "Thai_maiek", 0xDE8 }, +{ "Thai_maitho", 0xDE9 }, +{ "Thai_maitri", 0xDEA }, +{ "Thai_maichattawa", 0xDEB }, +{ "Thai_thanthakhat", 0xDEC }, +{ "Thai_nikhahit", 0xDED }, +{ "Thai_leksun", 0xDF0 }, +{ "Thai_leknung", 0xDF1 }, +{ "Thai_leksong", 0xDF2 }, +{ "Thai_leksam", 0xDF3 }, +{ "Thai_leksi", 0xDF4 }, +{ "Thai_lekha", 0xDF5 }, +{ "Thai_lekhok", 0xDF6 }, +{ "Thai_lekchet", 0xDF7 }, +{ "Thai_lekpaet", 0xDF8 }, +{ "Thai_lekkao", 0xDF9 }, +{ "Hangul_Kiyeog", 0xEA1 }, +{ "Hangul_SsangKiyeog", 0xEA2 }, +{ "Hangul_KiyeogSios", 0xEA3 }, +{ "Hangul_Nieun", 0xEA4 }, +{ "Hangul_NieunJieuj", 0xEA5 }, +{ "Hangul_NieunHieuh", 0xEA6 }, +{ "Hangul_Dikeud", 0xEA7 }, +{ "Hangul_SsangDikeud", 0xEA8 }, +{ "Hangul_Rieul", 0xEA9 }, +{ "Hangul_RieulKiyeog", 0xEAA }, +{ "Hangul_RieulMieum", 0xEAB }, +{ "Hangul_RieulPieub", 0xEAC }, +{ "Hangul_RieulSios", 0xEAD }, +{ "Hangul_RieulTieut", 0xEAE }, +{ "Hangul_RieulPhieuf", 0xEAF }, +{ "Hangul_RieulHieuh", 0xEB0 }, +{ "Hangul_Mieum", 0xEB1 }, +{ "Hangul_Pieub", 0xEB2 }, +{ "Hangul_SsangPieub", 0xEB3 }, +{ "Hangul_PieubSios", 0xEB4 }, +{ "Hangul_Sios", 0xEB5 }, +{ "Hangul_SsangSios", 0xEB6 }, +{ "Hangul_Ieung", 0xEB7 }, +{ "Hangul_Jieuj", 0xEB8 }, +{ "Hangul_SsangJieuj", 0xEB9 }, +{ "Hangul_Cieuc", 0xEBA }, +{ "Hangul_Khieuq", 0xEBB }, +{ "Hangul_Tieut", 0xEBC }, +{ "Hangul_Phieuf", 0xEBD }, +{ "Hangul_Hieuh", 0xEBE }, +{ "Hangul_A", 0xEBF }, +{ "Hangul_AE", 0xEC0 }, +{ "Hangul_YA", 0xEC1 }, +{ "Hangul_YAE", 0xEC2 }, +{ "Hangul_EO", 0xEC3 }, +{ "Hangul_E", 0xEC4 }, +{ "Hangul_YEO", 0xEC5 }, +{ "Hangul_YE", 0xEC6 }, +{ "Hangul_O", 0xEC7 }, +{ "Hangul_WA", 0xEC8 }, +{ "Hangul_WAE", 0xEC9 }, +{ "Hangul_OE", 0xECA }, +{ "Hangul_YO", 0xECB }, +{ "Hangul_U", 0xECC }, +{ "Hangul_WEO", 0xECD }, +{ "Hangul_WE", 0xECE }, +{ "Hangul_WI", 0xECF }, +{ "Hangul_YU", 0xED0 }, +{ "Hangul_EU", 0xED1 }, +{ "Hangul_YI", 0xED2 }, +{ "Hangul_I", 0xED3 }, +{ "Hangul_J_Kiyeog", 0xED4 }, +{ "Hangul_J_SsangKiyeog", 0xED5 }, +{ "Hangul_J_KiyeogSios", 0xED6 }, +{ "Hangul_J_Nieun", 0xED7 }, +{ "Hangul_J_NieunJieuj", 0xED8 }, +{ "Hangul_J_NieunHieuh", 0xED9 }, +{ "Hangul_J_Dikeud", 0xEDA }, +{ "Hangul_J_Rieul", 0xEDB }, +{ "Hangul_J_RieulKiyeog", 0xEDC }, +{ "Hangul_J_RieulMieum", 0xEDD }, +{ "Hangul_J_RieulPieub", 0xEDE }, +{ "Hangul_J_RieulSios", 0xEDF }, +{ "Hangul_J_RieulTieut", 0xEE0 }, +{ "Hangul_J_RieulPhieuf", 0xEE1 }, +{ "Hangul_J_RieulHieuh", 0xEE2 }, +{ "Hangul_J_Mieum", 0xEE3 }, +{ "Hangul_J_Pieub", 0xEE4 }, +{ "Hangul_J_PieubSios", 0xEE5 }, +{ "Hangul_J_Sios", 0xEE6 }, +{ "Hangul_J_SsangSios", 0xEE7 }, +{ "Hangul_J_Ieung", 0xEE8 }, +{ "Hangul_J_Jieuj", 0xEE9 }, +{ "Hangul_J_Cieuc", 0xEEA }, +{ "Hangul_J_Khieuq", 0xEEB }, +{ "Hangul_J_Tieut", 0xEEC }, +{ "Hangul_J_Phieuf", 0xEED }, +{ "Hangul_J_Hieuh", 0xEEE }, +{ "Hangul_RieulYeorinHieuh", 0xEEF }, +{ "Hangul_SunkyeongeumMieum", 0xEF0 }, +{ "Hangul_SunkyeongeumPieub", 0xEF1 }, +{ "Hangul_PanSios", 0xEF2 }, +{ "Hangul_KkogjiDalrinIeung", 0xEF3 }, +{ "Hangul_SunkyeongeumPhieuf", 0xEF4 }, +{ "Hangul_YeorinHieuh", 0xEF5 }, +{ "Hangul_AraeA", 0xEF6 }, +{ "Hangul_AraeAE", 0xEF7 }, +{ "Hangul_J_PanSios", 0xEF8 }, +{ "Hangul_J_KkogjiDalrinIeung", 0xEF9 }, +{ "Hangul_J_YeorinHieuh", 0xEFA }, +{ "Korean_Won", 0xEFF }, { "XF86ModeLock", 0x1008FF01 }, { "XF86MonBrightnessUp", 0x1008FF02 }, { "XF86MonBrightnessDown", 0x1008FF03 }, @@ -1184,6 +1523,7 @@ { "XF86RFKill", 0x1008FFB5 }, { "XF86AudioPreset", 0x1008FFB6 }, { "XF86RotationLockToggle", 0x1008FFB7 }, +{ "XF86FullScreen", 0x1008FFB8 }, { "XF86Switch_VT_1", 0x1008FE01 }, { "XF86Switch_VT_2", 0x1008FE02 }, { "XF86Switch_VT_3", 0x1008FE03 }, @@ -1202,3 +1542,165 @@ { "XF86Prev_VMode", 0x1008FE23 }, { "XF86LogWindowTree", 0x1008FE24 }, { "XF86LogGrabInfo", 0x1008FE25 }, +{ "XF86BrightnessAuto", 0x100810F4 }, +{ "XF86DisplayOff", 0x100810F5 }, +{ "XF86Info", 0x10081166 }, +{ "XF86AspectRatio", 0x10081177 }, +{ "XF86DVD", 0x10081185 }, +{ "XF86Audio", 0x10081188 }, +{ "XF86ChannelUp", 0x10081192 }, +{ "XF86ChannelDown", 0x10081193 }, +{ "XF86Break", 0x1008119B }, +{ "XF86VideoPhone", 0x100811A0 }, +{ "XF86ZoomReset", 0x100811A4 }, +{ "XF86Editor", 0x100811A6 }, +{ "XF86GraphicsEditor", 0x100811A8 }, +{ "XF86Presentation", 0x100811A9 }, +{ "XF86Database", 0x100811AA }, +{ "XF86Voicemail", 0x100811AC }, +{ "XF86Addressbook", 0x100811AD }, +{ "XF86DisplayToggle", 0x100811AF }, +{ "XF86SpellCheck", 0x100811B0 }, +{ "XF86ContextMenu", 0x100811B6 }, +{ "XF86MediaRepeat", 0x100811B7 }, +{ "XF8610ChannelsUp", 0x100811B8 }, +{ "XF8610ChannelsDown", 0x100811B9 }, +{ "XF86Images", 0x100811BA }, +{ "XF86NotificationCenter", 0x100811BC }, +{ "XF86PickupPhone", 0x100811BD }, +{ "XF86HangupPhone", 0x100811BE }, +{ "XF86Fn", 0x100811D0 }, +{ "XF86Fn_Esc", 0x100811D1 }, +{ "XF86FnRightShift", 0x100811E5 }, +{ "XF86Numeric0", 0x10081200 }, +{ "XF86Numeric1", 0x10081201 }, +{ "XF86Numeric2", 0x10081202 }, +{ "XF86Numeric3", 0x10081203 }, +{ "XF86Numeric4", 0x10081204 }, +{ "XF86Numeric5", 0x10081205 }, +{ "XF86Numeric6", 0x10081206 }, +{ "XF86Numeric7", 0x10081207 }, +{ "XF86Numeric8", 0x10081208 }, +{ "XF86Numeric9", 0x10081209 }, +{ "XF86NumericStar", 0x1008120A }, +{ "XF86NumericPound", 0x1008120B }, +{ "XF86NumericA", 0x1008120C }, +{ "XF86NumericB", 0x1008120D }, +{ "XF86NumericC", 0x1008120E }, +{ "XF86NumericD", 0x1008120F }, +{ "XF86CameraFocus", 0x10081210 }, +{ "XF86WPSButton", 0x10081211 }, +{ "XF86CameraZoomIn", 0x10081215 }, +{ "XF86CameraZoomOut", 0x10081216 }, +{ "XF86CameraUp", 0x10081217 }, +{ "XF86CameraDown", 0x10081218 }, +{ "XF86CameraLeft", 0x10081219 }, +{ "XF86CameraRight", 0x1008121A }, +{ "XF86AttendantOn", 0x1008121B }, +{ "XF86AttendantOff", 0x1008121C }, +{ "XF86AttendantToggle", 0x1008121D }, +{ "XF86LightsToggle", 0x1008121E }, +{ "XF86ALSToggle", 0x10081230 }, +{ "XF86Buttonconfig", 0x10081240 }, +{ "XF86Taskmanager", 0x10081241 }, +{ "XF86Journal", 0x10081242 }, +{ "XF86ControlPanel", 0x10081243 }, +{ "XF86AppSelect", 0x10081244 }, +{ "XF86Screensaver", 0x10081245 }, +{ "XF86VoiceCommand", 0x10081246 }, +{ "XF86Assistant", 0x10081247 }, +{ "XF86EmojiPicker", 0x10081249 }, +{ "XF86Dictate", 0x1008124A }, +{ "XF86BrightnessMin", 0x10081250 }, +{ "XF86BrightnessMax", 0x10081251 }, +{ "XF86KbdInputAssistPrev", 0x10081260 }, +{ "XF86KbdInputAssistNext", 0x10081261 }, +{ "XF86KbdInputAssistPrevgroup", 0x10081262 }, +{ "XF86KbdInputAssistNextgroup", 0x10081263 }, +{ "XF86KbdInputAssistAccept", 0x10081264 }, +{ "XF86KbdInputAssistCancel", 0x10081265 }, +{ "XF86RightUp", 0x10081266 }, +{ "XF86RightDown", 0x10081267 }, +{ "XF86LeftUp", 0x10081268 }, +{ "XF86LeftDown", 0x10081269 }, +{ "XF86RootMenu", 0x1008126A }, +{ "XF86MediaTopMenu", 0x1008126B }, +{ "XF86Numeric11", 0x1008126C }, +{ "XF86Numeric12", 0x1008126D }, +{ "XF86AudioDesc", 0x1008126E }, +{ "XF863DMode", 0x1008126F }, +{ "XF86NextFavorite", 0x10081270 }, +{ "XF86StopRecord", 0x10081271 }, +{ "XF86PauseRecord", 0x10081272 }, +{ "XF86VOD", 0x10081273 }, +{ "XF86Unmute", 0x10081274 }, +{ "XF86FastReverse", 0x10081275 }, +{ "XF86SlowReverse", 0x10081276 }, +{ "XF86Data", 0x10081277 }, +{ "XF86OnScreenKeyboard", 0x10081278 }, +{ "XF86PrivacyScreenToggle", 0x10081279 }, +{ "XF86SelectiveScreenshot", 0x1008127A }, +{ "XF86Macro1", 0x10081290 }, +{ "XF86Macro2", 0x10081291 }, +{ "XF86Macro3", 0x10081292 }, +{ "XF86Macro4", 0x10081293 }, +{ "XF86Macro5", 0x10081294 }, +{ "XF86Macro6", 0x10081295 }, +{ "XF86Macro7", 0x10081296 }, +{ "XF86Macro8", 0x10081297 }, +{ "XF86Macro9", 0x10081298 }, +{ "XF86Macro10", 0x10081299 }, +{ "XF86Macro11", 0x1008129A }, +{ "XF86Macro12", 0x1008129B }, +{ "XF86Macro13", 0x1008129C }, +{ "XF86Macro14", 0x1008129D }, +{ "XF86Macro15", 0x1008129E }, +{ "XF86Macro16", 0x1008129F }, +{ "XF86Macro17", 0x100812A0 }, +{ "XF86Macro18", 0x100812A1 }, +{ "XF86Macro19", 0x100812A2 }, +{ "XF86Macro20", 0x100812A3 }, +{ "XF86Macro21", 0x100812A4 }, +{ "XF86Macro22", 0x100812A5 }, +{ "XF86Macro23", 0x100812A6 }, +{ "XF86Macro24", 0x100812A7 }, +{ "XF86Macro25", 0x100812A8 }, +{ "XF86Macro26", 0x100812A9 }, +{ "XF86Macro27", 0x100812AA }, +{ "XF86Macro28", 0x100812AB }, +{ "XF86Macro29", 0x100812AC }, +{ "XF86Macro30", 0x100812AD }, +{ "XF86MacroRecordStart", 0x100812B0 }, +{ "XF86MacroRecordStop", 0x100812B1 }, +{ "XF86MacroPresetCycle", 0x100812B2 }, +{ "XF86MacroPreset1", 0x100812B3 }, +{ "XF86MacroPreset2", 0x100812B4 }, +{ "XF86MacroPreset3", 0x100812B5 }, +{ "XF86KbdLcdMenu1", 0x100812B8 }, +{ "XF86KbdLcdMenu2", 0x100812B9 }, +{ "XF86KbdLcdMenu3", 0x100812BA }, +{ "XF86KbdLcdMenu4", 0x100812BB }, +{ "XF86KbdLcdMenu5", 0x100812BC }, +{ "SunFA_Grave", 0x1005FF00 }, +{ "SunFA_Circum", 0x1005FF01 }, +{ "SunFA_Tilde", 0x1005FF02 }, +{ "SunFA_Acute", 0x1005FF03 }, +{ "SunFA_Diaeresis", 0x1005FF04 }, +{ "SunFA_Cedilla", 0x1005FF05 }, +{ "SunF36", 0x1005FF10 }, +{ "SunF37", 0x1005FF11 }, +{ "SunSys_Req", 0x1005FF60 }, +{ "SunProps", 0x1005FF70 }, +{ "SunFront", 0x1005FF71 }, +{ "SunCopy", 0x1005FF72 }, +{ "SunOpen", 0x1005FF73 }, +{ "SunPaste", 0x1005FF74 }, +{ "SunCut", 0x1005FF75 }, +{ "SunPowerSwitch", 0x1005FF76 }, +{ "SunAudioLowerVolume", 0x1005FF77 }, +{ "SunAudioMute", 0x1005FF78 }, +{ "SunAudioRaiseVolume", 0x1005FF79 }, +{ "SunVideoDegauss", 0x1005FF7A }, +{ "SunVideoLowerBrightness", 0x1005FF7B }, +{ "SunVideoRaiseBrightness", 0x1005FF7C }, +{ "SunPowerSwitchShift", 0x1005FF7D }, diff --git a/mingw32/include/tk8.6/tk-private/generic/tk.h b/mingw32/include/tk8.6/tk-private/generic/tk.h index d3c24663f49..66db0c564ae 100644 --- a/mingw32/include/tk8.6/tk-private/generic/tk.h +++ b/mingw32/include/tk8.6/tk-private/generic/tk.h @@ -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 12 +#define TK_RELEASE_SERIAL 13 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6.12" +#define TK_PATCH_LEVEL "8.6.13" /* * A special definition used to allow this header file to be included from @@ -1012,12 +1012,12 @@ typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Item *itemPtr, int argc, char **argv); #else typedef int (Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); typedef int (Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[], + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[], int flags); typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const argv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); #endif /* USE_OLD_CANVAS */ typedef void (Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr, Display *display); diff --git a/mingw32/include/tk8.6/tk-private/generic/tkDecls.h b/mingw32/include/tk8.6/tk-private/generic/tkDecls.h index 20729308473..6663d163dfd 100644 --- a/mingw32/include/tk8.6/tk-private/generic/tkDecls.h +++ b/mingw32/include/tk8.6/tk-private/generic/tkDecls.h @@ -870,7 +870,17 @@ EXTERN void Tk_CreateOldPhotoImageFormat( /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ -/* 280 */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ +/* 290 */ EXTERN void TkUnusedStubEntry(void); typedef struct { @@ -1164,7 +1174,17 @@ typedef struct TkStubs { void (*reserved277)(void); void (*reserved278)(void); void (*reserved279)(void); - void (*tkUnusedStubEntry) (void); /* 280 */ + void (*reserved280)(void); + void (*reserved281)(void); + void (*reserved282)(void); + void (*reserved283)(void); + void (*reserved284)(void); + void (*reserved285)(void); + void (*reserved286)(void); + void (*reserved287)(void); + void (*reserved288)(void); + void (*reserved289)(void); + void (*tkUnusedStubEntry) (void); /* 290 */ } TkStubs; extern const TkStubs *tkStubsPtr; @@ -1731,8 +1751,18 @@ extern const TkStubs *tkStubsPtr; /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ #define TkUnusedStubEntry \ - (tkStubsPtr->tkUnusedStubEntry) /* 280 */ + (tkStubsPtr->tkUnusedStubEntry) /* 290 */ #endif /* defined(USE_TK_STUBS) */ @@ -1750,6 +1780,8 @@ extern const TkStubs *tkStubsPtr; EXTERN void Tk_MainExW(int argc, wchar_t **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif +#undef Tk_FreeStyleFromObj +#define Tk_FreeStyleFromObj(objPtr) ((void)(objPtr)) #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/mingw32/include/tk8.6/tk-private/generic/tkInt.h b/mingw32/include/tk8.6/tk-private/generic/tkInt.h index fe8f16ec287..35b7e673804 100644 --- a/mingw32/include/tk8.6/tk-private/generic/tkInt.h +++ b/mingw32/include/tk8.6/tk-private/generic/tkInt.h @@ -19,6 +19,8 @@ #include "tkPort.h" #endif +#define TK_OPTION_ENUM_VAR ((int)(sizeof(Tk_OptionType)&(sizeof(int)-1))<<6) + /* * Ensure WORDS_BIGENDIAN is defined correctly: * Needs to happen here in addition to configure to work with fat compiles on @@ -84,7 +86,9 @@ # endif #endif -#if defined(__GNUC__) && (__GNUC__ > 2) +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +# define TKFLEXARRAY +#elif defined(__GNUC__) && (__GNUC__ > 2) # define TKFLEXARRAY 0 #else # define TKFLEXARRAY 1 @@ -368,8 +372,14 @@ typedef struct TkDisplay { * by that container. */ int geomInit; -#define TkGetContainer(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ - ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) + /* + * Information used by tkGrid.c, tkPack.c, tkPlace.c, tkPointer.c, + * and ttkMacOSXTheme.c: + */ + +#define TkGetContainer(tkwin) (Tk_TopWinHierarchy((TkWindow *)tkwin) ? NULL : \ + (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ + ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr)) /* * Information used by tkGet.c only: @@ -874,6 +884,13 @@ typedef struct TkWindow { * if its container is its parent. */ } TkWindow; +/* + * String tables: + */ + +MODULE_SCOPE const char *const tkStateStrings[]; +MODULE_SCOPE const char *const tkCompoundStrings[]; + /* * Real definition of some events. Note that these events come from outside * but have internally generated pieces added to them. @@ -1236,7 +1253,7 @@ MODULE_SCOPE void TkFreeGeometryContainer(Tk_Window tkwin, MODULE_SCOPE void TkEventInit(void); MODULE_SCOPE void TkRegisterObjTypes(void); MODULE_SCOPE int TkDeadAppObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, Tcl_Obj *const argv[]); + Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int TkCanvasGetCoordObj(Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr); @@ -1248,7 +1265,7 @@ MODULE_SCOPE int TkPostscriptImage(Tcl_Interp *interp, Tk_Window tkwin, MODULE_SCOPE void TkMapTopFrame(Tk_Window tkwin); MODULE_SCOPE XEvent * TkpGetBindingXEvent(Tcl_Interp *interp); MODULE_SCOPE void TkCreateExitHandler(Tcl_ExitProc *proc, - ClientData clientData); + void *clientData); MODULE_SCOPE void TkDeleteExitHandler(Tcl_ExitProc *proc, ClientData clientData); MODULE_SCOPE Tcl_ExitProc TkFinalize; diff --git a/mingw32/include/tk8.6/tk-private/generic/tkIntDecls.h b/mingw32/include/tk8.6/tk-private/generic/tkIntDecls.h index 705741117e2..cb4379cb7f7 100644 --- a/mingw32/include/tk8.6/tk-private/generic/tkIntDecls.h +++ b/mingw32/include/tk8.6/tk-private/generic/tkIntDecls.h @@ -558,6 +558,8 @@ EXTERN void TkpRedrawWidget(Tk_Window tkwin); /* 186 */ EXTERN int TkpWillDrawWidget(Tk_Window tkwin); #endif /* MACOSX */ +/* 187 */ +EXTERN void TkUnusedStubEntry(void); typedef struct TkIntStubs { int magic; @@ -793,6 +795,7 @@ typedef struct TkIntStubs { #ifdef MAC_OSX_TCL /* MACOSX */ int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 186 */ #endif /* MACOSX */ + void (*tkUnusedStubEntry) (void); /* 187 */ } TkIntStubs; extern const TkIntStubs *tkIntStubsPtr; @@ -1173,6 +1176,8 @@ extern const TkIntStubs *tkIntStubsPtr; #define TkpWillDrawWidget \ (tkIntStubsPtr->tkpWillDrawWidget) /* 186 */ #endif /* MACOSX */ +#define TkUnusedStubEntry \ + (tkIntStubsPtr->tkUnusedStubEntry) /* 187 */ #endif /* defined(USE_TK_STUBS) */ @@ -1224,5 +1229,7 @@ extern const TkIntStubs *tkIntStubsPtr; # define TkpRedrawWidget(w) #endif +#undef TkUnusedStubEntry + #endif /* _TKINTDECLS */ diff --git a/mingw32/include/tk8.6/tk-private/generic/tkMenu.h b/mingw32/include/tk8.6/tk-private/generic/tkMenu.h index 386b2044076..51e8cb2c70b 100644 --- a/mingw32/include/tk8.6/tk-private/generic/tkMenu.h +++ b/mingw32/include/tk8.6/tk-private/generic/tkMenu.h @@ -517,7 +517,7 @@ MODULE_SCOPE int TkPostCommand(TkMenu *menuPtr); MODULE_SCOPE int TkPostSubmenu(Tcl_Interp *interp, TkMenu *menuPtr, TkMenuEntry *mePtr); MODULE_SCOPE int TkPostTearoffMenu(Tcl_Interp *interp, TkMenu *menuPtr, - int x, int y); + int x, int y); MODULE_SCOPE int TkPreprocessMenu(TkMenu *menuPtr); MODULE_SCOPE void TkRecomputeMenu(TkMenu *menuPtr); @@ -542,7 +542,7 @@ MODULE_SCOPE int TkpNewMenu(TkMenu *menuPtr); MODULE_SCOPE int TkpPostMenu(Tcl_Interp *interp, TkMenu *menuPtr, int x, int y, int index); MODULE_SCOPE int TkpPostTearoffMenu(Tcl_Interp *interp, TkMenu *menuPtr, - int x, int y, int index); + int x, int y, int index); MODULE_SCOPE void TkpSetWindowMenuBar(Tk_Window tkwin, TkMenu *menuPtr); #endif /* _TKMENU */ diff --git a/mingw32/include/tk8.6/tk-private/generic/tkText.h b/mingw32/include/tk8.6/tk-private/generic/tkText.h index 9898462d3ff..d3c1cc902f7 100644 --- a/mingw32/include/tk8.6/tk-private/generic/tkText.h +++ b/mingw32/include/tk8.6/tk-private/generic/tkText.h @@ -168,7 +168,7 @@ typedef struct TkTextSegment { int size; /* Size of this segment (# of bytes of index * space it occupies). */ union { - char chars[TKFLEXARRAY]; /* Characters that make up character info. + char chars[TCL_UTF_MAX]; /* Characters that make up character info. * Actual length varies to hold as many * characters as needed.*/ TkTextToggle toggle; /* Information about tag toggle. */ diff --git a/mingw32/include/tk8.6/tk-private/generic/ttk/ttkWidget.h b/mingw32/include/tk8.6/tk-private/generic/ttk/ttkWidget.h index 6cd691b144e..c6b2dc996c2 100644 --- a/mingw32/include/tk8.6/tk-private/generic/ttk/ttkWidget.h +++ b/mingw32/include/tk8.6/tk-private/generic/ttk/ttkWidget.h @@ -247,9 +247,9 @@ MODULE_SCOPE void Ttk_TagSetApplyStyle(Ttk_TagTable,Ttk_Style,Ttk_State,void*); * String tables for widget resource specifications: */ -MODULE_SCOPE const char *ttkOrientStrings[]; -MODULE_SCOPE const char *ttkCompoundStrings[]; -MODULE_SCOPE const char *ttkDefaultStrings[]; +MODULE_SCOPE const char *const ttkOrientStrings[]; +MODULE_SCOPE const char *const ttkCompoundStrings[]; +MODULE_SCOPE const char *const ttkDefaultStrings[]; /* * ... other option types... diff --git a/mingw32/include/tk8.6/tk-private/win/tkWinDefault.h b/mingw32/include/tk8.6/tk-private/win/tkWinDefault.h index 852de02e014..b03cbd7441b 100644 --- a/mingw32/include/tk8.6/tk-private/win/tkWinDefault.h +++ b/mingw32/include/tk8.6/tk-private/win/tkWinDefault.h @@ -59,6 +59,7 @@ #define DEF_BUTTON_DEFAULT "disabled" #define DEF_BUTTON_DISABLED_FG_COLOR DISABLED #define DEF_BUTTON_DISABLED_FG_MONO "" +#define DEF_LABEL_FG NORMAL_FG #define DEF_BUTTON_FG NORMAL_FG #define DEF_CHKRAD_FG TEXT_FG #define DEF_BUTTON_FONT "TkDefaultFont" diff --git a/mingw32/include/tk8.6/tk-private/win/tkWinPort.h b/mingw32/include/tk8.6/tk-private/win/tkWinPort.h index 0118608a0d7..e5e9e6c0506 100644 --- a/mingw32/include/tk8.6/tk-private/win/tkWinPort.h +++ b/mingw32/include/tk8.6/tk-private/win/tkWinPort.h @@ -95,6 +95,7 @@ * See ticket [916c1095438eae56]: GetVersionExW triggers warnings */ #if defined(_MSC_VER) +# pragma warning(disable:4090) /* see: https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/390711 */ # pragma warning(disable:4146) # pragma warning(disable:4267) # pragma warning(disable:4244) @@ -124,12 +125,6 @@ #define TkpGetPixel(p) (((((p)->red >> 8) & 0xff) \ | ((p)->green & 0xff00) | (((p)->blue << 8) & 0xff0000)) | 0x20000000) -/* - * Used by tkWindow.c - */ - -#define TkpHandleMapOrUnmap(tkwin, event) Tk_HandleEvent(event) - /* * These calls implement native bitmaps which are not currently * supported under Windows. The macros eliminate the calls. diff --git a/mingw32/include/tkDecls.h b/mingw32/include/tkDecls.h index 20729308473..6663d163dfd 100644 --- a/mingw32/include/tkDecls.h +++ b/mingw32/include/tkDecls.h @@ -870,7 +870,17 @@ EXTERN void Tk_CreateOldPhotoImageFormat( /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ -/* 280 */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ +/* 290 */ EXTERN void TkUnusedStubEntry(void); typedef struct { @@ -1164,7 +1174,17 @@ typedef struct TkStubs { void (*reserved277)(void); void (*reserved278)(void); void (*reserved279)(void); - void (*tkUnusedStubEntry) (void); /* 280 */ + void (*reserved280)(void); + void (*reserved281)(void); + void (*reserved282)(void); + void (*reserved283)(void); + void (*reserved284)(void); + void (*reserved285)(void); + void (*reserved286)(void); + void (*reserved287)(void); + void (*reserved288)(void); + void (*reserved289)(void); + void (*tkUnusedStubEntry) (void); /* 290 */ } TkStubs; extern const TkStubs *tkStubsPtr; @@ -1731,8 +1751,18 @@ extern const TkStubs *tkStubsPtr; /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ #define TkUnusedStubEntry \ - (tkStubsPtr->tkUnusedStubEntry) /* 280 */ + (tkStubsPtr->tkUnusedStubEntry) /* 290 */ #endif /* defined(USE_TK_STUBS) */ @@ -1750,6 +1780,8 @@ extern const TkStubs *tkStubsPtr; EXTERN void Tk_MainExW(int argc, wchar_t **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif +#undef Tk_FreeStyleFromObj +#define Tk_FreeStyleFromObj(objPtr) ((void)(objPtr)) #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/mingw32/lib/libtkstub86.a b/mingw32/lib/libtkstub86.a index 5e537872d0e..880e3c4d46a 100644 Binary files a/mingw32/lib/libtkstub86.a and b/mingw32/lib/libtkstub86.a differ diff --git a/mingw32/lib/pkgconfig/tk.pc b/mingw32/lib/pkgconfig/tk.pc index 630278e5eb2..81ec28ec41a 100644 --- a/mingw32/lib/pkgconfig/tk.pc +++ b/mingw32/lib/pkgconfig/tk.pc @@ -8,7 +8,7 @@ includedir=${prefix}/include Name: The Tk Toolkit Description: Tk is a cross-platform graphical user interface toolkit, the standard GUI not only for Tcl, but for many other dynamic languages as well. URL: https://www.tcl-lang.org/ -Version: 8.6.12 +Version: 8.6.13 Requires: tcl >= 8.6 Libs: -L${libdir} -ltk86 -ltkstub86 Libs.private: diff --git a/mingw32/lib/tk8.6/clrpick.tcl b/mingw32/lib/tk8.6/clrpick.tcl index e408d037edd..d67c67fd4e1 100644 --- a/mingw32/lib/tk8.6/clrpick.tcl +++ b/mingw32/lib/tk8.6/clrpick.tcl @@ -316,7 +316,7 @@ proc ::tk::dialog::color::BuildDialog {w} { # Accelerator bindings bind $lab <> [list focus $ent] - bind $w [list tk::ButtonInvoke $data(cancelBtn)] + bind $w [list tk::ButtonInvoke $data(cancelBtn)] bind $w [list tk::AltKeyInDialog $w %A] wm protocol $w WM_DELETE_WINDOW [list tk::dialog::color::CancelCmd $w] diff --git a/mingw32/lib/tk8.6/console.tcl b/mingw32/lib/tk8.6/console.tcl index 30c4d88305c..83723f15f22 100644 --- a/mingw32/lib/tk8.6/console.tcl +++ b/mingw32/lib/tk8.6/console.tcl @@ -91,29 +91,29 @@ proc ::tk::ConsoleInit {} { AmpMenuArgs .menubar.edit add separator if {$::tk::console::useFontchooser} { - if {[tk windowingsystem] eq "aqua"} { - .menubar.edit add command -label tk_choose_font_marker - set index [.menubar.edit index tk_choose_font_marker] - .menubar.edit entryconfigure $index \ - -label [mc "Show Fonts"]\ - -accelerator "$mod-T"\ - -command [list ::tk::console::FontchooserToggle] - bind Console <> \ - [list ::tk::console::FontchooserVisibility $index] + if {[tk windowingsystem] eq "aqua"} { + .menubar.edit add command -label tk_choose_font_marker + set index [.menubar.edit index tk_choose_font_marker] + .menubar.edit entryconfigure $index \ + -label [mc "Show Fonts"]\ + -accelerator "$mod-T"\ + -command [list ::tk::console::FontchooserToggle] + bind Console <> \ + [list ::tk::console::FontchooserVisibility $index] ::tk::console::FontchooserVisibility $index - } else { - AmpMenuArgs .menubar.edit add command -label [mc "&Font..."] \ - -command [list ::tk::console::FontchooserToggle] - } + } else { + AmpMenuArgs .menubar.edit add command -label [mc "&Font..."] \ + -command [list ::tk::console::FontchooserToggle] + } bind Console [list ::tk::console::FontchooserFocus %W 1] bind Console [list ::tk::console::FontchooserFocus %W 0] } AmpMenuArgs .menubar.edit add command -label [mc "&Increase Font Size"] \ - -accel "$mod++" -command {event generate .console <>} + -accel "$mod++" -command {event generate .console <>} AmpMenuArgs .menubar.edit add command -label [mc "&Decrease Font Size"] \ - -accel "$mod+-" -command {event generate .console <>} + -accel "$mod+-" -command {event generate .console <>} AmpMenuArgs .menubar.edit add command -label [mc "Fit To Screen Width"] \ - -command {event generate .console <>} + -command {event generate .console <>} if {[tk windowingsystem] eq "aqua"} { .menubar add cascade -label [mc Window] -menu [menu .menubar.window] @@ -126,31 +126,31 @@ proc ::tk::ConsoleInit {} { catch {font create TkConsoleFont {*}[font configure TkFixedFont]} set families [font families] switch -exact -- [tk windowingsystem] { - aqua { set preferred {Monaco 10} } - win32 { set preferred {ProFontWindows 8 Consolas 8} } - default { set preferred {} } + aqua { set preferred {Monaco 10} } + win32 { set preferred {ProFontWindows 8 Consolas 8} } + default { set preferred {} } } foreach {family size} $preferred { - if {$family in $families} { - font configure TkConsoleFont -family $family -size $size - break - } + if {$family in $families} { + font configure TkConsoleFont -family $family -size $size + break + } } # Provide the right border for the text widget (platform dependent). ::ttk::style layout ConsoleFrame { - Entry.field -sticky news -border 1 -children { - ConsoleFrame.padding -sticky news - } + Entry.field -sticky news -border 1 -children { + ConsoleFrame.padding -sticky news + } } ::ttk::frame .consoleframe -style ConsoleFrame set con [text .console -yscrollcommand [list .sb set] -setgrid true \ - -borderwidth 0 -highlightthickness 0 -font TkConsoleFont] + -borderwidth 0 -highlightthickness 0 -font TkConsoleFont] if {[tk windowingsystem] eq "aqua"} { - scrollbar .sb -command [list $con yview] + scrollbar .sb -command [list $con yview] } else { - ::ttk::scrollbar .sb -command [list $con yview] + ::ttk::scrollbar .sb -command [list $con yview] } pack .sb -in .consoleframe -fill both -side right -padx 1 -pady 1 pack $con -in .consoleframe -fill both -expand 1 -side left -padx 1 -pady 1 @@ -215,7 +215,7 @@ proc ::tk::ConsoleSource {} { [list [mc "Tcl Scripts"] .tcl] \ [list [mc "All Files"] *]]] if {$filename ne ""} { - set cmd [list source $filename] + set cmd [list source $filename] if {[catch {consoleinterp eval $cmd} result]} { ConsoleOutput stderr "$result\n" } @@ -273,22 +273,22 @@ proc ::tk::ConsoleHistory {cmd} { variable HistNum switch $cmd { - prev { + prev { incr HistNum -1 if {$HistNum == 0} { set cmd {history event [expr {[history nextid] -1}]} } else { set cmd "history event $HistNum" } - if {[catch {consoleinterp eval $cmd} cmd]} { - incr HistNum - return - } + if {[catch {consoleinterp eval $cmd} cmd]} { + incr HistNum + return + } .console delete promptEnd end - .console insert promptEnd $cmd {input stdin} + .console insert promptEnd $cmd {input stdin} .console see end - } - next { + } + next { incr HistNum if {$HistNum == 0} { set cmd {history event [expr {[history nextid] -1}]} @@ -304,10 +304,10 @@ proc ::tk::ConsoleHistory {cmd} { .console delete promptEnd end .console insert promptEnd $cmd {input stdin} .console see end - } - reset { - set HistNum 1 - } + } + reset { + set HistNum 1 + } } } @@ -324,19 +324,19 @@ proc ::tk::ConsolePrompt {{partial normal}} { if {$partial eq "normal"} { set temp [$w index "end - 1 char"] $w mark set output end - if {[consoleinterp eval "info exists tcl_prompt1"]} { - consoleinterp eval "eval \[set tcl_prompt1\]" - } else { - puts -nonewline [EvalAttached $::tk::console::defaultPrompt] - } + if {[consoleinterp eval "info exists tcl_prompt1"]} { + consoleinterp eval "eval \[set tcl_prompt1\]" + } else { + puts -nonewline [EvalAttached $::tk::console::defaultPrompt] + } } else { set temp [$w index output] $w mark set output end - if {[consoleinterp eval "info exists tcl_prompt2"]} { - consoleinterp eval "eval \[set tcl_prompt2\]" - } else { + if {[consoleinterp eval "info exists tcl_prompt2"]} { + consoleinterp eval "eval \[set tcl_prompt2\]" + } else { puts -nonewline "> " - } + } } flush stdout $w mark set output $temp @@ -350,33 +350,33 @@ proc ::tk::ConsolePrompt {{partial normal}} { # Copy selected text from the console proc ::tk::console::Copy {w} { if {![catch {set data [$w get sel.first sel.last]}]} { - clipboard clear -displayof $w - clipboard append -displayof $w $data + clipboard clear -displayof $w + clipboard append -displayof $w $data } } # Copies selected text. If the selection is within the current active edit # region then it will be cut, if not it is only copied. proc ::tk::console::Cut {w} { if {![catch {set data [$w get sel.first sel.last]}]} { - clipboard clear -displayof $w - clipboard append -displayof $w $data - if {[$w compare sel.first >= output]} { - $w delete sel.first sel.last + clipboard clear -displayof $w + clipboard append -displayof $w $data + if {[$w compare sel.first >= output]} { + $w delete sel.first sel.last } } } # Paste text from the clipboard proc ::tk::console::Paste {w} { catch { - set clip [::tk::GetSelection $w CLIPBOARD] - set list [split $clip \n\r] - tk::ConsoleInsert $w [lindex $list 0] - foreach x [lrange $list 1 end] { - $w mark set insert {end - 1c} - tk::ConsoleInsert $w "\n" - tk::ConsoleInvoke - tk::ConsoleInsert $w $x - } + set clip [::tk::GetSelection $w CLIPBOARD] + set list [split $clip \n\r] + tk::ConsoleInsert $w [lindex $list 0] + foreach x [lrange $list 1 end] { + $w mark set insert {end - 1c} + tk::ConsoleInsert $w "\n" + tk::ConsoleInvoke + tk::ConsoleInsert $w $x + } } } @@ -388,14 +388,14 @@ proc ::tk::console::FitScreenWidth {w} { set fit 0 array set fi [font configure TkConsoleFont] while {$s < 0} { - set fi(-size) $s - set f [font create {*}[array get fi]] - set c [font measure $f "eM"] - font delete $f - if {$c * $cwidth < 1.667 * $width} { - font configure TkConsoleFont -size $s - break - } + set fi(-size) $s + set f [font create {*}[array get fi]] + set c [font measure $f "eM"] + font delete $f + if {$c * $cwidth < 1.667 * $width} { + font configure TkConsoleFont -size $s + break + } incr s 2 } } @@ -416,60 +416,64 @@ proc ::tk::ConsoleBind {w} { bind Console $ev [bind Text $ev] } ## We really didn't want the newline insertion... - bind Console {} + bind Console {} ## ...or any Control-v binding (would block <>) - bind Console {} + bind Console {} # For the moment, transpose isn't enabled until the console # gets and overhaul of how it handles input -- hobbs - bind Console {} + bind Console {} # Ignore all Alt, Meta, and Control keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the # class binding will also fire and insert the character # which is wrong. - bind Console {# nothing } - bind Console {# nothing} - bind Console {# nothing} + bind Console {# nothing } + bind Console {# nothing} + bind Console {# nothing} + if {[tk windowingsystem] eq "aqua"} { + bind Console {# nothing} + bind Console {# nothing} + } foreach {ev key} { - <> - <> - <> - <> - - <> - <> - <> - <> - <> - <> - <> - <> - <> - - <> - <> - <> - <> - <> - <> - <> + <> + <> + <> + <> + + <> + <> + <> + <> + <> + <> + <> + <> + <> + + <> + <> + <> + <> + <> + <> + <> } { event add $ev $key bind Console $key {} } if {[tk windowingsystem] eq "aqua"} { foreach {ev key} { - <> - <> + <> + <> } { event add $ev $key bind Console $key {} } if {$::tk::console::useFontchooser} { - bind Console [list ::tk::console::FontchooserToggle] + bind Console [list ::tk::console::FontchooserToggle] } } bind Console <> { @@ -587,7 +591,7 @@ proc ::tk::ConsoleBind {w} { bind Console { catch {tk::ConsoleInsert %W [::tk::GetSelection %W PRIMARY]} } - bind Console { + bind Console { tk::ConsoleInsert %W %A } bind Console { @@ -604,20 +608,20 @@ proc ::tk::ConsoleBind {w} { bind Console <> { ::tk::console::Paste %W } bind Console <> { - set size [font configure TkConsoleFont -size] - if {$size < 0} {set sign -1} else {set sign 1} - set size [expr {(abs($size) + 1) * $sign}] - font configure TkConsoleFont -size $size + set size [font configure TkConsoleFont -size] + if {$size < 0} {set sign -1} else {set sign 1} + set size [expr {(abs($size) + 1) * $sign}] + font configure TkConsoleFont -size $size if {$::tk::console::useFontchooser} { tk fontchooser configure -font TkConsoleFont } } bind Console <> { - set size [font configure TkConsoleFont -size] - if {abs($size) < 2} { return } - if {$size < 0} {set sign -1} else {set sign 1} - set size [expr {(abs($size) - 1) * $sign}] - font configure TkConsoleFont -size $size + set size [font configure TkConsoleFont -size] + if {abs($size) < 2} { return } + if {$size < 0} {set sign -1} else {set sign 1} + set size [expr {(abs($size) - 1) * $sign}] + font configure TkConsoleFont -size $size if {$::tk::console::useFontchooser} { tk fontchooser configure -font TkConsoleFont } @@ -629,28 +633,28 @@ proc ::tk::ConsoleBind {w} { ## ## Bindings for doing special things based on certain keys ## - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchPair %W \( \) promptEnd } } - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchPair %W \[ \] promptEnd } } - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchPair %W \{ \} promptEnd } } - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchQuote %W promptEnd } } - bind PostConsole { + bind PostConsole { if {"%A" ne ""} { ::tk::console::TagProc %W } diff --git a/mingw32/lib/tk8.6/demos/cscroll.tcl b/mingw32/lib/tk8.6/demos/cscroll.tcl index c88bfa9fc3e..98a4be2b5b2 100644 --- a/mingw32/lib/tk8.6/demos/cscroll.tcl +++ b/mingw32/lib/tk8.6/demos/cscroll.tcl @@ -25,7 +25,7 @@ set btns [addSeeDismiss $w.buttons $w] pack $btns -side bottom -fill x frame $w.grid -scrollbar $w.hscroll -orient horiz -command "$c xview" +scrollbar $w.hscroll -orient horizontal -command "$c xview" scrollbar $w.vscroll -command "$c yview" canvas $c -relief sunken -borderwidth 2 -scrollregion {-11c -11c 50c 20c} \ -xscrollcommand "$w.hscroll set" \ diff --git a/mingw32/lib/tk8.6/demos/entry2.tcl b/mingw32/lib/tk8.6/demos/entry2.tcl index 6405d8518d2..a4009a745d3 100644 --- a/mingw32/lib/tk8.6/demos/entry2.tcl +++ b/mingw32/lib/tk8.6/demos/entry2.tcl @@ -27,15 +27,15 @@ frame $w.frame -borderwidth 10 pack $w.frame -side top -fill x -expand 1 entry $w.frame.e1 -xscrollcommand "$w.frame.s1 set" -ttk::scrollbar $w.frame.s1 -orient horiz -command \ +ttk::scrollbar $w.frame.s1 -orient horizontal -command \ "$w.frame.e1 xview" frame $w.frame.spacer1 -width 20 -height 10 entry $w.frame.e2 -xscrollcommand "$w.frame.s2 set" -ttk::scrollbar $w.frame.s2 -orient horiz -command \ +ttk::scrollbar $w.frame.s2 -orient horizontal -command \ "$w.frame.e2 xview" frame $w.frame.spacer2 -width 20 -height 10 entry $w.frame.e3 -xscrollcommand "$w.frame.s3 set" -ttk::scrollbar $w.frame.s3 -orient horiz -command \ +ttk::scrollbar $w.frame.s3 -orient horizontal -command \ "$w.frame.e3 xview" pack $w.frame.e1 $w.frame.s1 $w.frame.spacer1 $w.frame.e2 $w.frame.s2 \ $w.frame.spacer2 $w.frame.e3 $w.frame.s3 -side top -fill x diff --git a/mingw32/lib/tk8.6/demos/floor.tcl b/mingw32/lib/tk8.6/demos/floor.tcl index eb2ea7f2893..7d0ad3bd394 100644 --- a/mingw32/lib/tk8.6/demos/floor.tcl +++ b/mingw32/lib/tk8.6/demos/floor.tcl @@ -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 42 389 42 337 1 337 1 389 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 51 300 51 253 6 253 6 300 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 98 248 98 309 79 309 79 248 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 51 251 51 204 6 204 6 251 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 6 156 51 156 51 203 6 203 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 85 169 79 169 79 192 85 192 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 77 302 77 168 53 168 53 302 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 51 155 51 115 6 115 6 155 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 95 115 53 115 53 168 95 168 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 87 113 87 27 10 27 10 113 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 89 91 128 91 128 113 89 113 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 138 169 154 169 154 191 138 191 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 99 300 126 300 126 309 99 309 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 174 309 174 300 152 300 152 309 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 138 385 138 337 91 337 91 385 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 256 337 140 337 140 385 256 385 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 300 353 300 329 260 329 260 353 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 397 255 486 255 486 276 397 276 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 742 387 742 281 800 281 800 387 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 800 168 800 280 699 280 699 168 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 726 131 726 166 800 166 800 131 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 694 279 643 279 643 314 694 314 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 277 6 277 6 338 51 338 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 560 389 599 389 599 326 560 326 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 601 389 601 326 643 326 643 389 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 688 316 645 316 645 365 688 365 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 802 367 759 367 759 226 802 226 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 755 262 755 314 717 314 717 262 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 755 316 689 316 689 365 755 365 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 755 206 717 206 717 261 755 261 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 695 277 643 277 643 206 695 206 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 676 135 676 185 724 185 724 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 476 249 557 249 557 205 476 205 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 476 186 495 186 495 204 476 204 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 234 198 306 198 306 249 234 249 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 268 179 221 179 221 135 268 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 177 179 219 179 219 135 177 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 256 385 256 340 212 340 212 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 210 340 164 340 164 385 210 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 115 340 162 340 162 385 115 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 89 228 89 156 53 156 53 228 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 89 169 97 169 97 190 89 190 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 179 51 135 6 135 6 179 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 227 6 227 6 180 51 180 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 275 6 275 6 229 51 229 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 114 340 67 340 67 385 114 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 89 228 89 180 70 180 70 228 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 115 368 162 368 162 323 115 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 164 323 164 368 211 368 211 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 256 368 212 368 212 323 256 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 251 219 251 203 244 203 244 219 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 251 249 244 249 244 232 251 232 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 223 135 223 179 177 179 177 135 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 114 368 114 323 67 323 67 368 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 23 277 23 321 68 321 68 277 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 23 229 68 229 68 275 23 275 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 68 227 23 227 23 180 68 180 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 95 179 95 135 23 135 23 179 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 99 226 99 204 91 204 91 226 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 91 202 99 202 99 180 91 180 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 274 194 274 221 306 221 306 194 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 306 222 274 222 274 249 306 249 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 263 179 224 179 224 135 263 135 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 397 246 377 246 377 185 397 185 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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} diff --git a/mingw32/lib/tk8.6/demos/goldberg.tcl b/mingw32/lib/tk8.6/demos/goldberg.tcl index 1cc52c62a89..90815fbd7f7 100644 --- a/mingw32/lib/tk8.6/demos/goldberg.tcl +++ b/mingw32/lib/tk8.6/demos/goldberg.tcl @@ -77,7 +77,6 @@ set S(mode) $::MSTART # Colors for everything set C(fg) black -set C(bg) gray75 set C(bg) cornflowerblue set C(0) white; set C(1a) darkgreen; set C(1b) yellow @@ -92,6 +91,7 @@ set C(17) \#A65353; set C(18) $C(fg); set C(19) gray50 set C(20) cyan; set C(21) gray65; set C(22) $C(20) set C(23a) blue; set C(23b) red; set C(23c) yellow set C(24a) red; set C(24b) white; +set C(24c) black; set C(26) $C(0); proc DoDisplay {w} { global S C @@ -136,7 +136,7 @@ proc DoCtrlFrame {w} { ttk::labelframe $w.message -text "Message" ttk::entry $w.message.e -textvariable S(message) -justify center ttk::labelframe $w.speed -text "Speed: 0" - ttk::scale $w.speed.scale -orient h -from 1 -to 10 -variable S(speed) + ttk::scale $w.speed.scale -orient horizontal -from 1 -to 10 -variable S(speed) ttk::button $w.about -text About -command [list About $w] grid $w.start -in $w.ctrl -row 0 -sticky ew @@ -1586,6 +1586,7 @@ proc Move24 {w {step {}}} { -width 10 -smooth 1 set msg [subst $S(message)] $w.c create text [Centroid $w I24] -text $msg -tag {I24 I24t} \ + -fill $::C(24c) \ -justify center -font {{Times Roman} 18 bold} return 1 } @@ -1619,6 +1620,7 @@ proc Move26 {w {step {}}} { if {$step >= 3} { $w.c delete I24 I26 $w.c create text 430 755 -anchor s -tag I26 \ + -fill $::C(26) \ -text "click to continue" -font {{Times Roman} 24 bold} bind $w.c [list Reset $w] return 4 diff --git a/mingw32/lib/tk8.6/demos/images/earth.gif b/mingw32/lib/tk8.6/demos/images/earth.gif index 2c229eb1101..d667244050d 100644 Binary files a/mingw32/lib/tk8.6/demos/images/earth.gif and b/mingw32/lib/tk8.6/demos/images/earth.gif differ diff --git a/mingw32/lib/tk8.6/demos/items.tcl b/mingw32/lib/tk8.6/demos/items.tcl index 1297046113f..19cd4f43133 100644 --- a/mingw32/lib/tk8.6/demos/items.tcl +++ b/mingw32/lib/tk8.6/demos/items.tcl @@ -32,7 +32,7 @@ canvas $c -scrollregion {0c 0c 30c 24c} -width 15c -height 10c \ -xscrollcommand "$w.frame.hscroll set" \ -yscrollcommand "$w.frame.vscroll set" ttk::scrollbar $w.frame.vscroll -command "$c yview" -ttk::scrollbar $w.frame.hscroll -orient horiz -command "$c xview" +ttk::scrollbar $w.frame.hscroll -orient horizontal -command "$c xview" grid $c -in $w.frame \ -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news diff --git a/mingw32/lib/tk8.6/demos/menu.tcl b/mingw32/lib/tk8.6/demos/menu.tcl index 244361d04a4..4f5d703fbb2 100644 --- a/mingw32/lib/tk8.6/demos/menu.tcl +++ b/mingw32/lib/tk8.6/demos/menu.tcl @@ -18,7 +18,6 @@ positionWindow $w label $w.msg -font $font -wraplength 4i -justify left if {[tk windowingsystem] eq "aqua"} { - catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1} $w.msg configure -text "This window has a menubar with cascaded menus. You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by selecting the first item in the menu." } else { $w.msg configure -text "This window contains a menubar with cascaded menus. You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu. You can then traverse among the menus using the arrow keys. When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character. If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu." @@ -56,7 +55,7 @@ menu $m -tearoff 0 $m add command -label "Long entry that does nothing" if {[tk windowingsystem] eq "aqua"} { set modifier Command -} elseif {[tk windowingsystem] == "win32"} { +} elseif {[tk windowingsystem] eq "win32"} { set modifier Control } else { set modifier Meta @@ -176,5 +175,3 @@ bind Menu <> { set menustatus $label update idletasks } - -if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}} diff --git a/mingw32/lib/tk8.6/demos/menubu.tcl b/mingw32/lib/tk8.6/demos/menubu.tcl index 96e3b15be2a..453b05c421c 100644 --- a/mingw32/lib/tk8.6/demos/menubu.tcl +++ b/mingw32/lib/tk8.6/demos/menubu.tcl @@ -18,7 +18,6 @@ positionWindow $w frame $w.body pack $w.body -expand 1 -fill both -if {[tk windowingsystem] eq "aqua"} {catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1}} menubutton $w.body.below -text "Below" -underline 0 -direction below -menu $w.body.below.m -relief raised menu $w.body.below.m -tearoff 0 @@ -86,5 +85,3 @@ foreach i {Black gray75 gray50 White} { } pack $body.buttons.colors -side left -padx 25 -pady 25 - -if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}} diff --git a/mingw32/lib/tk8.6/demos/puzzle.tcl b/mingw32/lib/tk8.6/demos/puzzle.tcl index eebe87a129a..f06de5d2aef 100644 --- a/mingw32/lib/tk8.6/demos/puzzle.tcl +++ b/mingw32/lib/tk8.6/demos/puzzle.tcl @@ -11,7 +11,7 @@ package require Tk # puzzleSwitch -- # This procedure is invoked when the user clicks on a particular button; -# if the button is next to the empty space, it moves the button into th +# if the button is next to the empty space, it moves the button into the # empty space. proc puzzleSwitch {w num} { diff --git a/mingw32/lib/tk8.6/entry.tcl b/mingw32/lib/tk8.6/entry.tcl index 6539af777df..4140c92f73f 100644 --- a/mingw32/lib/tk8.6/entry.tcl +++ b/mingw32/lib/tk8.6/entry.tcl @@ -211,6 +211,7 @@ bind Entry {# nothing} bind Entry {# nothing} if {[tk windowingsystem] eq "aqua"} { bind Entry {# nothing} + bind Entry {# nothing} } # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind Entry <> {# nothing} diff --git a/mingw32/lib/tk8.6/fontchooser.tcl b/mingw32/lib/tk8.6/fontchooser.tcl index fb6c6d3b264..27c8deffdcc 100644 --- a/mingw32/lib/tk8.6/fontchooser.tcl +++ b/mingw32/lib/tk8.6/fontchooser.tcl @@ -12,34 +12,48 @@ namespace eval ::tk::fontchooser { variable S set S(W) .__tk__fontchooser - set S(fonts) [lsort -dictionary [font families]] + set S(fonts) [lsort -dictionary -unique [font families]] set S(styles) [list \ - [::msgcat::mc "Regular"] \ - [::msgcat::mc "Italic"] \ - [::msgcat::mc "Bold"] \ - [::msgcat::mc "Bold Italic"] \ + [::msgcat::mc Regular] \ + [::msgcat::mc Italic] \ + [::msgcat::mc Bold] \ + [::msgcat::mc {Bold Italic}] \ ] - set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72} set S(strike) 0 set S(under) 0 set S(first) 1 - set S(sampletext) [::msgcat::mc "AaBbYyZz01"] set S(-parent) . - set S(-title) [::msgcat::mc "Font"] + set S(-title) {} set S(-command) "" set S(-font) TkDefaultFont + set S(bad) [list ] } -proc ::tk::fontchooser::Setup {} { +proc ::tk::fontchooser::Canonical {} { variable S + foreach style $S(styles) { + lappend S(styles,lcase) [string tolower $style] + } + set S(sizes,lcase) $S(sizes) + set S(sampletext) [::msgcat::mc "AaBbYyZz01"] + # Canonical versions of font families, styles, etc. for easier searching set S(fonts,lcase) {} - foreach font $S(fonts) {lappend S(fonts,lcase) [string tolower $font]} + foreach font $S(fonts) { + lappend S(fonts,lcase) [string tolower $font] + } set S(styles,lcase) {} - foreach style $S(styles) {lappend S(styles,lcase) [string tolower $style]} - set S(sizes,lcase) $S(sizes) + foreach style $S(styles) { + lappend S(styles,lcase) [string tolower $style] + } +} + +proc ::tk::fontchooser::Setup {} { + variable S + + Canonical ::ttk::style layout FontchooserFrame { Entry.field -sticky news -border true -children { @@ -47,8 +61,8 @@ proc ::tk::fontchooser::Setup {} { } } bind [winfo class .] <> \ - [list +ttk::style layout FontchooserFrame \ - [ttk::style layout FontchooserFrame]] + [list +ttk::style layout FontchooserFrame \ + [ttk::style layout FontchooserFrame]] namespace ensemble create -map { show ::tk::fontchooser::Show @@ -60,14 +74,24 @@ proc ::tk::fontchooser::Setup {} { proc ::tk::fontchooser::Show {} { variable S + + Canonical + if {![winfo exists $S(W)]} { Create wm transient $S(W) [winfo toplevel $S(-parent)] tk::PlaceWindow $S(W) widget $S(-parent) + if {[string trim $S(-title)] eq ""} { + wm title $S(W) [::msgcat::mc "Font"] + } else { + wm title $S(W) $S(-title) + } } - set S(fonts) [lsort -dictionary [font families]] + set S(fonts) [lsort -dictionary -unique [font families]] set S(fonts,lcase) {} - foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]} + foreach font $S(fonts) { + lappend S(fonts,lcase) [string tolower $font] + } wm deiconify $S(W) } @@ -91,10 +115,10 @@ proc ::tk::fontchooser::Configure {args} { foreach spec $specs { foreach {name xx yy default} $spec break lappend result $name \ - [expr {[info exists S($name)] ? $S($name) : $default}] + [expr {[info exists S($name)] ? $S($name) : $default}] } lappend result -visible \ - [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}] + [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}] return $result } if {[llength $args] == 1} { @@ -105,25 +129,32 @@ proc ::tk::fontchooser::Configure {args} { return $S($option) } return -code error -errorcode [list TK LOOKUP OPTION $option] \ - "bad option \"$option\": must be\ - -command, -font, -parent, -title or -visible" + "bad option \"$option\": must be\ + -command, -font, -parent, -title or -visible" } - set cache [dict create -parent $S(-parent) -title $S(-title) \ - -font $S(-font) -command $S(-command)] + -font $S(-font) -command $S(-command)] set r [tclParseConfigSpec [namespace which -variable S] $specs DONTSETDEFAULTS $args] if {![winfo exists $S(-parent)]} { - set code [list TK LOOKUP WINDOW $S(-parent)] + set code [list TK LOOKUP WINDOW $S(-parent)] set err "bad window path name \"$S(-parent)\"" array set S $cache return -code error -errorcode $code $err } - if {[string trim $S(-title)] eq ""} { - set S(-title) [::msgcat::mc "Font"] - } - if {[winfo exists $S(W)] && ("-font" in $args)} { - Init $S(-font) - event generate $S(-parent) <> + + if {[winfo exists $S(W)]} { + if {{-font} in $args} { + Init $S(-font) + event generate $S(-parent) <> + } + + if {[string trim $S(-title)] eq {}} { + wm title $S(W) [::msgcat::mc Font] + } else { + wm title $S(W) $S(-title) + } + $S(W).ok configure -state $S(nstate) + $S(W).apply configure -state $S(nstate) } return $r } @@ -140,7 +171,9 @@ proc ::tk::fontchooser::Create {} { # Now build the dialog if {![winfo exists $S(W)]} { toplevel $S(W) -class TkFontDialog - if {[package provide tcltest] ne {}} {set ::tk_dialog $S(W)} + if {[package provide tcltest] ne {}} { + set ::tk_dialog $S(W) + } wm withdraw $S(W) wm title $S(W) $S(-title) wm transient $S(W) [winfo toplevel $S(-parent)] @@ -153,40 +186,40 @@ proc ::tk::fontchooser::Create {} { ::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"] ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"] -width $sizeWidth ttk::entry $S(W).efont -width 18 \ - -textvariable [namespace which -variable S](font) + -textvariable [namespace which -variable S](font) ttk::entry $S(W).estyle -width 10 \ - -textvariable [namespace which -variable S](style) + -textvariable [namespace which -variable S](style) ttk::entry $S(W).esize -textvariable [namespace which -variable S](size) \ - -width 3 -validate key -validatecommand {string is double %P} + -width 3 -validate key -validatecommand {regexp -- {^-*[0-9]*$} %P} ttk_slistbox $S(W).lfonts -height 7 -exportselection 0 \ - -selectmode browse -activestyle none \ - -listvariable [namespace which -variable S](fonts) + -selectmode browse -activestyle none \ + -listvariable [namespace which -variable S](fonts) ttk_slistbox $S(W).lstyles -width 5 -height 7 -exportselection 0 \ - -selectmode browse -activestyle none \ - -listvariable [namespace which -variable S](styles) + -selectmode browse -activestyle none \ + -listvariable [namespace which -variable S](styles) ttk_slistbox $S(W).lsizes -width 4 -height 7 -exportselection 0 \ - -selectmode browse -activestyle none \ - -listvariable [namespace which -variable S](sizes) + -selectmode browse -activestyle none \ + -listvariable [namespace which -variable S](sizes) set WE $S(W).effects ::ttk::labelframe $WE -text [::msgcat::mc "Effects"] ::tk::AmpWidget ::ttk::checkbutton $WE.strike \ - -variable [namespace which -variable S](strike) \ - -text [::msgcat::mc "Stri&keout"] \ - -command [namespace code [list Click strike]] + -variable [namespace which -variable S](strike) \ + -text [::msgcat::mc "Stri&keout"] \ + -command [namespace code [list Click strike]] ::tk::AmpWidget ::ttk::checkbutton $WE.under \ - -variable [namespace which -variable S](under) \ - -text [::msgcat::mc "&Underline"] \ - -command [namespace code [list Click under]] + -variable [namespace which -variable S](under) \ + -text [::msgcat::mc "&Underline"] \ + -command [namespace code [list Click under]] set bbox [::ttk::frame $S(W).bbox] ::ttk::button $S(W).ok -text [::msgcat::mc OK] -default active\ - -command [namespace code [list Done 1]] + -command [namespace code [list Done 1]] ::ttk::button $S(W).cancel -text [::msgcat::mc Cancel] \ - -command [namespace code [list Done 0]] + -command [namespace code [list Done 0]] ::tk::AmpWidget ::ttk::button $S(W).apply -text [::msgcat::mc "&Apply"] \ - -command [namespace code [list Apply]] + -command [namespace code [list Apply]] wm protocol $S(W) WM_DELETE_WINDOW [namespace code [list Done 0]] # Calculate minimum sizes @@ -196,13 +229,15 @@ proc ::tk::fontchooser::Create {} { set minsize(gap) 10 set minsize(bbox) [winfo reqwidth $S(W).ok] set minsize(fonts) \ - [expr {[font measure TkDefaultFont "Helvetica"] + $scroll_width}] + [expr {[font measure TkDefaultFont "Helvetica"] + $scroll_width}] set minsize(styles) \ - [expr {[font measure TkDefaultFont "Bold Italic"] + $scroll_width}] + [expr {[font measure TkDefaultFont "Bold Italic"] + $scroll_width}] set minsize(sizes) \ - [expr {[font measure TkDefaultFont "-99"] + $scroll_width}] + [expr {[font measure TkDefaultFont "-99"] + $scroll_width}] set min [expr {$minsize(gap) * 4}] - foreach {what width} [array get minsize] {incr min $width} + foreach {what width} [array get minsize] { + incr min $width + } wm minsize $S(W) $min 260 bind $S(W) [namespace code [list Done 1]] @@ -224,7 +259,7 @@ proc ::tk::fontchooser::Create {} { set WS $S(W).sample ::ttk::labelframe $WS -text [::msgcat::mc "Sample"] ::ttk::label $WS.sample -relief sunken -anchor center \ - -textvariable [namespace which -variable S](sampletext) + -textvariable [namespace which -variable S](sampletext) set S(sample) $WS.sample grid $WS.sample -sticky news -padx 6 -pady 4 grid rowconfigure $WS 0 -weight 1 @@ -233,9 +268,7 @@ proc ::tk::fontchooser::Create {} { grid $S(W).ok -in $bbox -sticky new -pady {0 2} grid $S(W).cancel -in $bbox -sticky new -pady 2 - if {$S(-command) ne ""} { - grid $S(W).apply -in $bbox -sticky new -pady 2 - } + grid $S(W).apply -in $bbox -sticky new -pady 2 grid columnconfigure $bbox 0 -weight 1 grid $WE.strike -sticky w -padx 10 @@ -262,15 +295,19 @@ proc ::tk::fontchooser::Create {} { Init $S(-font) trace add variable [namespace which -variable S](size) \ - write [namespace code [list Tracer]] + write [namespace code [list Tracer]] trace add variable [namespace which -variable S](style) \ - write [namespace code [list Tracer]] + write [namespace code [list Tracer]] trace add variable [namespace which -variable S](font) \ - write [namespace code [list Tracer]] - } else { - Init $S(-font) + write [namespace code [list Tracer]] + trace add variable [namespace which -variable S](strike) \ + write [namespace code [list Tracer]] + trace add variable [namespace which -variable S](under) \ + write [namespace code [list Tracer]] } + Init $S(-font) + return } @@ -290,9 +327,14 @@ proc ::tk::fontchooser::Done {ok} { trace vdelete S(size) w [namespace code [list Tracer]] trace vdelete S(style) w [namespace code [list Tracer]] trace vdelete S(font) w [namespace code [list Tracer]] + trace vdelete S(strike) w [namespace code [list Tracer]] + trace vdelete S(under) w [namespace code [list Tracer]] destroy $S(W) - if {$ok && $S(-command) ne ""} { - uplevel #0 $S(-command) [list $S(result)] + if {$ok} { + if {$S(-command) ne ""} { + uplevel #0 $S(-command) [list $S(result)] + } + event generate $S(-parent) <> } } @@ -322,16 +364,17 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} { variable S if {$S(first) || $defaultFont ne ""} { + Canonical if {$defaultFont eq ""} { set defaultFont [[entry .___e] cget -font] destroy .___e } array set F [font actual $defaultFont] set S(font) $F(-family) + set S(style) [::msgcat::mc "Regular"] set S(size) $F(-size) set S(strike) $F(-overstrike) set S(under) $F(-underline) - set S(style) [::msgcat::mc "Regular"] if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} { set S(style) [::msgcat::mc "Bold Italic"] } elseif {$F(-weight) eq "bold"} { @@ -339,12 +382,8 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} { } elseif {$F(-slant) eq "italic"} { set S(style) [::msgcat::mc "Italic"] } - set S(first) 0 } - - Tracer a b c - Update } # ::tk::fontchooser::Click -- @@ -356,7 +395,6 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} { # proc ::tk::fontchooser::Click {who} { variable S - if {$who eq "font"} { set S(font) [$S(W).lfonts get [$S(W).lfonts curselection]] } elseif {$who eq "style"} { @@ -364,7 +402,6 @@ proc ::tk::fontchooser::Click {who} { } elseif {$who eq "size"} { set S(size) [$S(W).lsizes get [$S(W).lsizes curselection]] } - Update } # ::tk::fontchooser::Tracer -- @@ -376,32 +413,43 @@ proc ::tk::fontchooser::Click {who} { # proc ::tk::fontchooser::Tracer {var1 var2 op} { variable S - - set bad 0 - set nstate normal - # Make selection in each listbox - foreach var {font style size} { - set value [string tolower $S($var)] - $S(W).l${var}s selection clear 0 end - set n [lsearch -exact $S(${var}s,lcase) $value] - $S(W).l${var}s selection set $n + # We don't need to process strike and under + if {$var2 ni [list strike under]} { + # Make selection in listbox + set value [string tolower $S($var2)] + $S(W).l${var2}s selection clear 0 end + set n [lsearch -exact $S(${var2}s,lcase) $value] + $S(W).l${var2}s selection set $n if {$n >= 0} { - set S($var) [lindex $S(${var}s) $n] - $S(W).e$var icursor end - $S(W).e$var selection clear - } else { ;# No match, try prefix - # Size is weird: valid numbers are legal but don't display - # unless in the font size list - set n [lsearch -glob $S(${var}s,lcase) "$value*"] - set bad 1 - if {$var ne "size" || ! [string is double -strict $value]} { - set nstate disabled + set S($var2) [lindex $S(${var2}s) $n] + $S(W).e$var2 icursor end + $S(W).e$var2 selection clear + if {[set i [lsearch $S(bad) $var2]] >= 0} { + set S(bad) [lreplace $S(bad) $i $i] + } + } else { + # No match, try prefix + set n [lsearch -glob $S(${var2}s,lcase) "$value*"] + if {$var2 ne "size" || !([regexp -- {^(-[0-9]+|[0-9]+)$} $value] && $value >= -4096 && $value <= 4096)} { + if {[lsearch $S(bad) $var2] < 0} { + lappend S(bad) $var2 + } + } else { + if {[set i [lsearch $S(bad) $var2]] >= 0} { + set S(bad) [lreplace $S(bad) $i $i] + } } } - $S(W).l${var}s see $n + $S(W).l${var2}s see $n + } + if {[llength $S(bad)] == 0} { + set S(nstate) normal + Update + } else { + set S(nstate) disabled } - if {!$bad} {Update} - $S(W).ok configure -state $nstate + $S(W).ok configure -state $S(nstate) + $S(W).apply configure -state $S(nstate) } # ::tk::fontchooser::Update -- @@ -412,13 +460,24 @@ proc ::tk::fontchooser::Update {} { variable S set S(result) [list $S(font) $S(size)] - if {$S(style) eq [::msgcat::mc "Bold"]} {lappend S(result) bold} - if {$S(style) eq [::msgcat::mc "Italic"]} {lappend S(result) italic} - if {$S(style) eq [::msgcat::mc "Bold Italic"]} {lappend S(result) bold italic} - if {$S(strike)} {lappend S(result) overstrike} - if {$S(under)} {lappend S(result) underline} + if {$S(style) eq [::msgcat::mc "Bold"]} { + lappend S(result) bold + } + if {$S(style) eq [::msgcat::mc "Italic"]} { + lappend S(result) italic + } + if {$S(style) eq [::msgcat::mc "Bold Italic"]} { + lappend S(result) bold italic + } + if {$S(strike)} { + lappend S(result) overstrike + } + if {$S(under)} { + lappend S(result) underline + } $S(sample) configure -font $S(result) + set S(-font) $S(result) } # ::tk::fontchooser::Visibility -- @@ -432,7 +491,7 @@ proc ::tk::fontchooser::Visibility {w visible} { } } -# ::tk::fontchooser::ttk_listbox -- +# ::tk::fontchooser::ttk_slistbox -- # # Create a properly themed scrolled listbox. # This is exactly right on XP but may need adjusting on other platforms. diff --git a/mingw32/lib/tk8.6/iconlist.tcl b/mingw32/lib/tk8.6/iconlist.tcl index 34b19d02662..6f46ba4f67f 100644 --- a/mingw32/lib/tk8.6/iconlist.tcl +++ b/mingw32/lib/tk8.6/iconlist.tcl @@ -338,8 +338,8 @@ package require Tk set i_dy [expr {($dy - $iH)/2}] set t_dy [expr {($dy - $tH)/2}] - $canvas coords $iTag $x [expr {$y + $i_dy}] - $canvas coords $tTag [expr {$x + $shift}] [expr {$y + $t_dy}] + $canvas coords $iTag $x [expr {$y + $i_dy}] + $canvas coords $tTag [expr {$x + $shift}] [expr {$y + $t_dy}] $canvas coords $rTag $x $y [expr {$x+$dx}] [expr {$y+$dy}] incr y $dy @@ -433,11 +433,11 @@ package require Tk # bind $canvas [namespace code {my WhenIdle Arrange}] - bind $canvas <1> [namespace code {my Btn1 %x %y}] + bind $canvas [namespace code {my Btn1 %x %y}] bind $canvas [namespace code {my Motion1 %x %y}] bind $canvas [namespace code {my Leave1 %x %y}] - bind $canvas [namespace code {my CtrlBtn1 %x %y}] - bind $canvas [namespace code {my ShiftBtn1 %x %y}] + bind $canvas [namespace code {my CtrlBtn1 %x %y}] + bind $canvas [namespace code {my ShiftBtn1 %x %y}] bind $canvas [list tk::CancelRepeat] bind $canvas [list tk::CancelRepeat] bind $canvas \ @@ -449,12 +449,14 @@ package require Tk if {[tk windowingsystem] eq "aqua"} { bind $canvas [namespace code {my MouseWheel [expr {40 * (%D)}]}] bind $canvas [namespace code {my MouseWheel [expr {400 * (%D)}]}] + bind $canvas {# nothing} + bind $canvas {# nothing} } else { bind $canvas [namespace code {my MouseWheel %D}] } if {[tk windowingsystem] eq "x11"} { - bind $canvas [namespace code {my MouseWheel 120}] - bind $canvas [namespace code {my MouseWheel -120}] + bind $canvas [namespace code {my MouseWheel 120}] + bind $canvas [namespace code {my MouseWheel -120}] } bind $canvas <> [namespace code {my UpDown -1}] @@ -462,9 +464,10 @@ package require Tk bind $canvas <> [namespace code {my LeftRight -1}] bind $canvas <> [namespace code {my LeftRight 1}] bind $canvas [namespace code {my ReturnKey}] - bind $canvas [namespace code {my KeyPress %A}] - bind $canvas ";" - bind $canvas ";" + bind $canvas [namespace code {my KeyPress %A}] + bind $canvas {# nothing} + bind $canvas {# nothing} + bind $canvas {# nothing} bind $canvas [namespace code {my FocusIn}] bind $canvas [namespace code {my FocusOut}] diff --git a/mingw32/lib/tk8.6/menu.tcl b/mingw32/lib/tk8.6/menu.tcl index 823fd693234..deca4858e42 100644 --- a/mingw32/lib/tk8.6/menu.tcl +++ b/mingw32/lib/tk8.6/menu.tcl @@ -168,7 +168,7 @@ bind Menu <> { bind Menu <> { tk::MenuDownArrow %W } -bind Menu { +bind Menu { tk::TraverseWithinMenu %W %A break } @@ -177,7 +177,7 @@ bind Menu { # implement keyboard menu traversal. if {[tk windowingsystem] eq "x11"} { - bind all { + bind all { tk::TraverseToMenu %W %A } @@ -185,7 +185,7 @@ if {[tk windowingsystem] eq "x11"} { tk::FirstMenu %W } } else { - bind Menubutton { + bind Menubutton { tk::TraverseToMenu %W %A } @@ -285,7 +285,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { GenerateMenuSelect $menu update idletasks - if {[catch {PostMenubuttonMenu $w $menu} msg opt]} { + if {[catch {PostMenubuttonMenu $w $menu $x $y} msg opt]} { # Error posting menu (e.g. bogus -postcommand). Unpost it and # reflect the error. MenuUnpost {} @@ -1138,7 +1138,7 @@ proc ::tk::MenuFindName {menu s} { # side. On other platforms the entry is centered over the button. if {[tk windowingsystem] eq "aqua"} { - proc ::tk::PostMenubuttonMenu {button menu} { + proc ::tk::PostMenubuttonMenu {button menu cx cy} { set entry "" if {[$button cget -indicatoron]} { set entry [MenuFindName $menu [$button cget -text]] @@ -1163,14 +1163,14 @@ if {[tk windowingsystem] eq "aqua"} { right { incr x [winfo width $button] } - default { + default { # flush incr x [expr {[winfo width $button] - [winfo reqwidth $menu] - 5}] } } PostOverPoint $menu $x $y $entry } } else { - proc ::tk::PostMenubuttonMenu {button menu} { + proc ::tk::PostMenubuttonMenu {button menu cx cy} { set entry "" if {[$button cget -indicatoron]} { set entry [MenuFindName $menu [$button cget -text]] @@ -1201,22 +1201,24 @@ if {[tk windowingsystem] eq "aqua"} { set entry {} } left { - # It is not clear why this is needed. - if {[tk windowingsystem] eq "win32"} { - incr x [expr {-4 - [winfo reqwidth $button] / 2}] - } incr x [expr {- [winfo reqwidth $menu]}] } right { incr x [expr {[winfo width $button]}] } - default { - if {[$button cget -indicatoron]} { - incr x [expr {([winfo width $button] - \ - [winfo reqwidth $menu])/ 2}] - } else { - incr y [winfo height $button] - } + default { # flush + if {[$button cget -indicatoron]} { + if {$cx ne ""} { + set x [expr {$cx - [winfo reqwidth $menu] / 2}] + set l [font metrics [$menu cget -font] -linespace] + set y [expr {$cy - $l/2 - 2}] + } else { + incr x [expr {([winfo width $button] - \ + [winfo reqwidth $menu])/ 2}] + } + } else { + incr y [winfo height $button] + } } } PostOverPoint $menu $x $y $entry @@ -1242,7 +1244,8 @@ if {[tk windowingsystem] ne "win32"} { proc ::tk::PostOverPoint {menu x y {entry {}}} { if {$entry ne ""} { $menu post $x $y $entry - if {[$menu entrycget $entry -state] ne "disabled"} { + if {[$menu type $entry] ni {separator tearoff} && + [$menu entrycget $entry -state] ne "disabled"} { $menu activate $entry GenerateMenuSelect $menu } diff --git a/mingw32/lib/tk8.6/msgs/eo.msg b/mingw32/lib/tk8.6/msgs/eo.msg index 3645630b1ff..a096b622fc8 100644 --- a/mingw32/lib/tk8.6/msgs/eo.msg +++ b/mingw32/lib/tk8.6/msgs/eo.msg @@ -1,20 +1,20 @@ namespace eval ::tk { - ::msgcat::mcset eo "&Abort" "&\u0108esigo" + ::msgcat::mcset eo "&Abort" "&\u0108esigu" ::msgcat::mcset eo "&About..." "Pri..." - ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj" - ::msgcat::mcset eo "Application Error" "Aplikoerraro" + ::msgcat::mcset eo "All Files" "\u0108iuj dosieroj" + ::msgcat::mcset eo "Application Error" "Aplikoeraro" ::msgcat::mcset eo "&Blue" "&Blua" ::msgcat::mcset eo "Cancel" "Rezignu" ::msgcat::mcset eo "&Cancel" "&Rezignu" - ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion." - ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo" - ::msgcat::mcset eo "Cl&ear" "&Klaru" - ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon" - ::msgcat::mcset eo "Color" "Farbo" + ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u015dan\u011di al dosierujo \"%1\$s\".\nVi ne rajtas tion." + ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujon" + ::msgcat::mcset eo "Cl&ear" "&Vakigu" + ::msgcat::mcset eo "&Clear Console" "&Vakigu konzolon" + ::msgcat::mcset eo "Color" "Koloro" ::msgcat::mcset eo "Console" "Konzolo" ::msgcat::mcset eo "&Copy" "&Kopiu" - ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu" - ::msgcat::mcset eo "&Delete" "&Forprenu" + ::msgcat::mcset eo "Cu&t" "&Eltondu" + ::msgcat::mcset eo "&Delete" "&Forigu" ::msgcat::mcset eo "Details >>" "Detaloj >>" ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas." ::msgcat::mcset eo "&Directory:" "&Dosierujo:" @@ -22,12 +22,12 @@ namespace eval ::tk { ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s" ::msgcat::mcset eo "E&xit" "&Eliru" ::msgcat::mcset eo "&File" "&Dosiero" - ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?" - ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n" - ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas." + ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u016digi la dosieron?" + ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam ekzistas. \n\n" + ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosiero \"%1\$s\" ne ekzistas." ::msgcat::mcset eo "File &name:" "Dosiero&nomo:" ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:" - ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:" + ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Tipo:" ::msgcat::mcset eo "Fi&les:" "Do&sieroj:" ::msgcat::mcset eo "&Filter" "&Filtrilo" ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:" @@ -37,39 +37,39 @@ namespace eval ::tk { ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon" ::msgcat::mcset eo "&Ignore" "&Ignoru" ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"." - ::msgcat::mcset eo "Log Files" "Protokolo" + ::msgcat::mcset eo "Log Files" "Protokolaj dosieroj" ::msgcat::mcset eo "&No" "&Ne" - ::msgcat::mcset eo "&OK" - ::msgcat::mcset eo "OK" - ::msgcat::mcset eo "Ok" + ::msgcat::mcset eo "&OK" "&Bone" + ::msgcat::mcset eo "OK" "Bone" + ::msgcat::mcset eo "Ok" "Bone" ::msgcat::mcset eo "Open" "Malfermu" ::msgcat::mcset eo "&Open" "&Malfermu" - ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn" - ::msgcat::mcset eo "P&aste" "&Elpo\u015digi" - ::msgcat::mcset eo "&Quit" "&Finigu" - ::msgcat::mcset eo "&Red" "&Rosa" - ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?" - ::msgcat::mcset eo "&Retry" "&Ripetu" - ::msgcat::mcset eo "&Save" "&Savu" - ::msgcat::mcset eo "Save As" "Savu kiel" - ::msgcat::mcset eo "Save To Log" "Savu en protokolon" + ::msgcat::mcset eo "Open Multiple Files" "Malfermu plurajn dosierojn" + ::msgcat::mcset eo "P&aste" "&Algluu" + ::msgcat::mcset eo "&Quit" "&Forlasu" + ::msgcat::mcset eo "&Red" "&Ru\u011da" + ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u016digi ekzistantan dosieron?" + ::msgcat::mcset eo "&Retry" "&Reprovu" + ::msgcat::mcset eo "&Save" "&Konservu" + ::msgcat::mcset eo "Save As" "Konservu kiel" + ::msgcat::mcset eo "Save To Log" "Konservu en protokolon" ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron" ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti" ::msgcat::mcset eo "&Selection:" "&Elekto:" - ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn" + ::msgcat::mcset eo "Skip Messages" "transsaltu mesa\u011dojn" ::msgcat::mcset eo "&Source..." "&Fontoprogramo..." ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj" - ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso" - ::msgcat::mcset eo "Text Files" "Tekstodosierojn" + ::msgcat::mcset eo "Tcl for Windows" "Tcl por Vindozo" + ::msgcat::mcset eo "Text Files" "Tekstodosieroj" ::msgcat::mcset eo "&Yes" "&Jes" - ::msgcat::mcset eo "abort" "\u0109esigo" + ::msgcat::mcset eo "abort" "\u0109esigu" ::msgcat::mcset eo "blue" "blua" ::msgcat::mcset eo "cancel" "rezignu" - ::msgcat::mcset eo "extension" "ekspansio" - ::msgcat::mcset eo "extensions" "ekspansioj" + ::msgcat::mcset eo "extension" "kromprogramo" + ::msgcat::mcset eo "extensions" "kromprogramoj" ::msgcat::mcset eo "green" "verda" - ::msgcat::mcset eo "ignore" "ignorieren" + ::msgcat::mcset eo "ignore" "ignoru" ::msgcat::mcset eo "red" "ru\u011da" - ::msgcat::mcset eo "retry" "ripetu" + ::msgcat::mcset eo "retry" "reprovu" ::msgcat::mcset eo "yes" "jes" } diff --git a/mingw32/lib/tk8.6/msgs/fi.msg b/mingw32/lib/tk8.6/msgs/fi.msg new file mode 100644 index 00000000000..e014cce6ba4 --- /dev/null +++ b/mingw32/lib/tk8.6/msgs/fi.msg @@ -0,0 +1,89 @@ +namespace eval ::tk { + ::msgcat::mcset fi "&Abort" "&Keskeyt\u00e4" + ::msgcat::mcset fi "&About..." "&Tietoja..." + ::msgcat::mcset fi "All Files" "Kaikki tiedostot" + ::msgcat::mcset fi "Application Error" "Ohjelmavirhe" + ::msgcat::mcset fi "&Apply" "K\u00e4&yt\u00e4" + ::msgcat::mcset fi "Bold" "Lihavoitu" + ::msgcat::mcset fi "Bold Italic" "Lihavoitu, kursivoitu" + ::msgcat::mcset fi "&Blue" "&Sininen" + ::msgcat::mcset fi "Cancel" "Peruuta" + ::msgcat::mcset fi "&Cancel" "&Peruuta" + ::msgcat::mcset fi "Cannot change to the directory \"%1\$s\".\nPermission denied." "Ei voitu vaihtaa hakemistoon \"%1\$s\".\nLupa ev\u00e4tty." + ::msgcat::mcset fi "Choose Directory" "Valitse hakemisto" + ::msgcat::mcset fi "Cl&ear" "&Tyhjenn\u00e4" + ::msgcat::mcset fi "&Clear Console" "&Tyhjenn\u00e4 konsoli" + ::msgcat::mcset fi "Color" "V\u00e4ri" + ::msgcat::mcset fi "Console" "Konsoli" + ::msgcat::mcset fi "&Copy" "K&opioi" + ::msgcat::mcset fi "Cu&t" "&Leikkaa" + ::msgcat::mcset fi "&Delete" "&Poista" + ::msgcat::mcset fi "Details >>" "Lis\u00e4tiedot >>" + ::msgcat::mcset fi "Directory \"%1\$s\" does not exist." "Hakemistoa \"%1\$s\" ei ole olemassa." + ::msgcat::mcset fi "&Directory:" "&Hakemisto:" + ::msgcat::mcset fi "&Edit" "&Muokkaa" + ::msgcat::mcset fi "Effects" "Tehosteet" + ::msgcat::mcset fi "Error: %1\$s" "Virhe: %1\$s" + ::msgcat::mcset fi "E&xit" "&Lopeta" + ::msgcat::mcset fi "&File" "&Tiedosto" + ::msgcat::mcset fi "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Tiedosto \"%1\$s\" on jo olemassa.\nHaluatko korvata sen?" + ::msgcat::mcset fi "File \"%1\$s\" already exists.\n\n" "Tiedosto \"%1\$s\" on jo olemassa.\n\n" + ::msgcat::mcset fi "File \"%1\$s\" does not exist." "Tiedostoa \"%1\$s\" ei ole olemassa." + ::msgcat::mcset fi "File &name:" "Tiedosto&nimi:" + ::msgcat::mcset fi "File &names:" "Tiedosto&nimet:" + ::msgcat::mcset fi "Files of &type:" "T&yyppi:" + ::msgcat::mcset fi "Fi&les:" "Ti&edostot:" + ::msgcat::mcset fi "&Filter" "&Suodata" + ::msgcat::mcset fi "Fil&ter:" "Suo&data:" + ::msgcat::mcset fi "Font" "Kirjasin" + ::msgcat::mcset fi "&Font:" "&Kirjasin:" + ::msgcat::mcset fi "Font st&yle:" "Kirjasint&yyli:" + ::msgcat::mcset fi "&Green" "&Vihre\u00e4" + ::msgcat::mcset fi "&Help" "&Ohje" + ::msgcat::mcset fi "Hi" "Hei" + ::msgcat::mcset fi "&Hide Console" "P&iilota konsoli" + ::msgcat::mcset fi "&Ignore" "&Ohita" + ::msgcat::mcset fi "Invalid file name \"%1\$s\"." "Virheellinen tiedostonimi \"%1\$s\"." + ::msgcat::mcset fi "Italic" "Kursivoitu" + ::msgcat::mcset fi "Log Files" "Lokitiedostot" + ::msgcat::mcset fi "&No" "&Ei" + ::msgcat::mcset fi "&OK" + ::msgcat::mcset fi "OK" + ::msgcat::mcset fi "Ok" "OK" + ::msgcat::mcset fi "Open" "Avaa" + ::msgcat::mcset fi "&Open" "&Avaa" + ::msgcat::mcset fi "Open Multiple Files" "Avaa monta tiedostoa" + ::msgcat::mcset fi "P&aste" "L&iit\u00e4" + ::msgcat::mcset fi "&Quit" "&Lopeta" + ::msgcat::mcset fi "&Red" "&Punainen" + ::msgcat::mcset fi "Regular" "Tavallinen" + ::msgcat::mcset fi "Replace existing file?" "Korvataanko olemassaoleva tiedosto?" + ::msgcat::mcset fi "&Retry" "&Yrit\u00e4 uudelleen" + ::msgcat::mcset fi "Sample" "Malli" + ::msgcat::mcset fi "&Save" "&Tallenna" + ::msgcat::mcset fi "Save As" "Tallenna nimell\u00e4" + ::msgcat::mcset fi "Save To Log" "Tallenna lokiin" + ::msgcat::mcset fi "Select Log File" "Valitse lokitiedosto" + ::msgcat::mcset fi "Select a file to source" "Valitse l\u00e4hdetiedosto" + ::msgcat::mcset fi "&Selection:" "&Valinta:" + ::msgcat::mcset fi "&Size:" "K&oko:" + ::msgcat::mcset fi "Skip Messages" "J\u00e4t\u00e4 viestit huomiotta" + ::msgcat::mcset fi "&Source..." "L&\u00e4hde..." + ::msgcat::mcset fi "Stri&keout" "&Yliviivaa" + ::msgcat::mcset fi "Tcl Scripts" "Tcl-skriptit" + ::msgcat::mcset fi "Tcl for Windows" "Tcl Windowsille" + ::msgcat::mcset fi "Text Files" "Tekstitiedostot" + ::msgcat::mcset fi "&Underline" "&Alleviivaa" + ::msgcat::mcset fi "&Yes" "&Kyll\u00e4" + ::msgcat::mcset fi "abort" "keskeyt\u00e4" + ::msgcat::mcset fi "blue" "sininen" + ::msgcat::mcset fi "cancel" "peruuta" + ::msgcat::mcset fi "extension" "lis\u00e4osa" + ::msgcat::mcset fi "extensions" "lis\u00e4osat" + ::msgcat::mcset fi "green" "vihre\u00e4" + ::msgcat::mcset fi "ignore" "ohita" + ::msgcat::mcset fi "ok" + ::msgcat::mcset fi "red" "punainen" + ::msgcat::mcset fi "retry" "yrit\u00e4 uudelleen" + ::msgcat::mcset fi "yes" "kyll\u00e4" +} diff --git a/mingw32/lib/tk8.6/msgs/ru.msg b/mingw32/lib/tk8.6/msgs/ru.msg index 2aac5bbf40f..d7ad8b14fbf 100644 --- a/mingw32/lib/tk8.6/msgs/ru.msg +++ b/mingw32/lib/tk8.6/msgs/ru.msg @@ -3,13 +3,17 @@ namespace eval ::tk { ::msgcat::mcset ru "&About..." "\u041f\u0440\u043e..." ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b" ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435" + ::msgcat::mcset ru "&Apply" "&\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c" + ::msgcat::mcset ru "Bold" "Bold" + ::msgcat::mcset ru "Bold Italic" "Bold Italic" ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439" - ::msgcat::mcset ru "Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430" + ::msgcat::mcset ru "Cancel" "\u041e\u0442\u043c\u0435\u043d\u0430" ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430" ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \ "\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430" ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433" ::msgcat::mcset ru "Cl&ear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c" + ::msgcat::mcset ru "&Clear Console" "&Clear Console" ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442" ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c" ::msgcat::mcset ru "&Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c" @@ -18,8 +22,11 @@ namespace eval ::tk { ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>" ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442." ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:" + ::msgcat::mcset ru "&Edit" "&Edit" + ::msgcat::mcset ru "Effects" "\u042d\u0444\u0444\u0435\u043a\u0442\u044b" ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s" ::msgcat::mcset ru "E&xit" "\u0412\u044b\u0445\u043e\u0434" + ::msgcat::mcset ru "&File" "&File" ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \ "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?" ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n" @@ -30,11 +37,16 @@ namespace eval ::tk { ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:" ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440" ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:" + ::msgcat::mcset ru "Font" "\u0428\u0440\u0438\u0444\u0442" + ::msgcat::mcset ru "&Font:" "&\u0428\u0440\u0438\u0444\u0442" + ::msgcat::mcset ru "Font st&yle:" "&\u0421\u0442\u0438\u043b\u044c \u0448\u0440\u0438\u0444\u0442\u0430:" ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439" + ::msgcat::mcset ru "&Help" "&Help" ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442" ::msgcat::mcset ru "&Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c" ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c" ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"." + ::msgcat::mcset ru "Italic" "Italic" ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430" ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442" ::msgcat::mcset ru "&OK" "&\u041e\u041a" @@ -46,19 +58,26 @@ namespace eval ::tk { ::msgcat::mcset ru "P&aste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c" ::msgcat::mcset ru "&Quit" "\u0412\u044b\u0445\u043e\u0434" ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439" + ::msgcat::mcset ru "Regular" "Regular" ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?" ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c" + ::msgcat::mcset ru "Sample" "\u041f\u0440\u0438\u043c\u0435\u0440" ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c" ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a" ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b" ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b" ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438" - ::msgcat::mcset ru "&Selection:" + ::msgcat::mcset ru "&Selection:" "&Selection:" + ::msgcat::mcset ru "&Size:" "&\u0420\u0430\u0437\u043c\u0435\u0440:" + ::msgcat::mcset ru "Show &Hidden Directories" "Show &Hidden Directories" + ::msgcat::mcset ru "Show &Hidden Files and Directories" "Show &Hidden Files and Directories" ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f" ::msgcat::mcset ru "&Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..." + ::msgcat::mcset ru "Stri&keout" "\u041f&\u0435\u0440\u0435\u0447\u0451\u0440\u043a\u043d\u0443\u0442\u044b\u0439" ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL" ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows" ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b" + ::msgcat::mcset ru "&Underline" "\u041f\u043e&\u0434\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439" ::msgcat::mcset ru "&Yes" "&\u0414\u0430" ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430" ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439" @@ -72,4 +91,3 @@ namespace eval ::tk { ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c" ::msgcat::mcset ru "yes" "\u0434\u0430" } - diff --git a/mingw32/lib/tk8.6/msgs/zh_cn.msg b/mingw32/lib/tk8.6/msgs/zh_cn.msg new file mode 100644 index 00000000000..9a728b7b212 --- /dev/null +++ b/mingw32/lib/tk8.6/msgs/zh_cn.msg @@ -0,0 +1,92 @@ +namespace eval ::tk { + ::msgcat::mcset zh_cn "&Abort" "&中止" + ::msgcat::mcset zh_cn "&About..." "&关于……" + ::msgcat::mcset zh_cn "All Files" "所有文件" + ::msgcat::mcset zh_cn "Application Error" "应用程序错误" + ::msgcat::mcset zh_cn "&Apply" "&添加" + ::msgcat::mcset zh_cn "Bold" "粗体" + ::msgcat::mcset zh_cn "Bold Italic" "加粗斜体" + ::msgcat::mcset zh_cn "&Blue" "&蓝色" + ::msgcat::mcset zh_cn "Cancel" "取消" + ::msgcat::mcset zh_cn "&Cancel" "&取消" + ::msgcat::mcset zh_cn "Cannot change to the directory \"%1\$s\".\nPermission denied." "无法更改目录 \"%1\$s\"。\n访问被拒绝。" + ::msgcat::mcset zh_cn "Choose Directory" "选择文件夹" + ::msgcat::mcset zh_cn "Cl&ear" "清&除" + ::msgcat::mcset zh_cn "&Clear Console" "&清除终端" + ::msgcat::mcset zh_cn "Color" "颜色" + ::msgcat::mcset zh_cn "Console" "终端" + ::msgcat::mcset zh_cn "&Copy" "&复制" + ::msgcat::mcset zh_cn "Cu&t" "剪&切" + ::msgcat::mcset zh_cn "&Delete" "&删除" + ::msgcat::mcset zh_cn "Details >>" "详细信息 >>" + ::msgcat::mcset zh_cn "Directory \"%1\$s\" does not exist." "目录 \"%1\$s\" 不存在。" + ::msgcat::mcset zh_cn "&Directory:" "&目录：" + ::msgcat::mcset zh_cn "&Edit" "&编辑" + ::msgcat::mcset zh_cn "Effects" "效果" + ::msgcat::mcset zh_cn "Error: %1\$s" "错误： %1\$s" + ::msgcat::mcset zh_cn "E&xit" "退&出" + ::msgcat::mcset zh_cn "&File" "&文件" + ::msgcat::mcset zh_cn "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "文件 \"%1\$s\" 已经存在。\n您想要覆盖它吗？" + ::msgcat::mcset zh_cn "File \"%1\$s\" already exists.\n\n" "文件 \"%1\$s\" 已经存在。\n\n" + ::msgcat::mcset zh_cn "File \"%1\$s\" does not exist." "文件 \"%1\$s\" 不存在。" + ::msgcat::mcset zh_cn "File &name:" "文件&名：" + ::msgcat::mcset zh_cn "File &names:" "文件&名：" + ::msgcat::mcset zh_cn "Files of &type:" "文件&类型：" + ::msgcat::mcset zh_cn "Fi&les:" "文&件：" + ::msgcat::mcset zh_cn "&Filter" "&过滤" + ::msgcat::mcset zh_cn "Fil&ter:" "过&滤：" + ::msgcat::mcset zh_cn "Font" "字体" + ::msgcat::mcset zh_cn "&Font:" "&字体：" + ::msgcat::mcset zh_cn "Font st&yle:" "字体&样式：" + ::msgcat::mcset zh_cn "&Green" "&绿色" + ::msgcat::mcset zh_cn "&Help" "&帮助" + ::msgcat::mcset zh_cn "Hi" "你好" + ::msgcat::mcset zh_cn "&Hide Console" "&隐藏终端" + ::msgcat::mcset zh_cn "&Ignore" "&忽略" + ::msgcat::mcset zh_cn "Invalid file name \"%1\$s\"." "无效的文件名 \"%1\$s\"。" + ::msgcat::mcset zh_cn "Italic" "斜体" + ::msgcat::mcset zh_cn "Log Files" "日志文件" + ::msgcat::mcset zh_cn "&No" "&取消" + ::msgcat::mcset zh_cn "&OK" "&确定" + ::msgcat::mcset zh_cn "OK" "确定" + ::msgcat::mcset zh_cn "Ok" "确定" + ::msgcat::mcset zh_cn "Open" "打开" + ::msgcat::mcset zh_cn "&Open" "&打开" + ::msgcat::mcset zh_cn "Open Multiple Files" "打开多个文件" + ::msgcat::mcset zh_cn "P&aste" "粘&贴" + ::msgcat::mcset zh_cn "&Quit" "&退出" + ::msgcat::mcset zh_cn "&Red" "红色" + ::msgcat::mcset zh_cn "Regular" "规则" + ::msgcat::mcset zh_cn "Replace existing file?" "替换已有文件？" + ::msgcat::mcset zh_cn "&Retry" "&重试" + ::msgcat::mcset zh_cn "Sample" "样式" + ::msgcat::mcset zh_cn "&Save" "&保存" + ::msgcat::mcset zh_cn "Save As" "另存为" + ::msgcat::mcset zh_cn "Save To Log" "保存到日志" + ::msgcat::mcset zh_cn "Select Log File" "选择日志文件" + ::msgcat::mcset zh_cn "Select a file to source" "选择一个源文件" + ::msgcat::mcset zh_cn "&Selection:" "&选择：" + ::msgcat::mcset zh_cn "&Size:" "&大小：" + ::msgcat::mcset zh_cn "Show &Hidden Directories" "显示&隐藏目录" + ::msgcat::mcset zh_cn "Show &Hidden Files and Directories" "显示&隐藏文件和目录" + ::msgcat::mcset zh_cn "Skip Messages" "跳过信息" + ::msgcat::mcset zh_cn "&Source..." "&来源……" + ::msgcat::mcset zh_cn "Stri&keout" "删&除线" + ::msgcat::mcset zh_cn "Tcl Scripts" "Tcl脚本" + ::msgcat::mcset zh_cn "Tcl for Windows" "适用于Windows的Tcl" + ::msgcat::mcset zh_cn "Text Files" "文本文档" + ::msgcat::mcset zh_cn "&Underline" "&下划线" + ::msgcat::mcset zh_cn "&Yes" "&确定" + ::msgcat::mcset zh_cn "abort" "中止" + ::msgcat::mcset zh_cn "blue" "蓝色" + ::msgcat::mcset zh_cn "cancel" "取消" + ::msgcat::mcset zh_cn "extension" "拓展" + ::msgcat::mcset zh_cn "extensions" "拓展" + ::msgcat::mcset zh_cn "green" "绿色" + ::msgcat::mcset zh_cn "ignore" "忽略" + ::msgcat::mcset zh_cn "ok" "确定" + ::msgcat::mcset zh_cn "red" "红色" + ::msgcat::mcset zh_cn "retry" "重试" + ::msgcat::mcset zh_cn "yes" "确认" +} + diff --git a/mingw32/lib/tk8.6/pkgIndex.tcl b/mingw32/lib/tk8.6/pkgIndex.tcl index 0e4a3e37ed3..5c7dfbf946c 100644 --- a/mingw32/lib/tk8.6/pkgIndex.tcl +++ b/mingw32/lib/tk8.6/pkgIndex.tcl @@ -1,7 +1,7 @@ if {![package vsatisfies [package provide Tcl] 8.6.0]} return if {($::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)] || ([info exists ::argv] && ("-display" in $::argv)))} { - package ifneeded Tk 8.6.12 [list load [file normalize [file join $dir .. .. bin libtk8.6.dll]]] + package ifneeded Tk 8.6.13 [list load [file normalize [file join $dir .. .. bin libtk8.6.dll]]] } else { - package ifneeded Tk 8.6.12 [list load [file normalize [file join $dir .. .. bin tk86.dll]]] + package ifneeded Tk 8.6.13 [list load [file normalize [file join $dir .. .. bin tk86.dll]]] } diff --git a/mingw32/lib/tk8.6/scale.tcl b/mingw32/lib/tk8.6/scale.tcl index fb9b81b26b0..466a3ce6aad 100644 --- a/mingw32/lib/tk8.6/scale.tcl +++ b/mingw32/lib/tk8.6/scale.tcl @@ -210,7 +210,20 @@ proc ::tk::ScaleEndDrag {w} { proc ::tk::ScaleIncrement {w dir big repeat} { variable ::tk::Priv + if {![winfo exists $w]} return + + # give the cancel callback a chance to be serviced if the execution time of + # the -command script lasts longer than -repeatdelay + set clockms [clock milliseconds] + if {$repeat eq "again" && + [expr {$clockms - $Priv(clockms)}] > [expr {[$w cget -repeatinterval] * 1.1}]} { + set Priv(clockms) $clockms + set Priv(afterId) [after [$w cget -repeatinterval] \ + [list tk::ScaleIncrement $w $dir $big again]] + return + } + if {$big eq "big"} { set inc [$w cget -bigincrement] if {$inc == 0} { @@ -231,14 +244,18 @@ proc ::tk::ScaleIncrement {w dir big repeat} { set inc [expr {-$inc}] } } + # this will run the -command script (if any) during the redrawing + # of the scale at idle time $w set [expr {[$w get] + $inc}] if {$repeat eq "again"} { + set Priv(clockms) $clockms set Priv(afterId) [after [$w cget -repeatinterval] \ [list tk::ScaleIncrement $w $dir $big again]] } elseif {$repeat eq "initial"} { set delay [$w cget -repeatdelay] if {$delay > 0} { + set Priv(clockms) $clockms set Priv(afterId) [after $delay \ [list tk::ScaleIncrement $w $dir $big again]] } diff --git a/mingw32/lib/tk8.6/spinbox.tcl b/mingw32/lib/tk8.6/spinbox.tcl index 2b387d2afa0..0e26644a7ed 100644 --- a/mingw32/lib/tk8.6/spinbox.tcl +++ b/mingw32/lib/tk8.6/spinbox.tcl @@ -200,18 +200,18 @@ bind Spinbox <> { bind Spinbox <> { %W selection clear } -bind Spinbox { +bind Spinbox { ::tk::EntryInsert %W %A } -# Ignore all Alt, Meta, and Control keypresses unless explicitly bound. +# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the -# class binding will also fire and insert the character, +# class binding will also fire and insert the character, # which is wrong. Ditto for Escape, Return, and Tab. -bind Spinbox {# nothing} -bind Spinbox {# nothing} -bind Spinbox {# nothing} +bind Spinbox {# nothing} +bind Spinbox {# nothing} +bind Spinbox {# nothing} bind Spinbox {# nothing} bind Spinbox {# nothing} bind Spinbox {# nothing} @@ -219,7 +219,8 @@ bind Spinbox {# nothing} bind Spinbox {# nothing} bind Spinbox {# nothing} if {[tk windowingsystem] eq "aqua"} { - bind Spinbox {# nothing} + bind Spinbox {# nothing} + bind Spinbox {# nothing} } # On Windows, paste is done using Shift-Insert. Shift-Insert already diff --git a/mingw32/lib/tk8.6/text.tcl b/mingw32/lib/tk8.6/text.tcl index d1f9b8648e7..6cfe9d0e9b9 100644 --- a/mingw32/lib/tk8.6/text.tcl +++ b/mingw32/lib/tk8.6/text.tcl @@ -292,22 +292,23 @@ bind Text <> { bind Text { catch {tk::TextInsert %W [::tk::GetSelection %W PRIMARY]} } -bind Text { +bind Text { tk::TextInsert %W %A } # Ignore all Alt, Meta, and Control keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the -# class binding will also fire and insert the character, +# class binding will also fire and insert the character, # which is wrong. Ditto for . -bind Text {# nothing } -bind Text {# nothing} -bind Text {# nothing} +bind Text {# nothing } +bind Text {# nothing} +bind Text {# nothing} bind Text {# nothing} bind Text {# nothing} if {[tk windowingsystem] eq "aqua"} { - bind Text {# nothing} + bind Text {# nothing} + bind Text {# nothing} } # Additional emacs-like bindings: diff --git a/mingw32/lib/tk8.6/tk.tcl b/mingw32/lib/tk8.6/tk.tcl index 5bb3be71aa3..89267d66ccd 100644 --- a/mingw32/lib/tk8.6/tk.tcl +++ b/mingw32/lib/tk8.6/tk.tcl @@ -11,7 +11,7 @@ # this file, and for a DISCLAIMER OF ALL WARRANTIES. # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.6.12 +package require -exact Tk 8.6.13 # Create a ::tk namespace namespace eval ::tk { @@ -675,15 +675,6 @@ proc ::tk::mcmaxamp {args} { return $maxlen } -# For now, turn off the custom mdef proc for the Mac: - -if {[tk windowingsystem] eq "aqua"} { - namespace eval ::tk::mac { - set useCustomMDEF 0 - } -} - - if {[tk windowingsystem] eq "aqua"} { #stub procedures to respond to "do script" Apple Events proc ::tk::mac::DoScriptFile {file} { diff --git a/mingw32/lib/tk8.6/tkfbox.tcl b/mingw32/lib/tk8.6/tkfbox.tcl index f73fdc5c84c..0c3cc0c3f63 100644 --- a/mingw32/lib/tk8.6/tkfbox.tcl +++ b/mingw32/lib/tk8.6/tkfbox.tcl @@ -463,7 +463,7 @@ proc ::tk::dialog::file::Create {w class} { wm protocol $w WM_DELETE_WINDOW [list ::tk::dialog::file::CancelCmd $w] $data(upBtn) configure -command [list ::tk::dialog::file::UpDirCmd $w] $data(cancelBtn) configure -command [list ::tk::dialog::file::CancelCmd $w] - bind $w [list $data(cancelBtn) invoke] + bind $w [list $data(cancelBtn) invoke] bind $w [list tk::AltKeyInDialog $w %A] # Set up event handlers specific to File or Directory Dialogs @@ -581,9 +581,9 @@ proc ::tk::dialog::file::Update {w} { # so the user may still click and cause havoc ... # set entCursor [$data(ent) cget -cursor] - set dlgCursor [$w cget -cursor] + set dlgCursor [$w cget -cursor] $data(ent) configure -cursor watch - $w configure -cursor watch + $w configure -cursor watch update idletasks $data(icons) deleteall @@ -633,7 +633,7 @@ proc ::tk::dialog::file::Update {w} { # turn off the busy cursor. # $data(ent) configure -cursor $entCursor - $w configure -cursor $dlgCursor + $w configure -cursor $dlgCursor } # ::tk::dialog::file::SetPathSilently -- @@ -909,15 +909,15 @@ proc ::tk::dialog::file::VerifyFileName {w filename} { } } PATH { - tk_messageBox -icon warning -type ok -parent $w \ - -message [mc "Directory \"%1\$s\" does not exist." $path] + tk_messageBox -icon warning -type ok -parent $w -message \ + [mc "Directory \"%1\$s\" does not exist." $path] $data(ent) selection range 0 end $data(ent) icursor end } CHDIR { tk_messageBox -type ok -parent $w -icon warning -message \ - [mc "Cannot change to the directory\ - \"%1\$s\".\nPermission denied." $path] + [mc "Cannot change to the directory\ + \"%1\$s\".\nPermission denied." $path] $data(ent) selection range 0 end $data(ent) icursor end } @@ -1121,8 +1121,7 @@ proc ::tk::dialog::file::Done {w {selectFilePath ""}} { } then { upvar #0 $data(-typevariable) typeVariable set typeVariable [lindex $data(origfiletypes) \ - [lsearch -exact $data(-filetypes) $data(filterType)] 0] - + [lsearch -exact $data(-filetypes) $data(filterType)] 0] } } bind $data(okBtn) {} diff --git a/mingw32/lib/tk8.6/ttk/cursors.tcl b/mingw32/lib/tk8.6/ttk/cursors.tcl index f1f9fa16336..9d1e1aef31b 100644 --- a/mingw32/lib/tk8.6/ttk/cursors.tcl +++ b/mingw32/lib/tk8.6/ttk/cursors.tcl @@ -99,23 +99,20 @@ namespace eval ttk { } "aqua" { - if {[package vsatisfies [package provide Tk] 8.5]} { - # appeared 2007-04-23, Tk 8.5a6 - array set Cursors { - standard arrow - text ibeam - link pointinghand - crosshair crosshair - busy watch - forbidden notallowed - - hresize resizeleftright - vresize resizeupdown - nresize resizeup - sresize resizedown - wresize resizeleft - eresize resizeright - } + array set Cursors { + standard arrow + text ibeam + link pointinghand + crosshair crosshair + busy watch + forbidden notallowed + + hresize resizeleftright + vresize resizeupdown + nresize resizeup + sresize resizedown + wresize resizeleft + eresize resizeright } } } @@ -201,7 +198,7 @@ proc ttk::CursorSampler {f} { if {[info exists argv0] && $argv0 eq [info script]} { wm title . "[array size ::ttk::Cursors] cursors" pack [ttk::CursorSampler .f] -expand true -fill both - bind . [list destroy .] + bind . [list destroy .] focus .f } diff --git a/mingw32/lib/tk8.6/ttk/entry.tcl b/mingw32/lib/tk8.6/ttk/entry.tcl index 4cdb5acbfb5..12080a3bec3 100644 --- a/mingw32/lib/tk8.6/ttk/entry.tcl +++ b/mingw32/lib/tk8.6/ttk/entry.tcl @@ -141,6 +141,7 @@ bind TEntry {# nothing} # as a Command modifier. if {[tk windowingsystem] eq "aqua"} { bind TEntry {# nothing} + bind TEntry {# nothing} } # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind TEntry <> {# nothing} diff --git a/mingw32/lib/tk8.6/ttk/menubutton.tcl b/mingw32/lib/tk8.6/ttk/menubutton.tcl index a0f70c99d01..fc0ea023dec 100644 --- a/mingw32/lib/tk8.6/ttk/menubutton.tcl +++ b/mingw32/lib/tk8.6/ttk/menubutton.tcl @@ -82,7 +82,6 @@ if {[tk windowingsystem] eq "aqua"} { set bbh [expr {[winfo height $mb]} + $bevelPad] set mw [winfo reqwidth $menu] set bw [winfo width $mb] - set dF [expr {[winfo width $mb] - [winfo reqwidth $menu] - $menuPad}] set entry [::tk::MenuFindName $menu [$mb cget -text]] if {$entry < 0} { set entry 0 @@ -106,7 +105,7 @@ if {[tk windowingsystem] eq "aqua"} { incr y $menuPad incr x $bw } - default { + default { # flush incr y $bbh } } @@ -118,7 +117,6 @@ if {[tk windowingsystem] eq "aqua"} { set bh [expr {[winfo height $mb]}] set mw [expr {[winfo reqwidth $menu]}] set bw [expr {[winfo width $mb]}] - set dF [expr {[winfo width $mb] - [winfo reqwidth $menu]}] if {[tk windowingsystem] eq "win32"} { incr mh 6 incr mw 16 @@ -154,13 +152,8 @@ if {[tk windowingsystem] eq "aqua"} { right { incr x $bw } - default { - if {[$mb cget -style] eq ""} { - incr x [expr {([winfo width $mb] - \ - [winfo reqwidth $menu])/ 2}] - } else { - incr y $bh - } + default { # flush + incr x [expr {([winfo width $mb] - [winfo reqwidth $menu])/ 2}] } } return [list $x $y $entry] diff --git a/mingw32/lib/tk8.6/ttk/panedwindow.tcl b/mingw32/lib/tk8.6/ttk/panedwindow.tcl index 0fd9bd75631..1989b8955ca 100644 --- a/mingw32/lib/tk8.6/ttk/panedwindow.tcl +++ b/mingw32/lib/tk8.6/ttk/panedwindow.tcl @@ -45,9 +45,9 @@ proc ttk::panedwindow::Press {w x y} { proc ttk::panedwindow::Drag {w x y} { variable State if {!$State(pressed)} { return } - switch -- [$w cget -orient] { - horizontal { set delta [expr {$x - $State(pressX)}] } - vertical { set delta [expr {$y - $State(pressY)}] } + switch -glob -- [$w cget -orient] { + h* { set delta [expr {$x - $State(pressX)}] } + v* { set delta [expr {$y - $State(pressY)}] } } $w sashpos $State(sash) [expr {$State(sashPos) + $delta}] } @@ -80,9 +80,9 @@ proc ttk::panedwindow::SetCursor {w x y} { set cursor $State(userConfCursor) if {[llength [$w identify $x $y]]} { # Assume we're over a sash. - switch -- [$w cget -orient] { - horizontal { set cursor hresize } - vertical { set cursor vresize } + switch -glob -- [$w cget -orient] { + h* { set cursor hresize } + v* { set cursor vresize } } } ttk::setCursor $w $cursor diff --git a/mingw32/lib/tk8.6/ttk/utils.tcl b/mingw32/lib/tk8.6/ttk/utils.tcl index 257191493ef..3d908800442 100644 --- a/mingw32/lib/tk8.6/ttk/utils.tcl +++ b/mingw32/lib/tk8.6/ttk/utils.tcl @@ -236,8 +236,8 @@ proc ttk::Repeatedly {args} { after cancel $Repeat(timer) set script [uplevel 1 [list namespace code $args]] set Repeat(script) $script - uplevel #0 $script set Repeat(timer) [after $Repeat(delay) ttk::Repeat] + uplevel #0 $script } ## Repeat -- @@ -245,8 +245,8 @@ proc ttk::Repeatedly {args} { # proc ttk::Repeat {} { variable Repeat - uplevel #0 $Repeat(script) set Repeat(timer) [after $Repeat(interval) ttk::Repeat] + uplevel #0 $Repeat(script) } ## ttk::CancelRepeat -- diff --git a/mingw32/lib/tk8.6/xmfbox.tcl b/mingw32/lib/tk8.6/xmfbox.tcl index 14d2be5af65..c26164a3dd1 100644 --- a/mingw32/lib/tk8.6/xmfbox.tcl +++ b/mingw32/lib/tk8.6/xmfbox.tcl @@ -83,9 +83,9 @@ proc ::tk::MotifFDialog_Create {dataName type argList} { MotifFDialog_Config $dataName $type $argList if {$data(-parent) eq "."} { - set w .$dataName + set w .$dataName } else { - set w $data(-parent).$dataName + set w $data(-parent).$dataName } # (re)create the dialog box if necessary @@ -549,7 +549,7 @@ proc ::tk::MotifFDialog_Update {w} { $data(fEnt) delete 0 end $data(fEnt) insert 0 \ - [::tk::dialog::file::JoinFile $data(selectPath) $data(filter)] + [::tk::dialog::file::JoinFile $data(selectPath) $data(filter)] $data(sEnt) delete 0 end $data(sEnt) insert 0 [::tk::dialog::file::JoinFile $data(selectPath) \ $data(selectFile)] @@ -597,15 +597,15 @@ proc ::tk::MotifFDialog_LoadFiles {w} { if {[file isdir ./$f]} { lappend dlist $f } else { - foreach pat $data(filter) { - if {[string match $pat $f]} { + foreach pat $data(filter) { + if {[string match $pat $f]} { if {[string match .* $f]} { incr top } lappend flist $f - break + break } - } + } } } eval [list $data(dList) insert end] [lsort -dictionary $dlist] @@ -907,9 +907,9 @@ proc ::tk::MotifFDialog_CancelCmd {w} { } proc ::tk::ListBoxKeyAccel_Set {w} { - bind Listbox "" + bind Listbox "" bind $w [list tk::ListBoxKeyAccel_Unset $w] - bind $w [list tk::ListBoxKeyAccel_Key $w %A] + bind $w [list tk::ListBoxKeyAccel_Key $w %A] } proc ::tk::ListBoxKeyAccel_Unset {w} { diff --git a/mingw32/lib/tkConfig.sh b/mingw32/lib/tkConfig.sh index fb6210ef634..42cb900ad2b 100644 --- a/mingw32/lib/tkConfig.sh +++ b/mingw32/lib/tkConfig.sh @@ -17,7 +17,7 @@ TK_DLL_FILE="tk86.dll" TK_VERSION='8.6' TK_MAJOR_VERSION='8' TK_MINOR_VERSION='6' -TK_PATCH_LEVEL='.12' +TK_PATCH_LEVEL='.13' # -D flags for use with the C compiler. TK_DEFS='-DPACKAGE_NAME=\"tk\" -DPACKAGE_TARNAME=\"tk\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tk\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DMODULE_SCOPE=extern -DHAVE_NO_SEH=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_UXTHEME_H=1 -DHAVE_VSSYM32_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1' diff --git a/mingw32/share/man/man3/Tk_CreateOptionTable.3.gz b/mingw32/share/man/man3/Tk_CreateOptionTable.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_CreateOptionTable.3.gz and b/mingw32/share/man/man3/Tk_CreateOptionTable.3.gz differ diff --git a/mingw32/share/man/man3/Tk_DeleteOptionTable.3.gz b/mingw32/share/man/man3/Tk_DeleteOptionTable.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_DeleteOptionTable.3.gz and b/mingw32/share/man/man3/Tk_DeleteOptionTable.3.gz differ diff --git a/mingw32/share/man/man3/Tk_FreeConfigOptions.3.gz b/mingw32/share/man/man3/Tk_FreeConfigOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_FreeConfigOptions.3.gz and b/mingw32/share/man/man3/Tk_FreeConfigOptions.3.gz differ diff --git a/mingw32/share/man/man3/Tk_FreeSavedOptions.3.gz b/mingw32/share/man/man3/Tk_FreeSavedOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_FreeSavedOptions.3.gz and b/mingw32/share/man/man3/Tk_FreeSavedOptions.3.gz differ diff --git a/mingw32/share/man/man3/Tk_GetOptionInfo.3.gz b/mingw32/share/man/man3/Tk_GetOptionInfo.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_GetOptionInfo.3.gz and b/mingw32/share/man/man3/Tk_GetOptionInfo.3.gz differ diff --git a/mingw32/share/man/man3/Tk_GetOptionValue.3.gz b/mingw32/share/man/man3/Tk_GetOptionValue.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_GetOptionValue.3.gz and b/mingw32/share/man/man3/Tk_GetOptionValue.3.gz differ diff --git a/mingw32/share/man/man3/Tk_InitOptions.3.gz b/mingw32/share/man/man3/Tk_InitOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_InitOptions.3.gz and b/mingw32/share/man/man3/Tk_InitOptions.3.gz differ diff --git a/mingw32/share/man/man3/Tk_Offset.3.gz b/mingw32/share/man/man3/Tk_Offset.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_Offset.3.gz and b/mingw32/share/man/man3/Tk_Offset.3.gz differ diff --git a/mingw32/share/man/man3/Tk_RestoreSavedOptions.3.gz b/mingw32/share/man/man3/Tk_RestoreSavedOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_RestoreSavedOptions.3.gz and b/mingw32/share/man/man3/Tk_RestoreSavedOptions.3.gz differ diff --git a/mingw32/share/man/man3/Tk_SetOptions.3.gz b/mingw32/share/man/man3/Tk_SetOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw32/share/man/man3/Tk_SetOptions.3.gz and b/mingw32/share/man/man3/Tk_SetOptions.3.gz differ diff --git a/mingw32/share/man/mann/bind.n.gz b/mingw32/share/man/mann/bind.n.gz index 319cf5c7143..b6476cb1979 100644 Binary files a/mingw32/share/man/mann/bind.n.gz and b/mingw32/share/man/mann/bind.n.gz differ diff --git a/mingw32/share/man/mann/canvas.n.gz b/mingw32/share/man/mann/canvas.n.gz index adc7e351b49..5103b1e2b19 100644 Binary files a/mingw32/share/man/mann/canvas.n.gz and b/mingw32/share/man/mann/canvas.n.gz differ diff --git a/mingw32/share/man/mann/keysyms.n.gz b/mingw32/share/man/mann/keysyms.n.gz index 437061ee2e2..0c5442b5813 100644 Binary files a/mingw32/share/man/mann/keysyms.n.gz and b/mingw32/share/man/mann/keysyms.n.gz differ diff --git a/mingw32/share/man/mann/menubutton.n.gz b/mingw32/share/man/mann/menubutton.n.gz index 1812c59faaf..8c940af5e18 100644 Binary files a/mingw32/share/man/mann/menubutton.n.gz and b/mingw32/share/man/mann/menubutton.n.gz differ diff --git a/mingw32/share/man/mann/text.n.gz b/mingw32/share/man/mann/text.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw32/share/man/mann/text.n.gz and b/mingw32/share/man/mann/text.n.gz differ diff --git a/mingw32/share/man/mann/tk_messageBox.n.gz b/mingw32/share/man/mann/tk_messageBox.n.gz index c6a4e2dd556..3ce05c9095a 100644 Binary files a/mingw32/share/man/mann/tk_messageBox.n.gz and b/mingw32/share/man/mann/tk_messageBox.n.gz differ diff --git a/mingw32/share/man/mann/tk_textCopy.n.gz b/mingw32/share/man/mann/tk_textCopy.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw32/share/man/mann/tk_textCopy.n.gz and b/mingw32/share/man/mann/tk_textCopy.n.gz differ diff --git a/mingw32/share/man/mann/tk_textCut.n.gz b/mingw32/share/man/mann/tk_textCut.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw32/share/man/mann/tk_textCut.n.gz and b/mingw32/share/man/mann/tk_textCut.n.gz differ diff --git a/mingw32/share/man/mann/tk_textPaste.n.gz b/mingw32/share/man/mann/tk_textPaste.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw32/share/man/mann/tk_textPaste.n.gz and b/mingw32/share/man/mann/tk_textPaste.n.gz differ diff --git a/mingw32/share/man/mann/ttk_image.n.gz b/mingw32/share/man/mann/ttk_image.n.gz index e0d08ac2577..16742f42c06 100644 Binary files a/mingw32/share/man/mann/ttk_image.n.gz and b/mingw32/share/man/mann/ttk_image.n.gz differ diff --git a/mingw32/share/man/mann/ttk_style.n.gz b/mingw32/share/man/mann/ttk_style.n.gz index 1d4690a305e..ebfbe2b89e8 100644 Binary files a/mingw32/share/man/mann/ttk_style.n.gz and b/mingw32/share/man/mann/ttk_style.n.gz differ diff --git a/mingw32/share/man/mann/ttk_treeview.n.gz b/mingw32/share/man/mann/ttk_treeview.n.gz index 993dc122d02..d45cef50335 100644 Binary files a/mingw32/share/man/mann/ttk_treeview.n.gz and b/mingw32/share/man/mann/ttk_treeview.n.gz differ diff --git a/mingw32/share/man/mann/ttk_widget.n.gz b/mingw32/share/man/mann/ttk_widget.n.gz index 6fac16a9a4c..7abdeae0125 100644 Binary files a/mingw32/share/man/mann/ttk_widget.n.gz and b/mingw32/share/man/mann/ttk_widget.n.gz differ diff --git a/mingw32/share/man/mann/wm.n.gz b/mingw32/share/man/mann/wm.n.gz index 6e785c3b38e..cdd89dbcbdf 100644 Binary files a/mingw32/share/man/mann/wm.n.gz and b/mingw32/share/man/mann/wm.n.gz differ diff --git a/mingw64/bin/tk86.dll b/mingw64/bin/tk86.dll index 97d775e653c..21766b3cb7c 100755 Binary files a/mingw64/bin/tk86.dll and b/mingw64/bin/tk86.dll differ diff --git a/mingw64/bin/wish.exe b/mingw64/bin/wish.exe index aad7d3e9571..1af22c7917a 100755 Binary files a/mingw64/bin/wish.exe and b/mingw64/bin/wish.exe differ diff --git a/mingw64/bin/wish86.exe b/mingw64/bin/wish86.exe index aad7d3e9571..1af22c7917a 100755 Binary files a/mingw64/bin/wish86.exe and b/mingw64/bin/wish86.exe differ diff --git a/mingw64/include/X11/HPkeysym.h b/mingw64/include/X11/HPkeysym.h index 4a0655a2376..d41ed388389 100644 --- a/mingw64/include/X11/HPkeysym.h +++ b/mingw64/include/X11/HPkeysym.h @@ -46,7 +46,7 @@ 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 +TO THIS SOFTWARE, 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 diff --git a/mingw64/include/X11/XF86keysym.h b/mingw64/include/X11/XF86keysym.h index dd287e2493e..e8a9fb8cb78 100644 --- a/mingw64/include/X11/XF86keysym.h +++ b/mingw64/include/X11/XF86keysym.h @@ -3,8 +3,10 @@ * * 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. + * The XF86 set of keysyms is a catch-all set of defines for keysyms found + * on various multimedia keyboards. Originally specific to XFree86 they have + * been been adopted over time 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. * @@ -207,6 +209,8 @@ #define XF86XK_RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */ +#define XF86XK_FullScreen 0x1008FFB8 /* Toggle fullscreen */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 @@ -228,3 +232,238 @@ #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 */ + + +/* + * Reserved range for evdev symbols: 0x10081000-0x10081FFF + * + * Key syms within this range must match the Linux kernel + * input-event-codes.h file in the format: + * XF86XK_CamelCaseKernelName _EVDEVK(kernel value) + * For example, the kernel + * #define KEY_MACRO_RECORD_START 0x2b0 + * effectively ends up as: + * #define XF86XK_MacroRecordStart 0x100812b0 + * + * For historical reasons, some keysyms within the reserved range will be + * missing, most notably all "normal" keys that are mapped through default + * XKB layouts (e.g. KEY_Q). + * + * CamelCasing is done with a human control as last authority, e.g. see VOD + * instead of Vod for the Video on Demand key. + * + * The format for #defines is strict: + * + * #define XF86XK_FOO_EVDEVK(0xABC) |* kver KEY_FOO *| + * + * Where + * - alignment by tabs + * - the _EVDEVK macro must be used + * - the hex code must be in uppercase hex + * - the kernel version (kver) is in the form v5.10 + * - kver and key name are within a slash-star comment (a pipe is used in + * this example for technical reasons) + * These #defines are parsed by scripts. Do not stray from the given format. + * + * Where the evdev keycode is mapped to a different symbol, please add a + * comment line starting with Use: but otherwise the same format, e.g. + * Use: XF86XK_RotationLockToggle _EVDEVK(0x231) v4.16 KEY_ROTATE_LOCK_TOGGLE + * + */ +#define _EVDEVK(_v) (0x10081000 + _v) +/* Use: XF86XK_Eject _EVDEVK(0x0A2) KEY_EJECTCLOSECD */ +/* Use: XF86XK_New _EVDEVK(0x0B5) v2.6.14 KEY_NEW */ +/* Use: XK_Redo _EVDEVK(0x0B6) v2.6.14 KEY_REDO */ +/* KEY_DASHBOARD has been mapped to LaunchB in xkeyboard-config since 2011 */ +/* Use: XF86XK_LaunchB _EVDEVK(0x0CC) v2.6.28 KEY_DASHBOARD */ +/* Use: XF86XK_Display _EVDEVK(0x0E3) v2.6.12 KEY_SWITCHVIDEOMODE */ +/* Use: XF86XK_KbdLightOnOff _EVDEVK(0x0E4) v2.6.12 KEY_KBDILLUMTOGGLE */ +/* Use: XF86XK_KbdBrightnessDown _EVDEVK(0x0E5) v2.6.12 KEY_KBDILLUMDOWN */ +/* Use: XF86XK_KbdBrightnessUp _EVDEVK(0x0E6) v2.6.12 KEY_KBDILLUMUP */ +/* Use: XF86XK_Send _EVDEVK(0x0E7) v2.6.14 KEY_SEND */ +/* Use: XF86XK_Reply _EVDEVK(0x0E8) v2.6.14 KEY_REPLY */ +/* Use: XF86XK_MailForward _EVDEVK(0x0E9) v2.6.14 KEY_FORWARDMAIL */ +/* Use: XF86XK_Save _EVDEVK(0x0EA) v2.6.14 KEY_SAVE */ +/* Use: XF86XK_Documents _EVDEVK(0x0EB) v2.6.14 KEY_DOCUMENTS */ +/* Use: XF86XK_Battery _EVDEVK(0x0EC) v2.6.17 KEY_BATTERY */ +/* Use: XF86XK_Bluetooth _EVDEVK(0x0ED) v2.6.19 KEY_BLUETOOTH */ +/* Use: XF86XK_WLAN _EVDEVK(0x0EE) v2.6.19 KEY_WLAN */ +/* Use: XF86XK_UWB _EVDEVK(0x0EF) v2.6.24 KEY_UWB */ +/* Use: XF86XK_Next_VMode _EVDEVK(0x0F1) v2.6.23 KEY_VIDEO_NEXT */ +/* Use: XF86XK_Prev_VMode _EVDEVK(0x0F2) v2.6.23 KEY_VIDEO_PREV */ +/* Use: XF86XK_MonBrightnessCycle _EVDEVK(0x0F3) v2.6.23 KEY_BRIGHTNESS_CYCLE */ +#define XF86XK_BrightnessAuto _EVDEVK(0x0F4) /* v3.16 KEY_BRIGHTNESS_AUTO */ +#define XF86XK_DisplayOff _EVDEVK(0x0F5) /* v2.6.23 KEY_DISPLAY_OFF */ +/* Use: XF86XK_WWAN _EVDEVK(0x0F6) v3.13 KEY_WWAN */ +/* Use: XF86XK_RFKill _EVDEVK(0x0F7) v2.6.33 KEY_RFKILL */ +/* Use: XF86XK_AudioMicMute _EVDEVK(0x0F8) v3.1 KEY_MICMUTE */ +#define XF86XK_Info _EVDEVK(0x166) /* KEY_INFO */ +/* Use: XF86XK_CycleAngle _EVDEVK(0x173) KEY_ANGLE */ +/* Use: XF86XK_FullScreen _EVDEVK(0x174) v5.1 KEY_FULL_SCREEN */ +#define XF86XK_AspectRatio _EVDEVK(0x177) /* v5.1 KEY_ASPECT_RATIO */ +#define XF86XK_DVD _EVDEVK(0x185) /* KEY_DVD */ +#define XF86XK_Audio _EVDEVK(0x188) /* KEY_AUDIO */ +/* Use: XF86XK_Video _EVDEVK(0x189) KEY_VIDEO */ +/* Use: XF86XK_Calendar _EVDEVK(0x18D) KEY_CALENDAR */ +#define XF86XK_ChannelUp _EVDEVK(0x192) /* KEY_CHANNELUP */ +#define XF86XK_ChannelDown _EVDEVK(0x193) /* KEY_CHANNELDOWN */ +/* Use: XF86XK_AudioRandomPlay _EVDEVK(0x19A) KEY_SHUFFLE */ +#define XF86XK_Break _EVDEVK(0x19B) /* KEY_BREAK */ +#define XF86XK_VideoPhone _EVDEVK(0x1A0) /* v2.6.20 KEY_VIDEOPHONE */ +/* Use: XF86XK_Game _EVDEVK(0x1A1) v2.6.20 KEY_GAMES */ +/* Use: XF86XK_ZoomIn _EVDEVK(0x1A2) v2.6.20 KEY_ZOOMIN */ +/* Use: XF86XK_ZoomOut _EVDEVK(0x1A3) v2.6.20 KEY_ZOOMOUT */ +#define XF86XK_ZoomReset _EVDEVK(0x1A4) /* v2.6.20 KEY_ZOOMRESET */ +/* Use: XF86XK_Word _EVDEVK(0x1A5) v2.6.20 KEY_WORDPROCESSOR */ +#define XF86XK_Editor _EVDEVK(0x1A6) /* v2.6.20 KEY_EDITOR */ +/* Use: XF86XK_Excel _EVDEVK(0x1A7) v2.6.20 KEY_SPREADSHEET */ +#define XF86XK_GraphicsEditor _EVDEVK(0x1A8) /* v2.6.20 KEY_GRAPHICSEDITOR */ +#define XF86XK_Presentation _EVDEVK(0x1A9) /* v2.6.20 KEY_PRESENTATION */ +#define XF86XK_Database _EVDEVK(0x1AA) /* v2.6.20 KEY_DATABASE */ +/* Use: XF86XK_News _EVDEVK(0x1AB) v2.6.20 KEY_NEWS */ +#define XF86XK_Voicemail _EVDEVK(0x1AC) /* v2.6.20 KEY_VOICEMAIL */ +#define XF86XK_Addressbook _EVDEVK(0x1AD) /* v2.6.20 KEY_ADDRESSBOOK */ +/* Use: XF86XK_Messenger _EVDEVK(0x1AE) v2.6.20 KEY_MESSENGER */ +#define XF86XK_DisplayToggle _EVDEVK(0x1AF) /* v2.6.20 KEY_DISPLAYTOGGLE */ +#define XF86XK_SpellCheck _EVDEVK(0x1B0) /* v2.6.24 KEY_SPELLCHECK */ +/* Use: XF86XK_LogOff _EVDEVK(0x1B1) v2.6.24 KEY_LOGOFF */ +/* Use: XK_dollar _EVDEVK(0x1B2) v2.6.24 KEY_DOLLAR */ +/* Use: XK_EuroSign _EVDEVK(0x1B3) v2.6.24 KEY_EURO */ +/* Use: XF86XK_FrameBack _EVDEVK(0x1B4) v2.6.24 KEY_FRAMEBACK */ +/* Use: XF86XK_FrameForward _EVDEVK(0x1B5) v2.6.24 KEY_FRAMEFORWARD */ +#define XF86XK_ContextMenu _EVDEVK(0x1B6) /* v2.6.24 KEY_CONTEXT_MENU */ +#define XF86XK_MediaRepeat _EVDEVK(0x1B7) /* v2.6.26 KEY_MEDIA_REPEAT */ +#define XF86XK_10ChannelsUp _EVDEVK(0x1B8) /* v2.6.38 KEY_10CHANNELSUP */ +#define XF86XK_10ChannelsDown _EVDEVK(0x1B9) /* v2.6.38 KEY_10CHANNELSDOWN */ +#define XF86XK_Images _EVDEVK(0x1BA) /* v2.6.39 KEY_IMAGES */ +#define XF86XK_NotificationCenter _EVDEVK(0x1BC) /* v5.10 KEY_NOTIFICATION_CENTER */ +#define XF86XK_PickupPhone _EVDEVK(0x1BD) /* v5.10 KEY_PICKUP_PHONE */ +#define XF86XK_HangupPhone _EVDEVK(0x1BE) /* v5.10 KEY_HANGUP_PHONE */ +#define XF86XK_Fn _EVDEVK(0x1D0) /* KEY_FN */ +#define XF86XK_Fn_Esc _EVDEVK(0x1D1) /* KEY_FN_ESC */ +#define XF86XK_FnRightShift _EVDEVK(0x1E5) /* v5.10 KEY_FN_RIGHT_SHIFT */ +/* Use: XK_braille_dot_1 _EVDEVK(0x1F1) v2.6.17 KEY_BRL_DOT1 */ +/* Use: XK_braille_dot_2 _EVDEVK(0x1F2) v2.6.17 KEY_BRL_DOT2 */ +/* Use: XK_braille_dot_3 _EVDEVK(0x1F3) v2.6.17 KEY_BRL_DOT3 */ +/* Use: XK_braille_dot_4 _EVDEVK(0x1F4) v2.6.17 KEY_BRL_DOT4 */ +/* Use: XK_braille_dot_5 _EVDEVK(0x1F5) v2.6.17 KEY_BRL_DOT5 */ +/* Use: XK_braille_dot_6 _EVDEVK(0x1F6) v2.6.17 KEY_BRL_DOT6 */ +/* Use: XK_braille_dot_7 _EVDEVK(0x1F7) v2.6.17 KEY_BRL_DOT7 */ +/* Use: XK_braille_dot_8 _EVDEVK(0x1F8) v2.6.17 KEY_BRL_DOT8 */ +/* Use: XK_braille_dot_9 _EVDEVK(0x1F9) v2.6.23 KEY_BRL_DOT9 */ +/* Use: XK_braille_dot_1 _EVDEVK(0x1FA) v2.6.23 KEY_BRL_DOT10 */ +#define XF86XK_Numeric0 _EVDEVK(0x200) /* v2.6.28 KEY_NUMERIC_0 */ +#define XF86XK_Numeric1 _EVDEVK(0x201) /* v2.6.28 KEY_NUMERIC_1 */ +#define XF86XK_Numeric2 _EVDEVK(0x202) /* v2.6.28 KEY_NUMERIC_2 */ +#define XF86XK_Numeric3 _EVDEVK(0x203) /* v2.6.28 KEY_NUMERIC_3 */ +#define XF86XK_Numeric4 _EVDEVK(0x204) /* v2.6.28 KEY_NUMERIC_4 */ +#define XF86XK_Numeric5 _EVDEVK(0x205) /* v2.6.28 KEY_NUMERIC_5 */ +#define XF86XK_Numeric6 _EVDEVK(0x206) /* v2.6.28 KEY_NUMERIC_6 */ +#define XF86XK_Numeric7 _EVDEVK(0x207) /* v2.6.28 KEY_NUMERIC_7 */ +#define XF86XK_Numeric8 _EVDEVK(0x208) /* v2.6.28 KEY_NUMERIC_8 */ +#define XF86XK_Numeric9 _EVDEVK(0x209) /* v2.6.28 KEY_NUMERIC_9 */ +#define XF86XK_NumericStar _EVDEVK(0x20A) /* v2.6.28 KEY_NUMERIC_STAR */ +#define XF86XK_NumericPound _EVDEVK(0x20B) /* v2.6.28 KEY_NUMERIC_POUND */ +#define XF86XK_NumericA _EVDEVK(0x20C) /* v4.1 KEY_NUMERIC_A */ +#define XF86XK_NumericB _EVDEVK(0x20D) /* v4.1 KEY_NUMERIC_B */ +#define XF86XK_NumericC _EVDEVK(0x20E) /* v4.1 KEY_NUMERIC_C */ +#define XF86XK_NumericD _EVDEVK(0x20F) /* v4.1 KEY_NUMERIC_D */ +#define XF86XK_CameraFocus _EVDEVK(0x210) /* v2.6.33 KEY_CAMERA_FOCUS */ +#define XF86XK_WPSButton _EVDEVK(0x211) /* v2.6.34 KEY_WPS_BUTTON */ +/* Use: XF86XK_TouchpadToggle _EVDEVK(0x212) v2.6.37 KEY_TOUCHPAD_TOGGLE */ +/* Use: XF86XK_TouchpadOn _EVDEVK(0x213) v2.6.37 KEY_TOUCHPAD_ON */ +/* Use: XF86XK_TouchpadOff _EVDEVK(0x214) v2.6.37 KEY_TOUCHPAD_OFF */ +#define XF86XK_CameraZoomIn _EVDEVK(0x215) /* v2.6.39 KEY_CAMERA_ZOOMIN */ +#define XF86XK_CameraZoomOut _EVDEVK(0x216) /* v2.6.39 KEY_CAMERA_ZOOMOUT */ +#define XF86XK_CameraUp _EVDEVK(0x217) /* v2.6.39 KEY_CAMERA_UP */ +#define XF86XK_CameraDown _EVDEVK(0x218) /* v2.6.39 KEY_CAMERA_DOWN */ +#define XF86XK_CameraLeft _EVDEVK(0x219) /* v2.6.39 KEY_CAMERA_LEFT */ +#define XF86XK_CameraRight _EVDEVK(0x21A) /* v2.6.39 KEY_CAMERA_RIGHT */ +#define XF86XK_AttendantOn _EVDEVK(0x21B) /* v3.10 KEY_ATTENDANT_ON */ +#define XF86XK_AttendantOff _EVDEVK(0x21C) /* v3.10 KEY_ATTENDANT_OFF */ +#define XF86XK_AttendantToggle _EVDEVK(0x21D) /* v3.10 KEY_ATTENDANT_TOGGLE */ +#define XF86XK_LightsToggle _EVDEVK(0x21E) /* v3.10 KEY_LIGHTS_TOGGLE */ +#define XF86XK_ALSToggle _EVDEVK(0x230) /* v3.13 KEY_ALS_TOGGLE */ +/* Use: XF86XK_RotationLockToggle _EVDEVK(0x231) v4.16 KEY_ROTATE_LOCK_TOGGLE */ +#define XF86XK_Buttonconfig _EVDEVK(0x240) /* v3.16 KEY_BUTTONCONFIG */ +#define XF86XK_Taskmanager _EVDEVK(0x241) /* v3.16 KEY_TASKMANAGER */ +#define XF86XK_Journal _EVDEVK(0x242) /* v3.16 KEY_JOURNAL */ +#define XF86XK_ControlPanel _EVDEVK(0x243) /* v3.16 KEY_CONTROLPANEL */ +#define XF86XK_AppSelect _EVDEVK(0x244) /* v3.16 KEY_APPSELECT */ +#define XF86XK_Screensaver _EVDEVK(0x245) /* v3.16 KEY_SCREENSAVER */ +#define XF86XK_VoiceCommand _EVDEVK(0x246) /* v3.16 KEY_VOICECOMMAND */ +#define XF86XK_Assistant _EVDEVK(0x247) /* v4.13 KEY_ASSISTANT */ +/* Use: XK_ISO_Next_Group _EVDEVK(0x248) v5.2 KEY_KBD_LAYOUT_NEXT */ +#define XF86XK_EmojiPicker _EVDEVK(0x249) /* v5.13 KEY_EMOJI_PICKER */ +#define XF86XK_Dictate _EVDEVK(0x24A) /* v5.17 KEY_DICTATE */ +#define XF86XK_BrightnessMin _EVDEVK(0x250) /* v3.16 KEY_BRIGHTNESS_MIN */ +#define XF86XK_BrightnessMax _EVDEVK(0x251) /* v3.16 KEY_BRIGHTNESS_MAX */ +#define XF86XK_KbdInputAssistPrev _EVDEVK(0x260) /* v3.18 KEY_KBDINPUTASSIST_PREV */ +#define XF86XK_KbdInputAssistNext _EVDEVK(0x261) /* v3.18 KEY_KBDINPUTASSIST_NEXT */ +#define XF86XK_KbdInputAssistPrevgroup _EVDEVK(0x262) /* v3.18 KEY_KBDINPUTASSIST_PREVGROUP */ +#define XF86XK_KbdInputAssistNextgroup _EVDEVK(0x263) /* v3.18 KEY_KBDINPUTASSIST_NEXTGROUP */ +#define XF86XK_KbdInputAssistAccept _EVDEVK(0x264) /* v3.18 KEY_KBDINPUTASSIST_ACCEPT */ +#define XF86XK_KbdInputAssistCancel _EVDEVK(0x265) /* v3.18 KEY_KBDINPUTASSIST_CANCEL */ +#define XF86XK_RightUp _EVDEVK(0x266) /* v4.7 KEY_RIGHT_UP */ +#define XF86XK_RightDown _EVDEVK(0x267) /* v4.7 KEY_RIGHT_DOWN */ +#define XF86XK_LeftUp _EVDEVK(0x268) /* v4.7 KEY_LEFT_UP */ +#define XF86XK_LeftDown _EVDEVK(0x269) /* v4.7 KEY_LEFT_DOWN */ +#define XF86XK_RootMenu _EVDEVK(0x26A) /* v4.7 KEY_ROOT_MENU */ +#define XF86XK_MediaTopMenu _EVDEVK(0x26B) /* v4.7 KEY_MEDIA_TOP_MENU */ +#define XF86XK_Numeric11 _EVDEVK(0x26C) /* v4.7 KEY_NUMERIC_11 */ +#define XF86XK_Numeric12 _EVDEVK(0x26D) /* v4.7 KEY_NUMERIC_12 */ +#define XF86XK_AudioDesc _EVDEVK(0x26E) /* v4.7 KEY_AUDIO_DESC */ +#define XF86XK_3DMode _EVDEVK(0x26F) /* v4.7 KEY_3D_MODE */ +#define XF86XK_NextFavorite _EVDEVK(0x270) /* v4.7 KEY_NEXT_FAVORITE */ +#define XF86XK_StopRecord _EVDEVK(0x271) /* v4.7 KEY_STOP_RECORD */ +#define XF86XK_PauseRecord _EVDEVK(0x272) /* v4.7 KEY_PAUSE_RECORD */ +#define XF86XK_VOD _EVDEVK(0x273) /* v4.7 KEY_VOD */ +#define XF86XK_Unmute _EVDEVK(0x274) /* v4.7 KEY_UNMUTE */ +#define XF86XK_FastReverse _EVDEVK(0x275) /* v4.7 KEY_FASTREVERSE */ +#define XF86XK_SlowReverse _EVDEVK(0x276) /* v4.7 KEY_SLOWREVERSE */ +#define XF86XK_Data _EVDEVK(0x277) /* v4.7 KEY_DATA */ +#define XF86XK_OnScreenKeyboard _EVDEVK(0x278) /* v4.12 KEY_ONSCREEN_KEYBOARD */ +#define XF86XK_PrivacyScreenToggle _EVDEVK(0x279) /* v5.5 KEY_PRIVACY_SCREEN_TOGGLE */ +#define XF86XK_SelectiveScreenshot _EVDEVK(0x27A) /* v5.6 KEY_SELECTIVE_SCREENSHOT */ +#define XF86XK_Macro1 _EVDEVK(0x290) /* v5.5 KEY_MACRO1 */ +#define XF86XK_Macro2 _EVDEVK(0x291) /* v5.5 KEY_MACRO2 */ +#define XF86XK_Macro3 _EVDEVK(0x292) /* v5.5 KEY_MACRO3 */ +#define XF86XK_Macro4 _EVDEVK(0x293) /* v5.5 KEY_MACRO4 */ +#define XF86XK_Macro5 _EVDEVK(0x294) /* v5.5 KEY_MACRO5 */ +#define XF86XK_Macro6 _EVDEVK(0x295) /* v5.5 KEY_MACRO6 */ +#define XF86XK_Macro7 _EVDEVK(0x296) /* v5.5 KEY_MACRO7 */ +#define XF86XK_Macro8 _EVDEVK(0x297) /* v5.5 KEY_MACRO8 */ +#define XF86XK_Macro9 _EVDEVK(0x298) /* v5.5 KEY_MACRO9 */ +#define XF86XK_Macro10 _EVDEVK(0x299) /* v5.5 KEY_MACRO10 */ +#define XF86XK_Macro11 _EVDEVK(0x29A) /* v5.5 KEY_MACRO11 */ +#define XF86XK_Macro12 _EVDEVK(0x29B) /* v5.5 KEY_MACRO12 */ +#define XF86XK_Macro13 _EVDEVK(0x29C) /* v5.5 KEY_MACRO13 */ +#define XF86XK_Macro14 _EVDEVK(0x29D) /* v5.5 KEY_MACRO14 */ +#define XF86XK_Macro15 _EVDEVK(0x29E) /* v5.5 KEY_MACRO15 */ +#define XF86XK_Macro16 _EVDEVK(0x29F) /* v5.5 KEY_MACRO16 */ +#define XF86XK_Macro17 _EVDEVK(0x2A0) /* v5.5 KEY_MACRO17 */ +#define XF86XK_Macro18 _EVDEVK(0x2A1) /* v5.5 KEY_MACRO18 */ +#define XF86XK_Macro19 _EVDEVK(0x2A2) /* v5.5 KEY_MACRO19 */ +#define XF86XK_Macro20 _EVDEVK(0x2A3) /* v5.5 KEY_MACRO20 */ +#define XF86XK_Macro21 _EVDEVK(0x2A4) /* v5.5 KEY_MACRO21 */ +#define XF86XK_Macro22 _EVDEVK(0x2A5) /* v5.5 KEY_MACRO22 */ +#define XF86XK_Macro23 _EVDEVK(0x2A6) /* v5.5 KEY_MACRO23 */ +#define XF86XK_Macro24 _EVDEVK(0x2A7) /* v5.5 KEY_MACRO24 */ +#define XF86XK_Macro25 _EVDEVK(0x2A8) /* v5.5 KEY_MACRO25 */ +#define XF86XK_Macro26 _EVDEVK(0x2A9) /* v5.5 KEY_MACRO26 */ +#define XF86XK_Macro27 _EVDEVK(0x2AA) /* v5.5 KEY_MACRO27 */ +#define XF86XK_Macro28 _EVDEVK(0x2AB) /* v5.5 KEY_MACRO28 */ +#define XF86XK_Macro29 _EVDEVK(0x2AC) /* v5.5 KEY_MACRO29 */ +#define XF86XK_Macro30 _EVDEVK(0x2AD) /* v5.5 KEY_MACRO30 */ +#define XF86XK_MacroRecordStart _EVDEVK(0x2B0) /* v5.5 KEY_MACRO_RECORD_START */ +#define XF86XK_MacroRecordStop _EVDEVK(0x2B1) /* v5.5 KEY_MACRO_RECORD_STOP */ +#define XF86XK_MacroPresetCycle _EVDEVK(0x2B2) /* v5.5 KEY_MACRO_PRESET_CYCLE */ +#define XF86XK_MacroPreset1 _EVDEVK(0x2B3) /* v5.5 KEY_MACRO_PRESET1 */ +#define XF86XK_MacroPreset2 _EVDEVK(0x2B4) /* v5.5 KEY_MACRO_PRESET2 */ +#define XF86XK_MacroPreset3 _EVDEVK(0x2B5) /* v5.5 KEY_MACRO_PRESET3 */ +#define XF86XK_KbdLcdMenu1 _EVDEVK(0x2B8) /* v5.5 KEY_KBD_LCD_MENU1 */ +#define XF86XK_KbdLcdMenu2 _EVDEVK(0x2B9) /* v5.5 KEY_KBD_LCD_MENU2 */ +#define XF86XK_KbdLcdMenu3 _EVDEVK(0x2BA) /* v5.5 KEY_KBD_LCD_MENU3 */ +#define XF86XK_KbdLcdMenu4 _EVDEVK(0x2BB) /* v5.5 KEY_KBD_LCD_MENU4 */ +#define XF86XK_KbdLcdMenu5 _EVDEVK(0x2BC) /* v5.5 KEY_KBD_LCD_MENU5 */ +#undef _EVDEVK diff --git a/mingw64/include/X11/Xfuncproto.h b/mingw64/include/X11/Xfuncproto.h index 6d63002efea..f6890736023 100644 --- a/mingw64/include/X11/Xfuncproto.h +++ b/mingw64/include/X11/Xfuncproto.h @@ -1,16 +1,26 @@ -/* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */ /* - * Copyright 1989, 1991 by the Massachusetts Institute of Technology * - * 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 M.I.T. not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. M.I.T. makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. +Copyright 1989, 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. * */ @@ -24,7 +34,7 @@ #endif /* NeedFunctionPrototypes */ #ifndef NeedVarargsPrototypes -#define NeedVarargsPrototypes 0 +#define NeedVarargsPrototypes 1 #endif /* NeedVarargsPrototypes */ #if NeedFunctionPrototypes @@ -37,6 +47,15 @@ #define _Xconst const #endif /* _Xconst */ +/* Function prototype configuration (see configure for more info) */ +#if !defined(NARROWPROTO) && \ + (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) +#define NARROWPROTO +#endif +#ifndef FUNCPROTO +#define FUNCPROTO 15 +#endif + #ifndef NeedWidePrototypes #ifdef NARROWPROTO #define NeedWidePrototypes 0 @@ -47,14 +66,164 @@ #endif /* NeedFunctionPrototypes */ -#ifdef __cplusplus -#define _XFUNCPROTOBEGIN extern "C" { -#define _XFUNCPROTOEND } -#endif - #ifndef _XFUNCPROTOBEGIN +#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */ +#define _XFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */ +#define _XFUNCPROTOEND } +#else #define _XFUNCPROTOBEGIN #define _XFUNCPROTOEND +#endif #endif /* _XFUNCPROTOBEGIN */ +/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */ +#ifndef __has_attribute +# define __has_attribute(x) 0 /* Compatibility with non-clang compilers. */ +#endif +#ifndef __has_feature +# define __has_feature(x) 0 /* Compatibility with non-clang compilers. */ +#endif +#ifndef __has_extension +# define __has_extension(x) 0 /* Compatibility with non-clang compilers. */ +#endif + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4)) +# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x))) +#else +# define _X_SENTINEL(x) +#endif /* GNUC >= 4 */ + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if (__has_attribute(visibility) || (defined(__GNUC__) && (__GNUC__ >= 4))) \ + && !defined(__CYGWIN__) && !defined(__MINGW32__) +# define _X_EXPORT __attribute__((visibility("default"))) +# define _X_HIDDEN __attribute__((visibility("hidden"))) +# define _X_INTERNAL __attribute__((visibility("internal"))) +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) +# define _X_EXPORT __global +# define _X_HIDDEN __hidden +# define _X_INTERNAL __hidden +#else /* not gcc >= 4 and not Sun Studio >= 8 */ +# define _X_EXPORT +# define _X_HIDDEN +# define _X_INTERNAL +#endif /* GNUC >= 4 */ + +/* Branch prediction hints for individual conditionals */ +/* requires xproto >= 7.0.9 */ +#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) +# define _X_LIKELY(x) __builtin_expect(!!(x), 1) +# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0) +#else /* not gcc >= 3.3 */ +# define _X_LIKELY(x) (x) +# define _X_UNLIKELY(x) (x) +#endif + +/* Bulk branch prediction hints via marking error path functions as "cold" */ +/* requires xproto >= 7.0.25 */ +#if __has_attribute(__cold__) || \ + (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */ +# define _X_COLD __attribute__((__cold__)) +#else +# define _X_COLD /* nothing */ +#endif + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if __has_attribute(deprecated) \ + || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130)) +# define _X_DEPRECATED __attribute__((deprecated)) +#else /* not gcc >= 3.1 */ +# define _X_DEPRECATED +#endif + +/* requires xproto >= 7.0.30 */ +#if __has_extension(attribute_deprecated_with_message) || \ + (defined(__GNUC__) && ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg))) +#else +# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED +#endif + +/* requires xproto >= 7.0.17 */ +#if __has_attribute(noreturn) \ + || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define _X_NORETURN __attribute((noreturn)) +#else +# define _X_NORETURN +#endif /* GNUC */ + +/* Added in X11R6.9, so available in any version of modular xproto */ +#if __has_attribute(__format__) \ + || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203) +# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y))) +#else /* not gcc >= 2.3 */ +# define _X_ATTRIBUTE_PRINTF(x,y) +#endif + +/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable + argument macros, must be only used inside #ifdef _X_NONNULL guards, as + many legacy X clients are compiled in C89 mode still. */ +#if __has_attribute(nonnull) \ + && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ +#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) +#elif __has_attribute(nonnull) \ + || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) +#define _X_NONNULL(args...) __attribute__((nonnull(args))) +#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ +#define _X_NONNULL(...) /* */ +#endif + +/* requires xproto >= 7.0.22 */ +#if __has_attribute(__unused__) \ + || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) +#define _X_UNUSED __attribute__((__unused__)) +#else +#define _X_UNUSED /* */ +#endif + +/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */ +/* requires xproto >= 7.0.9 + (introduced in 7.0.8 but didn't support all compilers until 7.0.9) */ +#if defined(inline) /* assume autoconf set it correctly */ || \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \ + (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)) +# define _X_INLINE inline +#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */ +# define _X_INLINE __inline__ +#else +# define _X_INLINE +#endif + +/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */ +/* requires xproto >= 7.0.21 */ +#ifndef _X_RESTRICT_KYWD +# if defined(restrict) /* assume autoconf set it correctly */ || \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \ + && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */ +# define _X_RESTRICT_KYWD restrict +# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */ +# define _X_RESTRICT_KYWD __restrict__ +# else +# define _X_RESTRICT_KYWD +# endif +#endif + +/* requires xproto >= 7.0.30 */ +#if __has_attribute(no_sanitize_thread) +# define _X_NOTSAN __attribute__((no_sanitize_thread)) +#else +# define _X_NOTSAN +#endif + +/* Mark a char array/pointer as not containing a NUL-terminated string */ +/* requires xproto >= 7.0.33 */ +#if __has_attribute(nonstring) +# define _X_NONSTRING __attribute__((nonstring)) +#else +# define _X_NONSTRING +#endif + #endif /* _XFUNCPROTO_H_ */ diff --git a/mingw64/include/X11/Xutil.h b/mingw64/include/X11/Xutil.h index bf372fb0f06..f377e2b5b94 100644 --- a/mingw64/include/X11/Xutil.h +++ b/mingw64/include/X11/Xutil.h @@ -1,8 +1,30 @@ -/* $XConsortium: Xutil.h,v 11.73 91/07/30 16:21:37 rws Exp $ */ /*********************************************************** -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, -and the Massachusetts Institute of Technology, Cambridge, Massachusetts. + +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 @@ -10,7 +32,7 @@ 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 Digital or MIT not be +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. @@ -24,10 +46,20 @@ SOFTWARE. ******************************************************************/ -#ifndef _XUTIL_H_ -#define _XUTIL_H_ +#ifndef _X11_XUTIL_H_ +#define _X11_XUTIL_H_ /* You must include before including this file */ +#include +#include + +/* The Xlib structs are full of implicit padding to properly align members. + We can't clean that up without breaking ABI, so tell clang not to bother + complaining about it. */ +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpadded" +#endif #if defined(MAC_OSX_TK) # define Region XRegion @@ -112,6 +144,7 @@ typedef struct { #define WindowGroupHint (1L << 6) #define AllHints (InputHint|StateHint|IconPixmapHint|IconWindowHint| \ IconPositionHint|IconMaskHint|WindowGroupHint) +#define XUrgencyHint (1L << 8) /* definitions for initial window state */ #define WithdrawnState 0 /* for windows that are not mapped */ @@ -146,7 +179,9 @@ typedef enum { XStringStyle, /* STRING */ XCompoundTextStyle, /* COMPOUND_TEXT */ XTextStyle, /* text in owner's encoding (current locale)*/ - XStdICCTextStyle /* STRING, else COMPOUND_TEXT */ + XStdICCTextStyle, /* STRING, else COMPOUND_TEXT */ + /* The following is an XFree86 extension, introduced in November 2000 */ + XUTF8StringStyle /* UTF8_STRING */ } XICCEncodingStyle; typedef struct { @@ -160,6 +195,24 @@ typedef struct { char *res_class; } XClassHint; +#ifdef XUTIL_DEFINE_FUNCTIONS +extern int XDestroyImage( + XImage *ximage); +extern unsigned long XGetPixel( + XImage *ximage, + int x, int y); +extern int XPutPixel( + XImage *ximage, + int x, int y, + unsigned long pixel); +extern XImage *XSubImage( + XImage *ximage, + int x, int y, + unsigned int width, unsigned int height); +extern int XAddPixel( + XImage *ximage, + long value); +#else /* * These macros are used to give some sugar to the image routines so that * naive people are more comfortable with them. @@ -174,6 +227,7 @@ typedef struct { ((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height))) #define XAddPixel(ximage, value) \ ((*((ximage)->f.add_pixel))((ximage), (value))) +#endif /* * Compose sequence status structure, used in calling XLookupString. @@ -189,6 +243,9 @@ typedef struct _XComposeStatus { #define IsKeypadKey(keysym) \ (((unsigned)(keysym) >= XK_KP_Space) && ((unsigned)(keysym) <= XK_KP_Equal)) +#define IsPrivateKeypadKey(keysym) \ + (((unsigned)(keysym) >= 0x11000000) && ((unsigned)(keysym) <= 0x1100FFFF)) + #define IsCursorKey(keysym) \ (((unsigned)(keysym) >= XK_Home) && ((unsigned)(keysym) < XK_Select)) @@ -201,10 +258,19 @@ typedef struct _XComposeStatus { #define IsMiscFunctionKey(keysym) \ (((unsigned)(keysym) >= XK_Select) && ((unsigned)(keysym) <= XK_Break)) +#ifdef XK_XKB_KEYS +#define IsModifierKey(keysym) \ + ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \ + || (((unsigned)(keysym) >= XK_ISO_Lock) && \ + ((unsigned)(keysym) <= XK_ISO_Level5_Lock)) \ + || ((unsigned)(keysym) == XK_Mode_switch) \ + || ((unsigned)(keysym) == XK_Num_Lock)) +#else #define IsModifierKey(keysym) \ ((((unsigned)(keysym) >= XK_Shift_L) && ((unsigned)(keysym) <= XK_Hyper_R)) \ || ((unsigned)(keysym) == XK_Mode_switch) \ || ((unsigned)(keysym) == XK_Num_Lock)) +#endif /* * opaque reference to Region data type */ @@ -302,328 +368,250 @@ _XFUNCPROTOBEGIN /* The following declarations are alphabetized. */ extern XClassHint *XAllocClassHint ( -#if NeedFunctionPrototypes void -#endif ); extern XIconSize *XAllocIconSize ( -#if NeedFunctionPrototypes void -#endif ); extern XSizeHints *XAllocSizeHints ( -#if NeedFunctionPrototypes void -#endif ); extern XStandardColormap *XAllocStandardColormap ( -#if NeedFunctionPrototypes void -#endif ); extern XWMHints *XAllocWMHints ( -#if NeedFunctionPrototypes void -#endif ); -extern void XClipBox( -#if NeedFunctionPrototypes +extern int XClipBox( Region /* r */, XRectangle* /* rect_return */ -#endif ); extern Region XCreateRegion( -#if NeedFunctionPrototypes void -#endif ); -extern char *XDefaultString( -#if NeedFunctionPrototypes - void -#endif -); +extern const char *XDefaultString (void); extern int XDeleteContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */ -#endif ); -extern void XDestroyRegion( -#if NeedFunctionPrototypes +extern int XDestroyRegion( Region /* r */ -#endif ); -extern Bool XEmptyRegion( -#if NeedFunctionPrototypes +extern int XEmptyRegion( Region /* r */ -#endif ); -extern Bool XEqualRegion( -#if NeedFunctionPrototypes +extern int XEqualRegion( Region /* r1 */, Region /* r2 */ -#endif ); extern int XFindContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */, XPointer* /* data_return */ -#endif ); extern Status XGetClassHint( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XClassHint* /* class_hints_return */ -#endif ); extern Status XGetIconSizes( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XIconSize** /* size_list_return */, int* /* count_return */ -#endif ); extern Status XGetNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */ -#endif ); extern Status XGetRGBColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap** /* stdcmap_return */, int* /* count_return */, Atom /* property */ -#endif ); extern Status XGetSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, Atom /* property */ -#endif ); extern Status XGetStandardColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, Atom /* property */ -#endif ); extern Status XGetTextProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, XTextProperty* /* text_prop_return */, Atom /* property */ -#endif ); - extern Status XGetWMClientMachine( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern XWMHints *XGetWMHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */ -#endif ); extern Status XGetWMIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern Status XGetWMName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop_return */ -#endif ); extern Status XGetWMNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */ -#endif ); extern Status XGetWMSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, long* /* supplied_return */, Atom /* property */ -#endif ); extern Status XGetZoomHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* zhints_return */ -#endif ); -extern void XIntersectRegion( -#if NeedFunctionPrototypes +extern int XIntersectRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif +); + +extern void XConvertCase( + KeySym /* sym */, + KeySym* /* lower */, + KeySym* /* upper */ ); extern int XLookupString( -#if NeedFunctionPrototypes XKeyEvent* /* event_struct */, char* /* buffer_return */, int /* bytes_buffer */, KeySym* /* keysym_return */, XComposeStatus* /* status_in_out */ -#endif ); extern Status XMatchVisualInfo( -#if NeedFunctionPrototypes Display* /* display */, int /* screen */, int /* depth */, int /* class */, XVisualInfo* /* vinfo_return */ -#endif ); extern int XOffsetRegion( -#if NeedFunctionPrototypes Region /* r */, int /* dx */, int /* dy */ -#endif ); extern Bool XPointInRegion( -#if NeedFunctionPrototypes Region /* r */, int /* x */, int /* y */ -#endif ); extern Region XPolygonRegion( -#if NeedFunctionPrototypes XPoint* /* points */, int /* n */, int /* fill_rule */ -#endif ); extern int XRectInRegion( -#if NeedFunctionPrototypes Region /* r */, int /* x */, int /* y */, unsigned int /* width */, unsigned int /* height */ -#endif ); extern int XSaveContext( -#if NeedFunctionPrototypes Display* /* display */, XID /* rid */, XContext /* context */, _Xconst char* /* data */ -#endif ); -extern void XSetClassHint( -#if NeedFunctionPrototypes +extern int XSetClassHint( Display* /* display */, Window /* w */, XClassHint* /* class_hints */ -#endif ); -extern void XSetIconSizes( -#if NeedFunctionPrototypes +extern int XSetIconSizes( Display* /* display */, Window /* w */, XIconSize* /* size_list */, int /* count */ -#endif ); -extern void XSetNormalHints( -#if NeedFunctionPrototypes +extern int XSetNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */ -#endif ); extern void XSetRGBColormaps( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* stdcmaps */, int /* count */, Atom /* property */ -#endif ); -extern void XSetSizeHints( -#if NeedFunctionPrototypes +extern int XSetSizeHints( Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ -#endif ); -extern void XSetStandardProperties( -#if NeedFunctionPrototypes +extern int XSetStandardProperties( Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -632,52 +620,40 @@ extern void XSetStandardProperties( char** /* argv */, int /* argc */, XSizeHints* /* hints */ -#endif ); extern void XSetTextProperty( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */, Atom /* property */ -#endif ); -extern void XSetWMHints( -#if NeedFunctionPrototypes +extern int XSetWMHints( Display* /* display */, Window /* w */, XWMHints* /* wm_hints */ -#endif ); extern void XSetWMIconName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern void XSetWMName( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* text_prop */ -#endif ); extern void XSetWMNormalHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */ -#endif ); extern void XSetWMProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XTextProperty* /* window_name */, @@ -687,11 +663,9 @@ extern void XSetWMProperties( XSizeHints* /* normal_hints */, XWMHints* /* wm_hints */, XClassHint* /* class_hints */ -#endif ); extern void XmbSetWMProperties( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, _Xconst char* /* window_name */, @@ -701,129 +675,126 @@ extern void XmbSetWMProperties( XSizeHints* /* normal_hints */, XWMHints* /* wm_hints */, XClassHint* /* class_hints */ -#endif +); + +extern void Xutf8SetWMProperties( + Display* /* display */, + Window /* w */, + _Xconst char* /* window_name */, + _Xconst char* /* icon_name */, + char** /* argv */, + int /* argc */, + XSizeHints* /* normal_hints */, + XWMHints* /* wm_hints */, + XClassHint* /* class_hints */ ); extern void XSetWMSizeHints( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XSizeHints* /* hints */, Atom /* property */ -#endif ); -extern void XSetRegion( -#if NeedFunctionPrototypes +extern int XSetRegion( Display* /* display */, GC /* gc */, Region /* r */ -#endif ); extern void XSetStandardColormap( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XStandardColormap* /* colormap */, Atom /* property */ -#endif ); -extern void XSetZoomHints( -#if NeedFunctionPrototypes +extern int XSetZoomHints( Display* /* display */, Window /* w */, XSizeHints* /* zhints */ -#endif ); -extern void XShrinkRegion( -#if NeedFunctionPrototypes +extern int XShrinkRegion( Region /* r */, int /* dx */, int /* dy */ -#endif ); -extern void XSubtractRegion( -#if NeedFunctionPrototypes +extern int XSubtractRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern int XmbTextListToTextProperty( -#if NeedFunctionPrototypes - Display* /* display */, - char** /* list */, - int /* count */, - XICCEncodingStyle /* style */, - XTextProperty* /* text_prop_return */ -#endif + Display* display, + char** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return ); extern int XwcTextListToTextProperty( -#if NeedFunctionPrototypes - Display* /* display */, - wchar_t** /* list */, - int /* count */, - XICCEncodingStyle /* style */, - XTextProperty* /* text_prop_return */ -#endif + Display* display, + wchar_t** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return +); + +extern int Xutf8TextListToTextProperty( + Display* display, + char** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return ); extern void XwcFreeStringList( -#if NeedFunctionPrototypes - wchar_t** /* list */ -#endif + wchar_t** list ); extern Status XTextPropertyToStringList( -#if NeedFunctionPrototypes XTextProperty* /* text_prop */, char*** /* list_return */, int* /* count_return */ -#endif ); extern int XmbTextPropertyToTextList( -#if NeedFunctionPrototypes - Display* /* display */, - XTextProperty* /* text_prop */, - char*** /* list_return */, - int* /* count_return */ -#endif + Display* display, + const XTextProperty* text_prop, + char*** list_return, + int* count_return ); extern int XwcTextPropertyToTextList( -#if NeedFunctionPrototypes - Display* /* display */, - XTextProperty* /* text_prop */, - wchar_t*** /* list_return */, - int* /* count_return */ -#endif + Display* display, + const XTextProperty* text_prop, + wchar_t*** list_return, + int* count_return +); + +extern int Xutf8TextPropertyToTextList( + Display* display, + const XTextProperty* text_prop, + char*** list_return, + int* count_return ); -extern void XUnionRectWithRegion( -#if NeedFunctionPrototypes +extern int XUnionRectWithRegion( XRectangle* /* rectangle */, Region /* src_region */, Region /* dest_region_return */ -#endif ); extern int XUnionRegion( -#if NeedFunctionPrototypes Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); extern int XWMGeometry( -#if NeedFunctionPrototypes Display* /* display */, int /* screen_number */, _Xconst char* /* user_geometry */, @@ -835,21 +806,22 @@ extern int XWMGeometry( int* /* width_return */, int* /* height_return */, int* /* gravity_return */ -#endif ); -extern void XXorRegion( -#if NeedFunctionPrototypes +extern int XXorRegion( Region /* sra */, Region /* srb */, Region /* dr_return */ -#endif ); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + _XFUNCPROTOEND #if defined(MAC_OSX_TK) # undef Region #endif -#endif /* _XUTIL_H_ */ +#endif /* _X11_XUTIL_H_ */ diff --git a/mingw64/include/X11/ap_keysym.h b/mingw64/include/X11/ap_keysym.h index 76cbde2d053..601f1e58692 100644 --- a/mingw64/include/X11/ap_keysym.h +++ b/mingw64/include/X11/ap_keysym.h @@ -13,7 +13,7 @@ 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 +TO THIS SOFTWARE, 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 diff --git a/mingw64/include/X11/cursorfont.h b/mingw64/include/X11/cursorfont.h index 617274fa806..c69d508f491 100644 --- a/mingw64/include/X11/cursorfont.h +++ b/mingw64/include/X11/cursorfont.h @@ -1,4 +1,34 @@ -/* $XConsortium: cursorfont.h,v 1.2 88/09/06 16:44:27 jim Exp $ */ +/* + +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. + +*/ + +#ifndef _X11_CURSORFONT_H_ +#define _X11_CURSORFONT_H_ + #define XC_num_glyphs 154 #define XC_X_cursor 0 #define XC_arrow 2 @@ -77,3 +107,5 @@ #define XC_ur_angle 148 #define XC_watch 150 #define XC_xterm 152 + +#endif /* _X11_CURSORFONT_H_ */ diff --git a/mingw64/include/X11/keysym.h b/mingw64/include/X11/keysym.h index 2547abede3f..0ffdde4a5ae 100644 --- a/mingw64/include/X11/keysym.h +++ b/mingw64/include/X11/keysym.h @@ -47,16 +47,28 @@ SOFTWARE. /* default keysyms */ #define XK_MISCELLANY +#define XK_XKB_KEYS #define XK_LATIN1 #define XK_LATIN2 #define XK_LATIN3 #define XK_LATIN4 +#define XK_LATIN8 #define XK_LATIN9 +#define XK_CAUCASUS #define XK_GREEK #define XK_KATAKANA #define XK_ARABIC #define XK_CYRILLIC #define XK_HEBREW +#define XK_THAI +#define XK_KOREAN +#define XK_ARMENIAN +#define XK_GEORGIAN +#define XK_VIETNAMESE +#define XK_CURRENCY +#define XK_MATHEMATICAL +#define XK_BRAILLE +#define XK_SINHALA #include diff --git a/mingw64/include/X11/keysymdef.h b/mingw64/include/X11/keysymdef.h index 5c13c61d43a..31110e05721 100644 --- a/mingw64/include/X11/keysymdef.h +++ b/mingw64/include/X11/keysymdef.h @@ -161,6 +161,11 @@ SOFTWARE. #define XK_Kana_Shift 0xff2e /* Kana Shift */ #define XK_Eisu_Shift 0xff2f /* Alphanumeric Shift */ #define XK_Eisu_toggle 0xff30 /* Alphanumeric toggle */ +#define XK_Kanji_Bangou 0xff37 /* Codeinput */ +#define XK_Zen_Koho 0xff3d /* Multiple/All Candidate(s) */ +#define XK_Mae_Koho 0xff3e /* Previous Candidate */ + +/* 0xff31 thru 0xff3f are under XK_KOREAN */ /* Cursor control & motion */ @@ -330,6 +335,212 @@ SOFTWARE. #define XK_Hyper_R 0xffee /* Right hyper */ #endif /* XK_MISCELLANY */ +/* + * Keyboard (XKB) Extension function and modifier keys + * (from Appendix C of "The X Keyboard Extension: Protocol Specification") + * Byte 3 = 0xfe + */ + +#ifdef XK_XKB_KEYS +#define XK_ISO_Lock 0xfe01 +#define XK_ISO_Level2_Latch 0xfe02 +#define XK_ISO_Level3_Shift 0xfe03 +#define XK_ISO_Level3_Latch 0xfe04 +#define XK_ISO_Level3_Lock 0xfe05 +#define XK_ISO_Level5_Shift 0xfe11 +#define XK_ISO_Level5_Latch 0xfe12 +#define XK_ISO_Level5_Lock 0xfe13 +#define XK_ISO_Group_Shift 0xff7e /* Alias for mode_switch */ +#define XK_ISO_Group_Latch 0xfe06 +#define XK_ISO_Group_Lock 0xfe07 +#define XK_ISO_Next_Group 0xfe08 +#define XK_ISO_Next_Group_Lock 0xfe09 +#define XK_ISO_Prev_Group 0xfe0a +#define XK_ISO_Prev_Group_Lock 0xfe0b +#define XK_ISO_First_Group 0xfe0c +#define XK_ISO_First_Group_Lock 0xfe0d +#define XK_ISO_Last_Group 0xfe0e +#define XK_ISO_Last_Group_Lock 0xfe0f + +#define XK_ISO_Left_Tab 0xfe20 +#define XK_ISO_Move_Line_Up 0xfe21 +#define XK_ISO_Move_Line_Down 0xfe22 +#define XK_ISO_Partial_Line_Up 0xfe23 +#define XK_ISO_Partial_Line_Down 0xfe24 +#define XK_ISO_Partial_Space_Left 0xfe25 +#define XK_ISO_Partial_Space_Right 0xfe26 +#define XK_ISO_Set_Margin_Left 0xfe27 +#define XK_ISO_Set_Margin_Right 0xfe28 +#define XK_ISO_Release_Margin_Left 0xfe29 +#define XK_ISO_Release_Margin_Right 0xfe2a +#define XK_ISO_Release_Both_Margins 0xfe2b +#define XK_ISO_Fast_Cursor_Left 0xfe2c +#define XK_ISO_Fast_Cursor_Right 0xfe2d +#define XK_ISO_Fast_Cursor_Up 0xfe2e +#define XK_ISO_Fast_Cursor_Down 0xfe2f +#define XK_ISO_Continuous_Underline 0xfe30 +#define XK_ISO_Discontinuous_Underline 0xfe31 +#define XK_ISO_Emphasize 0xfe32 +#define XK_ISO_Center_Object 0xfe33 +#define XK_ISO_Enter 0xfe34 + +#define XK_dead_grave 0xfe50 +#define XK_dead_acute 0xfe51 +#define XK_dead_circumflex 0xfe52 +#define XK_dead_tilde 0xfe53 +#define XK_dead_perispomeni 0xfe53 /* alias for dead_tilde */ +#define XK_dead_macron 0xfe54 +#define XK_dead_breve 0xfe55 +#define XK_dead_abovedot 0xfe56 +#define XK_dead_diaeresis 0xfe57 +#define XK_dead_abovering 0xfe58 +#define XK_dead_doubleacute 0xfe59 +#define XK_dead_caron 0xfe5a +#define XK_dead_cedilla 0xfe5b +#define XK_dead_ogonek 0xfe5c +#define XK_dead_iota 0xfe5d +#define XK_dead_voiced_sound 0xfe5e +#define XK_dead_semivoiced_sound 0xfe5f +#define XK_dead_belowdot 0xfe60 +#define XK_dead_hook 0xfe61 +#define XK_dead_horn 0xfe62 +#define XK_dead_stroke 0xfe63 +#define XK_dead_abovecomma 0xfe64 +#define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */ +#define XK_dead_abovereversedcomma 0xfe65 +#define XK_dead_dasia 0xfe65 /* alias for dead_abovereversedcomma */ +#define XK_dead_doublegrave 0xfe66 +#define XK_dead_belowring 0xfe67 +#define XK_dead_belowmacron 0xfe68 +#define XK_dead_belowcircumflex 0xfe69 +#define XK_dead_belowtilde 0xfe6a +#define XK_dead_belowbreve 0xfe6b +#define XK_dead_belowdiaeresis 0xfe6c +#define XK_dead_invertedbreve 0xfe6d +#define XK_dead_belowcomma 0xfe6e +#define XK_dead_currency 0xfe6f + +/* extra dead elements for German T3 layout */ +#define XK_dead_lowline 0xfe90 +#define XK_dead_aboveverticalline 0xfe91 +#define XK_dead_belowverticalline 0xfe92 +#define XK_dead_longsolidusoverlay 0xfe93 + +/* dead vowels for universal syllable entry */ +#define XK_dead_a 0xfe80 +#define XK_dead_A 0xfe81 +#define XK_dead_e 0xfe82 +#define XK_dead_E 0xfe83 +#define XK_dead_i 0xfe84 +#define XK_dead_I 0xfe85 +#define XK_dead_o 0xfe86 +#define XK_dead_O 0xfe87 +#define XK_dead_u 0xfe88 +#define XK_dead_U 0xfe89 +#define XK_dead_small_schwa 0xfe8a +#define XK_dead_capital_schwa 0xfe8b + +#define XK_dead_greek 0xfe8c + +#define XK_First_Virtual_Screen 0xfed0 +#define XK_Prev_Virtual_Screen 0xfed1 +#define XK_Next_Virtual_Screen 0xfed2 +#define XK_Last_Virtual_Screen 0xfed4 +#define XK_Terminate_Server 0xfed5 + +#define XK_AccessX_Enable 0xfe70 +#define XK_AccessX_Feedback_Enable 0xfe71 +#define XK_RepeatKeys_Enable 0xfe72 +#define XK_SlowKeys_Enable 0xfe73 +#define XK_BounceKeys_Enable 0xfe74 +#define XK_StickyKeys_Enable 0xfe75 +#define XK_MouseKeys_Enable 0xfe76 +#define XK_MouseKeys_Accel_Enable 0xfe77 +#define XK_Overlay1_Enable 0xfe78 +#define XK_Overlay2_Enable 0xfe79 +#define XK_AudibleBell_Enable 0xfe7a + +#define XK_Pointer_Left 0xfee0 +#define XK_Pointer_Right 0xfee1 +#define XK_Pointer_Up 0xfee2 +#define XK_Pointer_Down 0xfee3 +#define XK_Pointer_UpLeft 0xfee4 +#define XK_Pointer_UpRight 0xfee5 +#define XK_Pointer_DownLeft 0xfee6 +#define XK_Pointer_DownRight 0xfee7 +#define XK_Pointer_Button_Dflt 0xfee8 +#define XK_Pointer_Button1 0xfee9 +#define XK_Pointer_Button2 0xfeea +#define XK_Pointer_Button3 0xfeeb +#define XK_Pointer_Button4 0xfeec +#define XK_Pointer_Button5 0xfeed +#define XK_Pointer_DblClick_Dflt 0xfeee +#define XK_Pointer_DblClick1 0xfeef +#define XK_Pointer_DblClick2 0xfef0 +#define XK_Pointer_DblClick3 0xfef1 +#define XK_Pointer_DblClick4 0xfef2 +#define XK_Pointer_DblClick5 0xfef3 +#define XK_Pointer_Drag_Dflt 0xfef4 +#define XK_Pointer_Drag1 0xfef5 +#define XK_Pointer_Drag2 0xfef6 +#define XK_Pointer_Drag3 0xfef7 +#define XK_Pointer_Drag4 0xfef8 +#define XK_Pointer_Drag5 0xfefd + +#define XK_Pointer_EnableKeys 0xfef9 +#define XK_Pointer_Accelerate 0xfefa +#define XK_Pointer_DfltBtnNext 0xfefb +#define XK_Pointer_DfltBtnPrev 0xfefc + +/* Single-Stroke Multiple-Character N-Graph Keysyms For The X Input Method */ + +#define XK_ch 0xfea0 +#define XK_Ch 0xfea1 +#define XK_CH 0xfea2 +#define XK_c_h 0xfea3 +#define XK_C_h 0xfea4 +#define XK_C_H 0xfea5 + +#endif /* XK_XKB_KEYS */ + +/* + * 3270 Terminal Keys + * Byte 3 = 0xfd + */ + +#ifdef XK_3270 +#define XK_3270_Duplicate 0xfd01 +#define XK_3270_FieldMark 0xfd02 +#define XK_3270_Right2 0xfd03 +#define XK_3270_Left2 0xfd04 +#define XK_3270_BackTab 0xfd05 +#define XK_3270_EraseEOF 0xfd06 +#define XK_3270_EraseInput 0xfd07 +#define XK_3270_Reset 0xfd08 +#define XK_3270_Quit 0xfd09 +#define XK_3270_PA1 0xfd0a +#define XK_3270_PA2 0xfd0b +#define XK_3270_PA3 0xfd0c +#define XK_3270_Test 0xfd0d +#define XK_3270_Attn 0xfd0e +#define XK_3270_CursorBlink 0xfd0f +#define XK_3270_AltCursor 0xfd10 +#define XK_3270_KeyClick 0xfd11 +#define XK_3270_Jump 0xfd12 +#define XK_3270_Ident 0xfd13 +#define XK_3270_Rule 0xfd14 +#define XK_3270_Copy 0xfd15 +#define XK_3270_Play 0xfd16 +#define XK_3270_Setup 0xfd17 +#define XK_3270_Record 0xfd18 +#define XK_3270_ChangeScreen 0xfd19 +#define XK_3270_DeleteWord 0xfd1a +#define XK_3270_ExSelect 0xfd1b +#define XK_3270_CursorSelect 0xfd1c +#define XK_3270_PrintScreen 0xfd1d +#define XK_3270_Enter 0xfd1e +#endif /* XK_3270 */ + /* * Latin 1 * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF) @@ -1282,6 +1493,246 @@ SOFTWARE. #define XK_Hebrew_switch 0xff7e /* Alias for mode_switch */ #endif /* XK_HEBREW */ +/* + * Thai + * Byte 3 = 0x0d + */ + +#ifdef XK_THAI +#define XK_Thai_kokai 0x0da1 /* U+0E01 THAI CHARACTER KO KAI */ +#define XK_Thai_khokhai 0x0da2 /* U+0E02 THAI CHARACTER KHO KHAI */ +#define XK_Thai_khokhuat 0x0da3 /* U+0E03 THAI CHARACTER KHO KHUAT */ +#define XK_Thai_khokhwai 0x0da4 /* U+0E04 THAI CHARACTER KHO KHWAI */ +#define XK_Thai_khokhon 0x0da5 /* U+0E05 THAI CHARACTER KHO KHON */ +#define XK_Thai_khorakhang 0x0da6 /* U+0E06 THAI CHARACTER KHO RAKHANG */ +#define XK_Thai_ngongu 0x0da7 /* U+0E07 THAI CHARACTER NGO NGU */ +#define XK_Thai_chochan 0x0da8 /* U+0E08 THAI CHARACTER CHO CHAN */ +#define XK_Thai_choching 0x0da9 /* U+0E09 THAI CHARACTER CHO CHING */ +#define XK_Thai_chochang 0x0daa /* U+0E0A THAI CHARACTER CHO CHANG */ +#define XK_Thai_soso 0x0dab /* U+0E0B THAI CHARACTER SO SO */ +#define XK_Thai_chochoe 0x0dac /* U+0E0C THAI CHARACTER CHO CHOE */ +#define XK_Thai_yoying 0x0dad /* U+0E0D THAI CHARACTER YO YING */ +#define XK_Thai_dochada 0x0dae /* U+0E0E THAI CHARACTER DO CHADA */ +#define XK_Thai_topatak 0x0daf /* U+0E0F THAI CHARACTER TO PATAK */ +#define XK_Thai_thothan 0x0db0 /* U+0E10 THAI CHARACTER THO THAN */ +#define XK_Thai_thonangmontho 0x0db1 /* U+0E11 THAI CHARACTER THO NANGMONTHO */ +#define XK_Thai_thophuthao 0x0db2 /* U+0E12 THAI CHARACTER THO PHUTHAO */ +#define XK_Thai_nonen 0x0db3 /* U+0E13 THAI CHARACTER NO NEN */ +#define XK_Thai_dodek 0x0db4 /* U+0E14 THAI CHARACTER DO DEK */ +#define XK_Thai_totao 0x0db5 /* U+0E15 THAI CHARACTER TO TAO */ +#define XK_Thai_thothung 0x0db6 /* U+0E16 THAI CHARACTER THO THUNG */ +#define XK_Thai_thothahan 0x0db7 /* U+0E17 THAI CHARACTER THO THAHAN */ +#define XK_Thai_thothong 0x0db8 /* U+0E18 THAI CHARACTER THO THONG */ +#define XK_Thai_nonu 0x0db9 /* U+0E19 THAI CHARACTER NO NU */ +#define XK_Thai_bobaimai 0x0dba /* U+0E1A THAI CHARACTER BO BAIMAI */ +#define XK_Thai_popla 0x0dbb /* U+0E1B THAI CHARACTER PO PLA */ +#define XK_Thai_phophung 0x0dbc /* U+0E1C THAI CHARACTER PHO PHUNG */ +#define XK_Thai_fofa 0x0dbd /* U+0E1D THAI CHARACTER FO FA */ +#define XK_Thai_phophan 0x0dbe /* U+0E1E THAI CHARACTER PHO PHAN */ +#define XK_Thai_fofan 0x0dbf /* U+0E1F THAI CHARACTER FO FAN */ +#define XK_Thai_phosamphao 0x0dc0 /* U+0E20 THAI CHARACTER PHO SAMPHAO */ +#define XK_Thai_moma 0x0dc1 /* U+0E21 THAI CHARACTER MO MA */ +#define XK_Thai_yoyak 0x0dc2 /* U+0E22 THAI CHARACTER YO YAK */ +#define XK_Thai_rorua 0x0dc3 /* U+0E23 THAI CHARACTER RO RUA */ +#define XK_Thai_ru 0x0dc4 /* U+0E24 THAI CHARACTER RU */ +#define XK_Thai_loling 0x0dc5 /* U+0E25 THAI CHARACTER LO LING */ +#define XK_Thai_lu 0x0dc6 /* U+0E26 THAI CHARACTER LU */ +#define XK_Thai_wowaen 0x0dc7 /* U+0E27 THAI CHARACTER WO WAEN */ +#define XK_Thai_sosala 0x0dc8 /* U+0E28 THAI CHARACTER SO SALA */ +#define XK_Thai_sorusi 0x0dc9 /* U+0E29 THAI CHARACTER SO RUSI */ +#define XK_Thai_sosua 0x0dca /* U+0E2A THAI CHARACTER SO SUA */ +#define XK_Thai_hohip 0x0dcb /* U+0E2B THAI CHARACTER HO HIP */ +#define XK_Thai_lochula 0x0dcc /* U+0E2C THAI CHARACTER LO CHULA */ +#define XK_Thai_oang 0x0dcd /* U+0E2D THAI CHARACTER O ANG */ +#define XK_Thai_honokhuk 0x0dce /* U+0E2E THAI CHARACTER HO NOKHUK */ +#define XK_Thai_paiyannoi 0x0dcf /* U+0E2F THAI CHARACTER PAIYANNOI */ +#define XK_Thai_saraa 0x0dd0 /* U+0E30 THAI CHARACTER SARA A */ +#define XK_Thai_maihanakat 0x0dd1 /* U+0E31 THAI CHARACTER MAI HAN-AKAT */ +#define XK_Thai_saraaa 0x0dd2 /* U+0E32 THAI CHARACTER SARA AA */ +#define XK_Thai_saraam 0x0dd3 /* U+0E33 THAI CHARACTER SARA AM */ +#define XK_Thai_sarai 0x0dd4 /* U+0E34 THAI CHARACTER SARA I */ +#define XK_Thai_saraii 0x0dd5 /* U+0E35 THAI CHARACTER SARA II */ +#define XK_Thai_saraue 0x0dd6 /* U+0E36 THAI CHARACTER SARA UE */ +#define XK_Thai_sarauee 0x0dd7 /* U+0E37 THAI CHARACTER SARA UEE */ +#define XK_Thai_sarau 0x0dd8 /* U+0E38 THAI CHARACTER SARA U */ +#define XK_Thai_sarauu 0x0dd9 /* U+0E39 THAI CHARACTER SARA UU */ +#define XK_Thai_phinthu 0x0dda /* U+0E3A THAI CHARACTER PHINTHU */ +#define XK_Thai_maihanakat_maitho 0x0dde +#define XK_Thai_baht 0x0ddf /* U+0E3F THAI CURRENCY SYMBOL BAHT */ +#define XK_Thai_sarae 0x0de0 /* U+0E40 THAI CHARACTER SARA E */ +#define XK_Thai_saraae 0x0de1 /* U+0E41 THAI CHARACTER SARA AE */ +#define XK_Thai_sarao 0x0de2 /* U+0E42 THAI CHARACTER SARA O */ +#define XK_Thai_saraaimaimuan 0x0de3 /* U+0E43 THAI CHARACTER SARA AI MAIMUAN */ +#define XK_Thai_saraaimaimalai 0x0de4 /* U+0E44 THAI CHARACTER SARA AI MAIMALAI */ +#define XK_Thai_lakkhangyao 0x0de5 /* U+0E45 THAI CHARACTER LAKKHANGYAO */ +#define XK_Thai_maiyamok 0x0de6 /* U+0E46 THAI CHARACTER MAIYAMOK */ +#define XK_Thai_maitaikhu 0x0de7 /* U+0E47 THAI CHARACTER MAITAIKHU */ +#define XK_Thai_maiek 0x0de8 /* U+0E48 THAI CHARACTER MAI EK */ +#define XK_Thai_maitho 0x0de9 /* U+0E49 THAI CHARACTER MAI THO */ +#define XK_Thai_maitri 0x0dea /* U+0E4A THAI CHARACTER MAI TRI */ +#define XK_Thai_maichattawa 0x0deb /* U+0E4B THAI CHARACTER MAI CHATTAWA */ +#define XK_Thai_thanthakhat 0x0dec /* U+0E4C THAI CHARACTER THANTHAKHAT */ +#define XK_Thai_nikhahit 0x0ded /* U+0E4D THAI CHARACTER NIKHAHIT */ +#define XK_Thai_leksun 0x0df0 /* U+0E50 THAI DIGIT ZERO */ +#define XK_Thai_leknung 0x0df1 /* U+0E51 THAI DIGIT ONE */ +#define XK_Thai_leksong 0x0df2 /* U+0E52 THAI DIGIT TWO */ +#define XK_Thai_leksam 0x0df3 /* U+0E53 THAI DIGIT THREE */ +#define XK_Thai_leksi 0x0df4 /* U+0E54 THAI DIGIT FOUR */ +#define XK_Thai_lekha 0x0df5 /* U+0E55 THAI DIGIT FIVE */ +#define XK_Thai_lekhok 0x0df6 /* U+0E56 THAI DIGIT SIX */ +#define XK_Thai_lekchet 0x0df7 /* U+0E57 THAI DIGIT SEVEN */ +#define XK_Thai_lekpaet 0x0df8 /* U+0E58 THAI DIGIT EIGHT */ +#define XK_Thai_lekkao 0x0df9 /* U+0E59 THAI DIGIT NINE */ +#endif /* XK_THAI */ + +/* + * Korean + * Byte 3 = 0x0e + */ + +#ifdef XK_KOREAN + +#define XK_Hangul 0xff31 /* Hangul start/stop(toggle) */ +#define XK_Hangul_Start 0xff32 /* Hangul start */ +#define XK_Hangul_End 0xff33 /* Hangul end, English start */ +#define XK_Hangul_Hanja 0xff34 /* Start Hangul->Hanja Conversion */ +#define XK_Hangul_Jamo 0xff35 /* Hangul Jamo mode */ +#define XK_Hangul_Romaja 0xff36 /* Hangul Romaja mode */ +#define XK_Hangul_Codeinput 0xff37 /* Hangul code input mode */ +#define XK_Hangul_Jeonja 0xff38 /* Jeonja mode */ +#define XK_Hangul_Banja 0xff39 /* Banja mode */ +#define XK_Hangul_PreHanja 0xff3a /* Pre Hanja conversion */ +#define XK_Hangul_PostHanja 0xff3b /* Post Hanja conversion */ +#define XK_Hangul_SingleCandidate 0xff3c /* Single candidate */ +#define XK_Hangul_MultipleCandidate 0xff3d /* Multiple candidate */ +#define XK_Hangul_PreviousCandidate 0xff3e /* Previous candidate */ +#define XK_Hangul_Special 0xff3f /* Special symbols */ +#define XK_Hangul_switch 0xff7e /* Alias for mode_switch */ + +/* Hangul Consonant Characters */ +#define XK_Hangul_Kiyeog 0x0ea1 /* U+3131 HANGUL LETTER KIYEOK */ +#define XK_Hangul_SsangKiyeog 0x0ea2 /* U+3132 HANGUL LETTER SSANGKIYEOK */ +#define XK_Hangul_KiyeogSios 0x0ea3 /* U+3133 HANGUL LETTER KIYEOK-SIOS */ +#define XK_Hangul_Nieun 0x0ea4 /* U+3134 HANGUL LETTER NIEUN */ +#define XK_Hangul_NieunJieuj 0x0ea5 /* U+3135 HANGUL LETTER NIEUN-CIEUC */ +#define XK_Hangul_NieunHieuh 0x0ea6 /* U+3136 HANGUL LETTER NIEUN-HIEUH */ +#define XK_Hangul_Dikeud 0x0ea7 /* U+3137 HANGUL LETTER TIKEUT */ +#define XK_Hangul_SsangDikeud 0x0ea8 /* U+3138 HANGUL LETTER SSANGTIKEUT */ +#define XK_Hangul_Rieul 0x0ea9 /* U+3139 HANGUL LETTER RIEUL */ +#define XK_Hangul_RieulKiyeog 0x0eaa /* U+313A HANGUL LETTER RIEUL-KIYEOK */ +#define XK_Hangul_RieulMieum 0x0eab /* U+313B HANGUL LETTER RIEUL-MIEUM */ +#define XK_Hangul_RieulPieub 0x0eac /* U+313C HANGUL LETTER RIEUL-PIEUP */ +#define XK_Hangul_RieulSios 0x0ead /* U+313D HANGUL LETTER RIEUL-SIOS */ +#define XK_Hangul_RieulTieut 0x0eae /* U+313E HANGUL LETTER RIEUL-THIEUTH */ +#define XK_Hangul_RieulPhieuf 0x0eaf /* U+313F HANGUL LETTER RIEUL-PHIEUPH */ +#define XK_Hangul_RieulHieuh 0x0eb0 /* U+3140 HANGUL LETTER RIEUL-HIEUH */ +#define XK_Hangul_Mieum 0x0eb1 /* U+3141 HANGUL LETTER MIEUM */ +#define XK_Hangul_Pieub 0x0eb2 /* U+3142 HANGUL LETTER PIEUP */ +#define XK_Hangul_SsangPieub 0x0eb3 /* U+3143 HANGUL LETTER SSANGPIEUP */ +#define XK_Hangul_PieubSios 0x0eb4 /* U+3144 HANGUL LETTER PIEUP-SIOS */ +#define XK_Hangul_Sios 0x0eb5 /* U+3145 HANGUL LETTER SIOS */ +#define XK_Hangul_SsangSios 0x0eb6 /* U+3146 HANGUL LETTER SSANGSIOS */ +#define XK_Hangul_Ieung 0x0eb7 /* U+3147 HANGUL LETTER IEUNG */ +#define XK_Hangul_Jieuj 0x0eb8 /* U+3148 HANGUL LETTER CIEUC */ +#define XK_Hangul_SsangJieuj 0x0eb9 /* U+3149 HANGUL LETTER SSANGCIEUC */ +#define XK_Hangul_Cieuc 0x0eba /* U+314A HANGUL LETTER CHIEUCH */ +#define XK_Hangul_Khieuq 0x0ebb /* U+314B HANGUL LETTER KHIEUKH */ +#define XK_Hangul_Tieut 0x0ebc /* U+314C HANGUL LETTER THIEUTH */ +#define XK_Hangul_Phieuf 0x0ebd /* U+314D HANGUL LETTER PHIEUPH */ +#define XK_Hangul_Hieuh 0x0ebe /* U+314E HANGUL LETTER HIEUH */ + +/* Hangul Vowel Characters */ +#define XK_Hangul_A 0x0ebf /* U+314F HANGUL LETTER A */ +#define XK_Hangul_AE 0x0ec0 /* U+3150 HANGUL LETTER AE */ +#define XK_Hangul_YA 0x0ec1 /* U+3151 HANGUL LETTER YA */ +#define XK_Hangul_YAE 0x0ec2 /* U+3152 HANGUL LETTER YAE */ +#define XK_Hangul_EO 0x0ec3 /* U+3153 HANGUL LETTER EO */ +#define XK_Hangul_E 0x0ec4 /* U+3154 HANGUL LETTER E */ +#define XK_Hangul_YEO 0x0ec5 /* U+3155 HANGUL LETTER YEO */ +#define XK_Hangul_YE 0x0ec6 /* U+3156 HANGUL LETTER YE */ +#define XK_Hangul_O 0x0ec7 /* U+3157 HANGUL LETTER O */ +#define XK_Hangul_WA 0x0ec8 /* U+3158 HANGUL LETTER WA */ +#define XK_Hangul_WAE 0x0ec9 /* U+3159 HANGUL LETTER WAE */ +#define XK_Hangul_OE 0x0eca /* U+315A HANGUL LETTER OE */ +#define XK_Hangul_YO 0x0ecb /* U+315B HANGUL LETTER YO */ +#define XK_Hangul_U 0x0ecc /* U+315C HANGUL LETTER U */ +#define XK_Hangul_WEO 0x0ecd /* U+315D HANGUL LETTER WEO */ +#define XK_Hangul_WE 0x0ece /* U+315E HANGUL LETTER WE */ +#define XK_Hangul_WI 0x0ecf /* U+315F HANGUL LETTER WI */ +#define XK_Hangul_YU 0x0ed0 /* U+3160 HANGUL LETTER YU */ +#define XK_Hangul_EU 0x0ed1 /* U+3161 HANGUL LETTER EU */ +#define XK_Hangul_YI 0x0ed2 /* U+3162 HANGUL LETTER YI */ +#define XK_Hangul_I 0x0ed3 /* U+3163 HANGUL LETTER I */ + +/* Hangul syllable-final (JongSeong) Characters */ +#define XK_Hangul_J_Kiyeog 0x0ed4 /* U+11A8 HANGUL JONGSEONG KIYEOK */ +#define XK_Hangul_J_SsangKiyeog 0x0ed5 /* U+11A9 HANGUL JONGSEONG SSANGKIYEOK */ +#define XK_Hangul_J_KiyeogSios 0x0ed6 /* U+11AA HANGUL JONGSEONG KIYEOK-SIOS */ +#define XK_Hangul_J_Nieun 0x0ed7 /* U+11AB HANGUL JONGSEONG NIEUN */ +#define XK_Hangul_J_NieunJieuj 0x0ed8 /* U+11AC HANGUL JONGSEONG NIEUN-CIEUC */ +#define XK_Hangul_J_NieunHieuh 0x0ed9 /* U+11AD HANGUL JONGSEONG NIEUN-HIEUH */ +#define XK_Hangul_J_Dikeud 0x0eda /* U+11AE HANGUL JONGSEONG TIKEUT */ +#define XK_Hangul_J_Rieul 0x0edb /* U+11AF HANGUL JONGSEONG RIEUL */ +#define XK_Hangul_J_RieulKiyeog 0x0edc /* U+11B0 HANGUL JONGSEONG RIEUL-KIYEOK */ +#define XK_Hangul_J_RieulMieum 0x0edd /* U+11B1 HANGUL JONGSEONG RIEUL-MIEUM */ +#define XK_Hangul_J_RieulPieub 0x0ede /* U+11B2 HANGUL JONGSEONG RIEUL-PIEUP */ +#define XK_Hangul_J_RieulSios 0x0edf /* U+11B3 HANGUL JONGSEONG RIEUL-SIOS */ +#define XK_Hangul_J_RieulTieut 0x0ee0 /* U+11B4 HANGUL JONGSEONG RIEUL-THIEUTH */ +#define XK_Hangul_J_RieulPhieuf 0x0ee1 /* U+11B5 HANGUL JONGSEONG RIEUL-PHIEUPH */ +#define XK_Hangul_J_RieulHieuh 0x0ee2 /* U+11B6 HANGUL JONGSEONG RIEUL-HIEUH */ +#define XK_Hangul_J_Mieum 0x0ee3 /* U+11B7 HANGUL JONGSEONG MIEUM */ +#define XK_Hangul_J_Pieub 0x0ee4 /* U+11B8 HANGUL JONGSEONG PIEUP */ +#define XK_Hangul_J_PieubSios 0x0ee5 /* U+11B9 HANGUL JONGSEONG PIEUP-SIOS */ +#define XK_Hangul_J_Sios 0x0ee6 /* U+11BA HANGUL JONGSEONG SIOS */ +#define XK_Hangul_J_SsangSios 0x0ee7 /* U+11BB HANGUL JONGSEONG SSANGSIOS */ +#define XK_Hangul_J_Ieung 0x0ee8 /* U+11BC HANGUL JONGSEONG IEUNG */ +#define XK_Hangul_J_Jieuj 0x0ee9 /* U+11BD HANGUL JONGSEONG CIEUC */ +#define XK_Hangul_J_Cieuc 0x0eea /* U+11BE HANGUL JONGSEONG CHIEUCH */ +#define XK_Hangul_J_Khieuq 0x0eeb /* U+11BF HANGUL JONGSEONG KHIEUKH */ +#define XK_Hangul_J_Tieut 0x0eec /* U+11C0 HANGUL JONGSEONG THIEUTH */ +#define XK_Hangul_J_Phieuf 0x0eed /* U+11C1 HANGUL JONGSEONG PHIEUPH */ +#define XK_Hangul_J_Hieuh 0x0eee /* U+11C2 HANGUL JONGSEONG HIEUH */ + +/* Ancient Hangul Consonant Characters */ +#define XK_Hangul_RieulYeorinHieuh 0x0eef /* U+316D HANGUL LETTER RIEUL-YEORINHIEUH */ +#define XK_Hangul_SunkyeongeumMieum 0x0ef0 /* U+3171 HANGUL LETTER KAPYEOUNMIEUM */ +#define XK_Hangul_SunkyeongeumPieub 0x0ef1 /* U+3178 HANGUL LETTER KAPYEOUNPIEUP */ +#define XK_Hangul_PanSios 0x0ef2 /* U+317F HANGUL LETTER PANSIOS */ +#define XK_Hangul_KkogjiDalrinIeung 0x0ef3 /* U+3181 HANGUL LETTER YESIEUNG */ +#define XK_Hangul_SunkyeongeumPhieuf 0x0ef4 /* U+3184 HANGUL LETTER KAPYEOUNPHIEUPH */ +#define XK_Hangul_YeorinHieuh 0x0ef5 /* U+3186 HANGUL LETTER YEORINHIEUH */ + +/* Ancient Hangul Vowel Characters */ +#define XK_Hangul_AraeA 0x0ef6 /* U+318D HANGUL LETTER ARAEA */ +#define XK_Hangul_AraeAE 0x0ef7 /* U+318E HANGUL LETTER ARAEAE */ + +/* Ancient Hangul syllable-final (JongSeong) Characters */ +#define XK_Hangul_J_PanSios 0x0ef8 /* U+11EB HANGUL JONGSEONG PANSIOS */ +#define XK_Hangul_J_KkogjiDalrinIeung 0x0ef9 /* U+11F0 HANGUL JONGSEONG YESIEUNG */ +#define XK_Hangul_J_YeorinHieuh 0x0efa /* U+11F9 HANGUL JONGSEONG YEORINHIEUH */ + +/* Korean currency symbol */ +#define XK_Korean_Won 0x0eff /*(U+20A9 WON SIGN)*/ + +#endif /* XK_KOREAN */ + +#ifdef XK_CURRENCY +#define XK_EuroSign 0x20ac /* U+20AC EURO SIGN */ +#endif /* XK_CURRENCY */ + +#ifdef XK_BRAILLE +#define XK_braille_dot_1 0xfff1 +#define XK_braille_dot_2 0xfff2 +#define XK_braille_dot_3 0xfff3 +#define XK_braille_dot_4 0xfff4 +#define XK_braille_dot_5 0xfff5 +#define XK_braille_dot_6 0xfff6 +#define XK_braille_dot_7 0xfff7 +#define XK_braille_dot_8 0xfff8 +#define XK_braille_dot_9 0xfff9 +#define XK_braille_dot_10 0xfffa +#endif /* XK_BRAILLE */ + /* Multimedia keys, defined same as on Linux * /usr/include/pkg/libxkbcommon/xkbcommon/xkbcommon-keysyms.h */ diff --git a/mingw64/include/tk.h b/mingw64/include/tk.h index d3c24663f49..66db0c564ae 100644 --- a/mingw64/include/tk.h +++ b/mingw64/include/tk.h @@ -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 12 +#define TK_RELEASE_SERIAL 13 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6.12" +#define TK_PATCH_LEVEL "8.6.13" /* * A special definition used to allow this header file to be included from @@ -1012,12 +1012,12 @@ typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Item *itemPtr, int argc, char **argv); #else typedef int (Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); typedef int (Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[], + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[], int flags); typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const argv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); #endif /* USE_OLD_CANVAS */ typedef void (Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr, Display *display); diff --git a/mingw64/include/tk8.6/tk-private/generic/ks_names.h b/mingw64/include/tk8.6/tk-private/generic/ks_names.h index 8d3702d7cf2..729436b92ed 100644 --- a/mingw64/include/tk8.6/tk-private/generic/ks_names.h +++ b/mingw64/include/tk8.6/tk-private/generic/ks_names.h @@ -38,10 +38,21 @@ { "Kana_Shift", 0xFF2E }, { "Eisu_Shift", 0xFF2F }, { "Eisu_toggle", 0xFF30 }, +{ "Hangul", 0xFF31 }, +{ "Hangul_Start", 0xFF32 }, +{ "Hangul_End", 0xFF33 }, +{ "Hangul_Hanja", 0xFF34 }, +{ "Hangul_Jamo", 0xFF35 }, +{ "Hangul_Romaja", 0xFF36 }, { "Codeinput", 0xFF37 }, +{ "Hangul_Jeonja", 0xFF38 }, +{ "Hangul_Banja", 0xFF39 }, +{ "Hangul_PreHanja", 0xFF3A }, +{ "Hangul_PostHanja", 0xFF3B }, { "SingleCandidate", 0xFF3C }, { "MultipleCandidate", 0xFF3D }, { "PreviousCandidate", 0xFF3E }, +{ "Hangul_Special", 0xFF3F }, { "Home", 0xFF50 }, { "Left", 0xFF51 }, { "Up", 0xFF52 }, @@ -185,7 +196,160 @@ { "Super_R", 0xFFEC }, { "Hyper_L", 0xFFED }, { "Hyper_R", 0xFFEE }, +{ "braille_dot_1", 0xFFF1 }, +{ "braille_dot_2", 0xFFF2 }, +{ "braille_dot_3", 0xFFF3 }, +{ "braille_dot_4", 0xFFF4 }, +{ "braille_dot_5", 0xFFF5 }, +{ "braille_dot_6", 0xFFF6 }, +{ "braille_dot_7", 0xFFF7 }, +{ "braille_dot_8", 0xFFF8 }, +{ "braille_dot_9", 0xFFF9 }, +{ "braille_dot_10", 0xFFFA }, { "Delete", 0xFFFF }, +{ "ISO_Lock", 0xFE01 }, +{ "ISO_Level2_Latch", 0xFE02 }, +{ "ISO_Level3_Shift", 0xFE03 }, +{ "ISO_Level3_Latch", 0xFE04 }, +{ "ISO_Level3_Lock", 0xFE05 }, +{ "ISO_Group_Latch", 0xFE06 }, +{ "ISO_Group_Lock", 0xFE07 }, +{ "ISO_Next_Group", 0xFE08 }, +{ "ISO_Next_Group_Lock", 0xFE09 }, +{ "ISO_Prev_Group", 0xFE0A }, +{ "ISO_Prev_Group_Lock", 0xFE0B }, +{ "ISO_First_Group", 0xFE0C }, +{ "ISO_First_Group_Lock", 0xFE0D }, +{ "ISO_Last_Group", 0xFE0E }, +{ "ISO_Last_Group_Lock", 0xFE0F }, +{ "ISO_Level5_Shift", 0xFE11 }, +{ "ISO_Level5_Latch", 0xFE12 }, +{ "ISO_Level5_Lock", 0xFE13 }, +{ "ISO_Left_Tab", 0xFE20 }, +{ "ISO_Move_Line_Up", 0xFE21 }, +{ "ISO_Move_Line_Down", 0xFE22 }, +{ "ISO_Partial_Line_Up", 0xFE23 }, +{ "ISO_Partial_Line_Down", 0xFE24 }, +{ "ISO_Partial_Space_Left", 0xFE25 }, +{ "ISO_Partial_Space_Right", 0xFE26 }, +{ "ISO_Set_Margin_Left", 0xFE27 }, +{ "ISO_Set_Margin_Right", 0xFE28 }, +{ "ISO_Release_Margin_Left", 0xFE29 }, +{ "ISO_Release_Margin_Right", 0xFE2A }, +{ "ISO_Release_Both_Margins", 0xFE2B }, +{ "ISO_Fast_Cursor_Left", 0xFE2C }, +{ "ISO_Fast_Cursor_Right", 0xFE2D }, +{ "ISO_Fast_Cursor_Up", 0xFE2E }, +{ "ISO_Fast_Cursor_Down", 0xFE2F }, +{ "ISO_Continuous_Underline", 0xFE30 }, +{ "ISO_Discontinuous_Underline", 0xFE31 }, +{ "ISO_Emphasize", 0xFE32 }, +{ "ISO_Center_Object", 0xFE33 }, +{ "ISO_Enter", 0xFE34 }, +{ "dead_grave", 0xFE50 }, +{ "dead_acute", 0xFE51 }, +{ "dead_circumflex", 0xFE52 }, +{ "dead_tilde", 0xFE53 }, +{ "dead_perispomeni", 0xFE53 }, +{ "dead_macron", 0xFE54 }, +{ "dead_breve", 0xFE55 }, +{ "dead_abovedot", 0xFE56 }, +{ "dead_diaeresis", 0xFE57 }, +{ "dead_abovering", 0xFE58 }, +{ "dead_doubleacute", 0xFE59 }, +{ "dead_caron", 0xFE5A }, +{ "dead_cedilla", 0xFE5B }, +{ "dead_ogonek", 0xFE5C }, +{ "dead_iota", 0xFE5D }, +{ "dead_voiced_sound", 0xFE5E }, +{ "dead_semivoiced_sound", 0xFE5F }, +{ "dead_belowdot", 0xFE60 }, +{ "dead_hook", 0xFE61 }, +{ "dead_horn", 0xFE62 }, +{ "dead_stroke", 0xFE63 }, +{ "dead_abovecomma", 0xFE64 }, +{ "dead_psili", 0xFE64 }, +{ "dead_abovereversedcomma", 0xFE65 }, +{ "dead_dasia", 0xFE65 }, +{ "dead_doublegrave", 0xFE66 }, +{ "dead_belowring", 0xFE67 }, +{ "dead_belowmacron", 0xFE68 }, +{ "dead_belowcircumflex", 0xFE69 }, +{ "dead_belowtilde", 0xFE6A }, +{ "dead_belowbreve", 0xFE6B }, +{ "dead_belowdiaeresis", 0xFE6C }, +{ "dead_invertedbreve", 0xFE6D }, +{ "dead_belowcomma", 0xFE6E }, +{ "dead_currency", 0xFE6F }, +{ "AccessX_Enable", 0xFE70 }, +{ "AccessX_Feedback_Enable", 0xFE71 }, +{ "RepeatKeys_Enable", 0xFE72 }, +{ "SlowKeys_Enable", 0xFE73 }, +{ "BounceKeys_Enable", 0xFE74 }, +{ "StickyKeys_Enable", 0xFE75 }, +{ "MouseKeys_Enable", 0xFE76 }, +{ "MouseKeys_Accel_Enable", 0xFE77 }, +{ "Overlay1_Enable", 0xFE78 }, +{ "Overlay2_Enable", 0xFE79 }, +{ "AudibleBell_Enable", 0xFE7A }, +{ "dead_a", 0xFE80 }, +{ "dead_A", 0xFE81 }, +{ "dead_e", 0xFE82 }, +{ "dead_E", 0xFE83 }, +{ "dead_i", 0xFE84 }, +{ "dead_I", 0xFE85 }, +{ "dead_o", 0xFE86 }, +{ "dead_O", 0xFE87 }, +{ "dead_u", 0xFE88 }, +{ "dead_U", 0xFE89 }, +{ "dead_small_schwa", 0xFE8A }, +{ "dead_capital_schwa", 0xFE8B }, +{ "dead_greek", 0xFE8C }, +{ "dead_lowline", 0xFE90 }, +{ "dead_aboveverticalline", 0xFE91 }, +{ "dead_belowverticalline", 0xFE92 }, +{ "dead_longsolidusoverlay", 0xFE93 }, +{ "ch", 0xFEA0 }, +{ "Ch", 0xFEA1 }, +{ "CH", 0xFEA2 }, +{ "c_h", 0xFEA3 }, +{ "C_h", 0xFEA4 }, +{ "C_H", 0xFEA5 }, +{ "First_Virtual_Screen", 0xFED0 }, +{ "Prev_Virtual_Screen", 0xFED1 }, +{ "Next_Virtual_Screen", 0xFED2 }, +{ "Last_Virtual_Screen", 0xFED4 }, +{ "Terminate_Server", 0xFED5 }, +{ "Pointer_Left", 0xFEE0 }, +{ "Pointer_Right", 0xFEE1 }, +{ "Pointer_Up", 0xFEE2 }, +{ "Pointer_Down", 0xFEE3 }, +{ "Pointer_UpLeft", 0xFEE4 }, +{ "Pointer_UpRight", 0xFEE5 }, +{ "Pointer_DownLeft", 0xFEE6 }, +{ "Pointer_DownRight", 0xFEE7 }, +{ "Pointer_Button_Dflt", 0xFEE8 }, +{ "Pointer_Button1", 0xFEE9 }, +{ "Pointer_Button2", 0xFEEA }, +{ "Pointer_Button3", 0xFEEB }, +{ "Pointer_Button4", 0xFEEC }, +{ "Pointer_Button5", 0xFEED }, +{ "Pointer_DblClick_Dflt", 0xFEEE }, +{ "Pointer_DblClick1", 0xFEEF }, +{ "Pointer_DblClick2", 0xFEF0 }, +{ "Pointer_DblClick3", 0xFEF1 }, +{ "Pointer_DblClick4", 0xFEF2 }, +{ "Pointer_DblClick5", 0xFEF3 }, +{ "Pointer_Drag_Dflt", 0xFEF4 }, +{ "Pointer_Drag1", 0xFEF5 }, +{ "Pointer_Drag2", 0xFEF6 }, +{ "Pointer_Drag3", 0xFEF7 }, +{ "Pointer_Drag4", 0xFEF8 }, +{ "Pointer_EnableKeys", 0xFEF9 }, +{ "Pointer_Accelerate", 0xFEFA }, +{ "Pointer_DfltBtnNext", 0xFEFB }, +{ "Pointer_DfltBtnPrev", 0xFEFC }, +{ "Pointer_Drag5", 0xFEFD }, { "space", 0x20 }, { "exclam", 0x21 }, { "quotedbl", 0x22 }, @@ -1019,6 +1183,181 @@ { "hebrew_shin", 0xCF9 }, { "hebrew_taw", 0xCFA }, { "hebrew_taf", 0xCFA }, +{ "Thai_kokai", 0xDA1 }, +{ "Thai_khokhai", 0xDA2 }, +{ "Thai_khokhuat", 0xDA3 }, +{ "Thai_khokhwai", 0xDA4 }, +{ "Thai_khokhon", 0xDA5 }, +{ "Thai_khorakhang", 0xDA6 }, +{ "Thai_ngongu", 0xDA7 }, +{ "Thai_chochan", 0xDA8 }, +{ "Thai_choching", 0xDA9 }, +{ "Thai_chochang", 0xDAA }, +{ "Thai_soso", 0xDAB }, +{ "Thai_chochoe", 0xDAC }, +{ "Thai_yoying", 0xDAD }, +{ "Thai_dochada", 0xDAE }, +{ "Thai_topatak", 0xDAF }, +{ "Thai_thothan", 0xDB0 }, +{ "Thai_thonangmontho", 0xDB1 }, +{ "Thai_thophuthao", 0xDB2 }, +{ "Thai_nonen", 0xDB3 }, +{ "Thai_dodek", 0xDB4 }, +{ "Thai_totao", 0xDB5 }, +{ "Thai_thothung", 0xDB6 }, +{ "Thai_thothahan", 0xDB7 }, +{ "Thai_thothong", 0xDB8 }, +{ "Thai_nonu", 0xDB9 }, +{ "Thai_bobaimai", 0xDBA }, +{ "Thai_popla", 0xDBB }, +{ "Thai_phophung", 0xDBC }, +{ "Thai_fofa", 0xDBD }, +{ "Thai_phophan", 0xDBE }, +{ "Thai_fofan", 0xDBF }, +{ "Thai_phosamphao", 0xDC0 }, +{ "Thai_moma", 0xDC1 }, +{ "Thai_yoyak", 0xDC2 }, +{ "Thai_rorua", 0xDC3 }, +{ "Thai_ru", 0xDC4 }, +{ "Thai_loling", 0xDC5 }, +{ "Thai_lu", 0xDC6 }, +{ "Thai_wowaen", 0xDC7 }, +{ "Thai_sosala", 0xDC8 }, +{ "Thai_sorusi", 0xDC9 }, +{ "Thai_sosua", 0xDCA }, +{ "Thai_hohip", 0xDCB }, +{ "Thai_lochula", 0xDCC }, +{ "Thai_oang", 0xDCD }, +{ "Thai_honokhuk", 0xDCE }, +{ "Thai_paiyannoi", 0xDCF }, +{ "Thai_saraa", 0xDD0 }, +{ "Thai_maihanakat", 0xDD1 }, +{ "Thai_saraaa", 0xDD2 }, +{ "Thai_saraam", 0xDD3 }, +{ "Thai_sarai", 0xDD4 }, +{ "Thai_saraii", 0xDD5 }, +{ "Thai_saraue", 0xDD6 }, +{ "Thai_sarauee", 0xDD7 }, +{ "Thai_sarau", 0xDD8 }, +{ "Thai_sarauu", 0xDD9 }, +{ "Thai_phinthu", 0xDDA }, +{ "Thai_maihanakat_maitho", 0xDDE }, +{ "Thai_baht", 0xDDF }, +{ "Thai_sarae", 0xDE0 }, +{ "Thai_saraae", 0xDE1 }, +{ "Thai_sarao", 0xDE2 }, +{ "Thai_saraaimaimuan", 0xDE3 }, +{ "Thai_saraaimaimalai", 0xDE4 }, +{ "Thai_lakkhangyao", 0xDE5 }, +{ "Thai_maiyamok", 0xDE6 }, +{ "Thai_maitaikhu", 0xDE7 }, +{ "Thai_maiek", 0xDE8 }, +{ "Thai_maitho", 0xDE9 }, +{ "Thai_maitri", 0xDEA }, +{ "Thai_maichattawa", 0xDEB }, +{ "Thai_thanthakhat", 0xDEC }, +{ "Thai_nikhahit", 0xDED }, +{ "Thai_leksun", 0xDF0 }, +{ "Thai_leknung", 0xDF1 }, +{ "Thai_leksong", 0xDF2 }, +{ "Thai_leksam", 0xDF3 }, +{ "Thai_leksi", 0xDF4 }, +{ "Thai_lekha", 0xDF5 }, +{ "Thai_lekhok", 0xDF6 }, +{ "Thai_lekchet", 0xDF7 }, +{ "Thai_lekpaet", 0xDF8 }, +{ "Thai_lekkao", 0xDF9 }, +{ "Hangul_Kiyeog", 0xEA1 }, +{ "Hangul_SsangKiyeog", 0xEA2 }, +{ "Hangul_KiyeogSios", 0xEA3 }, +{ "Hangul_Nieun", 0xEA4 }, +{ "Hangul_NieunJieuj", 0xEA5 }, +{ "Hangul_NieunHieuh", 0xEA6 }, +{ "Hangul_Dikeud", 0xEA7 }, +{ "Hangul_SsangDikeud", 0xEA8 }, +{ "Hangul_Rieul", 0xEA9 }, +{ "Hangul_RieulKiyeog", 0xEAA }, +{ "Hangul_RieulMieum", 0xEAB }, +{ "Hangul_RieulPieub", 0xEAC }, +{ "Hangul_RieulSios", 0xEAD }, +{ "Hangul_RieulTieut", 0xEAE }, +{ "Hangul_RieulPhieuf", 0xEAF }, +{ "Hangul_RieulHieuh", 0xEB0 }, +{ "Hangul_Mieum", 0xEB1 }, +{ "Hangul_Pieub", 0xEB2 }, +{ "Hangul_SsangPieub", 0xEB3 }, +{ "Hangul_PieubSios", 0xEB4 }, +{ "Hangul_Sios", 0xEB5 }, +{ "Hangul_SsangSios", 0xEB6 }, +{ "Hangul_Ieung", 0xEB7 }, +{ "Hangul_Jieuj", 0xEB8 }, +{ "Hangul_SsangJieuj", 0xEB9 }, +{ "Hangul_Cieuc", 0xEBA }, +{ "Hangul_Khieuq", 0xEBB }, +{ "Hangul_Tieut", 0xEBC }, +{ "Hangul_Phieuf", 0xEBD }, +{ "Hangul_Hieuh", 0xEBE }, +{ "Hangul_A", 0xEBF }, +{ "Hangul_AE", 0xEC0 }, +{ "Hangul_YA", 0xEC1 }, +{ "Hangul_YAE", 0xEC2 }, +{ "Hangul_EO", 0xEC3 }, +{ "Hangul_E", 0xEC4 }, +{ "Hangul_YEO", 0xEC5 }, +{ "Hangul_YE", 0xEC6 }, +{ "Hangul_O", 0xEC7 }, +{ "Hangul_WA", 0xEC8 }, +{ "Hangul_WAE", 0xEC9 }, +{ "Hangul_OE", 0xECA }, +{ "Hangul_YO", 0xECB }, +{ "Hangul_U", 0xECC }, +{ "Hangul_WEO", 0xECD }, +{ "Hangul_WE", 0xECE }, +{ "Hangul_WI", 0xECF }, +{ "Hangul_YU", 0xED0 }, +{ "Hangul_EU", 0xED1 }, +{ "Hangul_YI", 0xED2 }, +{ "Hangul_I", 0xED3 }, +{ "Hangul_J_Kiyeog", 0xED4 }, +{ "Hangul_J_SsangKiyeog", 0xED5 }, +{ "Hangul_J_KiyeogSios", 0xED6 }, +{ "Hangul_J_Nieun", 0xED7 }, +{ "Hangul_J_NieunJieuj", 0xED8 }, +{ "Hangul_J_NieunHieuh", 0xED9 }, +{ "Hangul_J_Dikeud", 0xEDA }, +{ "Hangul_J_Rieul", 0xEDB }, +{ "Hangul_J_RieulKiyeog", 0xEDC }, +{ "Hangul_J_RieulMieum", 0xEDD }, +{ "Hangul_J_RieulPieub", 0xEDE }, +{ "Hangul_J_RieulSios", 0xEDF }, +{ "Hangul_J_RieulTieut", 0xEE0 }, +{ "Hangul_J_RieulPhieuf", 0xEE1 }, +{ "Hangul_J_RieulHieuh", 0xEE2 }, +{ "Hangul_J_Mieum", 0xEE3 }, +{ "Hangul_J_Pieub", 0xEE4 }, +{ "Hangul_J_PieubSios", 0xEE5 }, +{ "Hangul_J_Sios", 0xEE6 }, +{ "Hangul_J_SsangSios", 0xEE7 }, +{ "Hangul_J_Ieung", 0xEE8 }, +{ "Hangul_J_Jieuj", 0xEE9 }, +{ "Hangul_J_Cieuc", 0xEEA }, +{ "Hangul_J_Khieuq", 0xEEB }, +{ "Hangul_J_Tieut", 0xEEC }, +{ "Hangul_J_Phieuf", 0xEED }, +{ "Hangul_J_Hieuh", 0xEEE }, +{ "Hangul_RieulYeorinHieuh", 0xEEF }, +{ "Hangul_SunkyeongeumMieum", 0xEF0 }, +{ "Hangul_SunkyeongeumPieub", 0xEF1 }, +{ "Hangul_PanSios", 0xEF2 }, +{ "Hangul_KkogjiDalrinIeung", 0xEF3 }, +{ "Hangul_SunkyeongeumPhieuf", 0xEF4 }, +{ "Hangul_YeorinHieuh", 0xEF5 }, +{ "Hangul_AraeA", 0xEF6 }, +{ "Hangul_AraeAE", 0xEF7 }, +{ "Hangul_J_PanSios", 0xEF8 }, +{ "Hangul_J_KkogjiDalrinIeung", 0xEF9 }, +{ "Hangul_J_YeorinHieuh", 0xEFA }, +{ "Korean_Won", 0xEFF }, { "XF86ModeLock", 0x1008FF01 }, { "XF86MonBrightnessUp", 0x1008FF02 }, { "XF86MonBrightnessDown", 0x1008FF03 }, @@ -1184,6 +1523,7 @@ { "XF86RFKill", 0x1008FFB5 }, { "XF86AudioPreset", 0x1008FFB6 }, { "XF86RotationLockToggle", 0x1008FFB7 }, +{ "XF86FullScreen", 0x1008FFB8 }, { "XF86Switch_VT_1", 0x1008FE01 }, { "XF86Switch_VT_2", 0x1008FE02 }, { "XF86Switch_VT_3", 0x1008FE03 }, @@ -1202,3 +1542,165 @@ { "XF86Prev_VMode", 0x1008FE23 }, { "XF86LogWindowTree", 0x1008FE24 }, { "XF86LogGrabInfo", 0x1008FE25 }, +{ "XF86BrightnessAuto", 0x100810F4 }, +{ "XF86DisplayOff", 0x100810F5 }, +{ "XF86Info", 0x10081166 }, +{ "XF86AspectRatio", 0x10081177 }, +{ "XF86DVD", 0x10081185 }, +{ "XF86Audio", 0x10081188 }, +{ "XF86ChannelUp", 0x10081192 }, +{ "XF86ChannelDown", 0x10081193 }, +{ "XF86Break", 0x1008119B }, +{ "XF86VideoPhone", 0x100811A0 }, +{ "XF86ZoomReset", 0x100811A4 }, +{ "XF86Editor", 0x100811A6 }, +{ "XF86GraphicsEditor", 0x100811A8 }, +{ "XF86Presentation", 0x100811A9 }, +{ "XF86Database", 0x100811AA }, +{ "XF86Voicemail", 0x100811AC }, +{ "XF86Addressbook", 0x100811AD }, +{ "XF86DisplayToggle", 0x100811AF }, +{ "XF86SpellCheck", 0x100811B0 }, +{ "XF86ContextMenu", 0x100811B6 }, +{ "XF86MediaRepeat", 0x100811B7 }, +{ "XF8610ChannelsUp", 0x100811B8 }, +{ "XF8610ChannelsDown", 0x100811B9 }, +{ "XF86Images", 0x100811BA }, +{ "XF86NotificationCenter", 0x100811BC }, +{ "XF86PickupPhone", 0x100811BD }, +{ "XF86HangupPhone", 0x100811BE }, +{ "XF86Fn", 0x100811D0 }, +{ "XF86Fn_Esc", 0x100811D1 }, +{ "XF86FnRightShift", 0x100811E5 }, +{ "XF86Numeric0", 0x10081200 }, +{ "XF86Numeric1", 0x10081201 }, +{ "XF86Numeric2", 0x10081202 }, +{ "XF86Numeric3", 0x10081203 }, +{ "XF86Numeric4", 0x10081204 }, +{ "XF86Numeric5", 0x10081205 }, +{ "XF86Numeric6", 0x10081206 }, +{ "XF86Numeric7", 0x10081207 }, +{ "XF86Numeric8", 0x10081208 }, +{ "XF86Numeric9", 0x10081209 }, +{ "XF86NumericStar", 0x1008120A }, +{ "XF86NumericPound", 0x1008120B }, +{ "XF86NumericA", 0x1008120C }, +{ "XF86NumericB", 0x1008120D }, +{ "XF86NumericC", 0x1008120E }, +{ "XF86NumericD", 0x1008120F }, +{ "XF86CameraFocus", 0x10081210 }, +{ "XF86WPSButton", 0x10081211 }, +{ "XF86CameraZoomIn", 0x10081215 }, +{ "XF86CameraZoomOut", 0x10081216 }, +{ "XF86CameraUp", 0x10081217 }, +{ "XF86CameraDown", 0x10081218 }, +{ "XF86CameraLeft", 0x10081219 }, +{ "XF86CameraRight", 0x1008121A }, +{ "XF86AttendantOn", 0x1008121B }, +{ "XF86AttendantOff", 0x1008121C }, +{ "XF86AttendantToggle", 0x1008121D }, +{ "XF86LightsToggle", 0x1008121E }, +{ "XF86ALSToggle", 0x10081230 }, +{ "XF86Buttonconfig", 0x10081240 }, +{ "XF86Taskmanager", 0x10081241 }, +{ "XF86Journal", 0x10081242 }, +{ "XF86ControlPanel", 0x10081243 }, +{ "XF86AppSelect", 0x10081244 }, +{ "XF86Screensaver", 0x10081245 }, +{ "XF86VoiceCommand", 0x10081246 }, +{ "XF86Assistant", 0x10081247 }, +{ "XF86EmojiPicker", 0x10081249 }, +{ "XF86Dictate", 0x1008124A }, +{ "XF86BrightnessMin", 0x10081250 }, +{ "XF86BrightnessMax", 0x10081251 }, +{ "XF86KbdInputAssistPrev", 0x10081260 }, +{ "XF86KbdInputAssistNext", 0x10081261 }, +{ "XF86KbdInputAssistPrevgroup", 0x10081262 }, +{ "XF86KbdInputAssistNextgroup", 0x10081263 }, +{ "XF86KbdInputAssistAccept", 0x10081264 }, +{ "XF86KbdInputAssistCancel", 0x10081265 }, +{ "XF86RightUp", 0x10081266 }, +{ "XF86RightDown", 0x10081267 }, +{ "XF86LeftUp", 0x10081268 }, +{ "XF86LeftDown", 0x10081269 }, +{ "XF86RootMenu", 0x1008126A }, +{ "XF86MediaTopMenu", 0x1008126B }, +{ "XF86Numeric11", 0x1008126C }, +{ "XF86Numeric12", 0x1008126D }, +{ "XF86AudioDesc", 0x1008126E }, +{ "XF863DMode", 0x1008126F }, +{ "XF86NextFavorite", 0x10081270 }, +{ "XF86StopRecord", 0x10081271 }, +{ "XF86PauseRecord", 0x10081272 }, +{ "XF86VOD", 0x10081273 }, +{ "XF86Unmute", 0x10081274 }, +{ "XF86FastReverse", 0x10081275 }, +{ "XF86SlowReverse", 0x10081276 }, +{ "XF86Data", 0x10081277 }, +{ "XF86OnScreenKeyboard", 0x10081278 }, +{ "XF86PrivacyScreenToggle", 0x10081279 }, +{ "XF86SelectiveScreenshot", 0x1008127A }, +{ "XF86Macro1", 0x10081290 }, +{ "XF86Macro2", 0x10081291 }, +{ "XF86Macro3", 0x10081292 }, +{ "XF86Macro4", 0x10081293 }, +{ "XF86Macro5", 0x10081294 }, +{ "XF86Macro6", 0x10081295 }, +{ "XF86Macro7", 0x10081296 }, +{ "XF86Macro8", 0x10081297 }, +{ "XF86Macro9", 0x10081298 }, +{ "XF86Macro10", 0x10081299 }, +{ "XF86Macro11", 0x1008129A }, +{ "XF86Macro12", 0x1008129B }, +{ "XF86Macro13", 0x1008129C }, +{ "XF86Macro14", 0x1008129D }, +{ "XF86Macro15", 0x1008129E }, +{ "XF86Macro16", 0x1008129F }, +{ "XF86Macro17", 0x100812A0 }, +{ "XF86Macro18", 0x100812A1 }, +{ "XF86Macro19", 0x100812A2 }, +{ "XF86Macro20", 0x100812A3 }, +{ "XF86Macro21", 0x100812A4 }, +{ "XF86Macro22", 0x100812A5 }, +{ "XF86Macro23", 0x100812A6 }, +{ "XF86Macro24", 0x100812A7 }, +{ "XF86Macro25", 0x100812A8 }, +{ "XF86Macro26", 0x100812A9 }, +{ "XF86Macro27", 0x100812AA }, +{ "XF86Macro28", 0x100812AB }, +{ "XF86Macro29", 0x100812AC }, +{ "XF86Macro30", 0x100812AD }, +{ "XF86MacroRecordStart", 0x100812B0 }, +{ "XF86MacroRecordStop", 0x100812B1 }, +{ "XF86MacroPresetCycle", 0x100812B2 }, +{ "XF86MacroPreset1", 0x100812B3 }, +{ "XF86MacroPreset2", 0x100812B4 }, +{ "XF86MacroPreset3", 0x100812B5 }, +{ "XF86KbdLcdMenu1", 0x100812B8 }, +{ "XF86KbdLcdMenu2", 0x100812B9 }, +{ "XF86KbdLcdMenu3", 0x100812BA }, +{ "XF86KbdLcdMenu4", 0x100812BB }, +{ "XF86KbdLcdMenu5", 0x100812BC }, +{ "SunFA_Grave", 0x1005FF00 }, +{ "SunFA_Circum", 0x1005FF01 }, +{ "SunFA_Tilde", 0x1005FF02 }, +{ "SunFA_Acute", 0x1005FF03 }, +{ "SunFA_Diaeresis", 0x1005FF04 }, +{ "SunFA_Cedilla", 0x1005FF05 }, +{ "SunF36", 0x1005FF10 }, +{ "SunF37", 0x1005FF11 }, +{ "SunSys_Req", 0x1005FF60 }, +{ "SunProps", 0x1005FF70 }, +{ "SunFront", 0x1005FF71 }, +{ "SunCopy", 0x1005FF72 }, +{ "SunOpen", 0x1005FF73 }, +{ "SunPaste", 0x1005FF74 }, +{ "SunCut", 0x1005FF75 }, +{ "SunPowerSwitch", 0x1005FF76 }, +{ "SunAudioLowerVolume", 0x1005FF77 }, +{ "SunAudioMute", 0x1005FF78 }, +{ "SunAudioRaiseVolume", 0x1005FF79 }, +{ "SunVideoDegauss", 0x1005FF7A }, +{ "SunVideoLowerBrightness", 0x1005FF7B }, +{ "SunVideoRaiseBrightness", 0x1005FF7C }, +{ "SunPowerSwitchShift", 0x1005FF7D }, diff --git a/mingw64/include/tk8.6/tk-private/generic/tk.h b/mingw64/include/tk8.6/tk-private/generic/tk.h index d3c24663f49..66db0c564ae 100644 --- a/mingw64/include/tk8.6/tk-private/generic/tk.h +++ b/mingw64/include/tk8.6/tk-private/generic/tk.h @@ -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 12 +#define TK_RELEASE_SERIAL 13 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6.12" +#define TK_PATCH_LEVEL "8.6.13" /* * A special definition used to allow this header file to be included from @@ -1012,12 +1012,12 @@ typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Item *itemPtr, int argc, char **argv); #else typedef int (Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); typedef int (Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[], + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[], int flags); typedef int (Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Item *itemPtr, int argc, Tcl_Obj *const argv[]); + Tk_Item *itemPtr, int objc, Tcl_Obj *const objv[]); #endif /* USE_OLD_CANVAS */ typedef void (Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr, Display *display); diff --git a/mingw64/include/tk8.6/tk-private/generic/tkDecls.h b/mingw64/include/tk8.6/tk-private/generic/tkDecls.h index 20729308473..6663d163dfd 100644 --- a/mingw64/include/tk8.6/tk-private/generic/tkDecls.h +++ b/mingw64/include/tk8.6/tk-private/generic/tkDecls.h @@ -870,7 +870,17 @@ EXTERN void Tk_CreateOldPhotoImageFormat( /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ -/* 280 */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ +/* 290 */ EXTERN void TkUnusedStubEntry(void); typedef struct { @@ -1164,7 +1174,17 @@ typedef struct TkStubs { void (*reserved277)(void); void (*reserved278)(void); void (*reserved279)(void); - void (*tkUnusedStubEntry) (void); /* 280 */ + void (*reserved280)(void); + void (*reserved281)(void); + void (*reserved282)(void); + void (*reserved283)(void); + void (*reserved284)(void); + void (*reserved285)(void); + void (*reserved286)(void); + void (*reserved287)(void); + void (*reserved288)(void); + void (*reserved289)(void); + void (*tkUnusedStubEntry) (void); /* 290 */ } TkStubs; extern const TkStubs *tkStubsPtr; @@ -1731,8 +1751,18 @@ extern const TkStubs *tkStubsPtr; /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ #define TkUnusedStubEntry \ - (tkStubsPtr->tkUnusedStubEntry) /* 280 */ + (tkStubsPtr->tkUnusedStubEntry) /* 290 */ #endif /* defined(USE_TK_STUBS) */ @@ -1750,6 +1780,8 @@ extern const TkStubs *tkStubsPtr; EXTERN void Tk_MainExW(int argc, wchar_t **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif +#undef Tk_FreeStyleFromObj +#define Tk_FreeStyleFromObj(objPtr) ((void)(objPtr)) #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/mingw64/include/tk8.6/tk-private/generic/tkInt.h b/mingw64/include/tk8.6/tk-private/generic/tkInt.h index fe8f16ec287..35b7e673804 100644 --- a/mingw64/include/tk8.6/tk-private/generic/tkInt.h +++ b/mingw64/include/tk8.6/tk-private/generic/tkInt.h @@ -19,6 +19,8 @@ #include "tkPort.h" #endif +#define TK_OPTION_ENUM_VAR ((int)(sizeof(Tk_OptionType)&(sizeof(int)-1))<<6) + /* * Ensure WORDS_BIGENDIAN is defined correctly: * Needs to happen here in addition to configure to work with fat compiles on @@ -84,7 +86,9 @@ # endif #endif -#if defined(__GNUC__) && (__GNUC__ > 2) +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +# define TKFLEXARRAY +#elif defined(__GNUC__) && (__GNUC__ > 2) # define TKFLEXARRAY 0 #else # define TKFLEXARRAY 1 @@ -368,8 +372,14 @@ typedef struct TkDisplay { * by that container. */ int geomInit; -#define TkGetContainer(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ - ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) + /* + * Information used by tkGrid.c, tkPack.c, tkPlace.c, tkPointer.c, + * and ttkMacOSXTheme.c: + */ + +#define TkGetContainer(tkwin) (Tk_TopWinHierarchy((TkWindow *)tkwin) ? NULL : \ + (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ + ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr)) /* * Information used by tkGet.c only: @@ -874,6 +884,13 @@ typedef struct TkWindow { * if its container is its parent. */ } TkWindow; +/* + * String tables: + */ + +MODULE_SCOPE const char *const tkStateStrings[]; +MODULE_SCOPE const char *const tkCompoundStrings[]; + /* * Real definition of some events. Note that these events come from outside * but have internally generated pieces added to them. @@ -1236,7 +1253,7 @@ MODULE_SCOPE void TkFreeGeometryContainer(Tk_Window tkwin, MODULE_SCOPE void TkEventInit(void); MODULE_SCOPE void TkRegisterObjTypes(void); MODULE_SCOPE int TkDeadAppObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, Tcl_Obj *const argv[]); + Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int TkCanvasGetCoordObj(Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr); @@ -1248,7 +1265,7 @@ MODULE_SCOPE int TkPostscriptImage(Tcl_Interp *interp, Tk_Window tkwin, MODULE_SCOPE void TkMapTopFrame(Tk_Window tkwin); MODULE_SCOPE XEvent * TkpGetBindingXEvent(Tcl_Interp *interp); MODULE_SCOPE void TkCreateExitHandler(Tcl_ExitProc *proc, - ClientData clientData); + void *clientData); MODULE_SCOPE void TkDeleteExitHandler(Tcl_ExitProc *proc, ClientData clientData); MODULE_SCOPE Tcl_ExitProc TkFinalize; diff --git a/mingw64/include/tk8.6/tk-private/generic/tkIntDecls.h b/mingw64/include/tk8.6/tk-private/generic/tkIntDecls.h index 705741117e2..cb4379cb7f7 100644 --- a/mingw64/include/tk8.6/tk-private/generic/tkIntDecls.h +++ b/mingw64/include/tk8.6/tk-private/generic/tkIntDecls.h @@ -558,6 +558,8 @@ EXTERN void TkpRedrawWidget(Tk_Window tkwin); /* 186 */ EXTERN int TkpWillDrawWidget(Tk_Window tkwin); #endif /* MACOSX */ +/* 187 */ +EXTERN void TkUnusedStubEntry(void); typedef struct TkIntStubs { int magic; @@ -793,6 +795,7 @@ typedef struct TkIntStubs { #ifdef MAC_OSX_TCL /* MACOSX */ int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 186 */ #endif /* MACOSX */ + void (*tkUnusedStubEntry) (void); /* 187 */ } TkIntStubs; extern const TkIntStubs *tkIntStubsPtr; @@ -1173,6 +1176,8 @@ extern const TkIntStubs *tkIntStubsPtr; #define TkpWillDrawWidget \ (tkIntStubsPtr->tkpWillDrawWidget) /* 186 */ #endif /* MACOSX */ +#define TkUnusedStubEntry \ + (tkIntStubsPtr->tkUnusedStubEntry) /* 187 */ #endif /* defined(USE_TK_STUBS) */ @@ -1224,5 +1229,7 @@ extern const TkIntStubs *tkIntStubsPtr; # define TkpRedrawWidget(w) #endif +#undef TkUnusedStubEntry + #endif /* _TKINTDECLS */ diff --git a/mingw64/include/tk8.6/tk-private/generic/tkMenu.h b/mingw64/include/tk8.6/tk-private/generic/tkMenu.h index 386b2044076..51e8cb2c70b 100644 --- a/mingw64/include/tk8.6/tk-private/generic/tkMenu.h +++ b/mingw64/include/tk8.6/tk-private/generic/tkMenu.h @@ -517,7 +517,7 @@ MODULE_SCOPE int TkPostCommand(TkMenu *menuPtr); MODULE_SCOPE int TkPostSubmenu(Tcl_Interp *interp, TkMenu *menuPtr, TkMenuEntry *mePtr); MODULE_SCOPE int TkPostTearoffMenu(Tcl_Interp *interp, TkMenu *menuPtr, - int x, int y); + int x, int y); MODULE_SCOPE int TkPreprocessMenu(TkMenu *menuPtr); MODULE_SCOPE void TkRecomputeMenu(TkMenu *menuPtr); @@ -542,7 +542,7 @@ MODULE_SCOPE int TkpNewMenu(TkMenu *menuPtr); MODULE_SCOPE int TkpPostMenu(Tcl_Interp *interp, TkMenu *menuPtr, int x, int y, int index); MODULE_SCOPE int TkpPostTearoffMenu(Tcl_Interp *interp, TkMenu *menuPtr, - int x, int y, int index); + int x, int y, int index); MODULE_SCOPE void TkpSetWindowMenuBar(Tk_Window tkwin, TkMenu *menuPtr); #endif /* _TKMENU */ diff --git a/mingw64/include/tk8.6/tk-private/generic/tkText.h b/mingw64/include/tk8.6/tk-private/generic/tkText.h index 9898462d3ff..d3c1cc902f7 100644 --- a/mingw64/include/tk8.6/tk-private/generic/tkText.h +++ b/mingw64/include/tk8.6/tk-private/generic/tkText.h @@ -168,7 +168,7 @@ typedef struct TkTextSegment { int size; /* Size of this segment (# of bytes of index * space it occupies). */ union { - char chars[TKFLEXARRAY]; /* Characters that make up character info. + char chars[TCL_UTF_MAX]; /* Characters that make up character info. * Actual length varies to hold as many * characters as needed.*/ TkTextToggle toggle; /* Information about tag toggle. */ diff --git a/mingw64/include/tk8.6/tk-private/generic/ttk/ttkWidget.h b/mingw64/include/tk8.6/tk-private/generic/ttk/ttkWidget.h index 6cd691b144e..c6b2dc996c2 100644 --- a/mingw64/include/tk8.6/tk-private/generic/ttk/ttkWidget.h +++ b/mingw64/include/tk8.6/tk-private/generic/ttk/ttkWidget.h @@ -247,9 +247,9 @@ MODULE_SCOPE void Ttk_TagSetApplyStyle(Ttk_TagTable,Ttk_Style,Ttk_State,void*); * String tables for widget resource specifications: */ -MODULE_SCOPE const char *ttkOrientStrings[]; -MODULE_SCOPE const char *ttkCompoundStrings[]; -MODULE_SCOPE const char *ttkDefaultStrings[]; +MODULE_SCOPE const char *const ttkOrientStrings[]; +MODULE_SCOPE const char *const ttkCompoundStrings[]; +MODULE_SCOPE const char *const ttkDefaultStrings[]; /* * ... other option types... diff --git a/mingw64/include/tk8.6/tk-private/win/tkWinDefault.h b/mingw64/include/tk8.6/tk-private/win/tkWinDefault.h index 852de02e014..b03cbd7441b 100644 --- a/mingw64/include/tk8.6/tk-private/win/tkWinDefault.h +++ b/mingw64/include/tk8.6/tk-private/win/tkWinDefault.h @@ -59,6 +59,7 @@ #define DEF_BUTTON_DEFAULT "disabled" #define DEF_BUTTON_DISABLED_FG_COLOR DISABLED #define DEF_BUTTON_DISABLED_FG_MONO "" +#define DEF_LABEL_FG NORMAL_FG #define DEF_BUTTON_FG NORMAL_FG #define DEF_CHKRAD_FG TEXT_FG #define DEF_BUTTON_FONT "TkDefaultFont" diff --git a/mingw64/include/tk8.6/tk-private/win/tkWinPort.h b/mingw64/include/tk8.6/tk-private/win/tkWinPort.h index 0118608a0d7..e5e9e6c0506 100644 --- a/mingw64/include/tk8.6/tk-private/win/tkWinPort.h +++ b/mingw64/include/tk8.6/tk-private/win/tkWinPort.h @@ -95,6 +95,7 @@ * See ticket [916c1095438eae56]: GetVersionExW triggers warnings */ #if defined(_MSC_VER) +# pragma warning(disable:4090) /* see: https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/390711 */ # pragma warning(disable:4146) # pragma warning(disable:4267) # pragma warning(disable:4244) @@ -124,12 +125,6 @@ #define TkpGetPixel(p) (((((p)->red >> 8) & 0xff) \ | ((p)->green & 0xff00) | (((p)->blue << 8) & 0xff0000)) | 0x20000000) -/* - * Used by tkWindow.c - */ - -#define TkpHandleMapOrUnmap(tkwin, event) Tk_HandleEvent(event) - /* * These calls implement native bitmaps which are not currently * supported under Windows. The macros eliminate the calls. diff --git a/mingw64/include/tkDecls.h b/mingw64/include/tkDecls.h index 20729308473..6663d163dfd 100644 --- a/mingw64/include/tkDecls.h +++ b/mingw64/include/tkDecls.h @@ -870,7 +870,17 @@ EXTERN void Tk_CreateOldPhotoImageFormat( /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ -/* 280 */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ +/* 290 */ EXTERN void TkUnusedStubEntry(void); typedef struct { @@ -1164,7 +1174,17 @@ typedef struct TkStubs { void (*reserved277)(void); void (*reserved278)(void); void (*reserved279)(void); - void (*tkUnusedStubEntry) (void); /* 280 */ + void (*reserved280)(void); + void (*reserved281)(void); + void (*reserved282)(void); + void (*reserved283)(void); + void (*reserved284)(void); + void (*reserved285)(void); + void (*reserved286)(void); + void (*reserved287)(void); + void (*reserved288)(void); + void (*reserved289)(void); + void (*tkUnusedStubEntry) (void); /* 290 */ } TkStubs; extern const TkStubs *tkStubsPtr; @@ -1731,8 +1751,18 @@ extern const TkStubs *tkStubsPtr; /* Slot 277 is reserved */ /* Slot 278 is reserved */ /* Slot 279 is reserved */ +/* Slot 280 is reserved */ +/* Slot 281 is reserved */ +/* Slot 282 is reserved */ +/* Slot 283 is reserved */ +/* Slot 284 is reserved */ +/* Slot 285 is reserved */ +/* Slot 286 is reserved */ +/* Slot 287 is reserved */ +/* Slot 288 is reserved */ +/* Slot 289 is reserved */ #define TkUnusedStubEntry \ - (tkStubsPtr->tkUnusedStubEntry) /* 280 */ + (tkStubsPtr->tkUnusedStubEntry) /* 290 */ #endif /* defined(USE_TK_STUBS) */ @@ -1750,6 +1780,8 @@ extern const TkStubs *tkStubsPtr; EXTERN void Tk_MainExW(int argc, wchar_t **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif +#undef Tk_FreeStyleFromObj +#define Tk_FreeStyleFromObj(objPtr) ((void)(objPtr)) #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/mingw64/lib/libtkstub86.a b/mingw64/lib/libtkstub86.a index 770003a7e1d..91f3f614ff4 100644 Binary files a/mingw64/lib/libtkstub86.a and b/mingw64/lib/libtkstub86.a differ diff --git a/mingw64/lib/pkgconfig/tk.pc b/mingw64/lib/pkgconfig/tk.pc index 651bed5bb9e..9f23e4846b7 100644 --- a/mingw64/lib/pkgconfig/tk.pc +++ b/mingw64/lib/pkgconfig/tk.pc @@ -8,7 +8,7 @@ includedir=${prefix}/include Name: The Tk Toolkit Description: Tk is a cross-platform graphical user interface toolkit, the standard GUI not only for Tcl, but for many other dynamic languages as well. URL: https://www.tcl-lang.org/ -Version: 8.6.12 +Version: 8.6.13 Requires: tcl >= 8.6 Libs: -L${libdir} -ltk86 -ltkstub86 Libs.private: diff --git a/mingw64/lib/tk8.6/clrpick.tcl b/mingw64/lib/tk8.6/clrpick.tcl index e408d037edd..d67c67fd4e1 100644 --- a/mingw64/lib/tk8.6/clrpick.tcl +++ b/mingw64/lib/tk8.6/clrpick.tcl @@ -316,7 +316,7 @@ proc ::tk::dialog::color::BuildDialog {w} { # Accelerator bindings bind $lab <> [list focus $ent] - bind $w [list tk::ButtonInvoke $data(cancelBtn)] + bind $w [list tk::ButtonInvoke $data(cancelBtn)] bind $w [list tk::AltKeyInDialog $w %A] wm protocol $w WM_DELETE_WINDOW [list tk::dialog::color::CancelCmd $w] diff --git a/mingw64/lib/tk8.6/console.tcl b/mingw64/lib/tk8.6/console.tcl index 30c4d88305c..83723f15f22 100644 --- a/mingw64/lib/tk8.6/console.tcl +++ b/mingw64/lib/tk8.6/console.tcl @@ -91,29 +91,29 @@ proc ::tk::ConsoleInit {} { AmpMenuArgs .menubar.edit add separator if {$::tk::console::useFontchooser} { - if {[tk windowingsystem] eq "aqua"} { - .menubar.edit add command -label tk_choose_font_marker - set index [.menubar.edit index tk_choose_font_marker] - .menubar.edit entryconfigure $index \ - -label [mc "Show Fonts"]\ - -accelerator "$mod-T"\ - -command [list ::tk::console::FontchooserToggle] - bind Console <> \ - [list ::tk::console::FontchooserVisibility $index] + if {[tk windowingsystem] eq "aqua"} { + .menubar.edit add command -label tk_choose_font_marker + set index [.menubar.edit index tk_choose_font_marker] + .menubar.edit entryconfigure $index \ + -label [mc "Show Fonts"]\ + -accelerator "$mod-T"\ + -command [list ::tk::console::FontchooserToggle] + bind Console <> \ + [list ::tk::console::FontchooserVisibility $index] ::tk::console::FontchooserVisibility $index - } else { - AmpMenuArgs .menubar.edit add command -label [mc "&Font..."] \ - -command [list ::tk::console::FontchooserToggle] - } + } else { + AmpMenuArgs .menubar.edit add command -label [mc "&Font..."] \ + -command [list ::tk::console::FontchooserToggle] + } bind Console [list ::tk::console::FontchooserFocus %W 1] bind Console [list ::tk::console::FontchooserFocus %W 0] } AmpMenuArgs .menubar.edit add command -label [mc "&Increase Font Size"] \ - -accel "$mod++" -command {event generate .console <>} + -accel "$mod++" -command {event generate .console <>} AmpMenuArgs .menubar.edit add command -label [mc "&Decrease Font Size"] \ - -accel "$mod+-" -command {event generate .console <>} + -accel "$mod+-" -command {event generate .console <>} AmpMenuArgs .menubar.edit add command -label [mc "Fit To Screen Width"] \ - -command {event generate .console <>} + -command {event generate .console <>} if {[tk windowingsystem] eq "aqua"} { .menubar add cascade -label [mc Window] -menu [menu .menubar.window] @@ -126,31 +126,31 @@ proc ::tk::ConsoleInit {} { catch {font create TkConsoleFont {*}[font configure TkFixedFont]} set families [font families] switch -exact -- [tk windowingsystem] { - aqua { set preferred {Monaco 10} } - win32 { set preferred {ProFontWindows 8 Consolas 8} } - default { set preferred {} } + aqua { set preferred {Monaco 10} } + win32 { set preferred {ProFontWindows 8 Consolas 8} } + default { set preferred {} } } foreach {family size} $preferred { - if {$family in $families} { - font configure TkConsoleFont -family $family -size $size - break - } + if {$family in $families} { + font configure TkConsoleFont -family $family -size $size + break + } } # Provide the right border for the text widget (platform dependent). ::ttk::style layout ConsoleFrame { - Entry.field -sticky news -border 1 -children { - ConsoleFrame.padding -sticky news - } + Entry.field -sticky news -border 1 -children { + ConsoleFrame.padding -sticky news + } } ::ttk::frame .consoleframe -style ConsoleFrame set con [text .console -yscrollcommand [list .sb set] -setgrid true \ - -borderwidth 0 -highlightthickness 0 -font TkConsoleFont] + -borderwidth 0 -highlightthickness 0 -font TkConsoleFont] if {[tk windowingsystem] eq "aqua"} { - scrollbar .sb -command [list $con yview] + scrollbar .sb -command [list $con yview] } else { - ::ttk::scrollbar .sb -command [list $con yview] + ::ttk::scrollbar .sb -command [list $con yview] } pack .sb -in .consoleframe -fill both -side right -padx 1 -pady 1 pack $con -in .consoleframe -fill both -expand 1 -side left -padx 1 -pady 1 @@ -215,7 +215,7 @@ proc ::tk::ConsoleSource {} { [list [mc "Tcl Scripts"] .tcl] \ [list [mc "All Files"] *]]] if {$filename ne ""} { - set cmd [list source $filename] + set cmd [list source $filename] if {[catch {consoleinterp eval $cmd} result]} { ConsoleOutput stderr "$result\n" } @@ -273,22 +273,22 @@ proc ::tk::ConsoleHistory {cmd} { variable HistNum switch $cmd { - prev { + prev { incr HistNum -1 if {$HistNum == 0} { set cmd {history event [expr {[history nextid] -1}]} } else { set cmd "history event $HistNum" } - if {[catch {consoleinterp eval $cmd} cmd]} { - incr HistNum - return - } + if {[catch {consoleinterp eval $cmd} cmd]} { + incr HistNum + return + } .console delete promptEnd end - .console insert promptEnd $cmd {input stdin} + .console insert promptEnd $cmd {input stdin} .console see end - } - next { + } + next { incr HistNum if {$HistNum == 0} { set cmd {history event [expr {[history nextid] -1}]} @@ -304,10 +304,10 @@ proc ::tk::ConsoleHistory {cmd} { .console delete promptEnd end .console insert promptEnd $cmd {input stdin} .console see end - } - reset { - set HistNum 1 - } + } + reset { + set HistNum 1 + } } } @@ -324,19 +324,19 @@ proc ::tk::ConsolePrompt {{partial normal}} { if {$partial eq "normal"} { set temp [$w index "end - 1 char"] $w mark set output end - if {[consoleinterp eval "info exists tcl_prompt1"]} { - consoleinterp eval "eval \[set tcl_prompt1\]" - } else { - puts -nonewline [EvalAttached $::tk::console::defaultPrompt] - } + if {[consoleinterp eval "info exists tcl_prompt1"]} { + consoleinterp eval "eval \[set tcl_prompt1\]" + } else { + puts -nonewline [EvalAttached $::tk::console::defaultPrompt] + } } else { set temp [$w index output] $w mark set output end - if {[consoleinterp eval "info exists tcl_prompt2"]} { - consoleinterp eval "eval \[set tcl_prompt2\]" - } else { + if {[consoleinterp eval "info exists tcl_prompt2"]} { + consoleinterp eval "eval \[set tcl_prompt2\]" + } else { puts -nonewline "> " - } + } } flush stdout $w mark set output $temp @@ -350,33 +350,33 @@ proc ::tk::ConsolePrompt {{partial normal}} { # Copy selected text from the console proc ::tk::console::Copy {w} { if {![catch {set data [$w get sel.first sel.last]}]} { - clipboard clear -displayof $w - clipboard append -displayof $w $data + clipboard clear -displayof $w + clipboard append -displayof $w $data } } # Copies selected text. If the selection is within the current active edit # region then it will be cut, if not it is only copied. proc ::tk::console::Cut {w} { if {![catch {set data [$w get sel.first sel.last]}]} { - clipboard clear -displayof $w - clipboard append -displayof $w $data - if {[$w compare sel.first >= output]} { - $w delete sel.first sel.last + clipboard clear -displayof $w + clipboard append -displayof $w $data + if {[$w compare sel.first >= output]} { + $w delete sel.first sel.last } } } # Paste text from the clipboard proc ::tk::console::Paste {w} { catch { - set clip [::tk::GetSelection $w CLIPBOARD] - set list [split $clip \n\r] - tk::ConsoleInsert $w [lindex $list 0] - foreach x [lrange $list 1 end] { - $w mark set insert {end - 1c} - tk::ConsoleInsert $w "\n" - tk::ConsoleInvoke - tk::ConsoleInsert $w $x - } + set clip [::tk::GetSelection $w CLIPBOARD] + set list [split $clip \n\r] + tk::ConsoleInsert $w [lindex $list 0] + foreach x [lrange $list 1 end] { + $w mark set insert {end - 1c} + tk::ConsoleInsert $w "\n" + tk::ConsoleInvoke + tk::ConsoleInsert $w $x + } } } @@ -388,14 +388,14 @@ proc ::tk::console::FitScreenWidth {w} { set fit 0 array set fi [font configure TkConsoleFont] while {$s < 0} { - set fi(-size) $s - set f [font create {*}[array get fi]] - set c [font measure $f "eM"] - font delete $f - if {$c * $cwidth < 1.667 * $width} { - font configure TkConsoleFont -size $s - break - } + set fi(-size) $s + set f [font create {*}[array get fi]] + set c [font measure $f "eM"] + font delete $f + if {$c * $cwidth < 1.667 * $width} { + font configure TkConsoleFont -size $s + break + } incr s 2 } } @@ -416,60 +416,64 @@ proc ::tk::ConsoleBind {w} { bind Console $ev [bind Text $ev] } ## We really didn't want the newline insertion... - bind Console {} + bind Console {} ## ...or any Control-v binding (would block <>) - bind Console {} + bind Console {} # For the moment, transpose isn't enabled until the console # gets and overhaul of how it handles input -- hobbs - bind Console {} + bind Console {} # Ignore all Alt, Meta, and Control keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the # class binding will also fire and insert the character # which is wrong. - bind Console {# nothing } - bind Console {# nothing} - bind Console {# nothing} + bind Console {# nothing } + bind Console {# nothing} + bind Console {# nothing} + if {[tk windowingsystem] eq "aqua"} { + bind Console {# nothing} + bind Console {# nothing} + } foreach {ev key} { - <> - <> - <> - <> - - <> - <> - <> - <> - <> - <> - <> - <> - <> - - <> - <> - <> - <> - <> - <> - <> + <> + <> + <> + <> + + <> + <> + <> + <> + <> + <> + <> + <> + <> + + <> + <> + <> + <> + <> + <> + <> } { event add $ev $key bind Console $key {} } if {[tk windowingsystem] eq "aqua"} { foreach {ev key} { - <> - <> + <> + <> } { event add $ev $key bind Console $key {} } if {$::tk::console::useFontchooser} { - bind Console [list ::tk::console::FontchooserToggle] + bind Console [list ::tk::console::FontchooserToggle] } } bind Console <> { @@ -587,7 +591,7 @@ proc ::tk::ConsoleBind {w} { bind Console { catch {tk::ConsoleInsert %W [::tk::GetSelection %W PRIMARY]} } - bind Console { + bind Console { tk::ConsoleInsert %W %A } bind Console { @@ -604,20 +608,20 @@ proc ::tk::ConsoleBind {w} { bind Console <> { ::tk::console::Paste %W } bind Console <> { - set size [font configure TkConsoleFont -size] - if {$size < 0} {set sign -1} else {set sign 1} - set size [expr {(abs($size) + 1) * $sign}] - font configure TkConsoleFont -size $size + set size [font configure TkConsoleFont -size] + if {$size < 0} {set sign -1} else {set sign 1} + set size [expr {(abs($size) + 1) * $sign}] + font configure TkConsoleFont -size $size if {$::tk::console::useFontchooser} { tk fontchooser configure -font TkConsoleFont } } bind Console <> { - set size [font configure TkConsoleFont -size] - if {abs($size) < 2} { return } - if {$size < 0} {set sign -1} else {set sign 1} - set size [expr {(abs($size) - 1) * $sign}] - font configure TkConsoleFont -size $size + set size [font configure TkConsoleFont -size] + if {abs($size) < 2} { return } + if {$size < 0} {set sign -1} else {set sign 1} + set size [expr {(abs($size) - 1) * $sign}] + font configure TkConsoleFont -size $size if {$::tk::console::useFontchooser} { tk fontchooser configure -font TkConsoleFont } @@ -629,28 +633,28 @@ proc ::tk::ConsoleBind {w} { ## ## Bindings for doing special things based on certain keys ## - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchPair %W \( \) promptEnd } } - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchPair %W \[ \] promptEnd } } - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchPair %W \{ \} promptEnd } } - bind PostConsole { + bind PostConsole { if {"\\" ne [%W get insert-2c]} { ::tk::console::MatchQuote %W promptEnd } } - bind PostConsole { + bind PostConsole { if {"%A" ne ""} { ::tk::console::TagProc %W } diff --git a/mingw64/lib/tk8.6/demos/cscroll.tcl b/mingw64/lib/tk8.6/demos/cscroll.tcl index c88bfa9fc3e..98a4be2b5b2 100644 --- a/mingw64/lib/tk8.6/demos/cscroll.tcl +++ b/mingw64/lib/tk8.6/demos/cscroll.tcl @@ -25,7 +25,7 @@ set btns [addSeeDismiss $w.buttons $w] pack $btns -side bottom -fill x frame $w.grid -scrollbar $w.hscroll -orient horiz -command "$c xview" +scrollbar $w.hscroll -orient horizontal -command "$c xview" scrollbar $w.vscroll -command "$c yview" canvas $c -relief sunken -borderwidth 2 -scrollregion {-11c -11c 50c 20c} \ -xscrollcommand "$w.hscroll set" \ diff --git a/mingw64/lib/tk8.6/demos/entry2.tcl b/mingw64/lib/tk8.6/demos/entry2.tcl index 6405d8518d2..a4009a745d3 100644 --- a/mingw64/lib/tk8.6/demos/entry2.tcl +++ b/mingw64/lib/tk8.6/demos/entry2.tcl @@ -27,15 +27,15 @@ frame $w.frame -borderwidth 10 pack $w.frame -side top -fill x -expand 1 entry $w.frame.e1 -xscrollcommand "$w.frame.s1 set" -ttk::scrollbar $w.frame.s1 -orient horiz -command \ +ttk::scrollbar $w.frame.s1 -orient horizontal -command \ "$w.frame.e1 xview" frame $w.frame.spacer1 -width 20 -height 10 entry $w.frame.e2 -xscrollcommand "$w.frame.s2 set" -ttk::scrollbar $w.frame.s2 -orient horiz -command \ +ttk::scrollbar $w.frame.s2 -orient horizontal -command \ "$w.frame.e2 xview" frame $w.frame.spacer2 -width 20 -height 10 entry $w.frame.e3 -xscrollcommand "$w.frame.s3 set" -ttk::scrollbar $w.frame.s3 -orient horiz -command \ +ttk::scrollbar $w.frame.s3 -orient horizontal -command \ "$w.frame.e3 xview" pack $w.frame.e1 $w.frame.s1 $w.frame.spacer1 $w.frame.e2 $w.frame.s2 \ $w.frame.spacer2 $w.frame.e3 $w.frame.s3 -side top -fill x diff --git a/mingw64/lib/tk8.6/demos/floor.tcl b/mingw64/lib/tk8.6/demos/floor.tcl index eb2ea7f2893..7d0ad3bd394 100644 --- a/mingw64/lib/tk8.6/demos/floor.tcl +++ b/mingw64/lib/tk8.6/demos/floor.tcl @@ -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 42 389 42 337 1 337 1 389 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 51 300 51 253 6 253 6 300 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 98 248 98 309 79 309 79 248 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 51 251 51 204 6 204 6 251 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 6 156 51 156 51 203 6 203 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 85 169 79 169 79 192 85 192 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 77 302 77 168 53 168 53 302 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 51 155 51 115 6 115 6 155 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 95 115 53 115 53 168 95 168 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 87 113 87 27 10 27 10 113 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 89 91 128 91 128 113 89 113 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 138 169 154 169 154 191 138 191 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 99 300 126 300 126 309 99 309 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 174 309 174 300 152 300 152 309 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 138 385 138 337 91 337 91 385 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 256 337 140 337 140 385 256 385 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 300 353 300 329 260 329 260 353 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 397 255 486 255 486 276 397 276 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 742 387 742 281 800 281 800 387 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 800 168 800 280 699 280 699 168 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 726 131 726 166 800 166 800 131 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor1 room}] + set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 694 279 643 279 643 314 694 314 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 277 6 277 6 338 51 338 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 560 389 599 389 599 326 560 326 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 601 389 601 326 643 326 643 389 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 688 316 645 316 645 365 688 365 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 802 367 759 367 759 226 802 226 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 755 262 755 314 717 314 717 262 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 755 316 689 316 689 365 755 365 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 755 206 717 206 717 261 755 261 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 695 277 643 277 643 206 695 206 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 676 135 676 185 724 185 724 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 476 249 557 249 557 205 476 205 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 476 186 495 186 495 204 476 204 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 234 198 306 198 306 249 234 249 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 268 179 221 179 221 135 268 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 177 179 219 179 219 135 177 135 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 256 385 256 340 212 340 212 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 210 340 164 340 164 385 210 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 115 340 162 340 162 385 115 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 89 228 89 156 53 156 53 228 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 89 169 97 169 97 190 89 190 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 179 51 135 6 135 6 179 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 227 6 227 6 180 51 180 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 51 275 6 275 6 229 51 229 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 114 340 67 340 67 385 114 385 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -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 -outline {} -tags {floor2 room}] + set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 89 228 89 180 70 180 70 228 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 115 368 162 368 162 323 115 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 164 323 164 368 211 368 211 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 256 368 212 368 212 323 256 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 251 219 251 203 244 203 244 219 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 251 249 244 249 244 232 251 232 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 223 135 223 179 177 179 177 135 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 114 368 114 323 67 323 67 368 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 23 277 23 321 68 321 68 277 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 23 229 68 229 68 275 23 275 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 68 227 23 227 23 180 68 180 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 95 179 95 135 23 135 23 179 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 99 226 99 204 91 204 91 226 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 91 202 99 202 99 180 91 180 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 274 194 274 221 306 221 306 194 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 306 222 274 222 274 249 306 249 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 263 179 224 179 224 135 263 135 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 397 246 377 246 377 185 397 185 -fill {} -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 -outline {} -tags {floor3 room}] + set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -fill {} -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 -outline {} -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 -fill {} -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 -outline {} -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 -fill {} -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} diff --git a/mingw64/lib/tk8.6/demos/goldberg.tcl b/mingw64/lib/tk8.6/demos/goldberg.tcl index 1cc52c62a89..90815fbd7f7 100644 --- a/mingw64/lib/tk8.6/demos/goldberg.tcl +++ b/mingw64/lib/tk8.6/demos/goldberg.tcl @@ -77,7 +77,6 @@ set S(mode) $::MSTART # Colors for everything set C(fg) black -set C(bg) gray75 set C(bg) cornflowerblue set C(0) white; set C(1a) darkgreen; set C(1b) yellow @@ -92,6 +91,7 @@ set C(17) \#A65353; set C(18) $C(fg); set C(19) gray50 set C(20) cyan; set C(21) gray65; set C(22) $C(20) set C(23a) blue; set C(23b) red; set C(23c) yellow set C(24a) red; set C(24b) white; +set C(24c) black; set C(26) $C(0); proc DoDisplay {w} { global S C @@ -136,7 +136,7 @@ proc DoCtrlFrame {w} { ttk::labelframe $w.message -text "Message" ttk::entry $w.message.e -textvariable S(message) -justify center ttk::labelframe $w.speed -text "Speed: 0" - ttk::scale $w.speed.scale -orient h -from 1 -to 10 -variable S(speed) + ttk::scale $w.speed.scale -orient horizontal -from 1 -to 10 -variable S(speed) ttk::button $w.about -text About -command [list About $w] grid $w.start -in $w.ctrl -row 0 -sticky ew @@ -1586,6 +1586,7 @@ proc Move24 {w {step {}}} { -width 10 -smooth 1 set msg [subst $S(message)] $w.c create text [Centroid $w I24] -text $msg -tag {I24 I24t} \ + -fill $::C(24c) \ -justify center -font {{Times Roman} 18 bold} return 1 } @@ -1619,6 +1620,7 @@ proc Move26 {w {step {}}} { if {$step >= 3} { $w.c delete I24 I26 $w.c create text 430 755 -anchor s -tag I26 \ + -fill $::C(26) \ -text "click to continue" -font {{Times Roman} 24 bold} bind $w.c [list Reset $w] return 4 diff --git a/mingw64/lib/tk8.6/demos/images/earth.gif b/mingw64/lib/tk8.6/demos/images/earth.gif index 2c229eb1101..d667244050d 100644 Binary files a/mingw64/lib/tk8.6/demos/images/earth.gif and b/mingw64/lib/tk8.6/demos/images/earth.gif differ diff --git a/mingw64/lib/tk8.6/demos/items.tcl b/mingw64/lib/tk8.6/demos/items.tcl index 1297046113f..19cd4f43133 100644 --- a/mingw64/lib/tk8.6/demos/items.tcl +++ b/mingw64/lib/tk8.6/demos/items.tcl @@ -32,7 +32,7 @@ canvas $c -scrollregion {0c 0c 30c 24c} -width 15c -height 10c \ -xscrollcommand "$w.frame.hscroll set" \ -yscrollcommand "$w.frame.vscroll set" ttk::scrollbar $w.frame.vscroll -command "$c yview" -ttk::scrollbar $w.frame.hscroll -orient horiz -command "$c xview" +ttk::scrollbar $w.frame.hscroll -orient horizontal -command "$c xview" grid $c -in $w.frame \ -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news diff --git a/mingw64/lib/tk8.6/demos/menu.tcl b/mingw64/lib/tk8.6/demos/menu.tcl index 244361d04a4..4f5d703fbb2 100644 --- a/mingw64/lib/tk8.6/demos/menu.tcl +++ b/mingw64/lib/tk8.6/demos/menu.tcl @@ -18,7 +18,6 @@ positionWindow $w label $w.msg -font $font -wraplength 4i -justify left if {[tk windowingsystem] eq "aqua"} { - catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1} $w.msg configure -text "This window has a menubar with cascaded menus. You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by selecting the first item in the menu." } else { $w.msg configure -text "This window contains a menubar with cascaded menus. You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu. You can then traverse among the menus using the arrow keys. When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character. If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu." @@ -56,7 +55,7 @@ menu $m -tearoff 0 $m add command -label "Long entry that does nothing" if {[tk windowingsystem] eq "aqua"} { set modifier Command -} elseif {[tk windowingsystem] == "win32"} { +} elseif {[tk windowingsystem] eq "win32"} { set modifier Control } else { set modifier Meta @@ -176,5 +175,3 @@ bind Menu <> { set menustatus $label update idletasks } - -if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}} diff --git a/mingw64/lib/tk8.6/demos/menubu.tcl b/mingw64/lib/tk8.6/demos/menubu.tcl index 96e3b15be2a..453b05c421c 100644 --- a/mingw64/lib/tk8.6/demos/menubu.tcl +++ b/mingw64/lib/tk8.6/demos/menubu.tcl @@ -18,7 +18,6 @@ positionWindow $w frame $w.body pack $w.body -expand 1 -fill both -if {[tk windowingsystem] eq "aqua"} {catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1}} menubutton $w.body.below -text "Below" -underline 0 -direction below -menu $w.body.below.m -relief raised menu $w.body.below.m -tearoff 0 @@ -86,5 +85,3 @@ foreach i {Black gray75 gray50 White} { } pack $body.buttons.colors -side left -padx 25 -pady 25 - -if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}} diff --git a/mingw64/lib/tk8.6/demos/puzzle.tcl b/mingw64/lib/tk8.6/demos/puzzle.tcl index eebe87a129a..f06de5d2aef 100644 --- a/mingw64/lib/tk8.6/demos/puzzle.tcl +++ b/mingw64/lib/tk8.6/demos/puzzle.tcl @@ -11,7 +11,7 @@ package require Tk # puzzleSwitch -- # This procedure is invoked when the user clicks on a particular button; -# if the button is next to the empty space, it moves the button into th +# if the button is next to the empty space, it moves the button into the # empty space. proc puzzleSwitch {w num} { diff --git a/mingw64/lib/tk8.6/entry.tcl b/mingw64/lib/tk8.6/entry.tcl index 6539af777df..4140c92f73f 100644 --- a/mingw64/lib/tk8.6/entry.tcl +++ b/mingw64/lib/tk8.6/entry.tcl @@ -211,6 +211,7 @@ bind Entry {# nothing} bind Entry {# nothing} if {[tk windowingsystem] eq "aqua"} { bind Entry {# nothing} + bind Entry {# nothing} } # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind Entry <> {# nothing} diff --git a/mingw64/lib/tk8.6/fontchooser.tcl b/mingw64/lib/tk8.6/fontchooser.tcl index fb6c6d3b264..27c8deffdcc 100644 --- a/mingw64/lib/tk8.6/fontchooser.tcl +++ b/mingw64/lib/tk8.6/fontchooser.tcl @@ -12,34 +12,48 @@ namespace eval ::tk::fontchooser { variable S set S(W) .__tk__fontchooser - set S(fonts) [lsort -dictionary [font families]] + set S(fonts) [lsort -dictionary -unique [font families]] set S(styles) [list \ - [::msgcat::mc "Regular"] \ - [::msgcat::mc "Italic"] \ - [::msgcat::mc "Bold"] \ - [::msgcat::mc "Bold Italic"] \ + [::msgcat::mc Regular] \ + [::msgcat::mc Italic] \ + [::msgcat::mc Bold] \ + [::msgcat::mc {Bold Italic}] \ ] - set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72} set S(strike) 0 set S(under) 0 set S(first) 1 - set S(sampletext) [::msgcat::mc "AaBbYyZz01"] set S(-parent) . - set S(-title) [::msgcat::mc "Font"] + set S(-title) {} set S(-command) "" set S(-font) TkDefaultFont + set S(bad) [list ] } -proc ::tk::fontchooser::Setup {} { +proc ::tk::fontchooser::Canonical {} { variable S + foreach style $S(styles) { + lappend S(styles,lcase) [string tolower $style] + } + set S(sizes,lcase) $S(sizes) + set S(sampletext) [::msgcat::mc "AaBbYyZz01"] + # Canonical versions of font families, styles, etc. for easier searching set S(fonts,lcase) {} - foreach font $S(fonts) {lappend S(fonts,lcase) [string tolower $font]} + foreach font $S(fonts) { + lappend S(fonts,lcase) [string tolower $font] + } set S(styles,lcase) {} - foreach style $S(styles) {lappend S(styles,lcase) [string tolower $style]} - set S(sizes,lcase) $S(sizes) + foreach style $S(styles) { + lappend S(styles,lcase) [string tolower $style] + } +} + +proc ::tk::fontchooser::Setup {} { + variable S + + Canonical ::ttk::style layout FontchooserFrame { Entry.field -sticky news -border true -children { @@ -47,8 +61,8 @@ proc ::tk::fontchooser::Setup {} { } } bind [winfo class .] <> \ - [list +ttk::style layout FontchooserFrame \ - [ttk::style layout FontchooserFrame]] + [list +ttk::style layout FontchooserFrame \ + [ttk::style layout FontchooserFrame]] namespace ensemble create -map { show ::tk::fontchooser::Show @@ -60,14 +74,24 @@ proc ::tk::fontchooser::Setup {} { proc ::tk::fontchooser::Show {} { variable S + + Canonical + if {![winfo exists $S(W)]} { Create wm transient $S(W) [winfo toplevel $S(-parent)] tk::PlaceWindow $S(W) widget $S(-parent) + if {[string trim $S(-title)] eq ""} { + wm title $S(W) [::msgcat::mc "Font"] + } else { + wm title $S(W) $S(-title) + } } - set S(fonts) [lsort -dictionary [font families]] + set S(fonts) [lsort -dictionary -unique [font families]] set S(fonts,lcase) {} - foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]} + foreach font $S(fonts) { + lappend S(fonts,lcase) [string tolower $font] + } wm deiconify $S(W) } @@ -91,10 +115,10 @@ proc ::tk::fontchooser::Configure {args} { foreach spec $specs { foreach {name xx yy default} $spec break lappend result $name \ - [expr {[info exists S($name)] ? $S($name) : $default}] + [expr {[info exists S($name)] ? $S($name) : $default}] } lappend result -visible \ - [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}] + [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}] return $result } if {[llength $args] == 1} { @@ -105,25 +129,32 @@ proc ::tk::fontchooser::Configure {args} { return $S($option) } return -code error -errorcode [list TK LOOKUP OPTION $option] \ - "bad option \"$option\": must be\ - -command, -font, -parent, -title or -visible" + "bad option \"$option\": must be\ + -command, -font, -parent, -title or -visible" } - set cache [dict create -parent $S(-parent) -title $S(-title) \ - -font $S(-font) -command $S(-command)] + -font $S(-font) -command $S(-command)] set r [tclParseConfigSpec [namespace which -variable S] $specs DONTSETDEFAULTS $args] if {![winfo exists $S(-parent)]} { - set code [list TK LOOKUP WINDOW $S(-parent)] + set code [list TK LOOKUP WINDOW $S(-parent)] set err "bad window path name \"$S(-parent)\"" array set S $cache return -code error -errorcode $code $err } - if {[string trim $S(-title)] eq ""} { - set S(-title) [::msgcat::mc "Font"] - } - if {[winfo exists $S(W)] && ("-font" in $args)} { - Init $S(-font) - event generate $S(-parent) <> + + if {[winfo exists $S(W)]} { + if {{-font} in $args} { + Init $S(-font) + event generate $S(-parent) <> + } + + if {[string trim $S(-title)] eq {}} { + wm title $S(W) [::msgcat::mc Font] + } else { + wm title $S(W) $S(-title) + } + $S(W).ok configure -state $S(nstate) + $S(W).apply configure -state $S(nstate) } return $r } @@ -140,7 +171,9 @@ proc ::tk::fontchooser::Create {} { # Now build the dialog if {![winfo exists $S(W)]} { toplevel $S(W) -class TkFontDialog - if {[package provide tcltest] ne {}} {set ::tk_dialog $S(W)} + if {[package provide tcltest] ne {}} { + set ::tk_dialog $S(W) + } wm withdraw $S(W) wm title $S(W) $S(-title) wm transient $S(W) [winfo toplevel $S(-parent)] @@ -153,40 +186,40 @@ proc ::tk::fontchooser::Create {} { ::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"] ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"] -width $sizeWidth ttk::entry $S(W).efont -width 18 \ - -textvariable [namespace which -variable S](font) + -textvariable [namespace which -variable S](font) ttk::entry $S(W).estyle -width 10 \ - -textvariable [namespace which -variable S](style) + -textvariable [namespace which -variable S](style) ttk::entry $S(W).esize -textvariable [namespace which -variable S](size) \ - -width 3 -validate key -validatecommand {string is double %P} + -width 3 -validate key -validatecommand {regexp -- {^-*[0-9]*$} %P} ttk_slistbox $S(W).lfonts -height 7 -exportselection 0 \ - -selectmode browse -activestyle none \ - -listvariable [namespace which -variable S](fonts) + -selectmode browse -activestyle none \ + -listvariable [namespace which -variable S](fonts) ttk_slistbox $S(W).lstyles -width 5 -height 7 -exportselection 0 \ - -selectmode browse -activestyle none \ - -listvariable [namespace which -variable S](styles) + -selectmode browse -activestyle none \ + -listvariable [namespace which -variable S](styles) ttk_slistbox $S(W).lsizes -width 4 -height 7 -exportselection 0 \ - -selectmode browse -activestyle none \ - -listvariable [namespace which -variable S](sizes) + -selectmode browse -activestyle none \ + -listvariable [namespace which -variable S](sizes) set WE $S(W).effects ::ttk::labelframe $WE -text [::msgcat::mc "Effects"] ::tk::AmpWidget ::ttk::checkbutton $WE.strike \ - -variable [namespace which -variable S](strike) \ - -text [::msgcat::mc "Stri&keout"] \ - -command [namespace code [list Click strike]] + -variable [namespace which -variable S](strike) \ + -text [::msgcat::mc "Stri&keout"] \ + -command [namespace code [list Click strike]] ::tk::AmpWidget ::ttk::checkbutton $WE.under \ - -variable [namespace which -variable S](under) \ - -text [::msgcat::mc "&Underline"] \ - -command [namespace code [list Click under]] + -variable [namespace which -variable S](under) \ + -text [::msgcat::mc "&Underline"] \ + -command [namespace code [list Click under]] set bbox [::ttk::frame $S(W).bbox] ::ttk::button $S(W).ok -text [::msgcat::mc OK] -default active\ - -command [namespace code [list Done 1]] + -command [namespace code [list Done 1]] ::ttk::button $S(W).cancel -text [::msgcat::mc Cancel] \ - -command [namespace code [list Done 0]] + -command [namespace code [list Done 0]] ::tk::AmpWidget ::ttk::button $S(W).apply -text [::msgcat::mc "&Apply"] \ - -command [namespace code [list Apply]] + -command [namespace code [list Apply]] wm protocol $S(W) WM_DELETE_WINDOW [namespace code [list Done 0]] # Calculate minimum sizes @@ -196,13 +229,15 @@ proc ::tk::fontchooser::Create {} { set minsize(gap) 10 set minsize(bbox) [winfo reqwidth $S(W).ok] set minsize(fonts) \ - [expr {[font measure TkDefaultFont "Helvetica"] + $scroll_width}] + [expr {[font measure TkDefaultFont "Helvetica"] + $scroll_width}] set minsize(styles) \ - [expr {[font measure TkDefaultFont "Bold Italic"] + $scroll_width}] + [expr {[font measure TkDefaultFont "Bold Italic"] + $scroll_width}] set minsize(sizes) \ - [expr {[font measure TkDefaultFont "-99"] + $scroll_width}] + [expr {[font measure TkDefaultFont "-99"] + $scroll_width}] set min [expr {$minsize(gap) * 4}] - foreach {what width} [array get minsize] {incr min $width} + foreach {what width} [array get minsize] { + incr min $width + } wm minsize $S(W) $min 260 bind $S(W) [namespace code [list Done 1]] @@ -224,7 +259,7 @@ proc ::tk::fontchooser::Create {} { set WS $S(W).sample ::ttk::labelframe $WS -text [::msgcat::mc "Sample"] ::ttk::label $WS.sample -relief sunken -anchor center \ - -textvariable [namespace which -variable S](sampletext) + -textvariable [namespace which -variable S](sampletext) set S(sample) $WS.sample grid $WS.sample -sticky news -padx 6 -pady 4 grid rowconfigure $WS 0 -weight 1 @@ -233,9 +268,7 @@ proc ::tk::fontchooser::Create {} { grid $S(W).ok -in $bbox -sticky new -pady {0 2} grid $S(W).cancel -in $bbox -sticky new -pady 2 - if {$S(-command) ne ""} { - grid $S(W).apply -in $bbox -sticky new -pady 2 - } + grid $S(W).apply -in $bbox -sticky new -pady 2 grid columnconfigure $bbox 0 -weight 1 grid $WE.strike -sticky w -padx 10 @@ -262,15 +295,19 @@ proc ::tk::fontchooser::Create {} { Init $S(-font) trace add variable [namespace which -variable S](size) \ - write [namespace code [list Tracer]] + write [namespace code [list Tracer]] trace add variable [namespace which -variable S](style) \ - write [namespace code [list Tracer]] + write [namespace code [list Tracer]] trace add variable [namespace which -variable S](font) \ - write [namespace code [list Tracer]] - } else { - Init $S(-font) + write [namespace code [list Tracer]] + trace add variable [namespace which -variable S](strike) \ + write [namespace code [list Tracer]] + trace add variable [namespace which -variable S](under) \ + write [namespace code [list Tracer]] } + Init $S(-font) + return } @@ -290,9 +327,14 @@ proc ::tk::fontchooser::Done {ok} { trace vdelete S(size) w [namespace code [list Tracer]] trace vdelete S(style) w [namespace code [list Tracer]] trace vdelete S(font) w [namespace code [list Tracer]] + trace vdelete S(strike) w [namespace code [list Tracer]] + trace vdelete S(under) w [namespace code [list Tracer]] destroy $S(W) - if {$ok && $S(-command) ne ""} { - uplevel #0 $S(-command) [list $S(result)] + if {$ok} { + if {$S(-command) ne ""} { + uplevel #0 $S(-command) [list $S(result)] + } + event generate $S(-parent) <> } } @@ -322,16 +364,17 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} { variable S if {$S(first) || $defaultFont ne ""} { + Canonical if {$defaultFont eq ""} { set defaultFont [[entry .___e] cget -font] destroy .___e } array set F [font actual $defaultFont] set S(font) $F(-family) + set S(style) [::msgcat::mc "Regular"] set S(size) $F(-size) set S(strike) $F(-overstrike) set S(under) $F(-underline) - set S(style) [::msgcat::mc "Regular"] if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} { set S(style) [::msgcat::mc "Bold Italic"] } elseif {$F(-weight) eq "bold"} { @@ -339,12 +382,8 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} { } elseif {$F(-slant) eq "italic"} { set S(style) [::msgcat::mc "Italic"] } - set S(first) 0 } - - Tracer a b c - Update } # ::tk::fontchooser::Click -- @@ -356,7 +395,6 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} { # proc ::tk::fontchooser::Click {who} { variable S - if {$who eq "font"} { set S(font) [$S(W).lfonts get [$S(W).lfonts curselection]] } elseif {$who eq "style"} { @@ -364,7 +402,6 @@ proc ::tk::fontchooser::Click {who} { } elseif {$who eq "size"} { set S(size) [$S(W).lsizes get [$S(W).lsizes curselection]] } - Update } # ::tk::fontchooser::Tracer -- @@ -376,32 +413,43 @@ proc ::tk::fontchooser::Click {who} { # proc ::tk::fontchooser::Tracer {var1 var2 op} { variable S - - set bad 0 - set nstate normal - # Make selection in each listbox - foreach var {font style size} { - set value [string tolower $S($var)] - $S(W).l${var}s selection clear 0 end - set n [lsearch -exact $S(${var}s,lcase) $value] - $S(W).l${var}s selection set $n + # We don't need to process strike and under + if {$var2 ni [list strike under]} { + # Make selection in listbox + set value [string tolower $S($var2)] + $S(W).l${var2}s selection clear 0 end + set n [lsearch -exact $S(${var2}s,lcase) $value] + $S(W).l${var2}s selection set $n if {$n >= 0} { - set S($var) [lindex $S(${var}s) $n] - $S(W).e$var icursor end - $S(W).e$var selection clear - } else { ;# No match, try prefix - # Size is weird: valid numbers are legal but don't display - # unless in the font size list - set n [lsearch -glob $S(${var}s,lcase) "$value*"] - set bad 1 - if {$var ne "size" || ! [string is double -strict $value]} { - set nstate disabled + set S($var2) [lindex $S(${var2}s) $n] + $S(W).e$var2 icursor end + $S(W).e$var2 selection clear + if {[set i [lsearch $S(bad) $var2]] >= 0} { + set S(bad) [lreplace $S(bad) $i $i] + } + } else { + # No match, try prefix + set n [lsearch -glob $S(${var2}s,lcase) "$value*"] + if {$var2 ne "size" || !([regexp -- {^(-[0-9]+|[0-9]+)$} $value] && $value >= -4096 && $value <= 4096)} { + if {[lsearch $S(bad) $var2] < 0} { + lappend S(bad) $var2 + } + } else { + if {[set i [lsearch $S(bad) $var2]] >= 0} { + set S(bad) [lreplace $S(bad) $i $i] + } } } - $S(W).l${var}s see $n + $S(W).l${var2}s see $n + } + if {[llength $S(bad)] == 0} { + set S(nstate) normal + Update + } else { + set S(nstate) disabled } - if {!$bad} {Update} - $S(W).ok configure -state $nstate + $S(W).ok configure -state $S(nstate) + $S(W).apply configure -state $S(nstate) } # ::tk::fontchooser::Update -- @@ -412,13 +460,24 @@ proc ::tk::fontchooser::Update {} { variable S set S(result) [list $S(font) $S(size)] - if {$S(style) eq [::msgcat::mc "Bold"]} {lappend S(result) bold} - if {$S(style) eq [::msgcat::mc "Italic"]} {lappend S(result) italic} - if {$S(style) eq [::msgcat::mc "Bold Italic"]} {lappend S(result) bold italic} - if {$S(strike)} {lappend S(result) overstrike} - if {$S(under)} {lappend S(result) underline} + if {$S(style) eq [::msgcat::mc "Bold"]} { + lappend S(result) bold + } + if {$S(style) eq [::msgcat::mc "Italic"]} { + lappend S(result) italic + } + if {$S(style) eq [::msgcat::mc "Bold Italic"]} { + lappend S(result) bold italic + } + if {$S(strike)} { + lappend S(result) overstrike + } + if {$S(under)} { + lappend S(result) underline + } $S(sample) configure -font $S(result) + set S(-font) $S(result) } # ::tk::fontchooser::Visibility -- @@ -432,7 +491,7 @@ proc ::tk::fontchooser::Visibility {w visible} { } } -# ::tk::fontchooser::ttk_listbox -- +# ::tk::fontchooser::ttk_slistbox -- # # Create a properly themed scrolled listbox. # This is exactly right on XP but may need adjusting on other platforms. diff --git a/mingw64/lib/tk8.6/iconlist.tcl b/mingw64/lib/tk8.6/iconlist.tcl index 34b19d02662..6f46ba4f67f 100644 --- a/mingw64/lib/tk8.6/iconlist.tcl +++ b/mingw64/lib/tk8.6/iconlist.tcl @@ -338,8 +338,8 @@ package require Tk set i_dy [expr {($dy - $iH)/2}] set t_dy [expr {($dy - $tH)/2}] - $canvas coords $iTag $x [expr {$y + $i_dy}] - $canvas coords $tTag [expr {$x + $shift}] [expr {$y + $t_dy}] + $canvas coords $iTag $x [expr {$y + $i_dy}] + $canvas coords $tTag [expr {$x + $shift}] [expr {$y + $t_dy}] $canvas coords $rTag $x $y [expr {$x+$dx}] [expr {$y+$dy}] incr y $dy @@ -433,11 +433,11 @@ package require Tk # bind $canvas [namespace code {my WhenIdle Arrange}] - bind $canvas <1> [namespace code {my Btn1 %x %y}] + bind $canvas [namespace code {my Btn1 %x %y}] bind $canvas [namespace code {my Motion1 %x %y}] bind $canvas [namespace code {my Leave1 %x %y}] - bind $canvas [namespace code {my CtrlBtn1 %x %y}] - bind $canvas [namespace code {my ShiftBtn1 %x %y}] + bind $canvas [namespace code {my CtrlBtn1 %x %y}] + bind $canvas [namespace code {my ShiftBtn1 %x %y}] bind $canvas [list tk::CancelRepeat] bind $canvas [list tk::CancelRepeat] bind $canvas \ @@ -449,12 +449,14 @@ package require Tk if {[tk windowingsystem] eq "aqua"} { bind $canvas [namespace code {my MouseWheel [expr {40 * (%D)}]}] bind $canvas [namespace code {my MouseWheel [expr {400 * (%D)}]}] + bind $canvas {# nothing} + bind $canvas {# nothing} } else { bind $canvas [namespace code {my MouseWheel %D}] } if {[tk windowingsystem] eq "x11"} { - bind $canvas [namespace code {my MouseWheel 120}] - bind $canvas [namespace code {my MouseWheel -120}] + bind $canvas [namespace code {my MouseWheel 120}] + bind $canvas [namespace code {my MouseWheel -120}] } bind $canvas <> [namespace code {my UpDown -1}] @@ -462,9 +464,10 @@ package require Tk bind $canvas <> [namespace code {my LeftRight -1}] bind $canvas <> [namespace code {my LeftRight 1}] bind $canvas [namespace code {my ReturnKey}] - bind $canvas [namespace code {my KeyPress %A}] - bind $canvas ";" - bind $canvas ";" + bind $canvas [namespace code {my KeyPress %A}] + bind $canvas {# nothing} + bind $canvas {# nothing} + bind $canvas {# nothing} bind $canvas [namespace code {my FocusIn}] bind $canvas [namespace code {my FocusOut}] diff --git a/mingw64/lib/tk8.6/menu.tcl b/mingw64/lib/tk8.6/menu.tcl index 823fd693234..deca4858e42 100644 --- a/mingw64/lib/tk8.6/menu.tcl +++ b/mingw64/lib/tk8.6/menu.tcl @@ -168,7 +168,7 @@ bind Menu <> { bind Menu <> { tk::MenuDownArrow %W } -bind Menu { +bind Menu { tk::TraverseWithinMenu %W %A break } @@ -177,7 +177,7 @@ bind Menu { # implement keyboard menu traversal. if {[tk windowingsystem] eq "x11"} { - bind all { + bind all { tk::TraverseToMenu %W %A } @@ -185,7 +185,7 @@ if {[tk windowingsystem] eq "x11"} { tk::FirstMenu %W } } else { - bind Menubutton { + bind Menubutton { tk::TraverseToMenu %W %A } @@ -285,7 +285,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { GenerateMenuSelect $menu update idletasks - if {[catch {PostMenubuttonMenu $w $menu} msg opt]} { + if {[catch {PostMenubuttonMenu $w $menu $x $y} msg opt]} { # Error posting menu (e.g. bogus -postcommand). Unpost it and # reflect the error. MenuUnpost {} @@ -1138,7 +1138,7 @@ proc ::tk::MenuFindName {menu s} { # side. On other platforms the entry is centered over the button. if {[tk windowingsystem] eq "aqua"} { - proc ::tk::PostMenubuttonMenu {button menu} { + proc ::tk::PostMenubuttonMenu {button menu cx cy} { set entry "" if {[$button cget -indicatoron]} { set entry [MenuFindName $menu [$button cget -text]] @@ -1163,14 +1163,14 @@ if {[tk windowingsystem] eq "aqua"} { right { incr x [winfo width $button] } - default { + default { # flush incr x [expr {[winfo width $button] - [winfo reqwidth $menu] - 5}] } } PostOverPoint $menu $x $y $entry } } else { - proc ::tk::PostMenubuttonMenu {button menu} { + proc ::tk::PostMenubuttonMenu {button menu cx cy} { set entry "" if {[$button cget -indicatoron]} { set entry [MenuFindName $menu [$button cget -text]] @@ -1201,22 +1201,24 @@ if {[tk windowingsystem] eq "aqua"} { set entry {} } left { - # It is not clear why this is needed. - if {[tk windowingsystem] eq "win32"} { - incr x [expr {-4 - [winfo reqwidth $button] / 2}] - } incr x [expr {- [winfo reqwidth $menu]}] } right { incr x [expr {[winfo width $button]}] } - default { - if {[$button cget -indicatoron]} { - incr x [expr {([winfo width $button] - \ - [winfo reqwidth $menu])/ 2}] - } else { - incr y [winfo height $button] - } + default { # flush + if {[$button cget -indicatoron]} { + if {$cx ne ""} { + set x [expr {$cx - [winfo reqwidth $menu] / 2}] + set l [font metrics [$menu cget -font] -linespace] + set y [expr {$cy - $l/2 - 2}] + } else { + incr x [expr {([winfo width $button] - \ + [winfo reqwidth $menu])/ 2}] + } + } else { + incr y [winfo height $button] + } } } PostOverPoint $menu $x $y $entry @@ -1242,7 +1244,8 @@ if {[tk windowingsystem] ne "win32"} { proc ::tk::PostOverPoint {menu x y {entry {}}} { if {$entry ne ""} { $menu post $x $y $entry - if {[$menu entrycget $entry -state] ne "disabled"} { + if {[$menu type $entry] ni {separator tearoff} && + [$menu entrycget $entry -state] ne "disabled"} { $menu activate $entry GenerateMenuSelect $menu } diff --git a/mingw64/lib/tk8.6/msgs/eo.msg b/mingw64/lib/tk8.6/msgs/eo.msg index 3645630b1ff..a096b622fc8 100644 --- a/mingw64/lib/tk8.6/msgs/eo.msg +++ b/mingw64/lib/tk8.6/msgs/eo.msg @@ -1,20 +1,20 @@ namespace eval ::tk { - ::msgcat::mcset eo "&Abort" "&\u0108esigo" + ::msgcat::mcset eo "&Abort" "&\u0108esigu" ::msgcat::mcset eo "&About..." "Pri..." - ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj" - ::msgcat::mcset eo "Application Error" "Aplikoerraro" + ::msgcat::mcset eo "All Files" "\u0108iuj dosieroj" + ::msgcat::mcset eo "Application Error" "Aplikoeraro" ::msgcat::mcset eo "&Blue" "&Blua" ::msgcat::mcset eo "Cancel" "Rezignu" ::msgcat::mcset eo "&Cancel" "&Rezignu" - ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion." - ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo" - ::msgcat::mcset eo "Cl&ear" "&Klaru" - ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon" - ::msgcat::mcset eo "Color" "Farbo" + ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u015dan\u011di al dosierujo \"%1\$s\".\nVi ne rajtas tion." + ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujon" + ::msgcat::mcset eo "Cl&ear" "&Vakigu" + ::msgcat::mcset eo "&Clear Console" "&Vakigu konzolon" + ::msgcat::mcset eo "Color" "Koloro" ::msgcat::mcset eo "Console" "Konzolo" ::msgcat::mcset eo "&Copy" "&Kopiu" - ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu" - ::msgcat::mcset eo "&Delete" "&Forprenu" + ::msgcat::mcset eo "Cu&t" "&Eltondu" + ::msgcat::mcset eo "&Delete" "&Forigu" ::msgcat::mcset eo "Details >>" "Detaloj >>" ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas." ::msgcat::mcset eo "&Directory:" "&Dosierujo:" @@ -22,12 +22,12 @@ namespace eval ::tk { ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s" ::msgcat::mcset eo "E&xit" "&Eliru" ::msgcat::mcset eo "&File" "&Dosiero" - ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?" - ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n" - ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas." + ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u016digi la dosieron?" + ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam ekzistas. \n\n" + ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosiero \"%1\$s\" ne ekzistas." ::msgcat::mcset eo "File &name:" "Dosiero&nomo:" ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:" - ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:" + ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Tipo:" ::msgcat::mcset eo "Fi&les:" "Do&sieroj:" ::msgcat::mcset eo "&Filter" "&Filtrilo" ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:" @@ -37,39 +37,39 @@ namespace eval ::tk { ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon" ::msgcat::mcset eo "&Ignore" "&Ignoru" ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"." - ::msgcat::mcset eo "Log Files" "Protokolo" + ::msgcat::mcset eo "Log Files" "Protokolaj dosieroj" ::msgcat::mcset eo "&No" "&Ne" - ::msgcat::mcset eo "&OK" - ::msgcat::mcset eo "OK" - ::msgcat::mcset eo "Ok" + ::msgcat::mcset eo "&OK" "&Bone" + ::msgcat::mcset eo "OK" "Bone" + ::msgcat::mcset eo "Ok" "Bone" ::msgcat::mcset eo "Open" "Malfermu" ::msgcat::mcset eo "&Open" "&Malfermu" - ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn" - ::msgcat::mcset eo "P&aste" "&Elpo\u015digi" - ::msgcat::mcset eo "&Quit" "&Finigu" - ::msgcat::mcset eo "&Red" "&Rosa" - ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?" - ::msgcat::mcset eo "&Retry" "&Ripetu" - ::msgcat::mcset eo "&Save" "&Savu" - ::msgcat::mcset eo "Save As" "Savu kiel" - ::msgcat::mcset eo "Save To Log" "Savu en protokolon" + ::msgcat::mcset eo "Open Multiple Files" "Malfermu plurajn dosierojn" + ::msgcat::mcset eo "P&aste" "&Algluu" + ::msgcat::mcset eo "&Quit" "&Forlasu" + ::msgcat::mcset eo "&Red" "&Ru\u011da" + ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u016digi ekzistantan dosieron?" + ::msgcat::mcset eo "&Retry" "&Reprovu" + ::msgcat::mcset eo "&Save" "&Konservu" + ::msgcat::mcset eo "Save As" "Konservu kiel" + ::msgcat::mcset eo "Save To Log" "Konservu en protokolon" ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron" ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti" ::msgcat::mcset eo "&Selection:" "&Elekto:" - ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn" + ::msgcat::mcset eo "Skip Messages" "transsaltu mesa\u011dojn" ::msgcat::mcset eo "&Source..." "&Fontoprogramo..." ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj" - ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso" - ::msgcat::mcset eo "Text Files" "Tekstodosierojn" + ::msgcat::mcset eo "Tcl for Windows" "Tcl por Vindozo" + ::msgcat::mcset eo "Text Files" "Tekstodosieroj" ::msgcat::mcset eo "&Yes" "&Jes" - ::msgcat::mcset eo "abort" "\u0109esigo" + ::msgcat::mcset eo "abort" "\u0109esigu" ::msgcat::mcset eo "blue" "blua" ::msgcat::mcset eo "cancel" "rezignu" - ::msgcat::mcset eo "extension" "ekspansio" - ::msgcat::mcset eo "extensions" "ekspansioj" + ::msgcat::mcset eo "extension" "kromprogramo" + ::msgcat::mcset eo "extensions" "kromprogramoj" ::msgcat::mcset eo "green" "verda" - ::msgcat::mcset eo "ignore" "ignorieren" + ::msgcat::mcset eo "ignore" "ignoru" ::msgcat::mcset eo "red" "ru\u011da" - ::msgcat::mcset eo "retry" "ripetu" + ::msgcat::mcset eo "retry" "reprovu" ::msgcat::mcset eo "yes" "jes" } diff --git a/mingw64/lib/tk8.6/msgs/fi.msg b/mingw64/lib/tk8.6/msgs/fi.msg new file mode 100644 index 00000000000..e014cce6ba4 --- /dev/null +++ b/mingw64/lib/tk8.6/msgs/fi.msg @@ -0,0 +1,89 @@ +namespace eval ::tk { + ::msgcat::mcset fi "&Abort" "&Keskeyt\u00e4" + ::msgcat::mcset fi "&About..." "&Tietoja..." + ::msgcat::mcset fi "All Files" "Kaikki tiedostot" + ::msgcat::mcset fi "Application Error" "Ohjelmavirhe" + ::msgcat::mcset fi "&Apply" "K\u00e4&yt\u00e4" + ::msgcat::mcset fi "Bold" "Lihavoitu" + ::msgcat::mcset fi "Bold Italic" "Lihavoitu, kursivoitu" + ::msgcat::mcset fi "&Blue" "&Sininen" + ::msgcat::mcset fi "Cancel" "Peruuta" + ::msgcat::mcset fi "&Cancel" "&Peruuta" + ::msgcat::mcset fi "Cannot change to the directory \"%1\$s\".\nPermission denied." "Ei voitu vaihtaa hakemistoon \"%1\$s\".\nLupa ev\u00e4tty." + ::msgcat::mcset fi "Choose Directory" "Valitse hakemisto" + ::msgcat::mcset fi "Cl&ear" "&Tyhjenn\u00e4" + ::msgcat::mcset fi "&Clear Console" "&Tyhjenn\u00e4 konsoli" + ::msgcat::mcset fi "Color" "V\u00e4ri" + ::msgcat::mcset fi "Console" "Konsoli" + ::msgcat::mcset fi "&Copy" "K&opioi" + ::msgcat::mcset fi "Cu&t" "&Leikkaa" + ::msgcat::mcset fi "&Delete" "&Poista" + ::msgcat::mcset fi "Details >>" "Lis\u00e4tiedot >>" + ::msgcat::mcset fi "Directory \"%1\$s\" does not exist." "Hakemistoa \"%1\$s\" ei ole olemassa." + ::msgcat::mcset fi "&Directory:" "&Hakemisto:" + ::msgcat::mcset fi "&Edit" "&Muokkaa" + ::msgcat::mcset fi "Effects" "Tehosteet" + ::msgcat::mcset fi "Error: %1\$s" "Virhe: %1\$s" + ::msgcat::mcset fi "E&xit" "&Lopeta" + ::msgcat::mcset fi "&File" "&Tiedosto" + ::msgcat::mcset fi "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Tiedosto \"%1\$s\" on jo olemassa.\nHaluatko korvata sen?" + ::msgcat::mcset fi "File \"%1\$s\" already exists.\n\n" "Tiedosto \"%1\$s\" on jo olemassa.\n\n" + ::msgcat::mcset fi "File \"%1\$s\" does not exist." "Tiedostoa \"%1\$s\" ei ole olemassa." + ::msgcat::mcset fi "File &name:" "Tiedosto&nimi:" + ::msgcat::mcset fi "File &names:" "Tiedosto&nimet:" + ::msgcat::mcset fi "Files of &type:" "T&yyppi:" + ::msgcat::mcset fi "Fi&les:" "Ti&edostot:" + ::msgcat::mcset fi "&Filter" "&Suodata" + ::msgcat::mcset fi "Fil&ter:" "Suo&data:" + ::msgcat::mcset fi "Font" "Kirjasin" + ::msgcat::mcset fi "&Font:" "&Kirjasin:" + ::msgcat::mcset fi "Font st&yle:" "Kirjasint&yyli:" + ::msgcat::mcset fi "&Green" "&Vihre\u00e4" + ::msgcat::mcset fi "&Help" "&Ohje" + ::msgcat::mcset fi "Hi" "Hei" + ::msgcat::mcset fi "&Hide Console" "P&iilota konsoli" + ::msgcat::mcset fi "&Ignore" "&Ohita" + ::msgcat::mcset fi "Invalid file name \"%1\$s\"." "Virheellinen tiedostonimi \"%1\$s\"." + ::msgcat::mcset fi "Italic" "Kursivoitu" + ::msgcat::mcset fi "Log Files" "Lokitiedostot" + ::msgcat::mcset fi "&No" "&Ei" + ::msgcat::mcset fi "&OK" + ::msgcat::mcset fi "OK" + ::msgcat::mcset fi "Ok" "OK" + ::msgcat::mcset fi "Open" "Avaa" + ::msgcat::mcset fi "&Open" "&Avaa" + ::msgcat::mcset fi "Open Multiple Files" "Avaa monta tiedostoa" + ::msgcat::mcset fi "P&aste" "L&iit\u00e4" + ::msgcat::mcset fi "&Quit" "&Lopeta" + ::msgcat::mcset fi "&Red" "&Punainen" + ::msgcat::mcset fi "Regular" "Tavallinen" + ::msgcat::mcset fi "Replace existing file?" "Korvataanko olemassaoleva tiedosto?" + ::msgcat::mcset fi "&Retry" "&Yrit\u00e4 uudelleen" + ::msgcat::mcset fi "Sample" "Malli" + ::msgcat::mcset fi "&Save" "&Tallenna" + ::msgcat::mcset fi "Save As" "Tallenna nimell\u00e4" + ::msgcat::mcset fi "Save To Log" "Tallenna lokiin" + ::msgcat::mcset fi "Select Log File" "Valitse lokitiedosto" + ::msgcat::mcset fi "Select a file to source" "Valitse l\u00e4hdetiedosto" + ::msgcat::mcset fi "&Selection:" "&Valinta:" + ::msgcat::mcset fi "&Size:" "K&oko:" + ::msgcat::mcset fi "Skip Messages" "J\u00e4t\u00e4 viestit huomiotta" + ::msgcat::mcset fi "&Source..." "L&\u00e4hde..." + ::msgcat::mcset fi "Stri&keout" "&Yliviivaa" + ::msgcat::mcset fi "Tcl Scripts" "Tcl-skriptit" + ::msgcat::mcset fi "Tcl for Windows" "Tcl Windowsille" + ::msgcat::mcset fi "Text Files" "Tekstitiedostot" + ::msgcat::mcset fi "&Underline" "&Alleviivaa" + ::msgcat::mcset fi "&Yes" "&Kyll\u00e4" + ::msgcat::mcset fi "abort" "keskeyt\u00e4" + ::msgcat::mcset fi "blue" "sininen" + ::msgcat::mcset fi "cancel" "peruuta" + ::msgcat::mcset fi "extension" "lis\u00e4osa" + ::msgcat::mcset fi "extensions" "lis\u00e4osat" + ::msgcat::mcset fi "green" "vihre\u00e4" + ::msgcat::mcset fi "ignore" "ohita" + ::msgcat::mcset fi "ok" + ::msgcat::mcset fi "red" "punainen" + ::msgcat::mcset fi "retry" "yrit\u00e4 uudelleen" + ::msgcat::mcset fi "yes" "kyll\u00e4" +} diff --git a/mingw64/lib/tk8.6/msgs/ru.msg b/mingw64/lib/tk8.6/msgs/ru.msg index 2aac5bbf40f..d7ad8b14fbf 100644 --- a/mingw64/lib/tk8.6/msgs/ru.msg +++ b/mingw64/lib/tk8.6/msgs/ru.msg @@ -3,13 +3,17 @@ namespace eval ::tk { ::msgcat::mcset ru "&About..." "\u041f\u0440\u043e..." ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b" ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435" + ::msgcat::mcset ru "&Apply" "&\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c" + ::msgcat::mcset ru "Bold" "Bold" + ::msgcat::mcset ru "Bold Italic" "Bold Italic" ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439" - ::msgcat::mcset ru "Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430" + ::msgcat::mcset ru "Cancel" "\u041e\u0442\u043c\u0435\u043d\u0430" ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430" ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \ "\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430" ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433" ::msgcat::mcset ru "Cl&ear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c" + ::msgcat::mcset ru "&Clear Console" "&Clear Console" ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442" ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c" ::msgcat::mcset ru "&Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c" @@ -18,8 +22,11 @@ namespace eval ::tk { ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>" ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442." ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:" + ::msgcat::mcset ru "&Edit" "&Edit" + ::msgcat::mcset ru "Effects" "\u042d\u0444\u0444\u0435\u043a\u0442\u044b" ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s" ::msgcat::mcset ru "E&xit" "\u0412\u044b\u0445\u043e\u0434" + ::msgcat::mcset ru "&File" "&File" ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \ "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?" ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n" @@ -30,11 +37,16 @@ namespace eval ::tk { ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:" ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440" ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:" + ::msgcat::mcset ru "Font" "\u0428\u0440\u0438\u0444\u0442" + ::msgcat::mcset ru "&Font:" "&\u0428\u0440\u0438\u0444\u0442" + ::msgcat::mcset ru "Font st&yle:" "&\u0421\u0442\u0438\u043b\u044c \u0448\u0440\u0438\u0444\u0442\u0430:" ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439" + ::msgcat::mcset ru "&Help" "&Help" ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442" ::msgcat::mcset ru "&Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c" ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c" ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"." + ::msgcat::mcset ru "Italic" "Italic" ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430" ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442" ::msgcat::mcset ru "&OK" "&\u041e\u041a" @@ -46,19 +58,26 @@ namespace eval ::tk { ::msgcat::mcset ru "P&aste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c" ::msgcat::mcset ru "&Quit" "\u0412\u044b\u0445\u043e\u0434" ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439" + ::msgcat::mcset ru "Regular" "Regular" ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?" ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c" + ::msgcat::mcset ru "Sample" "\u041f\u0440\u0438\u043c\u0435\u0440" ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c" ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a" ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b" ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b" ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438" - ::msgcat::mcset ru "&Selection:" + ::msgcat::mcset ru "&Selection:" "&Selection:" + ::msgcat::mcset ru "&Size:" "&\u0420\u0430\u0437\u043c\u0435\u0440:" + ::msgcat::mcset ru "Show &Hidden Directories" "Show &Hidden Directories" + ::msgcat::mcset ru "Show &Hidden Files and Directories" "Show &Hidden Files and Directories" ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f" ::msgcat::mcset ru "&Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..." + ::msgcat::mcset ru "Stri&keout" "\u041f&\u0435\u0440\u0435\u0447\u0451\u0440\u043a\u043d\u0443\u0442\u044b\u0439" ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL" ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows" ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b" + ::msgcat::mcset ru "&Underline" "\u041f\u043e&\u0434\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439" ::msgcat::mcset ru "&Yes" "&\u0414\u0430" ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430" ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439" @@ -72,4 +91,3 @@ namespace eval ::tk { ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c" ::msgcat::mcset ru "yes" "\u0434\u0430" } - diff --git a/mingw64/lib/tk8.6/msgs/zh_cn.msg b/mingw64/lib/tk8.6/msgs/zh_cn.msg new file mode 100644 index 00000000000..9a728b7b212 --- /dev/null +++ b/mingw64/lib/tk8.6/msgs/zh_cn.msg @@ -0,0 +1,92 @@ +namespace eval ::tk { + ::msgcat::mcset zh_cn "&Abort" "&中止" + ::msgcat::mcset zh_cn "&About..." "&关于……" + ::msgcat::mcset zh_cn "All Files" "所有文件" + ::msgcat::mcset zh_cn "Application Error" "应用程序错误" + ::msgcat::mcset zh_cn "&Apply" "&添加" + ::msgcat::mcset zh_cn "Bold" "粗体" + ::msgcat::mcset zh_cn "Bold Italic" "加粗斜体" + ::msgcat::mcset zh_cn "&Blue" "&蓝色" + ::msgcat::mcset zh_cn "Cancel" "取消" + ::msgcat::mcset zh_cn "&Cancel" "&取消" + ::msgcat::mcset zh_cn "Cannot change to the directory \"%1\$s\".\nPermission denied." "无法更改目录 \"%1\$s\"。\n访问被拒绝。" + ::msgcat::mcset zh_cn "Choose Directory" "选择文件夹" + ::msgcat::mcset zh_cn "Cl&ear" "清&除" + ::msgcat::mcset zh_cn "&Clear Console" "&清除终端" + ::msgcat::mcset zh_cn "Color" "颜色" + ::msgcat::mcset zh_cn "Console" "终端" + ::msgcat::mcset zh_cn "&Copy" "&复制" + ::msgcat::mcset zh_cn "Cu&t" "剪&切" + ::msgcat::mcset zh_cn "&Delete" "&删除" + ::msgcat::mcset zh_cn "Details >>" "详细信息 >>" + ::msgcat::mcset zh_cn "Directory \"%1\$s\" does not exist." "目录 \"%1\$s\" 不存在。" + ::msgcat::mcset zh_cn "&Directory:" "&目录：" + ::msgcat::mcset zh_cn "&Edit" "&编辑" + ::msgcat::mcset zh_cn "Effects" "效果" + ::msgcat::mcset zh_cn "Error: %1\$s" "错误： %1\$s" + ::msgcat::mcset zh_cn "E&xit" "退&出" + ::msgcat::mcset zh_cn "&File" "&文件" + ::msgcat::mcset zh_cn "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "文件 \"%1\$s\" 已经存在。\n您想要覆盖它吗？" + ::msgcat::mcset zh_cn "File \"%1\$s\" already exists.\n\n" "文件 \"%1\$s\" 已经存在。\n\n" + ::msgcat::mcset zh_cn "File \"%1\$s\" does not exist." "文件 \"%1\$s\" 不存在。" + ::msgcat::mcset zh_cn "File &name:" "文件&名：" + ::msgcat::mcset zh_cn "File &names:" "文件&名：" + ::msgcat::mcset zh_cn "Files of &type:" "文件&类型：" + ::msgcat::mcset zh_cn "Fi&les:" "文&件：" + ::msgcat::mcset zh_cn "&Filter" "&过滤" + ::msgcat::mcset zh_cn "Fil&ter:" "过&滤：" + ::msgcat::mcset zh_cn "Font" "字体" + ::msgcat::mcset zh_cn "&Font:" "&字体：" + ::msgcat::mcset zh_cn "Font st&yle:" "字体&样式：" + ::msgcat::mcset zh_cn "&Green" "&绿色" + ::msgcat::mcset zh_cn "&Help" "&帮助" + ::msgcat::mcset zh_cn "Hi" "你好" + ::msgcat::mcset zh_cn "&Hide Console" "&隐藏终端" + ::msgcat::mcset zh_cn "&Ignore" "&忽略" + ::msgcat::mcset zh_cn "Invalid file name \"%1\$s\"." "无效的文件名 \"%1\$s\"。" + ::msgcat::mcset zh_cn "Italic" "斜体" + ::msgcat::mcset zh_cn "Log Files" "日志文件" + ::msgcat::mcset zh_cn "&No" "&取消" + ::msgcat::mcset zh_cn "&OK" "&确定" + ::msgcat::mcset zh_cn "OK" "确定" + ::msgcat::mcset zh_cn "Ok" "确定" + ::msgcat::mcset zh_cn "Open" "打开" + ::msgcat::mcset zh_cn "&Open" "&打开" + ::msgcat::mcset zh_cn "Open Multiple Files" "打开多个文件" + ::msgcat::mcset zh_cn "P&aste" "粘&贴" + ::msgcat::mcset zh_cn "&Quit" "&退出" + ::msgcat::mcset zh_cn "&Red" "红色" + ::msgcat::mcset zh_cn "Regular" "规则" + ::msgcat::mcset zh_cn "Replace existing file?" "替换已有文件？" + ::msgcat::mcset zh_cn "&Retry" "&重试" + ::msgcat::mcset zh_cn "Sample" "样式" + ::msgcat::mcset zh_cn "&Save" "&保存" + ::msgcat::mcset zh_cn "Save As" "另存为" + ::msgcat::mcset zh_cn "Save To Log" "保存到日志" + ::msgcat::mcset zh_cn "Select Log File" "选择日志文件" + ::msgcat::mcset zh_cn "Select a file to source" "选择一个源文件" + ::msgcat::mcset zh_cn "&Selection:" "&选择：" + ::msgcat::mcset zh_cn "&Size:" "&大小：" + ::msgcat::mcset zh_cn "Show &Hidden Directories" "显示&隐藏目录" + ::msgcat::mcset zh_cn "Show &Hidden Files and Directories" "显示&隐藏文件和目录" + ::msgcat::mcset zh_cn "Skip Messages" "跳过信息" + ::msgcat::mcset zh_cn "&Source..." "&来源……" + ::msgcat::mcset zh_cn "Stri&keout" "删&除线" + ::msgcat::mcset zh_cn "Tcl Scripts" "Tcl脚本" + ::msgcat::mcset zh_cn "Tcl for Windows" "适用于Windows的Tcl" + ::msgcat::mcset zh_cn "Text Files" "文本文档" + ::msgcat::mcset zh_cn "&Underline" "&下划线" + ::msgcat::mcset zh_cn "&Yes" "&确定" + ::msgcat::mcset zh_cn "abort" "中止" + ::msgcat::mcset zh_cn "blue" "蓝色" + ::msgcat::mcset zh_cn "cancel" "取消" + ::msgcat::mcset zh_cn "extension" "拓展" + ::msgcat::mcset zh_cn "extensions" "拓展" + ::msgcat::mcset zh_cn "green" "绿色" + ::msgcat::mcset zh_cn "ignore" "忽略" + ::msgcat::mcset zh_cn "ok" "确定" + ::msgcat::mcset zh_cn "red" "红色" + ::msgcat::mcset zh_cn "retry" "重试" + ::msgcat::mcset zh_cn "yes" "确认" +} + diff --git a/mingw64/lib/tk8.6/pkgIndex.tcl b/mingw64/lib/tk8.6/pkgIndex.tcl index 0e4a3e37ed3..5c7dfbf946c 100644 --- a/mingw64/lib/tk8.6/pkgIndex.tcl +++ b/mingw64/lib/tk8.6/pkgIndex.tcl @@ -1,7 +1,7 @@ if {![package vsatisfies [package provide Tcl] 8.6.0]} return if {($::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)] || ([info exists ::argv] && ("-display" in $::argv)))} { - package ifneeded Tk 8.6.12 [list load [file normalize [file join $dir .. .. bin libtk8.6.dll]]] + package ifneeded Tk 8.6.13 [list load [file normalize [file join $dir .. .. bin libtk8.6.dll]]] } else { - package ifneeded Tk 8.6.12 [list load [file normalize [file join $dir .. .. bin tk86.dll]]] + package ifneeded Tk 8.6.13 [list load [file normalize [file join $dir .. .. bin tk86.dll]]] } diff --git a/mingw64/lib/tk8.6/scale.tcl b/mingw64/lib/tk8.6/scale.tcl index fb9b81b26b0..466a3ce6aad 100644 --- a/mingw64/lib/tk8.6/scale.tcl +++ b/mingw64/lib/tk8.6/scale.tcl @@ -210,7 +210,20 @@ proc ::tk::ScaleEndDrag {w} { proc ::tk::ScaleIncrement {w dir big repeat} { variable ::tk::Priv + if {![winfo exists $w]} return + + # give the cancel callback a chance to be serviced if the execution time of + # the -command script lasts longer than -repeatdelay + set clockms [clock milliseconds] + if {$repeat eq "again" && + [expr {$clockms - $Priv(clockms)}] > [expr {[$w cget -repeatinterval] * 1.1}]} { + set Priv(clockms) $clockms + set Priv(afterId) [after [$w cget -repeatinterval] \ + [list tk::ScaleIncrement $w $dir $big again]] + return + } + if {$big eq "big"} { set inc [$w cget -bigincrement] if {$inc == 0} { @@ -231,14 +244,18 @@ proc ::tk::ScaleIncrement {w dir big repeat} { set inc [expr {-$inc}] } } + # this will run the -command script (if any) during the redrawing + # of the scale at idle time $w set [expr {[$w get] + $inc}] if {$repeat eq "again"} { + set Priv(clockms) $clockms set Priv(afterId) [after [$w cget -repeatinterval] \ [list tk::ScaleIncrement $w $dir $big again]] } elseif {$repeat eq "initial"} { set delay [$w cget -repeatdelay] if {$delay > 0} { + set Priv(clockms) $clockms set Priv(afterId) [after $delay \ [list tk::ScaleIncrement $w $dir $big again]] } diff --git a/mingw64/lib/tk8.6/spinbox.tcl b/mingw64/lib/tk8.6/spinbox.tcl index 2b387d2afa0..0e26644a7ed 100644 --- a/mingw64/lib/tk8.6/spinbox.tcl +++ b/mingw64/lib/tk8.6/spinbox.tcl @@ -200,18 +200,18 @@ bind Spinbox <> { bind Spinbox <> { %W selection clear } -bind Spinbox { +bind Spinbox { ::tk::EntryInsert %W %A } -# Ignore all Alt, Meta, and Control keypresses unless explicitly bound. +# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the -# class binding will also fire and insert the character, +# class binding will also fire and insert the character, # which is wrong. Ditto for Escape, Return, and Tab. -bind Spinbox {# nothing} -bind Spinbox {# nothing} -bind Spinbox {# nothing} +bind Spinbox {# nothing} +bind Spinbox {# nothing} +bind Spinbox {# nothing} bind Spinbox {# nothing} bind Spinbox {# nothing} bind Spinbox {# nothing} @@ -219,7 +219,8 @@ bind Spinbox {# nothing} bind Spinbox {# nothing} bind Spinbox {# nothing} if {[tk windowingsystem] eq "aqua"} { - bind Spinbox {# nothing} + bind Spinbox {# nothing} + bind Spinbox {# nothing} } # On Windows, paste is done using Shift-Insert. Shift-Insert already diff --git a/mingw64/lib/tk8.6/text.tcl b/mingw64/lib/tk8.6/text.tcl index d1f9b8648e7..6cfe9d0e9b9 100644 --- a/mingw64/lib/tk8.6/text.tcl +++ b/mingw64/lib/tk8.6/text.tcl @@ -292,22 +292,23 @@ bind Text <> { bind Text { catch {tk::TextInsert %W [::tk::GetSelection %W PRIMARY]} } -bind Text { +bind Text { tk::TextInsert %W %A } # Ignore all Alt, Meta, and Control keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the -# class binding will also fire and insert the character, +# class binding will also fire and insert the character, # which is wrong. Ditto for . -bind Text {# nothing } -bind Text {# nothing} -bind Text {# nothing} +bind Text {# nothing } +bind Text {# nothing} +bind Text {# nothing} bind Text {# nothing} bind Text {# nothing} if {[tk windowingsystem] eq "aqua"} { - bind Text {# nothing} + bind Text {# nothing} + bind Text {# nothing} } # Additional emacs-like bindings: diff --git a/mingw64/lib/tk8.6/tk.tcl b/mingw64/lib/tk8.6/tk.tcl index 5bb3be71aa3..89267d66ccd 100644 --- a/mingw64/lib/tk8.6/tk.tcl +++ b/mingw64/lib/tk8.6/tk.tcl @@ -11,7 +11,7 @@ # this file, and for a DISCLAIMER OF ALL WARRANTIES. # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.6.12 +package require -exact Tk 8.6.13 # Create a ::tk namespace namespace eval ::tk { @@ -675,15 +675,6 @@ proc ::tk::mcmaxamp {args} { return $maxlen } -# For now, turn off the custom mdef proc for the Mac: - -if {[tk windowingsystem] eq "aqua"} { - namespace eval ::tk::mac { - set useCustomMDEF 0 - } -} - - if {[tk windowingsystem] eq "aqua"} { #stub procedures to respond to "do script" Apple Events proc ::tk::mac::DoScriptFile {file} { diff --git a/mingw64/lib/tk8.6/tkfbox.tcl b/mingw64/lib/tk8.6/tkfbox.tcl index f73fdc5c84c..0c3cc0c3f63 100644 --- a/mingw64/lib/tk8.6/tkfbox.tcl +++ b/mingw64/lib/tk8.6/tkfbox.tcl @@ -463,7 +463,7 @@ proc ::tk::dialog::file::Create {w class} { wm protocol $w WM_DELETE_WINDOW [list ::tk::dialog::file::CancelCmd $w] $data(upBtn) configure -command [list ::tk::dialog::file::UpDirCmd $w] $data(cancelBtn) configure -command [list ::tk::dialog::file::CancelCmd $w] - bind $w [list $data(cancelBtn) invoke] + bind $w [list $data(cancelBtn) invoke] bind $w [list tk::AltKeyInDialog $w %A] # Set up event handlers specific to File or Directory Dialogs @@ -581,9 +581,9 @@ proc ::tk::dialog::file::Update {w} { # so the user may still click and cause havoc ... # set entCursor [$data(ent) cget -cursor] - set dlgCursor [$w cget -cursor] + set dlgCursor [$w cget -cursor] $data(ent) configure -cursor watch - $w configure -cursor watch + $w configure -cursor watch update idletasks $data(icons) deleteall @@ -633,7 +633,7 @@ proc ::tk::dialog::file::Update {w} { # turn off the busy cursor. # $data(ent) configure -cursor $entCursor - $w configure -cursor $dlgCursor + $w configure -cursor $dlgCursor } # ::tk::dialog::file::SetPathSilently -- @@ -909,15 +909,15 @@ proc ::tk::dialog::file::VerifyFileName {w filename} { } } PATH { - tk_messageBox -icon warning -type ok -parent $w \ - -message [mc "Directory \"%1\$s\" does not exist." $path] + tk_messageBox -icon warning -type ok -parent $w -message \ + [mc "Directory \"%1\$s\" does not exist." $path] $data(ent) selection range 0 end $data(ent) icursor end } CHDIR { tk_messageBox -type ok -parent $w -icon warning -message \ - [mc "Cannot change to the directory\ - \"%1\$s\".\nPermission denied." $path] + [mc "Cannot change to the directory\ + \"%1\$s\".\nPermission denied." $path] $data(ent) selection range 0 end $data(ent) icursor end } @@ -1121,8 +1121,7 @@ proc ::tk::dialog::file::Done {w {selectFilePath ""}} { } then { upvar #0 $data(-typevariable) typeVariable set typeVariable [lindex $data(origfiletypes) \ - [lsearch -exact $data(-filetypes) $data(filterType)] 0] - + [lsearch -exact $data(-filetypes) $data(filterType)] 0] } } bind $data(okBtn) {} diff --git a/mingw64/lib/tk8.6/ttk/cursors.tcl b/mingw64/lib/tk8.6/ttk/cursors.tcl index f1f9fa16336..9d1e1aef31b 100644 --- a/mingw64/lib/tk8.6/ttk/cursors.tcl +++ b/mingw64/lib/tk8.6/ttk/cursors.tcl @@ -99,23 +99,20 @@ namespace eval ttk { } "aqua" { - if {[package vsatisfies [package provide Tk] 8.5]} { - # appeared 2007-04-23, Tk 8.5a6 - array set Cursors { - standard arrow - text ibeam - link pointinghand - crosshair crosshair - busy watch - forbidden notallowed - - hresize resizeleftright - vresize resizeupdown - nresize resizeup - sresize resizedown - wresize resizeleft - eresize resizeright - } + array set Cursors { + standard arrow + text ibeam + link pointinghand + crosshair crosshair + busy watch + forbidden notallowed + + hresize resizeleftright + vresize resizeupdown + nresize resizeup + sresize resizedown + wresize resizeleft + eresize resizeright } } } @@ -201,7 +198,7 @@ proc ttk::CursorSampler {f} { if {[info exists argv0] && $argv0 eq [info script]} { wm title . "[array size ::ttk::Cursors] cursors" pack [ttk::CursorSampler .f] -expand true -fill both - bind . [list destroy .] + bind . [list destroy .] focus .f } diff --git a/mingw64/lib/tk8.6/ttk/entry.tcl b/mingw64/lib/tk8.6/ttk/entry.tcl index 4cdb5acbfb5..12080a3bec3 100644 --- a/mingw64/lib/tk8.6/ttk/entry.tcl +++ b/mingw64/lib/tk8.6/ttk/entry.tcl @@ -141,6 +141,7 @@ bind TEntry {# nothing} # as a Command modifier. if {[tk windowingsystem] eq "aqua"} { bind TEntry {# nothing} + bind TEntry {# nothing} } # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind TEntry <> {# nothing} diff --git a/mingw64/lib/tk8.6/ttk/menubutton.tcl b/mingw64/lib/tk8.6/ttk/menubutton.tcl index a0f70c99d01..fc0ea023dec 100644 --- a/mingw64/lib/tk8.6/ttk/menubutton.tcl +++ b/mingw64/lib/tk8.6/ttk/menubutton.tcl @@ -82,7 +82,6 @@ if {[tk windowingsystem] eq "aqua"} { set bbh [expr {[winfo height $mb]} + $bevelPad] set mw [winfo reqwidth $menu] set bw [winfo width $mb] - set dF [expr {[winfo width $mb] - [winfo reqwidth $menu] - $menuPad}] set entry [::tk::MenuFindName $menu [$mb cget -text]] if {$entry < 0} { set entry 0 @@ -106,7 +105,7 @@ if {[tk windowingsystem] eq "aqua"} { incr y $menuPad incr x $bw } - default { + default { # flush incr y $bbh } } @@ -118,7 +117,6 @@ if {[tk windowingsystem] eq "aqua"} { set bh [expr {[winfo height $mb]}] set mw [expr {[winfo reqwidth $menu]}] set bw [expr {[winfo width $mb]}] - set dF [expr {[winfo width $mb] - [winfo reqwidth $menu]}] if {[tk windowingsystem] eq "win32"} { incr mh 6 incr mw 16 @@ -154,13 +152,8 @@ if {[tk windowingsystem] eq "aqua"} { right { incr x $bw } - default { - if {[$mb cget -style] eq ""} { - incr x [expr {([winfo width $mb] - \ - [winfo reqwidth $menu])/ 2}] - } else { - incr y $bh - } + default { # flush + incr x [expr {([winfo width $mb] - [winfo reqwidth $menu])/ 2}] } } return [list $x $y $entry] diff --git a/mingw64/lib/tk8.6/ttk/panedwindow.tcl b/mingw64/lib/tk8.6/ttk/panedwindow.tcl index 0fd9bd75631..1989b8955ca 100644 --- a/mingw64/lib/tk8.6/ttk/panedwindow.tcl +++ b/mingw64/lib/tk8.6/ttk/panedwindow.tcl @@ -45,9 +45,9 @@ proc ttk::panedwindow::Press {w x y} { proc ttk::panedwindow::Drag {w x y} { variable State if {!$State(pressed)} { return } - switch -- [$w cget -orient] { - horizontal { set delta [expr {$x - $State(pressX)}] } - vertical { set delta [expr {$y - $State(pressY)}] } + switch -glob -- [$w cget -orient] { + h* { set delta [expr {$x - $State(pressX)}] } + v* { set delta [expr {$y - $State(pressY)}] } } $w sashpos $State(sash) [expr {$State(sashPos) + $delta}] } @@ -80,9 +80,9 @@ proc ttk::panedwindow::SetCursor {w x y} { set cursor $State(userConfCursor) if {[llength [$w identify $x $y]]} { # Assume we're over a sash. - switch -- [$w cget -orient] { - horizontal { set cursor hresize } - vertical { set cursor vresize } + switch -glob -- [$w cget -orient] { + h* { set cursor hresize } + v* { set cursor vresize } } } ttk::setCursor $w $cursor diff --git a/mingw64/lib/tk8.6/ttk/utils.tcl b/mingw64/lib/tk8.6/ttk/utils.tcl index 257191493ef..3d908800442 100644 --- a/mingw64/lib/tk8.6/ttk/utils.tcl +++ b/mingw64/lib/tk8.6/ttk/utils.tcl @@ -236,8 +236,8 @@ proc ttk::Repeatedly {args} { after cancel $Repeat(timer) set script [uplevel 1 [list namespace code $args]] set Repeat(script) $script - uplevel #0 $script set Repeat(timer) [after $Repeat(delay) ttk::Repeat] + uplevel #0 $script } ## Repeat -- @@ -245,8 +245,8 @@ proc ttk::Repeatedly {args} { # proc ttk::Repeat {} { variable Repeat - uplevel #0 $Repeat(script) set Repeat(timer) [after $Repeat(interval) ttk::Repeat] + uplevel #0 $Repeat(script) } ## ttk::CancelRepeat -- diff --git a/mingw64/lib/tk8.6/xmfbox.tcl b/mingw64/lib/tk8.6/xmfbox.tcl index 14d2be5af65..c26164a3dd1 100644 --- a/mingw64/lib/tk8.6/xmfbox.tcl +++ b/mingw64/lib/tk8.6/xmfbox.tcl @@ -83,9 +83,9 @@ proc ::tk::MotifFDialog_Create {dataName type argList} { MotifFDialog_Config $dataName $type $argList if {$data(-parent) eq "."} { - set w .$dataName + set w .$dataName } else { - set w $data(-parent).$dataName + set w $data(-parent).$dataName } # (re)create the dialog box if necessary @@ -549,7 +549,7 @@ proc ::tk::MotifFDialog_Update {w} { $data(fEnt) delete 0 end $data(fEnt) insert 0 \ - [::tk::dialog::file::JoinFile $data(selectPath) $data(filter)] + [::tk::dialog::file::JoinFile $data(selectPath) $data(filter)] $data(sEnt) delete 0 end $data(sEnt) insert 0 [::tk::dialog::file::JoinFile $data(selectPath) \ $data(selectFile)] @@ -597,15 +597,15 @@ proc ::tk::MotifFDialog_LoadFiles {w} { if {[file isdir ./$f]} { lappend dlist $f } else { - foreach pat $data(filter) { - if {[string match $pat $f]} { + foreach pat $data(filter) { + if {[string match $pat $f]} { if {[string match .* $f]} { incr top } lappend flist $f - break + break } - } + } } } eval [list $data(dList) insert end] [lsort -dictionary $dlist] @@ -907,9 +907,9 @@ proc ::tk::MotifFDialog_CancelCmd {w} { } proc ::tk::ListBoxKeyAccel_Set {w} { - bind Listbox "" + bind Listbox "" bind $w [list tk::ListBoxKeyAccel_Unset $w] - bind $w [list tk::ListBoxKeyAccel_Key $w %A] + bind $w [list tk::ListBoxKeyAccel_Key $w %A] } proc ::tk::ListBoxKeyAccel_Unset {w} { diff --git a/mingw64/lib/tkConfig.sh b/mingw64/lib/tkConfig.sh index f864df9ba3e..92c92020f1b 100644 --- a/mingw64/lib/tkConfig.sh +++ b/mingw64/lib/tkConfig.sh @@ -17,7 +17,7 @@ TK_DLL_FILE="tk86.dll" TK_VERSION='8.6' TK_MAJOR_VERSION='8' TK_MINOR_VERSION='6' -TK_PATCH_LEVEL='.12' +TK_PATCH_LEVEL='.13' # -D flags for use with the C compiler. TK_DEFS='-DPACKAGE_NAME=\"tk\" -DPACKAGE_TARNAME=\"tk\" -DPACKAGE_VERSION=\"8.6\" -DPACKAGE_STRING=\"tk\ 8.6\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DMODULE_SCOPE=extern -DTCL_CFG_DO64BIT=1 -DHAVE_NO_SEH=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_UXTHEME_H=1 -DHAVE_VSSYM32_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1' diff --git a/mingw64/share/man/man3/Tk_CreateOptionTable.3.gz b/mingw64/share/man/man3/Tk_CreateOptionTable.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_CreateOptionTable.3.gz and b/mingw64/share/man/man3/Tk_CreateOptionTable.3.gz differ diff --git a/mingw64/share/man/man3/Tk_DeleteOptionTable.3.gz b/mingw64/share/man/man3/Tk_DeleteOptionTable.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_DeleteOptionTable.3.gz and b/mingw64/share/man/man3/Tk_DeleteOptionTable.3.gz differ diff --git a/mingw64/share/man/man3/Tk_FreeConfigOptions.3.gz b/mingw64/share/man/man3/Tk_FreeConfigOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_FreeConfigOptions.3.gz and b/mingw64/share/man/man3/Tk_FreeConfigOptions.3.gz differ diff --git a/mingw64/share/man/man3/Tk_FreeSavedOptions.3.gz b/mingw64/share/man/man3/Tk_FreeSavedOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_FreeSavedOptions.3.gz and b/mingw64/share/man/man3/Tk_FreeSavedOptions.3.gz differ diff --git a/mingw64/share/man/man3/Tk_GetOptionInfo.3.gz b/mingw64/share/man/man3/Tk_GetOptionInfo.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_GetOptionInfo.3.gz and b/mingw64/share/man/man3/Tk_GetOptionInfo.3.gz differ diff --git a/mingw64/share/man/man3/Tk_GetOptionValue.3.gz b/mingw64/share/man/man3/Tk_GetOptionValue.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_GetOptionValue.3.gz and b/mingw64/share/man/man3/Tk_GetOptionValue.3.gz differ diff --git a/mingw64/share/man/man3/Tk_InitOptions.3.gz b/mingw64/share/man/man3/Tk_InitOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_InitOptions.3.gz and b/mingw64/share/man/man3/Tk_InitOptions.3.gz differ diff --git a/mingw64/share/man/man3/Tk_Offset.3.gz b/mingw64/share/man/man3/Tk_Offset.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_Offset.3.gz and b/mingw64/share/man/man3/Tk_Offset.3.gz differ diff --git a/mingw64/share/man/man3/Tk_RestoreSavedOptions.3.gz b/mingw64/share/man/man3/Tk_RestoreSavedOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_RestoreSavedOptions.3.gz and b/mingw64/share/man/man3/Tk_RestoreSavedOptions.3.gz differ diff --git a/mingw64/share/man/man3/Tk_SetOptions.3.gz b/mingw64/share/man/man3/Tk_SetOptions.3.gz index 669db8448b2..160c091a135 100644 Binary files a/mingw64/share/man/man3/Tk_SetOptions.3.gz and b/mingw64/share/man/man3/Tk_SetOptions.3.gz differ diff --git a/mingw64/share/man/mann/bind.n.gz b/mingw64/share/man/mann/bind.n.gz index 319cf5c7143..b6476cb1979 100644 Binary files a/mingw64/share/man/mann/bind.n.gz and b/mingw64/share/man/mann/bind.n.gz differ diff --git a/mingw64/share/man/mann/canvas.n.gz b/mingw64/share/man/mann/canvas.n.gz index adc7e351b49..5103b1e2b19 100644 Binary files a/mingw64/share/man/mann/canvas.n.gz and b/mingw64/share/man/mann/canvas.n.gz differ diff --git a/mingw64/share/man/mann/keysyms.n.gz b/mingw64/share/man/mann/keysyms.n.gz index 437061ee2e2..0c5442b5813 100644 Binary files a/mingw64/share/man/mann/keysyms.n.gz and b/mingw64/share/man/mann/keysyms.n.gz differ diff --git a/mingw64/share/man/mann/menubutton.n.gz b/mingw64/share/man/mann/menubutton.n.gz index 1812c59faaf..8c940af5e18 100644 Binary files a/mingw64/share/man/mann/menubutton.n.gz and b/mingw64/share/man/mann/menubutton.n.gz differ diff --git a/mingw64/share/man/mann/text.n.gz b/mingw64/share/man/mann/text.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw64/share/man/mann/text.n.gz and b/mingw64/share/man/mann/text.n.gz differ diff --git a/mingw64/share/man/mann/tk_messageBox.n.gz b/mingw64/share/man/mann/tk_messageBox.n.gz index c6a4e2dd556..3ce05c9095a 100644 Binary files a/mingw64/share/man/mann/tk_messageBox.n.gz and b/mingw64/share/man/mann/tk_messageBox.n.gz differ diff --git a/mingw64/share/man/mann/tk_textCopy.n.gz b/mingw64/share/man/mann/tk_textCopy.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw64/share/man/mann/tk_textCopy.n.gz and b/mingw64/share/man/mann/tk_textCopy.n.gz differ diff --git a/mingw64/share/man/mann/tk_textCut.n.gz b/mingw64/share/man/mann/tk_textCut.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw64/share/man/mann/tk_textCut.n.gz and b/mingw64/share/man/mann/tk_textCut.n.gz differ diff --git a/mingw64/share/man/mann/tk_textPaste.n.gz b/mingw64/share/man/mann/tk_textPaste.n.gz index 5114516dcee..f348653b0f2 100644 Binary files a/mingw64/share/man/mann/tk_textPaste.n.gz and b/mingw64/share/man/mann/tk_textPaste.n.gz differ diff --git a/mingw64/share/man/mann/ttk_image.n.gz b/mingw64/share/man/mann/ttk_image.n.gz index e0d08ac2577..16742f42c06 100644 Binary files a/mingw64/share/man/mann/ttk_image.n.gz and b/mingw64/share/man/mann/ttk_image.n.gz differ diff --git a/mingw64/share/man/mann/ttk_style.n.gz b/mingw64/share/man/mann/ttk_style.n.gz index 1d4690a305e..ebfbe2b89e8 100644 Binary files a/mingw64/share/man/mann/ttk_style.n.gz and b/mingw64/share/man/mann/ttk_style.n.gz differ diff --git a/mingw64/share/man/mann/ttk_treeview.n.gz b/mingw64/share/man/mann/ttk_treeview.n.gz index 993dc122d02..d45cef50335 100644 Binary files a/mingw64/share/man/mann/ttk_treeview.n.gz and b/mingw64/share/man/mann/ttk_treeview.n.gz differ diff --git a/mingw64/share/man/mann/ttk_widget.n.gz b/mingw64/share/man/mann/ttk_widget.n.gz index 6fac16a9a4c..7abdeae0125 100644 Binary files a/mingw64/share/man/mann/ttk_widget.n.gz and b/mingw64/share/man/mann/ttk_widget.n.gz differ diff --git a/mingw64/share/man/mann/wm.n.gz b/mingw64/share/man/mann/wm.n.gz index 6e785c3b38e..cdd89dbcbdf 100644 Binary files a/mingw64/share/man/mann/wm.n.gz and b/mingw64/share/man/mann/wm.n.gz differ diff --git a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/mtree b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/mtree deleted file mode 100644 index 19b09009f8a..00000000000 Binary files a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/mtree and /dev/null differ diff --git a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/desc b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/desc similarity index 69% rename from var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/desc rename to var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/desc index 466accdcda3..d862ee785e0 100644 --- a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/desc +++ b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/desc @@ -2,7 +2,7 @@ mingw-w64-i686-tk %VERSION% -8.6.12-2 +8.6.13-1 %BASE% mingw-w64-tk @@ -17,16 +17,16 @@ https://tcl.sourceforge.io/ any %BUILDDATE% -1687420843 +1712173129 %INSTALLDATE% -1687490657 +1712285976 %PACKAGER% -CI (msys2/msys2-autobuild/79096b75/5342516887) +CI (msys2/msys2-autobuild/8d08599c/8544495110) %SIZE% -5976724 +6077750 %REASON% 1 @@ -35,8 +35,9 @@ CI (msys2/msys2-autobuild/79096b75/5342516887) custom %VALIDATION% +sha256 pgp %DEPENDS% -mingw-w64-i686-tcl>=8.6.12 +mingw-w64-i686-tcl>=8.6.13 diff --git a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/files b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/files similarity index 99% rename from var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/files rename to var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/files index 8bfec528476..15211471d23 100644 --- a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.12-2/files +++ b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/files @@ -199,6 +199,7 @@ mingw32/lib/tk8.6/msgs/en.msg mingw32/lib/tk8.6/msgs/en_gb.msg mingw32/lib/tk8.6/msgs/eo.msg mingw32/lib/tk8.6/msgs/es.msg +mingw32/lib/tk8.6/msgs/fi.msg mingw32/lib/tk8.6/msgs/fr.msg mingw32/lib/tk8.6/msgs/hu.msg mingw32/lib/tk8.6/msgs/it.msg @@ -207,6 +208,7 @@ mingw32/lib/tk8.6/msgs/pl.msg mingw32/lib/tk8.6/msgs/pt.msg mingw32/lib/tk8.6/msgs/ru.msg mingw32/lib/tk8.6/msgs/sv.msg +mingw32/lib/tk8.6/msgs/zh_cn.msg mingw32/lib/tk8.6/obsolete.tcl mingw32/lib/tk8.6/optMenu.tcl mingw32/lib/tk8.6/palette.tcl diff --git a/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/mtree b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/mtree new file mode 100644 index 00000000000..30a052c5661 Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-tk-8.6.13-1/mtree differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc index 33de8eaad95..d2641041d65 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc @@ -20,7 +20,7 @@ any 1682971619 %INSTALLDATE% -1712199591 +1712285982 %PACKAGER% Johannes Schindelin diff --git a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/mtree b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/mtree deleted file mode 100644 index 7c8951e3b6b..00000000000 Binary files a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/mtree and /dev/null differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/desc b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/desc similarity index 68% rename from var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/desc rename to var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/desc index c41ff2044e8..26e9eb8655c 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/desc @@ -2,7 +2,7 @@ mingw-w64-x86_64-tk %VERSION% -8.6.12-2 +8.6.13-1 %BASE% mingw-w64-tk @@ -17,16 +17,16 @@ https://tcl.sourceforge.io/ any %BUILDDATE% -1687421018 +1712173143 %INSTALLDATE% -1687490677 +1712285977 %PACKAGER% -CI (msys2/msys2-autobuild/79096b75/5342516887) +CI (msys2/msys2-autobuild/8d08599c/8544495110) %SIZE% -5906994 +6012624 %REASON% 1 @@ -35,8 +35,9 @@ CI (msys2/msys2-autobuild/79096b75/5342516887) custom %VALIDATION% +sha256 pgp %DEPENDS% -mingw-w64-x86_64-tcl>=8.6.12 +mingw-w64-x86_64-tcl>=8.6.13 diff --git a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/files b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/files similarity index 99% rename from var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/files rename to var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/files index 7d0c1422e01..983cca8623c 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.12-2/files +++ b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/files @@ -199,6 +199,7 @@ mingw64/lib/tk8.6/msgs/en.msg mingw64/lib/tk8.6/msgs/en_gb.msg mingw64/lib/tk8.6/msgs/eo.msg mingw64/lib/tk8.6/msgs/es.msg +mingw64/lib/tk8.6/msgs/fi.msg mingw64/lib/tk8.6/msgs/fr.msg mingw64/lib/tk8.6/msgs/hu.msg mingw64/lib/tk8.6/msgs/it.msg @@ -207,6 +208,7 @@ mingw64/lib/tk8.6/msgs/pl.msg mingw64/lib/tk8.6/msgs/pt.msg mingw64/lib/tk8.6/msgs/ru.msg mingw64/lib/tk8.6/msgs/sv.msg +mingw64/lib/tk8.6/msgs/zh_cn.msg mingw64/lib/tk8.6/obsolete.tcl mingw64/lib/tk8.6/optMenu.tcl mingw64/lib/tk8.6/palette.tcl diff --git a/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/mtree new file mode 100644 index 00000000000..adcf35c43dc Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-x86_64-tk-8.6.13-1/mtree differ diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db index 32ee2671583..152c129bdd0 100644 Binary files a/var/lib/pacman/sync/clang32.db and b/var/lib/pacman/sync/clang32.db differ diff --git a/var/lib/pacman/sync/clang32.db.sig b/var/lib/pacman/sync/clang32.db.sig index 8c869d63044..6cc8e20e0fd 100644 Binary files a/var/lib/pacman/sync/clang32.db.sig and b/var/lib/pacman/sync/clang32.db.sig differ diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db index 85ffc2366f3..54b0582650f 100644 Binary files a/var/lib/pacman/sync/clang64.db and b/var/lib/pacman/sync/clang64.db differ diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig index c6f89206a3d..df9e9645d19 100644 Binary files a/var/lib/pacman/sync/clang64.db.sig and b/var/lib/pacman/sync/clang64.db.sig differ diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db index 938df3c12a7..e85446e8ce5 100644 Binary files a/var/lib/pacman/sync/clangarm64.db and b/var/lib/pacman/sync/clangarm64.db differ diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig index 03156e4b423..00c216defe8 100644 Binary files a/var/lib/pacman/sync/clangarm64.db.sig and b/var/lib/pacman/sync/clangarm64.db.sig differ diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db index 575720c3c6c..639f6099679 100644 Binary files a/var/lib/pacman/sync/mingw32.db and b/var/lib/pacman/sync/mingw32.db differ diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig index bf4822442e1..93e43ecafd6 100644 Binary files a/var/lib/pacman/sync/mingw32.db.sig and b/var/lib/pacman/sync/mingw32.db.sig differ diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db index 6eab98aa5e2..6059d6f3262 100644 Binary files a/var/lib/pacman/sync/mingw64.db and b/var/lib/pacman/sync/mingw64.db differ diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig index e5ebb02e81c..9eadfea4743 100644 Binary files a/var/lib/pacman/sync/mingw64.db.sig and b/var/lib/pacman/sync/mingw64.db.sig differ diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db index f1f27c5b243..8f75c561fce 100644 Binary files a/var/lib/pacman/sync/ucrt64.db and b/var/lib/pacman/sync/ucrt64.db differ diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig index dab4c64a445..f95577c64b5 100644 Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ