Check-in [6b571b71c1]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merge with trunk
Timelines: family | ancestors | descendants | both | wtf-8-experiment
Files: files | file ages | folders
SHA1: 6b571b71c1b34080ca82ef0d42ebe0e8d325001a
User & Date: chw 2020-02-10 14:18:18
Context
2020-02-11
05:59
merge with trunk check-in: a0f5e59e48 user: chw tags: wtf-8-experiment
2020-02-10
14:18
merge with trunk check-in: 6b571b71c1 user: chw tags: wtf-8-experiment
14:14
add tk upstream changes check-in: 00f11c761d user: chw tags: trunk
10:28
merge with trunk check-in: c18ec81ad5 user: chw tags: wtf-8-experiment
Changes

Changes to jni/sdl2tk/generic/tkClipboard.c.

141
142
143
144
145
146
147
148
149
150
151

152
153
154
155
156
157
158
    p = dispPtr->clipboardAppPtr->winPtr->nameUid;
    length = strlen(p);
    length -= offset;
    if (length <= 0) {
	return 0;
    }
    if (length > (size_t) maxBytes) {
	memcpy(buffer, p, maxBytes);
	return (int)maxBytes;
    }
    strcpy(buffer, p);

    return (int)length;
}
 
/*
 *----------------------------------------------------------------------
 *
 * ClipboardWindowHandler --







<
|

|
>







141
142
143
144
145
146
147

148
149
150
151
152
153
154
155
156
157
158
    p = dispPtr->clipboardAppPtr->winPtr->nameUid;
    length = strlen(p);
    length -= offset;
    if (length <= 0) {
	return 0;
    }
    if (length > (size_t) maxBytes) {

	length = maxBytes;
    }
    memcpy(buffer, p, length);
    buffer[length] = 0;
    return (int)length;
}
 
/*
 *----------------------------------------------------------------------
 *
 * ClipboardWindowHandler --