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.282 by ayin, Wed Oct 31 10:06:42 2007 UTC vs.
Revision 1.307 by root, Fri Jun 27 00:44:32 2008 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
596/* 580/*
597 * Change the rendition style for following text 581 * Change the rendition style for following text
598 */ 582 */
599void 583void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 584rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 585{
602 if (set) 586 if (set)
603 rstyle |= style; 587 rstyle |= style;
604 else if (style == ~RS_None) 588 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
606 else 590 else
607 rstyle &= ~style; 591 rstyle &= ~style;
608 } 592}
609 593
610/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
611/* 595/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 597 * count positive ==> scroll up
… …
1011 * XTERM_SEQ: CTRL-H 995 * XTERM_SEQ: CTRL-H
1012 */ 996 */
1013void 997void
1014rxvt_term::scr_backspace () NOTHROW 998rxvt_term::scr_backspace () NOTHROW
1015{ 999{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1000 if (screen.cur.col == 0)
1019 { 1001 {
1020 if (screen.cur.row > 0) 1002 if (screen.cur.row > 0)
1021 { 1003 {
1022#ifdef TERMCAP_HAS_BW 1004#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1005 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1006 --screen.cur.row;
1025 return; 1007
1008 want_refresh = 1;
1026#endif 1009#endif
1027 } 1010 }
1028 } 1011 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1012 else
1030 scr_gotorc (0, -1, RELATIVE); 1013 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1014}
1034 1015
1035/* ------------------------------------------------------------------------- */ 1016/* ------------------------------------------------------------------------- */
1036/* 1017/*
1037 * Process Horizontal Tab 1018 * Process Horizontal Tab
… …
1186 } 1167 }
1187 } 1168 }
1188 else 1169 else
1189 { 1170 {
1190 if (screen.flags & Screen_Relative) 1171 if (screen.flags & Screen_Relative)
1172 {
1191 { /* relative origin mode */ 1173 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1174 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1175 min_it (screen.cur.row, screen.bscroll);
1194 } 1176 }
1195 else 1177 else
1196 screen.cur.row = row; 1178 screen.cur.row = row;
… …
1229/* 1211/*
1230 * Erase part or whole of a line 1212 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1213 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1214 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1215 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1216 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1217 */
1235void 1218void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1219rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1220{
1238 unsigned int col, num; 1221 unsigned int col, num;
… …
1247 line.touch (); 1230 line.touch ();
1248 line.is_longer (0); 1231 line.is_longer (0);
1249 1232
1250 switch (mode) 1233 switch (mode)
1251 { 1234 {
1235 case 3:
1236 if (screen.flags & Screen_WrapNext)
1237 return;
1238
1239 /* fall through */
1240
1252 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1242 col = screen.cur.col;
1254 num = ncol - col; 1243 num = ncol - col;
1255 min_it (line.l, col); 1244 min_it (line.l, col);
1245
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1246 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1247 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1248 CLEAR_SELECTION ();
1259 break; 1249 break;
1250
1260 case 1: /* erase to beginning of line */ 1251 case 1: /* erase to beginning of line */
1261 col = 0; 1252 col = 0;
1262 num = screen.cur.col + 1; 1253 num = screen.cur.col + 1;
1254
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1255 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1256 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1257 CLEAR_SELECTION ();
1266 break; 1258 break;
1259
1267 case 2: /* erase whole line */ 1260 case 2: /* erase whole line */
1268 col = 0; 1261 col = 0;
1269 num = ncol; 1262 num = ncol;
1270 line.l = 0; 1263 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1264 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1322 if (row >= nrow) /* Out Of Bounds */
1330 return; 1323 return;
1331 1324
1332 min_it (num, nrow - row); 1325 min_it (num, nrow - row);
1333 1326
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1334 if (rstyle & (RS_RVid | RS_Uline)) 1328 if (rstyle & (RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1329 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1330 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1331 {
1338 ren = DEFAULT_RSTYLE; 1332 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1333
1334 if (mapped)
1335 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width,
1337 (unsigned int)Height2Pixel (num), False);
1340 } 1338 }
1341 else 1339 else
1342 { 1340 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1342
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1345 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row),
1347 (unsigned int)width,
1348 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1349 } 1351 }
1350 1352
1351 for (; num--; row++) 1353 for (; num--; row++)
… …
1472 { 1474 {
1473 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1476 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1477 CLEAR_SELECTION ();
1476 else 1478 else
1479 {
1477 { /* shift selection */ 1480 /* shift selection */
1478 selection.beg.col += count; 1481 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1482 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1483 selection.end.col += count;
1481 } 1484 }
1482 } 1485 }
… …
1866 return true; 1869 return true;
1867} 1870}
1868 1871
1869#ifndef NO_BELL 1872#ifndef NO_BELL
1870void 1873void
1871rxvt_term::bell_cb (time_watcher &w) 1874rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1875{
1873 rvideo_bell = false; 1876 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1877 scr_rvideo_mode (rvideo_mode);
1878 refresh_check ();
1875} 1879}
1876#endif 1880#endif
1877 1881
1878/* ------------------------------------------------------------------------- */ 1882/* ------------------------------------------------------------------------- */
1879void 1883void
… …
1901 1905
1902 if (option (Opt_visualBell)) 1906 if (option (Opt_visualBell))
1903 { 1907 {
1904 rvideo_bell = true; 1908 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1909 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1910 flush ();
1907 1911
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1912 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1913 }
1910 else 1914 else
1911 XBell (dpy, 0); 1915 XBell (dpy, 0);
1912#endif 1916#endif
1913} 1917}
… …
1994 return; 1998 return;
1995 1999
1996 /* 2000 /*
1997 * A: set up vars 2001 * A: set up vars
1998 */ 2002 */
2003 refresh_count = 0;
2004
1999 have_bg = 0; 2005 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2006#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
2004#endif 2008#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2010
2007 /* 2011 /*
2008 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2265 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2262 { 2266 {
2263 bool invert = rend & RS_RVid; 2267 bool invert = rend & RS_RVid;
2264 2268
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
2268 { 2271 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2272 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2273 fore = Color_BD;
2271# if !ENABLE_STYLES 2274# if !ENABLE_STYLES
2272 else 2275 else
2273 invert = !invert; 2276 invert = !invert;
2274# endif 2277# endif
2275 } 2278 }
2276 2279
2277 if (rend & RS_Italic 2280 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2281 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2282 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2283 fore = Color_IT;
2282# if !ENABLE_STYLES 2284# if !ENABLE_STYLES
2283 else 2285 else
… …
2317 } 2319 }
2318 2320
2319#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2323 {
2322 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2323 { 2325 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2325 hidden_text = 0; 2327 hidden_text = 0;
2326 } 2328 }
2327 else if (hidden_text) 2329 else if (hidden_text)
2328 fore = back; 2330 fore = back;
2329 } 2331 }
… …
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2380 else
2379#endif 2381#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2383
2382 XDrawLine (dpy, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2387 }
2386 } /* for (col....) */ 2388 } /* for (col....) */
2387 } /* for (row....) */ 2389 } /* for (row....) */
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2428 else
2427#endif 2429#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2431
2430 XDrawRectangle (dpy, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2433 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2437 }
… …
2473rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2474{ 2476{
2475#ifdef HAVE_BG_PIXMAP 2477#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2478 bgPixmap.apply ();
2477#else 2479#else
2480
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2484
2482 if (scrollBar.win) 2485 if (scrollBar.win)
2483 { 2486 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2488 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2489 scrollBar.show (0);
2487 } 2490 }
2491
2488# endif 2492#endif
2493
2494 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2495 scr_clear ();
2490 scr_touch (true); 2496 scr_touch (true);
2491 want_refresh = 1; 2497 want_refresh = 1;
2492#endif
2493
2494} 2498}
2495 2499
2496/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2497void 2501void
2498rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2587{ 2591{
2588 int row, wrote; 2592 int row, wrote;
2589 unsigned int width, towrite; 2593 unsigned int width, towrite;
2590 char r1[] = "\n"; 2594 char r1[] = "\n";
2591 2595
2592 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2594 { 2598 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2600 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2655 data[i] = C0_CR;
2652 2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~");
2659
2653 tt_write (data, len); 2660 tt_write (data, len);
2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~");
2654} 2664}
2655 2665
2656/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2657/* 2667/*
2658 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
… …
2733 if (!delete_prop) 2743 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop); 2744 XDeleteProperty (dpy, win, prop);
2735 2745
2736 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2737 incr_buf_fill = 0; 2747 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10); 2748 incr_ev.start (10);
2739 2749
2740 goto bailout; 2750 goto bailout;
2741 } 2751 }
2742 2752
2743 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
… …
2769 goto bailout; 2779 goto bailout;
2770 } 2780 }
2771 } 2781 }
2772 else if (selection_wait == Sel_incr) 2782 else if (selection_wait == Sel_incr)
2773 { 2783 {
2774 incr_ev.start (NOW + 10); 2784 incr_ev.start (10);
2775 2785
2776 while (incr_buf_fill + ct.nitems > incr_buf_size) 2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 { 2787 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2819 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2821} 2831}
2822 2832
2823void 2833void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2825{ 2835{
2826 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2827 2837
2828 incr_buf_size = 0; 2838 incr_buf_size = 0;
2829 free (incr_buf); 2839 free (incr_buf);
… …
2852 */ 2862 */
2853void 2863void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2865{
2856 if (selection.text && selnum == Sel_Primary) 2866 if (selection.text && selnum == Sel_Primary)
2867 {
2857 { /* internal selection */ 2868 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2870 paste (str, strlen (str));
2860 free (str); 2871 free (str);
2861 return; 2872 return;
2862 } 2873 }
… …
3130 while (selection.mark.col > 0 3141 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3142 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3143 --selection.mark.col;
3133 3144
3134 if (selection.op) 3145 if (selection.op)
3146 {
3135 { /* clear the old selection */ 3147 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3148 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3149 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3150 }
3139 3151
3140 selection.op = SELECTION_INIT; 3152 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3341 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3342 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3343 * time of the most recent button3 press
3332 */ 3344 */
3333 if (button3 && buttonpress) 3345 if (button3 && buttonpress)
3346 {
3334 { /* button3 press */ 3347 /* button3 press */
3335 /* 3348 /*
3336 * first determine which edge of the selection we are closest to 3349 * first determine which edge of the selection we are closest to
3337 */ 3350 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3351 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3352 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3370 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3371 selection.mark.col = selection.beg.col;
3359 } 3372 }
3360 } 3373 }
3361 else 3374 else
3375 {
3362 { /* button1 drag or button3 drag */ 3376 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3377 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3378 {
3365 if (selection.mark.row == selection.end.row 3379 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3380 && selection.mark.col == selection.end.col
3367 && clickchange 3381 && clickchange
… …
3448 selection.end.row++; 3462 selection.end.row++;
3449 } 3463 }
3450 } 3464 }
3451 3465
3452 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3467 {
3453 { /* mark may need to be changed */ 3468 /* mark may need to be changed */
3454 if (closeto == LEFT) 3469 if (closeto == LEFT)
3455 { 3470 {
3456 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3473 }

Diff Legend

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