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.240 by root, Thu Jan 19 17:21:20 2006 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC

… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 239 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 CLEAR_ALL_SELECTION ();
245
246 /* 243 /*
247 * add or delete rows as appropriate 244 * add or delete rows as appropriate
248 */ 245 */
249 246
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
… …
350 347
351 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
352 349
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 351
352#if DEBUG_STRICT
355 assert (len); 353 assert (len);
356 assert (pline.t); 354 assert (pline.t);
355#endif
357 356
358 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
359 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
360 359
361 lofs += len; 360 lofs += len;
… …
406 405
407 if (tabs) 406 if (tabs)
408 free (tabs); 407 free (tabs);
409 } 408 }
410 409
410 CLEAR_ALL_SELECTION ();
411
411 prev_nrow = nrow; 412 prev_nrow = nrow;
412 prev_ncol = ncol; 413 prev_ncol = ncol;
413 414
414 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
415 416
… …
424/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
425/* 426/*
426 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
427 */ 428 */
428void 429void
429rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
430{ 431{
431 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
433 434
434 free (row_buf); 435 free (row_buf);
… …
442/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
443/* 444/*
444 * Hard reset 445 * Hard reset
445 */ 446 */
446void 447void
447rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
448{ 449{
449 scr_release (); 450 scr_release ();
450 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
451 scr_reset (); 452 scr_reset ();
452 453
… …
461 * Save and Restore cursor 462 * Save and Restore cursor
462 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
463 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
464 */ 465 */
465void 466void
466rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
467{ 468{
468 screen_t *s; 469 screen_t *s;
469 470
470#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
471 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
510 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
511 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
512 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
513 */ 514 */
514int 515int
515rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
516{ 517{
517 want_refresh = 1; 518 want_refresh = 1;
518 view_start = 0; 519 view_start = 0;
519 520
520 if (current_screen == scrn) 521 if (current_screen == scrn)
… …
551 return scrn; 552 return scrn;
552} 553}
553 554
554// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
555void 556void
556rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
557{ 558{
558 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
559 return; 560 return;
560 561
561 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
571/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
572/* 573/*
573 * Change the colour for following text 574 * Change the colour for following text
574 */ 575 */
575void 576void
576rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
577{ 578{
578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
579 color = fgbg; 580 color = fgbg;
580 581
581 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
… …
587/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
588/* 589/*
589 * Change the rendition style for following text 590 * Change the rendition style for following text
590 */ 591 */
591void 592void
592rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
593 { 594 {
594 if (set) 595 if (set)
595 rstyle |= style; 596 rstyle |= style;
596 else if (style == ~RS_None) 597 else if (style == ~RS_None)
597 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
604 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
605 * count positive ==> scroll up 606 * count positive ==> scroll up
606 * count negative ==> scroll down 607 * count negative ==> scroll down
607 */ 608 */
608int 609int
609rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
610{ 611{
611 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
612 return 0; 613 return 0;
613 614
614 want_refresh = 1; 615 want_refresh = 1;
… …
732/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
733/* 734/*
734 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
735 */ 736 */
736void 737void
737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
738{ 739{
739 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
740 return; 741 return;
741 742
742 unsigned char checksel; 743 unsigned char checksel;
… …
996/* 997/*
997 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
998 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
999 */ 1000 */
1000void 1001void
1001rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
1002{ 1003{
1003 want_refresh = 1; 1004 want_refresh = 1;
1004 1005
1005 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
1006 { 1007 {
… …
1024 * Process Horizontal Tab 1025 * Process Horizontal Tab
1025 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
1026 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
1027 */ 1028 */
1028void 1029void
1029rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
1030{ 1031{
1031 int i, x; 1032 int i, x;
1032 1033
1033 want_refresh = 1; 1034 want_refresh = 1;
1034 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
… …
1101 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1102 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1103 */ 1104 */
1104#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1105void 1106void
1106rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1107{ 1108{
1108 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1109 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1110 else 1111 else
1111 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1118 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1119 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1120 */ 1121 */
1121#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1122void 1123void
1123rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1124{ 1125{
1125 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1127 else 1128 else
1128 { 1129 {
… …
1141/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1142/* 1143/*
1143 * Goto Row/Column 1144 * Goto Row/Column
1144 */ 1145 */
1145void 1146void
1146rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1147{ 1148{
1148 want_refresh = 1; 1149 want_refresh = 1;
1149 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1150 1151
1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1189/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1190/* 1191/*
1191 * direction should be UP or DN 1192 * direction should be UP or DN
1192 */ 1193 */
1193void 1194void
1194rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1195{ 1196{
1196 int dirn; 1197 int dirn;
1197 1198
1198 want_refresh = 1; 1199 want_refresh = 1;
1199 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1218 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1219 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1221 */ 1222 */
1222void 1223void
1223rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1224{ 1225{
1225 unsigned int col, num; 1226 unsigned int col, num;
1226 1227
1227 want_refresh = 1; 1228 want_refresh = 1;
1228 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
… …
1272 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1273 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1274 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1275 */ 1276 */
1276void 1277void
1277rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1278{ 1279{
1279 int num; 1280 int num;
1280 int32_t row; 1281 int32_t row;
1281 rend_t ren; 1282 rend_t ren;
1282 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1342 } 1343 }
1343} 1344}
1344 1345
1345#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1346void 1347void
1347rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1348{ 1349{
1349 want_refresh = 1; 1350 want_refresh = 1;
1350 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1351 1352
1352 top_row = 0; 1353 top_row = 0;
… …
1357/* 1358/*
1358 * Fill the screen with `E's 1359 * Fill the screen with `E's
1359 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1360 */ 1361 */
1361void 1362void
1362rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1363{ 1364{
1364 rend_t fs; 1365 rend_t fs;
1365 1366
1366 want_refresh = 1; 1367 want_refresh = 1;
1367 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1388/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1389/* 1390/*
1390 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1391 */ 1392 */
1392void 1393void
1393rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1394{ 1395{
1395 int end; 1396 int end;
1396 1397
1397 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1398 1399
… …
1418/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1419/* 1420/*
1420 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1421 */ 1422 */
1422void 1423void
1423rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1424{ 1425{
1425 int col, row; 1426 int col, row;
1426 rend_t tr; 1427 rend_t tr;
1427 1428
1428 want_refresh = 1; 1429 want_refresh = 1;
… …
1516/* 1517/*
1517 * Set the scrolling region 1518 * Set the scrolling region
1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1519 */ 1520 */
1520void 1521void
1521rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1522{ 1523{
1523 max_it (top, 0); 1524 max_it (top, 0);
1524 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1525 1526
1526 if (top > bot) 1527 if (top > bot)
… …
1536 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1537 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1538 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1539 */ 1540 */
1540void 1541void
1541rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1542{ 1543{
1543 want_refresh = 1; 1544 want_refresh = 1;
1544 1545
1545 if (mode) 1546 if (mode)
1546 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1553 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1554 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1555 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1556 */ 1557 */
1557void 1558void
1558rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1559{ 1560{
1560 if (mode) 1561 if (mode)
1561 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1562 else 1563 else
1563 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1572 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1573 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1574 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1575 */ 1576 */
1576void 1577void
1577rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1578{ 1579{
1579 if (mode) 1580 if (mode)
1580 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1581 else 1582 else
1582 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1589 * Set insert/replace mode 1590 * Set insert/replace mode
1590 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1591 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1592 */ 1593 */
1593void 1594void
1594rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1595{ 1596{
1596 if (mode) 1597 if (mode)
1597 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1598 else 1599 else
1599 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1605 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1606 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1607 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1608 */ 1609 */
1609void 1610void
1610rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1611{ 1612{
1612 if (mode < 0) 1613 if (mode < 0)
1613 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1614 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1615 tabs [screen.cur.col] = !!mode; 1616 tabs [screen.cur.col] = !!mode;
… …
1620 * Set reverse/normal video 1621 * Set reverse/normal video
1621 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1622 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1623 */ 1624 */
1624void 1625void
1625rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1626{ 1627{
1627 XGCValues gcvalue; 1628 rvideo_mode = on;
1628 1629
1630#ifndef NO_BELL
1631 on ^= rvideo_bell;
1632#endif
1633
1629 if (rvideo != mode) 1634 if (rvideo_state != on)
1630 { 1635 {
1631 rvideo = mode; 1636 rvideo_state = on;
1637
1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1633#if XPM_BACKGROUND 1639#if XPM_BACKGROUND
1634 if (bgPixmap.pixmap == None) 1640 if (bgPixmap.pixmap == None)
1635#endif 1641#endif
1636#if TRANSPARENT 1642#if TRANSPARENT
1637 if (! OPTION (Opt_transparent) || am_transparent == 0) 1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1638#endif 1644#endif
1639 XSetWindowBackground (display->display, vt, 1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1640 pix_colors[Color_bg]);
1641 1646
1647 XGCValues gcvalue;
1642 gcvalue.foreground = pix_colors[Color_fg]; 1648 gcvalue.foreground = pix_colors[Color_fg];
1643 gcvalue.background = pix_colors[Color_bg]; 1649 gcvalue.background = pix_colors[Color_bg];
1644 XChangeGC (display->display, gc, GCBackground | GCForeground, 1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1645 &gcvalue); 1651
1646 scr_clear (); 1652 scr_clear ();
1647 scr_touch (true); 1653 scr_touch (true);
1648 } 1654 }
1649} 1655}
1650 1656
… …
1652/* 1658/*
1653 * Report current cursor position 1659 * Report current cursor position
1654 * XTERM_SEQ: Report position: ESC [ 6 n 1660 * XTERM_SEQ: Report position: ESC [ 6 n
1655 */ 1661 */
1656void 1662void
1657rxvt_term::scr_report_position () 1663rxvt_term::scr_report_position () NOTHROW
1658{ 1664{
1659 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1665 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1660} 1666}
1661 1667
1662/* ------------------------------------------------------------------------- * 1668/* ------------------------------------------------------------------------- *
… …
1665 1671
1666/* 1672/*
1667 * Set font style 1673 * Set font style
1668 */ 1674 */
1669void 1675void
1670rxvt_term::set_font_style () 1676rxvt_term::set_font_style () NOTHROW
1671{ 1677{
1672#if 0 1678#if 0
1673 switch (charsets [screen.charset]) 1679 switch (charsets [screen.charset])
1674 { 1680 {
1675 case '0': /* DEC Special Character & Line Drawing Set */ 1681 case '0': /* DEC Special Character & Line Drawing Set */
… …
1697 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1703 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1698 * XTERM_SEQ: Invoke G2 character set: ESC N 1704 * XTERM_SEQ: Invoke G2 character set: ESC N
1699 * XTERM_SEQ: Invoke G3 character set: ESC O 1705 * XTERM_SEQ: Invoke G3 character set: ESC O
1700 */ 1706 */
1701void 1707void
1702rxvt_term::scr_charset_choose (int set) 1708rxvt_term::scr_charset_choose (int set) NOTHROW
1703{ 1709{
1704 screen.charset = set; 1710 screen.charset = set;
1705 set_font_style (); 1711 set_font_style ();
1706} 1712}
1707 1713
… …
1713 * XTERM_SEQ: Set G2 character set: ESC * <C> 1719 * XTERM_SEQ: Set G2 character set: ESC * <C>
1714 * XTERM_SEQ: Set G3 character set: ESC + <C> 1720 * XTERM_SEQ: Set G3 character set: ESC + <C>
1715 * See set_font_style for possible values for <C> 1721 * See set_font_style for possible values for <C>
1716 */ 1722 */
1717void 1723void
1718rxvt_term::scr_charset_set (int set, unsigned int ch) 1724rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1719{ 1725{
1720 charsets[set] = (unsigned char)ch; 1726 charsets[set] = (unsigned char)ch;
1721 set_font_style (); 1727 set_font_style ();
1722} 1728}
1723 1729
… …
1728 1734
1729/* 1735/*
1730 * refresh matching text. 1736 * refresh matching text.
1731 */ 1737 */
1732bool 1738bool
1733rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1739rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1734{ 1740{
1735 bool found = false; 1741 bool found = false;
1736 1742
1737 for (int i = 0; i < nrow; i++) 1743 for (int i = 0; i < nrow; i++)
1738 { 1744 {
… …
1758 PART_END, 1764 PART_END,
1759 RC_COUNT 1765 RC_COUNT
1760}; 1766};
1761 1767
1762void 1768void
1763rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1769rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1764{ 1770{
1765 int i; 1771 int i;
1766 row_col_t rc[RC_COUNT]; 1772 row_col_t rc[RC_COUNT];
1767 1773
1768 if (!drawn_buf) /* sanity check */ 1774 if (!drawn_buf) /* sanity check */
… …
1802/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1803/* 1809/*
1804 * Refresh the entire screen 1810 * Refresh the entire screen
1805 */ 1811 */
1806void 1812void
1807rxvt_term::scr_touch (bool refresh) 1813rxvt_term::scr_touch (bool refresh) NOTHROW
1808{ 1814{
1809 scr_expose (0, 0, width, height, refresh); 1815 scr_expose (0, 0, width, height, refresh);
1810} 1816}
1811 1817
1812/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1813/* 1819/*
1814 * Move the display so that the line represented by scrollbar value Y is at 1820 * Move the display so that the line represented by scrollbar value Y is at
1815 * the top of the screen 1821 * the top of the screen
1816 */ 1822 */
1817void 1823void
1818rxvt_term::scr_move_to (int y, int len) 1824rxvt_term::scr_move_to (int y, int len) NOTHROW
1819{ 1825{
1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1826 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1821} 1827}
1822 1828
1823/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1824/* 1830/*
1825 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1826 * direction should be UP or DN 1832 * direction should be UP or DN
1827 */ 1833 */
1828bool 1834bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1836{
1831 int new_view_start = 1837 int new_view_start =
1832 direction == UP ? view_start - nlines 1838 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1839 : view_start + nlines;
1834 1840
1835 return scr_changeview (new_view_start); 1841 return scr_changeview (new_view_start);
1836} 1842}
1837 1843
1838bool 1844bool
1839rxvt_term::scr_changeview (int new_view_start) 1845rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1846{
1841 clamp_it (new_view_start, top_row, 0); 1847 clamp_it (new_view_start, top_row, 0);
1842 1848
1843 if (new_view_start == view_start) 1849 if (new_view_start == view_start)
1844 return false; 1850 return false;
… …
1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1856 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851 1857
1852 return true; 1858 return true;
1853} 1859}
1854 1860
1855/* ------------------------------------------------------------------------- */ 1861#ifndef NO_BELL
1856void 1862void
1863rxvt_term::bell_cb (time_watcher &w)
1864{
1865 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode);
1867}
1868#endif
1869
1870/* ------------------------------------------------------------------------- */
1871void
1857rxvt_term::scr_bell () 1872rxvt_term::scr_bell () NOTHROW
1858{ 1873{
1859#ifndef NO_BELL 1874#ifndef NO_BELL
1860 1875
1861# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
… …
1865 XMapWindow (display->display, parent[0]); 1880 XMapWindow (display->display, parent[0]);
1866# endif 1881# endif
1867 1882
1868 if (OPTION (Opt_visualBell)) 1883 if (OPTION (Opt_visualBell))
1869 { 1884 {
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode);
1871 display->flush (); 1887 display->flush ();
1872 rxvt_usleep (VISUAL_BELL_DURATION); 1888
1873 scr_rvideo_mode (!rvideo); /* refresh also done */ 1889 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1874 } 1890 }
1875 else 1891 else
1876 XBell (display->display, 0); 1892 XBell (display->display, 0);
1877 1893
1878#endif 1894#endif
1879} 1895}
1880 1896
1881/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
1882/* ARGSUSED */ 1898/* ARGSUSED */
1883void 1899void
1884rxvt_term::scr_printscreen (int fullhist) 1900rxvt_term::scr_printscreen (int fullhist) NOTHROW
1885{ 1901{
1886#ifdef PRINTPIPE 1902#ifdef PRINTPIPE
1887 int nrows, row_start; 1903 int nrows, row_start;
1888 FILE *fd; 1904 FILE *fd;
1889 1905
… …
1938 * Refresh the screen 1954 * Refresh the screen
1939 * drawn_text/drawn_rend contain the screen information before the update. 1955 * drawn_text/drawn_rend contain the screen information before the update.
1940 * screen.text/screen.rend contain what the screen will change to. 1956 * screen.text/screen.rend contain what the screen will change to.
1941 */ 1957 */
1942void 1958void
1943rxvt_term::scr_refresh () 1959rxvt_term::scr_refresh () NOTHROW
1944{ 1960{
1945 unsigned char must_clear, /* use draw_string not draw_image_string */ 1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1946 showcursor; /* show the cursor */ 1962 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 1963 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 1964 ocrow; /* old cursor row */
… …
2389 num_scr = 0; 2405 num_scr = 0;
2390 num_scr_allow = 1; 2406 num_scr_allow = 1;
2391} 2407}
2392 2408
2393void 2409void
2394rxvt_term::scr_remap_chars (line_t &l) 2410rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2411{
2396 if (!l.t) 2412 if (!l.t)
2397 return; 2413 return;
2398 2414
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2415 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2401 for (int i = ncol; i--; ) 2417 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2419}
2404 2420
2405void 2421void
2406rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars () NOTHROW
2407{ 2423{
2408 for (int i = total_rows; i--; ) 2424 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2425 scr_remap_chars (row_buf [i]);
2410 2426
2411 for (int i = nrow; i--; ) 2427 for (int i = nrow; i--; )
… …
2414 scr_remap_chars (swap_buf [i]); 2430 scr_remap_chars (swap_buf [i]);
2415 } 2431 }
2416} 2432}
2417 2433
2418void 2434void
2419rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour () NOTHROW
2420{ 2436{
2421 if (1 2437 if (1
2422#if TRANSPARENT 2438#if TRANSPARENT
2423 && !am_transparent 2439 && !am_transparent
2424#endif 2440#endif
… …
2445 want_refresh = 1; 2461 want_refresh = 1;
2446} 2462}
2447 2463
2448/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2449void 2465void
2450rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2467{
2452 if (!mapped) 2468 if (!mapped)
2453 return; 2469 return;
2454 2470
2455 num_scr_allow = 0; 2471 num_scr_allow = 0;
… …
2458 if (really) 2474 if (really)
2459 XClearWindow (display->display, vt); 2475 XClearWindow (display->display, vt);
2460} 2476}
2461 2477
2462void 2478void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2464{ 2480{
2465 int view_end = view_start + nrow; 2481 int view_end = view_start + nrow;
2466 int row, col; 2482 int row, col;
2467 2483
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2484 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2480 srp[col] ^= rstyle2; 2496 srp[col] ^= rstyle2;
2481 } 2497 }
2482} 2498}
2483 2499
2484void 2500void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2501rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2486{ 2502{
2487 int view_end = view_start + nrow; 2503 int view_end = view_start + nrow;
2488 int row, col; 2504 int row, col;
2489 2505
2490 if (beg_row >= view_start) 2506 if (beg_row >= view_start)
… …
2507 srp[col] ^= rstyle; 2523 srp[col] ^= rstyle;
2508} 2524}
2509 2525
2510/* ------------------------------------------------------------------------- */ 2526/* ------------------------------------------------------------------------- */
2511void 2527void
2512rxvt_term::scr_reverse_selection () 2528rxvt_term::scr_reverse_selection () NOTHROW
2513{ 2529{
2514 if (selection.op 2530 if (selection.op
2515 && current_screen == selection.screen 2531 && current_screen == selection.screen
2516 && selection.end.row >= view_start) 2532 && selection.end.row >= view_start)
2517 { 2533 {
… …
2533 * Dump the whole scrollback and screen to the passed filedescriptor. The 2549 * Dump the whole scrollback and screen to the passed filedescriptor. The
2534 * invoking routine must close the fd. 2550 * invoking routine must close the fd.
2535 */ 2551 */
2536#if 0 2552#if 0
2537void 2553void
2538rxvt_term::scr_dump (int fd) 2554rxvt_term::scr_dump (int fd) NOTHROW
2539{ 2555{
2540 int row, wrote; 2556 int row, wrote;
2541 unsigned int width, towrite; 2557 unsigned int width, towrite;
2542 char r1[] = "\n"; 2558 char r1[] = "\n";
2543 2559
… …
2562 2578
2563/* ------------------------------------------------------------------------- * 2579/* ------------------------------------------------------------------------- *
2564 * CHARACTER SELECTION * 2580 * CHARACTER SELECTION *
2565 * ------------------------------------------------------------------------- */ 2581 * ------------------------------------------------------------------------- */
2566void 2582void
2567rxvt_term::selection_check (int check_more) 2583rxvt_term::selection_check (int check_more) NOTHROW
2568{ 2584{
2569 row_col_t pos; 2585 row_col_t pos;
2570 2586
2571 if (!selection.op) 2587 if (!selection.op)
2572 return; 2588 return;
… …
2593/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2594/* 2610/*
2595 * Paste a selection direct to the command fd 2611 * Paste a selection direct to the command fd
2596 */ 2612 */
2597void 2613void
2598rxvt_term::paste (char *data, unsigned int len) 2614rxvt_term::paste (char *data, unsigned int len) NOTHROW
2599{ 2615{
2600 /* convert normal newline chars into common keyboard Return key sequence */ 2616 /* convert normal newline chars into common keyboard Return key sequence */
2601 for (unsigned int i = 0; i < len; i++) 2617 for (unsigned int i = 0; i < len; i++)
2602 if (data[i] == C0_LF) 2618 if (data[i] == C0_LF)
2603 data[i] = C0_CR; 2619 data[i] = C0_CR;
… …
2609/* 2625/*
2610 * Respond to a notification that a primary selection has been sent 2626 * Respond to a notification that a primary selection has been sent
2611 * EXT: SelectionNotify 2627 * EXT: SelectionNotify
2612 */ 2628 */
2613void 2629void
2614rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2615{ 2631{
2616 if (prop == None) /* check for failed XConvertSelection */ 2632 if (prop == None) /* check for failed XConvertSelection */
2617 { 2633 {
2618 if ((selection_type & Sel_CompoundText)) 2634 if ((selection_type & Sel_CompoundText))
2619 { 2635 {
… …
2771 if (selection_wait == Sel_normal) 2787 if (selection_wait == Sel_normal)
2772 selection_wait = Sel_none; 2788 selection_wait = Sel_none;
2773} 2789}
2774 2790
2775void 2791void
2776rxvt_term::incr_cb (time_watcher &w) 2792rxvt_term::incr_cb (time_watcher &w) NOTHROW
2777{ 2793{
2778 selection_wait = Sel_none; 2794 selection_wait = Sel_none;
2779 2795
2780 incr_buf_size = 0; 2796 incr_buf_size = 0;
2781 free (incr_buf); 2797 free (incr_buf);
2782 2798
2783 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2784} 2800}
2785 2801
2786void 2802void
2787rxvt_term::selection_property (Window win, Atom prop) 2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2788{ 2804{
2789 if (prop == None || selection_wait != Sel_incr) 2805 if (prop == None || selection_wait != Sel_incr)
2790 return; 2806 return;
2791 2807
2792 selection_paste (win, prop, true); 2808 selection_paste (win, prop, true);
… …
2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2802 * will auto fallback to CUT_BUFFER0 2818 * will auto fallback to CUT_BUFFER0
2803 * EXT: button 2 release 2819 * EXT: button 2 release
2804 */ 2820 */
2805void 2821void
2806rxvt_term::selection_request (Time tm) 2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2807{ 2823{
2808 if (selection.text) 2824 if (selection.text && selnum == Sel_Primary)
2809 { /* internal selection */ 2825 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2827 paste (str, strlen (str));
2812 free (str); 2828 free (str);
2813 return; 2829 return;
2814 } 2830 }
2815 else 2831 else
2816 { 2832 {
2817 int i;
2818
2819 selection_request_time = tm; 2833 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2834 selection_wait = Sel_normal;
2821 2835
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2836#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2837 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2839 return;
2828#else 2840#else
2829 selection_type = Sel_CompoundText; 2841 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2843 return;
2832#endif 2844#endif
2833 }
2834 } 2845 }
2835 2846
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2849}
2839 2850
2840int 2851int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2853{
2843 Atom sel; 2854 Atom sel;
2844 2855
2845 selection_type |= selnum; 2856 selection_type |= selnum;
2846 2857
… …
2865/* 2876/*
2866 * Clear all selected text 2877 * Clear all selected text
2867 * EXT: SelectionClear 2878 * EXT: SelectionClear
2868 */ 2879 */
2869void 2880void
2870rxvt_term::selection_clear () 2881rxvt_term::selection_clear () NOTHROW
2871{ 2882{
2872 want_refresh = 1; 2883 want_refresh = 1;
2873 free (selection.text); 2884 free (selection.text);
2874 selection.text = NULL; 2885 selection.text = NULL;
2875 selection.len = 0; 2886 selection.len = 0;
… …
3010 3021
3011 selection_grab (tm); 3022 selection_grab (tm);
3012} 3023}
3013 3024
3014bool 3025bool
3015rxvt_term::selection_grab (Time tm) 3026rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3027{
3017 selection_time = tm; 3028 selection_time = tm;
3018 3029
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
… …
3043/* 3054/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3055 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3056 * EXT: button 1 press
3046 */ 3057 */
3047void 3058void
3048rxvt_term::selection_click (int clicks, int x, int y) 3059rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3060{
3050 clicks = ((clicks - 1) % 3) + 1; 3061 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3062 selection.clicks = clicks; /* save clicks so extend will work */
3052 3063
3053 if (clicks == 2 && !selection.rect 3064 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
3073/* 3084/*
3074 * Mark a selection at the specified col/row 3085 * Mark a selection at the specified col/row
3075 */ 3086 */
3076void 3087void
3077rxvt_term::selection_start_colrow (int col, int row) 3088rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 3089{
3079 want_refresh = 1; 3090 want_refresh = 1;
3080 3091
3081 selection.mark.row = row + view_start; 3092 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3093 selection.mark.col = col;
… …
3108#define DELIMIT_TEXT(x) \ 3119#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3120 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3121#define DELIMIT_REND(x) 1
3111 3122
3112void 3123void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3124rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3125{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3126 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3127 row_col_t bound;
3117 text_t *stp; 3128 text_t *stp;
3118 rend_t *srp; 3129 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3203 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3204 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3205 * flag == 2 ==> button 3 motion
3195 */ 3206 */
3196void 3207void
3197rxvt_term::selection_extend (int x, int y, int flag) 3208rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3209{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3210 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3211 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3212
3202 /* 3213 /*
… …
3228/* ------------------------------------------------------------------------- */ 3239/* ------------------------------------------------------------------------- */
3229/* 3240/*
3230 * Extend the selection to the specified col/row 3241 * Extend the selection to the specified col/row
3231 */ 3242 */
3232void 3243void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3244rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3245{
3235 row_col_t pos; 3246 row_col_t pos;
3236 enum { 3247 enum {
3237 LEFT, RIGHT 3248 LEFT, RIGHT
3238 } closeto = RIGHT; 3249 } closeto = RIGHT;
… …
3424#endif 3435#endif
3425} 3436}
3426 3437
3427#if ENABLE_FRILLS 3438#if ENABLE_FRILLS
3428void 3439void
3429rxvt_term::selection_remove_trailing_spaces () 3440rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3441{
3431 int32_t end_col, end_row; 3442 int32_t end_col, end_row;
3432 text_t *stp; 3443 text_t *stp;
3433 3444
3434 end_col = selection.end.col; 3445 end_col = selection.end.col;
… …
3472/* 3483/*
3473 * Double click on button 3 when already selected 3484 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3485 * EXT: button 3 double click
3475 */ 3486 */
3476void 3487void
3477rxvt_term::selection_rotate (int x, int y) 3488rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3489{
3479 selection.clicks = selection.clicks % 3 + 1; 3490 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3491 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3492}
3482 3493
… …
3484/* 3495/*
3485 * Respond to a request for our current selection 3496 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3497 * EXT: SelectionRequest
3487 */ 3498 */
3488void 3499void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3501{
3491 XSelectionEvent ev; 3502 XSelectionEvent ev;
3492 dDisp; 3503 dDisp;
3493 3504
3494 ev.type = SelectionNotify; 3505 ev.type = SelectionNotify;
… …
3622 3633
3623/* 3634/*
3624 * return col/row values corresponding to x/y pixel values 3635 * return col/row values corresponding to x/y pixel values
3625 */ 3636 */
3626void 3637void
3627rxvt_term::pixel_position (int *x, int *y) 3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3628{ 3639{
3629 *x = Pixel2Col (*x); 3640 *x = Pixel2Col (*x);
3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3631 *y = Pixel2Row (*y); 3642 *y = Pixel2Row (*y);
3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3633} 3644}
3634 3645
3635/* ------------------------------------------------------------------------- */ 3646/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3647#ifdef USE_XIM
3637void 3648void
3638rxvt_term::im_set_position (XPoint &pos) 3649rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3650{
3640 XWindowAttributes xwa; 3651 XWindowAttributes xwa;
3641 3652
3642 XGetWindowAttributes (display->display, vt, &xwa); 3653 XGetWindowAttributes (display->display, vt, &xwa);
3643 3654
… …
3646} 3657}
3647#endif 3658#endif
3648 3659
3649#if ENABLE_OVERLAY 3660#if ENABLE_OVERLAY
3650void 3661void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3662rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3663{
3653 if (nrow < 1 || ncol < 1) 3664 if (nrow < 1 || ncol < 1)
3654 return; 3665 return;
3655 3666
3656 want_refresh = 1; 3667 want_refresh = 1;
… …
3701 *rp = r; 3712 *rp = r;
3702 } 3713 }
3703} 3714}
3704 3715
3705void 3716void
3706rxvt_term::scr_overlay_off () 3717rxvt_term::scr_overlay_off () NOTHROW
3707{ 3718{
3708 if (!ov_text) 3719 if (!ov_text)
3709 return; 3720 return;
3710 3721
3711 want_refresh = 1; 3722 want_refresh = 1;
… …
3719 delete [] ov_text; ov_text = 0; 3730 delete [] ov_text; ov_text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3731 delete [] ov_rend; ov_rend = 0;
3721} 3732}
3722 3733
3723void 3734void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3736{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727 return; 3738 return;
3728 3739
3729 x++, y++; 3740 x++, y++;
… …
3731 ov_text[y][x] = text; 3742 ov_text[y][x] = text;
3732 ov_rend[y][x] = rend; 3743 ov_rend[y][x] = rend;
3733} 3744}
3734 3745
3735void 3746void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3748{
3738 while (*s) 3749 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3750 scr_overlay_set (x++, y, *s++);
3740} 3751}
3741 3752
3742void 3753void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3755{
3745 while (*s) 3756 while (*s)
3746 { 3757 {
3747 text_t t = *s++; 3758 text_t t = *s++;
3748 int width = wcwidth (t); 3759 int width = wcwidth (t);
… …
3754 } 3765 }
3755 } 3766 }
3756} 3767}
3757 3768
3758void 3769void
3759rxvt_term::scr_swap_overlay () 3770rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3771{
3761 if (!ov_text) 3772 if (!ov_text)
3762 return; 3773 return;
3763 3774
3764 // swap screen mem with overlay 3775 // swap screen mem with overlay

Diff Legend

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