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

Diff Legend

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