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

Diff Legend

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