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

Diff Legend

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