… | |
… | |
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 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline 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++) |
… | |
… | |
1171 | */ |
1161 | */ |
1172 | #if ENABLE_FRILLS |
1162 | #if ENABLE_FRILLS |
1173 | void |
1163 | void |
1174 | rxvt_term::scr_forwardindex () |
1164 | rxvt_term::scr_forwardindex () |
1175 | { |
1165 | { |
1176 | int row; |
1166 | int row; |
1177 | |
1167 | |
1178 | if (screen.cur.col < TermWin.ncol - 1) |
1168 | if (screen.cur.col < TermWin.ncol - 1) |
1179 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1169 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1180 | else |
1170 | else |
1181 | { |
1171 | { |
… | |
… | |
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 | |
|
|
1395 | #if ENABLE_FRILLS |
|
|
1396 | void |
|
|
1397 | rxvt_term::scr_erase_savelines () |
|
|
1398 | { |
|
|
1399 | want_refresh = 1; |
|
|
1400 | ZERO_SCROLLBACK (); |
|
|
1401 | |
|
|
1402 | for (int i = 0; i < TermWin.saveLines; ++i) |
|
|
1403 | if (screen.text [i]) |
|
|
1404 | { |
|
|
1405 | screen.tlen[i] = 0; |
|
|
1406 | scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE); |
|
|
1407 | } |
|
|
1408 | } |
|
|
1409 | #endif |
|
|
1410 | |
1405 | /* ------------------------------------------------------------------------- */ |
1411 | /* ------------------------------------------------------------------------- */ |
1406 | /* |
1412 | /* |
1407 | * Fill the screen with `E's |
1413 | * Fill the screen with `E's |
1408 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1414 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1409 | */ |
1415 | */ |
1410 | void |
1416 | void |
1411 | rxvt_term::scr_E () |
1417 | rxvt_term::scr_E () |
1412 | { |
1418 | { |
1413 | int i, j, k; |
1419 | int i, j, k; |
1414 | rend_t *r1, fs; |
1420 | rend_t *r1, fs; |
1415 | |
1421 | |
1416 | want_refresh = 1; |
1422 | want_refresh = 1; |
1417 | ZERO_SCROLLBACK (); |
1423 | ZERO_SCROLLBACK (); |
1418 | |
1424 | |
1419 | num_scr_allow = 0; |
1425 | num_scr_allow = 0; |
… | |
… | |
1902 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1908 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1903 | { |
1909 | { |
1904 | int n; |
1910 | int n; |
1905 | unsigned int oldviewstart; |
1911 | unsigned int oldviewstart; |
1906 | |
1912 | |
1907 | #ifdef DEBUG_STRICT |
|
|
1908 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1909 | #endif |
|
|
1910 | oldviewstart = TermWin.view_start; |
1913 | oldviewstart = TermWin.view_start; |
|
|
1914 | |
1911 | if (direction == UP) |
1915 | if (direction == UP) |
1912 | { |
1916 | { |
1913 | n = TermWin.view_start + nlines; |
1917 | n = TermWin.view_start + nlines; |
1914 | TermWin.view_start = min (n, TermWin.nscrolled); |
1918 | TermWin.view_start = min (n, TermWin.nscrolled); |
1915 | } |
1919 | } |
1916 | else |
1920 | else |
1917 | { |
1921 | { |
1918 | n = TermWin.view_start - nlines; |
1922 | n = TermWin.view_start - nlines; |
1919 | TermWin.view_start = max (n, 0); |
1923 | TermWin.view_start = max (n, 0); |
1920 | } |
1924 | } |
|
|
1925 | |
1921 | return scr_changeview (oldviewstart); |
1926 | return scr_changeview (oldviewstart); |
1922 | } |
1927 | } |
1923 | |
1928 | |
1924 | int |
1929 | int |
1925 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1930 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
… | |
… | |
2400 | else |
2405 | else |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2406 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2402 | |
2407 | |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2408 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2404 | { |
2409 | { |
|
|
2410 | #if ENABLE_FRILLS |
|
|
2411 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2412 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2413 | else |
|
|
2414 | #endif |
2405 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2415 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2416 | |
2406 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2417 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2407 | xpixel, ypixel + font->ascent + 1, |
2418 | xpixel, ypixel + font->ascent + 1, |
2408 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2419 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2409 | } |
2420 | } |
2410 | } /* for (col....) */ |
2421 | } /* for (col....) */ |
… | |
… | |
3412 | selection_delimit_word (DN, &selection.end, &selection.end); |
3423 | selection_delimit_word (DN, &selection.end, &selection.end); |
3413 | } |
3424 | } |
3414 | else if (selection.clicks == 3) |
3425 | else if (selection.clicks == 3) |
3415 | { |
3426 | { |
3416 | #if ENABLE_FRILLS |
3427 | #if ENABLE_FRILLS |
3417 | if ((options & Opt_tripleclickwords)) |
3428 | if (options & Opt_tripleclickwords) |
3418 | { |
3429 | { |
3419 | int end_row; |
3430 | int end_row; |
3420 | |
3431 | |
3421 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3432 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3422 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3433 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
… | |
… | |
3440 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3451 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3441 | selection.mark.col++; |
3452 | selection.mark.col++; |
3442 | |
3453 | |
3443 | selection.beg.col = 0; |
3454 | selection.beg.col = 0; |
3444 | selection.end.col = ncol; |
3455 | selection.end.col = ncol; |
|
|
3456 | |
|
|
3457 | // select a complete logical line |
|
|
3458 | while (selection.beg.row > -TermWin.saveLines |
|
|
3459 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
|
|
3460 | selection.beg.row--; |
|
|
3461 | |
|
|
3462 | while (selection.end.row < TermWin.nrow |
|
|
3463 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
|
|
3464 | selection.end.row++; |
3445 | } |
3465 | } |
3446 | } |
3466 | } |
3447 | |
3467 | |
3448 | if (button3 && buttonpress) |
3468 | if (button3 && buttonpress) |
3449 | { /* mark may need to be changed */ |
3469 | { /* mark may need to be changed */ |
… | |
… | |
3529 | */ |
3549 | */ |
3530 | void |
3550 | void |
3531 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3551 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3532 | { |
3552 | { |
3533 | XSelectionEvent ev; |
3553 | XSelectionEvent ev; |
|
|
3554 | dDisp; |
3534 | |
3555 | |
3535 | ev.type = SelectionNotify; |
3556 | ev.type = SelectionNotify; |
3536 | ev.property = None; |
3557 | ev.property = None; |
3537 | ev.display = rq.display; |
3558 | ev.display = rq.display; |
3538 | ev.requestor = rq.requestor; |
3559 | ev.requestor = rq.requestor; |
… | |
… | |
3552 | *target++ = xa[XA_COMPOUND_TEXT]; |
3573 | *target++ = xa[XA_COMPOUND_TEXT]; |
3553 | #if X_HAVE_UTF8_STRING |
3574 | #if X_HAVE_UTF8_STRING |
3554 | *target++ = xa[XA_UTF8_STRING]; |
3575 | *target++ = xa[XA_UTF8_STRING]; |
3555 | #endif |
3576 | #endif |
3556 | |
3577 | |
3557 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3578 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3558 | 32, PropModeReplace, |
3579 | 32, PropModeReplace, |
3559 | (unsigned char *)target_list, target - target_list); |
3580 | (unsigned char *)target_list, target - target_list); |
3560 | ev.property = rq.property; |
3581 | ev.property = rq.property; |
3561 | } |
3582 | } |
3562 | #if TODO // TODO |
3583 | #if TODO // TODO |
… | |
… | |
3565 | /* TODO: Handle MULTIPLE */ |
3586 | /* TODO: Handle MULTIPLE */ |
3566 | } |
3587 | } |
3567 | #endif |
3588 | #endif |
3568 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3589 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3569 | { |
3590 | { |
3570 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3591 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3571 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3592 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3572 | ev.property = rq.property; |
3593 | ev.property = rq.property; |
3573 | } |
3594 | } |
3574 | else if (rq.target == XA_STRING |
3595 | else if (rq.target == XA_STRING |
3575 | || rq.target == xa[XA_TEXT] |
3596 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3633 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3654 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3634 | ct.nitems = strlen ((char *)ct.value); |
3655 | ct.nitems = strlen ((char *)ct.value); |
3635 | } |
3656 | } |
3636 | else |
3657 | else |
3637 | #endif |
3658 | #endif |
3638 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3659 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3639 | freect = 1; |
3660 | freect = 1; |
3640 | else |
3661 | else |
3641 | { |
3662 | { |
3642 | /* if we failed to convert then send it raw */ |
3663 | /* if we failed to convert then send it raw */ |
3643 | ct.value = (unsigned char *)cl; |
3664 | ct.value = (unsigned char *)cl; |
3644 | ct.nitems = selectlen; |
3665 | ct.nitems = selectlen; |
3645 | ct.encoding = target; |
3666 | ct.encoding = target; |
3646 | } |
3667 | } |
3647 | |
3668 | |
3648 | XChangeProperty (display->display, rq.requestor, rq.property, |
3669 | XChangeProperty (disp, rq.requestor, rq.property, |
3649 | ct.encoding, 8, PropModeReplace, |
3670 | ct.encoding, 8, PropModeReplace, |
3650 | ct.value, (int)ct.nitems); |
3671 | ct.value, (int)ct.nitems); |
3651 | ev.property = rq.property; |
3672 | ev.property = rq.property; |
3652 | |
3673 | |
3653 | if (freect) |
3674 | if (freect) |
3654 | XFree (ct.value); |
3675 | XFree (ct.value); |
3655 | } |
3676 | } |
3656 | |
3677 | |
3657 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3678 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3658 | } |
3679 | } |
3659 | |
3680 | |
3660 | /* ------------------------------------------------------------------------- * |
3681 | /* ------------------------------------------------------------------------- * |
3661 | * MOUSE ROUTINES * |
3682 | * MOUSE ROUTINES * |
3662 | * ------------------------------------------------------------------------- */ |
3683 | * ------------------------------------------------------------------------- */ |