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