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.248 by root, Sun Jan 22 20:58:33 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;
… …
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 top_row--; 187 top_row--;
… …
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 */ 202 */
200 top_row = 0; /* no saved lines */ 203 top_row = 0;
201 term_start = 0; 204 term_start = 0;
202 205
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 208
… …
234 selection.text = NULL; 237 selection.text = NULL;
235 selection.len = 0; 238 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
238 selection.clicks = 0; 241 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 CLEAR_ALL_SELECTION ();
245
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
248 */ 248 */
249 249
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
… …
283 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (top_row) 286 if (top_row)
287 { 287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 290
291 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 293
… …
350 350
351 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
352 352
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 354
355 assert (len);
356 assert (pline.t);
357
358 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
359 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
360 357
361 lofs += len; 358 lofs += len;
362 qcol += len; 359 qcol += len;
… …
402 delete old_ra; 399 delete old_ra;
403 400
404 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
405 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
406 403
407 if (tabs)
408 free (tabs); 404 free (tabs);
409 } 405 }
406
407 CLEAR_ALL_SELECTION ();
410 408
411 prev_nrow = nrow; 409 prev_nrow = nrow;
412 prev_ncol = ncol; 410 prev_ncol = ncol;
413 411
414 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
415 413
416 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
417 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
418 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
419 tt_winch (); 420 tt_winch ();
420 421
421 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 423}
423 424
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{
432 if (row_buf)
433 {
431 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
433 436
434 free (row_buf); 437 free (row_buf);
435 free (swap_buf); 438 free (swap_buf);
436 free (drawn_buf); 439 free (drawn_buf);
437 free (tabs); 440 free (tabs);
438 441
439 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
440} 444}
441 445
442/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
443/* 447/*
444 * Hard reset 448 * Hard reset
… …
461 * Save and Restore cursor 465 * Save and Restore cursor
462 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
463 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
464 */ 468 */
465void 469void
466rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
467{ 471{
468 screen_t *s; 472 screen_t *s;
469 473
470#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
471 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
503 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
505#endif 509#endif
506} 510}
507 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
508/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
509/* 528/*
510 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
511 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
512 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
513 */ 532 */
514int 533void
515rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
516{ 535{
536 if (scrn == current_screen)
537 return;
538
517 want_refresh = 1; 539 want_refresh = 1;
518 view_start = 0; 540 view_start = 0;
519 541
520 if (current_screen == scrn)
521 return scrn;
522
523 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
524 543
525 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
526
527 ::swap (screen.cur.row, swap.cur.row);
528 ::swap (screen.cur.col, swap.cur.col);
529
530 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
531 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
532 545
533#if NSCREENS 546#if NSCREENS
534 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
535 { 548 {
536 num_scr = 0; 549 num_scr = 0;
537 550
538 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
539 ::swap (ROW(i), swap_buf [i]);
540 552
541 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
542 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
543 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
544 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
545 } 557 }
546 else 558 else
547#endif 559#endif
548 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
549 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
550
551 return scrn;
552} 562}
553 563
554// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
555void 565void
556rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
557{ 567{
558 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
559 return; 569 return;
560 570
561 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
571/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
572/* 582/*
573 * Change the colour for following text 583 * Change the colour for following text
574 */ 584 */
575void 585void
576rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
577{ 587{
578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
579 color = fgbg; 589 color = fgbg;
580 590
581 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
… …
587/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
588/* 598/*
589 * Change the rendition style for following text 599 * Change the rendition style for following text
590 */ 600 */
591void 601void
592rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
593 { 603 {
594 if (set) 604 if (set)
595 rstyle |= style; 605 rstyle |= style;
596 else if (style == ~RS_None) 606 else if (style == ~RS_None)
597 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
604 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
605 * count positive ==> scroll up 615 * count positive ==> scroll up
606 * count negative ==> scroll down 616 * count negative ==> scroll down
607 */ 617 */
608int 618int
609rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
610{ 620{
611 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
612 return 0; 622 return 0;
613 623
614 want_refresh = 1; 624 want_refresh = 1;
… …
732/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
733/* 743/*
734 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
735 */ 745 */
736void 746void
737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
738{ 748{
739 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
740 return; 750 return;
741 751
742 unsigned char checksel; 752 unsigned char checksel;
… …
748 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
749 759
750 if (minlines > 0) 760 if (minlines > 0)
751 { 761 {
752 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
753 764
754 if (minlines > 0 765 if (minlines > 0
755 && screen.tscroll == 0 766 && screen.tscroll == 0
756 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
757 { 768 {
… …
996/* 1007/*
997 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
998 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
999 */ 1010 */
1000void 1011void
1001rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1002{ 1013{
1003 want_refresh = 1; 1014 want_refresh = 1;
1004 1015
1005 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1006 { 1017 {
… …
1024 * Process Horizontal Tab 1035 * Process Horizontal Tab
1025 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1026 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1027 */ 1038 */
1028void 1039void
1029rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1030{ 1041{
1031 int i, x; 1042 int i, x;
1032 1043
1033 want_refresh = 1; 1044 want_refresh = 1;
1034 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
… …
1101 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1102 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1103 */ 1114 */
1104#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1105void 1116void
1106rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1107{ 1118{
1108 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1109 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1110 else 1121 else
1111 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1118 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1119 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1120 */ 1131 */
1121#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1122void 1133void
1123rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1124{ 1135{
1125 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1127 else 1138 else
1128 { 1139 {
… …
1141/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1142/* 1153/*
1143 * Goto Row/Column 1154 * Goto Row/Column
1144 */ 1155 */
1145void 1156void
1146rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1147{ 1158{
1148 want_refresh = 1; 1159 want_refresh = 1;
1149 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1150 1161
1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1189/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1190/* 1201/*
1191 * direction should be UP or DN 1202 * direction should be UP or DN
1192 */ 1203 */
1193void 1204void
1194rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1195{ 1206{
1196 int dirn; 1207 int dirn;
1197 1208
1198 want_refresh = 1; 1209 want_refresh = 1;
1199 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1218 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1219 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1221 */ 1232 */
1222void 1233void
1223rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1224{ 1235{
1225 unsigned int col, num; 1236 unsigned int col, num;
1226 1237
1227 want_refresh = 1; 1238 want_refresh = 1;
1228 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
… …
1272 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1273 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1274 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1275 */ 1286 */
1276void 1287void
1277rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1278{ 1289{
1279 int num; 1290 int num;
1280 int32_t row; 1291 int32_t row;
1281 rend_t ren; 1292 rend_t ren;
1282 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1342 } 1353 }
1343} 1354}
1344 1355
1345#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1346void 1357void
1347rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1348{ 1359{
1349 want_refresh = 1; 1360 want_refresh = 1;
1350 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1351 1362
1352 top_row = 0; 1363 top_row = 0;
… …
1357/* 1368/*
1358 * Fill the screen with `E's 1369 * Fill the screen with `E's
1359 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1360 */ 1371 */
1361void 1372void
1362rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1363{ 1374{
1364 rend_t fs; 1375 rend_t fs;
1365 1376
1366 want_refresh = 1; 1377 want_refresh = 1;
1367 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1388/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1389/* 1400/*
1390 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1391 */ 1402 */
1392void 1403void
1393rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1394{ 1405{
1395 int end; 1406 int end;
1396 1407
1397 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1398 1409
… …
1418/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1419/* 1430/*
1420 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1421 */ 1432 */
1422void 1433void
1423rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1424{ 1435{
1425 int col, row; 1436 int col, row;
1426 rend_t tr; 1437 rend_t tr;
1427 1438
1428 want_refresh = 1; 1439 want_refresh = 1;
… …
1516/* 1527/*
1517 * Set the scrolling region 1528 * Set the scrolling region
1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1519 */ 1530 */
1520void 1531void
1521rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1522{ 1533{
1523 max_it (top, 0); 1534 max_it (top, 0);
1524 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1525 1536
1526 if (top > bot) 1537 if (top > bot)
… …
1536 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1537 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1538 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1539 */ 1550 */
1540void 1551void
1541rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1542{ 1553{
1543 want_refresh = 1; 1554 want_refresh = 1;
1544 1555
1545 if (mode) 1556 if (mode)
1546 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1553 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1554 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1555 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1556 */ 1567 */
1557void 1568void
1558rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1559{ 1570{
1560 if (mode) 1571 if (mode)
1561 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1562 else 1573 else
1563 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1572 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1573 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1574 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1575 */ 1586 */
1576void 1587void
1577rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1578{ 1589{
1579 if (mode) 1590 if (mode)
1580 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1581 else 1592 else
1582 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1589 * Set insert/replace mode 1600 * Set insert/replace mode
1590 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1591 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1592 */ 1603 */
1593void 1604void
1594rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1595{ 1606{
1596 if (mode) 1607 if (mode)
1597 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1598 else 1609 else
1599 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1605 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1606 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1607 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1608 */ 1619 */
1609void 1620void
1610rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1611{ 1622{
1612 if (mode < 0) 1623 if (mode < 0)
1613 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1614 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1615 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
… …
1620 * Set reverse/normal video 1631 * Set reverse/normal video
1621 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1622 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1623 */ 1634 */
1624void 1635void
1625rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1626{ 1637{
1627 XGCValues gcvalue; 1638 rvideo_mode = on;
1628 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1629 if (rvideo != mode) 1644 if (rvideo_state != on)
1630 { 1645 {
1631 rvideo = mode; 1646 rvideo_state = on;
1647
1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1633#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1634 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1635#endif 1651#endif
1636#if TRANSPARENT 1652#if TRANSPARENT
1637 if (! OPTION (Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1638#endif 1654#endif
1639 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1640 pix_colors[Color_bg]);
1641 1656
1657 XGCValues gcvalue;
1642 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1643 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1644 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1645 &gcvalue); 1661
1646 scr_clear (); 1662 scr_clear ();
1647 scr_touch (true); 1663 scr_touch (true);
1648 } 1664 }
1649} 1665}
1650 1666
… …
1652/* 1668/*
1653 * Report current cursor position 1669 * Report current cursor position
1654 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1655 */ 1671 */
1656void 1672void
1657rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1658{ 1674{
1659 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1660} 1676}
1661 1677
1662/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1665 1681
1666/* 1682/*
1667 * Set font style 1683 * Set font style
1668 */ 1684 */
1669void 1685void
1670rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1671{ 1687{
1672#if 0 1688#if 0
1673 switch (charsets [screen.charset]) 1689 switch (charsets [screen.charset])
1674 { 1690 {
1675 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
… …
1697 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1698 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1699 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1700 */ 1716 */
1701void 1717void
1702rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1703{ 1719{
1704 screen.charset = set; 1720 screen.charset = set;
1705 set_font_style (); 1721 set_font_style ();
1706} 1722}
1707 1723
… …
1713 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1714 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1715 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1716 */ 1732 */
1717void 1733void
1718rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1719{ 1735{
1720 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1721 set_font_style (); 1737 set_font_style ();
1722} 1738}
1723 1739
… …
1728 1744
1729/* 1745/*
1730 * refresh matching text. 1746 * refresh matching text.
1731 */ 1747 */
1732bool 1748bool
1733rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1734{ 1750{
1735 bool found = false; 1751 bool found = false;
1736 1752
1737 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1738 { 1754 {
… …
1758 PART_END, 1774 PART_END,
1759 RC_COUNT 1775 RC_COUNT
1760}; 1776};
1761 1777
1762void 1778void
1763rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1764{ 1780{
1765 int i; 1781 int i;
1766 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1767 1783
1768 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1802/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1803/* 1819/*
1804 * Refresh the entire screen 1820 * Refresh the entire screen
1805 */ 1821 */
1806void 1822void
1807rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1808{ 1824{
1809 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1810} 1826}
1811 1827
1812/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1813/* 1829/*
1814 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1815 * the top of the screen 1831 * the top of the screen
1816 */ 1832 */
1817void 1833void
1818rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1819{ 1835{
1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1821} 1837}
1822 1838
1823/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1824/* 1840/*
1825 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1826 * direction should be UP or DN 1842 * direction should be UP or DN
1827 */ 1843 */
1828bool 1844bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1846{
1831 int new_view_start = 1847 int new_view_start =
1832 direction == UP ? view_start - nlines 1848 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1849 : view_start + nlines;
1834 1850
1835 return scr_changeview (new_view_start); 1851 return scr_changeview (new_view_start);
1836} 1852}
1837 1853
1838bool 1854bool
1839rxvt_term::scr_changeview (int new_view_start) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1856{
1841 clamp_it (new_view_start, top_row, 0); 1857 clamp_it (new_view_start, top_row, 0);
1842 1858
1843 if (new_view_start == view_start) 1859 if (new_view_start == view_start)
1844 return false; 1860 return false;
… …
1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851 1867
1852 return true; 1868 return true;
1853} 1869}
1854 1870
1855/* ------------------------------------------------------------------------- */ 1871#ifndef NO_BELL
1856void 1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1857rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1858{ 1883{
1859#ifndef NO_BELL 1884#ifndef NO_BELL
1860 1885
1861# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
… …
1865 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1866# endif 1891# endif
1867 1892
1868 if (OPTION (Opt_visualBell)) 1893 if (OPTION (Opt_visualBell))
1869 { 1894 {
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode);
1871 display->flush (); 1897 display->flush ();
1872 rxvt_usleep (VISUAL_BELL_DURATION); 1898
1873 scr_rvideo_mode (!rvideo); /* refresh also done */ 1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1874 } 1900 }
1875 else 1901 else
1876 XBell (display->display, 0); 1902 XBell (display->display, 0);
1877 1903
1878#endif 1904#endif
1879} 1905}
1880 1906
1881/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1882/* ARGSUSED */ 1908/* ARGSUSED */
1883void 1909void
1884rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1885{ 1911{
1886#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1887 int nrows, row_start; 1913 int nrows, row_start;
1888 FILE *fd; 1914 FILE *fd;
1889 1915
… …
1938 * Refresh the screen 1964 * Refresh the screen
1939 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1940 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1941 */ 1967 */
1942void 1968void
1943rxvt_term::scr_refresh () 1969rxvt_term::scr_refresh () NOTHROW
1944{ 1970{
1945 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1946 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
… …
2389 num_scr = 0; 2415 num_scr = 0;
2390 num_scr_allow = 1; 2416 num_scr_allow = 1;
2391} 2417}
2392 2418
2393void 2419void
2394rxvt_term::scr_remap_chars (line_t &l) 2420rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2421{
2396 if (!l.t) 2422 if (!l.t)
2397 return; 2423 return;
2398 2424
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2425 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2401 for (int i = ncol; i--; ) 2427 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2428 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2429}
2404 2430
2405void 2431void
2406rxvt_term::scr_remap_chars () 2432rxvt_term::scr_remap_chars () NOTHROW
2407{ 2433{
2408 for (int i = total_rows; i--; ) 2434 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2435 scr_remap_chars (row_buf [i]);
2410 2436
2411 for (int i = nrow; i--; ) 2437 for (int i = nrow; i--; )
… …
2414 scr_remap_chars (swap_buf [i]); 2440 scr_remap_chars (swap_buf [i]);
2415 } 2441 }
2416} 2442}
2417 2443
2418void 2444void
2419rxvt_term::scr_recolour () 2445rxvt_term::scr_recolour () NOTHROW
2420{ 2446{
2421 if (1 2447 if (1
2422#if TRANSPARENT 2448#if TRANSPARENT
2423 && !am_transparent 2449 && !am_transparent
2424#endif 2450#endif
… …
2445 want_refresh = 1; 2471 want_refresh = 1;
2446} 2472}
2447 2473
2448/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2449void 2475void
2450rxvt_term::scr_clear (bool really) 2476rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2477{
2452 if (!mapped) 2478 if (!mapped)
2453 return; 2479 return;
2454 2480
2455 num_scr_allow = 0; 2481 num_scr_allow = 0;
… …
2458 if (really) 2484 if (really)
2459 XClearWindow (display->display, vt); 2485 XClearWindow (display->display, vt);
2460} 2486}
2461 2487
2462void 2488void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2464{ 2490{
2465 int view_end = view_start + nrow; 2491 int view_end = view_start + nrow;
2466 int row, col; 2492 int row, col;
2467 2493
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2494 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2480 srp[col] ^= rstyle2; 2506 srp[col] ^= rstyle2;
2481 } 2507 }
2482} 2508}
2483 2509
2484void 2510void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2511rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2486{ 2512{
2487 int view_end = view_start + nrow; 2513 int view_end = view_start + nrow;
2488 int row, col; 2514 int row, col;
2489 2515
2490 if (beg_row >= view_start) 2516 if (beg_row >= view_start)
… …
2507 srp[col] ^= rstyle; 2533 srp[col] ^= rstyle;
2508} 2534}
2509 2535
2510/* ------------------------------------------------------------------------- */ 2536/* ------------------------------------------------------------------------- */
2511void 2537void
2512rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection () NOTHROW
2513{ 2539{
2514 if (selection.op 2540 if (selection.op
2515 && current_screen == selection.screen 2541 && current_screen == selection.screen
2516 && selection.end.row >= view_start) 2542 && selection.end.row >= view_start)
2517 { 2543 {
… …
2533 * Dump the whole scrollback and screen to the passed filedescriptor. The 2559 * Dump the whole scrollback and screen to the passed filedescriptor. The
2534 * invoking routine must close the fd. 2560 * invoking routine must close the fd.
2535 */ 2561 */
2536#if 0 2562#if 0
2537void 2563void
2538rxvt_term::scr_dump (int fd) 2564rxvt_term::scr_dump (int fd) NOTHROW
2539{ 2565{
2540 int row, wrote; 2566 int row, wrote;
2541 unsigned int width, towrite; 2567 unsigned int width, towrite;
2542 char r1[] = "\n"; 2568 char r1[] = "\n";
2543 2569
… …
2562 2588
2563/* ------------------------------------------------------------------------- * 2589/* ------------------------------------------------------------------------- *
2564 * CHARACTER SELECTION * 2590 * CHARACTER SELECTION *
2565 * ------------------------------------------------------------------------- */ 2591 * ------------------------------------------------------------------------- */
2566void 2592void
2567rxvt_term::selection_check (int check_more) 2593rxvt_term::selection_check (int check_more) NOTHROW
2568{ 2594{
2569 row_col_t pos; 2595 row_col_t pos;
2570 2596
2571 if (!selection.op) 2597 if (!selection.op)
2572 return; 2598 return;
… …
2593/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2594/* 2620/*
2595 * Paste a selection direct to the command fd 2621 * Paste a selection direct to the command fd
2596 */ 2622 */
2597void 2623void
2598rxvt_term::paste (char *data, unsigned int len) 2624rxvt_term::paste (char *data, unsigned int len) NOTHROW
2599{ 2625{
2600 /* convert normal newline chars into common keyboard Return key sequence */ 2626 /* convert normal newline chars into common keyboard Return key sequence */
2601 for (unsigned int i = 0; i < len; i++) 2627 for (unsigned int i = 0; i < len; i++)
2602 if (data[i] == C0_LF) 2628 if (data[i] == C0_LF)
2603 data[i] = C0_CR; 2629 data[i] = C0_CR;
… …
2609/* 2635/*
2610 * Respond to a notification that a primary selection has been sent 2636 * Respond to a notification that a primary selection has been sent
2611 * EXT: SelectionNotify 2637 * EXT: SelectionNotify
2612 */ 2638 */
2613void 2639void
2614rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2640rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2615{ 2641{
2616 if (prop == None) /* check for failed XConvertSelection */ 2642 if (prop == None) /* check for failed XConvertSelection */
2617 { 2643 {
2618 if ((selection_type & Sel_CompoundText)) 2644 if ((selection_type & Sel_CompoundText))
2619 { 2645 {
… …
2771 if (selection_wait == Sel_normal) 2797 if (selection_wait == Sel_normal)
2772 selection_wait = Sel_none; 2798 selection_wait = Sel_none;
2773} 2799}
2774 2800
2775void 2801void
2776rxvt_term::incr_cb (time_watcher &w) 2802rxvt_term::incr_cb (time_watcher &w) NOTHROW
2777{ 2803{
2778 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2779 2805
2780 incr_buf_size = 0; 2806 incr_buf_size = 0;
2781 free (incr_buf); 2807 free (incr_buf);
2782 2808
2783 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2809 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2784} 2810}
2785 2811
2786void 2812void
2787rxvt_term::selection_property (Window win, Atom prop) 2813rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2788{ 2814{
2789 if (prop == None || selection_wait != Sel_incr) 2815 if (prop == None || selection_wait != Sel_incr)
2790 return; 2816 return;
2791 2817
2792 selection_paste (win, prop, true); 2818 selection_paste (win, prop, true);
… …
2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2802 * will auto fallback to CUT_BUFFER0 2828 * will auto fallback to CUT_BUFFER0
2803 * EXT: button 2 release 2829 * EXT: button 2 release
2804 */ 2830 */
2805void 2831void
2806rxvt_term::selection_request (Time tm) 2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2807{ 2833{
2808 if (selection.text) 2834 if (selection.text && selnum == Sel_Primary)
2809 { /* internal selection */ 2835 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2836 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2837 paste (str, strlen (str));
2812 free (str); 2838 free (str);
2813 return; 2839 return;
2814 } 2840 }
2815 else 2841 else
2816 { 2842 {
2817 int i;
2818
2819 selection_request_time = tm; 2843 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2844 selection_wait = Sel_normal;
2821 2845
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2846#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2847 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2848 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2849 return;
2828#else 2850#else
2829 selection_type = Sel_CompoundText; 2851 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2853 return;
2832#endif 2854#endif
2833 }
2834 } 2855 }
2835 2856
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2857 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2858 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2859}
2839 2860
2840int 2861int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2862rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2863{
2843 Atom sel; 2864 Atom sel;
2844 2865
2845 selection_type |= selnum; 2866 selection_type |= selnum;
2846 2867
… …
2865/* 2886/*
2866 * Clear all selected text 2887 * Clear all selected text
2867 * EXT: SelectionClear 2888 * EXT: SelectionClear
2868 */ 2889 */
2869void 2890void
2870rxvt_term::selection_clear () 2891rxvt_term::selection_clear () NOTHROW
2871{ 2892{
2872 want_refresh = 1; 2893 want_refresh = 1;
2873 free (selection.text); 2894 free (selection.text);
2874 selection.text = NULL; 2895 selection.text = NULL;
2875 selection.len = 0; 2896 selection.len = 0;
… …
3010 3031
3011 selection_grab (tm); 3032 selection_grab (tm);
3012} 3033}
3013 3034
3014bool 3035bool
3015rxvt_term::selection_grab (Time tm) 3036rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3037{
3017 selection_time = tm; 3038 selection_time = tm;
3018 3039
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
… …
3043/* 3064/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3065 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3066 * EXT: button 1 press
3046 */ 3067 */
3047void 3068void
3048rxvt_term::selection_click (int clicks, int x, int y) 3069rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3070{
3050 clicks = ((clicks - 1) % 3) + 1; 3071 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3072 selection.clicks = clicks; /* save clicks so extend will work */
3052 3073
3053 if (clicks == 2 && !selection.rect 3074 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 3093/* ------------------------------------------------------------------------- */
3073/* 3094/*
3074 * Mark a selection at the specified col/row 3095 * Mark a selection at the specified col/row
3075 */ 3096 */
3076void 3097void
3077rxvt_term::selection_start_colrow (int col, int row) 3098rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 3099{
3079 want_refresh = 1; 3100 want_refresh = 1;
3080 3101
3081 selection.mark.row = row + view_start; 3102 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3103 selection.mark.col = col;
… …
3108#define DELIMIT_TEXT(x) \ 3129#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3130 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3131#define DELIMIT_REND(x) 1
3111 3132
3112void 3133void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3134rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3135{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3136 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3137 row_col_t bound;
3117 text_t *stp; 3138 text_t *stp;
3118 rend_t *srp; 3139 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3213 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3214 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3215 * flag == 2 ==> button 3 motion
3195 */ 3216 */
3196void 3217void
3197rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3219{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3220 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3221 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3222
3202 /* 3223 /*
… …
3228/* ------------------------------------------------------------------------- */ 3249/* ------------------------------------------------------------------------- */
3229/* 3250/*
3230 * Extend the selection to the specified col/row 3251 * Extend the selection to the specified col/row
3231 */ 3252 */
3232void 3253void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3254rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3255{
3235 row_col_t pos; 3256 row_col_t pos;
3236 enum { 3257 enum {
3237 LEFT, RIGHT 3258 LEFT, RIGHT
3238 } closeto = RIGHT; 3259 } closeto = RIGHT;
… …
3424#endif 3445#endif
3425} 3446}
3426 3447
3427#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3428void 3449void
3429rxvt_term::selection_remove_trailing_spaces () 3450rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3451{
3431 int32_t end_col, end_row; 3452 int32_t end_col, end_row;
3432 text_t *stp; 3453 text_t *stp;
3433 3454
3434 end_col = selection.end.col; 3455 end_col = selection.end.col;
… …
3472/* 3493/*
3473 * Double click on button 3 when already selected 3494 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3495 * EXT: button 3 double click
3475 */ 3496 */
3476void 3497void
3477rxvt_term::selection_rotate (int x, int y) 3498rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3499{
3479 selection.clicks = selection.clicks % 3 + 1; 3500 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3501 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3502}
3482 3503
… …
3484/* 3505/*
3485 * Respond to a request for our current selection 3506 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3507 * EXT: SelectionRequest
3487 */ 3508 */
3488void 3509void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3511{
3491 XSelectionEvent ev; 3512 XSelectionEvent ev;
3492 dDisp; 3513 dDisp;
3493 3514
3494 ev.type = SelectionNotify; 3515 ev.type = SelectionNotify;
… …
3622 3643
3623/* 3644/*
3624 * return col/row values corresponding to x/y pixel values 3645 * return col/row values corresponding to x/y pixel values
3625 */ 3646 */
3626void 3647void
3627rxvt_term::pixel_position (int *x, int *y) 3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3628{ 3649{
3629 *x = Pixel2Col (*x); 3650 *x = Pixel2Col (*x);
3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3631 *y = Pixel2Row (*y); 3652 *y = Pixel2Row (*y);
3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3633} 3654}
3634 3655
3635/* ------------------------------------------------------------------------- */ 3656/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3657#ifdef USE_XIM
3637void 3658void
3638rxvt_term::im_set_position (XPoint &pos) 3659rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3660{
3640 XWindowAttributes xwa; 3661 XWindowAttributes xwa;
3641 3662
3642 XGetWindowAttributes (display->display, vt, &xwa); 3663 XGetWindowAttributes (display->display, vt, &xwa);
3643 3664
… …
3646} 3667}
3647#endif 3668#endif
3648 3669
3649#if ENABLE_OVERLAY 3670#if ENABLE_OVERLAY
3650void 3671void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3672rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3673{
3653 if (nrow < 1 || ncol < 1) 3674 if (nrow < 1 || ncol < 1)
3654 return; 3675 return;
3655 3676
3656 want_refresh = 1; 3677 want_refresh = 1;
… …
3701 *rp = r; 3722 *rp = r;
3702 } 3723 }
3703} 3724}
3704 3725
3705void 3726void
3706rxvt_term::scr_overlay_off () 3727rxvt_term::scr_overlay_off () NOTHROW
3707{ 3728{
3708 if (!ov_text) 3729 if (!ov_text)
3709 return; 3730 return;
3710 3731
3711 want_refresh = 1; 3732 want_refresh = 1;
… …
3719 delete [] ov_text; ov_text = 0; 3740 delete [] ov_text; ov_text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3741 delete [] ov_rend; ov_rend = 0;
3721} 3742}
3722 3743
3723void 3744void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3746{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727 return; 3748 return;
3728 3749
3729 x++, y++; 3750 x++, y++;
… …
3731 ov_text[y][x] = text; 3752 ov_text[y][x] = text;
3732 ov_rend[y][x] = rend; 3753 ov_rend[y][x] = rend;
3733} 3754}
3734 3755
3735void 3756void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3758{
3738 while (*s) 3759 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3760 scr_overlay_set (x++, y, *s++);
3740} 3761}
3741 3762
3742void 3763void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3765{
3745 while (*s) 3766 while (*s)
3746 { 3767 {
3747 text_t t = *s++; 3768 text_t t = *s++;
3748 int width = wcwidth (t); 3769 int width = wcwidth (t);
… …
3754 } 3775 }
3755 } 3776 }
3756} 3777}
3757 3778
3758void 3779void
3759rxvt_term::scr_swap_overlay () 3780rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3781{
3761 if (!ov_text) 3782 if (!ov_text)
3762 return; 3783 return;
3763 3784
3764 // swap screen mem with overlay 3785 // swap screen mem with overlay

Diff Legend

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