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.151 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.164 by root, Wed Jun 22 14:33:23 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++)
… …
1171 */ 1161 */
1172#if ENABLE_FRILLS 1162#if ENABLE_FRILLS
1173void 1163void
1174rxvt_term::scr_forwardindex () 1164rxvt_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
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 TermWin.nscrolled = 0;
1403}
1404#endif
1405
1405/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1406/* 1407/*
1407 * Fill the screen with `E's 1408 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1410 */
1410void 1411void
1411rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1412{ 1413{
1413 int i, j, k; 1414 int i, j, k;
1414 rend_t *r1, fs; 1415 rend_t *r1, fs;
1415 1416
1416 want_refresh = 1; 1417 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1418 1419
1419 num_scr_allow = 0; 1420 num_scr_allow = 0;
… …
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1903rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903{ 1904{
1904 int n; 1905 int n;
1905 unsigned int oldviewstart; 1906 unsigned int oldviewstart;
1906 1907
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start; 1908 oldviewstart = TermWin.view_start;
1909
1911 if (direction == UP) 1910 if (direction == UP)
1912 { 1911 {
1913 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1915 } 1914 }
1916 else 1915 else
1917 { 1916 {
1918 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1919 TermWin.view_start = max (n, 0); 1918 TermWin.view_start = max (n, 0);
1920 } 1919 }
1920
1921 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1922} 1922}
1923 1923
1924int 1924int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2013/* 2013/*
2014 * Refresh the screen 2014 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 2015 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 2016 * screen.text/screen.rend contain what the screen will change to.
2017 */ 2017 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 2018void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 2019rxvt_term::scr_refresh (unsigned char refresh_type)
2030{ 2020{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 2021 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 2022 showcursor; /* show the cursor */
… …
2051 refresh_count = 0; 2041 refresh_count = 0;
2052 2042
2053 row_offset = TermWin.saveLines - TermWin.view_start; 2043 row_offset = TermWin.saveLines - TermWin.view_start;
2054 2044
2055#if XPM_BACKGROUND 2045#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 2046 must_clear |= bgPixmap.pixmap != None;
2057#endif 2047#endif
2058#if TRANSPARENT 2048#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 2049 must_clear |= (options & Opt_transparent) && am_transparent;
2060#endif 2050#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 2052
2063 /* 2053 /*
2064 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
… …
2088 2078
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2090 2080
2091 if (showcursor && TermWin.focus) 2081 if (showcursor && TermWin.focus)
2092 { 2082 {
2083 if (options & Opt_cursorUnderline)
2084 *crp ^= RS_Uline;
2085 else
2086 {
2093 *crp ^= RS_RVid; 2087 *crp ^= RS_RVid;
2088
2094#ifndef NO_CURSORCOLOR 2089#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 2090 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2091 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2092 ccol1 = Color_cursor;
2098 else 2093 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2095 ccol1 = GET_FGCOLOR (rstyle);
2101#else 2096#else
2102 ccol1 = Color_fg; 2097 ccol1 = Color_fg;
2103#endif 2098#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2099 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2100 ccol2 = Color_cursor2;
2106 else 2101 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2103 ccol2 = GET_BGCOLOR (rstyle);
2109#else 2104#else
2110 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2111#endif 2106#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2107 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2108 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2109#endif
2110 }
2115 } 2111 }
2116 } 2112 }
2117 2113
2118 /* make sure no outline cursor is left around */ 2114 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2115 setoldcursor = 0;
… …
2425 */ 2421 */
2426 if (showcursor) 2422 if (showcursor)
2427 { 2423 {
2428 if (TermWin.focus) 2424 if (TermWin.focus)
2429 { 2425 {
2426 if (options & Opt_cursorUnderline)
2427 *crp ^= RS_Uline;
2428 else
2429 {
2430 *crp ^= RS_RVid; 2430 *crp ^= RS_RVid;
2431#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2433#endif 2433#endif
2434 }
2434 } 2435 }
2435 else if (oldcursor.row >= 0) 2436 else if (oldcursor.row >= 0)
2436 { 2437 {
2438 int cursorwidth = 1;
2439 int col = oldcursor.col;
2440
2441 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2442 col--;
2443
2444 while (col + cursorwidth < TermWin.ncol
2445 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2446 cursorwidth++;
2447
2437#ifndef NO_CURSORCOLOR 2448#ifndef NO_CURSORCOLOR
2438 if (ISSET_PIXCOLOR (Color_cursor)) 2449 if (ISSET_PIXCOLOR (Color_cursor))
2439 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2450 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2440#endif 2451#endif
2441 int cursorwidth = 1;
2442 while (oldcursor.col + cursorwidth < TermWin.ncol
2443 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2444 cursorwidth++;
2445 2452
2446 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2453 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2447 Col2Pixel (oldcursor.col), 2454 Col2Pixel (col),
2448 Row2Pixel (oldcursor.row), 2455 Row2Pixel (oldcursor.row),
2449 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2456 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2450 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2457 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2451 } 2458 }
2452 } 2459 }
… …
2911 2918
2912int 2919int
2913rxvt_term::selection_request_other (Atom target, int selnum) 2920rxvt_term::selection_request_other (Atom target, int selnum)
2914{ 2921{
2915 Atom sel; 2922 Atom sel;
2916#ifdef DEBUG_SELECT
2917 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2918#endif
2919 2923
2920 selection_type |= selnum; 2924 selection_type |= selnum;
2921 2925
2922 if (selnum == Sel_Primary) 2926 if (selnum == Sel_Primary)
2923 sel = XA_PRIMARY; 2927 sel = XA_PRIMARY;
… …
3418 selection_delimit_word (DN, &selection.end, &selection.end); 3422 selection_delimit_word (DN, &selection.end, &selection.end);
3419 } 3423 }
3420 else if (selection.clicks == 3) 3424 else if (selection.clicks == 3)
3421 { 3425 {
3422#if ENABLE_FRILLS 3426#if ENABLE_FRILLS
3423 if ((options & Opt_tripleclickwords)) 3427 if (options & Opt_tripleclickwords)
3424 { 3428 {
3425 int end_row; 3429 int end_row;
3426 3430
3427 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3428 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3432 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3446 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3450 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3447 selection.mark.col++; 3451 selection.mark.col++;
3448 3452
3449 selection.beg.col = 0; 3453 selection.beg.col = 0;
3450 selection.end.col = ncol; 3454 selection.end.col = ncol;
3455
3456 // select a complete logical line
3457 while (selection.beg.row > -TermWin.saveLines
3458 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3459 selection.beg.row--;
3460
3461 while (selection.end.row < TermWin.nrow
3462 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3463 selection.end.row++;
3451 } 3464 }
3452 } 3465 }
3453 3466
3454 if (button3 && buttonpress) 3467 if (button3 && buttonpress)
3455 { /* mark may need to be changed */ 3468 { /* mark may need to be changed */
… …
3535 */ 3548 */
3536void 3549void
3537rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3550rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3538{ 3551{
3539 XSelectionEvent ev; 3552 XSelectionEvent ev;
3553 dDisp;
3540 3554
3541 ev.type = SelectionNotify; 3555 ev.type = SelectionNotify;
3542 ev.property = None; 3556 ev.property = None;
3543 ev.display = rq.display; 3557 ev.display = rq.display;
3544 ev.requestor = rq.requestor; 3558 ev.requestor = rq.requestor;
… …
3558 *target++ = xa[XA_COMPOUND_TEXT]; 3572 *target++ = xa[XA_COMPOUND_TEXT];
3559#if X_HAVE_UTF8_STRING 3573#if X_HAVE_UTF8_STRING
3560 *target++ = xa[XA_UTF8_STRING]; 3574 *target++ = xa[XA_UTF8_STRING];
3561#endif 3575#endif
3562 3576
3563 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3577 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3564 32, PropModeReplace, 3578 32, PropModeReplace,
3565 (unsigned char *)target_list, target - target_list); 3579 (unsigned char *)target_list, target - target_list);
3566 ev.property = rq.property; 3580 ev.property = rq.property;
3567 } 3581 }
3568#if TODO // TODO 3582#if TODO // TODO
… …
3571 /* TODO: Handle MULTIPLE */ 3585 /* TODO: Handle MULTIPLE */
3572 } 3586 }
3573#endif 3587#endif
3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3575 { 3589 {
3576 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3590 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3577 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3591 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3578 ev.property = rq.property; 3592 ev.property = rq.property;
3579 } 3593 }
3580 else if (rq.target == XA_STRING 3594 else if (rq.target == XA_STRING
3581 || rq.target == xa[XA_TEXT] 3595 || rq.target == xa[XA_TEXT]
… …
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3653 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value); 3654 ct.nitems = strlen ((char *)ct.value);
3641 } 3655 }
3642 else 3656 else
3643#endif 3657#endif
3644 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3658 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3645 freect = 1; 3659 freect = 1;
3646 else 3660 else
3647 { 3661 {
3648 /* if we failed to convert then send it raw */ 3662 /* if we failed to convert then send it raw */
3649 ct.value = (unsigned char *)cl; 3663 ct.value = (unsigned char *)cl;
3650 ct.nitems = selectlen; 3664 ct.nitems = selectlen;
3651 ct.encoding = target; 3665 ct.encoding = target;
3652 } 3666 }
3653 3667
3654 XChangeProperty (display->display, rq.requestor, rq.property, 3668 XChangeProperty (disp, rq.requestor, rq.property,
3655 ct.encoding, 8, PropModeReplace, 3669 ct.encoding, 8, PropModeReplace,
3656 ct.value, (int)ct.nitems); 3670 ct.value, (int)ct.nitems);
3657 ev.property = rq.property; 3671 ev.property = rq.property;
3658 3672
3659 if (freect) 3673 if (freect)
3660 XFree (ct.value); 3674 XFree (ct.value);
3661 } 3675 }
3662 3676
3663 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3677 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3664} 3678}
3665 3679
3666/* ------------------------------------------------------------------------- * 3680/* ------------------------------------------------------------------------- *
3667 * MOUSE ROUTINES * 3681 * MOUSE ROUTINES *
3668 * ------------------------------------------------------------------------- */ 3682 * ------------------------------------------------------------------------- */
… …
3788 while (*s) 3802 while (*s)
3789 scr_overlay_set (x++, y, *s++); 3803 scr_overlay_set (x++, y, *s++);
3790} 3804}
3791 3805
3792void 3806void
3807rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3808{
3809 while (*s)
3810 {
3811 text_t t = *s++;
3812 int width = wcwidth (t);
3813
3814 while (width--)
3815 {
3816 scr_overlay_set (x++, y, t);
3817 t = NOCHAR;
3818 }
3819 }
3820}
3821
3822void
3793rxvt_term::scr_swap_overlay () 3823rxvt_term::scr_swap_overlay ()
3794{ 3824{
3795 if (!ov_text) 3825 if (!ov_text)
3796 return; 3826 return;
3797 3827

Diff Legend

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