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.184 by root, Wed Dec 21 14:23:30 2005 UTC vs.
Revision 1.249 by root, Wed Jan 25 00:42:21 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 * ------------------------------------------------------------------------- */
158
152void 159void
153rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
154{ 161{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
159 scr_overlay_off (); 163 scr_overlay_off ();
160#endif 164#endif
161 165
162 view_start = 0; 166 view_start = 0;
… …
169 nrow = 24; 173 nrow = 24;
170 174
171 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
172 return; 176 return;
173 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
174 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
176 { 183 {
184 //TODO//FIXME
177 saveLines++; 185 saveLines++;
178 prev_nrow--; 186 prev_nrow--;
179 nsaved++; 187 top_row--;
180 } 188 }
181 189
182 want_refresh = 1; 190 want_refresh = 1;
183 191
184 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
185 total_rows = nrow + saveLines; 193 total_rows = nrow + saveLines;
186 194
187 screen.tscroll = 0; 195 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 196 screen.bscroll = nrow - 1;
189 197
190 if (!save) 198 if (!row_buf)
191 { 199 {
192 /* 200 /*
193 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 202 */
196 nsaved = 0; /* no saved lines */ 203 top_row = 0;
197 term_start = 0; 204 term_start = 0;
198 205
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 208
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 212
207 for (p = nrow; p--; ) 213 for (int row = nrow; row--; )
208 { 214 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 218 }
213 219
214 memset (charsets, 'B', sizeof (charsets)); 220 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 221 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 222 screen.flags = Screen_DefaultFlags;
… …
231 selection.text = NULL; 237 selection.text = NULL;
232 selection.len = 0; 238 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
235 selection.clicks = 0; 241 selection.clicks = 0;
236 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
237 rvideo = 0;
238 } 243 }
239 else 244 else
240 { 245 {
241 /* 246 /*
242 * add or delete rows as appropriate 247 * add or delete rows as appropriate
243 */ 248 */
244 249
245 rxvt_salloc *old_ta; 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 252
253#if 0
248 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
249 { 255 {
250 /* delete rows */
251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253 scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
256 { 257 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 258 lfree (swap_buf [row]);
259 lfree (drawn[p]); 259 lfree (drawn_buf[row]);
260 } 260 }
261 }
262#endif
261 263
262 /* we have fewer rows so fix up cursor position */ 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 min_it (screen.cur.row, (int32_t)nrow - 1); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 266
265 scr_reset_realloc (); /* realloc _last_ */ 267 for (int row = min (nrow, prev_nrow); row--; )
268 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
266 } 281
267 else if (nrow > prev_nrow) 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
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
268 { 294 do
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 { 295 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 296 p = MOD (p - 1, prev_total_rows);
286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287 }
288
289 if (k > 0)
290 {
291 scr_scroll_text (0, (int)nrow - 1, -k);
292 screen.cur.row += k;
293 screen.s_cur.row += k;
294 nsaved -= k;
295 }
296
297#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#else /* drive with your eyes closed */
300 min_it (screen.cur.row, nrow - 1);
301#endif 299#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304
305 /* resize columns */
306 if (ncol != prev_ncol)
307 {
308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
315 {
316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 min_it (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 302
350 assert (llen >= 0); 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
354 --p; 307 plines++;
355 llen += prev_ncol; 308 llen += prev_ncol;
356 } 309 }
357 310
358 int qlines = llen / ncol + 1; 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
359 int lofs = 0; 319 int lofs = 0;
320 line_t *qline;
360 321
361 q -= qlines; 322 // re-assemble the full line by destination lines
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
367 { 324 {
325 qline = row_buf + qrow;
326 lalloc (*qline);
327 qline->l = ncol;
328 qline->is_longer (1);
329
330 int qcol = 0;
331
332 // see below for cursor adjustment rationale
368 if (qrow >= 0) 333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
336 // fill a single destination line
337 while (lofs < llen && qcol < ncol)
369 { 338 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p; 339 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
380 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
351 line_t &pline = old_buf [prow];
352
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 354
383 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);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000);
397
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 357
401 lofs += len; 358 lofs += len;
402 qcol += len; 359 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 360 }
408 else
409 lofs += ncol;
410 } 361 }
362
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);
411 } 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
412 } 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];
413 384
414 free (screen.text); screen.text = tp; 385 qline = pline;
415 free (screen.rend); screen.rend = rp; 386 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 387 }
417 388
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 389 for (int row = prev_nrow; row < nrow; row++)
419#endif 390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
420 393
421 if (tabs) 394 term_start = 0;
395 }
396
397 free (old_buf);
398 delete old_ta;
399 delete old_ra;
400
401 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1);
403
422 free (tabs); 404 free (tabs);
423 } 405 }
406
407 CLEAR_ALL_SELECTION ();
424 408
425 prev_nrow = nrow; 409 prev_nrow = nrow;
426 prev_ncol = ncol; 410 prev_ncol = ncol;
427 411
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 413
430 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
432 419
433 tt_winch (); 420 tt_winch ();
434}
435 421
436void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
437rxvt_term::scr_reset_realloc ()
438{
439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443} 423}
444 424
445/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
446/* 426/*
447 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
448 */ 428 */
449void 429void
450rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
451{ 431{
432 if (row_buf)
433 {
452 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
454 436
455 free (save); 437 free (row_buf);
456 free (swap_save); 438 free (swap_buf);
457 free (drawn); 439 free (drawn_buf);
458 free (buf);
459 free (tabs); 440 free (tabs);
441
442 row_buf = 0; // signal that we freed all the arrays
443 }
460} 444}
461 445
462/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
463/* 447/*
464 * Hard reset 448 * Hard reset
… …
469 scr_release (); 453 scr_release ();
470 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
471 scr_reset (); 455 scr_reset ();
472 456
473 scr_clear (true); 457 scr_clear (true);
474 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
475} 459}
476 460
477/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
478 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
479 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
481 * Save and Restore cursor 465 * Save and Restore cursor
482 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
483 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
484 */ 468 */
485void 469void
486rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
487{ 471{
488 screen_t *s; 472 screen_t *s;
489 473
490#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
491 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
520 min_it (s->cur.row, nrow - 1); 504 min_it (s->cur.row, nrow - 1);
521 min_it (s->cur.col, ncol - 1); 505 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */
526 max_it (s->cur.row, 0);
527 max_it (s->cur.col, 0);
528#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);
529} 525}
530 526
531/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
532/* 528/*
533 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
534 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
535 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
536 */ 532 */
537int 533void
538rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
539{ 535{
536 if (scrn == current_screen)
537 return;
538
540 want_refresh = 1; 539 want_refresh = 1;
541 view_start = 0; 540 view_start = 0;
542 541
543 if (current_screen == scrn)
544 return scrn;
545
546 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
547 543
548 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
549 545
550 ::swap (screen.cur.row, swap.cur.row);
551 ::swap (screen.cur.col, swap.cur.col);
552
553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555
556#if NSCREENS 546#if NSCREENS
557 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
558 { 548 {
559 num_scr = 0; 549 num_scr = 0;
560 550
561 for (int i = nrow; i--; ) 551 scr_swap_screen ();
562 ::swap (ROW(i), swap_save[i]);
563 552
564 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
568 } 557 }
569 else 558 else
570#endif 559#endif
571 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
572 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
573
574 return scrn;
575} 562}
576 563
577// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
578void 565void
579rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
580{ 567{
581 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
582 return; 569 return;
583 570
584 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
594/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
595/* 582/*
596 * Change the colour for following text 583 * Change the colour for following text
597 */ 584 */
598void 585void
599rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
600{ 587{
601 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
602 color = fgbg; 589 color = fgbg;
603 590
604 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
605 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
606 else 593 else
… …
610/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
611/* 598/*
612 * Change the rendition style for following text 599 * Change the rendition style for following text
613 */ 600 */
614void 601void
615rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
616 { 603 {
617 if (set) 604 if (set)
618 rstyle |= style; 605 rstyle |= style;
619 else if (style == ~RS_None) 606 else if (style == ~RS_None)
620 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
627 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
628 * count positive ==> scroll up 615 * count positive ==> scroll up
629 * count negative ==> scroll down 616 * count negative ==> scroll down
630 */ 617 */
631int 618int
632rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
633{ 620{
634 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
635 return 0; 622 return 0;
636 623
637 want_refresh = 1; 624 want_refresh = 1;
638 num_scr += count; 625 num_scr += count;
639 626
640 if (count > 0 627 if (count > 0
641 && row1 == 0 628 && row1 == 0
642 && row2 == nrow - 1
643 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
644 { 630 {
645 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
647 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
648 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
649 { 670 {
650 selection.beg.row -= count; 671 selection.beg.row -= count;
651 selection.end.row -= count; 672 selection.end.row -= count;
652 selection.mark.row -= count; 673 selection.mark.row -= count;
653 674
654 selection_check (0); 675 if (selection.beg.row < top_row
655 } 676 || selection.end.row < top_row
656 677 || selection.mark.row < top_row)
657 for (int i = count; i--; )
658 scr_blank_screen_mem (ROW(row2 - i), rstyle);
659
660 if ((options & Opt_scrollWithBuffer)
661 && view_start != 0
662 && view_start != saveLines)
663 scr_page (UP, count);
664 }
665 else
666 {
667 if (selection.op && current_screen == selection.screen)
668 {
669 int i = selection.beg.row;
670 int j = selection.end.row;
671
672 if ((i < row1 && j > row1)
673 || (i < row2 && j > row2)
674 || (i - count < row1 && i >= row1)
675 || (i - count > row2 && i <= row2)
676 || (j - count < row1 && j >= row1)
677 || (j - count > row2 && j <= row2))
678 { 678 {
679 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 680 selection.op = SELECTION_CLEAR;
681 } 681 }
682 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)
683 { 708 {
684 /* move selected region too */ 709 /* move selected region too */
685 selection.beg.row -= count; 710 selection.beg.row -= count;
686 selection.end.row -= count; 711 selection.end.row -= count;
687 selection.mark.row -= count; 712 selection.mark.row -= count;
… …
693 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 719 // part of scr_scroll_text is not time-critical.
695 720
696 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
697 722
723 min_it (count, rows);
724
725 line_t *temp_buf = row_buf + total_rows;
726
698 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
699 { 728 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 730
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 732 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 733 }
705 734
706 for (int row = 0; row < rows; row++) 735 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 736 ROW(row1 + row) = temp_buf [row];
708 } 737 }
709 738
710 return count; 739 return count;
711} 740}
712 741
713/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
714/* 743/*
715 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
716 */ 745 */
717void 746void
718rxvt_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
719{ 748{
720 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
721 return; 750 return;
722 751
723 unsigned char checksel; 752 unsigned char checksel;
724 unicode_t c; 753 unicode_t c;
725 int row, last_col; 754 int ncol = this->ncol;
726 const unicode_t *strend = str + len; 755 const wchar_t *strend = str + len;
727 756
728 want_refresh = 1; 757 want_refresh = 1;
729 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
730 last_col = ncol;
731 759
732 if (nlines > 0) 760 if (minlines > 0)
733 { 761 {
734 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
764
735 if ((nlines > 0) 765 if (minlines > 0
736 && (screen.tscroll == 0) 766 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 767 && screen.bscroll == nrow - 1)
738 { 768 {
739 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
741 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
742 } 772 }
743 } 773 }
744 774
745#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
747 assert ((screen.cur.row < nrow) 777 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 778 && screen.cur.row >= top_row);
749#else /* drive with your eyes closed */
750 min_it (screen.cur.col, last_col - 1);
751 min_it (screen.cur.row, (int32_t)nrow - 1);
752 max_it (screen.cur.row, - (int32_t)nsaved);
753#endif 779#endif
754 row = screen.cur.row; 780 int row = screen.cur.row;
755 781
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 783
758 line_t *line = &ROW(row); 784 line_t *line = &ROW(row);
759 785
760 while (str < strend) 786 while (str < strend)
761 { 787 {
762 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
763 789
764 if (c < 0x20) 790 if (c < 0x20)
765 if (c == C0_LF) 791 if (c == C0_LF)
766 { 792 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 max_it (line->l, screen.cur.col); 793 max_it (line->l, screen.cur.col);
769 794
770 screen.flags &= ~Screen_WrapNext; 795 screen.flags &= ~Screen_WrapNext;
771 796
772 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
777 line = &ROW(row); /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
778 continue; 803 continue;
779 } 804 }
780 else if (c == C0_CR) 805 else if (c == C0_CR)
781 { 806 {
782 if (!line->is_longer ()) /* XXX: think about this */
783 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
784 808
785 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 810 screen.cur.col = 0;
787 continue; 811 continue;
788 } 812 }
… …
805 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
806 } 830 }
807 831
808 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
809 { 833 {
810 line->set_is_longer ();
811
812 scr_do_wrap (); 834 scr_do_wrap ();
813 835
836 line->l = ncol;
837 line->is_longer (1);
838
814 row = screen.cur.row; 839 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
816 } 841 }
817 842
818 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
819 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
820 c = 0xfffd; 845 c = 0xfffd;
821 846
822 // 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
823 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
824 // 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
825 // locale. 850 // locale.
826 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
827 852
828 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
829 { 854 {
830 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
831 // 5f-7e standard vt100 856 // 5f-7e standard vt100
832 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
833 static uint16_t vt100_0[62] = { // 41 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 } 910 }
886 911
887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888 913
889 // if the character doesn't fit into the remaining columns... 914 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width) 915 if (screen.cur.col > ncol - width && ncol >= width)
891 { 916 {
892 // ...output spaces 917 // ...output spaces
893 c = ' '; 918 c = ' ';
894 // and try the same character next loop iteration 919 // and try the same character next loop iteration
895 --str; 920 --str;
896 } 921 }
897 922
923 line->touch ();
924
898 do 925 do
899 { 926 {
900 line->t[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
901 line->r[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
902 929
903 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
904 screen.cur.col++; 931 screen.cur.col++;
905 else 932 else
906 { 933 {
907 line->l = last_col; 934 line->l = ncol;
908 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
909 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
910 break; 937 break;
911 } 938 }
912 939
… …
914 } 941 }
915 while (--width > 0); 942 while (--width > 0);
916 943
917 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
918 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
919 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++)
920 { 950 {
921 line->t[c] = ' '; 951 line->t[c] = ' ';
922 line->r[c] = rend; 952 line->r[c] = rend;
923 } 953 }
954 }
924 } 955 }
925 else // width == 0 956 else // width == 0
926 { 957 {
927#if ENABLE_COMBINING 958#if ENABLE_COMBINING
928 // handle combining characters 959 // handle combining characters
929 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
932 text_t *tp; 964 text_t *tp;
933 rend_t *rp; 965 rend_t *rp;
934 966
935 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
936 { 968 {
969 linep = line;
937 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
938 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 972 }
943 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
944 && ROW(screen.cur.row - 1).is_longer ()) 974 && ROW(screen.cur.row - 1).is_longer ())
945 { 975 {
946 line_t *line = &ROW(screen.cur.row - 1); 976 linep = &ROW(screen.cur.row - 1);
947
948 tp = line->t + last_col - 1; 977 tp = line->t + ncol - 1;
949 rp = line->r + last_col - 1; 978 rp = line->r + ncol - 1;
950
951 while (*tp == NOCHAR && tp > line->t)
952 tp--, rp--;
953 } 979 }
954 else 980 else
955 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
956 987
957 // first try to find a precomposed character 988 // first try to find a precomposed character
958 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
959 if (n == NOCHAR) 990 if (n == NOCHAR)
960 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
964#endif 995#endif
965 } 996 }
966 } 997 }
967 998
968 if (!line->is_longer ()) /* XXX: think about this */
969 max_it (line->l, screen.cur.col); 999 max_it (line->l, screen.cur.col);
970 1000
971#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 max_it (screen.cur.row, 0);
975#endif 1003#endif
976} 1004}
977 1005
978/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
979/* 1007/*
980 * 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
981 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
982 */ 1010 */
983void 1011void
984rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
985{ 1013{
986 want_refresh = 1; 1014 want_refresh = 1;
987 1015
988 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
989 { 1017 {
… …
1007 * Process Horizontal Tab 1035 * Process Horizontal Tab
1008 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1009 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1010 */ 1038 */
1011void 1039void
1012rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1013{ 1041{
1014 int i, x; 1042 int i, x;
1015 1043
1016 want_refresh = 1; 1044 want_refresh = 1;
1017 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
1018 1046
1019 if (count == 0) 1047 if (count == 0)
1020 return; 1048 return;
1021 else if (count > 0) 1049 else if (count > 0)
1022 { 1050 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1051 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1052 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1053 ht &= l.t[i] == ' ';
1028 1054
1029 for (; ++i < ncol; ) 1055 for (; ++i < ncol; )
1030 if (tabs[i]) 1056 if (tabs[i])
1031 { 1057 {
1032 x = i; 1058 x = i;
1059
1033 if (!--count) 1060 if (!--count)
1034 break; 1061 break;
1035 } 1062 }
1036 else 1063 else
1037 ht &= l.t[i] == ' ' 1064 ht &= l.t[i] == ' '
… …
1040 if (count) 1067 if (count)
1041 x = ncol - 1; 1068 x = ncol - 1;
1042 1069
1043 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
1046 { 1073 {
1047 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
1048 1075
1049 if (!l.is_longer ()) /* XXX: think about this */ 1076 l.touch (x);
1050 max_it (l.l, x);
1051 1077
1052 i = screen.cur.col; 1078 i = screen.cur.col;
1053 1079
1054 l.t[i] = '\t'; 1080 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1081 l.r[i] = base_rend;
… …
1086 * 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
1087 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1088 */ 1114 */
1089#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1090void 1116void
1091rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1092{ 1118{
1093 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1094 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1095 else 1121 else
1096 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1103 * 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
1104 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1105 */ 1131 */
1106#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1107void 1133void
1108rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1109{ 1135{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1138 else
1115 { 1139 {
1116 row = screen.cur.row; 1140 line_t &l = ROW(screen.cur.row);
1117 1141
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1142 l.touch ();
1119 ROW(row).l = ncol; 1143 l.is_longer (0);
1120 1144
1121 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1148 }
… …
1128/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1129/* 1153/*
1130 * Goto Row/Column 1154 * Goto Row/Column
1131 */ 1155 */
1132void 1156void
1133rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1134{ 1158{
1135 want_refresh = 1; 1159 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1137 1161
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 max_it (screen.cur.col, 0);
1140 min_it (screen.cur.col, (int32_t)ncol - 1); 1163 clamp_it (screen.cur.col, 0, ncol - 1);
1141 1164
1142 screen.flags &= ~Screen_WrapNext; 1165 screen.flags &= ~Screen_WrapNext;
1143 1166
1144 if (relative & R_RELATIVE) 1167 if (relative & R_RELATIVE)
1145 { 1168 {
… …
1169 } 1192 }
1170 else 1193 else
1171 screen.cur.row = row; 1194 screen.cur.row = row;
1172 } 1195 }
1173 1196
1174 max_it (screen.cur.row, 0);
1175 min_it (screen.cur.row, (int32_t)nrow - 1); 1197 clamp_it (screen.cur.row, 0, nrow - 1);
1176} 1198}
1177 1199
1178/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1179/* 1201/*
1180 * direction should be UP or DN 1202 * direction should be UP or DN
1181 */ 1203 */
1182void 1204void
1183rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1184{ 1206{
1185 int dirn; 1207 int dirn;
1186 1208
1187 want_refresh = 1; 1209 want_refresh = 1;
1188 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1217 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1218 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1219 else
1198 screen.cur.row += dirn; 1220 screen.cur.row += dirn;
1199 1221
1200 max_it (screen.cur.row, 0);
1201 min_it (screen.cur.row, (int32_t)nrow - 1); 1222 clamp_it (screen.cur.row, 0, nrow - 1);
1202 selection_check (0); 1223 selection_check (0);
1203} 1224}
1204 1225
1205/* ------------------------------------------------------------------------- */ 1226/* ------------------------------------------------------------------------- */
1206/* 1227/*
… …
1208 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1209 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1232 */
1212void 1233void
1213rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1214{ 1235{
1215 unsigned int row, col, num; 1236 unsigned int col, num;
1216 1237
1217 want_refresh = 1; 1238 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1219 1240
1220 selection_check (1); 1241 selection_check (1);
1221 1242
1222 row = screen.cur.row; 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1223 1247
1224 switch (mode) 1248 switch (mode)
1225 { 1249 {
1226 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1251 col = screen.cur.col;
1228 num = ncol - col; 1252 num = ncol - col;
1229 min_it (ROW(row).l, (int16_t)col); 1253 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1256 CLEAR_SELECTION ();
1233 break; 1257 break;
1234 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1263 CLEAR_SELECTION ();
1240 break; 1264 break;
1241 case 2: /* erase whole line */ 1265 case 2: /* erase whole line */
1242 col = 0; 1266 col = 0;
1243 num = ncol; 1267 num = ncol;
1244 ROW(row).l = 0; 1268 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1269 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1270 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1248 break; 1272 break;
1249 default: 1273 default:
1250 return; 1274 return;
1251 } 1275 }
1252 1276
1253 scr_blank_line (ROW(row), col, num, rstyle); 1277 scr_blank_line (line, col, num, rstyle);
1254} 1278}
1255 1279
1256/* ------------------------------------------------------------------------- */ 1280/* ------------------------------------------------------------------------- */
1257/* 1281/*
1258 * Erase part of whole of the screen 1282 * Erase part of whole of the screen
1259 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1260 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1261 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1262 */ 1286 */
1263void 1287void
1264rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1265{ 1289{
1266 int num; 1290 int num;
1267 int32_t row; 1291 int32_t row;
1268 rend_t ren; 1292 rend_t ren;
1269 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1301 CLEAR_SELECTION (); 1325 CLEAR_SELECTION ();
1302 1326
1303 if (row >= nrow) /* Out Of Bounds */ 1327 if (row >= nrow) /* Out Of Bounds */
1304 return; 1328 return;
1305 1329
1306 min_it (num, (nrow - row)); 1330 min_it (num, nrow - row);
1307 1331
1308 if (rstyle & (RS_RVid | RS_Uline)) 1332 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1333 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1334 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1335 {
… …
1313 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1314 } 1338 }
1315 else 1339 else
1316 { 1340 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1323 } 1347 }
1324 1348
1325 for (; num--; row++) 1349 for (; num--; row++)
1326 { 1350 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1353 }
1331} 1354}
1332 1355
1333#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1334void 1357void
1335rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1336{ 1359{
1337 want_refresh = 1; 1360 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1339 1362
1340 nsaved = 0; 1363 top_row = 0;
1341} 1364}
1342#endif 1365#endif
1343 1366
1344/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1345/* 1368/*
1346 * Fill the screen with `E's 1369 * Fill the screen with `E's
1347 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1348 */ 1371 */
1349void 1372void
1350rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1351{ 1374{
1352 rend_t fs; 1375 rend_t fs;
1353 1376
1354 want_refresh = 1; 1377 want_refresh = 1;
1355 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1366 rend_t *r1 = line.r; 1389 rend_t *r1 = line.r;
1367 1390
1368 for (int j = ncol; j--; ) 1391 for (int j = ncol; j--; )
1369 *r1++ = fs; 1392 *r1++ = fs;
1370 1393
1371 line.l = ncol; /* make the `E's selectable */ 1394 line.is_longer (0);
1395 line.touch (ncol);
1372 } 1396 }
1373} 1397}
1374 1398
1375/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1376/* 1400/*
1377 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1378 */ 1402 */
1379void 1403void
1380rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1381{ 1405{
1382 int end; 1406 int end;
1383 1407
1384 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1385 1409
… …
1405/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1406/* 1430/*
1407 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1408 */ 1432 */
1409void 1433void
1410rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1411{ 1435{
1412 int col, row; 1436 int col, row;
1413 rend_t tr; 1437 rend_t tr;
1414 1438
1415 want_refresh = 1; 1439 want_refresh = 1;
… …
1419 return; 1443 return;
1420 1444
1421 scr_do_wrap (); 1445 scr_do_wrap ();
1422 1446
1423 selection_check (1); 1447 selection_check (1);
1424 min_it (count, (ncol - screen.cur.col)); 1448 min_it (count, ncol - screen.cur.col);
1425 1449
1426 row = screen.cur.row; 1450 row = screen.cur.row;
1427 1451
1428 line_t *line = &ROW(row); 1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1429 1456
1430 switch (insdel) 1457 switch (insdel)
1431 { 1458 {
1432 case INSERT: 1459 case INSERT:
1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1434 { 1461 {
1435 line->t[col] = line->t[col - count]; 1462 line->t[col] = line->t[col - count];
1436 line->r[col] = line->r[col - count]; 1463 line->r[col] = line->r[col - count];
1437 } 1464 }
1438 1465
1439 if (!line->is_longer ()) 1466 line->l = min (line->l + count, ncol);
1440 {
1441 line->l += count;
1442 min_it (line->l, ncol);
1443 }
1444 1467
1445 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1470 {
1448 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
… …
1461 1484
1462 case ERASE: 1485 case ERASE:
1463 screen.cur.col += count; /* don't worry if > ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1464 selection_check (1); 1487 selection_check (1);
1465 screen.cur.col -= count; 1488 screen.cur.col -= count;
1489
1490 line->l = max (line->l - count, 0);
1466 scr_blank_line (*line, screen.cur.col, count, rstyle); 1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1467 break; 1492 break;
1468 1493
1469 case DELETE: 1494 case DELETE:
1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1473 { 1498 {
1474 line->t[col] = line->t[col + count]; 1499 line->t[col] = line->t[col + count];
1475 line->r[col] = line->r[col + count]; 1500 line->r[col] = line->r[col + count];
1476 } 1501 }
1477 1502
1503 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, ncol - count, count, tr); 1504 scr_blank_line (*line, ncol - count, count, tr);
1479
1480 if (line->is_longer ()) /* break line continuation */
1481 line->l = ncol;
1482
1483 max_it (line->l - count, 0);
1484 1505
1485 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 { 1508 {
1488 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
… …
1506/* 1527/*
1507 * Set the scrolling region 1528 * Set the scrolling region
1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1509 */ 1530 */
1510void 1531void
1511rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1512{ 1533{
1513 max_it (top, 0); 1534 max_it (top, 0);
1514 min_it (bot, (int)nrow - 1); 1535 min_it (bot, nrow - 1);
1515 1536
1516 if (top > bot) 1537 if (top > bot)
1517 return; 1538 return;
1518 1539
1519 screen.tscroll = top; 1540 screen.tscroll = top;
… …
1526 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1527 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1528 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1529 */ 1550 */
1530void 1551void
1531rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1532{ 1553{
1533 want_refresh = 1; 1554 want_refresh = 1;
1534 1555
1535 if (mode) 1556 if (mode)
1536 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1543 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1544 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1545 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1546 */ 1567 */
1547void 1568void
1548rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1549{ 1570{
1550 if (mode) 1571 if (mode)
1551 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1552 else 1573 else
1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1562 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1563 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1564 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1565 */ 1586 */
1566void 1587void
1567rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1568{ 1589{
1569 if (mode) 1590 if (mode)
1570 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1571 else 1592 else
1572 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1579 * Set insert/replace mode 1600 * Set insert/replace mode
1580 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1581 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1582 */ 1603 */
1583void 1604void
1584rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1585{ 1606{
1586 if (mode) 1607 if (mode)
1587 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1588 else 1609 else
1589 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1595 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1596 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1597 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1598 */ 1619 */
1599void 1620void
1600rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1601{ 1622{
1602 if (mode < 0) 1623 if (mode < 0)
1603 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1604 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1605 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1606} 1627}
1607 1628
1608/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1609/* 1630/*
1610 * Set reverse/normal video 1631 * Set reverse/normal video
1611 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1612 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1613 */ 1634 */
1614void 1635void
1615rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1616{ 1637{
1617 XGCValues gcvalue; 1638 rvideo_mode = on;
1618 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1619 if (rvideo != mode) 1644 if (rvideo_state != on)
1620 { 1645 {
1621 rvideo = mode; 1646 rvideo_state = on;
1647
1622 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1625#endif 1651#endif
1626#if TRANSPARENT 1652#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1654#endif
1629 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1630 pix_colors[Color_bg]);
1631 1656
1657 XGCValues gcvalue;
1632 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1633 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1634 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1635 &gcvalue); 1661
1636 scr_clear (); 1662 scr_clear ();
1637 scr_touch (true); 1663 scr_touch (true);
1638 } 1664 }
1639} 1665}
1640 1666
… …
1642/* 1668/*
1643 * Report current cursor position 1669 * Report current cursor position
1644 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1645 */ 1671 */
1646void 1672void
1647rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1648{ 1674{
1649 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);
1650} 1676}
1651 1677
1652/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1655 1681
1656/* 1682/*
1657 * Set font style 1683 * Set font style
1658 */ 1684 */
1659void 1685void
1660rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1661{ 1687{
1688#if 0
1662 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1663 { 1690 {
1664 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1665 break; 1692 break;
1666 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1667 break; 1694 break;
… …
1674 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1675 break; 1702 break;
1676 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1677 break; 1704 break;
1678 } 1705 }
1706#endif
1679} 1707}
1680 1708
1681/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1682/* 1710/*
1683 * Choose a font 1711 * Choose a font
… …
1685 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1686 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1687 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1688 */ 1716 */
1689void 1717void
1690rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1691{ 1719{
1692 screen.charset = set; 1720 screen.charset = set;
1693 set_font_style (); 1721 set_font_style ();
1694} 1722}
1695 1723
… …
1701 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1702 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1703 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1704 */ 1732 */
1705void 1733void
1706rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1707{ 1735{
1708 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1709 set_font_style (); 1737 set_font_style ();
1710} 1738}
1711 1739
… …
1716 1744
1717/* 1745/*
1718 * refresh matching text. 1746 * refresh matching text.
1719 */ 1747 */
1720bool 1748bool
1721rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1722{ 1750{
1723 bool found = false; 1751 bool found = false;
1724 1752
1725 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1726 { 1754 {
1727 int col = 0; 1755 int col = 0;
1728 rend_t *drp = drawn[i].r; 1756 rend_t *drp = drawn_buf[i].r;
1729 1757
1730 for (; col < ncol; col++, drp++) 1758 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1732 { 1760 {
1733 found = true; 1761 found = true;
… …
1746 PART_END, 1774 PART_END,
1747 RC_COUNT 1775 RC_COUNT
1748}; 1776};
1749 1777
1750void 1778void
1751rxvt_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
1752{ 1780{
1753 int i; 1781 int i;
1754 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1755 1783
1756 if (!drawn) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1757 return; 1785 return;
1758 1786
1759#ifndef NO_SLOW_LINK_SUPPORT 1787#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1789 {
1762 y = 0; 1790 y = 0;
1763 eheight = height; 1791 eheight = height;
1764 } 1792 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768#if 0
1769 // that's not debugging //TODO //FIXME
1770 clamp_it (x, 0, width);
1771 clamp_it (y, 0, height);
1772#endif
1773#endif 1793#endif
1774 1794
1775 /* round down */ 1795 /* round down */
1776 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1777 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
… …
1785 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1786 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1787 } 1807 }
1788 1808
1789 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++)
1790 fill_text (&drawn[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);
1811
1812 num_scr_allow = 0;
1791 1813
1792 if (refresh) 1814 if (refresh)
1793 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1794} 1816}
1795 1817
1796/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1797/* 1819/*
1798 * Refresh the entire screen 1820 * Refresh the entire screen
1799 */ 1821 */
1800void 1822void
1801rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1802{ 1824{
1803 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1804} 1826}
1805 1827
1806/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1807/* 1829/*
1808 * 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
1809 * the top of the screen 1831 * the top of the screen
1810 */ 1832 */
1811int 1833void
1812rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1813{ 1835{
1814 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1815 unsigned int oldviewstart;
1816
1817 oldviewstart = view_start;
1818
1819 if (y < len)
1820 {
1821 p = (nrow + nsaved) * (len - y) / len;
1822 p -= (long) (nrow - 1);
1823 p = max (p, 0);
1824 }
1825
1826 view_start = (unsigned int)min (p, nsaved);
1827
1828 return scr_changeview (oldviewstart);
1829} 1837}
1830 1838
1831/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1832/* 1840/*
1833 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1834 * direction should be UP or DN 1842 * direction should be UP or DN
1835 */ 1843 */
1836int 1844bool
1837rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1838{ 1846{
1839 int n; 1847 int new_view_start =
1840 unsigned int oldviewstart;
1841
1842 oldviewstart = view_start;
1843
1844 if (direction == UP)
1845 {
1846 n = view_start + nlines;
1847 view_start = min (n, nsaved);
1848 }
1849 else
1850 {
1851 n = view_start - nlines; 1848 direction == UP ? view_start - nlines
1852 view_start = max (n, 0); 1849 : view_start + nlines;
1853 }
1854 1850
1855 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1856} 1852}
1857 1853
1858int 1854bool
1859rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1860{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1861 if (view_start != oldviewstart) 1859 if (new_view_start == view_start)
1862 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1863 want_refresh = 1; 1864 want_refresh = 1;
1864 num_scr -= (view_start - oldviewstart);
1865 }
1866 1865
1867 return (int) (view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1868}
1869 1867
1870/* ------------------------------------------------------------------------- */ 1868 return true;
1869}
1870
1871#ifndef NO_BELL
1871void 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
1872rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1873{ 1883{
1874#ifndef NO_BELL 1884#ifndef NO_BELL
1875 1885
1876# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1878 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1879# endif 1889# endif
1880 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1881# endif 1891# endif
1882 1892
1883 if (options & Opt_visualBell) 1893 if (OPTION (Opt_visualBell))
1884 { 1894 {
1885 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1886 rxvt_usleep (VISUAL_BELL_DURATION); 1896 scr_rvideo_mode (rvideo_mode);
1887 scr_rvideo_mode (!rvideo); /* refresh also done */ 1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1888 } 1900 }
1889 else 1901 else
1890 XBell (display->display, 0); 1902 XBell (display->display, 0);
1891 1903
1892#endif 1904#endif
1893} 1905}
1894 1906
1895/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1896/* ARGSUSED */ 1908/* ARGSUSED */
1897void 1909void
1898rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1899{ 1911{
1900#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1901 int nrows, row_start; 1913 int nrows, row_start;
1902 FILE *fd; 1914 FILE *fd;
1903 1915
1904 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1905 return; 1917 return;
1906 1918
1907 if (fullhist) 1919 if (fullhist)
1908 { 1920 {
1909 nrows = nrow + nsaved; 1921 nrows = nrow - top_row;
1910 row_start = -nsaved; 1922 row_start = top_row;
1911 } 1923 }
1912 else 1924 else
1913 { 1925 {
1914 nrows = nrow; 1926 nrows = nrow;
1915 row_start = -view_start; 1927 row_start = view_start;
1916 } 1928 }
1917 1929
1918 wctomb (0, 0); 1930 wctomb (0, 0);
1919 1931
1920 for (int r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
… …
1952 * Refresh the screen 1964 * Refresh the screen
1953 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1954 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1955 */ 1967 */
1956void 1968void
1957rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1958{ 1970{
1959 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1960 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1961 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1962 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
… …
1979 1991
1980#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
1981 must_clear |= bgPixmap.pixmap != None; 1993 must_clear |= bgPixmap.pixmap != None;
1982#endif 1994#endif
1983#if TRANSPARENT 1995#if TRANSPARENT
1984 must_clear |= (options & Opt_transparent) && am_transparent; 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1985#endif 1997#endif
1986 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1987 1999
1988 /* 2000 /*
1989 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
2013 2025
2014 crp = &ROW(screen.cur.row).r[col]; 2026 crp = &ROW(screen.cur.row).r[col];
2015 2027
2016 if (showcursor && focus) 2028 if (showcursor && focus)
2017 { 2029 {
2018 if (options & Opt_cursorUnderline) 2030 if (OPTION (Opt_cursorUnderline))
2019 *crp ^= RS_Uline; 2031 *crp ^= RS_Uline;
2020 else 2032 else
2021 { 2033 {
2022 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
2023 2035
… …
2025 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2026 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
2027 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
2028 else 2040 else
2029#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2030 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
2031#else 2043#else
2032 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
2033#endif 2045#endif
2034 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
2035 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
2036 else 2048 else
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
2039#else 2051#else
2040 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
2041#endif 2053#endif
2042 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
2043 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2048 2060
2049 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2050 setoldcursor = 0; 2062 setoldcursor = 0;
2051 if (ocrow != -1) 2063 if (ocrow != -1)
2052 { 2064 {
2053 if (screen.cur.row + view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2054 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2055 { 2067 {
2056 if (ocrow < nrow 2068 if (ocrow < nrow
2057 && oldcursor.col < ncol) 2069 && oldcursor.col < ncol)
2058 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2059 2071
2060 if (focus || !showcursor) 2072 if (focus || !showcursor)
2061 oldcursor.row = -1; 2073 oldcursor.row = -1;
2062 else 2074 else
2063 setoldcursor = 1; 2075 setoldcursor = 1;
… …
2066 else if (!focus) 2078 else if (!focus)
2067 setoldcursor = 1; 2079 setoldcursor = 1;
2068 2080
2069 if (setoldcursor) 2081 if (setoldcursor)
2070 { 2082 {
2071 if (screen.cur.row + view_start >= nrow) 2083 if (screen.cur.row - view_start >= nrow)
2072 oldcursor.row = -1; 2084 oldcursor.row = -1;
2073 else 2085 else
2074 { 2086 {
2075 oldcursor.row = screen.cur.row + view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2076 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2077 } 2089 }
2078 } 2090 }
2079 } 2091 }
2080 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2081#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2082 scr_swap_overlay (); 2095 scr_swap_overlay ();
2083#endif 2096#endif
2084 2097
2085#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2086 /* 2099 /*
2087 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2088 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2089 */ 2102 */
2090 i = num_scr;
2091 if (!display->is_local 2103 if (!display->is_local
2092 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2093 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2094 { 2106 {
2095 int16_t nits; 2107 int16_t nits;
2096 int j; 2108 int j;
2097 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2098 2111
2099 j = nrow; 2112 j = nrow;
2100 wlen = len = -1; 2113 wlen = len = -1;
2101 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2102 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2103 { 2116 {
2104 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2105 { 2118 {
2106 line_t s = ROW(row - view_start); 2119 line_t s = ROW(view_start + row);
2107 line_t d = drawn[row]; 2120 line_t d = drawn_buf[row];
2108 line_t d2 = drawn[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2109 2122
2110 for (nits = 0, col = ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2111 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])
2112 nits--; 2125 nits--;
2113 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2126 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2135 if (wlen < len) 2148 if (wlen < len)
2136 ::swap (wlen, len); 2149 ::swap (wlen, len);
2137 2150
2138 XCopyArea (display->display, vt, vt, 2151 XCopyArea (display->display, vt, vt,
2139 gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2140 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2141 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2142 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2143 len = -1; 2156 len = -1;
2144 } 2157 }
2145 } 2158 }
… …
2149 /* 2162 /*
2150 * E: main pass across every character 2163 * E: main pass across every character
2151 */ 2164 */
2152 for (row = 0; row < nrow; row++) 2165 for (row = 0; row < nrow; row++)
2153 { 2166 {
2154 text_t *stp = ROW(row - view_start).t; 2167 text_t *stp = ROW(view_start + row).t;
2155 rend_t *srp = ROW(row - view_start).r; 2168 rend_t *srp = ROW(view_start + row).r;
2156 text_t *dtp = drawn[row].t; 2169 text_t *dtp = drawn_buf[row].t;
2157 rend_t *drp = drawn[row].r; 2170 rend_t *drp = drawn_buf[row].r;
2158 2171
2159 /* 2172 /*
2160 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
2161 */ 2174 */
2162 int ypixel = (int)Row2Pixel (row); 2175 int ypixel = (int)Row2Pixel (row);
… …
2224 count++, i--; 2237 count++, i--;
2225 2238
2226 /* 2239 /*
2227 * Determine the attributes for the string 2240 * Determine the attributes for the string
2228 */ 2241 */
2229 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2230 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2231 2244
2232 // 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
2233 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))
2234 { 2247 {
2235#if ENABLE_STYLES 2248#if ENABLE_STYLES
2236 // force redraw after "careful" characters to avoid pixel droppings 2249 // force redraw after "careful" characters to avoid pixel droppings
2237 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2348 } /* for (row....) */ 2361 } /* for (row....) */
2349 2362
2350#if ENABLE_OVERLAY 2363#if ENABLE_OVERLAY
2351 scr_swap_overlay (); 2364 scr_swap_overlay ();
2352#endif 2365#endif
2366 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2353 2367
2354 /* 2368 /*
2355 * G: cleanup cursor and display outline cursor if necessary 2369 * G: cleanup cursor and display outline cursor if necessary
2356 */ 2370 */
2357 if (showcursor) 2371 if (showcursor)
2358 { 2372 {
2359 if (focus) 2373 if (focus)
2360 { 2374 {
2361 if (options & Opt_cursorUnderline) 2375 if (OPTION (Opt_cursorUnderline))
2362 *crp ^= RS_Uline; 2376 *crp ^= RS_Uline;
2363 else 2377 else
2364 { 2378 {
2365 *crp ^= RS_RVid; 2379 *crp ^= RS_RVid;
2366#ifndef NO_CURSORCOLOR 2380#ifndef NO_CURSORCOLOR
… …
2375 2389
2376 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2390 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2377 col--; 2391 col--;
2378 2392
2379 while (col + cursorwidth < ncol 2393 while (col + cursorwidth < ncol
2380 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2381 cursorwidth++; 2395 cursorwidth++;
2382 2396
2383#ifndef NO_CURSORCOLOR 2397#ifndef NO_CURSORCOLOR
2384 if (ISSET_PIXCOLOR (Color_cursor)) 2398 if (ISSET_PIXCOLOR (Color_cursor))
2385 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2396 /* 2410 /*
2397 * H: cleanup selection 2411 * H: cleanup selection
2398 */ 2412 */
2399 scr_reverse_selection (); 2413 scr_reverse_selection ();
2400 2414
2401 if (refresh_type & SMOOTH_REFRESH)
2402 XFlush (display->display);
2403
2404 num_scr = 0; 2415 num_scr = 0;
2405 num_scr_allow = 1; 2416 num_scr_allow = 1;
2406} 2417}
2407 2418
2408void 2419void
2409rxvt_term::scr_remap_chars (const line_t &l) 2420rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2410{ 2421{
2411 if (!l.t) 2422 if (!l.t)
2412 return; 2423 return;
2413 2424
2425 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2426
2414 for (int i = ncol; i--; ) 2427 for (int i = ncol; i--; )
2415 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2428 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2416} 2429}
2417 2430
2418void 2431void
2419rxvt_term::scr_remap_chars () 2432rxvt_term::scr_remap_chars () NOTHROW
2420{ 2433{
2421 for (int i = total_rows; i--; ) 2434 for (int i = total_rows; i--; )
2422 scr_remap_chars (save[i]); 2435 scr_remap_chars (row_buf [i]);
2423 2436
2424 for (int i = nrow; i--; ) 2437 for (int i = nrow; i--; )
2425 { 2438 {
2426 scr_remap_chars (drawn[i]); 2439 scr_remap_chars (drawn_buf [i]);
2427 scr_remap_chars (swap_save[i]); 2440 scr_remap_chars (swap_buf [i]);
2428 } 2441 }
2429} 2442}
2430 2443
2431void 2444void
2432rxvt_term::scr_recolour () 2445rxvt_term::scr_recolour () NOTHROW
2433{ 2446{
2434 if (1 2447 if (1
2435#if TRANSPARENT 2448#if TRANSPARENT
2436 && !am_transparent 2449 && !am_transparent
2437#endif 2450#endif
… …
2458 want_refresh = 1; 2471 want_refresh = 1;
2459} 2472}
2460 2473
2461/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2462void 2475void
2463rxvt_term::scr_clear (bool really) 2476rxvt_term::scr_clear (bool really) NOTHROW
2464{ 2477{
2465 if (!mapped) 2478 if (!mapped)
2466 return; 2479 return;
2467 2480
2468 num_scr_allow = 0; 2481 num_scr_allow = 0;
… …
2470 2483
2471 if (really) 2484 if (really)
2472 XClearWindow (display->display, vt); 2485 XClearWindow (display->display, vt);
2473} 2486}
2474 2487
2475/* ------------------------------------------------------------------------- */
2476void 2488void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{
2491 int view_end = view_start + nrow;
2492 int row, col;
2493
2494 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2495 {
2496 text_t *stp = ROW(row).t;
2497 rend_t *srp = ROW(row).r;
2498
2499 for (col = beg_col; col < end_col; col++)
2500 srp[col] ^= rstyle1;
2501
2502 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2503 srp[col] ^= rstyle2;
2504
2505 if (++col < end_col)
2506 srp[col] ^= rstyle2;
2507 }
2508}
2509
2510void
2511rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2512{
2513 int view_end = view_start + nrow;
2514 int row, col;
2515
2516 if (beg_row >= view_start)
2517 {
2518 col = beg_col;
2519 row = beg_row;
2520 }
2521 else
2522 {
2523 col = 0;
2524 row = view_start;
2525 }
2526
2527 for (; row < min (end_row, view_end); row++, col = 0)
2528 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2529 srp[col] ^= rstyle;
2530
2531 if (row == end_row)
2532 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2533 srp[col] ^= rstyle;
2534}
2535
2536/* ------------------------------------------------------------------------- */
2537void
2477rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection () NOTHROW
2478{ 2539{
2479 if (selection.op 2540 if (selection.op
2480 && current_screen == selection.screen 2541 && current_screen == selection.screen
2481 && selection.end.row >= -view_start) 2542 && selection.end.row >= view_start)
2482 { 2543 {
2483 int view_end = -view_start + nrow;
2484 int row, col;
2485
2486#if ENABLE_FRILLS 2544#if ENABLE_FRILLS
2487 if (selection.rect) 2545 if (selection.rect)
2488 { 2546 scr_xor_rect (selection.beg.row, selection.beg.col,
2489 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2547 selection.end.row, selection.end.col,
2490 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2548 RS_RVid, RS_RVid | RS_Uline);
2491 srp[col] ^= RS_RVid;
2492 }
2493 else 2549 else
2494#endif 2550#endif
2495 { 2551 scr_xor_span (selection.beg.row, selection.beg.col,
2496 if (selection.beg.row >= -view_start) 2552 selection.end.row, selection.end.col,
2497 { 2553 RS_RVid);
2498 col = selection.beg.col;
2499 row = selection.beg.row;
2500 }
2501 else
2502 {
2503 col = 0;
2504 row = view_start;
2505 }
2506
2507 for (; row < min (selection.end.row, view_end); row++, col = 0)
2508 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2509 srp[col] ^= RS_RVid;
2510
2511 if (row == selection.end.row)
2512 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2513 srp[col] ^= RS_RVid;
2514 }
2515 } 2554 }
2516} 2555}
2517 2556
2518/* ------------------------------------------------------------------------- */ 2557/* ------------------------------------------------------------------------- */
2519/* 2558/*
2520 * Dump the whole scrollback and screen to the passed filedescriptor. The 2559 * Dump the whole scrollback and screen to the passed filedescriptor. The
2521 * invoking routine must close the fd. 2560 * invoking routine must close the fd.
2522 */ 2561 */
2523#if 0 2562#if 0
2524void 2563void
2525rxvt_term::scr_dump (int fd) 2564rxvt_term::scr_dump (int fd) NOTHROW
2526{ 2565{
2527 int row, wrote; 2566 int row, wrote;
2528 unsigned int width, towrite; 2567 unsigned int width, towrite;
2529 char r1[] = "\n"; 2568 char r1[] = "\n";
2530 2569
2531 for (row = saveLines - nsaved; 2570 for (row = saveLines - nsaved;
2532 row < saveLines + nrow - 1; row++) 2571 row < saveLines + nrow - 1; row++)
2533 { 2572 {
2534 width = save[row].l >= 0 ? save[row].l 2573 width = row_buf[row].l >= 0 ? row_buf[row].l
2535 : ncol; 2574 : ncol;
2536 for (towrite = width; towrite; towrite -= wrote) 2575 for (towrite = width; towrite; towrite -= wrote)
2537 { 2576 {
2538 wrote = write (fd, & (save[row].t[width - towrite]), 2577 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2539 towrite); 2578 towrite);
2540 if (wrote < 0) 2579 if (wrote < 0)
2541 return; /* XXX: death, no report */ 2580 return; /* XXX: death, no report */
2542 } 2581 }
2543 if (save[row].l >= 0) 2582 if (row_buf[row].l >= 0)
2544 if (write (fd, r1, 1) <= 0) 2583 if (write (fd, r1, 1) <= 0)
2545 return; /* XXX: death, no report */ 2584 return; /* XXX: death, no report */
2546 } 2585 }
2547} 2586}
2548#endif 2587#endif
2549 2588
2550/* ------------------------------------------------------------------------- * 2589/* ------------------------------------------------------------------------- *
2551 * CHARACTER SELECTION * 2590 * CHARACTER SELECTION *
2552 * ------------------------------------------------------------------------- */ 2591 * ------------------------------------------------------------------------- */
2553void 2592void
2554rxvt_term::selection_check (int check_more) 2593rxvt_term::selection_check (int check_more) NOTHROW
2555{ 2594{
2556 row_col_t pos; 2595 row_col_t pos;
2557 2596
2558 if (!selection.op) 2597 if (!selection.op)
2559 return; 2598 return;
2560 2599
2561 pos.row = pos.col = 0; 2600 pos.row = pos.col = 0;
2562 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2601 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2563 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2602 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2564 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2603 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2565 || (check_more == 1 2604 || (check_more == 1
2566 && current_screen == selection.screen 2605 && current_screen == selection.screen
2567 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2606 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2568 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2607 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2569 || (check_more == 2 2608 || (check_more == 2
… …
2580/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2581/* 2620/*
2582 * Paste a selection direct to the command fd 2621 * Paste a selection direct to the command fd
2583 */ 2622 */
2584void 2623void
2585rxvt_term::paste (unsigned char *data, unsigned int len) 2624rxvt_term::paste (char *data, unsigned int len) NOTHROW
2586{ 2625{
2587 /* convert normal newline chars into common keyboard Return key sequence */ 2626 /* convert normal newline chars into common keyboard Return key sequence */
2588 for (unsigned int i = 0; i < len; i++) 2627 for (unsigned int i = 0; i < len; i++)
2589 if (data[i] == C0_LF) 2628 if (data[i] == C0_LF)
2590 data[i] = C0_CR; 2629 data[i] = C0_CR;
… …
2596/* 2635/*
2597 * Respond to a notification that a primary selection has been sent 2636 * Respond to a notification that a primary selection has been sent
2598 * EXT: SelectionNotify 2637 * EXT: SelectionNotify
2599 */ 2638 */
2600void 2639void
2601rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2640rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2602{ 2641{
2603 if (prop == None) /* check for failed XConvertSelection */ 2642 if (prop == None) /* check for failed XConvertSelection */
2604 { 2643 {
2605 if ((selection_type & Sel_CompoundText)) 2644 if ((selection_type & Sel_CompoundText))
2606 { 2645 {
… …
2734 { 2773 {
2735 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2736 char *s = rxvt_wcstombs (w); 2775 char *s = rxvt_wcstombs (w);
2737 free (w); 2776 free (w);
2738 // TODO: strlen == only the first element will be converted. well... 2777 // TODO: strlen == only the first element will be converted. well...
2739 paste ((unsigned char *)s, strlen (s)); 2778 paste (s, strlen (s));
2740 free (s); 2779 free (s);
2741 } 2780 }
2742 else 2781 else
2743#endif 2782#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 && cl) 2784 && cl)
2746 { 2785 {
2747 for (int i = 0; i < cr; i++) 2786 for (int i = 0; i < cr; i++)
2748 paste ((unsigned char *)cl[i], strlen (cl[i])); 2787 paste (cl[i], strlen (cl[i]));
2749 2788
2750 XFreeStringList (cl); 2789 XFreeStringList (cl);
2751 } 2790 }
2752 else 2791 else
2753 paste (ct.value, ct.nitems); // paste raw 2792 paste ((char *)ct.value, ct.nitems); // paste raw
2754 2793
2755bailout: 2794bailout:
2756 XFree (ct.value); 2795 XFree (ct.value);
2757 2796
2758 if (selection_wait == Sel_normal) 2797 if (selection_wait == Sel_normal)
2759 selection_wait = Sel_none; 2798 selection_wait = Sel_none;
2760} 2799}
2761 2800
2762void 2801void
2763rxvt_term::incr_cb (time_watcher &w) 2802rxvt_term::incr_cb (time_watcher &w) NOTHROW
2764{ 2803{
2765 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2766 2805
2767 incr_buf_size = 0; 2806 incr_buf_size = 0;
2768 free (incr_buf); 2807 free (incr_buf);
2769 2808
2770 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2809 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2771} 2810}
2772 2811
2773void 2812void
2774rxvt_term::selection_property (Window win, Atom prop) 2813rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2775{ 2814{
2776 if (prop == None || selection_wait != Sel_incr) 2815 if (prop == None || selection_wait != Sel_incr)
2777 return; 2816 return;
2778 2817
2779 selection_paste (win, prop, true); 2818 selection_paste (win, prop, true);
… …
2788 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2789 * will auto fallback to CUT_BUFFER0 2828 * will auto fallback to CUT_BUFFER0
2790 * EXT: button 2 release 2829 * EXT: button 2 release
2791 */ 2830 */
2792void 2831void
2793rxvt_term::selection_request (Time tm, int x, int y) 2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2794{ 2833{
2795 if (x < 0 || x >= width || y < 0 || y >= height) 2834 if (selection.text && selnum == Sel_Primary)
2796 return; /* outside window */
2797
2798 if (selection.text)
2799 { /* internal selection */ 2835 { /* internal selection */
2800 char *str = rxvt_wcstombs (selection.text, selection.len); 2836 char *str = rxvt_wcstombs (selection.text, selection.len);
2801 paste ((unsigned char *)str, strlen (str)); 2837 paste (str, strlen (str));
2802 free (str); 2838 free (str);
2803 return; 2839 return;
2804 } 2840 }
2805 else 2841 else
2806 { 2842 {
2807 int i;
2808
2809 selection_request_time = tm; 2843 selection_request_time = tm;
2810 selection_wait = Sel_normal; 2844 selection_wait = Sel_normal;
2811 2845
2812 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2813 {
2814#if X_HAVE_UTF8_STRING 2846#if X_HAVE_UTF8_STRING
2815 selection_type = Sel_UTF8String; 2847 selection_type = Sel_UTF8String;
2816 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2848 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2817 return; 2849 return;
2818#else 2850#else
2819 selection_type = Sel_CompoundText; 2851 selection_type = Sel_CompoundText;
2820 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2821 return; 2853 return;
2822#endif 2854#endif
2823 }
2824 } 2855 }
2825 2856
2826 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2857 selection_wait = Sel_none; /* don't loop in selection_paste () */
2827 selection_paste (display->root, XA_CUT_BUFFER0, false); 2858 selection_paste (display->root, XA_CUT_BUFFER0, false);
2828} 2859}
2829 2860
2830int 2861int
2831rxvt_term::selection_request_other (Atom target, int selnum) 2862rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2832{ 2863{
2833 Atom sel; 2864 Atom sel;
2834 2865
2835 selection_type |= selnum; 2866 selection_type |= selnum;
2836 2867
… …
2855/* 2886/*
2856 * Clear all selected text 2887 * Clear all selected text
2857 * EXT: SelectionClear 2888 * EXT: SelectionClear
2858 */ 2889 */
2859void 2890void
2860rxvt_term::selection_clear () 2891rxvt_term::selection_clear () NOTHROW
2861{ 2892{
2862 want_refresh = 1; 2893 want_refresh = 1;
2863 free (selection.text); 2894 free (selection.text);
2864 selection.text = NULL; 2895 selection.text = NULL;
2865 selection.len = 0; 2896 selection.len = 0;
… …
2898 selection.op = SELECTION_DONE; 2929 selection.op = SELECTION_DONE;
2899 2930
2900 if (selection.clicks == 4) 2931 if (selection.clicks == 4)
2901 return; /* nothing selected, go away */ 2932 return; /* nothing selected, go away */
2902 2933
2934 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2935 return;
2936
2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2937 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2938 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2905 2939
2906 int ofs = 0; 2940 int ofs = 0;
2907 int extra = 0; 2941 int extra = 0;
… …
2919 col = selection.beg.col; 2953 col = selection.beg.col;
2920 end_col = ncol + 1; 2954 end_col = ncol + 1;
2921 } 2955 }
2922 else 2956 else
2923#endif 2957#endif
2924 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2958 end_col = ROW(row).l;
2925 2959
2926 col = max (col, 0); 2960 col = max (col, 0);
2927 2961
2928 if (row == selection.end.row || selection.rect) 2962 if (row == selection.end.row
2963#if ENABLE_FRILLS
2964 || selection.rect
2965#endif
2966 )
2929 end_col = min (end_col, selection.end.col); 2967 min_it (end_col, selection.end.col);
2930 2968
2931 t = ROW(row).t + col; 2969 t = ROW(row).t + col;
2970
2932 for (; col < end_col; col++) 2971 for (; col < end_col; col++)
2933 { 2972 {
2934 if (*t == NOCHAR) 2973 if (*t == NOCHAR)
2935 t++; 2974 t++;
2936#if ENABLE_COMBINING 2975#if ENABLE_COMBINING
… …
2952#endif 2991#endif
2953 else 2992 else
2954 new_selection_text[ofs++] = *t++; 2993 new_selection_text[ofs++] = *t++;
2955 } 2994 }
2956 2995
2996#if ENABLE_FRILLS
2997 if (selection.rect)
2998 {
2999 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1]))
3002 --ofs;
3003
3004 new_selection_text[ofs++] = C0_LF;
3005 }
3006 else
3007#endif
2957 if (!ROW(row).is_longer () && row != selection.end.row) 3008 if (!ROW(row).is_longer () && row != selection.end.row)
2958 new_selection_text[ofs++] = C0_LF; 3009 new_selection_text[ofs++] = C0_LF;
2959 } 3010 }
2960 3011
2961 if (end_col != selection.end.col) 3012 if (end_col != selection.end.col)
2962 new_selection_text[ofs++] = C0_LF; 3013 new_selection_text[ofs++] = C0_LF;
2963 3014
… …
2973 3024
2974 // we usually allocate much more than necessary, so realloc it smaller again 3025 // we usually allocate much more than necessary, so realloc it smaller again
2975 selection.len = ofs; 3026 selection.len = ofs;
2976 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3027 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2977 3028
3029 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3030 return;
3031
3032 selection_grab (tm);
3033}
3034
3035bool
3036rxvt_term::selection_grab (Time tm) NOTHROW
3037{
3038 selection_time = tm;
3039
2978 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2979 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3042 {
2980 display->set_selection_owner (this); 3043 display->set_selection_owner (this);
3044 return true;
3045 }
2981 else 3046 else
2982 rxvt_warn ("can't get primary selection, ignoring.\n"); 3047 {
3048 selection_clear ();
3049 return false;
3050 }
2983 3051
2984#if 0 3052#if 0
2985 XTextProperty ct; 3053 XTextProperty ct;
2986 3054
2987 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2988 { 3056 {
2989 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2990 XFree (ct.value); 3058 XFree (ct.value);
2991 } 3059 }
2992#endif 3060#endif
2993
2994 selection_time = tm;
2995} 3061}
2996 3062
2997/* ------------------------------------------------------------------------- */ 3063/* ------------------------------------------------------------------------- */
2998/* 3064/*
2999 * Mark or select text based upon number of clicks: 1, 2, or 3 3065 * Mark or select text based upon number of clicks: 1, 2, or 3
3000 * EXT: button 1 press 3066 * EXT: button 1 press
3001 */ 3067 */
3002void 3068void
3003rxvt_term::selection_click (int clicks, int x, int y) 3069rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3004{ 3070{
3005 clicks = ((clicks - 1) % 3) + 1; 3071 clicks = ((clicks - 1) % 3) + 1;
3006 selection.clicks = clicks; /* save clicks so extend will work */ 3072 selection.clicks = clicks; /* save clicks so extend will work */
3007 3073
3074 if (clicks == 2 && !selection.rect
3075 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3076 {
3077 MEvent.clicks = 1; // what a mess
3078 selection.screen = current_screen;
3079 selection.op = SELECTION_CONT;
3080 return;
3081 }
3082
3008 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3083 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3009 3084
3010 if (clicks == 2 || clicks == 3) 3085 if (clicks == 2 || clicks == 3)
3011 selection_extend_colrow (selection.mark.col, 3086 selection_extend_colrow (selection.mark.col,
3012 selection.mark.row + view_start, 3087 selection.mark.row - view_start,
3013 0, /* button 3 */ 3088 0, /* button 3 */
3014 1, /* button press */ 3089 1, /* button press */
3015 0); /* click change */ 3090 0); /* click change */
3016} 3091}
3017 3092
3018/* ------------------------------------------------------------------------- */ 3093/* ------------------------------------------------------------------------- */
3019/* 3094/*
3020 * Mark a selection at the specified col/row 3095 * Mark a selection at the specified col/row
3021 */ 3096 */
3022void 3097void
3023rxvt_term::selection_start_colrow (int col, int row) 3098rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3024{ 3099{
3025 want_refresh = 1; 3100 want_refresh = 1;
3026 3101
3027 selection.mark.row = row - view_start; 3102 selection.mark.row = row + view_start;
3028 selection.mark.col = col; 3103 selection.mark.col = col;
3029 3104
3030 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3105 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3031 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3032 3107
3033 while (selection.mark.col > 0 3108 while (selection.mark.col > 0
3034 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3035 --selection.mark.col; 3110 --selection.mark.col;
… …
3054#define DELIMIT_TEXT(x) \ 3129#define DELIMIT_TEXT(x) \
3055 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3130 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3056#define DELIMIT_REND(x) 1 3131#define DELIMIT_REND(x) 1
3057 3132
3058void 3133void
3059rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3134rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3060{ 3135{
3061 int col, row, dirnadd, tcol, trow, w1, w2; 3136 int col, row, dirnadd, tcol, trow, w1, w2;
3062 row_col_t bound; 3137 row_col_t bound;
3063 text_t *stp; 3138 text_t *stp;
3064 rend_t *srp; 3139 rend_t *srp;
3065 3140
3066 if (dirn == UP) 3141 if (dirn == UP)
3067 { 3142 {
3068 bound.row = - nsaved - 1; 3143 bound.row = top_row - 1;
3069 bound.col = 0; 3144 bound.col = 0;
3070 dirnadd = -1; 3145 dirnadd = -1;
3071 } 3146 }
3072 else 3147 else
3073 { 3148 {
… …
3121 } 3196 }
3122 } 3197 }
3123 break; 3198 break;
3124 } 3199 }
3125 3200
3126Old_Word_Selection_You_Die:
3127 if (dirn == DN) 3201 if (dirn == DN)
3128 col++; /* put us on one past the end */ 3202 col++; /* put us on one past the end */
3129 3203
3130 /* Poke the values back in */ 3204 /* Poke the values back in */
3131 ret->row = row; 3205 ret->row = row;
… …
3139 * flag == 0 ==> button 1 3213 * flag == 0 ==> button 1
3140 * flag == 1 ==> button 3 press 3214 * flag == 1 ==> button 3 press
3141 * flag == 2 ==> button 3 motion 3215 * flag == 2 ==> button 3 motion
3142 */ 3216 */
3143void 3217void
3144rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3145{ 3219{
3146 int col = clamp (Pixel2Col (x), 0, ncol); 3220 int col = clamp (Pixel2Col (x), 0, ncol);
3147 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3221 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3148 3222
3149 /* 3223 /*
… …
3152 * select nothing. Otherwise, if we're to the right of the mark, you have to 3226 * select nothing. Otherwise, if we're to the right of the mark, you have to
3153 * be _past_ a character for it to be selected. 3227 * be _past_ a character for it to be selected.
3154 */ 3228 */
3155 if (((selection.clicks % 3) == 1) && !flag 3229 if (((selection.clicks % 3) == 1) && !flag
3156 && (col == selection.mark.col 3230 && (col == selection.mark.col
3157 && (row == selection.mark.row + view_start))) 3231 && (row == selection.mark.row - view_start)))
3158 { 3232 {
3159 /* select nothing */ 3233 /* select nothing */
3160 selection.beg.row = selection.end.row = 0; 3234 selection.beg.row = selection.end.row = 0;
3161 selection.beg.col = selection.end.col = 0; 3235 selection.beg.col = selection.end.col = 0;
3162 selection.clicks = 4; 3236 selection.clicks = 4;
… …
3175/* ------------------------------------------------------------------------- */ 3249/* ------------------------------------------------------------------------- */
3176/* 3250/*
3177 * Extend the selection to the specified col/row 3251 * Extend the selection to the specified col/row
3178 */ 3252 */
3179void 3253void
3180rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3254rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3181{ 3255{
3182 row_col_t pos; 3256 row_col_t pos;
3183 enum { 3257 enum {
3184 LEFT, RIGHT 3258 LEFT, RIGHT
3185 } closeto = RIGHT; 3259 } closeto = RIGHT;
… …
3217 selection.beg.col = selection.end.col = selection.mark.col; 3291 selection.beg.col = selection.end.col = selection.mark.col;
3218 selection.beg.row = selection.end.row = selection.mark.row; 3292 selection.beg.row = selection.end.row = selection.mark.row;
3219 } 3293 }
3220 3294
3221 pos.col = col; 3295 pos.col = col;
3222 pos.row = row - view_start; 3296 pos.row = view_start + row;
3223 3297
3224 /* 3298 /*
3225 * This is mainly xterm style selection with a couple of differences, mainly 3299 * This is mainly xterm style selection with a couple of differences, mainly
3226 * in the way button3 drag extension works. 3300 * in the way button3 drag extension works.
3227 * We're either doing: button1 drag; button3 press; or button3 drag 3301 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3314 selection_delimit_word (DN, &selection.end, &selection.end); 3388 selection_delimit_word (DN, &selection.end, &selection.end);
3315 } 3389 }
3316 else if (selection.clicks == 3) 3390 else if (selection.clicks == 3)
3317 { 3391 {
3318#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3319 if (options & Opt_tripleclickwords) 3393 if (OPTION (Opt_tripleclickwords))
3320 { 3394 {
3321 selection_delimit_word (UP, &selection.beg, &selection.beg); 3395 selection_delimit_word (UP, &selection.beg, &selection.beg);
3322 3396
3323 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3324 { 3398 {
… …
3371#endif 3445#endif
3372} 3446}
3373 3447
3374#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3375void 3449void
3376rxvt_term::selection_remove_trailing_spaces () 3450rxvt_term::selection_remove_trailing_spaces () NOTHROW
3377{ 3451{
3378 int32_t end_col, end_row; 3452 int32_t end_col, end_row;
3379 text_t *stp; 3453 text_t *stp;
3380 3454
3381 end_col = selection.end.col; 3455 end_col = selection.end.col;
… …
3385 { 3459 {
3386 stp = ROW(end_row).t; 3460 stp = ROW(end_row).t;
3387 3461
3388 while (--end_col >= 0) 3462 while (--end_col >= 0)
3389 { 3463 {
3390 if (stp[end_col] != ' ' 3464 if (stp[end_col] != NOCHAR
3391 && stp[end_col] != '\t' 3465 && !unicode::is_space (stp[end_col]))
3392 && stp[end_col] != NOCHAR)
3393 break; 3466 break;
3394 } 3467 }
3395 3468
3396 if (end_col >= 0 3469 if (end_col >= 0
3397 || !ROW(end_row - 1).is_longer ()) 3470 || !ROW(end_row - 1).is_longer ())
… …
3420/* 3493/*
3421 * Double click on button 3 when already selected 3494 * Double click on button 3 when already selected
3422 * EXT: button 3 double click 3495 * EXT: button 3 double click
3423 */ 3496 */
3424void 3497void
3425rxvt_term::selection_rotate (int x, int y) 3498rxvt_term::selection_rotate (int x, int y) NOTHROW
3426{ 3499{
3427 selection.clicks = selection.clicks % 3 + 1; 3500 selection.clicks = selection.clicks % 3 + 1;
3428 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3501 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3429} 3502}
3430 3503
… …
3432/* 3505/*
3433 * Respond to a request for our current selection 3506 * Respond to a request for our current selection
3434 * EXT: SelectionRequest 3507 * EXT: SelectionRequest
3435 */ 3508 */
3436void 3509void
3437rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3438{ 3511{
3439 XSelectionEvent ev; 3512 XSelectionEvent ev;
3440 dDisp; 3513 dDisp;
3441 3514
3442 ev.type = SelectionNotify; 3515 ev.type = SelectionNotify;
… …
3570 3643
3571/* 3644/*
3572 * return col/row values corresponding to x/y pixel values 3645 * return col/row values corresponding to x/y pixel values
3573 */ 3646 */
3574void 3647void
3575rxvt_term::pixel_position (int *x, int *y) 3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3576{ 3649{
3577 *x = Pixel2Col (*x); 3650 *x = Pixel2Col (*x);
3578 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3579 *y = Pixel2Row (*y); 3652 *y = Pixel2Row (*y);
3580 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3581} 3654}
3582 3655
3583/* ------------------------------------------------------------------------- */ 3656/* ------------------------------------------------------------------------- */
3584#ifdef USE_XIM 3657#ifdef USE_XIM
3585void 3658void
3586rxvt_term::im_set_position (XPoint &pos) 3659rxvt_term::im_set_position (XPoint &pos) NOTHROW
3587{ 3660{
3588 XWindowAttributes xwa; 3661 XWindowAttributes xwa;
3589 3662
3590 XGetWindowAttributes (display->display, vt, &xwa); 3663 XGetWindowAttributes (display->display, vt, &xwa);
3591 3664
… …
3594} 3667}
3595#endif 3668#endif
3596 3669
3597#if ENABLE_OVERLAY 3670#if ENABLE_OVERLAY
3598void 3671void
3599rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3672rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3600{ 3673{
3601 if (nrow < 3 || ncol < 3) 3674 if (nrow < 1 || ncol < 1)
3602 return; 3675 return;
3603 3676
3604 want_refresh = 1; 3677 want_refresh = 1;
3605 3678
3606 scr_overlay_off (); 3679 scr_overlay_off ();
… …
3610 3683
3611 // make space for border 3684 // make space for border
3612 w += 2; min_it (w, ncol); 3685 w += 2; min_it (w, ncol);
3613 h += 2; min_it (h, nrow); 3686 h += 2; min_it (h, nrow);
3614 3687
3615 x -= 1; max_it (x, 0); 3688 x -= 1; clamp_it (x, 0, ncol - w);
3616 y -= 1; max_it (y, 0); 3689 y -= 1; clamp_it (y, 0, nrow - h);
3617
3618 min_it (x, ncol - w);
3619 min_it (y, nrow - h);
3620 3690
3621 ov_x = x; ov_y = y; 3691 ov_x = x; ov_y = y;
3622 ov_w = w; ov_h = h; 3692 ov_w = w; ov_h = h;
3623 3693
3624 ov_text = new text_t *[h]; 3694 ov_text = new text_t *[h];
… …
3652 *rp = r; 3722 *rp = r;
3653 } 3723 }
3654} 3724}
3655 3725
3656void 3726void
3657rxvt_term::scr_overlay_off () 3727rxvt_term::scr_overlay_off () NOTHROW
3658{ 3728{
3659 if (!ov_text) 3729 if (!ov_text)
3660 return; 3730 return;
3661 3731
3662 want_refresh = 1; 3732 want_refresh = 1;
… …
3670 delete [] ov_text; ov_text = 0; 3740 delete [] ov_text; ov_text = 0;
3671 delete [] ov_rend; ov_rend = 0; 3741 delete [] ov_rend; ov_rend = 0;
3672} 3742}
3673 3743
3674void 3744void
3675rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3676{ 3746{
3677 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3678 return; 3748 return;
3679 3749
3680 x++, y++; 3750 x++, y++;
… …
3682 ov_text[y][x] = text; 3752 ov_text[y][x] = text;
3683 ov_rend[y][x] = rend; 3753 ov_rend[y][x] = rend;
3684} 3754}
3685 3755
3686void 3756void
3687rxvt_term::scr_overlay_set (int x, int y, const char *s) 3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3688{ 3758{
3689 while (*s) 3759 while (*s)
3690 scr_overlay_set (x++, y, *s++); 3760 scr_overlay_set (x++, y, *s++);
3691} 3761}
3692 3762
3693void 3763void
3694rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3695{ 3765{
3696 while (*s) 3766 while (*s)
3697 { 3767 {
3698 text_t t = *s++; 3768 text_t t = *s++;
3699 int width = wcwidth (t); 3769 int width = wcwidth (t);
… …
3705 } 3775 }
3706 } 3776 }
3707} 3777}
3708 3778
3709void 3779void
3710rxvt_term::scr_swap_overlay () 3780rxvt_term::scr_swap_overlay () NOTHROW
3711{ 3781{
3712 if (!ov_text) 3782 if (!ov_text)
3713 return; 3783 return;
3714 3784
3715 // swap screen mem with overlay 3785 // swap screen mem with overlay
3716 for (int y = ov_h; y--; ) 3786 for (int y = ov_h; y--; )
3717 { 3787 {
3718 text_t *t1 = ov_text[y]; 3788 text_t *t1 = ov_text[y];
3719 rend_t *r1 = ov_rend[y]; 3789 rend_t *r1 = ov_rend[y];
3720 3790
3721 text_t *t2 = ROW(y - view_start).t + ov_x; 3791 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3722 rend_t *r2 = ROW(y - view_start).r + ov_x; 3792 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3723 3793
3724 for (int x = ov_w; x--; ) 3794 for (int x = ov_w; x--; )
3725 { 3795 {
3726 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3796 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3727 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3797 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