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