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.203 by root, Sat Dec 31 19:30:25 2005 UTC vs.
Revision 1.257 by root, Tue Jan 31 00:25:16 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
92 */ 93 */
93#define drawBuffer vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
128 efs &= ~RS_baseattrMask; 129 l.touch ();
130
131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
133 136
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* 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 */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
167 nrow = 24; 173 nrow = 24;
168 174
169 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 176 return;
171 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
172 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
174 { 183 {
175 //TODO//FIXME 184 //TODO//FIXME
176 saveLines++; 185 saveLines++;
177 prev_nrow--; 186 prev_nrow--;
178 nsaved++; 187 top_row--;
179 } 188 }
180 189
181 want_refresh = 1; 190 want_refresh = 1;
182 191
183 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
188 197
189 if (!row_buf) 198 if (!row_buf)
190 { 199 {
191 /* 200 /*
192 * 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
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 202 */
195 nsaved = 0; /* no saved lines */ 203 top_row = 0;
196 term_start = 0; 204 term_start = 0;
197 205
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 208
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 212
206 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
207 { 214 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 237 selection.text = NULL;
231 selection.len = 0; 238 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
234 selection.clicks = 0; 241 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 243 }
238 else 244 else
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
254 } 260 }
255 } 261 }
256#endif 262#endif
257 263
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 266
262 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
263 { 268 {
264 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
269 { 274 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 277 }
273 278
279 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 281
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
279 285
280 if (nsaved) 286 if (top_row)
281 { 287 {
282 // 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
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 293
… …
289 { 295 {
290 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 299#endif
294
295 int plines = 1; 300 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 302
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 304 {
… …
317 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
319 { 324 {
320 qline = row_buf + qrow; 325 qline = row_buf + qrow;
321 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
322 qline->set_is_longer (); 328 qline->is_longer (1);
323 329
324 int qcol = 0; 330 int qcol = 0;
325 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
326 // fill a single destination line 336 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
328 { 338 {
329 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
340 350
341 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
342 352
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344 354
345 assert (len);
346 assert (pline.t);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350 357
351 lofs += len; 358 lofs += len;
352 qcol += len; 359 qcol += len;
353 } 360 }
354 } 361 }
355 362
356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 364 qline->is_longer (0);
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
363#endif
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 366 }
366 while (p != pend && q > 0); 367 while (p != pend && q > 0);
367 368
368 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
369 nsaved = term_start - q; 370 top_row = q - term_start;
370 371
371 // make sure all terminal lines exist 372 // make sure all terminal lines exist
372 while (nsaved < 0) 373 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374
375 } 375 }
376 else 376 else
377 { 377 {
378 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
379 379
… …
392 } 392 }
393 393
394 term_start = 0; 394 term_start = 0;
395 } 395 }
396 396
397#ifdef DEBUG_STRICT //TODO: remove
398 for (int i = -nsaved; i < nrow; i++)
399 assert (ROW (i).t);
400#endif
401
402 free (old_buf); 397 free (old_buf);
403 delete old_ta; 398 delete old_ta;
404 delete old_ra; 399 delete old_ra;
405 400
406 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
407 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
408 403
409 if (tabs)
410 free (tabs); 404 free (tabs);
411 } 405 }
406
407 CLEAR_ALL_SELECTION ();
412 408
413 prev_nrow = nrow; 409 prev_nrow = nrow;
414 prev_ncol = ncol; 410 prev_ncol = ncol;
415 411
416 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
417 413
418 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
420 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
421 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 423}
423 424
424/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
425/* 426/*
426 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
427 */ 428 */
428void 429void
429rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
430{ 431{
432 if (row_buf)
433 {
431 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
433 436
434 free (row_buf); 437 free (row_buf);
435 free (swap_buf); 438 free (swap_buf);
436 free (drawn_buf); 439 free (drawn_buf);
437 free (temp_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
… …
450 scr_release (); 453 scr_release ();
451 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
452 scr_reset (); 455 scr_reset ();
453 456
454 scr_clear (true); 457 scr_clear (true);
455 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
456} 459}
457 460
458/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
462 * Save and Restore cursor 465 * Save and Restore cursor
463 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
464 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
465 */ 468 */
466void 469void
467rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
468{ 471{
469 screen_t *s; 472 screen_t *s;
470 473
471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
472 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
504 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
506#endif 509#endif
507} 510}
508 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
509/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
510/* 528/*
511 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 532 */
515int 533void
516rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
517{ 535{
536 if (scrn == current_screen)
537 return;
538
518 want_refresh = 1; 539 want_refresh = 1;
519 view_start = 0; 540 view_start = 0;
520 541
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
525 543
526 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 545
534#if NSCREENS 546#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
536 { 548 {
537 num_scr = 0; 549 num_scr = 0;
538 550
539 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 552
542 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
546 } 557 }
547 else 558 else
548#endif 559#endif
549 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 562}
554 563
555// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
556void 565void
557rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
558{ 567{
559 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
560 return; 569 return;
561 570
562 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
572/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
573/* 582/*
574 * Change the colour for following text 583 * Change the colour for following text
575 */ 584 */
576void 585void
577rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
578{ 587{
579 if (color > 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)
583 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
584 else 593 else
… …
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;
616 num_scr += count; 625 num_scr += count;
617 626
618 if (count > 0 627 if (count > 0
619 && row1 == 0 628 && row1 == 0
620 && row2 == nrow - 1
621 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
622 { 630 {
623 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
625 635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
658 }
659
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any
626 if (selection.op && current_screen == selection.screen) 673 if (selection.op && current_screen == selection.screen)
627 { 674 {
628 selection.beg.row -= count; 675 selection.beg.row -= count;
629 selection.end.row -= count; 676 selection.end.row -= count;
630 selection.mark.row -= count; 677 selection.mark.row -= count;
631 678
632 if (selection.beg.row < -nsaved 679 if (selection.beg.row < top_row
633 || selection.end.row < -nsaved 680 || selection.end.row < top_row
634 || selection.mark.row < -nsaved) 681 || selection.mark.row < top_row)
635 { 682 {
636 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
638 } 685 }
639 } 686 }
640 687
641 for (int i = count; i--; ) 688 // finally move the view window, if desired
642 {
643 ROW(row2 - i).l = 0;
644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
646
647 if (OPTION (Opt_scrollWithBuffer) 689 if (OPTION (Opt_scrollWithBuffer)
648 && view_start != 0 690 && view_start != 0
649 && view_start != saveLines) 691 && view_start != -saveLines)
650 scr_page (UP, count); 692 scr_page (UP, count);
693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
651 } 696 }
652 else 697 else
653 { 698 {
654 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen)
655 { 700 {
… …
679 724
680 int rows = row2 - row1 + 1; 725 int rows = row2 - row1 + 1;
681 726
682 min_it (count, rows); 727 min_it (count, rows);
683 728
729 line_t *temp_buf = row_buf + total_rows;
730
684 for (int row = 0; row < rows; row++) 731 for (int row = 0; row < rows; row++)
685 { 732 {
686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
687 734
688 if (!IN_RANGE_EXC (row + count, 0, rows)) 735 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
699/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
700/* 747/*
701 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
702 */ 749 */
703void 750void
704rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
705{ 752{
706 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
707 return; 754 return;
708 755
709 unsigned char checksel; 756 unsigned char checksel;
710 unicode_t c; 757 unicode_t c;
711 int last_col; 758 int ncol = this->ncol;
712 const unicode_t *strend = str + len; 759 const wchar_t *strend = str + len;
713 760
714 want_refresh = 1; 761 want_refresh = 1;
715 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
716 last_col = ncol;
717 763
718 if (nlines > 0) 764 if (minlines > 0)
719 { 765 {
720 nlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
768
721 if (nlines > 0 769 if (minlines > 0
722 && screen.tscroll == 0 770 && screen.tscroll == 0
723 && screen.bscroll == (nrow - 1)) 771 && screen.bscroll == nrow - 1)
724 { 772 {
725 /* _at least_ this many lines need to be scrolled */ 773 /* _at least_ this many lines need to be scrolled */
726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
727 screen.cur.row -= nlines; 775 screen.cur.row -= minlines;
728 } 776 }
729 } 777 }
730 778
731#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
732 assert (screen.cur.col < last_col); 780 assert (screen.cur.col < ncol);
733 assert (screen.cur.row < nrow 781 assert (screen.cur.row < nrow
734 && screen.cur.row >= -nsaved); 782 && screen.cur.row >= top_row);
735#endif 783#endif
736 int row = screen.cur.row; 784 int row = screen.cur.row;
737 785
738 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
739 787
740 line_t *line = &ROW(row); 788 line_t *line = &ROW(row);
741 789
742 while (str < strend) 790 while (str < strend)
743 { 791 {
744 c = *str++; 792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
745 793
746 if (c < 0x20) 794 if (c < 0x20)
747 if (c == C0_LF) 795 if (c == C0_LF)
748 { 796 {
749 if (!line->is_longer ()) /* XXX: think about this */
750 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
751 798
752 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
753 800
754 if (screen.cur.row == screen.bscroll) 801 if (screen.cur.row == screen.bscroll)
755 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 802 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
759 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
760 continue; 807 continue;
761 } 808 }
762 else if (c == C0_CR) 809 else if (c == C0_CR)
763 { 810 {
764 if (!line->is_longer ()) /* XXX: think about this */
765 max_it (line->l, screen.cur.col); 811 max_it (line->l, screen.cur.col);
766 812
767 screen.flags &= ~Screen_WrapNext; 813 screen.flags &= ~Screen_WrapNext;
768 screen.cur.col = 0; 814 screen.cur.col = 0;
769 continue; 815 continue;
770 } 816 }
… …
787 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
788 } 834 }
789 835
790 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
791 { 837 {
792 line->set_is_longer ();
793
794 scr_do_wrap (); 838 scr_do_wrap ();
795 839
840 line->l = ncol;
841 line->is_longer (1);
842
796 row = screen.cur.row; 843 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
798 } 845 }
799 846
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 849 c = 0xfffd;
803 850
804 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
805 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
806 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
807 // locale. 854 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
809 856
810 if (charsets[screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 858 {
812 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 860 // 5f-7e standard vt100
814 // 40-5e rxvt extension for extra curses acs chars 861 // 40-5e rxvt extension for extra curses acs chars
815 static uint16_t vt100_0[62] = { // 41 .. 7e 862 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
867 } 914 }
868 915
869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870 917
871 // if the character doesn't fit into the remaining columns... 918 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > last_col - width && last_col >= width) 919 if (screen.cur.col > ncol - width && ncol >= width)
873 { 920 {
874 // ...output spaces 921 // ...output spaces
875 c = ' '; 922 c = ' ';
876 // and try the same character next loop iteration 923 // and try the same character next loop iteration
877 --str; 924 --str;
878 } 925 }
879 926
927 line->touch ();
928
880 do 929 do
881 { 930 {
882 line->t[screen.cur.col] = c; 931 line->t[screen.cur.col] = c;
883 line->r[screen.cur.col] = rend; 932 line->r[screen.cur.col] = rend;
884 933
885 if (screen.cur.col < last_col - 1) 934 if (screen.cur.col < ncol - 1)
886 screen.cur.col++; 935 screen.cur.col++;
887 else 936 else
888 { 937 {
889 line->l = last_col; 938 line->l = ncol;
890 if (screen.flags & Screen_Autowrap) 939 if (screen.flags & Screen_Autowrap)
891 screen.flags |= Screen_WrapNext; 940 screen.flags |= Screen_WrapNext;
892 break; 941 break;
893 } 942 }
894 943
… …
896 } 945 }
897 while (--width > 0); 946 while (--width > 0);
898 947
899 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
900 if (!width) 949 if (!width)
950 {
951 line->touch ();
952
901 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
902 { 954 {
903 line->t[c] = ' '; 955 line->t[c] = ' ';
904 line->r[c] = rend; 956 line->r[c] = rend;
905 } 957 }
958 }
906 } 959 }
907 else // width == 0 960 else // width == 0
908 { 961 {
909#if ENABLE_COMBINING 962#if ENABLE_COMBINING
910 // handle combining characters 963 // handle combining characters
911 // we just tag the accent on the previous on-screen character. 964 // we just tag the accent on the previous on-screen character.
912 // this is arguably not correct, but also arguably not wrong. 965 // this is arguably not correct, but also arguably not wrong.
913 // we don't handle double-width characters nicely yet. 966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
914 text_t *tp; 968 text_t *tp;
915 rend_t *rp; 969 rend_t *rp;
916 970
917 if (screen.cur.col > 0) 971 if (screen.cur.col > 0)
918 { 972 {
973 linep = line;
919 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
920 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
921
922 while (*tp == NOCHAR && tp > line->t)
923 tp--, rp--;
924 } 976 }
925 else if (screen.cur.row > 0 977 else if (screen.cur.row > 0
926 && ROW(screen.cur.row - 1).is_longer ()) 978 && ROW(screen.cur.row - 1).is_longer ())
927 { 979 {
928 line_t *line = &ROW(screen.cur.row - 1); 980 linep = &ROW(screen.cur.row - 1);
929
930 tp = line->t + last_col - 1; 981 tp = line->t + ncol - 1;
931 rp = line->r + last_col - 1; 982 rp = line->r + ncol - 1;
932
933 while (*tp == NOCHAR && tp > line->t)
934 tp--, rp--;
935 } 983 }
936 else 984 else
937 continue; 985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
938 991
939 // first try to find a precomposed character 992 // first try to find a precomposed character
940 unicode_t n = rxvt_compose (*tp, c); 993 unicode_t n = rxvt_compose (*tp, c);
941 if (n == NOCHAR) 994 if (n == NOCHAR)
942 n = rxvt_composite.compose (*tp, c); 995 n = rxvt_composite.compose (*tp, c);
… …
945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
946#endif 999#endif
947 } 1000 }
948 } 1001 }
949 1002
950 if (!line->is_longer ()) /* XXX: think about this */
951 max_it (line->l, screen.cur.col); 1003 max_it (line->l, screen.cur.col);
952 1004
953#ifdef DEBUG_STRICT 1005#ifdef DEBUG_STRICT
954 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
955#endif 1007#endif
956} 1008}
… …
959/* 1011/*
960 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
961 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
962 */ 1014 */
963void 1015void
964rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
965{ 1017{
966 want_refresh = 1; 1018 want_refresh = 1;
967 1019
968 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
969 { 1021 {
… …
987 * Process Horizontal Tab 1039 * Process Horizontal Tab
988 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
989 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
990 */ 1042 */
991void 1043void
992rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
993{ 1045{
994 int i, x; 1046 int i, x;
995 1047
996 want_refresh = 1; 1048 want_refresh = 1;
997 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
1006 1058
1007 for (; ++i < ncol; ) 1059 for (; ++i < ncol; )
1008 if (tabs[i]) 1060 if (tabs[i])
1009 { 1061 {
1010 x = i; 1062 x = i;
1063
1011 if (!--count) 1064 if (!--count)
1012 break; 1065 break;
1013 } 1066 }
1014 else 1067 else
1015 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
… …
1022 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1023 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && OPTION (Opt_pastableTabs))
1024 { 1077 {
1025 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1026 1079
1027 if (!l.is_longer ()) /* XXX: think about this */ 1080 l.touch (x);
1028 max_it (l.l, x);
1029 1081
1030 i = screen.cur.col; 1082 i = screen.cur.col;
1031 1083
1032 l.t[i] = '\t'; 1084 l.t[i] = '\t';
1033 l.r[i] = base_rend; 1085 l.r[i] = base_rend;
… …
1062 * Process DEC Back Index 1114 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1066 */ 1118 */
1067#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1068void 1120void
1069rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1070{ 1122{
1071 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1125 else
1074 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1079 * Process DEC Forward Index 1131 * Process DEC Forward Index
1080 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1081 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1082 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1083 */ 1135 */
1084#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1085void 1137void
1086rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1087{ 1139{
1088 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1142 else
1091 { 1143 {
1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1144 line_t &l = ROW(screen.cur.row);
1093 ROW(screen.cur.row).l = ncol; 1145
1146 l.touch ();
1147 l.is_longer (0);
1094 1148
1095 scr_gotorc (0, 0, R_RELATIVE); 1149 scr_gotorc (0, 0, R_RELATIVE);
1096 scr_insdel_chars (1, DELETE); 1150 scr_insdel_chars (1, DELETE);
1097 scr_gotorc (0, ncol - 1, R_RELATIVE); 1151 scr_gotorc (0, ncol - 1, R_RELATIVE);
1098 } 1152 }
… …
1102/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1103/* 1157/*
1104 * Goto Row/Column 1158 * Goto Row/Column
1105 */ 1159 */
1106void 1160void
1107rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1108{ 1162{
1109 want_refresh = 1; 1163 want_refresh = 1;
1110 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1111 1165
1112 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1150/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1151/* 1205/*
1152 * direction should be UP or DN 1206 * direction should be UP or DN
1153 */ 1207 */
1154void 1208void
1155rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1156{ 1210{
1157 int dirn; 1211 int dirn;
1158 1212
1159 want_refresh = 1; 1213 want_refresh = 1;
1160 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1179 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1180 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1182 */ 1236 */
1183void 1237void
1184rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1185{ 1239{
1186 unsigned int col, num; 1240 unsigned int col, num;
1187 1241
1188 want_refresh = 1; 1242 want_refresh = 1;
1189 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1190 1244
1191 selection_check (1); 1245 selection_check (1);
1192 1246
1193 line_t &line = ROW(screen.cur.row); 1247 line_t &line = ROW(screen.cur.row);
1248
1249 line.touch ();
1250 line.is_longer (0);
1194 1251
1195 switch (mode) 1252 switch (mode)
1196 { 1253 {
1197 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1198 col = screen.cur.col; 1255 col = screen.cur.col;
… …
1230 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1231 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1232 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1233 */ 1290 */
1234void 1291void
1235rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1236{ 1293{
1237 int num; 1294 int num;
1238 int32_t row; 1295 int32_t row;
1239 rend_t ren; 1296 rend_t ren;
1240 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1285 } 1342 }
1286 else 1343 else
1287 { 1344 {
1288 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1289 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1290 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1291 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1292 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1293 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1294 } 1351 }
1295 1352
1296 for (; num--; row++) 1353 for (; num--; row++)
1297 { 1354 {
1298 ROW (row).l = 0;
1299 scr_blank_screen_mem (ROW (row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1300 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1301 } 1357 }
1302} 1358}
1303 1359
1304#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1305void 1361void
1306rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1307{ 1363{
1308 want_refresh = 1; 1364 want_refresh = 1;
1309 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1310 1366
1311 nsaved = 0; 1367 top_row = 0;
1312} 1368}
1313#endif 1369#endif
1314 1370
1315/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1316/* 1372/*
1317 * Fill the screen with `E's 1373 * Fill the screen with `E's
1318 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1319 */ 1375 */
1320void 1376void
1321rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1322{ 1378{
1323 rend_t fs; 1379 rend_t fs;
1324 1380
1325 want_refresh = 1; 1381 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1337 rend_t *r1 = line.r; 1393 rend_t *r1 = line.r;
1338 1394
1339 for (int j = ncol; j--; ) 1395 for (int j = ncol; j--; )
1340 *r1++ = fs; 1396 *r1++ = fs;
1341 1397
1342 line.l = ncol; /* make the `E's selectable */ 1398 line.is_longer (0);
1399 line.touch (ncol);
1343 } 1400 }
1344} 1401}
1345 1402
1346/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1347/* 1404/*
1348 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1349 */ 1406 */
1350void 1407void
1351rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1352{ 1409{
1353 int end; 1410 int end;
1354 1411
1355 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1356 1413
… …
1376/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1377/* 1434/*
1378 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1379 */ 1436 */
1380void 1437void
1381rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1382{ 1439{
1383 int col, row; 1440 int col, row;
1384 rend_t tr; 1441 rend_t tr;
1385 1442
1386 want_refresh = 1; 1443 want_refresh = 1;
… …
1395 min_it (count, ncol - screen.cur.col); 1452 min_it (count, ncol - screen.cur.col);
1396 1453
1397 row = screen.cur.row; 1454 row = screen.cur.row;
1398 1455
1399 line_t *line = &ROW(row); 1456 line_t *line = &ROW(row);
1457
1458 line->touch ();
1459 line->is_longer (0);
1400 1460
1401 switch (insdel) 1461 switch (insdel)
1402 { 1462 {
1403 case INSERT: 1463 case INSERT:
1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1405 { 1465 {
1406 line->t[col] = line->t[col - count]; 1466 line->t[col] = line->t[col - count];
1407 line->r[col] = line->r[col - count]; 1467 line->r[col] = line->r[col - count];
1408 } 1468 }
1409 1469
1410 if (!line->is_longer ()) 1470 line->l = min (line->l + count, ncol);
1411 {
1412 line->l += count;
1413 min_it (line->l, ncol);
1414 }
1415 1471
1416 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1474 {
1419 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1432 1488
1433 case ERASE: 1489 case ERASE:
1434 screen.cur.col += count; /* don't worry if > ncol */ 1490 screen.cur.col += count; /* don't worry if > ncol */
1435 selection_check (1); 1491 selection_check (1);
1436 screen.cur.col -= count; 1492 screen.cur.col -= count;
1493
1494 line->l = max (line->l - count, 0);
1437 scr_blank_line (*line, screen.cur.col, count, rstyle); 1495 scr_blank_line (*line, screen.cur.col, count, rstyle);
1438 break; 1496 break;
1439 1497
1440 case DELETE: 1498 case DELETE:
1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1444 { 1502 {
1445 line->t[col] = line->t[col + count]; 1503 line->t[col] = line->t[col + count];
1446 line->r[col] = line->r[col + count]; 1504 line->r[col] = line->r[col + count];
1447 } 1505 }
1448 1506
1507 line->l = max (line->l - count, 0);
1449 scr_blank_line (*line, ncol - count, count, tr); 1508 scr_blank_line (*line, ncol - count, count, tr);
1450
1451 if (line->is_longer ()) /* break line continuation */
1452 line->l = ncol;
1453
1454 line->l = max (line->l - count, 0);
1455 1509
1456 if (selection.op && current_screen == selection.screen 1510 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1512 {
1459 if (selection.end.row != screen.cur.row 1513 if (selection.end.row != screen.cur.row
… …
1477/* 1531/*
1478 * Set the scrolling region 1532 * Set the scrolling region
1479 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1480 */ 1534 */
1481void 1535void
1482rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1483{ 1537{
1484 max_it (top, 0); 1538 max_it (top, 0);
1485 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1486 1540
1487 if (top > bot) 1541 if (top > bot)
… …
1497 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1498 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1499 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1500 */ 1554 */
1501void 1555void
1502rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1503{ 1557{
1504 want_refresh = 1; 1558 want_refresh = 1;
1505 1559
1506 if (mode) 1560 if (mode)
1507 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1514 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1515 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1516 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1517 */ 1571 */
1518void 1572void
1519rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1520{ 1574{
1521 if (mode) 1575 if (mode)
1522 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1523 else 1577 else
1524 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1533 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1534 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1535 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1536 */ 1590 */
1537void 1591void
1538rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1539{ 1593{
1540 if (mode) 1594 if (mode)
1541 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1542 else 1596 else
1543 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1550 * Set insert/replace mode 1604 * Set insert/replace mode
1551 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1552 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1553 */ 1607 */
1554void 1608void
1555rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1556{ 1610{
1557 if (mode) 1611 if (mode)
1558 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1559 else 1613 else
1560 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1566 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1567 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1568 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1569 */ 1623 */
1570void 1624void
1571rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1572{ 1626{
1573 if (mode < 0) 1627 if (mode < 0)
1574 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1575 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1576 tabs[screen.cur.col] = (mode ? 1 : 0); 1630 tabs [screen.cur.col] = !!mode;
1577} 1631}
1578 1632
1579/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1580/* 1634/*
1581 * Set reverse/normal video 1635 * Set reverse/normal video
1582 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1583 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1584 */ 1638 */
1585void 1639void
1586rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1587{ 1641{
1588 XGCValues gcvalue; 1642 rvideo_mode = on;
1589 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1590 if (rvideo != mode) 1648 if (rvideo_state != on)
1591 { 1649 {
1592 rvideo = mode; 1650 rvideo_state = on;
1651
1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1594#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1595 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1596#endif 1655#endif
1597#if TRANSPARENT 1656#if TRANSPARENT
1598 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1599#endif 1658#endif
1600 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1601 pix_colors[Color_bg]);
1602 1660
1661 XGCValues gcvalue;
1603 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1604 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1605 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1606 &gcvalue); 1665
1607 scr_clear (); 1666 scr_clear ();
1608 scr_touch (true); 1667 scr_touch (true);
1609 } 1668 }
1610} 1669}
1611 1670
… …
1613/* 1672/*
1614 * Report current cursor position 1673 * Report current cursor position
1615 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1616 */ 1675 */
1617void 1676void
1618rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1619{ 1678{
1620 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1621} 1680}
1622 1681
1623/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1626 1685
1627/* 1686/*
1628 * Set font style 1687 * Set font style
1629 */ 1688 */
1630void 1689void
1631rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1632{ 1691{
1692#if 0
1633 switch (charsets[screen.charset]) 1693 switch (charsets [screen.charset])
1634 { 1694 {
1635 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
1636 break; 1696 break;
1637 case 'A': /* United Kingdom (UK) */ 1697 case 'A': /* United Kingdom (UK) */
1638 break; 1698 break;
… …
1645 case 'C': /* Finnish character set */ 1705 case 'C': /* Finnish character set */
1646 break; 1706 break;
1647 case 'K': /* German character set */ 1707 case 'K': /* German character set */
1648 break; 1708 break;
1649 } 1709 }
1710#endif
1650} 1711}
1651 1712
1652/* ------------------------------------------------------------------------- */ 1713/* ------------------------------------------------------------------------- */
1653/* 1714/*
1654 * Choose a font 1715 * Choose a font
… …
1656 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1657 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1658 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1659 */ 1720 */
1660void 1721void
1661rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1662{ 1723{
1663 screen.charset = set; 1724 screen.charset = set;
1664 set_font_style (); 1725 set_font_style ();
1665} 1726}
1666 1727
… …
1672 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1673 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1674 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1675 */ 1736 */
1676void 1737void
1677rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1678{ 1739{
1679 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1680 set_font_style (); 1741 set_font_style ();
1681} 1742}
1682 1743
… …
1687 1748
1688/* 1749/*
1689 * refresh matching text. 1750 * refresh matching text.
1690 */ 1751 */
1691bool 1752bool
1692rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1693{ 1754{
1694 bool found = false; 1755 bool found = false;
1695 1756
1696 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1697 { 1758 {
1698 int col = 0;
1699 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1700 1760
1701 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1702 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1703 { 1763 {
1704 found = true; 1764 found = true;
1705 *drp = ~value; 1765 *drp = ~value;
1706 } 1766 }
… …
1717 PART_END, 1777 PART_END,
1718 RC_COUNT 1778 RC_COUNT
1719}; 1779};
1720 1780
1721void 1781void
1722rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1723{ 1783{
1724 int i; 1784 int i;
1725 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1726 1786
1727 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1750 } 1810 }
1751 1811
1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1754 1814
1815 num_scr_allow = 0;
1816
1755 if (refresh) 1817 if (refresh)
1756 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1757} 1819}
1758 1820
1759/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1760/* 1822/*
1761 * Refresh the entire screen 1823 * Refresh the entire screen
1762 */ 1824 */
1763void 1825void
1764rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1765{ 1827{
1766 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1767} 1829}
1768 1830
1769/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1770/* 1832/*
1771 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1772 * the top of the screen 1834 * the top of the screen
1773 */ 1835 */
1774int 1836void
1775rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1776{ 1838{
1777 long p = 0; 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1778 unsigned int oldviewstart;
1779
1780 oldviewstart = view_start;
1781
1782 if (y < len)
1783 {
1784 p = (nrow + nsaved) * (len - y) / len;
1785 p -= (long) (nrow - 1);
1786 p = max (p, 0);
1787 }
1788
1789 view_start = (unsigned int)min (p, nsaved);
1790
1791 return scr_changeview (oldviewstart);
1792} 1840}
1793 1841
1794/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1795/* 1843/*
1796 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1797 * direction should be UP or DN 1845 * direction should be UP or DN
1798 */ 1846 */
1799int 1847bool
1800rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1801{ 1849{
1802 int n; 1850 int new_view_start =
1803 unsigned int oldviewstart;
1804
1805 oldviewstart = view_start;
1806
1807 if (direction == UP)
1808 {
1809 n = view_start + nlines;
1810 view_start = min (n, nsaved);
1811 }
1812 else
1813 {
1814 n = view_start - nlines; 1851 direction == UP ? view_start - nlines
1815 view_start = max (n, 0); 1852 : view_start + nlines;
1816 }
1817 1853
1818 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1819} 1855}
1820 1856
1821int 1857bool
1822rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1823{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1824 if (view_start != oldviewstart) 1862 if (new_view_start == view_start)
1825 { 1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1826 want_refresh = 1; 1867 want_refresh = 1;
1827 num_scr -= (view_start - oldviewstart);
1828 }
1829 1868
1830 return (int) (view_start - oldviewstart); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831}
1832 1870
1833/* ------------------------------------------------------------------------- */ 1871 return true;
1872}
1873
1874#ifndef NO_BELL
1834void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1835rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1836{ 1886{
1837#ifndef NO_BELL 1887#ifndef NO_BELL
1838 1888
1839# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1840# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1841 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1842# endif 1892# endif
1843 XMapWindow (display->display, parent[0]); 1893 XMapWindow (xdisp, parent[0]);
1844# endif 1894# endif
1845 1895
1846 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1847 { 1897 {
1848 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 rvideo_bell = true;
1849 rxvt_usleep (VISUAL_BELL_DURATION); 1899 scr_rvideo_mode (rvideo_mode);
1850 scr_rvideo_mode (!rvideo); /* refresh also done */ 1900 display->flush ();
1901
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1851 } 1903 }
1852 else 1904 else
1853 XBell (display->display, 0); 1905 XBell (xdisp, 0);
1854 1906
1855#endif 1907#endif
1856} 1908}
1857 1909
1858/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1859/* ARGSUSED */ 1911/* ARGSUSED */
1860void 1912void
1861rxvt_term::scr_printscreen (int fullhist) 1913rxvt_term::scr_printscreen (int fullhist) NOTHROW
1862{ 1914{
1863#ifdef PRINTPIPE 1915#ifdef PRINTPIPE
1864 int nrows, row_start; 1916 int nrows, row_start;
1865 FILE *fd; 1917 FILE *fd;
1866 1918
1867 if ((fd = popen_printer ()) == NULL) 1919 if ((fd = popen_printer ()) == NULL)
1868 return; 1920 return;
1869 1921
1870 if (fullhist) 1922 if (fullhist)
1871 { 1923 {
1872 nrows = nrow + nsaved; 1924 nrows = nrow - top_row;
1873 row_start = -nsaved; 1925 row_start = top_row;
1874 } 1926 }
1875 else 1927 else
1876 { 1928 {
1877 nrows = nrow; 1929 nrows = nrow;
1878 row_start = -view_start; 1930 row_start = view_start;
1879 } 1931 }
1880 1932
1881 wctomb (0, 0); 1933 wctomb (0, 0);
1882 1934
1883 for (int r1 = 0; r1 < nrows; r1++) 1935 for (int r1 = 0; r1 < nrows; r1++)
… …
1915 * Refresh the screen 1967 * Refresh the screen
1916 * drawn_text/drawn_rend contain the screen information before the update. 1968 * drawn_text/drawn_rend contain the screen information before the update.
1917 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1918 */ 1970 */
1919void 1971void
1920rxvt_term::scr_refresh (unsigned char refresh_type) 1972rxvt_term::scr_refresh () NOTHROW
1921{ 1973{
1922 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char must_clear, /* use draw_string not draw_image_string */
1923 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1924 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1925 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
… …
2011 2063
2012 /* make sure no outline cursor is left around */ 2064 /* make sure no outline cursor is left around */
2013 setoldcursor = 0; 2065 setoldcursor = 0;
2014 if (ocrow != -1) 2066 if (ocrow != -1)
2015 { 2067 {
2016 if (screen.cur.row + view_start != ocrow 2068 if (screen.cur.row - view_start != ocrow
2017 || screen.cur.col != oldcursor.col) 2069 || screen.cur.col != oldcursor.col)
2018 { 2070 {
2019 if (ocrow < nrow 2071 if (ocrow < nrow
2020 && oldcursor.col < ncol) 2072 && oldcursor.col < ncol)
2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2073 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2029 else if (!focus) 2081 else if (!focus)
2030 setoldcursor = 1; 2082 setoldcursor = 1;
2031 2083
2032 if (setoldcursor) 2084 if (setoldcursor)
2033 { 2085 {
2034 if (screen.cur.row + view_start >= nrow) 2086 if (screen.cur.row - view_start >= nrow)
2035 oldcursor.row = -1; 2087 oldcursor.row = -1;
2036 else 2088 else
2037 { 2089 {
2038 oldcursor.row = screen.cur.row + view_start; 2090 oldcursor.row = screen.cur.row - view_start;
2039 oldcursor.col = screen.cur.col; 2091 oldcursor.col = screen.cur.col;
2040 } 2092 }
2041 } 2093 }
2042 } 2094 }
2043 2095
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2097#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2098 scr_swap_overlay ();
2046#endif 2099#endif
2047 2100
2048#ifndef NO_SLOW_LINK_SUPPORT 2101#ifndef NO_SLOW_LINK_SUPPORT
2049 /* 2102 /*
2050 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2051 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2052 */ 2105 */
2053 i = num_scr;
2054 if (!display->is_local 2106 if (!display->is_local
2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2056 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !must_clear)
2057 { 2109 {
2058 int16_t nits; 2110 int16_t nits;
2059 int j; 2111 int j;
2060 int len, wlen; 2112 int len, wlen;
2113 dLocal (int, num_scr);
2061 2114
2062 j = nrow; 2115 j = nrow;
2063 wlen = len = -1; 2116 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2117 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2119 {
2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2068 { 2121 {
2069 line_t s = ROW(row - view_start); 2122 line_t s = ROW(view_start + row);
2070 line_t d = drawn_buf[row]; 2123 line_t d = drawn_buf[row];
2071 line_t d2 = drawn_buf[row + i]; 2124 line_t d2 = drawn_buf[row + i];
2072 2125
2073 for (nits = 0, col = ncol; col--; ) 2126 for (nits = 0, col = ncol; col--; )
2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2127 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2096 { 2149 {
2097 /* also comes here at end if needed because of >= above */ 2150 /* also comes here at end if needed because of >= above */
2098 if (wlen < len) 2151 if (wlen < len)
2099 ::swap (wlen, len); 2152 ::swap (wlen, len);
2100 2153
2101 XCopyArea (display->display, vt, vt, 2154 XCopyArea (xdisp, vt, vt,
2102 gc, 0, Row2Pixel (len + i), 2155 gc, 0, Row2Pixel (len + i),
2103 (unsigned int)TermWin_TotalWidth (), 2156 (unsigned int)this->width,
2104 (unsigned int)Height2Pixel (wlen - len + 1), 2157 (unsigned int)Height2Pixel (wlen - len + 1),
2105 0, Row2Pixel (len)); 2158 0, Row2Pixel (len));
2106 len = -1; 2159 len = -1;
2107 } 2160 }
2108 } 2161 }
… …
2112 /* 2165 /*
2113 * E: main pass across every character 2166 * E: main pass across every character
2114 */ 2167 */
2115 for (row = 0; row < nrow; row++) 2168 for (row = 0; row < nrow; row++)
2116 { 2169 {
2117 text_t *stp = ROW(row - view_start).t; 2170 text_t *stp = ROW(view_start + row).t;
2118 rend_t *srp = ROW(row - view_start).r; 2171 rend_t *srp = ROW(view_start + row).r;
2119 text_t *dtp = drawn_buf[row].t; 2172 text_t *dtp = drawn_buf[row].t;
2120 rend_t *drp = drawn_buf[row].r; 2173 rend_t *drp = drawn_buf[row].r;
2121 2174
2122 /* 2175 /*
2123 * E2: OK, now the real pass 2176 * E2: OK, now the real pass
… …
2194 2247
2195 // only do special processing if any attributes are set, which is unlikely 2248 // only do special processing if any attributes are set, which is unlikely
2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2197 { 2250 {
2198#if ENABLE_STYLES 2251#if ENABLE_STYLES
2199 // force redraw after "careful" characters to avoid pixel droppings 2252 // "careful" (too wide) character handling
2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2201 drp[col + 1] = ~srp[col + 1];
2202 2253
2203 // include previous careful character(s) if possible, looks nicer (best effort...) 2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2204 while (text > stp 2255 while (text > stp
2205 && srp[text - stp - 1] & RS_Careful 2256 && srp[text - stp - 1] & RS_Careful
2206 && RS_SAME (rend, srp[text - stp - 1])) 2257 && RS_SAME (rend, srp[text - stp - 1]))
2207 text--, count++, xpixel -= fwidth; 2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2208#endif 2267#endif
2209 2268
2210 bool invert = rend & RS_RVid; 2269 bool invert = rend & RS_RVid;
2211 2270
2212#ifndef NO_BOLD_UNDERLINE_REVERSE 2271#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2270 * Actually do the drawing of the string here 2329 * Actually do the drawing of the string here
2271 */ 2330 */
2272 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2273 2332
2274 if (back == fore) 2333 if (back == fore)
2275 font->clear_rect (*drawable, xpixel, ypixel, 2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2276 fwidth * count, fheight,
2277 back);
2278 else if (back == Color_bg) 2335 else if (back == Color_bg)
2279 { 2336 {
2280 if (must_clear) 2337 if (must_clear)
2281 { 2338 {
2282 CLEAR_CHARS (xpixel, ypixel, count); 2339 CLEAR_CHARS (xpixel, ypixel, count);
… …
2296 2353
2297 if (rend & RS_Uline && font->descent > 1 && fore != back) 2354 if (rend & RS_Uline && font->descent > 1 && fore != back)
2298 { 2355 {
2299#if ENABLE_FRILLS 2356#if ENABLE_FRILLS
2300 if (ISSET_PIXCOLOR (Color_underline)) 2357 if (ISSET_PIXCOLOR (Color_underline))
2301 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2358 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2302 else 2359 else
2303#endif 2360#endif
2304 XSetForeground (display->display, gc, pix_colors[fore]); 2361 XSetForeground (xdisp, gc, pix_colors[fore]);
2305 2362
2306 XDrawLine (display->display, drawBuffer, gc, 2363 XDrawLine (xdisp, drawBuffer, gc,
2307 xpixel, ypixel + font->ascent + 1, 2364 xpixel, ypixel + font->ascent + 1,
2308 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2309 } 2366 }
2310 } /* for (col....) */ 2367 } /* for (col....) */
2311 } /* for (row....) */ 2368 } /* for (row....) */
2312 2369
2313#if ENABLE_OVERLAY 2370#if ENABLE_OVERLAY
2314 scr_swap_overlay (); 2371 scr_swap_overlay ();
2315#endif 2372#endif
2373 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2316 2374
2317 /* 2375 /*
2318 * G: cleanup cursor and display outline cursor if necessary 2376 * G: cleanup cursor and display outline cursor if necessary
2319 */ 2377 */
2320 if (showcursor) 2378 if (showcursor)
… …
2343 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2344 cursorwidth++; 2402 cursorwidth++;
2345 2403
2346#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
2347 if (ISSET_PIXCOLOR (Color_cursor)) 2405 if (ISSET_PIXCOLOR (Color_cursor))
2348 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2406 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2349#endif 2407#endif
2350 2408
2351 XDrawRectangle (display->display, drawBuffer, gc, 2409 XDrawRectangle (xdisp, drawBuffer, gc,
2352 Col2Pixel (col), 2410 Col2Pixel (col),
2353 Row2Pixel (oldcursor.row), 2411 Row2Pixel (oldcursor.row),
2354 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2412 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2355 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2356 } 2414 }
… …
2359 /* 2417 /*
2360 * H: cleanup selection 2418 * H: cleanup selection
2361 */ 2419 */
2362 scr_reverse_selection (); 2420 scr_reverse_selection ();
2363 2421
2364 if (refresh_type & SMOOTH_REFRESH)
2365 XFlush (display->display);
2366
2367 num_scr = 0; 2422 num_scr = 0;
2368 num_scr_allow = 1; 2423 num_scr_allow = 1;
2369} 2424}
2370 2425
2371void 2426void
2372rxvt_term::scr_remap_chars (const line_t &l) 2427rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2373{ 2428{
2374 if (!l.t) 2429 if (!l.t)
2375 return; 2430 return;
2376 2431
2432 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2433
2377 for (int i = ncol; i--; ) 2434 for (int i = ncol; i--; )
2378 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2435 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2379} 2436}
2380 2437
2381void 2438void
2382rxvt_term::scr_remap_chars () 2439rxvt_term::scr_remap_chars () NOTHROW
2383{ 2440{
2384 for (int i = total_rows; i--; ) 2441 for (int i = total_rows; i--; )
2385 scr_remap_chars (row_buf [i]); 2442 scr_remap_chars (row_buf [i]);
2386 2443
2387 for (int i = nrow; i--; ) 2444 for (int i = nrow; i--; )
… …
2390 scr_remap_chars (swap_buf [i]); 2447 scr_remap_chars (swap_buf [i]);
2391 } 2448 }
2392} 2449}
2393 2450
2394void 2451void
2395rxvt_term::scr_recolour () 2452rxvt_term::scr_recolour () NOTHROW
2396{ 2453{
2397 if (1 2454 if (1
2398#if TRANSPARENT 2455#if TRANSPARENT
2399 && !am_transparent 2456 && !am_transparent
2400#endif 2457#endif
2401#if XPM_BACKGROUND 2458#if XPM_BACKGROUND
2402 && !bgPixmap.pixmap 2459 && !bgPixmap.pixmap
2403#endif 2460#endif
2404 ) 2461 )
2405 { 2462 {
2406 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2463 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2407 XClearWindow (display->display, parent[0]); 2464 XClearWindow (xdisp, parent[0]);
2408 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2465 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2409#if HAVE_SCROLLBARS 2466#if HAVE_SCROLLBARS
2410 if (scrollBar.win) 2467 if (scrollBar.win)
2411 { 2468 {
2412 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2469 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2413 scrollBar.setIdle (); 2470 scrollBar.setIdle ();
2414 scrollbar_show (0); 2471 scrollbar_show (0);
2415 } 2472 }
2416#endif 2473#endif
2417 } 2474 }
… …
2421 want_refresh = 1; 2478 want_refresh = 1;
2422} 2479}
2423 2480
2424/* ------------------------------------------------------------------------- */ 2481/* ------------------------------------------------------------------------- */
2425void 2482void
2426rxvt_term::scr_clear (bool really) 2483rxvt_term::scr_clear (bool really) NOTHROW
2427{ 2484{
2428 if (!mapped) 2485 if (!mapped)
2429 return; 2486 return;
2430 2487
2431 num_scr_allow = 0; 2488 num_scr_allow = 0;
2432 want_refresh = 1; 2489 want_refresh = 1;
2433 2490
2434 if (really) 2491 if (really)
2435 XClearWindow (display->display, vt); 2492 XClearWindow (xdisp, vt);
2436} 2493}
2437 2494
2438/* ------------------------------------------------------------------------- */
2439void 2495void
2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2497{
2498 int view_end = view_start + nrow;
2499 int row, col;
2500
2501 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2502 {
2503 text_t *stp = ROW(row).t;
2504 rend_t *srp = ROW(row).r;
2505
2506 for (col = beg_col; col < end_col; col++)
2507 srp[col] ^= rstyle1;
2508
2509 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2510 srp[col] ^= rstyle2;
2511
2512 if (++col < end_col)
2513 srp[col] ^= rstyle2;
2514 }
2515}
2516
2517void
2518rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2519{
2520 int view_end = view_start + nrow;
2521 int row, col;
2522
2523 if (beg_row >= view_start)
2524 {
2525 col = beg_col;
2526 row = beg_row;
2527 }
2528 else
2529 {
2530 col = 0;
2531 row = view_start;
2532 }
2533
2534 for (; row < min (end_row, view_end); row++, col = 0)
2535 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2536 srp[col] ^= rstyle;
2537
2538 if (row == end_row)
2539 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2540 srp[col] ^= rstyle;
2541}
2542
2543/* ------------------------------------------------------------------------- */
2544void
2440rxvt_term::scr_reverse_selection () 2545rxvt_term::scr_reverse_selection () NOTHROW
2441{ 2546{
2442 if (selection.op 2547 if (selection.op
2443 && current_screen == selection.screen 2548 && current_screen == selection.screen
2444 && selection.end.row >= -view_start) 2549 && selection.end.row >= view_start)
2445 { 2550 {
2446 int view_end = -view_start + nrow; 2551#if !ENABLE_MINIMAL
2447 int row, col;
2448
2449#if ENABLE_FRILLS
2450 if (selection.rect) 2552 if (selection.rect)
2451 { 2553 scr_xor_rect (selection.beg.row, selection.beg.col,
2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2554 selection.end.row, selection.end.col,
2453 { 2555 RS_RVid, RS_RVid | RS_Uline);
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2456
2457 for (col = selection.beg.col; col < selection.end.col; col++)
2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462
2463 if (++col < selection.end.col)
2464 srp[col] ^= RS_RVid | RS_Uline;
2465 }
2466 }
2467 else 2556 else
2468#endif 2557#endif
2469 { 2558 scr_xor_span (selection.beg.row, selection.beg.col,
2470 if (selection.beg.row >= -view_start) 2559 selection.end.row, selection.end.col,
2471 { 2560 RS_RVid);
2472 col = selection.beg.col;
2473 row = selection.beg.row;
2474 }
2475 else
2476 {
2477 col = 0;
2478 row = -view_start;
2479 }
2480
2481 for (; row < min (selection.end.row, view_end); row++, col = 0)
2482 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2483 srp[col] ^= RS_RVid;
2484
2485 if (row == selection.end.row)
2486 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2487 srp[col] ^= RS_RVid;
2488 }
2489 } 2561 }
2490} 2562}
2491 2563
2492/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2493/* 2565/*
2494 * Dump the whole scrollback and screen to the passed filedescriptor. The 2566 * Dump the whole scrollback and screen to the passed filedescriptor. The
2495 * invoking routine must close the fd. 2567 * invoking routine must close the fd.
2496 */ 2568 */
2497#if 0 2569#if 0
2498void 2570void
2499rxvt_term::scr_dump (int fd) 2571rxvt_term::scr_dump (int fd) NOTHROW
2500{ 2572{
2501 int row, wrote; 2573 int row, wrote;
2502 unsigned int width, towrite; 2574 unsigned int width, towrite;
2503 char r1[] = "\n"; 2575 char r1[] = "\n";
2504 2576
… …
2523 2595
2524/* ------------------------------------------------------------------------- * 2596/* ------------------------------------------------------------------------- *
2525 * CHARACTER SELECTION * 2597 * CHARACTER SELECTION *
2526 * ------------------------------------------------------------------------- */ 2598 * ------------------------------------------------------------------------- */
2527void 2599void
2528rxvt_term::selection_check (int check_more) 2600rxvt_term::selection_check (int check_more) NOTHROW
2529{ 2601{
2530 row_col_t pos; 2602 row_col_t pos;
2531 2603
2532 if (!selection.op) 2604 if (!selection.op)
2533 return; 2605 return;
2534 2606
2535 pos.row = pos.col = 0; 2607 pos.row = pos.col = 0;
2536 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2608 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2537 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2609 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2538 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2610 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2539 || (check_more == 1 2611 || (check_more == 1
2540 && current_screen == selection.screen 2612 && current_screen == selection.screen
2541 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2613 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2542 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2614 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2543 || (check_more == 2 2615 || (check_more == 2
… …
2554/* ------------------------------------------------------------------------- */ 2626/* ------------------------------------------------------------------------- */
2555/* 2627/*
2556 * Paste a selection direct to the command fd 2628 * Paste a selection direct to the command fd
2557 */ 2629 */
2558void 2630void
2559rxvt_term::paste (unsigned char *data, unsigned int len) 2631rxvt_term::paste (char *data, unsigned int len) NOTHROW
2560{ 2632{
2561 /* convert normal newline chars into common keyboard Return key sequence */ 2633 /* convert normal newline chars into common keyboard Return key sequence */
2562 for (unsigned int i = 0; i < len; i++) 2634 for (unsigned int i = 0; i < len; i++)
2563 if (data[i] == C0_LF) 2635 if (data[i] == C0_LF)
2564 data[i] = C0_CR; 2636 data[i] = C0_CR;
… …
2570/* 2642/*
2571 * Respond to a notification that a primary selection has been sent 2643 * Respond to a notification that a primary selection has been sent
2572 * EXT: SelectionNotify 2644 * EXT: SelectionNotify
2573 */ 2645 */
2574void 2646void
2575rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2647rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2576{ 2648{
2577 if (prop == None) /* check for failed XConvertSelection */ 2649 if (prop == None) /* check for failed XConvertSelection */
2578 { 2650 {
2579 if ((selection_type & Sel_CompoundText)) 2651 if ((selection_type & Sel_CompoundText))
2580 { 2652 {
… …
2600 } 2672 }
2601 2673
2602 unsigned long bytes_after; 2674 unsigned long bytes_after;
2603 XTextProperty ct; 2675 XTextProperty ct;
2604 2676
2605 if (XGetWindowProperty (display->display, win, prop, 2677 if (XGetWindowProperty (xdisp, win, prop,
2606 0, PROP_SIZE / 4, 2678 0, PROP_SIZE / 4,
2607 delete_prop, AnyPropertyType, 2679 delete_prop, AnyPropertyType,
2608 &ct.encoding, &ct.format, 2680 &ct.encoding, &ct.format,
2609 &ct.nitems, &bytes_after, 2681 &ct.nitems, &bytes_after,
2610 &ct.value) != Success) 2682 &ct.value) != Success)
… …
2619 if (bytes_after) 2691 if (bytes_after)
2620 { 2692 {
2621 // fetch and append remaining data 2693 // fetch and append remaining data
2622 XTextProperty ct2; 2694 XTextProperty ct2;
2623 2695
2624 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (xdisp, win, prop,
2625 ct.nitems / 4, (bytes_after + 3) / 4, 2697 ct.nitems / 4, (bytes_after + 3) / 4,
2626 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2627 &ct2.encoding, &ct2.format, 2699 &ct2.encoding, &ct2.format,
2628 &ct2.nitems, &bytes_after, 2700 &ct2.nitems, &bytes_after,
2629 &ct2.value) != Success) 2701 &ct2.value) != Success)
… …
2642 2714
2643 if (ct.encoding == xa[XA_INCR]) 2715 if (ct.encoding == xa[XA_INCR])
2644 { 2716 {
2645 // INCR selection, start handshake 2717 // INCR selection, start handshake
2646 if (!delete_prop) 2718 if (!delete_prop)
2647 XDeleteProperty (display->display, win, prop); 2719 XDeleteProperty (xdisp, win, prop);
2648 2720
2649 selection_wait = Sel_incr; 2721 selection_wait = Sel_incr;
2650 incr_buf_fill = 0; 2722 incr_buf_fill = 0;
2651 incr_ev.start (NOW + 10); 2723 incr_ev.start (NOW + 10);
2652 2724
… …
2699 } 2771 }
2700 2772
2701 char **cl; 2773 char **cl;
2702 int cr; 2774 int cr;
2703 2775
2704#if ENABLE_FRILLS 2776#if !ENABLE_MINIMAL
2705 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2777 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2706 // so recode it manually 2778 // so recode it manually
2707 if (ct.encoding == xa[XA_UTF8_STRING]) 2779 if (ct.encoding == xa[XA_UTF8_STRING])
2708 { 2780 {
2709 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2781 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2710 char *s = rxvt_wcstombs (w); 2782 char *s = rxvt_wcstombs (w);
2711 free (w); 2783 free (w);
2712 // TODO: strlen == only the first element will be converted. well... 2784 // TODO: strlen == only the first element will be converted. well...
2713 paste ((unsigned char *)s, strlen (s)); 2785 paste (s, strlen (s));
2714 free (s); 2786 free (s);
2715 } 2787 }
2716 else 2788 else
2717#endif 2789#endif
2718 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2790 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2719 && cl) 2791 && cl)
2720 { 2792 {
2721 for (int i = 0; i < cr; i++) 2793 for (int i = 0; i < cr; i++)
2722 paste ((unsigned char *)cl[i], strlen (cl[i])); 2794 paste (cl[i], strlen (cl[i]));
2723 2795
2724 XFreeStringList (cl); 2796 XFreeStringList (cl);
2725 } 2797 }
2726 else 2798 else
2727 paste (ct.value, ct.nitems); // paste raw 2799 paste ((char *)ct.value, ct.nitems); // paste raw
2728 2800
2729bailout: 2801bailout:
2730 XFree (ct.value); 2802 XFree (ct.value);
2731 2803
2732 if (selection_wait == Sel_normal) 2804 if (selection_wait == Sel_normal)
2733 selection_wait = Sel_none; 2805 selection_wait = Sel_none;
2734} 2806}
2735 2807
2736void 2808void
2737rxvt_term::incr_cb (time_watcher &w) 2809rxvt_term::incr_cb (time_watcher &w) NOTHROW
2738{ 2810{
2739 selection_wait = Sel_none; 2811 selection_wait = Sel_none;
2740 2812
2741 incr_buf_size = 0; 2813 incr_buf_size = 0;
2742 free (incr_buf); 2814 free (incr_buf);
2743 2815
2744 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2816 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2745} 2817}
2746 2818
2747void 2819void
2748rxvt_term::selection_property (Window win, Atom prop) 2820rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2749{ 2821{
2750 if (prop == None || selection_wait != Sel_incr) 2822 if (prop == None || selection_wait != Sel_incr)
2751 return; 2823 return;
2752 2824
2753 selection_paste (win, prop, true); 2825 selection_paste (win, prop, true);
… …
2762 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2834 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2763 * will auto fallback to CUT_BUFFER0 2835 * will auto fallback to CUT_BUFFER0
2764 * EXT: button 2 release 2836 * EXT: button 2 release
2765 */ 2837 */
2766void 2838void
2767rxvt_term::selection_request (Time tm, int x, int y) 2839rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2768{ 2840{
2769 if (x < 0 || x >= width || y < 0 || y >= height) 2841 if (selection.text && selnum == Sel_Primary)
2770 return; /* outside window */
2771
2772 if (selection.text)
2773 { /* internal selection */ 2842 { /* internal selection */
2774 char *str = rxvt_wcstombs (selection.text, selection.len); 2843 char *str = rxvt_wcstombs (selection.text, selection.len);
2775 paste ((unsigned char *)str, strlen (str)); 2844 paste (str, strlen (str));
2776 free (str); 2845 free (str);
2777 return; 2846 return;
2778 } 2847 }
2779 else 2848 else
2780 { 2849 {
2781 int i;
2782
2783 selection_request_time = tm; 2850 selection_request_time = tm;
2784 selection_wait = Sel_normal; 2851 selection_wait = Sel_normal;
2785 2852
2786 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2787 {
2788#if X_HAVE_UTF8_STRING 2853#if X_HAVE_UTF8_STRING
2789 selection_type = Sel_UTF8String; 2854 selection_type = Sel_UTF8String;
2790 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2855 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2791 return; 2856 return;
2792#else 2857#else
2793 selection_type = Sel_CompoundText; 2858 selection_type = Sel_CompoundText;
2794 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2859 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2795 return; 2860 return;
2796#endif 2861#endif
2797 }
2798 } 2862 }
2799 2863
2800 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2864 selection_wait = Sel_none; /* don't loop in selection_paste () */
2801 selection_paste (display->root, XA_CUT_BUFFER0, false); 2865 selection_paste (display->root, XA_CUT_BUFFER0, false);
2802} 2866}
2803 2867
2804int 2868int
2805rxvt_term::selection_request_other (Atom target, int selnum) 2869rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2806{ 2870{
2807 Atom sel; 2871 Atom sel;
2808 2872
2809 selection_type |= selnum; 2873 selection_type |= selnum;
2810 2874
… …
2813 else if (selnum == Sel_Secondary) 2877 else if (selnum == Sel_Secondary)
2814 sel = XA_SECONDARY; 2878 sel = XA_SECONDARY;
2815 else 2879 else
2816 sel = xa[XA_CLIPBOARD]; 2880 sel = xa[XA_CLIPBOARD];
2817 2881
2818 if (XGetSelectionOwner (display->display, sel) != None) 2882 if (XGetSelectionOwner (xdisp, sel) != None)
2819 { 2883 {
2820 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2884 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2821 vt, selection_request_time); 2885 vt, selection_request_time);
2822 return 1; 2886 return 1;
2823 } 2887 }
2824 2888
2825 return 0; 2889 return 0;
… …
2829/* 2893/*
2830 * Clear all selected text 2894 * Clear all selected text
2831 * EXT: SelectionClear 2895 * EXT: SelectionClear
2832 */ 2896 */
2833void 2897void
2834rxvt_term::selection_clear () 2898rxvt_term::selection_clear () NOTHROW
2835{ 2899{
2836 want_refresh = 1; 2900 want_refresh = 1;
2837 free (selection.text); 2901 free (selection.text);
2838 selection.text = NULL; 2902 selection.text = NULL;
2839 selection.len = 0; 2903 selection.len = 0;
… …
2872 selection.op = SELECTION_DONE; 2936 selection.op = SELECTION_DONE;
2873 2937
2874 if (selection.clicks == 4) 2938 if (selection.clicks == 4)
2875 return; /* nothing selected, go away */ 2939 return; /* nothing selected, go away */
2876 2940
2941 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2942 return;
2943
2877 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2944 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2878 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2945 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2879 2946
2880 int ofs = 0; 2947 int ofs = 0;
2881 int extra = 0; 2948 int extra = 0;
… …
2885 2952
2886 int end_col; 2953 int end_col;
2887 2954
2888 for (; row <= selection.end.row; row++, col = 0) 2955 for (; row <= selection.end.row; row++, col = 0)
2889 { 2956 {
2890#if ENABLE_FRILLS 2957#if !ENABLE_MINIMAL
2891 if (selection.rect) 2958 if (selection.rect)
2892 { 2959 {
2893 col = selection.beg.col; 2960 col = selection.beg.col;
2894 end_col = ncol + 1; 2961 end_col = ncol + 1;
2895 } 2962 }
2896 else 2963 else
2897#endif 2964#endif
2898 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2965 end_col = ROW(row).l;
2899 2966
2900 col = max (col, 0); 2967 col = max (col, 0);
2901 2968
2902 if (row == selection.end.row 2969 if (row == selection.end.row
2903#if ENABLE_FRILLS 2970#if !ENABLE_MINIMAL
2904 || selection.rect 2971 || selection.rect
2905#endif 2972#endif
2906 ) 2973 )
2907 min_it (end_col, selection.end.col); 2974 min_it (end_col, selection.end.col);
2908 2975
2909 t = ROW(row).t + col; 2976 t = ROW(row).t + col;
2977
2910 for (; col < end_col; col++) 2978 for (; col < end_col; col++)
2911 { 2979 {
2912 if (*t == NOCHAR) 2980 if (*t == NOCHAR)
2913 t++; 2981 t++;
2914#if ENABLE_COMBINING 2982#if ENABLE_COMBINING
… …
2930#endif 2998#endif
2931 else 2999 else
2932 new_selection_text[ofs++] = *t++; 3000 new_selection_text[ofs++] = *t++;
2933 } 3001 }
2934 3002
2935#if ENABLE_FRILLS 3003#if !ENABLE_MINIMAL
2936 if (selection.rect) 3004 if (selection.rect)
2937 { 3005 {
2938 while (ofs 3006 while (ofs
2939 && new_selection_text[ofs - 1] != C0_LF 3007 && new_selection_text[ofs - 1] != C0_LF
2940 && unicode::is_space (new_selection_text[ofs - 1])) 3008 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2963 3031
2964 // we usually allocate much more than necessary, so realloc it smaller again 3032 // we usually allocate much more than necessary, so realloc it smaller again
2965 selection.len = ofs; 3033 selection.len = ofs;
2966 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3034 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2967 3035
3036 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3037 return;
3038
3039 selection_grab (tm);
3040}
3041
3042bool
3043rxvt_term::selection_grab (Time tm) NOTHROW
3044{
3045 selection_time = tm;
3046
2968 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3047 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
2969 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3048 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3049 {
2970 display->set_selection_owner (this); 3050 display->set_selection_owner (this);
3051 return true;
3052 }
2971 else 3053 else
2972 rxvt_warn ("can't get primary selection, ignoring.\n"); 3054 {
3055 selection_clear ();
3056 return false;
3057 }
2973 3058
2974#if 0 3059#if 0
2975 XTextProperty ct; 3060 XTextProperty ct;
2976 3061
2977 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3062 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
2978 { 3063 {
2979 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2980 XFree (ct.value); 3065 XFree (ct.value);
2981 } 3066 }
2982#endif 3067#endif
2983
2984 selection_time = tm;
2985} 3068}
2986 3069
2987/* ------------------------------------------------------------------------- */ 3070/* ------------------------------------------------------------------------- */
2988/* 3071/*
2989 * Mark or select text based upon number of clicks: 1, 2, or 3 3072 * Mark or select text based upon number of clicks: 1, 2, or 3
2990 * EXT: button 1 press 3073 * EXT: button 1 press
2991 */ 3074 */
2992void 3075void
2993rxvt_term::selection_click (int clicks, int x, int y) 3076rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2994{ 3077{
2995 clicks = ((clicks - 1) % 3) + 1; 3078 clicks = ((clicks - 1) % 3) + 1;
2996 selection.clicks = clicks; /* save clicks so extend will work */ 3079 selection.clicks = clicks; /* save clicks so extend will work */
2997 3080
3081 if (clicks == 2 && !selection.rect
3082 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3083 {
3084 MEvent.clicks = 1; // what a mess
3085 selection.screen = current_screen;
3086 selection.op = SELECTION_CONT;
3087 return;
3088 }
3089
2998 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3090 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2999 3091
3000 if (clicks == 2 || clicks == 3) 3092 if (clicks == 2 || clicks == 3)
3001 selection_extend_colrow (selection.mark.col, 3093 selection_extend_colrow (selection.mark.col,
3002 selection.mark.row + view_start, 3094 selection.mark.row - view_start,
3003 0, /* button 3 */ 3095 0, /* button 3 */
3004 1, /* button press */ 3096 1, /* button press */
3005 0); /* click change */ 3097 0); /* click change */
3006} 3098}
3007 3099
3008/* ------------------------------------------------------------------------- */ 3100/* ------------------------------------------------------------------------- */
3009/* 3101/*
3010 * Mark a selection at the specified col/row 3102 * Mark a selection at the specified col/row
3011 */ 3103 */
3012void 3104void
3013rxvt_term::selection_start_colrow (int col, int row) 3105rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3014{ 3106{
3015 want_refresh = 1; 3107 want_refresh = 1;
3016 3108
3017 selection.mark.row = row - view_start; 3109 selection.mark.row = row + view_start;
3018 selection.mark.col = col; 3110 selection.mark.col = col;
3019 3111
3020 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3112 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3021 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3113 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3022 3114
3023 while (selection.mark.col > 0 3115 while (selection.mark.col > 0
3024 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3116 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3025 --selection.mark.col; 3117 --selection.mark.col;
… …
3044#define DELIMIT_TEXT(x) \ 3136#define DELIMIT_TEXT(x) \
3045 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3137 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3046#define DELIMIT_REND(x) 1 3138#define DELIMIT_REND(x) 1
3047 3139
3048void 3140void
3049rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3141rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3050{ 3142{
3051 int col, row, dirnadd, tcol, trow, w1, w2; 3143 int col, row, dirnadd, tcol, trow, w1, w2;
3052 row_col_t bound; 3144 row_col_t bound;
3053 text_t *stp; 3145 text_t *stp;
3054 rend_t *srp; 3146 rend_t *srp;
3055 3147
3056 if (dirn == UP) 3148 if (dirn == UP)
3057 { 3149 {
3058 bound.row = - nsaved - 1; 3150 bound.row = top_row - 1;
3059 bound.col = 0; 3151 bound.col = 0;
3060 dirnadd = -1; 3152 dirnadd = -1;
3061 } 3153 }
3062 else 3154 else
3063 { 3155 {
… …
3111 } 3203 }
3112 } 3204 }
3113 break; 3205 break;
3114 } 3206 }
3115 3207
3116Old_Word_Selection_You_Die:
3117 if (dirn == DN) 3208 if (dirn == DN)
3118 col++; /* put us on one past the end */ 3209 col++; /* put us on one past the end */
3119 3210
3120 /* Poke the values back in */ 3211 /* Poke the values back in */
3121 ret->row = row; 3212 ret->row = row;
… …
3129 * flag == 0 ==> button 1 3220 * flag == 0 ==> button 1
3130 * flag == 1 ==> button 3 press 3221 * flag == 1 ==> button 3 press
3131 * flag == 2 ==> button 3 motion 3222 * flag == 2 ==> button 3 motion
3132 */ 3223 */
3133void 3224void
3134rxvt_term::selection_extend (int x, int y, int flag) 3225rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3135{ 3226{
3136 int col = clamp (Pixel2Col (x), 0, ncol); 3227 int col = clamp (Pixel2Col (x), 0, ncol);
3137 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3228 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3138 3229
3139 /* 3230 /*
… …
3142 * select nothing. Otherwise, if we're to the right of the mark, you have to 3233 * select nothing. Otherwise, if we're to the right of the mark, you have to
3143 * be _past_ a character for it to be selected. 3234 * be _past_ a character for it to be selected.
3144 */ 3235 */
3145 if (((selection.clicks % 3) == 1) && !flag 3236 if (((selection.clicks % 3) == 1) && !flag
3146 && (col == selection.mark.col 3237 && (col == selection.mark.col
3147 && (row == selection.mark.row + view_start))) 3238 && (row == selection.mark.row - view_start)))
3148 { 3239 {
3149 /* select nothing */ 3240 /* select nothing */
3150 selection.beg.row = selection.end.row = 0; 3241 selection.beg.row = selection.end.row = 0;
3151 selection.beg.col = selection.end.col = 0; 3242 selection.beg.col = selection.end.col = 0;
3152 selection.clicks = 4; 3243 selection.clicks = 4;
… …
3165/* ------------------------------------------------------------------------- */ 3256/* ------------------------------------------------------------------------- */
3166/* 3257/*
3167 * Extend the selection to the specified col/row 3258 * Extend the selection to the specified col/row
3168 */ 3259 */
3169void 3260void
3170rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3261rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3171{ 3262{
3172 row_col_t pos; 3263 row_col_t pos;
3173 enum { 3264 enum {
3174 LEFT, RIGHT 3265 LEFT, RIGHT
3175 } closeto = RIGHT; 3266 } closeto = RIGHT;
… …
3207 selection.beg.col = selection.end.col = selection.mark.col; 3298 selection.beg.col = selection.end.col = selection.mark.col;
3208 selection.beg.row = selection.end.row = selection.mark.row; 3299 selection.beg.row = selection.end.row = selection.mark.row;
3209 } 3300 }
3210 3301
3211 pos.col = col; 3302 pos.col = col;
3212 pos.row = row - view_start; 3303 pos.row = view_start + row;
3213 3304
3214 /* 3305 /*
3215 * This is mainly xterm style selection with a couple of differences, mainly 3306 * This is mainly xterm style selection with a couple of differences, mainly
3216 * in the way button3 drag extension works. 3307 * in the way button3 drag extension works.
3217 * We're either doing: button1 drag; button3 press; or button3 drag 3308 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3278 3369
3279 if (selection.clicks == 1) 3370 if (selection.clicks == 1)
3280 { 3371 {
3281 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3372 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3282 && !ROW(selection.beg.row).is_longer () 3373 && !ROW(selection.beg.row).is_longer ()
3283#if ENABLE_FRILLS 3374#if !ENABLE_MINIMAL
3284 && !selection.rect 3375 && !selection.rect
3285#endif 3376#endif
3286 ) 3377 )
3287 selection.beg.col = ncol; 3378 selection.beg.col = ncol;
3288 3379
3289 if ( 3380 if (
3290 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3381 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3291 && !ROW(selection.end.row).is_longer () 3382 && !ROW(selection.end.row).is_longer ()
3292#if ENABLE_FRILLS 3383#if !ENABLE_MINIMAL
3293 && !selection.rect 3384 && !selection.rect
3294#endif 3385#endif
3295 ) 3386 )
3296 selection.end.col = ncol; 3387 selection.end.col = ncol;
3297 } 3388 }
… …
3314 { 3405 {
3315 if (!ROW(end_row).is_longer ()) 3406 if (!ROW(end_row).is_longer ())
3316 { 3407 {
3317 selection.end.row = end_row; 3408 selection.end.row = end_row;
3318 selection.end.col = ROW(end_row).l; 3409 selection.end.col = ROW(end_row).l;
3410# if !ENABLE_MINIMAL
3319 selection_remove_trailing_spaces (); 3411 selection_remove_trailing_spaces ();
3412# endif
3320 break; 3413 break;
3321 } 3414 }
3322 } 3415 }
3323 } 3416 }
3324 else 3417 else
… …
3353 selection.mark.row = selection.beg.row; 3446 selection.mark.row = selection.beg.row;
3354 selection.mark.col = selection.beg.col; 3447 selection.mark.col = selection.beg.col;
3355 } 3448 }
3356 } 3449 }
3357 3450
3358#if ENABLE_FRILLS 3451#if !ENABLE_MINIMAL
3359 if (selection.rect && selection.beg.col > selection.end.col) 3452 if (selection.rect && selection.beg.col > selection.end.col)
3360 ::swap (selection.beg.col, selection.end.col); 3453 ::swap (selection.beg.col, selection.end.col);
3361#endif 3454#endif
3362} 3455}
3363 3456
3364#if ENABLE_FRILLS 3457#if !ENABLE_MINIMAL
3365void 3458void
3366rxvt_term::selection_remove_trailing_spaces () 3459rxvt_term::selection_remove_trailing_spaces () NOTHROW
3367{ 3460{
3368 int32_t end_col, end_row; 3461 int32_t end_col, end_row;
3369 text_t *stp; 3462 text_t *stp;
3370 3463
3371 end_col = selection.end.col; 3464 end_col = selection.end.col;
… …
3409/* 3502/*
3410 * Double click on button 3 when already selected 3503 * Double click on button 3 when already selected
3411 * EXT: button 3 double click 3504 * EXT: button 3 double click
3412 */ 3505 */
3413void 3506void
3414rxvt_term::selection_rotate (int x, int y) 3507rxvt_term::selection_rotate (int x, int y) NOTHROW
3415{ 3508{
3416 selection.clicks = selection.clicks % 3 + 1; 3509 selection.clicks = selection.clicks % 3 + 1;
3417 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3510 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3418} 3511}
3419 3512
… …
3421/* 3514/*
3422 * Respond to a request for our current selection 3515 * Respond to a request for our current selection
3423 * EXT: SelectionRequest 3516 * EXT: SelectionRequest
3424 */ 3517 */
3425void 3518void
3426rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3519rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3427{ 3520{
3428 XSelectionEvent ev; 3521 XSelectionEvent ev;
3429 dDisp;
3430 3522
3431 ev.type = SelectionNotify; 3523 ev.type = SelectionNotify;
3432 ev.property = None; 3524 ev.property = None;
3433 ev.display = rq.display; 3525 ev.display = rq.display;
3434 ev.requestor = rq.requestor; 3526 ev.requestor = rq.requestor;
… …
3448 *target++ = xa[XA_COMPOUND_TEXT]; 3540 *target++ = xa[XA_COMPOUND_TEXT];
3449#if X_HAVE_UTF8_STRING 3541#if X_HAVE_UTF8_STRING
3450 *target++ = xa[XA_UTF8_STRING]; 3542 *target++ = xa[XA_UTF8_STRING];
3451#endif 3543#endif
3452 3544
3453 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3454 32, PropModeReplace, 3546 32, PropModeReplace,
3455 (unsigned char *)target_list, target - target_list); 3547 (unsigned char *)target_list, target - target_list);
3456 ev.property = rq.property; 3548 ev.property = rq.property;
3457 } 3549 }
3458#if TODO // TODO 3550#if TODO // TODO
… …
3461 /* TODO: Handle MULTIPLE */ 3553 /* TODO: Handle MULTIPLE */
3462 } 3554 }
3463#endif 3555#endif
3464 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3465 { 3557 {
3466 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3467 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3559 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3468 ev.property = rq.property; 3560 ev.property = rq.property;
3469 } 3561 }
3470 else if (rq.target == XA_STRING 3562 else if (rq.target == XA_STRING
3471 || rq.target == xa[XA_TEXT] 3563 || rq.target == xa[XA_TEXT]
… …
3495 style = enc_string; 3587 style = enc_string;
3496 else if (target == xa[XA_TEXT]) 3588 else if (target == xa[XA_TEXT])
3497 style = enc_text; 3589 style = enc_text;
3498 else if (target == xa[XA_COMPOUND_TEXT]) 3590 else if (target == xa[XA_COMPOUND_TEXT])
3499 style = enc_compound_text; 3591 style = enc_compound_text;
3500#if ENABLE_FRILLS 3592#if !ENABLE_MINIMAL
3501 else if (target == xa[XA_UTF8_STRING]) 3593 else if (target == xa[XA_UTF8_STRING])
3502 style = enc_utf8; 3594 style = enc_utf8;
3503#endif 3595#endif
3504 else 3596 else
3505 { 3597 {
… …
3516 { 3608 {
3517 cl = L""; 3609 cl = L"";
3518 selectlen = 0; 3610 selectlen = 0;
3519 } 3611 }
3520 3612
3521#if ENABLE_FRILLS 3613#if !ENABLE_MINIMAL
3522 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3614 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3523 // so recode it manually 3615 // so recode it manually
3524 if (style == enc_utf8) 3616 if (style == enc_utf8)
3525 { 3617 {
3526 freect = 1; 3618 freect = 1;
… …
3529 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3530 ct.nitems = strlen ((char *)ct.value); 3622 ct.nitems = strlen ((char *)ct.value);
3531 } 3623 }
3532 else 3624 else
3533#endif 3625#endif
3534 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3535 freect = 1; 3627 freect = 1;
3536 else 3628 else
3537 { 3629 {
3538 /* if we failed to convert then send it raw */ 3630 /* if we failed to convert then send it raw */
3539 ct.value = (unsigned char *)cl; 3631 ct.value = (unsigned char *)cl;
3540 ct.nitems = selectlen; 3632 ct.nitems = selectlen;
3541 ct.encoding = target; 3633 ct.encoding = target;
3542 } 3634 }
3543 3635
3544 XChangeProperty (disp, rq.requestor, rq.property, 3636 XChangeProperty (xdisp, rq.requestor, rq.property,
3545 ct.encoding, 8, PropModeReplace, 3637 ct.encoding, 8, PropModeReplace,
3546 ct.value, (int)ct.nitems); 3638 ct.value, (int)ct.nitems);
3547 ev.property = rq.property; 3639 ev.property = rq.property;
3548 3640
3549 if (freect) 3641 if (freect)
3550 XFree (ct.value); 3642 XFree (ct.value);
3551 } 3643 }
3552 3644
3553 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3554} 3646}
3555 3647
3556/* ------------------------------------------------------------------------- * 3648/* ------------------------------------------------------------------------- *
3557 * MOUSE ROUTINES * 3649 * MOUSE ROUTINES *
3558 * ------------------------------------------------------------------------- */ 3650 * ------------------------------------------------------------------------- */
3559 3651
3560/* 3652/*
3561 * return col/row values corresponding to x/y pixel values 3653 * return col/row values corresponding to x/y pixel values
3562 */ 3654 */
3563void 3655void
3564rxvt_term::pixel_position (int *x, int *y) 3656rxvt_term::pixel_position (int *x, int *y) NOTHROW
3565{ 3657{
3566 *x = Pixel2Col (*x); 3658 *x = Pixel2Col (*x);
3567 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3659 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3568 *y = Pixel2Row (*y); 3660 *y = Pixel2Row (*y);
3569 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3661 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3570} 3662}
3571 3663
3572/* ------------------------------------------------------------------------- */ 3664/* ------------------------------------------------------------------------- */
3573#ifdef USE_XIM 3665#ifdef USE_XIM
3574void 3666void
3575rxvt_term::im_set_position (XPoint &pos) 3667rxvt_term::im_set_position (XPoint &pos) NOTHROW
3576{ 3668{
3577 XWindowAttributes xwa; 3669 XWindowAttributes xwa;
3578 3670
3579 XGetWindowAttributes (display->display, vt, &xwa); 3671 XGetWindowAttributes (xdisp, vt, &xwa);
3580 3672
3581 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3673 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3582 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3583} 3675}
3584#endif 3676#endif
3585 3677
3586#if ENABLE_OVERLAY 3678#if ENABLE_OVERLAY
3587void 3679void
3588rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3680rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3589{ 3681{
3590 if (nrow < 3 || ncol < 3) 3682 if (nrow < 1 || ncol < 1)
3591 return; 3683 return;
3592 3684
3593 want_refresh = 1; 3685 want_refresh = 1;
3594 3686
3595 scr_overlay_off (); 3687 scr_overlay_off ();
… …
3638 *rp = r; 3730 *rp = r;
3639 } 3731 }
3640} 3732}
3641 3733
3642void 3734void
3643rxvt_term::scr_overlay_off () 3735rxvt_term::scr_overlay_off () NOTHROW
3644{ 3736{
3645 if (!ov_text) 3737 if (!ov_text)
3646 return; 3738 return;
3647 3739
3648 want_refresh = 1; 3740 want_refresh = 1;
… …
3656 delete [] ov_text; ov_text = 0; 3748 delete [] ov_text; ov_text = 0;
3657 delete [] ov_rend; ov_rend = 0; 3749 delete [] ov_rend; ov_rend = 0;
3658} 3750}
3659 3751
3660void 3752void
3661rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3753rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3662{ 3754{
3663 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3755 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3664 return; 3756 return;
3665 3757
3666 x++, y++; 3758 x++, y++;
… …
3668 ov_text[y][x] = text; 3760 ov_text[y][x] = text;
3669 ov_rend[y][x] = rend; 3761 ov_rend[y][x] = rend;
3670} 3762}
3671 3763
3672void 3764void
3673rxvt_term::scr_overlay_set (int x, int y, const char *s) 3765rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3674{ 3766{
3675 while (*s) 3767 while (*s)
3676 scr_overlay_set (x++, y, *s++); 3768 scr_overlay_set (x++, y, *s++);
3677} 3769}
3678 3770
3679void 3771void
3680rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3772rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3681{ 3773{
3682 while (*s) 3774 while (*s)
3683 { 3775 {
3684 text_t t = *s++; 3776 text_t t = *s++;
3685 int width = wcwidth (t); 3777 int width = WCWIDTH (t);
3686 3778
3687 while (width--) 3779 while (width--)
3688 { 3780 {
3689 scr_overlay_set (x++, y, t); 3781 scr_overlay_set (x++, y, t);
3690 t = NOCHAR; 3782 t = NOCHAR;
3691 } 3783 }
3692 } 3784 }
3693} 3785}
3694 3786
3695void 3787void
3696rxvt_term::scr_swap_overlay () 3788rxvt_term::scr_swap_overlay () NOTHROW
3697{ 3789{
3698 if (!ov_text) 3790 if (!ov_text)
3699 return; 3791 return;
3700 3792
3701 // swap screen mem with overlay 3793 // swap screen mem with overlay
3702 for (int y = ov_h; y--; ) 3794 for (int y = ov_h; y--; )
3703 { 3795 {
3704 text_t *t1 = ov_text[y]; 3796 text_t *t1 = ov_text[y];
3705 rend_t *r1 = ov_rend[y]; 3797 rend_t *r1 = ov_rend[y];
3706 3798
3707 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3799 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3708 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3800 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3709 3801
3710 for (int x = ov_w; x--; ) 3802 for (int x = ov_w; x--; )
3711 { 3803 {
3712 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3804 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3713 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3805 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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