comparison src/select-x.c @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents 2f22818d92d4
children 574f0cded429
comparison
equal deleted inserted replaced
5921:68639fb08af8 5923:61d7d7bcbe76
1377 { 1377 {
1378 struct device *d = decode_x_device (Qnil); 1378 struct device *d = decode_x_device (Qnil);
1379 Display *display = DEVICE_X_DISPLAY (d); 1379 Display *display = DEVICE_X_DISPLAY (d);
1380 Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */ 1380 Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */
1381 Atom cut_buffer_atom; 1381 Atom cut_buffer_atom;
1382 const Ibyte *data = XSTRING_DATA (string); 1382 const Ibyte *data;
1383 Bytecount bytes = XSTRING_LENGTH (string); 1383 Bytecount bytes, bytes_remaining;
1384 Bytecount bytes_remaining;
1385 Bytecount max_bytes = SELECTION_QUANTUM (display); 1384 Bytecount max_bytes = SELECTION_QUANTUM (display);
1386 #ifdef MULE 1385 #ifdef MULE
1387 const Ibyte *ptr, *end; 1386 const Ibyte *ptr, *end;
1388 enum { ASCII, LATIN_1, WORLD } chartypes = ASCII; 1387 enum { ASCII, LATIN_1, WORLD } chartypes = ASCII;
1389 #endif 1388 #endif
1391 if (max_bytes > MAX_SELECTION_QUANTUM) 1390 if (max_bytes > MAX_SELECTION_QUANTUM)
1392 max_bytes = MAX_SELECTION_QUANTUM; 1391 max_bytes = MAX_SELECTION_QUANTUM;
1393 1392
1394 CHECK_CUTBUFFER (cutbuffer); 1393 CHECK_CUTBUFFER (cutbuffer);
1395 CHECK_STRING (string); 1394 CHECK_STRING (string);
1395
1396 cut_buffer_atom = symbol_to_x_atom (d, cutbuffer, 0); 1396 cut_buffer_atom = symbol_to_x_atom (d, cutbuffer, 0);
1397 data = XSTRING_DATA (string);
1398 bytes = XSTRING_LENGTH (string);
1397 1399
1398 if (! cut_buffers_initialized) 1400 if (! cut_buffers_initialized)
1399 initialize_cut_buffers (display, window); 1401 initialize_cut_buffers (display, window);
1400 1402
1401 /* We use the STRING encoding (Latin-1 only) if we can, else COMPOUND_TEXT. 1403 /* We use the STRING encoding (Latin-1 only) if we can, else COMPOUND_TEXT.