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.243 by ayin, Thu Jan 19 23:15:21 2006 UTC vs.
Revision 1.247 by root, Sun Jan 22 20:39:47 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 (cursor_mode 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;
… …
997/* 1006/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1000 */ 1009 */
1001void 1010void
1002rxvt_term::scr_backspace () 1011rxvt_term::scr_backspace () NOTHROW
1003{ 1012{
1004 want_refresh = 1; 1013 want_refresh = 1;
1005 1014
1006 if (screen.cur.col == 0) 1015 if (screen.cur.col == 0)
1007 { 1016 {
… …
1025 * Process Horizontal Tab 1034 * Process Horizontal Tab
1026 * count: +ve = forward; -ve = backwards 1035 * count: +ve = forward; -ve = backwards
1027 * XTERM_SEQ: CTRL-I 1036 * XTERM_SEQ: CTRL-I
1028 */ 1037 */
1029void 1038void
1030rxvt_term::scr_tab (int count, bool ht) 1039rxvt_term::scr_tab (int count, bool ht) NOTHROW
1031{ 1040{
1032 int i, x; 1041 int i, x;
1033 1042
1034 want_refresh = 1; 1043 want_refresh = 1;
1035 i = x = screen.cur.col; 1044 i = x = screen.cur.col;
… …
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1111 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1112 * in that row right. Clear left column.
1104 */ 1113 */
1105#if ENABLE_FRILLS 1114#if ENABLE_FRILLS
1106void 1115void
1107rxvt_term::scr_backindex () 1116rxvt_term::scr_backindex () NOTHROW
1108{ 1117{
1109 if (screen.cur.col > 0) 1118 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1111 else 1120 else
1112 scr_insdel_chars (1, INSERT); 1121 scr_insdel_chars (1, INSERT);
… …
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1128 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1129 * in that row left. Clear right column.
1121 */ 1130 */
1122#if ENABLE_FRILLS 1131#if ENABLE_FRILLS
1123void 1132void
1124rxvt_term::scr_forwardindex () 1133rxvt_term::scr_forwardindex () NOTHROW
1125{ 1134{
1126 if (screen.cur.col < ncol - 1) 1135 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1128 else 1137 else
1129 { 1138 {
… …
1142/* ------------------------------------------------------------------------- */ 1151/* ------------------------------------------------------------------------- */
1143/* 1152/*
1144 * Goto Row/Column 1153 * Goto Row/Column
1145 */ 1154 */
1146void 1155void
1147rxvt_term::scr_gotorc (int row, int col, int relative) 1156rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1148{ 1157{
1149 want_refresh = 1; 1158 want_refresh = 1;
1150 ZERO_SCROLLBACK (); 1159 ZERO_SCROLLBACK ();
1151 1160
1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1161 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1190/* ------------------------------------------------------------------------- */ 1199/* ------------------------------------------------------------------------- */
1191/* 1200/*
1192 * direction should be UP or DN 1201 * direction should be UP or DN
1193 */ 1202 */
1194void 1203void
1195rxvt_term::scr_index (enum page_dirn direction) 1204rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1196{ 1205{
1197 int dirn; 1206 int dirn;
1198 1207
1199 want_refresh = 1; 1208 want_refresh = 1;
1200 ZERO_SCROLLBACK (); 1209 ZERO_SCROLLBACK ();
… …
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1230 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1222 */ 1231 */
1223void 1232void
1224rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1234{
1226 unsigned int col, num; 1235 unsigned int col, num;
1227 1236
1228 want_refresh = 1; 1237 want_refresh = 1;
1229 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
… …
1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1282 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1283 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1284 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1276 */ 1285 */
1277void 1286void
1278rxvt_term::scr_erase_screen (int mode) 1287rxvt_term::scr_erase_screen (int mode) NOTHROW
1279{ 1288{
1280 int num; 1289 int num;
1281 int32_t row; 1290 int32_t row;
1282 rend_t ren; 1291 rend_t ren;
1283 XGCValues gcvalue; 1292 XGCValues gcvalue;
… …
1343 } 1352 }
1344} 1353}
1345 1354
1346#if ENABLE_FRILLS 1355#if ENABLE_FRILLS
1347void 1356void
1348rxvt_term::scr_erase_savelines () 1357rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1358{
1350 want_refresh = 1; 1359 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1352 1361
1353 top_row = 0; 1362 top_row = 0;
… …
1358/* 1367/*
1359 * Fill the screen with `E's 1368 * Fill the screen with `E's
1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1369 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1361 */ 1370 */
1362void 1371void
1363rxvt_term::scr_E () 1372rxvt_term::scr_E () NOTHROW
1364{ 1373{
1365 rend_t fs; 1374 rend_t fs;
1366 1375
1367 want_refresh = 1; 1376 want_refresh = 1;
1368 ZERO_SCROLLBACK (); 1377 ZERO_SCROLLBACK ();
… …
1389/* ------------------------------------------------------------------------- */ 1398/* ------------------------------------------------------------------------- */
1390/* 1399/*
1391 * Insert/Delete <count> lines 1400 * Insert/Delete <count> lines
1392 */ 1401 */
1393void 1402void
1394rxvt_term::scr_insdel_lines (int count, int insdel) 1403rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1395{ 1404{
1396 int end; 1405 int end;
1397 1406
1398 ZERO_SCROLLBACK (); 1407 ZERO_SCROLLBACK ();
1399 1408
… …
1419/* ------------------------------------------------------------------------- */ 1428/* ------------------------------------------------------------------------- */
1420/* 1429/*
1421 * Insert/Delete <count> characters from the current position 1430 * Insert/Delete <count> characters from the current position
1422 */ 1431 */
1423void 1432void
1424rxvt_term::scr_insdel_chars (int count, int insdel) 1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1434{
1426 int col, row; 1435 int col, row;
1427 rend_t tr; 1436 rend_t tr;
1428 1437
1429 want_refresh = 1; 1438 want_refresh = 1;
… …
1517/* 1526/*
1518 * Set the scrolling region 1527 * Set the scrolling region
1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1520 */ 1529 */
1521void 1530void
1522rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1523{ 1532{
1524 max_it (top, 0); 1533 max_it (top, 0);
1525 min_it (bot, nrow - 1); 1534 min_it (bot, nrow - 1);
1526 1535
1527 if (top > bot) 1536 if (top > bot)
… …
1537 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1540 */ 1549 */
1541void 1550void
1542rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1543{ 1552{
1544 want_refresh = 1; 1553 want_refresh = 1;
1545 1554
1546 if (mode) 1555 if (mode)
1547 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
… …
1554 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1557 */ 1566 */
1558void 1567void
1559rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1560{ 1569{
1561 if (mode) 1570 if (mode)
1562 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1563 else 1572 else
1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1573 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1576 */ 1585 */
1577void 1586void
1578rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1579{ 1588{
1580 if (mode) 1589 if (mode)
1581 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1582 else 1591 else
1583 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
… …
1590 * Set insert/replace mode 1599 * Set insert/replace mode
1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1593 */ 1602 */
1594void 1603void
1595rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1596{ 1605{
1597 if (mode) 1606 if (mode)
1598 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1599 else 1608 else
1600 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
… …
1606 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1609 */ 1618 */
1610void 1619void
1611rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1621{
1613 if (mode < 0) 1622 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol * sizeof (char));
1615 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
… …
1621 * Set reverse/normal video 1630 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1633 */
1625void 1634void
1626rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1636{
1628 XGCValues gcvalue; 1637 rvideo_mode = on;
1629 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1630 if (rvideo != mode) 1643 if (rvideo_state != on)
1631 { 1644 {
1632 rvideo = mode; 1645 rvideo_state = on;
1646
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1648#if XPM_BACKGROUND
1635 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1636#endif 1650#endif
1637#if TRANSPARENT 1651#if TRANSPARENT
1638 if (! OPTION (Opt_transparent) || am_transparent == 0) 1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1639#endif 1653#endif
1640 XSetWindowBackground (display->display, vt, 1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1641 pix_colors[Color_bg]);
1642 1655
1656 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1660
1647 scr_clear (); 1661 scr_clear ();
1648 scr_touch (true); 1662 scr_touch (true);
1649 } 1663 }
1650} 1664}
1651 1665
… …
1653/* 1667/*
1654 * Report current cursor position 1668 * Report current cursor position
1655 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1656 */ 1670 */
1657void 1671void
1658rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1659{ 1673{
1660 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1661} 1675}
1662 1676
1663/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
… …
1666 1680
1667/* 1681/*
1668 * Set font style 1682 * Set font style
1669 */ 1683 */
1670void 1684void
1671rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1672{ 1686{
1673#if 0 1687#if 0
1674 switch (charsets [screen.charset]) 1688 switch (charsets [screen.charset])
1675 { 1689 {
1676 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
… …
1698 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1699 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1700 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1701 */ 1715 */
1702void 1716void
1703rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1704{ 1718{
1705 screen.charset = set; 1719 screen.charset = set;
1706 set_font_style (); 1720 set_font_style ();
1707} 1721}
1708 1722
… …
1714 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1715 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1716 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1717 */ 1731 */
1718void 1732void
1719rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1720{ 1734{
1721 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1722 set_font_style (); 1736 set_font_style ();
1723} 1737}
1724 1738
… …
1729 1743
1730/* 1744/*
1731 * refresh matching text. 1745 * refresh matching text.
1732 */ 1746 */
1733bool 1747bool
1734rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1735{ 1749{
1736 bool found = false; 1750 bool found = false;
1737 1751
1738 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1739 { 1753 {
… …
1759 PART_END, 1773 PART_END,
1760 RC_COUNT 1774 RC_COUNT
1761}; 1775};
1762 1776
1763void 1777void
1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1778rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1765{ 1779{
1766 int i; 1780 int i;
1767 row_col_t rc[RC_COUNT]; 1781 row_col_t rc[RC_COUNT];
1768 1782
1769 if (!drawn_buf) /* sanity check */ 1783 if (!drawn_buf) /* sanity check */
… …
1803/* ------------------------------------------------------------------------- */ 1817/* ------------------------------------------------------------------------- */
1804/* 1818/*
1805 * Refresh the entire screen 1819 * Refresh the entire screen
1806 */ 1820 */
1807void 1821void
1808rxvt_term::scr_touch (bool refresh) 1822rxvt_term::scr_touch (bool refresh) NOTHROW
1809{ 1823{
1810 scr_expose (0, 0, width, height, refresh); 1824 scr_expose (0, 0, width, height, refresh);
1811} 1825}
1812 1826
1813/* ------------------------------------------------------------------------- */ 1827/* ------------------------------------------------------------------------- */
1814/* 1828/*
1815 * Move the display so that the line represented by scrollbar value Y is at 1829 * Move the display so that the line represented by scrollbar value Y is at
1816 * the top of the screen 1830 * the top of the screen
1817 */ 1831 */
1818void 1832void
1819rxvt_term::scr_move_to (int y, int len) 1833rxvt_term::scr_move_to (int y, int len) NOTHROW
1820{ 1834{
1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1835 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1822} 1836}
1823 1837
1824/* ------------------------------------------------------------------------- */ 1838/* ------------------------------------------------------------------------- */
1825/* 1839/*
1826 * Page the screen up/down nlines 1840 * Page the screen up/down nlines
1827 * direction should be UP or DN 1841 * direction should be UP or DN
1828 */ 1842 */
1829bool 1843bool
1830rxvt_term::scr_page (enum page_dirn direction, int nlines) 1844rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1831{ 1845{
1832 int new_view_start = 1846 int new_view_start =
1833 direction == UP ? view_start - nlines 1847 direction == UP ? view_start - nlines
1834 : view_start + nlines; 1848 : view_start + nlines;
1835 1849
1836 return scr_changeview (new_view_start); 1850 return scr_changeview (new_view_start);
1837} 1851}
1838 1852
1839bool 1853bool
1840rxvt_term::scr_changeview (int new_view_start) 1854rxvt_term::scr_changeview (int new_view_start) NOTHROW
1841{ 1855{
1842 clamp_it (new_view_start, top_row, 0); 1856 clamp_it (new_view_start, top_row, 0);
1843 1857
1844 if (new_view_start == view_start) 1858 if (new_view_start == view_start)
1845 return false; 1859 return false;
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1866
1853 return true; 1867 return true;
1854} 1868}
1855 1869
1856/* ------------------------------------------------------------------------- */ 1870#ifndef NO_BELL
1857void 1871void
1872rxvt_term::bell_cb (time_watcher &w)
1873{
1874 rvideo_bell = false;
1875 scr_rvideo_mode (rvideo_mode);
1876}
1877#endif
1878
1879/* ------------------------------------------------------------------------- */
1880void
1858rxvt_term::scr_bell () 1881rxvt_term::scr_bell () NOTHROW
1859{ 1882{
1860#ifndef NO_BELL 1883#ifndef NO_BELL
1861 1884
1862# ifndef NO_MAPALERT 1885# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1886# ifdef MAPALERT_OPTION
… …
1866 XMapWindow (display->display, parent[0]); 1889 XMapWindow (display->display, parent[0]);
1867# endif 1890# endif
1868 1891
1869 if (OPTION (Opt_visualBell)) 1892 if (OPTION (Opt_visualBell))
1870 { 1893 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1894 rvideo_bell = true;
1895 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1896 display->flush ();
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1897
1874 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1875 } 1899 }
1876 else 1900 else
1877 XBell (display->display, 0); 1901 XBell (display->display, 0);
1878 1902
1879#endif 1903#endif
1880} 1904}
1881 1905
1882/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1907/* ARGSUSED */
1884void 1908void
1885rxvt_term::scr_printscreen (int fullhist) 1909rxvt_term::scr_printscreen (int fullhist) NOTHROW
1886{ 1910{
1887#ifdef PRINTPIPE 1911#ifdef PRINTPIPE
1888 int nrows, row_start; 1912 int nrows, row_start;
1889 FILE *fd; 1913 FILE *fd;
1890 1914
… …
1939 * Refresh the screen 1963 * Refresh the screen
1940 * drawn_text/drawn_rend contain the screen information before the update. 1964 * drawn_text/drawn_rend contain the screen information before the update.
1941 * screen.text/screen.rend contain what the screen will change to. 1965 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1966 */
1943void 1967void
1944rxvt_term::scr_refresh () 1968rxvt_term::scr_refresh () NOTHROW
1945{ 1969{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1970 unsigned char must_clear, /* use draw_string not draw_image_string */
1947 showcursor; /* show the cursor */ 1971 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1972 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1973 ocrow; /* old cursor row */
… …
2390 num_scr = 0; 2414 num_scr = 0;
2391 num_scr_allow = 1; 2415 num_scr_allow = 1;
2392} 2416}
2393 2417
2394void 2418void
2395rxvt_term::scr_remap_chars (line_t &l) 2419rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2396{ 2420{
2397 if (!l.t) 2421 if (!l.t)
2398 return; 2422 return;
2399 2423
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2424 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2402 for (int i = ncol; i--; ) 2426 for (int i = ncol; i--; )
2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2427 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2404} 2428}
2405 2429
2406void 2430void
2407rxvt_term::scr_remap_chars () 2431rxvt_term::scr_remap_chars () NOTHROW
2408{ 2432{
2409 for (int i = total_rows; i--; ) 2433 for (int i = total_rows; i--; )
2410 scr_remap_chars (row_buf [i]); 2434 scr_remap_chars (row_buf [i]);
2411 2435
2412 for (int i = nrow; i--; ) 2436 for (int i = nrow; i--; )
… …
2415 scr_remap_chars (swap_buf [i]); 2439 scr_remap_chars (swap_buf [i]);
2416 } 2440 }
2417} 2441}
2418 2442
2419void 2443void
2420rxvt_term::scr_recolour () 2444rxvt_term::scr_recolour () NOTHROW
2421{ 2445{
2422 if (1 2446 if (1
2423#if TRANSPARENT 2447#if TRANSPARENT
2424 && !am_transparent 2448 && !am_transparent
2425#endif 2449#endif
… …
2446 want_refresh = 1; 2470 want_refresh = 1;
2447} 2471}
2448 2472
2449/* ------------------------------------------------------------------------- */ 2473/* ------------------------------------------------------------------------- */
2450void 2474void
2451rxvt_term::scr_clear (bool really) 2475rxvt_term::scr_clear (bool really) NOTHROW
2452{ 2476{
2453 if (!mapped) 2477 if (!mapped)
2454 return; 2478 return;
2455 2479
2456 num_scr_allow = 0; 2480 num_scr_allow = 0;
… …
2459 if (really) 2483 if (really)
2460 XClearWindow (display->display, vt); 2484 XClearWindow (display->display, vt);
2461} 2485}
2462 2486
2463void 2487void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2489{
2466 int view_end = view_start + nrow; 2490 int view_end = view_start + nrow;
2467 int row, col; 2491 int row, col;
2468 2492
2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2493 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2481 srp[col] ^= rstyle2; 2505 srp[col] ^= rstyle2;
2482 } 2506 }
2483} 2507}
2484 2508
2485void 2509void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2510rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2487{ 2511{
2488 int view_end = view_start + nrow; 2512 int view_end = view_start + nrow;
2489 int row, col; 2513 int row, col;
2490 2514
2491 if (beg_row >= view_start) 2515 if (beg_row >= view_start)
… …
2508 srp[col] ^= rstyle; 2532 srp[col] ^= rstyle;
2509} 2533}
2510 2534
2511/* ------------------------------------------------------------------------- */ 2535/* ------------------------------------------------------------------------- */
2512void 2536void
2513rxvt_term::scr_reverse_selection () 2537rxvt_term::scr_reverse_selection () NOTHROW
2514{ 2538{
2515 if (selection.op 2539 if (selection.op
2516 && current_screen == selection.screen 2540 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2541 && selection.end.row >= view_start)
2518 { 2542 {
… …
2534 * Dump the whole scrollback and screen to the passed filedescriptor. The 2558 * Dump the whole scrollback and screen to the passed filedescriptor. The
2535 * invoking routine must close the fd. 2559 * invoking routine must close the fd.
2536 */ 2560 */
2537#if 0 2561#if 0
2538void 2562void
2539rxvt_term::scr_dump (int fd) 2563rxvt_term::scr_dump (int fd) NOTHROW
2540{ 2564{
2541 int row, wrote; 2565 int row, wrote;
2542 unsigned int width, towrite; 2566 unsigned int width, towrite;
2543 char r1[] = "\n"; 2567 char r1[] = "\n";
2544 2568
… …
2563 2587
2564/* ------------------------------------------------------------------------- * 2588/* ------------------------------------------------------------------------- *
2565 * CHARACTER SELECTION * 2589 * CHARACTER SELECTION *
2566 * ------------------------------------------------------------------------- */ 2590 * ------------------------------------------------------------------------- */
2567void 2591void
2568rxvt_term::selection_check (int check_more) 2592rxvt_term::selection_check (int check_more) NOTHROW
2569{ 2593{
2570 row_col_t pos; 2594 row_col_t pos;
2571 2595
2572 if (!selection.op) 2596 if (!selection.op)
2573 return; 2597 return;
… …
2594/* ------------------------------------------------------------------------- */ 2618/* ------------------------------------------------------------------------- */
2595/* 2619/*
2596 * Paste a selection direct to the command fd 2620 * Paste a selection direct to the command fd
2597 */ 2621 */
2598void 2622void
2599rxvt_term::paste (char *data, unsigned int len) 2623rxvt_term::paste (char *data, unsigned int len) NOTHROW
2600{ 2624{
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2625 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2626 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2627 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2628 data[i] = C0_CR;
… …
2610/* 2634/*
2611 * Respond to a notification that a primary selection has been sent 2635 * Respond to a notification that a primary selection has been sent
2612 * EXT: SelectionNotify 2636 * EXT: SelectionNotify
2613 */ 2637 */
2614void 2638void
2615rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2639rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2616{ 2640{
2617 if (prop == None) /* check for failed XConvertSelection */ 2641 if (prop == None) /* check for failed XConvertSelection */
2618 { 2642 {
2619 if ((selection_type & Sel_CompoundText)) 2643 if ((selection_type & Sel_CompoundText))
2620 { 2644 {
… …
2772 if (selection_wait == Sel_normal) 2796 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2797 selection_wait = Sel_none;
2774} 2798}
2775 2799
2776void 2800void
2777rxvt_term::incr_cb (time_watcher &w) 2801rxvt_term::incr_cb (time_watcher &w) NOTHROW
2778{ 2802{
2779 selection_wait = Sel_none; 2803 selection_wait = Sel_none;
2780 2804
2781 incr_buf_size = 0; 2805 incr_buf_size = 0;
2782 free (incr_buf); 2806 free (incr_buf);
2783 2807
2784 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2808 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2785} 2809}
2786 2810
2787void 2811void
2788rxvt_term::selection_property (Window win, Atom prop) 2812rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2789{ 2813{
2790 if (prop == None || selection_wait != Sel_incr) 2814 if (prop == None || selection_wait != Sel_incr)
2791 return; 2815 return;
2792 2816
2793 selection_paste (win, prop, true); 2817 selection_paste (win, prop, true);
… …
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2827 * will auto fallback to CUT_BUFFER0
2804 * EXT: button 2 release 2828 * EXT: button 2 release
2805 */ 2829 */
2806void 2830void
2807rxvt_term::selection_request (Time tm, int selnum) 2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2832{
2809/* After making a selection with selection_make this function will always 2833 if (selection.text && selnum == Sel_Primary)
2810 * return the internal selection, which is not correct IMO, now much more since
2811 * I added the selnum parameter.
2812 */
2813#if 0
2814 if (selection.text)
2815 { /* internal selection */ 2834 { /* internal selection */
2816 char *str = rxvt_wcstombs (selection.text, selection.len); 2835 char *str = rxvt_wcstombs (selection.text, selection.len);
2817 paste (str, strlen (str)); 2836 paste (str, strlen (str));
2818 free (str); 2837 free (str);
2819 return; 2838 return;
2820 } 2839 }
2821 else 2840 else
2822#endif
2823 { 2841 {
2824 selection_request_time = tm; 2842 selection_request_time = tm;
2825 selection_wait = Sel_normal; 2843 selection_wait = Sel_normal;
2826 2844
2827#if X_HAVE_UTF8_STRING 2845#if X_HAVE_UTF8_STRING
… …
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2856 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2857 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2858}
2841 2859
2842int 2860int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2861rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2862{
2845 Atom sel; 2863 Atom sel;
2846 2864
2847 selection_type |= selnum; 2865 selection_type |= selnum;
2848 2866
… …
2867/* 2885/*
2868 * Clear all selected text 2886 * Clear all selected text
2869 * EXT: SelectionClear 2887 * EXT: SelectionClear
2870 */ 2888 */
2871void 2889void
2872rxvt_term::selection_clear () 2890rxvt_term::selection_clear () NOTHROW
2873{ 2891{
2874 want_refresh = 1; 2892 want_refresh = 1;
2875 free (selection.text); 2893 free (selection.text);
2876 selection.text = NULL; 2894 selection.text = NULL;
2877 selection.len = 0; 2895 selection.len = 0;
… …
3012 3030
3013 selection_grab (tm); 3031 selection_grab (tm);
3014} 3032}
3015 3033
3016bool 3034bool
3017rxvt_term::selection_grab (Time tm) 3035rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3036{
3019 selection_time = tm; 3037 selection_time = tm;
3020 3038
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
… …
3045/* 3063/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3064 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3065 * EXT: button 1 press
3048 */ 3066 */
3049void 3067void
3050rxvt_term::selection_click (int clicks, int x, int y) 3068rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3069{
3052 clicks = ((clicks - 1) % 3) + 1; 3070 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3071 selection.clicks = clicks; /* save clicks so extend will work */
3054 3072
3055 if (clicks == 2 && !selection.rect 3073 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3092/* ------------------------------------------------------------------------- */
3075/* 3093/*
3076 * Mark a selection at the specified col/row 3094 * Mark a selection at the specified col/row
3077 */ 3095 */
3078void 3096void
3079rxvt_term::selection_start_colrow (int col, int row) 3097rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3098{
3081 want_refresh = 1; 3099 want_refresh = 1;
3082 3100
3083 selection.mark.row = row + view_start; 3101 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3102 selection.mark.col = col;
… …
3110#define DELIMIT_TEXT(x) \ 3128#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3129 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3130#define DELIMIT_REND(x) 1
3113 3131
3114void 3132void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3133rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3134{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3135 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3136 row_col_t bound;
3119 text_t *stp; 3137 text_t *stp;
3120 rend_t *srp; 3138 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3212 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3213 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3214 * flag == 2 ==> button 3 motion
3197 */ 3215 */
3198void 3216void
3199rxvt_term::selection_extend (int x, int y, int flag) 3217rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3218{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3219 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3220 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3221
3204 /* 3222 /*
… …
3230/* ------------------------------------------------------------------------- */ 3248/* ------------------------------------------------------------------------- */
3231/* 3249/*
3232 * Extend the selection to the specified col/row 3250 * Extend the selection to the specified col/row
3233 */ 3251 */
3234void 3252void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3253rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3254{
3237 row_col_t pos; 3255 row_col_t pos;
3238 enum { 3256 enum {
3239 LEFT, RIGHT 3257 LEFT, RIGHT
3240 } closeto = RIGHT; 3258 } closeto = RIGHT;
… …
3426#endif 3444#endif
3427} 3445}
3428 3446
3429#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3430void 3448void
3431rxvt_term::selection_remove_trailing_spaces () 3449rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3450{
3433 int32_t end_col, end_row; 3451 int32_t end_col, end_row;
3434 text_t *stp; 3452 text_t *stp;
3435 3453
3436 end_col = selection.end.col; 3454 end_col = selection.end.col;
… …
3474/* 3492/*
3475 * Double click on button 3 when already selected 3493 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3494 * EXT: button 3 double click
3477 */ 3495 */
3478void 3496void
3479rxvt_term::selection_rotate (int x, int y) 3497rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3498{
3481 selection.clicks = selection.clicks % 3 + 1; 3499 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3500 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3501}
3484 3502
… …
3486/* 3504/*
3487 * Respond to a request for our current selection 3505 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3506 * EXT: SelectionRequest
3489 */ 3507 */
3490void 3508void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3510{
3493 XSelectionEvent ev; 3511 XSelectionEvent ev;
3494 dDisp; 3512 dDisp;
3495 3513
3496 ev.type = SelectionNotify; 3514 ev.type = SelectionNotify;
… …
3624 3642
3625/* 3643/*
3626 * return col/row values corresponding to x/y pixel values 3644 * return col/row values corresponding to x/y pixel values
3627 */ 3645 */
3628void 3646void
3629rxvt_term::pixel_position (int *x, int *y) 3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630{ 3648{
3631 *x = Pixel2Col (*x); 3649 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y); 3651 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3653}
3636 3654
3637/* ------------------------------------------------------------------------- */ 3655/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3656#ifdef USE_XIM
3639void 3657void
3640rxvt_term::im_set_position (XPoint &pos) 3658rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3659{
3642 XWindowAttributes xwa; 3660 XWindowAttributes xwa;
3643 3661
3644 XGetWindowAttributes (display->display, vt, &xwa); 3662 XGetWindowAttributes (display->display, vt, &xwa);
3645 3663
… …
3648} 3666}
3649#endif 3667#endif
3650 3668
3651#if ENABLE_OVERLAY 3669#if ENABLE_OVERLAY
3652void 3670void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3671rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3672{
3655 if (nrow < 1 || ncol < 1) 3673 if (nrow < 1 || ncol < 1)
3656 return; 3674 return;
3657 3675
3658 want_refresh = 1; 3676 want_refresh = 1;
… …
3703 *rp = r; 3721 *rp = r;
3704 } 3722 }
3705} 3723}
3706 3724
3707void 3725void
3708rxvt_term::scr_overlay_off () 3726rxvt_term::scr_overlay_off () NOTHROW
3709{ 3727{
3710 if (!ov_text) 3728 if (!ov_text)
3711 return; 3729 return;
3712 3730
3713 want_refresh = 1; 3731 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3739 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3740 delete [] ov_rend; ov_rend = 0;
3723} 3741}
3724 3742
3725void 3743void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3744rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3745{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3746 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3747 return;
3730 3748
3731 x++, y++; 3749 x++, y++;
… …
3733 ov_text[y][x] = text; 3751 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3752 ov_rend[y][x] = rend;
3735} 3753}
3736 3754
3737void 3755void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3756rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3757{
3740 while (*s) 3758 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3759 scr_overlay_set (x++, y, *s++);
3742} 3760}
3743 3761
3744void 3762void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3764{
3747 while (*s) 3765 while (*s)
3748 { 3766 {
3749 text_t t = *s++; 3767 text_t t = *s++;
3750 int width = wcwidth (t); 3768 int width = wcwidth (t);
… …
3756 } 3774 }
3757 } 3775 }
3758} 3776}
3759 3777
3760void 3778void
3761rxvt_term::scr_swap_overlay () 3779rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3780{
3763 if (!ov_text) 3781 if (!ov_text)
3764 return; 3782 return;
3765 3783
3766 // swap screen mem with overlay 3784 // swap screen mem with overlay

Diff Legend

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