ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.159 by root, Mon Feb 21 19:26:07 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
… …
203 /* 202 /*
204 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
205 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
206 */ 205 */
207 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
209 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
211 210
212 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
214 213
215 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
217 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
219 218
220 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
221 { 220 {
222 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
223 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
294 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
295 } 294 }
296 295
297 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
298 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
299 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
300 298
301 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
302 } 300 }
303 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
304 { 302 {
… …
335 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
336 screen.cur.row += k; 334 screen.cur.row += k;
337 screen.s_cur.row += k; 335 screen.s_cur.row += k;
338 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
339 } 337 }
338
340#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
341 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
342 assert (swap.cur.row < TermWin.nrow);
343#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
344
345 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
346 MIN_IT (swap.cur.row, nrow - 1);
347#endif 343#endif
348 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
349 } 345 }
350 346
351 /* resize columns */ 347 /* resize columns */
… …
394 } 390 }
395 391
396 } 392 }
397 393
398 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
399 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
400 395
401 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
402 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
403 } 398 }
404 399
… …
566 if (current_screen == scrn) 561 if (current_screen == scrn)
567 return scrn; 562 return scrn;
568 563
569 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
570 565
571 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
572 567
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0); 570 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0); 572 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584 574
585#if NSCREENS 575#if NSCREENS
586 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
587 { 577 {
588 num_scr = 0; 578 num_scr = 0;
… …
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710 } 700 }
711 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
712 { 702 {
713 /* move selected region too */ 703 /* move selected region too */
714 selection.beg.row -= count; 704 selection.beg.row -= count;
715 selection.end.row -= count; 705 selection.end.row -= count;
716 selection.mark.row -= count; 706 selection.mark.row -= count;
717 } 707 }
718 } 708 }
719 709
720 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
728 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
729 MIN_IT (count, i); 719 MIN_IT (count, i);
730 720
731 if (j > 0) 721 if (j > 0)
732 { 722 {
733 /* A: scroll up */ 723 /* scroll up */
734 724
735 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738 728
739 /* A2: Rotate lines */ 729 /* Rotate lines */
740 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744 734
745 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
746 } 736 }
747 else /* if (j < 0) */ 737 else /* if (j < 0) */
748 { 738 {
749 /* B: scroll down */ 739 /* scroll down */
750 740
751 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
753 { 743 {
754 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
755 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
756 } 746 }
757 747
758 /* B2: Rotate lines */ 748 /* Rotate lines */
759 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
760 { 750 {
761 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
765 755
766 j = row1, i = count; 756 j = row1, i = count;
767 count = -count; 757 count = -count;
768 } 758 }
769 759
770 /* C: Resurrect lines */ 760 /* Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++) 765 for (; i--; j++)
… …
1400 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1402 } 1392 }
1403} 1393}
1404 1394
1395void
1396rxvt_term::scr_erase_savelines ()
1397{
1398 want_refresh = 1;
1399 ZERO_SCROLLBACK ();
1400
1401 for (int i = 0; i < TermWin.saveLines; ++i)
1402 if (screen.text [i])
1403 {
1404 screen.tlen[i] = 0;
1405 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1406 }
1407}
1408
1405/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1406/* 1410/*
1407 * Fill the screen with `E's 1411 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1413 */
1410void 1414void
1411rxvt_term::scr_E () 1415rxvt_term::scr_E ()
1412{ 1416{
1413 int i, j, k; 1417 int i, j, k;
1414 rend_t *r1, fs; 1418 rend_t *r1, fs;
1415 1419
1416 want_refresh = 1; 1420 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1421 ZERO_SCROLLBACK ();
1418 1422
1419 num_scr_allow = 0; 1423 num_scr_allow = 0;
… …
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1906rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903{ 1907{
1904 int n; 1908 int n;
1905 unsigned int oldviewstart; 1909 unsigned int oldviewstart;
1906 1910
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start; 1911 oldviewstart = TermWin.view_start;
1912
1911 if (direction == UP) 1913 if (direction == UP)
1912 { 1914 {
1913 n = TermWin.view_start + nlines; 1915 n = TermWin.view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled); 1916 TermWin.view_start = min (n, TermWin.nscrolled);
1915 } 1917 }
1916 else 1918 else
1917 { 1919 {
1918 n = TermWin.view_start - nlines; 1920 n = TermWin.view_start - nlines;
1919 TermWin.view_start = max (n, 0); 1921 TermWin.view_start = max (n, 0);
1920 } 1922 }
1923
1921 return scr_changeview (oldviewstart); 1924 return scr_changeview (oldviewstart);
1922} 1925}
1923 1926
1924int 1927int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1928rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2400 else 2403 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2404 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2402 2405
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2406 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2407 {
2408#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2411 else
2412#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2413 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2414
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2415 XDrawLine (display->display, drawBuffer, TermWin.gc,
2407 xpixel, ypixel + font->ascent + 1, 2416 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2418 }
2410 } /* for (col....) */ 2419 } /* for (col....) */
… …
2656/* ------------------------------------------------------------------------- */ 2665/* ------------------------------------------------------------------------- */
2657/* 2666/*
2658 * Paste a selection direct to the command fd 2667 * Paste a selection direct to the command fd
2659 */ 2668 */
2660void 2669void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2670rxvt_term::paste (unsigned char *data, unsigned int len)
2662{ 2671{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2672 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PASTE_SIZE) 2673 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PASTE_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2674 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2675 data[i] = C0_CR;
2675 2676
2676 tt_write (ds, (int)n); 2677 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2678}
2681 2679
2682/* ------------------------------------------------------------------------- */ 2680/* ------------------------------------------------------------------------- */
2683/* 2681/*
2684 * Respond to a notification that a primary selection has been sent 2682 * Respond to a notification that a primary selection has been sent
… …
2714 2712
2715 unsigned long bytes_after; 2713 unsigned long bytes_after;
2716 XTextProperty ct; 2714 XTextProperty ct;
2717 2715
2718 if (XGetWindowProperty (display->display, win, prop, 2716 if (XGetWindowProperty (display->display, win, prop,
2719 0, (long)(PROP_SIZE / 4), 2717 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType, 2718 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format, 2719 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after, 2720 &ct.nitems, &bytes_after,
2723 &ct.value) != Success) 2721 &ct.value) != Success)
2724 { 2722 {
… …
2731 2729
2732 if (bytes_after) 2730 if (bytes_after)
2733 { 2731 {
2734 // fetch and append remaining data 2732 // fetch and append remaining data
2735 XTextProperty ct2; 2733 XTextProperty ct2;
2736 unsigned long bytes_after2;
2737 2734
2738 if (XGetWindowProperty (display->display, win, prop, 2735 if (XGetWindowProperty (display->display, win, prop,
2739 ct.nitems / 4, (long) (bytes_after + 3) / 4, 2736 ct.nitems / 4, (bytes_after + 3) / 4,
2740 delete_prop, AnyPropertyType, 2737 delete_prop, AnyPropertyType,
2741 &ct2.encoding, &ct2.format, 2738 &ct2.encoding, &ct2.format,
2742 &ct2.nitems, &bytes_after2, 2739 &ct2.nitems, &bytes_after,
2743 &ct2.value) != Success) 2740 &ct2.value) != Success)
2744 goto bailout; 2741 goto bailout;
2745 2742
2746 // realloc should be compatible to XFree, here, and elsewhere, too 2743 // realloc should be compatible to XFree, here, and elsewhere, too
2747 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + bytes_after); 2744 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2748 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems); 2745 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2749 ct.nitems += ct2.nitems; 2746 ct.nitems += ct2.nitems;
2750 2747
2751 XFree (ct2.value); 2748 XFree (ct2.value);
2752 } 2749 }
2753 else if (delete_prop)
2754 XDeleteProperty (display->display, win, prop);
2755 2750
2756 if (ct.value == 0) 2751 if (ct.value == 0)
2757 goto bailout; 2752 goto bailout;
2758 2753
2759 if (ct.encoding == xa[XA_INCR]) 2754 if (ct.encoding == xa[XA_INCR])
… …
3426 selection_delimit_word (DN, &selection.end, &selection.end); 3421 selection_delimit_word (DN, &selection.end, &selection.end);
3427 } 3422 }
3428 else if (selection.clicks == 3) 3423 else if (selection.clicks == 3)
3429 { 3424 {
3430#if ENABLE_FRILLS 3425#if ENABLE_FRILLS
3431 if ((options & Opt_tripleclickwords)) 3426 if (options & Opt_tripleclickwords)
3432 { 3427 {
3433 int end_row; 3428 int end_row;
3434 3429
3435 selection_delimit_word (UP, &selection.beg, &selection.beg); 3430 selection_delimit_word (UP, &selection.beg, &selection.beg);
3436 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3431 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3454 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3449 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3455 selection.mark.col++; 3450 selection.mark.col++;
3456 3451
3457 selection.beg.col = 0; 3452 selection.beg.col = 0;
3458 selection.end.col = ncol; 3453 selection.end.col = ncol;
3454
3455 // select a complete logical line
3456 while (selection.beg.row > -TermWin.saveLines
3457 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3458 selection.beg.row--;
3459
3460 while (selection.end.row < TermWin.nrow
3461 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3462 selection.end.row++;
3459 } 3463 }
3460 } 3464 }
3461 3465
3462 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3463 { /* mark may need to be changed */ 3467 { /* mark may need to be changed */
… …
3543 */ 3547 */
3544void 3548void
3545rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3549rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3546{ 3550{
3547 XSelectionEvent ev; 3551 XSelectionEvent ev;
3552 dDisp;
3548 3553
3549 ev.type = SelectionNotify; 3554 ev.type = SelectionNotify;
3550 ev.property = None; 3555 ev.property = None;
3551 ev.display = rq.display; 3556 ev.display = rq.display;
3552 ev.requestor = rq.requestor; 3557 ev.requestor = rq.requestor;
… …
3566 *target++ = xa[XA_COMPOUND_TEXT]; 3571 *target++ = xa[XA_COMPOUND_TEXT];
3567#if X_HAVE_UTF8_STRING 3572#if X_HAVE_UTF8_STRING
3568 *target++ = xa[XA_UTF8_STRING]; 3573 *target++ = xa[XA_UTF8_STRING];
3569#endif 3574#endif
3570 3575
3571 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3576 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3572 32, PropModeReplace, 3577 32, PropModeReplace,
3573 (unsigned char *)target_list, target - target_list); 3578 (unsigned char *)target_list, target - target_list);
3574 ev.property = rq.property; 3579 ev.property = rq.property;
3575 } 3580 }
3576#if TODO // TODO 3581#if TODO // TODO
… …
3579 /* TODO: Handle MULTIPLE */ 3584 /* TODO: Handle MULTIPLE */
3580 } 3585 }
3581#endif 3586#endif
3582 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3583 { 3588 {
3584 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3589 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3585 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3590 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3586 ev.property = rq.property; 3591 ev.property = rq.property;
3587 } 3592 }
3588 else if (rq.target == XA_STRING 3593 else if (rq.target == XA_STRING
3589 || rq.target == xa[XA_TEXT] 3594 || rq.target == xa[XA_TEXT]
… …
3647 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3652 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3648 ct.nitems = strlen ((char *)ct.value); 3653 ct.nitems = strlen ((char *)ct.value);
3649 } 3654 }
3650 else 3655 else
3651#endif 3656#endif
3652 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3657 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3653 freect = 1; 3658 freect = 1;
3654 else 3659 else
3655 { 3660 {
3656 /* if we failed to convert then send it raw */ 3661 /* if we failed to convert then send it raw */
3657 ct.value = (unsigned char *)cl; 3662 ct.value = (unsigned char *)cl;
3658 ct.nitems = selectlen; 3663 ct.nitems = selectlen;
3659 ct.encoding = target; 3664 ct.encoding = target;
3660 } 3665 }
3661 3666
3662 XChangeProperty (display->display, rq.requestor, rq.property, 3667 XChangeProperty (disp, rq.requestor, rq.property,
3663 ct.encoding, 8, PropModeReplace, 3668 ct.encoding, 8, PropModeReplace,
3664 ct.value, (int)ct.nitems); 3669 ct.value, (int)ct.nitems);
3665 ev.property = rq.property; 3670 ev.property = rq.property;
3666 3671
3667 if (freect) 3672 if (freect)
3668 XFree (ct.value); 3673 XFree (ct.value);
3669 } 3674 }
3670 3675
3671 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3676 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3672} 3677}
3673 3678
3674/* ------------------------------------------------------------------------- * 3679/* ------------------------------------------------------------------------- *
3675 * MOUSE ROUTINES * 3680 * MOUSE ROUTINES *
3676 * ------------------------------------------------------------------------- */ 3681 * ------------------------------------------------------------------------- */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines