diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-03-31 13:11:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-03-31 13:11:02 (GMT) |
| commit | 37ffc5d06afe069f7266b77571fbb1442af47dc0 (patch) | |
| tree | ac67d7f4a9e1008c67b5101426bd649921b98ac2 /generic | |
| parent | aca8f6e571da1e5aeb078efae38cb33c3e5f3228 (diff) | |
| parent | b067e33b380775ccdb269def17dfb8699f22bf5a (diff) | |
| download | tk-37ffc5d06afe069f7266b77571fbb1442af47dc0.zip tk-37ffc5d06afe069f7266b77571fbb1442af47dc0.tar.gz tk-37ffc5d06afe069f7266b77571fbb1442af47dc0.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ks_names.h | 19 | ||||
| -rw-r--r-- | generic/tkTextBTree.c | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/generic/ks_names.h b/generic/ks_names.h index 22d9fc5..9f49130 100644 --- a/generic/ks_names.h +++ b/generic/ks_names.h @@ -1,5 +1,15 @@ /* - * This file is generated from $(INCLUDESRC)/keysymdef.h. Do not edit. + * This file should be maintained in sync with xlib/X11/keysymdefs.h + * + * Note that this should be done manually only, because in some cases + * keysymdefs.h defines the same integer for multiple keysyms, e.g.: + * + * #define XK_Greek_LAMDA 0x7cb + * #define XK_Greek_LAMBDA 0x7cb + * + * #define XK_Cyrillic_DZHE 0x6bf + * #define XK_Serbian_DZE 0x6bf (deprecated) + * */ { "BackSpace", 0xFF08 }, { "Tab", 0xFF09 }, @@ -920,3 +930,10 @@ { "hebrew_shin", 0xcf9 }, { "hebrew_taf", 0xcfa }, { "Hebrew_switch", 0xFF7E }, +{ "XF86AudioLowerVolume", 0x1008FF11 }, +{ "XF86AudioMute", 0x1008FF12 }, +{ "XF86AudioRaiseVolume", 0x1008FF13 }, +{ "XF86AudioPlay", 0x1008FF14 }, +{ "XF86AudioStop", 0x1008FF15 }, +{ "XF86AudioPrev", 0x1008FF16 }, +{ "XF86AudioNext", 0x1008FF17 }, diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 0fdc280..db0d71a 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -1439,6 +1439,7 @@ TkBTreeDeleteIndexRange( prevNodePtr->nextPtr = curNodePtr->nextPtr; } parentPtr->numChildren--; + ckfree(curNodePtr->numPixels); ckfree(curNodePtr); curNodePtr = parentPtr; } @@ -4185,6 +4186,7 @@ Rebalance( treePtr->rootPtr = nodePtr->children.nodePtr; treePtr->rootPtr->parentPtr = NULL; DeleteSummaries(nodePtr->summaryPtr); + ckfree(nodePtr->numPixels); ckfree(nodePtr); } return; @@ -4274,6 +4276,7 @@ Rebalance( nodePtr->nextPtr = otherPtr->nextPtr; nodePtr->parentPtr->numChildren--; DeleteSummaries(otherPtr->summaryPtr); + ckfree(otherPtr->numPixels); ckfree(otherPtr); continue; } |