Import Tk 8.6.11

This commit is contained in:
Steve Dower
2021-03-30 00:54:10 +01:00
parent 42c69189d9
commit 070b8750b0
403 changed files with 21608 additions and 16269 deletions

View File

@@ -56,7 +56,7 @@ ClipboardHandler(
char *buffer, /* Place to store converted selection. */
int maxBytes) /* Maximum # of bytes to store at buffer. */
{
TkClipboardTarget *targetPtr = clientData;
TkClipboardTarget *targetPtr = (TkClipboardTarget *)clientData;
TkClipboardBuffer *cbPtr;
char *srcPtr, *destPtr;
size_t count = 0;
@@ -147,7 +147,8 @@ ClipboardAppHandler(
if (length > (size_t) maxBytes) {
length = maxBytes;
}
strncpy(buffer, p, length);
memcpy(buffer, p, length);
buffer[length] = 0;
return (int)length;
}
@@ -172,11 +173,11 @@ ClipboardAppHandler(
static int
ClipboardWindowHandler(
ClientData clientData, /* Not used. */
int offset, /* Return selection bytes starting at this
TCL_UNUSED(void *), /* Not used. */
TCL_UNUSED(int), /* Return selection bytes starting at this
* offset. */
char *buffer, /* Place to store converted selection. */
int maxBytes) /* Maximum # of bytes to store at buffer. */
TCL_UNUSED(int)) /* Maximum # of bytes to store at buffer. */
{
buffer[0] = '.';
buffer[1] = 0;
@@ -205,7 +206,7 @@ static void
ClipboardLostSel(
ClientData clientData) /* Pointer to TkDisplay structure. */
{
TkDisplay *dispPtr = clientData;
TkDisplay *dispPtr = (TkDisplay *)clientData;
dispPtr->clipboardActive = 0;
}
@@ -358,7 +359,7 @@ Tk_ClipboardAppend(
}
}
if (targetPtr == NULL) {
targetPtr = ckalloc(sizeof(TkClipboardTarget));
targetPtr = (TkClipboardTarget *)ckalloc(sizeof(TkClipboardTarget));
targetPtr->type = type;
targetPtr->format = format;
targetPtr->firstBufferPtr = targetPtr->lastBufferPtr = NULL;
@@ -380,7 +381,7 @@ Tk_ClipboardAppend(
* Append a new buffer to the buffer chain.
*/
cbPtr = ckalloc(sizeof(TkClipboardBuffer));
cbPtr = (TkClipboardBuffer *)ckalloc(sizeof(TkClipboardBuffer));
cbPtr->nextPtr = NULL;
if (targetPtr->lastBufferPtr != NULL) {
targetPtr->lastBufferPtr->nextPtr = cbPtr;
@@ -390,7 +391,7 @@ Tk_ClipboardAppend(
targetPtr->lastBufferPtr = cbPtr;
cbPtr->length = strlen(buffer);
cbPtr->buffer = ckalloc(cbPtr->length + 1);
cbPtr->buffer = (char *)ckalloc(cbPtr->length + 1);
strcpy(cbPtr->buffer, buffer);
TkSelUpdateClipboard((TkWindow *) dispPtr->clipWindow, targetPtr);
@@ -422,7 +423,7 @@ Tk_ClipboardObjCmd(
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument strings. */
{
Tk_Window tkwin = (Tk_Window) clientData;
Tk_Window tkwin = (Tk_Window)clientData;
const char *path = NULL;
Atom selection;
static const char *const optionStrings[] = { "append", "clear", "get", NULL };
@@ -635,8 +636,8 @@ Tk_ClipboardObjCmd(
int
TkClipInit(
Tcl_Interp *interp, /* Interpreter to use for error reporting. */
register TkDisplay *dispPtr)/* Display to initialize. */
TCL_UNUSED(Tcl_Interp *), /* Interpreter to use for error reporting. */
TkDisplay *dispPtr)/* Display to initialize. */
{
XSetWindowAttributes atts;
@@ -699,12 +700,11 @@ TkClipInit(
*--------------------------------------------------------------
*/
/* ARGSUSED */
static int
ClipboardGetProc(
ClientData clientData, /* Dynamic string holding partially assembled
* selection. */
Tcl_Interp *interp, /* Interpreter used for error reporting (not
TCL_UNUSED(Tcl_Interp *), /* Interpreter used for error reporting (not
* used). */
const char *portion) /* New information to be appended. */
{