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.275 by sasha, Wed Aug 15 22:41:52 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.
… …
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
34 34
35inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
… …
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
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 259 }
276 260
277 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 263
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
283 267
284 if (top_row) 268 if (top_row)
… …
328 int qcol = 0; 312 int qcol = 0;
329 313
330 // see below for cursor adjustment rationale 314 // see below for cursor adjustment rationale
331 if (p == ocur.row) 315 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 316 screen.cur.row = q - (total_rows - nrow);
333 317
334 // fill a single destination line 318 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
336 { 320 {
337 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
364 } 348 }
365 while (p != pend && q > 0); 349 while (p != pend && q > 0);
366 350
367 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
368 top_row = q - term_start; 352 top_row = q - term_start;
369 353
370 // make sure all terminal lines exist 354 // make sure all terminal lines exist
371 while (top_row > 0) 355 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 357 }
374 else 358 else
375 { 359 {
376 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
377 361
378 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
379 { 363 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
382 366
… …
405 CLEAR_ALL_SELECTION (); 389 CLEAR_ALL_SELECTION ();
406 390
407 prev_nrow = nrow; 391 prev_nrow = nrow;
408 prev_ncol = ncol; 392 prev_ncol = ncol;
409 393
410 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 394 tabs = (char *)rxvt_malloc (ncol);
411 395
412 for (int col = ncol; --col; ) 396 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0; 397 tabs [col] = col % TABSIZE == 0;
414 398
415 if (current_screen != PRIMARY) 399 if (current_screen != PRIMARY)
… …
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
… …
664 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
665 649
666 ::swap (l1, l2); 650 ::swap (l1, l2);
667 l2.touch (); 651 l2.touch ();
668 } 652 }
669 653
670 // move and/or clear selection, if any 654 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
672 { 656 {
673 selection.beg.row -= count; 657 selection.beg.row -= count;
674 selection.end.row -= count; 658 selection.end.row -= count;
… …
710 { 694 {
711 /* move selected region too */ 695 /* move selected region too */
712 selection.beg.row -= count; 696 selection.beg.row -= count;
713 selection.end.row -= count; 697 selection.end.row -= count;
714 selection.mark.row -= count; 698 selection.mark.row -= count;
715 699
716 selection_check (0); 700 selection_check (0);
717 } 701 }
718 } 702 }
719 703
720 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
832 } 816 }
833 817
834 if (screen.flags & Screen_WrapNext) 818 if (screen.flags & Screen_WrapNext)
835 { 819 {
836 scr_do_wrap (); 820 scr_do_wrap ();
837 821
838 line->l = ncol; 822 line->l = ncol;
839 line->is_longer (1); 823 line->is_longer (1);
840 824
841 row = screen.cur.row; 825 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 826 line = &ROW(row); /* _must_ refresh */
… …
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
… …
1060 x = i; 1041 x = i;
1061 1042
1062 if (!--count) 1043 if (!--count)
1063 break; 1044 break;
1064 } 1045 }
1065 else 1046 else
1066 ht &= l.t[i] == ' ' 1047 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1048 && RS_SAME (l.r[i], base_rend);
1068 1049
1069 if (count) 1050 if (count)
1070 x = ncol - 1; 1051 x = ncol - 1;
… …
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 }
… …
1621 */ 1624 */
1622void 1625void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1626rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1627{
1625 if (mode < 0) 1628 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1629 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1630 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1631 tabs [screen.cur.col] = !!mode;
1629} 1632}
1630 1633
1631/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
… …
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
… …
1885# ifdef MAPALERT_OPTION 1889# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1890 if (option (Opt_mapAlert))
1887# endif 1891# endif
1888 XMapWindow (dpy, parent[0]); 1892 XMapWindow (dpy, parent[0]);
1889# endif 1893# endif
1894
1890# if ENABLE_FRILLS 1895# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1896 if (option (Opt_urgentOnBell))
1892 { 1897 {
1893 XWMHints *h;
1894
1895 h = XGetWMHints(dpy, parent[0]); 1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1896 if (h != NULL)
1897 { 1899 {
1898 h->flags |= XUrgencyHint; 1900 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h); 1901 XSetWMHints (dpy, parent[0], h);
1900 } 1902 }
1901 } 1903 }
1902# endif 1904# endif
1903 1905
1904 if (option (Opt_visualBell)) 1906 if (option (Opt_visualBell))
1905 { 1907 {
1906 rvideo_bell = true; 1908 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1909 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1910 flush ();
1909 1911
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1912 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1913 }
1912 else 1914 else
1913 XBell (dpy, 0); 1915 XBell (dpy, 0);
1914#endif 1916#endif
1915} 1917}
… …
1996 return; 1998 return;
1997 1999
1998 /* 2000 /*
1999 * A: set up vars 2001 * A: set up vars
2000 */ 2002 */
2003 refresh_count = 0;
2004
2001 have_bg = 0; 2005 have_bg = 0;
2002 refresh_count = 0;
2003
2004#ifdef HAVE_BG_PIXMAP 2006#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
2006#endif 2008#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2010
2009 /* 2011 /*
2010 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
2263 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))
2264 { 2266 {
2265 bool invert = rend & RS_RVid; 2267 bool invert = rend & RS_RVid;
2266 2268
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
2270 { 2271 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2272 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2273 fore = Color_BD;
2273# if !ENABLE_STYLES 2274# if !ENABLE_STYLES
2274 else 2275 else
2275 invert = !invert; 2276 invert = !invert;
2276# endif 2277# endif
2277 } 2278 }
2278 2279
2279 if (rend & RS_Italic 2280 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2281 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2282 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2283 fore = Color_IT;
2284# if !ENABLE_STYLES 2284# if !ENABLE_STYLES
2285 else 2285 else
… …
2319 } 2319 }
2320 2320
2321#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2323 {
2324 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2325 { 2325 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2327 hidden_text = 0; 2327 hidden_text = 0;
2328 } 2328 }
2329 else if (hidden_text) 2329 else if (hidden_text)
2330 fore = back; 2330 fore = back;
2331 } 2331 }
… …
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2380 else
2381#endif 2381#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2383
2384 XDrawLine (dpy, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2387 }
2388 } /* for (col....) */ 2388 } /* for (col....) */
2389 } /* for (row....) */ 2389 } /* for (row....) */
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2428 else
2429#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2431
2432 XDrawRectangle (dpy, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2433 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2437 }
… …
2475rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2476{ 2476{
2477#ifdef HAVE_BG_PIXMAP 2477#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2478 bgPixmap.apply ();
2479#else 2479#else
2480
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2484
2484 if (scrollBar.win) 2485 if (scrollBar.win)
2485 { 2486 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2488 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2489 scrollBar.show (0);
2489 } 2490 }
2491
2490# endif 2492#endif
2491#endif 2493
2492 2494 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2495 scr_clear ();
2494 scr_touch (true); 2496 scr_touch (true);
2495 want_refresh = 1; 2497 want_refresh = 1;
2496} 2498}
2497 2499
… …
2589{ 2591{
2590 int row, wrote; 2592 int row, wrote;
2591 unsigned int width, towrite; 2593 unsigned int width, towrite;
2592 char r1[] = "\n"; 2594 char r1[] = "\n";
2593 2595
2594 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2596 { 2598 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2600 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
… …
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2655 data[i] = C0_CR;
2654 2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~");
2659
2655 tt_write (data, len); 2660 tt_write (data, len);
2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~");
2656} 2664}
2657 2665
2658/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2659/* 2667/*
2660 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
… …
2735 if (!delete_prop) 2743 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop); 2744 XDeleteProperty (dpy, win, prop);
2737 2745
2738 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2739 incr_buf_fill = 0; 2747 incr_buf_fill = 0;
2740 incr_ev.start (NOW + 10); 2748 incr_ev.start (10);
2741 2749
2742 goto bailout; 2750 goto bailout;
2743 } 2751 }
2744 2752
2745 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
… …
2754 ct.nitems = incr_buf_fill; 2762 ct.nitems = incr_buf_fill;
2755 incr_buf = 0; 2763 incr_buf = 0;
2756 incr_buf_size = 0; 2764 incr_buf_size = 0;
2757 incr_ev.stop (); 2765 incr_ev.stop ();
2758 } 2766 }
2759 else 2767 else
2760 { 2768 {
2761 if (selection_wait == Sel_normal 2769 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 { 2771 {
2764 /* 2772 /*
… …
2771 goto bailout; 2779 goto bailout;
2772 } 2780 }
2773 } 2781 }
2774 else if (selection_wait == Sel_incr) 2782 else if (selection_wait == Sel_incr)
2775 { 2783 {
2776 incr_ev.start (NOW + 10); 2784 incr_ev.start (10);
2777 2785
2778 while (incr_buf_fill + ct.nitems > incr_buf_size) 2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 { 2787 {
2780 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;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2821 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2823} 2831}
2824 2832
2825void 2833void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2827{ 2835{
2828 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2829 2837
2830 incr_buf_size = 0; 2838 incr_buf_size = 0;
2831 free (incr_buf); 2839 free (incr_buf);
… …
2842 selection_paste (win, prop, true); 2850 selection_paste (win, prop, true);
2843} 2851}
2844 2852
2845/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2846/* 2854/*
2847 * Request the current selection: 2855 * Request the current selection:
2848 * Order: > internal selection if available 2856 * Order: > internal selection if available
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2850 * > CUT_BUFFER0 2858 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0 2860 * will auto fallback to CUT_BUFFER0
… …
2854 */ 2862 */
2855void 2863void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2865{
2858 if (selection.text && selnum == Sel_Primary) 2866 if (selection.text && selnum == Sel_Primary)
2867 {
2859 { /* internal selection */ 2868 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str)); 2870 paste (str, strlen (str));
2862 free (str); 2871 free (str);
2863 return; 2872 return;
2864 } 2873 }
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3139 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3140
3132 while (selection.mark.col > 0 3141 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3142 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3143 --selection.mark.col;
3135 3144
3136 if (selection.op) 3145 if (selection.op)
3146 {
3137 { /* clear the old selection */ 3147 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3148 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3149 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3150 }
3141 3151
3142 selection.op = SELECTION_INIT; 3152 selection.op = SELECTION_INIT;
… …
3331 * 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
3332 * 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
3333 * time of the most recent button3 press 3343 * time of the most recent button3 press
3334 */ 3344 */
3335 if (button3 && buttonpress) 3345 if (button3 && buttonpress)
3346 {
3336 { /* button3 press */ 3347 /* button3 press */
3337 /* 3348 /*
3338 * first determine which edge of the selection we are closest to 3349 * first determine which edge of the selection we are closest to
3339 */ 3350 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3351 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3352 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3370 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3371 selection.mark.col = selection.beg.col;
3361 } 3372 }
3362 } 3373 }
3363 else 3374 else
3375 {
3364 { /* button1 drag or button3 drag */ 3376 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3377 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3378 {
3367 if (selection.mark.row == selection.end.row 3379 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3380 && selection.mark.col == selection.end.col
3369 && clickchange 3381 && clickchange
… …
3450 selection.end.row++; 3462 selection.end.row++;
3451 } 3463 }
3452 } 3464 }
3453 3465
3454 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3467 {
3455 { /* mark may need to be changed */ 3468 /* mark may need to be changed */
3456 if (closeto == LEFT) 3469 if (closeto == LEFT)
3457 { 3470 {
3458 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3473 }
… …
3659 XFree (ct.value); 3672 XFree (ct.value);
3660 } 3673 }
3661 3674
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3663} 3676}
3664
3665/* ------------------------------------------------------------------------- *
3666 * MOUSE ROUTINES *
3667 * ------------------------------------------------------------------------- */
3668
3669/*
3670 * return col/row values corresponding to x/y pixel values
3671 */
3672void
3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3674{
3675 *x = Pixel2Col (*x);
3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y);
3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679}
3680 3677
3681/* ------------------------------------------------------------------------- */ 3678/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3679#ifdef USE_XIM
3683void 3680void
3684rxvt_term::im_set_position (XPoint &pos) NOTHROW 3681rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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