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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
167 nrow = 24; 173 nrow = 24;
168 174
169 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 176 return;
171 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
172 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
174 { 183 {
175 //TODO//FIXME 184 //TODO//FIXME
176 saveLines++; 185 saveLines++;
177 prev_nrow--; 186 prev_nrow--;
178 nsaved++; 187 top_row--;
179 } 188 }
180 189
181 want_refresh = 1; 190 want_refresh = 1;
182 191
183 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
188 197
189 if (!row_buf) 198 if (!row_buf)
190 { 199 {
191 /* 200 /*
192 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 202 */
195 nsaved = 0; /* no saved lines */ 203 top_row = 0;
196 term_start = 0; 204 term_start = 0;
197 205
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 208
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 212
206 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
207 { 214 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 237 selection.text = NULL;
231 selection.len = 0; 238 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
234 selection.clicks = 0; 241 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 243 }
238 else 244 else
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
242 */ 248 */
243
244 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
245 249
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 252
249#if 0 253#if 0
… …
255 lfree (drawn_buf[row]); 259 lfree (drawn_buf[row]);
256 } 260 }
257 } 261 }
258#endif 262#endif
259 263
260 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));
261 temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t));
262 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));
263 266
264 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
265 { 268 {
266 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]); 270 lresize (swap_buf [row]);
… …
271 { 274 {
272 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);
273 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);
274 } 277 }
275 278
279 line_t *old_buf = row_buf;
276 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));
277 281
278 // re-wrap lines, this is rather ugly, possibly because I am too dumb
279 // to come up with a lean and mean algorithm.
280
281 int p = MOD (term_start + nrow , prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
283 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
284 285
285 while (p != pend && q > 0) 286 if (top_row)
287 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
286 { 294 do
287 p = MOD (p - 1, prev_total_rows);
288
289 assert (old_buf [MOD (p, prev_total_rows)].t);
290 assert (!old_buf [MOD (p, prev_total_rows)].is_longer ());
291
292 int llen = old_buf [MOD (p, prev_total_rows)].l;
293
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295 { 295 {
296 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
297 297#ifdef DEBUG_STRICT
298 llen += prev_ncol; 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299 } 299#endif
300
301 int qlines = llen / ncol + 1;
302 int lofs = 0; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 302
304 q -= qlines; 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305
306 int qrow = q;
307
308 for (; qlines--; qrow++)
309 {
310 if (qrow >= 0)
311 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
307 plines++;
308 llen += prev_ncol;
309 }
310
311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
319 int lofs = 0;
320 line_t *qline;
321
322 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++)
324 {
312 line_t &qline = row_buf [qrow]; 325 qline = row_buf + qrow;
313
314 lalloc (qline); 326 lalloc (*qline);
327 qline->l = ncol;
315 qline.set_is_longer (); 328 qline->is_longer (1);
316 329
317 int qcol = 0; 330 int qcol = 0;
318 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
319 for (;;) 335
336 // fill a single destination line
337 while (lofs < llen && qcol < ncol)
320 { 338 {
321 int prow = lofs / prev_ncol + p; 339 int prow = lofs / prev_ncol;
322 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
323 341
342 prow = MOD (p + prow, prev_total_rows);
343
344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
346 // this seems to upset applications/shells/readline
347 // least.
348 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow);
350
324 line_t &pline = old_buf [p]; 351 line_t &pline = old_buf [prow];
325 352
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327 354
328 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
329
330 if (len <= 0)
331 {
332 qline.l = qcol;
333 scr_blank_line (qline, qcol, ncol - qcol, DEFAULT_RSTYLE);
334 break;
335 }
336
337 assert (lofs < 1000);
338
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341 357
342 lofs += len; 358 lofs += len;
343 qcol += len; 359 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 } 360 }
348 } 361 }
349 else 362
350 lofs += ncol; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
364 qline->is_longer (0);
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351 } 366 }
367 while (p != pend && q > 0);
368
369 term_start = total_rows - nrow;
370 top_row = q - term_start;
371
372 // make sure all terminal lines exist
373 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 }
376 else
377 {
378 // if no scrollback exists (yet), wing, instead of wrap
379
380 for (int row = min (nrow, prev_nrow); row--; )
381 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row];
384
385 qline = pline;
386 lresize (qline);
387 }
388
389 for (int row = prev_nrow; row < nrow; row++)
390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
393
394 term_start = 0;
352 } 395 }
353 396
354 free (old_buf); 397 free (old_buf);
355 delete old_ta; 398 delete old_ta;
356 delete old_ra; 399 delete old_ra;
357 400
358 min_it (screen.cur.row, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
359 min_it (screen.cur.col, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
360 403
361 if (tabs)
362 free (tabs); 404 free (tabs);
363 } 405 }
406
407 CLEAR_ALL_SELECTION ();
364 408
365 prev_nrow = nrow; 409 prev_nrow = nrow;
366 prev_ncol = ncol; 410 prev_ncol = ncol;
367 411
368 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
369 413
370 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
371 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
372 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
373 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
374} 423}
375 424
376/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
377/* 426/*
378 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
379 */ 428 */
380void 429void
381rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
382{ 431{
432 if (row_buf)
433 {
383 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
384 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
385 436
386 free (row_buf); 437 free (row_buf);
387 free (swap_buf); 438 free (swap_buf);
388 free (drawn_buf); 439 free (drawn_buf);
389 free (temp_buf);
390 free (tabs); 440 free (tabs);
441
442 row_buf = 0; // signal that we freed all the arrays
443 }
391} 444}
392 445
393/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
394/* 447/*
395 * Hard reset 448 * Hard reset
… …
400 scr_release (); 453 scr_release ();
401 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
402 scr_reset (); 455 scr_reset ();
403 456
404 scr_clear (true); 457 scr_clear (true);
405 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
406} 459}
407 460
408/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
409 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
410 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
412 * Save and Restore cursor 465 * Save and Restore cursor
413 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
414 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
415 */ 468 */
416void 469void
417rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
418{ 471{
419 screen_t *s; 472 screen_t *s;
420 473
421#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
422 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
451 min_it (s->cur.row, nrow - 1); 504 min_it (s->cur.row, nrow - 1);
452 min_it (s->cur.col, ncol - 1); 505 min_it (s->cur.col, ncol - 1);
453#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
454 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
455 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
456#else /* drive with your eyes closed */
457 max_it (s->cur.row, 0);
458 max_it (s->cur.col, 0);
459#endif 509#endif
510}
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);
460} 525}
461 526
462/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
463/* 528/*
464 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
465 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
466 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
467 */ 532 */
468int 533void
469rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
470{ 535{
536 if (scrn == current_screen)
537 return;
538
471 want_refresh = 1; 539 want_refresh = 1;
472 view_start = 0; 540 view_start = 0;
473 541
474 if (current_screen == scrn)
475 return scrn;
476
477 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
478 543
479 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
480 545
481 ::swap (screen.cur.row, swap.cur.row);
482 ::swap (screen.cur.col, swap.cur.col);
483
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486
487#if NSCREENS 546#if NSCREENS
488 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
489 { 548 {
490 num_scr = 0; 549 num_scr = 0;
491 550
492 for (int i = nrow; i--; ) 551 scr_swap_screen ();
493 ::swap (ROW(i), swap_buf [i]);
494 552
495 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
499 } 557 }
500 else 558 else
501#endif 559#endif
502 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504
505 return scrn;
506} 562}
507 563
508// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
509void 565void
510rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
511{ 567{
512 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
513 return; 569 return;
514 570
515 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
525/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
526/* 582/*
527 * Change the colour for following text 583 * Change the colour for following text
528 */ 584 */
529void 585void
530rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
531{ 587{
532 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533 color = fgbg; 589 color = fgbg;
534 590
535 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
536 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
537 else 593 else
… …
541/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
542/* 598/*
543 * Change the rendition style for following text 599 * Change the rendition style for following text
544 */ 600 */
545void 601void
546rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
547 { 603 {
548 if (set) 604 if (set)
549 rstyle |= style; 605 rstyle |= style;
550 else if (style == ~RS_None) 606 else if (style == ~RS_None)
551 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
558 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
559 * count positive ==> scroll up 615 * count positive ==> scroll up
560 * count negative ==> scroll down 616 * count negative ==> scroll down
561 */ 617 */
562int 618int
563rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
564{ 620{
565 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
566 return 0; 622 return 0;
567 623
568 want_refresh = 1; 624 want_refresh = 1;
569 num_scr += count; 625 num_scr += count;
570 626
571 if (count > 0 627 if (count > 0
572 && row1 == 0 628 && row1 == 0
573 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 630 {
576 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
577 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
578 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 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
579 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
580 { 670 {
581 selection.beg.row -= count; 671 selection.beg.row -= count;
582 selection.end.row -= count; 672 selection.end.row -= count;
583 selection.mark.row -= count; 673 selection.mark.row -= count;
584 674
585 selection_check (0); 675 if (selection.beg.row < top_row
586 } 676 || selection.end.row < top_row
587 677 || selection.mark.row < top_row)
588 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle);
590
591 if ((options & Opt_scrollWithBuffer)
592 && view_start != 0
593 && view_start != saveLines)
594 scr_page (UP, count);
595 }
596 else
597 {
598 if (selection.op && current_screen == selection.screen)
599 {
600 int i = selection.beg.row;
601 int j = selection.end.row;
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1)
606 || (i - count > row2 && i <= row2)
607 || (j - count < row1 && j >= row1)
608 || (j - count > row2 && j <= row2))
609 { 678 {
610 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 680 selection.op = SELECTION_CLEAR;
612 } 681 }
613 else if (j >= row1 && j <= row2) 682 }
683
684 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer)
686 && view_start != 0
687 && view_start != -saveLines)
688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
692 }
693 else
694 {
695 if (selection.op && current_screen == selection.screen)
696 {
697 if ((selection.beg.row < row1 && selection.end.row > row1)
698 || (selection.beg.row < row2 && selection.end.row > row2)
699 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
700 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
701 || (selection.end.row - count < row1 && selection.end.row >= row1)
702 || (selection.end.row - count > row2 && selection.end.row <= row2))
703 {
704 CLEAR_ALL_SELECTION ();
705 selection.op = SELECTION_CLEAR;
706 }
707 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 708 {
615 /* move selected region too */ 709 /* move selected region too */
616 selection.beg.row -= count; 710 selection.beg.row -= count;
617 selection.end.row -= count; 711 selection.end.row -= count;
618 selection.mark.row -= count; 712 selection.mark.row -= count;
… …
626 720
627 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
628 722
629 min_it (count, rows); 723 min_it (count, rows);
630 724
725 line_t *temp_buf = row_buf + total_rows;
726
631 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
632 { 728 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634 730
635 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
646/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
647/* 743/*
648 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
649 */ 745 */
650void 746void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
652{ 748{
653 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
654 return; 750 return;
655 751
656 unsigned char checksel; 752 unsigned char checksel;
657 unicode_t c; 753 unicode_t c;
658 int row, last_col; 754 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 755 const wchar_t *strend = str + len;
660 756
661 want_refresh = 1; 757 want_refresh = 1;
662 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 759
665 if (nlines > 0) 760 if (minlines > 0)
666 { 761 {
667 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
764
668 if (nlines > 0 765 if (minlines > 0
669 && screen.tscroll == 0 766 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 767 && screen.bscroll == nrow - 1)
671 { 768 {
672 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
675 } 772 }
676 } 773 }
677 774
678#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 777 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 778 && screen.cur.row >= top_row);
682#else /* drive with your eyes closed */
683 min_it (screen.cur.col, last_col - 1);
684 clamp_it (screen.cur.row, -nsaved, nrow - 1);
685#endif 779#endif
686 row = screen.cur.row; 780 int row = screen.cur.row;
687 781
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 783
690 line_t *line = &ROW(row); 784 line_t *line = &ROW(row);
691 785
692 while (str < strend) 786 while (str < strend)
693 { 787 {
694 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695 789
696 if (c < 0x20) 790 if (c < 0x20)
697 if (c == C0_LF) 791 if (c == C0_LF)
698 { 792 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 793 max_it (line->l, screen.cur.col);
701 794
702 screen.flags &= ~Screen_WrapNext; 795 screen.flags &= ~Screen_WrapNext;
703 796
704 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
709 line = &ROW(row); /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
710 continue; 803 continue;
711 } 804 }
712 else if (c == C0_CR) 805 else if (c == C0_CR)
713 { 806 {
714 if (!line->is_longer ()) /* XXX: think about this */
715 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
716 808
717 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
718 screen.cur.col = 0; 810 screen.cur.col = 0;
719 continue; 811 continue;
720 } 812 }
… …
737 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
738 } 830 }
739 831
740 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
741 { 833 {
742 line->set_is_longer ();
743
744 scr_do_wrap (); 834 scr_do_wrap ();
745 835
836 line->l = ncol;
837 line->is_longer (1);
838
746 row = screen.cur.row; 839 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
748 } 841 }
749 842
750 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
751 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
752 c = 0xfffd; 845 c = 0xfffd;
753 846
754 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
755 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
756 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
757 // locale. 850 // locale.
758 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
759 852
760 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
761 { 854 {
762 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
763 // 5f-7e standard vt100 856 // 5f-7e standard vt100
764 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
765 static uint16_t vt100_0[62] = { // 41 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
817 } 910 }
818 911
819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820 913
821 // if the character doesn't fit into the remaining columns... 914 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width) 915 if (screen.cur.col > ncol - width && ncol >= width)
823 { 916 {
824 // ...output spaces 917 // ...output spaces
825 c = ' '; 918 c = ' ';
826 // and try the same character next loop iteration 919 // and try the same character next loop iteration
827 --str; 920 --str;
828 } 921 }
829 922
923 line->touch ();
924
830 do 925 do
831 { 926 {
832 line->t[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
833 line->r[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
834 929
835 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
836 screen.cur.col++; 931 screen.cur.col++;
837 else 932 else
838 { 933 {
839 line->l = last_col; 934 line->l = ncol;
840 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
841 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
842 break; 937 break;
843 } 938 }
844 939
… …
846 } 941 }
847 while (--width > 0); 942 while (--width > 0);
848 943
849 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
850 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
851 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852 { 950 {
853 line->t[c] = ' '; 951 line->t[c] = ' ';
854 line->r[c] = rend; 952 line->r[c] = rend;
855 } 953 }
954 }
856 } 955 }
857 else // width == 0 956 else // width == 0
858 { 957 {
859#if ENABLE_COMBINING 958#if ENABLE_COMBINING
860 // handle combining characters 959 // handle combining characters
861 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
862 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
863 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
864 text_t *tp; 964 text_t *tp;
865 rend_t *rp; 965 rend_t *rp;
866 966
867 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
868 { 968 {
969 linep = line;
869 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
870 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
871
872 while (*tp == NOCHAR && tp > line->t)
873 tp--, rp--;
874 } 972 }
875 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
876 && ROW(screen.cur.row - 1).is_longer ()) 974 && ROW(screen.cur.row - 1).is_longer ())
877 { 975 {
878 line_t *line = &ROW(screen.cur.row - 1); 976 linep = &ROW(screen.cur.row - 1);
879
880 tp = line->t + last_col - 1; 977 tp = line->t + ncol - 1;
881 rp = line->r + last_col - 1; 978 rp = line->r + ncol - 1;
882
883 while (*tp == NOCHAR && tp > line->t)
884 tp--, rp--;
885 } 979 }
886 else 980 else
887 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
888 987
889 // first try to find a precomposed character 988 // first try to find a precomposed character
890 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
891 if (n == NOCHAR) 990 if (n == NOCHAR)
892 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896#endif 995#endif
897 } 996 }
898 } 997 }
899 998
900 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 999 max_it (line->l, screen.cur.col);
902 1000
903#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 1003#endif
908} 1004}
909 1005
910/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
911/* 1007/*
912 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
913 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
914 */ 1010 */
915void 1011void
916rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
917{ 1013{
918 want_refresh = 1; 1014 want_refresh = 1;
919 1015
920 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
921 { 1017 {
… …
939 * Process Horizontal Tab 1035 * Process Horizontal Tab
940 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
941 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
942 */ 1038 */
943void 1039void
944rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
945{ 1041{
946 int i, x; 1042 int i, x;
947 1043
948 want_refresh = 1; 1044 want_refresh = 1;
949 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
950 1046
951 if (count == 0) 1047 if (count == 0)
952 return; 1048 return;
953 else if (count > 0) 1049 else if (count > 0)
954 { 1050 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 1051 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 1052 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 1053 ht &= l.t[i] == ' ';
960 1054
961 for (; ++i < ncol; ) 1055 for (; ++i < ncol; )
962 if (tabs[i]) 1056 if (tabs[i])
963 { 1057 {
964 x = i; 1058 x = i;
1059
965 if (!--count) 1060 if (!--count)
966 break; 1061 break;
967 } 1062 }
968 else 1063 else
969 ht &= l.t[i] == ' ' 1064 ht &= l.t[i] == ' '
… …
972 if (count) 1067 if (count)
973 x = ncol - 1; 1068 x = ncol - 1;
974 1069
975 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
976 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
977 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
978 { 1073 {
979 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
980 1075
981 if (!l.is_longer ()) /* XXX: think about this */ 1076 l.touch (x);
982 max_it (l.l, x);
983 1077
984 i = screen.cur.col; 1078 i = screen.cur.col;
985 1079
986 l.t[i] = '\t'; 1080 l.t[i] = '\t';
987 l.r[i] = base_rend; 1081 l.r[i] = base_rend;
… …
1018 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1019 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1020 */ 1114 */
1021#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1022void 1116void
1023rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1024{ 1118{
1025 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1026 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1027 else 1121 else
1028 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1035 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1036 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1037 */ 1131 */
1038#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1039void 1133void
1040rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1041{ 1135{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1138 else
1047 { 1139 {
1048 row = screen.cur.row; 1140 line_t &l = ROW(screen.cur.row);
1049 1141
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1142 l.touch ();
1051 ROW(row).l = ncol; 1143 l.is_longer (0);
1052 1144
1053 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1148 }
… …
1060/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1061/* 1153/*
1062 * Goto Row/Column 1154 * Goto Row/Column
1063 */ 1155 */
1064void 1156void
1065rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1066{ 1158{
1067 want_refresh = 1; 1159 want_refresh = 1;
1068 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1069 1161
1070 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1108/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1109/* 1201/*
1110 * direction should be UP or DN 1202 * direction should be UP or DN
1111 */ 1203 */
1112void 1204void
1113rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1114{ 1206{
1115 int dirn; 1207 int dirn;
1116 1208
1117 want_refresh = 1; 1209 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1137 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1138 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1232 */
1141void 1233void
1142rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1143{ 1235{
1144 unsigned int row, col, num; 1236 unsigned int col, num;
1145 1237
1146 want_refresh = 1; 1238 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1148 1240
1149 selection_check (1); 1241 selection_check (1);
1150 1242
1151 row = screen.cur.row; 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1152 1247
1153 switch (mode) 1248 switch (mode)
1154 { 1249 {
1155 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1251 col = screen.cur.col;
1157 num = ncol - col; 1252 num = ncol - col;
1158 min_it (ROW(row).l, col); 1253 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1256 CLEAR_SELECTION ();
1162 break; 1257 break;
1163 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
… …
1168 CLEAR_SELECTION (); 1263 CLEAR_SELECTION ();
1169 break; 1264 break;
1170 case 2: /* erase whole line */ 1265 case 2: /* erase whole line */
1171 col = 0; 1266 col = 0;
1172 num = ncol; 1267 num = ncol;
1173 ROW(row).l = 0; 1268 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1269 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1270 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1177 break; 1272 break;
1178 default: 1273 default:
1179 return; 1274 return;
1180 } 1275 }
1181 1276
1182 scr_blank_line (ROW(row), col, num, rstyle); 1277 scr_blank_line (line, col, num, rstyle);
1183} 1278}
1184 1279
1185/* ------------------------------------------------------------------------- */ 1280/* ------------------------------------------------------------------------- */
1186/* 1281/*
1187 * Erase part of whole of the screen 1282 * Erase part of whole of the screen
1188 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1189 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1190 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1191 */ 1286 */
1192void 1287void
1193rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1194{ 1289{
1195 int num; 1290 int num;
1196 int32_t row; 1291 int32_t row;
1197 rend_t ren; 1292 rend_t ren;
1198 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1242 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1243 } 1338 }
1244 else 1339 else
1245 { 1340 {
1246 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1250 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1347 }
1253 1348
1254 for (; num--; row++) 1349 for (; num--; row++)
1255 { 1350 {
1256 scr_blank_screen_mem (ROW (row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1353 }
1260} 1354}
1261 1355
1262#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1263void 1357void
1264rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1265{ 1359{
1266 want_refresh = 1; 1360 want_refresh = 1;
1267 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1268 1362
1269 nsaved = 0; 1363 top_row = 0;
1270} 1364}
1271#endif 1365#endif
1272 1366
1273/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1274/* 1368/*
1275 * Fill the screen with `E's 1369 * Fill the screen with `E's
1276 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1277 */ 1371 */
1278void 1372void
1279rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1280{ 1374{
1281 rend_t fs; 1375 rend_t fs;
1282 1376
1283 want_refresh = 1; 1377 want_refresh = 1;
1284 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1295 rend_t *r1 = line.r; 1389 rend_t *r1 = line.r;
1296 1390
1297 for (int j = ncol; j--; ) 1391 for (int j = ncol; j--; )
1298 *r1++ = fs; 1392 *r1++ = fs;
1299 1393
1300 line.l = ncol; /* make the `E's selectable */ 1394 line.is_longer (0);
1395 line.touch (ncol);
1301 } 1396 }
1302} 1397}
1303 1398
1304/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1305/* 1400/*
1306 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1307 */ 1402 */
1308void 1403void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1310{ 1405{
1311 int end; 1406 int end;
1312 1407
1313 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1314 1409
… …
1334/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1335/* 1430/*
1336 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1337 */ 1432 */
1338void 1433void
1339rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1340{ 1435{
1341 int col, row; 1436 int col, row;
1342 rend_t tr; 1437 rend_t tr;
1343 1438
1344 want_refresh = 1; 1439 want_refresh = 1;
… …
1353 min_it (count, ncol - screen.cur.col); 1448 min_it (count, ncol - screen.cur.col);
1354 1449
1355 row = screen.cur.row; 1450 row = screen.cur.row;
1356 1451
1357 line_t *line = &ROW(row); 1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1358 1456
1359 switch (insdel) 1457 switch (insdel)
1360 { 1458 {
1361 case INSERT: 1459 case INSERT:
1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363 { 1461 {
1364 line->t[col] = line->t[col - count]; 1462 line->t[col] = line->t[col - count];
1365 line->r[col] = line->r[col - count]; 1463 line->r[col] = line->r[col - count];
1366 } 1464 }
1367 1465
1368 if (!line->is_longer ()) 1466 line->l = min (line->l + count, ncol);
1369 {
1370 line->l += count;
1371 min_it (line->l, ncol);
1372 }
1373 1467
1374 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376 { 1470 {
1377 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
… …
1390 1484
1391 case ERASE: 1485 case ERASE:
1392 screen.cur.col += count; /* don't worry if > ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1487 selection_check (1);
1394 screen.cur.col -= count; 1488 screen.cur.col -= count;
1489
1490 line->l = max (line->l - count, 0);
1395 scr_blank_line (*line, screen.cur.col, count, rstyle); 1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1396 break; 1492 break;
1397 1493
1398 case DELETE: 1494 case DELETE:
1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1402 { 1498 {
1403 line->t[col] = line->t[col + count]; 1499 line->t[col] = line->t[col + count];
1404 line->r[col] = line->r[col + count]; 1500 line->r[col] = line->r[col + count];
1405 } 1501 }
1406 1502
1503 line->l = max (line->l - count, 0);
1407 scr_blank_line (*line, ncol - count, count, tr); 1504 scr_blank_line (*line, ncol - count, count, tr);
1408
1409 if (line->is_longer ()) /* break line continuation */
1410 line->l = ncol;
1411
1412 line->l = max (line->l - count, 0);
1413 1505
1414 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416 { 1508 {
1417 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
… …
1435/* 1527/*
1436 * Set the scrolling region 1528 * Set the scrolling region
1437 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1438 */ 1530 */
1439void 1531void
1440rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1441{ 1533{
1442 max_it (top, 0); 1534 max_it (top, 0);
1443 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1444 1536
1445 if (top > bot) 1537 if (top > bot)
… …
1455 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1456 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1457 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1458 */ 1550 */
1459void 1551void
1460rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1461{ 1553{
1462 want_refresh = 1; 1554 want_refresh = 1;
1463 1555
1464 if (mode) 1556 if (mode)
1465 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1472 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1473 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1474 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1475 */ 1567 */
1476void 1568void
1477rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1478{ 1570{
1479 if (mode) 1571 if (mode)
1480 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1481 else 1573 else
1482 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1491 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1492 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1493 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1494 */ 1586 */
1495void 1587void
1496rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1497{ 1589{
1498 if (mode) 1590 if (mode)
1499 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1500 else 1592 else
1501 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1508 * Set insert/replace mode 1600 * Set insert/replace mode
1509 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1510 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1511 */ 1603 */
1512void 1604void
1513rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1514{ 1606{
1515 if (mode) 1607 if (mode)
1516 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1517 else 1609 else
1518 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1524 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1525 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1526 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1527 */ 1619 */
1528void 1620void
1529rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1530{ 1622{
1531 if (mode < 0) 1623 if (mode < 0)
1532 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1533 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1534 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1535} 1627}
1536 1628
1537/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1538/* 1630/*
1539 * Set reverse/normal video 1631 * Set reverse/normal video
1540 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1541 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1542 */ 1634 */
1543void 1635void
1544rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1545{ 1637{
1546 XGCValues gcvalue; 1638 rvideo_mode = on;
1547 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1548 if (rvideo != mode) 1644 if (rvideo_state != on)
1549 { 1645 {
1550 rvideo = mode; 1646 rvideo_state = on;
1647
1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1553 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1554#endif 1651#endif
1555#if TRANSPARENT 1652#if TRANSPARENT
1556 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1557#endif 1654#endif
1558 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1559 pix_colors[Color_bg]);
1560 1656
1657 XGCValues gcvalue;
1561 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1562 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1563 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1564 &gcvalue); 1661
1565 scr_clear (); 1662 scr_clear ();
1566 scr_touch (true); 1663 scr_touch (true);
1567 } 1664 }
1568} 1665}
1569 1666
… …
1571/* 1668/*
1572 * Report current cursor position 1669 * Report current cursor position
1573 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1574 */ 1671 */
1575void 1672void
1576rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1577{ 1674{
1578 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1579} 1676}
1580 1677
1581/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1584 1681
1585/* 1682/*
1586 * Set font style 1683 * Set font style
1587 */ 1684 */
1588void 1685void
1589rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1590{ 1687{
1688#if 0
1591 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1592 { 1690 {
1593 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1594 break; 1692 break;
1595 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1596 break; 1694 break;
… …
1603 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1604 break; 1702 break;
1605 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1606 break; 1704 break;
1607 } 1705 }
1706#endif
1608} 1707}
1609 1708
1610/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1611/* 1710/*
1612 * Choose a font 1711 * Choose a font
… …
1614 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1615 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1616 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1617 */ 1716 */
1618void 1717void
1619rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1620{ 1719{
1621 screen.charset = set; 1720 screen.charset = set;
1622 set_font_style (); 1721 set_font_style ();
1623} 1722}
1624 1723
… …
1630 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1631 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1632 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1633 */ 1732 */
1634void 1733void
1635rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1636{ 1735{
1637 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1638 set_font_style (); 1737 set_font_style ();
1639} 1738}
1640 1739
… …
1645 1744
1646/* 1745/*
1647 * refresh matching text. 1746 * refresh matching text.
1648 */ 1747 */
1649bool 1748bool
1650rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1651{ 1750{
1652 bool found = false; 1751 bool found = false;
1653 1752
1654 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1655 { 1754 {
… …
1675 PART_END, 1774 PART_END,
1676 RC_COUNT 1775 RC_COUNT
1677}; 1776};
1678 1777
1679void 1778void
1680rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1681{ 1780{
1682 int i; 1781 int i;
1683 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1684 1783
1685 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1689 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1690 { 1789 {
1691 y = 0; 1790 y = 0;
1692 eheight = height; 1791 eheight = height;
1693 } 1792 }
1694#endif
1695
1696#ifdef DEBUG_STRICT
1697#if 0
1698 // that's not debugging //TODO //FIXME
1699 clamp_it (x, 0, width);
1700 clamp_it (y, 0, height);
1701#endif
1702#endif 1793#endif
1703 1794
1704 /* round down */ 1795 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
… …
1716 } 1807 }
1717 1808
1718 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1719 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1720 1811
1812 num_scr_allow = 0;
1813
1721 if (refresh) 1814 if (refresh)
1722 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1723} 1816}
1724 1817
1725/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1726/* 1819/*
1727 * Refresh the entire screen 1820 * Refresh the entire screen
1728 */ 1821 */
1729void 1822void
1730rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1731{ 1824{
1732 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1733} 1826}
1734 1827
1735/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1736/* 1829/*
1737 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1738 * the top of the screen 1831 * the top of the screen
1739 */ 1832 */
1740int 1833void
1741rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1742{ 1835{
1743 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1744 unsigned int oldviewstart;
1745
1746 oldviewstart = view_start;
1747
1748 if (y < len)
1749 {
1750 p = (nrow + nsaved) * (len - y) / len;
1751 p -= (long) (nrow - 1);
1752 p = max (p, 0);
1753 }
1754
1755 view_start = (unsigned int)min (p, nsaved);
1756
1757 return scr_changeview (oldviewstart);
1758} 1837}
1759 1838
1760/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1761/* 1840/*
1762 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1763 * direction should be UP or DN 1842 * direction should be UP or DN
1764 */ 1843 */
1765int 1844bool
1766rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1767{ 1846{
1768 int n; 1847 int new_view_start =
1769 unsigned int oldviewstart;
1770
1771 oldviewstart = view_start;
1772
1773 if (direction == UP)
1774 {
1775 n = view_start + nlines;
1776 view_start = min (n, nsaved);
1777 }
1778 else
1779 {
1780 n = view_start - nlines; 1848 direction == UP ? view_start - nlines
1781 view_start = max (n, 0); 1849 : view_start + nlines;
1782 }
1783 1850
1784 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1785} 1852}
1786 1853
1787int 1854bool
1788rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1789{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1790 if (view_start != oldviewstart) 1859 if (new_view_start == view_start)
1791 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1792 want_refresh = 1; 1864 want_refresh = 1;
1793 num_scr -= (view_start - oldviewstart);
1794 }
1795 1865
1796 return (int) (view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1797}
1798 1867
1799/* ------------------------------------------------------------------------- */ 1868 return true;
1869}
1870
1871#ifndef NO_BELL
1800void 1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1801rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1802{ 1883{
1803#ifndef NO_BELL 1884#ifndef NO_BELL
1804 1885
1805# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1806# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1807 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1808# endif 1889# endif
1809 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1810# endif 1891# endif
1811 1892
1812 if (options & Opt_visualBell) 1893 if (OPTION (Opt_visualBell))
1813 { 1894 {
1814 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1815 rxvt_usleep (VISUAL_BELL_DURATION); 1896 scr_rvideo_mode (rvideo_mode);
1816 scr_rvideo_mode (!rvideo); /* refresh also done */ 1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1817 } 1900 }
1818 else 1901 else
1819 XBell (display->display, 0); 1902 XBell (display->display, 0);
1820 1903
1821#endif 1904#endif
1822} 1905}
1823 1906
1824/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1825/* ARGSUSED */ 1908/* ARGSUSED */
1826void 1909void
1827rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1828{ 1911{
1829#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1830 int nrows, row_start; 1913 int nrows, row_start;
1831 FILE *fd; 1914 FILE *fd;
1832 1915
1833 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1834 return; 1917 return;
1835 1918
1836 if (fullhist) 1919 if (fullhist)
1837 { 1920 {
1838 nrows = nrow + nsaved; 1921 nrows = nrow - top_row;
1839 row_start = -nsaved; 1922 row_start = top_row;
1840 } 1923 }
1841 else 1924 else
1842 { 1925 {
1843 nrows = nrow; 1926 nrows = nrow;
1844 row_start = -view_start; 1927 row_start = view_start;
1845 } 1928 }
1846 1929
1847 wctomb (0, 0); 1930 wctomb (0, 0);
1848 1931
1849 for (int r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
… …
1881 * Refresh the screen 1964 * Refresh the screen
1882 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1883 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1884 */ 1967 */
1885void 1968void
1886rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1887{ 1970{
1888 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1889 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1890 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1891 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
… …
1908 1991
1909#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
1910 must_clear |= bgPixmap.pixmap != None; 1993 must_clear |= bgPixmap.pixmap != None;
1911#endif 1994#endif
1912#if TRANSPARENT 1995#if TRANSPARENT
1913 must_clear |= (options & Opt_transparent) && am_transparent; 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1914#endif 1997#endif
1915 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1916 1999
1917 /* 2000 /*
1918 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
1942 2025
1943 crp = &ROW(screen.cur.row).r[col]; 2026 crp = &ROW(screen.cur.row).r[col];
1944 2027
1945 if (showcursor && focus) 2028 if (showcursor && focus)
1946 { 2029 {
1947 if (options & Opt_cursorUnderline) 2030 if (OPTION (Opt_cursorUnderline))
1948 *crp ^= RS_Uline; 2031 *crp ^= RS_Uline;
1949 else 2032 else
1950 { 2033 {
1951 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
1952 2035
… …
1954 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
1955 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
1956 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
1957 else 2040 else
1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
1960#else 2043#else
1961 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
1962#endif 2045#endif
1963 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
1964 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
1965 else 2048 else
1966#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1967 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
1968#else 2051#else
1969 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
1970#endif 2053#endif
1971 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
1972 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1977 2060
1978 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
1979 setoldcursor = 0; 2062 setoldcursor = 0;
1980 if (ocrow != -1) 2063 if (ocrow != -1)
1981 { 2064 {
1982 if (screen.cur.row + view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
1983 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
1984 { 2067 {
1985 if (ocrow < nrow 2068 if (ocrow < nrow
1986 && oldcursor.col < ncol) 2069 && oldcursor.col < ncol)
1987 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
1995 else if (!focus) 2078 else if (!focus)
1996 setoldcursor = 1; 2079 setoldcursor = 1;
1997 2080
1998 if (setoldcursor) 2081 if (setoldcursor)
1999 { 2082 {
2000 if (screen.cur.row + view_start >= nrow) 2083 if (screen.cur.row - view_start >= nrow)
2001 oldcursor.row = -1; 2084 oldcursor.row = -1;
2002 else 2085 else
2003 { 2086 {
2004 oldcursor.row = screen.cur.row + view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2005 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2006 } 2089 }
2007 } 2090 }
2008 } 2091 }
2009 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2010#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2011 scr_swap_overlay (); 2095 scr_swap_overlay ();
2012#endif 2096#endif
2013 2097
2014#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2015 /* 2099 /*
2016 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2017 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2018 */ 2102 */
2019 i = num_scr;
2020 if (!display->is_local 2103 if (!display->is_local
2021 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2022 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2023 { 2106 {
2024 int16_t nits; 2107 int16_t nits;
2025 int j; 2108 int j;
2026 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2027 2111
2028 j = nrow; 2112 j = nrow;
2029 wlen = len = -1; 2113 wlen = len = -1;
2030 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2031 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2032 { 2116 {
2033 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2034 { 2118 {
2035 line_t s = ROW(row - view_start); 2119 line_t s = ROW(view_start + row);
2036 line_t d = drawn_buf[row]; 2120 line_t d = drawn_buf[row];
2037 line_t d2 = drawn_buf[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2038 2122
2039 for (nits = 0, col = ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2040 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2064 if (wlen < len) 2148 if (wlen < len)
2065 ::swap (wlen, len); 2149 ::swap (wlen, len);
2066 2150
2067 XCopyArea (display->display, vt, vt, 2151 XCopyArea (display->display, vt, vt,
2068 gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2069 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2070 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2071 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2072 len = -1; 2156 len = -1;
2073 } 2157 }
2074 } 2158 }
… …
2078 /* 2162 /*
2079 * E: main pass across every character 2163 * E: main pass across every character
2080 */ 2164 */
2081 for (row = 0; row < nrow; row++) 2165 for (row = 0; row < nrow; row++)
2082 { 2166 {
2083 text_t *stp = ROW(row - view_start).t; 2167 text_t *stp = ROW(view_start + row).t;
2084 rend_t *srp = ROW(row - view_start).r; 2168 rend_t *srp = ROW(view_start + row).r;
2085 text_t *dtp = drawn_buf[row].t; 2169 text_t *dtp = drawn_buf[row].t;
2086 rend_t *drp = drawn_buf[row].r; 2170 rend_t *drp = drawn_buf[row].r;
2087 2171
2088 /* 2172 /*
2089 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
… …
2153 count++, i--; 2237 count++, i--;
2154 2238
2155 /* 2239 /*
2156 * Determine the attributes for the string 2240 * Determine the attributes for the string
2157 */ 2241 */
2158 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2159 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2160 2244
2161 // only do special processing if any attributes are set, which is rare 2245 // only do special processing if any attributes are set, which is unlikely
2162 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2163 { 2247 {
2164#if ENABLE_STYLES 2248#if ENABLE_STYLES
2165 // force redraw after "careful" characters to avoid pixel droppings 2249 // "careful" (too wide) character handling
2166 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2167 drp[col + 1] = ~srp[col + 1];
2168 2250
2169 // include previous careful character(s) if possible, looks nicer (best effort...) 2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2170 while (text > stp 2252 while (text > stp
2171 && srp[text - stp - 1] & RS_Careful 2253 && srp[text - stp - 1] & RS_Careful
2172 && RS_SAME (rend, srp[text - stp - 1])) 2254 && RS_SAME (rend, srp[text - stp - 1]))
2173 text--, count++, xpixel -= fwidth; 2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2174#endif 2264#endif
2175 2265
2176 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2177 2267
2178#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2277 } /* for (row....) */ 2367 } /* for (row....) */
2278 2368
2279#if ENABLE_OVERLAY 2369#if ENABLE_OVERLAY
2280 scr_swap_overlay (); 2370 scr_swap_overlay ();
2281#endif 2371#endif
2372 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2282 2373
2283 /* 2374 /*
2284 * G: cleanup cursor and display outline cursor if necessary 2375 * G: cleanup cursor and display outline cursor if necessary
2285 */ 2376 */
2286 if (showcursor) 2377 if (showcursor)
2287 { 2378 {
2288 if (focus) 2379 if (focus)
2289 { 2380 {
2290 if (options & Opt_cursorUnderline) 2381 if (OPTION (Opt_cursorUnderline))
2291 *crp ^= RS_Uline; 2382 *crp ^= RS_Uline;
2292 else 2383 else
2293 { 2384 {
2294 *crp ^= RS_RVid; 2385 *crp ^= RS_RVid;
2295#ifndef NO_CURSORCOLOR 2386#ifndef NO_CURSORCOLOR
… …
2325 /* 2416 /*
2326 * H: cleanup selection 2417 * H: cleanup selection
2327 */ 2418 */
2328 scr_reverse_selection (); 2419 scr_reverse_selection ();
2329 2420
2330 if (refresh_type & SMOOTH_REFRESH)
2331 XFlush (display->display);
2332
2333 num_scr = 0; 2421 num_scr = 0;
2334 num_scr_allow = 1; 2422 num_scr_allow = 1;
2335} 2423}
2336 2424
2337void 2425void
2338rxvt_term::scr_remap_chars (const line_t &l) 2426rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2339{ 2427{
2340 if (!l.t) 2428 if (!l.t)
2341 return; 2429 return;
2342 2430
2431 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2432
2343 for (int i = ncol; i--; ) 2433 for (int i = ncol; i--; )
2344 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2434 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345} 2435}
2346 2436
2347void 2437void
2348rxvt_term::scr_remap_chars () 2438rxvt_term::scr_remap_chars () NOTHROW
2349{ 2439{
2350 for (int i = total_rows; i--; ) 2440 for (int i = total_rows; i--; )
2351 scr_remap_chars (row_buf [i]); 2441 scr_remap_chars (row_buf [i]);
2352 2442
2353 for (int i = nrow; i--; ) 2443 for (int i = nrow; i--; )
… …
2356 scr_remap_chars (swap_buf [i]); 2446 scr_remap_chars (swap_buf [i]);
2357 } 2447 }
2358} 2448}
2359 2449
2360void 2450void
2361rxvt_term::scr_recolour () 2451rxvt_term::scr_recolour () NOTHROW
2362{ 2452{
2363 if (1 2453 if (1
2364#if TRANSPARENT 2454#if TRANSPARENT
2365 && !am_transparent 2455 && !am_transparent
2366#endif 2456#endif
… …
2387 want_refresh = 1; 2477 want_refresh = 1;
2388} 2478}
2389 2479
2390/* ------------------------------------------------------------------------- */ 2480/* ------------------------------------------------------------------------- */
2391void 2481void
2392rxvt_term::scr_clear (bool really) 2482rxvt_term::scr_clear (bool really) NOTHROW
2393{ 2483{
2394 if (!mapped) 2484 if (!mapped)
2395 return; 2485 return;
2396 2486
2397 num_scr_allow = 0; 2487 num_scr_allow = 0;
… …
2399 2489
2400 if (really) 2490 if (really)
2401 XClearWindow (display->display, vt); 2491 XClearWindow (display->display, vt);
2402} 2492}
2403 2493
2404/* ------------------------------------------------------------------------- */
2405void 2494void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{
2497 int view_end = view_start + nrow;
2498 int row, col;
2499
2500 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2501 {
2502 text_t *stp = ROW(row).t;
2503 rend_t *srp = ROW(row).r;
2504
2505 for (col = beg_col; col < end_col; col++)
2506 srp[col] ^= rstyle1;
2507
2508 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2509 srp[col] ^= rstyle2;
2510
2511 if (++col < end_col)
2512 srp[col] ^= rstyle2;
2513 }
2514}
2515
2516void
2517rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2518{
2519 int view_end = view_start + nrow;
2520 int row, col;
2521
2522 if (beg_row >= view_start)
2523 {
2524 col = beg_col;
2525 row = beg_row;
2526 }
2527 else
2528 {
2529 col = 0;
2530 row = view_start;
2531 }
2532
2533 for (; row < min (end_row, view_end); row++, col = 0)
2534 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2535 srp[col] ^= rstyle;
2536
2537 if (row == end_row)
2538 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2539 srp[col] ^= rstyle;
2540}
2541
2542/* ------------------------------------------------------------------------- */
2543void
2406rxvt_term::scr_reverse_selection () 2544rxvt_term::scr_reverse_selection () NOTHROW
2407{ 2545{
2408 if (selection.op 2546 if (selection.op
2409 && current_screen == selection.screen 2547 && current_screen == selection.screen
2410 && selection.end.row >= -view_start) 2548 && selection.end.row >= view_start)
2411 { 2549 {
2412 int view_end = -view_start + nrow;
2413 int row, col;
2414
2415#if ENABLE_FRILLS 2550#if ENABLE_FRILLS
2416 if (selection.rect) 2551 if (selection.rect)
2417 { 2552 scr_xor_rect (selection.beg.row, selection.beg.col,
2418 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2553 selection.end.row, selection.end.col,
2419 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2554 RS_RVid, RS_RVid | RS_Uline);
2420 srp[col] ^= RS_RVid;
2421 }
2422 else 2555 else
2423#endif 2556#endif
2424 { 2557 scr_xor_span (selection.beg.row, selection.beg.col,
2425 if (selection.beg.row >= -view_start) 2558 selection.end.row, selection.end.col,
2426 { 2559 RS_RVid);
2427 col = selection.beg.col;
2428 row = selection.beg.row;
2429 }
2430 else
2431 {
2432 col = 0;
2433 row = view_start;
2434 }
2435
2436 for (; row < min (selection.end.row, view_end); row++, col = 0)
2437 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438 srp[col] ^= RS_RVid;
2439
2440 if (row == selection.end.row)
2441 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2442 srp[col] ^= RS_RVid;
2443 }
2444 } 2560 }
2445} 2561}
2446 2562
2447/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2448/* 2564/*
2449 * Dump the whole scrollback and screen to the passed filedescriptor. The 2565 * Dump the whole scrollback and screen to the passed filedescriptor. The
2450 * invoking routine must close the fd. 2566 * invoking routine must close the fd.
2451 */ 2567 */
2452#if 0 2568#if 0
2453void 2569void
2454rxvt_term::scr_dump (int fd) 2570rxvt_term::scr_dump (int fd) NOTHROW
2455{ 2571{
2456 int row, wrote; 2572 int row, wrote;
2457 unsigned int width, towrite; 2573 unsigned int width, towrite;
2458 char r1[] = "\n"; 2574 char r1[] = "\n";
2459 2575
… …
2478 2594
2479/* ------------------------------------------------------------------------- * 2595/* ------------------------------------------------------------------------- *
2480 * CHARACTER SELECTION * 2596 * CHARACTER SELECTION *
2481 * ------------------------------------------------------------------------- */ 2597 * ------------------------------------------------------------------------- */
2482void 2598void
2483rxvt_term::selection_check (int check_more) 2599rxvt_term::selection_check (int check_more) NOTHROW
2484{ 2600{
2485 row_col_t pos; 2601 row_col_t pos;
2486 2602
2487 if (!selection.op) 2603 if (!selection.op)
2488 return; 2604 return;
2489 2605
2490 pos.row = pos.col = 0; 2606 pos.row = pos.col = 0;
2491 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2607 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2492 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2608 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2493 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2609 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2494 || (check_more == 1 2610 || (check_more == 1
2495 && current_screen == selection.screen 2611 && current_screen == selection.screen
2496 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2612 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2497 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2613 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2498 || (check_more == 2 2614 || (check_more == 2
… …
2509/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2510/* 2626/*
2511 * Paste a selection direct to the command fd 2627 * Paste a selection direct to the command fd
2512 */ 2628 */
2513void 2629void
2514rxvt_term::paste (unsigned char *data, unsigned int len) 2630rxvt_term::paste (char *data, unsigned int len) NOTHROW
2515{ 2631{
2516 /* convert normal newline chars into common keyboard Return key sequence */ 2632 /* convert normal newline chars into common keyboard Return key sequence */
2517 for (unsigned int i = 0; i < len; i++) 2633 for (unsigned int i = 0; i < len; i++)
2518 if (data[i] == C0_LF) 2634 if (data[i] == C0_LF)
2519 data[i] = C0_CR; 2635 data[i] = C0_CR;
… …
2525/* 2641/*
2526 * Respond to a notification that a primary selection has been sent 2642 * Respond to a notification that a primary selection has been sent
2527 * EXT: SelectionNotify 2643 * EXT: SelectionNotify
2528 */ 2644 */
2529void 2645void
2530rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2646rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2531{ 2647{
2532 if (prop == None) /* check for failed XConvertSelection */ 2648 if (prop == None) /* check for failed XConvertSelection */
2533 { 2649 {
2534 if ((selection_type & Sel_CompoundText)) 2650 if ((selection_type & Sel_CompoundText))
2535 { 2651 {
… …
2663 { 2779 {
2664 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665 char *s = rxvt_wcstombs (w); 2781 char *s = rxvt_wcstombs (w);
2666 free (w); 2782 free (w);
2667 // TODO: strlen == only the first element will be converted. well... 2783 // TODO: strlen == only the first element will be converted. well...
2668 paste ((unsigned char *)s, strlen (s)); 2784 paste (s, strlen (s));
2669 free (s); 2785 free (s);
2670 } 2786 }
2671 else 2787 else
2672#endif 2788#endif
2673 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674 && cl) 2790 && cl)
2675 { 2791 {
2676 for (int i = 0; i < cr; i++) 2792 for (int i = 0; i < cr; i++)
2677 paste ((unsigned char *)cl[i], strlen (cl[i])); 2793 paste (cl[i], strlen (cl[i]));
2678 2794
2679 XFreeStringList (cl); 2795 XFreeStringList (cl);
2680 } 2796 }
2681 else 2797 else
2682 paste (ct.value, ct.nitems); // paste raw 2798 paste ((char *)ct.value, ct.nitems); // paste raw
2683 2799
2684bailout: 2800bailout:
2685 XFree (ct.value); 2801 XFree (ct.value);
2686 2802
2687 if (selection_wait == Sel_normal) 2803 if (selection_wait == Sel_normal)
2688 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2689} 2805}
2690 2806
2691void 2807void
2692rxvt_term::incr_cb (time_watcher &w) 2808rxvt_term::incr_cb (time_watcher &w) NOTHROW
2693{ 2809{
2694 selection_wait = Sel_none; 2810 selection_wait = Sel_none;
2695 2811
2696 incr_buf_size = 0; 2812 incr_buf_size = 0;
2697 free (incr_buf); 2813 free (incr_buf);
2698 2814
2699 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2815 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2700} 2816}
2701 2817
2702void 2818void
2703rxvt_term::selection_property (Window win, Atom prop) 2819rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2704{ 2820{
2705 if (prop == None || selection_wait != Sel_incr) 2821 if (prop == None || selection_wait != Sel_incr)
2706 return; 2822 return;
2707 2823
2708 selection_paste (win, prop, true); 2824 selection_paste (win, prop, true);
… …
2717 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2718 * will auto fallback to CUT_BUFFER0 2834 * will auto fallback to CUT_BUFFER0
2719 * EXT: button 2 release 2835 * EXT: button 2 release
2720 */ 2836 */
2721void 2837void
2722rxvt_term::selection_request (Time tm, int x, int y) 2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2723{ 2839{
2724 if (x < 0 || x >= width || y < 0 || y >= height) 2840 if (selection.text && selnum == Sel_Primary)
2725 return; /* outside window */
2726
2727 if (selection.text)
2728 { /* internal selection */ 2841 { /* internal selection */
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2842 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2843 paste (str, strlen (str));
2731 free (str); 2844 free (str);
2732 return; 2845 return;
2733 } 2846 }
2734 else 2847 else
2735 { 2848 {
2736 int i;
2737
2738 selection_request_time = tm; 2849 selection_request_time = tm;
2739 selection_wait = Sel_normal; 2850 selection_wait = Sel_normal;
2740 2851
2741 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2742 {
2743#if X_HAVE_UTF8_STRING 2852#if X_HAVE_UTF8_STRING
2744 selection_type = Sel_UTF8String; 2853 selection_type = Sel_UTF8String;
2745 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2854 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2746 return; 2855 return;
2747#else 2856#else
2748 selection_type = Sel_CompoundText; 2857 selection_type = Sel_CompoundText;
2749 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2858 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2750 return; 2859 return;
2751#endif 2860#endif
2752 }
2753 } 2861 }
2754 2862
2755 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2863 selection_wait = Sel_none; /* don't loop in selection_paste () */
2756 selection_paste (display->root, XA_CUT_BUFFER0, false); 2864 selection_paste (display->root, XA_CUT_BUFFER0, false);
2757} 2865}
2758 2866
2759int 2867int
2760rxvt_term::selection_request_other (Atom target, int selnum) 2868rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2761{ 2869{
2762 Atom sel; 2870 Atom sel;
2763 2871
2764 selection_type |= selnum; 2872 selection_type |= selnum;
2765 2873
… …
2784/* 2892/*
2785 * Clear all selected text 2893 * Clear all selected text
2786 * EXT: SelectionClear 2894 * EXT: SelectionClear
2787 */ 2895 */
2788void 2896void
2789rxvt_term::selection_clear () 2897rxvt_term::selection_clear () NOTHROW
2790{ 2898{
2791 want_refresh = 1; 2899 want_refresh = 1;
2792 free (selection.text); 2900 free (selection.text);
2793 selection.text = NULL; 2901 selection.text = NULL;
2794 selection.len = 0; 2902 selection.len = 0;
… …
2827 selection.op = SELECTION_DONE; 2935 selection.op = SELECTION_DONE;
2828 2936
2829 if (selection.clicks == 4) 2937 if (selection.clicks == 4)
2830 return; /* nothing selected, go away */ 2938 return; /* nothing selected, go away */
2831 2939
2940 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2941 return;
2942
2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2943 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2944 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834 2945
2835 int ofs = 0; 2946 int ofs = 0;
2836 int extra = 0; 2947 int extra = 0;
… …
2848 col = selection.beg.col; 2959 col = selection.beg.col;
2849 end_col = ncol + 1; 2960 end_col = ncol + 1;
2850 } 2961 }
2851 else 2962 else
2852#endif 2963#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2964 end_col = ROW(row).l;
2854 2965
2855 col = max (col, 0); 2966 col = max (col, 0);
2856 2967
2857 if (row == selection.end.row || selection.rect) 2968 if (row == selection.end.row
2969#if ENABLE_FRILLS
2970 || selection.rect
2971#endif
2972 )
2858 end_col = min (end_col, selection.end.col); 2973 min_it (end_col, selection.end.col);
2859 2974
2860 t = ROW(row).t + col; 2975 t = ROW(row).t + col;
2976
2861 for (; col < end_col; col++) 2977 for (; col < end_col; col++)
2862 { 2978 {
2863 if (*t == NOCHAR) 2979 if (*t == NOCHAR)
2864 t++; 2980 t++;
2865#if ENABLE_COMBINING 2981#if ENABLE_COMBINING
… …
2881#endif 2997#endif
2882 else 2998 else
2883 new_selection_text[ofs++] = *t++; 2999 new_selection_text[ofs++] = *t++;
2884 } 3000 }
2885 3001
3002#if ENABLE_FRILLS
3003 if (selection.rect)
3004 {
3005 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1]))
3008 --ofs;
3009
3010 new_selection_text[ofs++] = C0_LF;
3011 }
3012 else
3013#endif
2886 if (!ROW(row).is_longer () && row != selection.end.row) 3014 if (!ROW(row).is_longer () && row != selection.end.row)
2887 new_selection_text[ofs++] = C0_LF; 3015 new_selection_text[ofs++] = C0_LF;
2888 } 3016 }
2889 3017
2890 if (end_col != selection.end.col) 3018 if (end_col != selection.end.col)
2891 new_selection_text[ofs++] = C0_LF; 3019 new_selection_text[ofs++] = C0_LF;
2892 3020
… …
2902 3030
2903 // we usually allocate much more than necessary, so realloc it smaller again 3031 // we usually allocate much more than necessary, so realloc it smaller again
2904 selection.len = ofs; 3032 selection.len = ofs;
2905 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3033 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906 3034
3035 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3036 return;
3037
3038 selection_grab (tm);
3039}
3040
3041bool
3042rxvt_term::selection_grab (Time tm) NOTHROW
3043{
3044 selection_time = tm;
3045
2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3048 {
2909 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3050 return true;
3051 }
2910 else 3052 else
2911 rxvt_warn ("can't get primary selection, ignoring.\n"); 3053 {
3054 selection_clear ();
3055 return false;
3056 }
2912 3057
2913#if 0 3058#if 0
2914 XTextProperty ct; 3059 XTextProperty ct;
2915 3060
2916 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917 { 3062 {
2918 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919 XFree (ct.value); 3064 XFree (ct.value);
2920 } 3065 }
2921#endif 3066#endif
2922
2923 selection_time = tm;
2924} 3067}
2925 3068
2926/* ------------------------------------------------------------------------- */ 3069/* ------------------------------------------------------------------------- */
2927/* 3070/*
2928 * Mark or select text based upon number of clicks: 1, 2, or 3 3071 * Mark or select text based upon number of clicks: 1, 2, or 3
2929 * EXT: button 1 press 3072 * EXT: button 1 press
2930 */ 3073 */
2931void 3074void
2932rxvt_term::selection_click (int clicks, int x, int y) 3075rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2933{ 3076{
2934 clicks = ((clicks - 1) % 3) + 1; 3077 clicks = ((clicks - 1) % 3) + 1;
2935 selection.clicks = clicks; /* save clicks so extend will work */ 3078 selection.clicks = clicks; /* save clicks so extend will work */
2936 3079
3080 if (clicks == 2 && !selection.rect
3081 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3082 {
3083 MEvent.clicks = 1; // what a mess
3084 selection.screen = current_screen;
3085 selection.op = SELECTION_CONT;
3086 return;
3087 }
3088
2937 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3089 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2938 3090
2939 if (clicks == 2 || clicks == 3) 3091 if (clicks == 2 || clicks == 3)
2940 selection_extend_colrow (selection.mark.col, 3092 selection_extend_colrow (selection.mark.col,
2941 selection.mark.row + view_start, 3093 selection.mark.row - view_start,
2942 0, /* button 3 */ 3094 0, /* button 3 */
2943 1, /* button press */ 3095 1, /* button press */
2944 0); /* click change */ 3096 0); /* click change */
2945} 3097}
2946 3098
2947/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
2948/* 3100/*
2949 * Mark a selection at the specified col/row 3101 * Mark a selection at the specified col/row
2950 */ 3102 */
2951void 3103void
2952rxvt_term::selection_start_colrow (int col, int row) 3104rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2953{ 3105{
2954 want_refresh = 1; 3106 want_refresh = 1;
2955 3107
2956 selection.mark.row = row - view_start; 3108 selection.mark.row = row + view_start;
2957 selection.mark.col = col; 3109 selection.mark.col = col;
2958 3110
2959 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3111 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2960 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2961 3113
2962 while (selection.mark.col > 0 3114 while (selection.mark.col > 0
2963 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2964 --selection.mark.col; 3116 --selection.mark.col;
… …
2983#define DELIMIT_TEXT(x) \ 3135#define DELIMIT_TEXT(x) \
2984 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2985#define DELIMIT_REND(x) 1 3137#define DELIMIT_REND(x) 1
2986 3138
2987void 3139void
2988rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
2989{ 3141{
2990 int col, row, dirnadd, tcol, trow, w1, w2; 3142 int col, row, dirnadd, tcol, trow, w1, w2;
2991 row_col_t bound; 3143 row_col_t bound;
2992 text_t *stp; 3144 text_t *stp;
2993 rend_t *srp; 3145 rend_t *srp;
2994 3146
2995 if (dirn == UP) 3147 if (dirn == UP)
2996 { 3148 {
2997 bound.row = - nsaved - 1; 3149 bound.row = top_row - 1;
2998 bound.col = 0; 3150 bound.col = 0;
2999 dirnadd = -1; 3151 dirnadd = -1;
3000 } 3152 }
3001 else 3153 else
3002 { 3154 {
… …
3050 } 3202 }
3051 } 3203 }
3052 break; 3204 break;
3053 } 3205 }
3054 3206
3055Old_Word_Selection_You_Die:
3056 if (dirn == DN) 3207 if (dirn == DN)
3057 col++; /* put us on one past the end */ 3208 col++; /* put us on one past the end */
3058 3209
3059 /* Poke the values back in */ 3210 /* Poke the values back in */
3060 ret->row = row; 3211 ret->row = row;
… …
3068 * flag == 0 ==> button 1 3219 * flag == 0 ==> button 1
3069 * flag == 1 ==> button 3 press 3220 * flag == 1 ==> button 3 press
3070 * flag == 2 ==> button 3 motion 3221 * flag == 2 ==> button 3 motion
3071 */ 3222 */
3072void 3223void
3073rxvt_term::selection_extend (int x, int y, int flag) 3224rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3074{ 3225{
3075 int col = clamp (Pixel2Col (x), 0, ncol); 3226 int col = clamp (Pixel2Col (x), 0, ncol);
3076 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3227 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3077 3228
3078 /* 3229 /*
… …
3081 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
3082 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
3083 */ 3234 */
3084 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
3085 && (col == selection.mark.col 3236 && (col == selection.mark.col
3086 && (row == selection.mark.row + view_start))) 3237 && (row == selection.mark.row - view_start)))
3087 { 3238 {
3088 /* select nothing */ 3239 /* select nothing */
3089 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
3090 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
3091 selection.clicks = 4; 3242 selection.clicks = 4;
… …
3104/* ------------------------------------------------------------------------- */ 3255/* ------------------------------------------------------------------------- */
3105/* 3256/*
3106 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
3107 */ 3258 */
3108void 3259void
3109rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3110{ 3261{
3111 row_col_t pos; 3262 row_col_t pos;
3112 enum { 3263 enum {
3113 LEFT, RIGHT 3264 LEFT, RIGHT
3114 } closeto = RIGHT; 3265 } closeto = RIGHT;
… …
3146 selection.beg.col = selection.end.col = selection.mark.col; 3297 selection.beg.col = selection.end.col = selection.mark.col;
3147 selection.beg.row = selection.end.row = selection.mark.row; 3298 selection.beg.row = selection.end.row = selection.mark.row;
3148 } 3299 }
3149 3300
3150 pos.col = col; 3301 pos.col = col;
3151 pos.row = row - view_start; 3302 pos.row = view_start + row;
3152 3303
3153 /* 3304 /*
3154 * This is mainly xterm style selection with a couple of differences, mainly 3305 * This is mainly xterm style selection with a couple of differences, mainly
3155 * in the way button3 drag extension works. 3306 * in the way button3 drag extension works.
3156 * We're either doing: button1 drag; button3 press; or button3 drag 3307 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3243 selection_delimit_word (DN, &selection.end, &selection.end); 3394 selection_delimit_word (DN, &selection.end, &selection.end);
3244 } 3395 }
3245 else if (selection.clicks == 3) 3396 else if (selection.clicks == 3)
3246 { 3397 {
3247#if ENABLE_FRILLS 3398#if ENABLE_FRILLS
3248 if (options & Opt_tripleclickwords) 3399 if (OPTION (Opt_tripleclickwords))
3249 { 3400 {
3250 selection_delimit_word (UP, &selection.beg, &selection.beg); 3401 selection_delimit_word (UP, &selection.beg, &selection.beg);
3251 3402
3252 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253 { 3404 {
… …
3300#endif 3451#endif
3301} 3452}
3302 3453
3303#if ENABLE_FRILLS 3454#if ENABLE_FRILLS
3304void 3455void
3305rxvt_term::selection_remove_trailing_spaces () 3456rxvt_term::selection_remove_trailing_spaces () NOTHROW
3306{ 3457{
3307 int32_t end_col, end_row; 3458 int32_t end_col, end_row;
3308 text_t *stp; 3459 text_t *stp;
3309 3460
3310 end_col = selection.end.col; 3461 end_col = selection.end.col;
… …
3314 { 3465 {
3315 stp = ROW(end_row).t; 3466 stp = ROW(end_row).t;
3316 3467
3317 while (--end_col >= 0) 3468 while (--end_col >= 0)
3318 { 3469 {
3319 if (stp[end_col] != ' ' 3470 if (stp[end_col] != NOCHAR
3320 && stp[end_col] != '\t' 3471 && !unicode::is_space (stp[end_col]))
3321 && stp[end_col] != NOCHAR)
3322 break; 3472 break;
3323 } 3473 }
3324 3474
3325 if (end_col >= 0 3475 if (end_col >= 0
3326 || !ROW(end_row - 1).is_longer ()) 3476 || !ROW(end_row - 1).is_longer ())
… …
3349/* 3499/*
3350 * Double click on button 3 when already selected 3500 * Double click on button 3 when already selected
3351 * EXT: button 3 double click 3501 * EXT: button 3 double click
3352 */ 3502 */
3353void 3503void
3354rxvt_term::selection_rotate (int x, int y) 3504rxvt_term::selection_rotate (int x, int y) NOTHROW
3355{ 3505{
3356 selection.clicks = selection.clicks % 3 + 1; 3506 selection.clicks = selection.clicks % 3 + 1;
3357 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3507 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3358} 3508}
3359 3509
… …
3361/* 3511/*
3362 * Respond to a request for our current selection 3512 * Respond to a request for our current selection
3363 * EXT: SelectionRequest 3513 * EXT: SelectionRequest
3364 */ 3514 */
3365void 3515void
3366rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3367{ 3517{
3368 XSelectionEvent ev; 3518 XSelectionEvent ev;
3369 dDisp; 3519 dDisp;
3370 3520
3371 ev.type = SelectionNotify; 3521 ev.type = SelectionNotify;
… …
3499 3649
3500/* 3650/*
3501 * return col/row values corresponding to x/y pixel values 3651 * return col/row values corresponding to x/y pixel values
3502 */ 3652 */
3503void 3653void
3504rxvt_term::pixel_position (int *x, int *y) 3654rxvt_term::pixel_position (int *x, int *y) NOTHROW
3505{ 3655{
3506 *x = Pixel2Col (*x); 3656 *x = Pixel2Col (*x);
3507 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3657 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3508 *y = Pixel2Row (*y); 3658 *y = Pixel2Row (*y);
3509 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3659 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3510} 3660}
3511 3661
3512/* ------------------------------------------------------------------------- */ 3662/* ------------------------------------------------------------------------- */
3513#ifdef USE_XIM 3663#ifdef USE_XIM
3514void 3664void
3515rxvt_term::im_set_position (XPoint &pos) 3665rxvt_term::im_set_position (XPoint &pos) NOTHROW
3516{ 3666{
3517 XWindowAttributes xwa; 3667 XWindowAttributes xwa;
3518 3668
3519 XGetWindowAttributes (display->display, vt, &xwa); 3669 XGetWindowAttributes (display->display, vt, &xwa);
3520 3670
… …
3523} 3673}
3524#endif 3674#endif
3525 3675
3526#if ENABLE_OVERLAY 3676#if ENABLE_OVERLAY
3527void 3677void
3528rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3678rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3529{ 3679{
3530 if (nrow < 3 || ncol < 3) 3680 if (nrow < 1 || ncol < 1)
3531 return; 3681 return;
3532 3682
3533 want_refresh = 1; 3683 want_refresh = 1;
3534 3684
3535 scr_overlay_off (); 3685 scr_overlay_off ();
… …
3578 *rp = r; 3728 *rp = r;
3579 } 3729 }
3580} 3730}
3581 3731
3582void 3732void
3583rxvt_term::scr_overlay_off () 3733rxvt_term::scr_overlay_off () NOTHROW
3584{ 3734{
3585 if (!ov_text) 3735 if (!ov_text)
3586 return; 3736 return;
3587 3737
3588 want_refresh = 1; 3738 want_refresh = 1;
… …
3596 delete [] ov_text; ov_text = 0; 3746 delete [] ov_text; ov_text = 0;
3597 delete [] ov_rend; ov_rend = 0; 3747 delete [] ov_rend; ov_rend = 0;
3598} 3748}
3599 3749
3600void 3750void
3601rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3751rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3602{ 3752{
3603 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3753 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3604 return; 3754 return;
3605 3755
3606 x++, y++; 3756 x++, y++;
… …
3608 ov_text[y][x] = text; 3758 ov_text[y][x] = text;
3609 ov_rend[y][x] = rend; 3759 ov_rend[y][x] = rend;
3610} 3760}
3611 3761
3612void 3762void
3613rxvt_term::scr_overlay_set (int x, int y, const char *s) 3763rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3614{ 3764{
3615 while (*s) 3765 while (*s)
3616 scr_overlay_set (x++, y, *s++); 3766 scr_overlay_set (x++, y, *s++);
3617} 3767}
3618 3768
3619void 3769void
3620rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3770rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3621{ 3771{
3622 while (*s) 3772 while (*s)
3623 { 3773 {
3624 text_t t = *s++; 3774 text_t t = *s++;
3625 int width = wcwidth (t); 3775 int width = WCWIDTH (t);
3626 3776
3627 while (width--) 3777 while (width--)
3628 { 3778 {
3629 scr_overlay_set (x++, y, t); 3779 scr_overlay_set (x++, y, t);
3630 t = NOCHAR; 3780 t = NOCHAR;
3631 } 3781 }
3632 } 3782 }
3633} 3783}
3634 3784
3635void 3785void
3636rxvt_term::scr_swap_overlay () 3786rxvt_term::scr_swap_overlay () NOTHROW
3637{ 3787{
3638 if (!ov_text) 3788 if (!ov_text)
3639 return; 3789 return;
3640 3790
3641 // swap screen mem with overlay 3791 // swap screen mem with overlay
3642 for (int y = ov_h; y--; ) 3792 for (int y = ov_h; y--; )
3643 { 3793 {
3644 text_t *t1 = ov_text[y]; 3794 text_t *t1 = ov_text[y];
3645 rend_t *r1 = ov_rend[y]; 3795 rend_t *r1 = ov_rend[y];
3646 3796
3647 text_t *t2 = ROW(y - view_start).t + ov_x; 3797 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3648 rend_t *r2 = ROW(y - view_start).r + ov_x; 3798 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3649 3799
3650 for (int x = ov_w; x--; ) 3800 for (int x = ov_w; x--; )
3651 { 3801 {
3652 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3802 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3803 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