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.160 by root, Mon Feb 21 19:30:58 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 TermWin.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() \
57 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
88/* 89/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 93 */
93#define drawBuffer TermWin.vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
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 (text_t *et, rend_t *er, 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
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
136
124 while (width--) 137 while (width--)
125 { 138 {
126 *et++ = ' '; 139 *et++ = ' ';
127 *er++ = efs; 140 *er++ = efs;
128 } 141 }
129} 142}
130 143
131/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
132/* 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 */
133void 146void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
135{ 148{
136#ifdef DEBUG_STRICT 149 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144 150
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 151 l.l = 0;
152 l.f = 0;
146} 153}
147 154
148/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
151void 159void
152rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
153{ 161{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q;
156 int k;
157 rend_t setrstyle;
158
159#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
160 scr_overlay_off (); 163 scr_overlay_off ();
161#endif 164#endif
162 165
163 TermWin.view_start = 0; 166 view_start = 0;
164 num_scr = 0; 167 num_scr = 0;
165 168
166 if (TermWin.ncol == 0) 169 if (ncol == 0)
167 TermWin.ncol = 80; 170 ncol = 80;
168 171
169 if (TermWin.nrow == 0) 172 if (nrow == 0)
170 TermWin.nrow = 24; 173 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
184 //TODO//FIXME
181 TermWin.saveLines++; 185 saveLines++;
182 prev_nrow--; 186 prev_nrow--;
183 TermWin.nscrolled++; 187 top_row--;
184 } 188 }
185 189
186 want_refresh = 1; 190 want_refresh = 1;
187 191
188 prev_total_rows = prev_nrow + TermWin.saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 193 total_rows = nrow + saveLines;
190 194
191 screen.tscroll = 0; 195 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 196 screen.bscroll = nrow - 1;
193 197
194 if (!talloc) 198 if (!row_buf)
195 { 199 {
200 /*
201 * first time called so just malloc everything: don't rely on realloc
202 */
203 top_row = 0;
204 term_start = 0;
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 }
199 208
200 if (!screen.text) 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
201 { 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 /* 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 * first time called so just malloc everything: don't rely on realloc 212
204 * Note: this is still needed so that all the scrollback lines are NULL 213 for (int row = nrow; row--; )
205 */ 214 {
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++)
220 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
226 } 218 }
227 219
228 memset (charsets, 'B', sizeof (charsets)); 220 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 221 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 222 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 223 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 224 screen.charset = 0;
234 current_screen = PRIMARY; 225 current_screen = PRIMARY;
… …
246 selection.text = NULL; 237 selection.text = NULL;
247 selection.len = 0; 238 selection.len = 0;
248 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
249 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
250 selection.clicks = 0; 241 selection.clicks = 0;
251 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
252 rvideo = 0;
253 } 243 }
254 else 244 else
255 { 245 {
256 /* 246 /*
257 * add or delete rows as appropriate 247 * add or delete rows as appropriate
258 */ 248 */
259 setrstyle = DEFAULT_RSTYLE;
260 249
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
261 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
262 { 255 {
263 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266
267 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
268 { 257 {
269 q = p + TermWin.saveLines; 258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
270 263
271 if (screen.text[q]) 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
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));
281
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
294 do
295 {
296 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
302
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
272 { 304 {
273#ifdef DEBUG_STRICT 305 p = MOD (p - 1, prev_total_rows);
274 assert (screen.rend[q]); 306
275#endif 307 plines++;
276 talloc->free (screen.text[q]); 308 llen += prev_ncol;
277 ralloc->free (screen.rend[q]);
278 } 309 }
279 310
280 if (swap.text[p]) 311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
319 int lofs = 0;
320 line_t *qline;
321
322 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++)
281 { 324 {
282#ifdef DEBUG_STRICT 325 qline = row_buf + qrow;
283 assert (swap.rend[p]); 326 lalloc (*qline);
284#endif 327 qline->l = ncol;
285 talloc->free (swap.text[p]); 328 qline->is_longer (1);
286 ralloc->free (swap.rend[p]); 329
330 int qcol = 0;
331
332 // see below for cursor adjustment rationale
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)
338 {
339 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol;
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
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354
355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
357
358 lofs += len;
359 qcol += len;
360 }
287 } 361 }
288 362
289#ifdef DEBUG_STRICT 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
290 assert (drawn_text[p] && drawn_rend[p]); 364 qline->is_longer (0);
291#endif 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
292 talloc->free (drawn_text[p]);
293 ralloc->free (drawn_rend[p]);
294 } 366 }
367 while (p != pend && q > 0);
295 368
296 /* we have fewer rows so fix up cursor position */ 369 term_start = total_rows - nrow;
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 370 top_row = q - term_start;
298 371
299 scr_reset_realloc (); /* realloc _last_ */ 372 // make sure all terminal lines exist
300 } 373 while (top_row > 0)
301 else if (nrow > prev_nrow) 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
302 { 375 }
303 /* add rows */ 376 else
304 scr_reset_realloc (); /* realloc _first_ */ 377 {
305 378 // if no scrollback exists (yet), wing, instead of wrap
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 379
307 380 for (int row = min (nrow, prev_nrow); row--; )
308 k = min (TermWin.nscrolled, nrow - prev_nrow);
309
310 for (p = prev_total_rows; p < total_rows; p++)
311 { 381 {
312 screen.tlen[p] = 0; 382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
313 screen.text[p] = NULL; 383 line_t &qline = row_buf [row];
314 screen.rend[p] = NULL; 384
385 qline = pline;
386 lresize (qline);
315 } 387 }
316 388
317 for (p = prev_total_rows; p < total_rows - k; p++)
318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
319
320 for (p = prev_nrow; p < nrow; p++) 389 for (int row = prev_nrow; row < nrow; row++)
321 { 390 {
322 swap.tlen[p] = 0; 391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
323 swap.text[p] = NULL;
324 swap.rend[p] = NULL;
325 drawn_text[p] = NULL;
326 drawn_rend[p] = NULL;
327 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
328 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
329 } 392 }
330 393
331 if (k > 0) 394 term_start = 0;
332 {
333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
334 screen.cur.row += k;
335 screen.s_cur.row += k;
336 TermWin.nscrolled -= k;
337 }
338
339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow);
341#else /* drive with your eyes closed */
342 MIN_IT (screen.cur.row, nrow - 1);
343#endif
344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
345 }
346
347 /* resize columns */
348 if (ncol != prev_ncol)
349 { 395 }
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
352 396
353 for (p = 0; p < total_rows; p++) 397 free (old_buf);
354 { 398 delete old_ta;
355 if (screen.text[p]) 399 delete old_ra;
356 {
357 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
358 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
359 400
360 MIN_IT (screen.tlen[p], (int16_t)ncol); 401 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1);
361 403
362 if (ncol > prev_ncol)
363 scr_blank_line (&screen.text[p][prev_ncol],
364 &screen.rend[p][prev_ncol],
365 ncol - prev_ncol, setrstyle);
366 }
367 }
368
369 for (p = 0; p < nrow; p++)
370 {
371 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
372 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
373
374 if (ncol > prev_ncol)
375 scr_blank_line (&drawn_text[p][prev_ncol],
376 &drawn_rend[p][prev_ncol],
377 ncol - prev_ncol, setrstyle);
378
379 if (swap.text[p])
380 {
381 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
382 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
383
384 MIN_IT (swap.tlen[p], (int16_t)ncol);
385
386 if (ncol > prev_ncol)
387 scr_blank_line (&swap.text[p][prev_ncol],
388 &swap.rend[p][prev_ncol],
389 ncol - prev_ncol, setrstyle);
390 }
391
392 }
393
394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
395
396 delete talloc; talloc = ta;
397 delete ralloc; ralloc = ra;
398 }
399
400 if (tabs)
401 free (tabs); 404 free (tabs);
402 } 405 }
406
407 CLEAR_ALL_SELECTION ();
403 408
404 prev_nrow = nrow; 409 prev_nrow = nrow;
405 prev_ncol = ncol; 410 prev_ncol = ncol;
406 411
407 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
408 413
409 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
410 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
411 419
412 tt_winch (); 420 tt_winch ();
413}
414 421
415void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416rxvt_term::scr_reset_realloc ()
417{
418 unsigned int total_rows, nrow;
419
420 nrow = TermWin.nrow;
421 total_rows = nrow + TermWin.saveLines;
422 /* *INDENT-OFF* */
423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
424 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
425 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
426 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
427
428 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
429 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
430
431 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
432 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
433 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
434 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
435 /* *INDENT-ON* */
436} 423}
437 424
438/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
439/* 426/*
440 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
441 */ 428 */
442void 429void
443rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
444{ 431{
445 unsigned int total_rows; 432 if (row_buf)
446 int i; 433 {
447
448 total_rows = TermWin.nrow + TermWin.saveLines;
449
450 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
452 436
453 free (screen.text); 437 free (row_buf);
454 free (screen.tlen); 438 free (swap_buf);
455 free (screen.rend); 439 free (drawn_buf);
456 free (drawn_text);
457 free (drawn_rend);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text);
462 free (buf_rend);
463 free (tabs); 440 free (tabs);
464 441
465 /* NULL these so if anything tries to use them, we'll know about it */ 442 row_buf = 0; // signal that we freed all the arrays
466 screen.text = drawn_text = swap.text = NULL; 443 }
467 screen.rend = drawn_rend = swap.rend = NULL;
468 screen.tlen = swap.tlen = NULL;
469 buf_text = NULL;
470 buf_rend = NULL;
471 tabs = NULL;
472} 444}
473 445
474/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
475/* 447/*
476 * Hard reset 448 * Hard reset
… …
481 scr_release (); 453 scr_release ();
482 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
483 scr_reset (); 455 scr_reset ();
484 456
485 scr_clear (true); 457 scr_clear (true);
486 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
487} 459}
488 460
489/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
490 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
491 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
493 * Save and Restore cursor 465 * Save and Restore cursor
494 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
495 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
496 */ 468 */
497void 469void
498rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
499{ 471{
500 screen_t *s; 472 screen_t *s;
501 473
502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
503 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
527 set_font_style (); 499 set_font_style ();
528 break; 500 break;
529 } 501 }
530 502
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 504 min_it (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 505 min_it (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0);
539 MAX_IT (s->cur.col, 0);
540#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);
541} 525}
542 526
543/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
544/* 528/*
545 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
546 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
547 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
548 */ 532 */
549int 533void
550rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
551{ 535{
552 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
553#if NSCREENS 546#if NSCREENS
554 int offset; 547 if (OPTION (Opt_secondaryScreen))
555#endif
556
557 want_refresh = 1;
558
559 TermWin.view_start = 0;
560
561 if (current_screen == scrn)
562 return scrn;
563
564 selection_check (2); /* check for boundary cross */
565
566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
575#if NSCREENS
576 if (options & Opt_secondaryScreen)
577 { 548 {
578 num_scr = 0; 549 num_scr = 0;
579 offset = TermWin.saveLines;
580 550
581 for (i = prev_nrow; i--;) 551 scr_swap_screen ();
582 {
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 }
587 552
588 SWAP_IT (screen.charset, swap.charset, int16_t); 553 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 554 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
592 } 557 }
593 else 558 else
594#endif 559#endif
595 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
597
598 return scrn;
599} 562}
600 563
601// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
602void 565void
603rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
604{ 567{
605 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
606 return; 569 return;
607 570
608 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
609 572
610 screen.cur.col = 0; 573 screen.cur.col = 0;
611 574
612 if (screen.cur.row == screen.bscroll) 575 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 576 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
614 else if (screen.cur.row < TermWin.nrow - 1) 577 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 578 screen.cur.row++;
616} 579}
617 580
618/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
619/* 582/*
620 * Change the colour for following text 583 * Change the colour for following text
621 */ 584 */
622void 585void
623rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
624{ 587{
625 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
626 color = fgbg; 589 color = fgbg;
627 590
628 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
629 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
630 else 593 else
… …
634/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
635/* 598/*
636 * Change the rendition style for following text 599 * Change the rendition style for following text
637 */ 600 */
638void 601void
639rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
640 { 603 {
641 if (set) 604 if (set)
642 rstyle |= style; 605 rstyle |= style;
643 else if (style == ~RS_None) 606 else if (style == ~RS_None)
644 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
649/* ------------------------------------------------------------------------- */ 612/* ------------------------------------------------------------------------- */
650/* 613/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 615 * count positive ==> scroll up
653 * count negative ==> scroll down 616 * count negative ==> scroll down
654 * spec == 0 for normal routines
655 */ 617 */
656int 618int
657rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
658{ 620{
659 int i, j;
660 long nscrolled;
661
662 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
663 return 0; 622 return 0;
664 623
665 want_refresh = 1; 624 want_refresh = 1;
625 num_scr += count;
666 626
667 if (row1 == 0 && count > 0 627 if (count > 0
628 && row1 == 0
668 && (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
669 { 637 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 638 line_t &l = ROW(row2 - count);
671 639 l.is_longer (0);
672 if (nscrolled > (long)TermWin.saveLines) 640 l.touch ();
673 TermWin.nscrolled = TermWin.saveLines;
674 else
675 TermWin.nscrolled = (unsigned int)nscrolled;
676
677 if ((options & Opt_scrollWithBuffer)
678 && TermWin.view_start != 0
679 && TermWin.view_start != TermWin.saveLines)
680 scr_page (UP, count);
681 } 641 }
682 else if (!spec)
683 row1 += TermWin.saveLines;
684 642
685 row2 += TermWin.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 + TermWin.saveLines;
690 j = selection.end.row + TermWin.saveLines;
691 if ((i < row1 && j > row1)
692 || (i < row2 && j > row2)
693 || (i - count < row1 && i >= row1)
694 || (i - count > row2 && i <= row2)
695 || (j - count < row1 && j >= row1)
696 || (j - count > row2 && j <= row2))
697 {
698 CLEAR_ALL_SELECTION ();
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700 } 670 {
701 else if (j >= row1 && j <= row2)
702 {
703 /* move selected region too */
704 selection.beg.row -= count; 671 selection.beg.row -= count;
705 selection.end.row -= count; 672 selection.end.row -= count;
706 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;
707 } 681 }
708 }
709
710 selection_check (0); /* _after_ TermWin.nscrolled update */
711
712 num_scr += count;
713 j = count;
714
715 if (count < 0)
716 count = -count;
717
718 i = row2 - row1 + 1;
719 MIN_IT (count, i);
720
721 if (j > 0)
722 {
723 /* scroll up */
724
725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734
735 j = row2 - count + 1, i = count;
736 }
737 else /* if (j < 0) */
738 {
739 /* scroll down */
740
741 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--)
743 { 682 }
744 buf_text[i] = screen.text[j]; 683
745 buf_rend[i] = screen.rend[j]; 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)
746 } 696 {
747 697 if ((selection.beg.row < row1 && selection.end.row > row1)
748 /* Rotate lines */ 698 || (selection.beg.row < row2 && selection.end.row > row2)
749 for (j = row2, i = j - count; i >= row1; i--, j--) 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 }
750 { 716 }
751 screen.tlen[j] = screen.tlen[i]; 717
752 screen.text[j] = screen.text[i]; 718 // use a simple and robust scrolling algorithm, this
753 screen.rend[j] = screen.rend[i]; 719 // part of scr_scroll_text is not time-critical.
720
721 int rows = row2 - row1 + 1;
722
723 min_it (count, rows);
724
725 line_t *temp_buf = row_buf + total_rows;
726
727 for (int row = 0; row < rows; row++)
754 } 728 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
755 730
756 j = row1, i = count; 731 if (!IN_RANGE_EXC (row + count, 0, rows))
757 count = -count; 732 scr_blank_screen_mem (temp_buf [row], rstyle);
758 } 733 }
759 734
760 /* Resurrect lines */ 735 for (int row = 0; row < rows; row++)
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 736 ROW(row1 + row) = temp_buf [row];
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 737 }
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */
765 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
767 738
768 return count; 739 return count;
769} 740}
770 741
771/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
772/* 743/*
773 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
774 */ 745 */
775void 746void
776rxvt_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
777{ 748{
749 if (len <= 0) /* sanity */
750 return;
751
778 unsigned char checksel; 752 unsigned char checksel;
779 unicode_t c; 753 unicode_t c;
780 int i, row, last_col; 754 int ncol = this->ncol;
781 text_t *stp; 755 const wchar_t *strend = str + len;
782 rend_t *srp;
783
784 if (len <= 0) /* sanity */
785 return;
786 756
787 want_refresh = 1; 757 want_refresh = 1;
788 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol;
790 759
791 if (nlines > 0) 760 if (minlines > 0)
792 { 761 {
793 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763
794 if ((nlines > 0) 764 if (minlines > 0
795 && (screen.tscroll == 0) 765 && screen.tscroll == 0
796 && (screen.bscroll == (TermWin.nrow - 1))) 766 && screen.bscroll == nrow - 1)
797 { 767 {
798 /* _at least_ this many lines need to be scrolled */ 768 /* _at least_ this many lines need to be scrolled */
799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 769 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
800 screen.cur.row -= nlines; 770 screen.cur.row -= minlines;
801 } 771 }
802 } 772 }
803 773
804#ifdef DEBUG_STRICT 774#ifdef DEBUG_STRICT
805 assert (screen.cur.col < last_col); 775 assert (screen.cur.col < ncol);
806 assert ((screen.cur.row < TermWin.nrow) 776 assert (screen.cur.row < nrow
807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 777 && screen.cur.row >= top_row);
808#else /* drive with your eyes closed */
809 MIN_IT (screen.cur.col, last_col - 1);
810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
812#endif 778#endif
813 row = screen.cur.row + TermWin.saveLines; 779 int row = screen.cur.row;
814 780
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 781 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 782
817 stp = screen.text[row]; 783 line_t *line = &ROW(row);
818 srp = screen.rend[row];
819 784
820 while (len--) 785 while (str < strend)
821 { 786 {
822 c = *str++; 787 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
823 788
824 if (c < 0x20) 789 if (c < 0x20)
825 switch (c) 790 if (c == C0_LF)
826 { 791 {
827 case C0_HT: 792 max_it (line->l, screen.cur.col);
828 scr_tab (1, true);
829 continue;
830 793
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 794 screen.flags &= ~Screen_WrapNext;
836 795
837 if (screen.cur.row == screen.bscroll) 796 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 797 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
839 else if (screen.cur.row < (TermWin.nrow - 1)) 798 else if (screen.cur.row < (nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines; 799 row = ++screen.cur.row;
841 800
842 stp = screen.text[row]; /* _must_ refresh */ 801 line = &ROW(row); /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue; 802 continue;
803 }
804 else if (c == C0_CR)
805 {
806 max_it (line->l, screen.cur.col);
845 807
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 809 screen.cur.col = 0;
852 continue; 810 continue;
811 }
812 else if (c == C0_HT)
813 {
814 scr_tab (1, true);
815 continue;
853 } 816 }
854 817
855 if (checksel /* see if we're writing within selection */ 818 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 819 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 820 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
865 CLEAR_SELECTION (); 828 CLEAR_SELECTION ();
866 } 829 }
867 830
868 if (screen.flags & Screen_WrapNext) 831 if (screen.flags & Screen_WrapNext)
869 { 832 {
870 screen.tlen[row] = -1; 833 scr_do_wrap ();
871
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
873
874 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */
876 } 834
835 line->l = ncol;
836 line->is_longer (1);
837
838 row = screen.cur.row;
839 line = &ROW(row); /* _must_ refresh */
840 }
841
842 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
844 c = 0xfffd;
877 845
878 // 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
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 847 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 848 // for the line drawing characters below as they might be invalid in the current
849 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 850 int width = c < 0x100 ? 1 : wcwidth (c);
882 851
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 852 if (charsets [screen.charset] == '0') // DEC SPECIAL
884 { 853 {
885 // vt100 special graphics and line drawing 854 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 855 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 856 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 857 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 858 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 859 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 860 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 861 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 862 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 863 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 864 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 865 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 866 };
898 867
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 868 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 869 {
901 c = vt100_0[c - 0x40]; 870 c = vt100_0[c - 0x41];
902 width = 1; 871 width = 1; // vt100 line drawing characters are always single-width
903 } 872 }
904 } 873 }
905 874
906 if (screen.flags & Screen_Insert) 875 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 876 scr_insdel_chars (width, INSERT);
908 877
909 if (width != 0) 878 if (width != 0)
910 { 879 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 880#if !UNICODE_3
916 // trim characters we can't store directly :( 881 // trim characters we can't store directly :(
917 if (c >= 0x10000) 882 if (c >= 0x10000)
918# if ENABLE_COMBINING 883# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 884 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
921 c = 0xfffd; 886 c = 0xfffd;
922# endif 887# endif
923#endif 888#endif
924 889
925 // nuke the character at this position, if required 890 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR 891 if (line->t[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1 892 || (screen.cur.col < ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR)) 893 && line->t[screen.cur.col + 1] == NOCHAR))
929 { 894 {
930 int col = screen.cur.col; 895 int col = screen.cur.col;
931 896
932 // find begin 897 // find begin
933 while (col > 0 && stp[col] == NOCHAR) 898 while (col > 0 && line->t[col] == NOCHAR)
934 col--; 899 col--;
935 900
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 901 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
937 902
938 // found begin, nuke 903 // found begin, nuke
939 do { 904 do {
940 stp[col] = ' '; 905 line->t[col] = ' ';
941 srp[col] = rend; 906 line->r[col] = rend;
942 col++; 907 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 908 } while (col < ncol && line->t[col] == NOCHAR);
944 } 909 }
945 910
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (screen.cur.col > ncol - width && ncol >= width)
915 {
916 // ...output spaces
917 c = ' ';
918 // and try the same character next loop iteration
919 --str;
920 }
921
922 line->touch ();
947 923
948 do 924 do
949 { 925 {
950 stp[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
951 srp[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 screen.tlen[row] = 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 && stp[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
970 { 949 {
971 stp[c] = ' '; 950 line->t[c] = ' ';
972 srp[c] = rend; 951 line->r[c] = rend;
973 } 952 }
974 } 953 }
954 }
975 else if (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.
982 962 line_t *linep;
983 text_t *tp; 963 text_t *tp;
984 rend_t *rp; 964 rend_t *rp;
985 965
986 if (screen.cur.col > 0) 966 if (screen.cur.col > 0)
987 { 967 {
968 linep = line;
988 tp = stp + screen.cur.col - 1; 969 tp = line->t + screen.cur.col - 1;
989 rp = srp + screen.cur.col - 1; 970 rp = line->r + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
993 } 971 }
994 else if (screen.cur.row > 0 972 else if (screen.cur.row > 0
995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 973 && ROW(screen.cur.row - 1).is_longer ())
996 { 974 {
997 int line = screen.cur.row - 1 + TermWin.saveLines; 975 linep = &ROW(screen.cur.row - 1);
998
999 tp = screen.text[line] + last_col - 1; 976 tp = line->t + ncol - 1;
1000 rp = screen.rend[line] + last_col - 1; 977 rp = line->r + ncol - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
1004 } 978 }
1005 else 979 else
1006 continue; 980 continue;
981
982 linep->touch ();
983
984 while (*tp == NOCHAR && tp > linep->t)
985 tp--, rp--;
1007 986
1008 // first try to find a precomposed character 987 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c); 988 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR) 989 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c); 990 n = rxvt_composite.compose (*tp, c);
… …
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 993 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1015#endif 994#endif
1016 } 995 }
1017 } 996 }
1018 997
1019 if (screen.tlen[row] != -1) /* XXX: think about this */ 998 max_it (line->l, screen.cur.col);
1020 MAX_IT (screen.tlen[row], screen.cur.col);
1021 999
1022#ifdef DEBUG_STRICT 1000#ifdef DEBUG_STRICT
1023 assert (screen.cur.row >= 0); 1001 assert (screen.cur.row >= 0);
1024#else /* drive with your eyes closed */
1025 MAX_IT (screen.cur.row, 0);
1026#endif 1002#endif
1027} 1003}
1028 1004
1029/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1030/* 1006/*
1031 * 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
1032 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1033 */ 1009 */
1034void 1010void
1035rxvt_term::scr_backspace () 1011rxvt_term::scr_backspace () NOTHROW
1036{ 1012{
1037 want_refresh = 1; 1013 want_refresh = 1;
1038 1014
1039 if (screen.cur.col == 0) 1015 if (screen.cur.col == 0)
1040 { 1016 {
1041 if (screen.cur.row > 0) 1017 if (screen.cur.row > 0)
1042 { 1018 {
1043#ifdef TERMCAP_HAS_BW 1019#ifdef TERMCAP_HAS_BW
1044 screen.cur.col = TermWin.ncol - 1; 1020 screen.cur.col = ncol - 1;
1045 screen.cur.row--; 1021 screen.cur.row--;
1046 return; 1022 return;
1047#endif 1023#endif
1048 } 1024 }
1049 } 1025 }
… …
1058 * Process Horizontal Tab 1034 * Process Horizontal Tab
1059 * count: +ve = forward; -ve = backwards 1035 * count: +ve = forward; -ve = backwards
1060 * XTERM_SEQ: CTRL-I 1036 * XTERM_SEQ: CTRL-I
1061 */ 1037 */
1062void 1038void
1063rxvt_term::scr_tab (int count, bool ht) 1039rxvt_term::scr_tab (int count, bool ht) NOTHROW
1064{ 1040{
1065 int i, x; 1041 int i, x;
1066 1042
1067 want_refresh = 1; 1043 want_refresh = 1;
1068 i = x = screen.cur.col; 1044 i = x = screen.cur.col;
1069 1045
1070 if (count == 0) 1046 if (count == 0)
1071 return; 1047 return;
1072 else if (count > 0) 1048 else if (count > 0)
1073 { 1049 {
1074 int row = TermWin.saveLines + screen.cur.row; 1050 line_t &l = ROW(screen.cur.row);
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i]; 1051 rend_t base_rend = l.r[i];
1078 ht &= tp[i] == ' '; 1052 ht &= l.t[i] == ' ';
1079 1053
1080 for (; ++i < TermWin.ncol; ) 1054 for (; ++i < ncol; )
1081 if (tabs[i]) 1055 if (tabs[i])
1082 { 1056 {
1083 x = i; 1057 x = i;
1058
1084 if (!--count) 1059 if (!--count)
1085 break; 1060 break;
1086 } 1061 }
1087 else 1062 else
1088 ht &= tp[i] == ' ' 1063 ht &= l.t[i] == ' '
1089 && RS_SAME (rp[i], base_rend); 1064 && RS_SAME (l.r[i], base_rend);
1090 1065
1091 if (count) 1066 if (count)
1092 x = TermWin.ncol - 1; 1067 x = ncol - 1;
1093 1068
1094 // store horizontal tab commands as characters inside the text 1069 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted. 1070 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs) 1071 if (ht && OPTION (Opt_pastableTabs))
1097 { 1072 {
1098 base_rend = SET_FONT (base_rend, 0); 1073 base_rend = SET_FONT (base_rend, 0);
1099 1074
1100 if (screen.tlen[row] != -1) /* XXX: think about this */ 1075 l.touch (x);
1101 MAX_IT (screen.tlen[row], x);
1102 1076
1103 i = screen.cur.col; 1077 i = screen.cur.col;
1104 1078
1105 tp[i] = '\t'; 1079 l.t[i] = '\t';
1106 rp[i] = base_rend; 1080 l.r[i] = base_rend;
1107 1081
1108 while (++i < x) 1082 while (++i < x)
1109 { 1083 {
1110 tp[i] = NOCHAR; 1084 l.t[i] = NOCHAR;
1111 rp[i] = base_rend; 1085 l.r[i] = base_rend;
1112 } 1086 }
1113 } 1087 }
1114 } 1088 }
1115 else /* if (count < 0) */ 1089 else /* if (count < 0) */
1116 { 1090 {
… …
1137 * 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
1138 * in that row right. Clear left column. 1112 * in that row right. Clear left column.
1139 */ 1113 */
1140#if ENABLE_FRILLS 1114#if ENABLE_FRILLS
1141void 1115void
1142rxvt_term::scr_backindex () 1116rxvt_term::scr_backindex () NOTHROW
1143{ 1117{
1144 if (screen.cur.col > 0) 1118 if (screen.cur.col > 0)
1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1146 else 1120 else
1147 {
1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1149 return; /* um, yeah? */
1150
1151 scr_insdel_chars (1, INSERT); 1121 scr_insdel_chars (1, INSERT);
1152 }
1153} 1122}
1154#endif 1123#endif
1155/* ------------------------------------------------------------------------- */ 1124/* ------------------------------------------------------------------------- */
1156/* 1125/*
1157 * Process DEC Forward Index 1126 * Process DEC Forward Index
… …
1159 * 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
1160 * in that row left. Clear right column. 1129 * in that row left. Clear right column.
1161 */ 1130 */
1162#if ENABLE_FRILLS 1131#if ENABLE_FRILLS
1163void 1132void
1164rxvt_term::scr_forwardindex () 1133rxvt_term::scr_forwardindex () NOTHROW
1165{ 1134{
1166 int row;
1167
1168 if (screen.cur.col < TermWin.ncol - 1) 1135 if (screen.cur.col < ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1137 else
1171 { 1138 {
1172 row = screen.cur.row + TermWin.saveLines; 1139 line_t &l = ROW(screen.cur.row);
1173 1140
1174 if (screen.tlen[row] == 0) 1141 l.touch ();
1175 return; /* um, yeah? */ 1142 l.is_longer (0);
1176 else if (screen.tlen[row] == -1)
1177 screen.tlen[row] = TermWin.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, TermWin.ncol - 1, R_RELATIVE); 1146 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1147 }
1183} 1148}
1184#endif 1149#endif
1185 1150
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)TermWin.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)TermWin.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)TermWin.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 = TermWin.saveLines + screen.cur.row; 1242 line_t &line = ROW(screen.cur.row);
1243
1244 line.touch ();
1245 line.is_longer (0);
1246
1281 switch (mode) 1247 switch (mode)
1282 { 1248 {
1283 case 0: /* erase to end of line */ 1249 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1250 col = screen.cur.col;
1285 num = TermWin.ncol - col; 1251 num = ncol - col;
1286 MIN_IT (screen.tlen[row], (int16_t)col); 1252 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1290 break; 1256 break;
1291 case 1: /* erase to beginning of line */ 1257 case 1: /* erase to beginning of line */
… …
1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1296 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1297 break; 1263 break;
1298 case 2: /* erase whole line */ 1264 case 2: /* erase whole line */
1299 col = 0; 1265 col = 0;
1300 num = TermWin.ncol; 1266 num = ncol;
1301 screen.tlen[row] = 0; 1267 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1268 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1269 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1305 break; 1271 break;
1306 default: 1272 default:
1307 return; 1273 return;
1308 } 1274 }
1309 1275
1310 if (screen.text[row]) 1276 scr_blank_line (line, col, num, rstyle);
1311 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1312 else
1313 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1314} 1277}
1315 1278
1316/* ------------------------------------------------------------------------- */ 1279/* ------------------------------------------------------------------------- */
1317/* 1280/*
1318 * Erase part of whole of the screen 1281 * Erase part of whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1282 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1283 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1284 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1285 */
1323void 1286void
1324rxvt_term::scr_erase_screen (int mode) 1287rxvt_term::scr_erase_screen (int mode) NOTHROW
1325{ 1288{
1326 int num; 1289 int num;
1327 int32_t row, row_offset; 1290 int32_t row;
1328 rend_t ren; 1291 rend_t ren;
1329 XGCValues gcvalue; 1292 XGCValues gcvalue;
1330 1293
1331 want_refresh = 1; 1294 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1295 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)TermWin.saveLines;
1335 1296
1336 switch (mode) 1297 switch (mode)
1337 { 1298 {
1338 case 0: /* erase to end of screen */ 1299 case 0: /* erase to end of screen */
1339 selection_check (1); 1300 selection_check (1);
1340 scr_erase_line (0); 1301 scr_erase_line (0);
1341 row = screen.cur.row + 1; /* possible OOB */ 1302 row = screen.cur.row + 1; /* possible OOB */
1342 num = TermWin.nrow - row; 1303 num = nrow - row;
1343 break; 1304 break;
1344 case 1: /* erase to beginning of screen */ 1305 case 1: /* erase to beginning of screen */
1345 selection_check (3); 1306 selection_check (3);
1346 scr_erase_line (1); 1307 scr_erase_line (1);
1347 row = 0; 1308 row = 0;
1348 num = screen.cur.row; 1309 num = screen.cur.row;
1349 break; 1310 break;
1350 case 2: /* erase whole screen */ 1311 case 2: /* erase whole screen */
1351 selection_check (3); 1312 selection_check (3);
1352 row = 0; 1313 row = 0;
1353 num = TermWin.nrow; 1314 num = nrow;
1354 break; 1315 break;
1355 default: 1316 default:
1356 return; 1317 return;
1357 } 1318 }
1358 1319
… …
1360 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1321 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1361 || (selection.end.row >= row 1322 || (selection.end.row >= row
1362 && selection.end.row <= row + num))) 1323 && selection.end.row <= row + num)))
1363 CLEAR_SELECTION (); 1324 CLEAR_SELECTION ();
1364 1325
1365 if (row >= TermWin.nrow) /* Out Of Bounds */ 1326 if (row >= nrow) /* Out Of Bounds */
1366 return; 1327 return;
1367 1328
1368 MIN_IT (num, (TermWin.nrow - row)); 1329 min_it (num, nrow - row);
1369 1330
1370 if (rstyle & (RS_RVid | RS_Uline)) 1331 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1332 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1333 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1334 {
… …
1375 CLEAR_ROWS (row, num); 1336 CLEAR_ROWS (row, num);
1376 } 1337 }
1377 else 1338 else
1378 { 1339 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1340 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1342 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1343 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1344 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1345 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1346 }
1386 1347
1387 for (; num--; row++) 1348 for (; num--; row++)
1388 { 1349 {
1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1350 scr_blank_screen_mem (ROW(row), rstyle);
1390 screen.tlen[row + row_offset] = 0; 1351 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1392 } 1352 }
1393} 1353}
1394 1354
1395#if ENABLE_FRILLS 1355#if ENABLE_FRILLS
1396void 1356void
1397rxvt_term::scr_erase_savelines () 1357rxvt_term::scr_erase_savelines () NOTHROW
1398{ 1358{
1399 want_refresh = 1; 1359 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1401 1361
1402 for (int i = 0; i < TermWin.saveLines; ++i) 1362 top_row = 0;
1403 if (screen.text [i])
1404 {
1405 screen.tlen[i] = 0;
1406 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1407 }
1408} 1363}
1409#endif 1364#endif
1410 1365
1411/* ------------------------------------------------------------------------- */ 1366/* ------------------------------------------------------------------------- */
1412/* 1367/*
1413 * Fill the screen with `E's 1368 * Fill the screen with `E's
1414 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1369 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1415 */ 1370 */
1416void 1371void
1417rxvt_term::scr_E () 1372rxvt_term::scr_E () NOTHROW
1418{ 1373{
1419 int i, j, k;
1420 rend_t *r1, fs; 1374 rend_t fs;
1421 1375
1422 want_refresh = 1; 1376 want_refresh = 1;
1423 ZERO_SCROLLBACK (); 1377 ZERO_SCROLLBACK ();
1424 1378
1425 num_scr_allow = 0; 1379 num_scr_allow = 0;
1426 selection_check (3); 1380 selection_check (3);
1427 1381
1428 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1382 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1429 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1383 for (int row = nrow; row--; )
1430 { 1384 {
1431 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1385 line_t &line = ROW(row);
1386
1432 fill_text (screen.text[k], 'E', TermWin.ncol); 1387 fill_text (line.t, 'E', ncol);
1433 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1388 rend_t *r1 = line.r;
1389
1390 for (int j = ncol; j--; )
1434 *r1++ = fs; 1391 *r1++ = fs;
1392
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 text_t *stp;
1478 rend_t *srp;
1479 int16_t *slp;
1480 1437
1481 want_refresh = 1; 1438 want_refresh = 1;
1482 ZERO_SCROLLBACK (); 1439 ZERO_SCROLLBACK ();
1483 1440
1484 if (count <= 0) 1441 if (count <= 0)
1485 return; 1442 return;
1486 1443
1487 scr_do_wrap (); 1444 scr_do_wrap ();
1488 1445
1489 selection_check (1); 1446 selection_check (1);
1490 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1447 min_it (count, ncol - screen.cur.col);
1491 1448
1492 row = screen.cur.row + TermWin.saveLines;
1493
1494 stp = screen.text[row];
1495 srp = screen.rend[row]; 1449 row = screen.cur.row;
1496 slp = &screen.tlen[row]; 1450
1451 line_t *line = &ROW(row);
1452
1453 line->touch ();
1454 line->is_longer (0);
1497 1455
1498 switch (insdel) 1456 switch (insdel)
1499 { 1457 {
1500 case INSERT: 1458 case INSERT:
1501 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1459 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1502 { 1460 {
1503 stp[col] = stp[col - count]; 1461 line->t[col] = line->t[col - count];
1504 srp[col] = srp[col - count]; 1462 line->r[col] = line->r[col - count];
1505 } 1463 }
1506 1464
1507 if (*slp != -1) 1465 line->l = min (line->l + count, ncol);
1508 {
1509 *slp += count;
1510 MIN_IT (*slp, TermWin.ncol);
1511 }
1512 1466
1513 if (selection.op && current_screen == selection.screen 1467 if (selection.op && current_screen == selection.screen
1514 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1515 { 1469 {
1516 if (selection.end.row != screen.cur.row 1470 if (selection.end.row != screen.cur.row
1517 || (selection.end.col + count >= TermWin.ncol)) 1471 || (selection.end.col + count >= ncol))
1518 CLEAR_SELECTION (); 1472 CLEAR_SELECTION ();
1519 else 1473 else
1520 { /* shift selection */ 1474 { /* shift selection */
1521 selection.beg.col += count; 1475 selection.beg.col += count;
1522 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1523 selection.end.col += count; 1477 selection.end.col += count;
1524 } 1478 }
1525 } 1479 }
1526 1480
1527 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1528 (unsigned int)count, rstyle);
1529 break; 1482 break;
1530 1483
1531 case ERASE: 1484 case ERASE:
1532 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1485 screen.cur.col += count; /* don't worry if > ncol */
1533 selection_check (1); 1486 selection_check (1);
1534 screen.cur.col -= count; 1487 screen.cur.col -= count;
1535 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1488
1536 (unsigned int)count, rstyle); 1489 line->l = max (line->l - count, 0);
1490 scr_blank_line (*line, screen.cur.col, count, rstyle);
1537 break; 1491 break;
1538 1492
1539 case DELETE: 1493 case DELETE:
1540 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1541 1495
1542 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1496 for (col = screen.cur.col; (col + count) < ncol; col++)
1543 { 1497 {
1544 stp[col] = stp[col + count]; 1498 line->t[col] = line->t[col + count];
1545 srp[col] = srp[col + count]; 1499 line->r[col] = line->r[col + count];
1546 } 1500 }
1547 1501
1548 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1502 line->l = max (line->l - count, 0);
1549 (unsigned int)count, tr); 1503 scr_blank_line (*line, ncol - count, count, tr);
1550
1551 if (*slp == -1) /* break line continuation */
1552 *slp = TermWin.ncol;
1553
1554 *slp -= count;
1555 MAX_IT (*slp, 0);
1556 1504
1557 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1558 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1559 { 1507 {
1560 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
1561 || (screen.cur.col >= selection.beg.col - count) 1509 || (screen.cur.col >= selection.beg.col - count)
1562 || selection.end.col >= TermWin.ncol) 1510 || selection.end.col >= ncol)
1563 CLEAR_SELECTION (); 1511 CLEAR_SELECTION ();
1564 else 1512 else
1565 { 1513 {
1566 /* shift selection */ 1514 /* shift selection */
1567 selection.beg.col -= count; 1515 selection.beg.col -= count;
… …
1578/* 1526/*
1579 * Set the scrolling region 1527 * Set the scrolling region
1580 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1581 */ 1529 */
1582void 1530void
1583rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1584{ 1532{
1585 MAX_IT (top, 0); 1533 max_it (top, 0);
1586 MIN_IT (bot, (int)TermWin.nrow - 1); 1534 min_it (bot, nrow - 1);
1587 1535
1588 if (top > bot) 1536 if (top > bot)
1589 return; 1537 return;
1590 1538
1591 screen.tscroll = top; 1539 screen.tscroll = top;
… …
1598 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1599 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1600 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1601 */ 1549 */
1602void 1550void
1603rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1604{ 1552{
1605 want_refresh = 1; 1553 want_refresh = 1;
1606 1554
1607 if (mode) 1555 if (mode)
1608 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
… …
1615 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1616 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1617 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1618 */ 1566 */
1619void 1567void
1620rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1621{ 1569{
1622 if (mode) 1570 if (mode)
1623 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1624 else 1572 else
1625 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1634 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1635 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1636 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1637 */ 1585 */
1638void 1586void
1639rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1640{ 1588{
1641 if (mode) 1589 if (mode)
1642 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1643 else 1591 else
1644 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
… …
1651 * Set insert/replace mode 1599 * Set insert/replace mode
1652 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1653 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1654 */ 1602 */
1655void 1603void
1656rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1657{ 1605{
1658 if (mode) 1606 if (mode)
1659 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1660 else 1608 else
1661 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
… …
1667 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1668 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1669 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1670 */ 1618 */
1671void 1619void
1672rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1673{ 1621{
1674 if (mode < 0) 1622 if (mode < 0)
1675 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1623 memset (tabs, 0, ncol * sizeof (char));
1676 else if (screen.cur.col < TermWin.ncol) 1624 else if (screen.cur.col < ncol)
1677 tabs[screen.cur.col] = (mode ? 1 : 0); 1625 tabs [screen.cur.col] = !!mode;
1678} 1626}
1679 1627
1680/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
1681/* 1629/*
1682 * Set reverse/normal video 1630 * Set reverse/normal video
1683 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1684 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1685 */ 1633 */
1686void 1634void
1687rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1688{ 1636{
1689 XGCValues gcvalue; 1637 rvideo_mode = on;
1690 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1691 if (rvideo != mode) 1643 if (rvideo_state != on)
1692 { 1644 {
1693 rvideo = mode; 1645 rvideo_state = on;
1646
1694 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1695#if XPM_BACKGROUND 1648#if XPM_BACKGROUND
1696 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1697#endif 1650#endif
1698#if TRANSPARENT 1651#if TRANSPARENT
1699 if (! (options & Opt_transparent) || am_transparent == 0) 1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1700#endif 1653#endif
1701 XSetWindowBackground (display->display, TermWin.vt, 1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1702 pix_colors[Color_bg]);
1703 1655
1656 XGCValues gcvalue;
1704 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1705 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1706 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1707 &gcvalue); 1660
1708 scr_clear (); 1661 scr_clear ();
1709 scr_touch (true); 1662 scr_touch (true);
1710 } 1663 }
1711} 1664}
1712 1665
… …
1714/* 1667/*
1715 * Report current cursor position 1668 * Report current cursor position
1716 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1717 */ 1670 */
1718void 1671void
1719rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1720{ 1673{
1721 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);
1722} 1675}
1723 1676
1724/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
… …
1727 1680
1728/* 1681/*
1729 * Set font style 1682 * Set font style
1730 */ 1683 */
1731void 1684void
1732rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1733{ 1686{
1687#if 0
1734 switch (charsets[screen.charset]) 1688 switch (charsets [screen.charset])
1735 { 1689 {
1736 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
1737 break; 1691 break;
1738 case 'A': /* United Kingdom (UK) */ 1692 case 'A': /* United Kingdom (UK) */
1739 break; 1693 break;
… …
1746 case 'C': /* Finnish character set */ 1700 case 'C': /* Finnish character set */
1747 break; 1701 break;
1748 case 'K': /* German character set */ 1702 case 'K': /* German character set */
1749 break; 1703 break;
1750 } 1704 }
1705#endif
1751} 1706}
1752 1707
1753/* ------------------------------------------------------------------------- */ 1708/* ------------------------------------------------------------------------- */
1754/* 1709/*
1755 * Choose a font 1710 * Choose a font
… …
1757 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1758 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1759 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1760 */ 1715 */
1761void 1716void
1762rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1763{ 1718{
1764 screen.charset = set; 1719 screen.charset = set;
1765 set_font_style (); 1720 set_font_style ();
1766} 1721}
1767 1722
… …
1773 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1774 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1775 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1776 */ 1731 */
1777void 1732void
1778rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1779{ 1734{
1780 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1781 set_font_style (); 1736 set_font_style ();
1782} 1737}
1783 1738
… …
1788 1743
1789/* 1744/*
1790 * refresh matching text. 1745 * refresh matching text.
1791 */ 1746 */
1792bool 1747bool
1793rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1794{ 1749{
1795 bool found = false; 1750 bool found = false;
1796 1751
1797 for (int i = 0; i < TermWin.nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1798 { 1753 {
1799 int col = 0; 1754 int col = 0;
1800 rend_t *drp = drawn_rend [i]; 1755 rend_t *drp = drawn_buf[i].r;
1801 1756
1802 for (; col < TermWin.ncol; col++, drp++) 1757 for (; col < ncol; col++, drp++)
1803 if ((*drp & mask) == value) 1758 if ((*drp & mask) == value)
1804 { 1759 {
1805 found = true; 1760 found = true;
1806 *drp = ~value; 1761 *drp = ~value;
1807 } 1762 }
… …
1818 PART_END, 1773 PART_END,
1819 RC_COUNT 1774 RC_COUNT
1820}; 1775};
1821 1776
1822void 1777void
1823rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1778rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1824{ 1779{
1825 int i; 1780 int i;
1826 row_col_t rc[RC_COUNT]; 1781 row_col_t rc[RC_COUNT];
1827 1782
1828 if (drawn_text == NULL) /* sanity check */ 1783 if (!drawn_buf) /* sanity check */
1829 return; 1784 return;
1830 1785
1831#ifndef NO_SLOW_LINK_SUPPORT 1786#ifndef NO_SLOW_LINK_SUPPORT
1832 if (refresh_type == FAST_REFRESH && !display->is_local) 1787 if (refresh_type == FAST_REFRESH && !display->is_local)
1833 { 1788 {
1834 y = 0; 1789 y = 0;
1835 height = TermWin.height; 1790 eheight = height;
1836 } 1791 }
1837#endif
1838
1839#ifdef DEBUG_STRICT
1840 x = max (x, 0);
1841 x = min (x, (int)TermWin.width);
1842 y = max (y, 0);
1843 y = min (y, (int)TermWin.height);
1844#endif 1792#endif
1845 1793
1846 /* round down */ 1794 /* round down */
1847 rc[PART_BEG].col = Pixel2Col (x); 1795 rc[PART_BEG].col = Pixel2Col (x);
1848 rc[PART_BEG].row = Pixel2Row (y); 1796 rc[PART_BEG].row = Pixel2Row (y);
1849 /* round up */ 1797 /* round up */
1850 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1798 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1851 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1799 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1852 1800
1853 /* sanity checks */ 1801 /* sanity checks */
1854 for (i = PART_BEG; i < RC_COUNT; i++) 1802 for (i = PART_BEG; i < RC_COUNT; i++)
1855 { 1803 {
1856 MIN_IT (rc[i].col, TermWin.ncol - 1); 1804 min_it (rc[i].col, ncol - 1);
1857 MIN_IT (rc[i].row, TermWin.nrow - 1); 1805 min_it (rc[i].row, nrow - 1);
1858 } 1806 }
1859 1807
1860 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++)
1861 fill_text (&drawn_text[i][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;
1862 1812
1863 if (refresh) 1813 if (refresh)
1864 scr_refresh (SLOW_REFRESH); 1814 scr_refresh ();
1865} 1815}
1866 1816
1867/* ------------------------------------------------------------------------- */ 1817/* ------------------------------------------------------------------------- */
1868/* 1818/*
1869 * Refresh the entire screen 1819 * Refresh the entire screen
1870 */ 1820 */
1871void 1821void
1872rxvt_term::scr_touch (bool refresh) 1822rxvt_term::scr_touch (bool refresh) NOTHROW
1873{ 1823{
1874 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1824 scr_expose (0, 0, width, height, refresh);
1875} 1825}
1876 1826
1877/* ------------------------------------------------------------------------- */ 1827/* ------------------------------------------------------------------------- */
1878/* 1828/*
1879 * 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
1880 * the top of the screen 1830 * the top of the screen
1881 */ 1831 */
1882int 1832void
1883rxvt_term::scr_move_to (int y, int len) 1833rxvt_term::scr_move_to (int y, int len) NOTHROW
1884{ 1834{
1885 long p = 0; 1835 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1886 unsigned int oldviewstart;
1887
1888 oldviewstart = TermWin.view_start;
1889
1890 if (y < len)
1891 {
1892 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1893 p -= (long) (TermWin.nrow - 1);
1894 p = max (p, 0);
1895 }
1896
1897 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1898
1899 return scr_changeview (oldviewstart);
1900} 1836}
1901 1837
1902/* ------------------------------------------------------------------------- */ 1838/* ------------------------------------------------------------------------- */
1903/* 1839/*
1904 * Page the screen up/down nlines 1840 * Page the screen up/down nlines
1905 * direction should be UP or DN 1841 * direction should be UP or DN
1906 */ 1842 */
1907int 1843bool
1908rxvt_term::scr_page (enum page_dirn direction, int nlines) 1844rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1909{ 1845{
1910 int n; 1846 int new_view_start =
1911 unsigned int oldviewstart; 1847 direction == UP ? view_start - nlines
1848 : view_start + nlines;
1912 1849
1913 oldviewstart = TermWin.view_start;
1914
1915 if (direction == UP)
1916 {
1917 n = TermWin.view_start + nlines;
1918 TermWin.view_start = min (n, TermWin.nscrolled);
1919 }
1920 else
1921 {
1922 n = TermWin.view_start - nlines;
1923 TermWin.view_start = max (n, 0);
1924 }
1925
1926 return scr_changeview (oldviewstart); 1850 return scr_changeview (new_view_start);
1927} 1851}
1928 1852
1929int 1853bool
1930rxvt_term::scr_changeview (unsigned int oldviewstart) 1854rxvt_term::scr_changeview (int new_view_start) NOTHROW
1931{ 1855{
1856 clamp_it (new_view_start, top_row, 0);
1857
1932 if (TermWin.view_start != oldviewstart) 1858 if (new_view_start == view_start)
1933 { 1859 return false;
1860
1861 num_scr += new_view_start - view_start;
1862 view_start = new_view_start;
1934 want_refresh = 1; 1863 want_refresh = 1;
1935 num_scr -= (TermWin.view_start - oldviewstart);
1936 }
1937 1864
1938 return (int) (TermWin.view_start - oldviewstart); 1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1939}
1940 1866
1941/* ------------------------------------------------------------------------- */ 1867 return true;
1942void 1868}
1943rxvt_term::scr_bell () 1869
1944{
1945#ifndef NO_BELL 1870#ifndef NO_BELL
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
1881rxvt_term::scr_bell () NOTHROW
1882{
1883#ifndef NO_BELL
1884
1946# ifndef NO_MAPALERT 1885# ifndef NO_MAPALERT
1947# ifdef MAPALERT_OPTION 1886# ifdef MAPALERT_OPTION
1948 if (options & Opt_mapAlert) 1887 if (OPTION (Opt_mapAlert))
1949# endif 1888# endif
1950 XMapWindow (display->display, TermWin.parent[0]); 1889 XMapWindow (display->display, parent[0]);
1951# endif 1890# endif
1952 if (options & Opt_visualBell) 1891
1892 if (OPTION (Opt_visualBell))
1953 { 1893 {
1954 scr_rvideo_mode (!rvideo); /* refresh also done */ 1894 rvideo_bell = true;
1955 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 scr_rvideo_mode (rvideo_mode);
1896 display->flush ();
1897
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1956 } 1899 }
1957 else 1900 else
1958 XBell (display->display, 0); 1901 XBell (display->display, 0);
1902
1959#endif 1903#endif
1960} 1904}
1961 1905
1962/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1963/* ARGSUSED */ 1907/* ARGSUSED */
1964void 1908void
1965rxvt_term::scr_printscreen (int fullhist) 1909rxvt_term::scr_printscreen (int fullhist) NOTHROW
1966{ 1910{
1967#ifdef PRINTPIPE 1911#ifdef PRINTPIPE
1968 int i, r1, nrows, row_offset; 1912 int nrows, row_start;
1969 FILE *fd; 1913 FILE *fd;
1970 1914
1971 if ((fd = popen_printer ()) == NULL) 1915 if ((fd = popen_printer ()) == NULL)
1972 return; 1916 return;
1973 1917
1974 nrows = TermWin.nrow;
1975 row_offset = TermWin.saveLines;
1976
1977 if (!fullhist) 1918 if (fullhist)
1978 row_offset -= TermWin.view_start; 1919 {
1920 nrows = nrow - top_row;
1921 row_start = top_row;
1922 }
1979 else 1923 else
1980 { 1924 {
1981 nrows += TermWin.nscrolled; 1925 nrows = nrow;
1982 row_offset -= TermWin.nscrolled; 1926 row_start = view_start;
1983 } 1927 }
1984 1928
1985 wctomb (0, 0); 1929 wctomb (0, 0);
1986 1930
1987 for (r1 = 0; r1 < nrows; r1++) 1931 for (int r1 = 0; r1 < nrows; r1++)
1988 { 1932 {
1989 text_t *tp = screen.text[r1 + row_offset]; 1933 text_t *tp = ROW(r1).t;
1990 int len = screen.tlen[r1 + row_offset]; 1934 int len = ROW(r1).l;
1991 1935
1992 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1936 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1993 { 1937 {
1994 char mb[MB_LEN_MAX]; 1938 char mb[MB_LEN_MAX];
1995 text_t t = *tp++; 1939 text_t t = *tp++;
1996 if (t == NOCHAR) 1940 if (t == NOCHAR)
1997 continue; 1941 continue;
… …
2018/* 1962/*
2019 * Refresh the screen 1963 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 1964 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 1965 * screen.text/screen.rend contain what the screen will change to.
2022 */ 1966 */
2023
2024#define FONT_WIDTH(X, Y) \
2025 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2026#define FONT_RBEAR(X, Y) \
2027 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2028#define FONT_LBEAR(X, Y) \
2029 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2030#define IS_FONT_CHAR(X, Y) \
2031 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2032
2033void 1967void
2034rxvt_term::scr_refresh (unsigned char refresh_type) 1968rxvt_term::scr_refresh () NOTHROW
2035{ 1969{
2036 unsigned char must_clear, /* use draw_string not draw_image_string */ 1970 unsigned char must_clear, /* use draw_string not draw_image_string */
2037 showcursor; /* show the cursor */ 1971 showcursor; /* show the cursor */
2038 int16_t col, row, /* column/row we're processing */ 1972 int16_t col, row, /* column/row we're processing */
2039 ocrow; /* old cursor row */ 1973 ocrow; /* old cursor row */
2040 int i, /* tmp */ 1974 int i; /* tmp */
2041 row_offset; /* basic offset in screen structure */
2042#ifndef NO_CURSORCOLOR 1975#ifndef NO_CURSORCOLOR
2043 rend_t cc1; /* store colours at cursor position (s) */ 1976 rend_t cc1; /* store colours at cursor position (s) */
2044#endif 1977#endif
2045 rend_t *crp; // cursor rendition pointer 1978 rend_t *crp; // cursor rendition pointer
2046 1979
2047 want_refresh = 0; /* screen is current */ 1980 want_refresh = 0; /* screen is current */
2048 1981
2049 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1982 if (refresh_type == NO_REFRESH || !mapped)
2050 return; 1983 return;
2051 1984
2052 /* 1985 /*
2053 * A: set up vars 1986 * A: set up vars
2054 */ 1987 */
2055 must_clear = 0; 1988 must_clear = 0;
2056 refresh_count = 0; 1989 refresh_count = 0;
2057 1990
2058 row_offset = TermWin.saveLines - TermWin.view_start;
2059
2060#if XPM_BACKGROUND 1991#if XPM_BACKGROUND
2061 must_clear |= (bgPixmap.pixmap != None); 1992 must_clear |= bgPixmap.pixmap != None;
2062#endif 1993#endif
2063#if TRANSPARENT 1994#if TRANSPARENT
2064 must_clear |= ((options & Opt_transparent) && am_transparent); 1995 must_clear |= OPTION (Opt_transparent) && am_transparent;
2065#endif 1996#endif
2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2067 1998
2068 /* 1999 /*
2069 * B: reverse any characters which are selected 2000 * B: reverse any characters which are selected
… …
2086 2017
2087 if (showcursor) 2018 if (showcursor)
2088 { 2019 {
2089 int col = screen.cur.col; 2020 int col = screen.cur.col;
2090 2021
2091 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2022 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2092 col--; 2023 col--;
2093 2024
2094 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2025 crp = &ROW(screen.cur.row).r[col];
2095 2026
2096 if (showcursor && TermWin.focus) 2027 if (showcursor && focus)
2097 { 2028 {
2029 if (OPTION (Opt_cursorUnderline))
2030 *crp ^= RS_Uline;
2031 else
2032 {
2098 *crp ^= RS_RVid; 2033 *crp ^= RS_RVid;
2034
2099#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
2100 cc1 = *crp & (RS_fgMask | RS_bgMask); 2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2101 if (ISSET_PIXCOLOR (Color_cursor)) 2037 if (ISSET_PIXCOLOR (Color_cursor))
2102 ccol1 = Color_cursor; 2038 ccol1 = Color_cursor;
2103 else 2039 else
2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2105 ccol1 = GET_FGCOLOR (rstyle); 2041 ccol1 = fgcolor_of (rstyle);
2106#else 2042#else
2107 ccol1 = Color_fg; 2043 ccol1 = Color_fg;
2108#endif 2044#endif
2109 if (ISSET_PIXCOLOR (Color_cursor2)) 2045 if (ISSET_PIXCOLOR (Color_cursor2))
2110 ccol2 = Color_cursor2; 2046 ccol2 = Color_cursor2;
2111 else 2047 else
2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2113 ccol2 = GET_BGCOLOR (rstyle); 2049 ccol2 = bgcolor_of (rstyle);
2114#else 2050#else
2115 ccol2 = Color_bg; 2051 ccol2 = Color_bg;
2116#endif 2052#endif
2117 *crp = SET_FGCOLOR (*crp, ccol1); 2053 *crp = SET_FGCOLOR (*crp, ccol1);
2118 *crp = SET_BGCOLOR (*crp, ccol2); 2054 *crp = SET_BGCOLOR (*crp, ccol2);
2119#endif 2055#endif
2056 }
2120 } 2057 }
2121 } 2058 }
2122 2059
2123 /* make sure no outline cursor is left around */ 2060 /* make sure no outline cursor is left around */
2124 setoldcursor = 0; 2061 setoldcursor = 0;
2125 if (ocrow != -1) 2062 if (ocrow != -1)
2126 { 2063 {
2127 if (screen.cur.row + TermWin.view_start != ocrow 2064 if (screen.cur.row - view_start != ocrow
2128 || screen.cur.col != oldcursor.col) 2065 || screen.cur.col != oldcursor.col)
2129 { 2066 {
2130 if (ocrow < TermWin.nrow 2067 if (ocrow < nrow
2131 && oldcursor.col < TermWin.ncol) 2068 && oldcursor.col < ncol)
2132 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2069 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2133 2070
2134 if (TermWin.focus || !showcursor) 2071 if (focus || !showcursor)
2135 oldcursor.row = -1; 2072 oldcursor.row = -1;
2136 else 2073 else
2137 setoldcursor = 1; 2074 setoldcursor = 1;
2138 } 2075 }
2139 } 2076 }
2140 else if (!TermWin.focus) 2077 else if (!focus)
2141 setoldcursor = 1; 2078 setoldcursor = 1;
2142 2079
2143 if (setoldcursor) 2080 if (setoldcursor)
2144 { 2081 {
2145 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2082 if (screen.cur.row - view_start >= nrow)
2146 oldcursor.row = -1; 2083 oldcursor.row = -1;
2147 else 2084 else
2148 { 2085 {
2149 oldcursor.row = screen.cur.row + TermWin.view_start; 2086 oldcursor.row = screen.cur.row - view_start;
2150 oldcursor.col = screen.cur.col; 2087 oldcursor.col = screen.cur.col;
2151 } 2088 }
2152 } 2089 }
2153 } 2090 }
2154 2091
2092 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2155#if ENABLE_OVERLAY 2093#if ENABLE_OVERLAY
2156 scr_swap_overlay (); 2094 scr_swap_overlay ();
2157#endif 2095#endif
2158
2159 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2160 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2161 2096
2162#ifndef NO_SLOW_LINK_SUPPORT 2097#ifndef NO_SLOW_LINK_SUPPORT
2163 /* 2098 /*
2164 * D: CopyArea pass - very useful for slower links 2099 * D: CopyArea pass - very useful for slower links
2165 * This has been deliberately kept simple. 2100 * This has been deliberately kept simple.
2166 */ 2101 */
2167 i = num_scr;
2168 if (!display->is_local 2102 if (!display->is_local
2169 && refresh_type == FAST_REFRESH && num_scr_allow && i 2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2170 && abs (i) < TermWin.nrow && !must_clear) 2104 && abs (num_scr) < nrow && !must_clear)
2171 { 2105 {
2172 int16_t nits; 2106 int16_t nits;
2173 int j; 2107 int j;
2174 int len, wlen; 2108 int len, wlen;
2109 dLocal (int, num_scr);
2175 2110
2176 j = TermWin.nrow; 2111 j = nrow;
2177 wlen = len = -1; 2112 wlen = len = -1;
2178 row = i > 0 ? 0 : j - 1; 2113 row = i > 0 ? 0 : j - 1;
2179 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2180 { 2115 {
2181 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2182 { 2117 {
2183 text_t *stp = screen.text[row + row_offset]; 2118 line_t s = ROW(view_start + row);
2184 rend_t *srp = screen.rend[row + row_offset];
2185 text_t *dtp = drawn_text[row]; 2119 line_t d = drawn_buf[row];
2186 text_t *dtp2 = drawn_text[row + i]; 2120 line_t d2 = drawn_buf[row + i];
2187 rend_t *drp = drawn_rend[row];
2188 rend_t *drp2 = drawn_rend[row + i];
2189 2121
2190 for (nits = 0, col = TermWin.ncol; col--; ) 2122 for (nits = 0, col = ncol; col--; )
2191 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2123 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2192 nits--; 2124 nits--;
2193 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2125 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2194 nits++; 2126 nits++;
2195 2127
2196 if (nits > 8) /* XXX: arbitrary choice */ 2128 if (nits > 8) /* XXX: arbitrary choice */
2197 { 2129 {
2198 for (col = TermWin.ncol; col--; ) 2130 for (col = ncol; col--; )
2199 { 2131 {
2200 *dtp++ = *dtp2++; 2132 *d.t++ = *d2.t++;
2201 *drp++ = *drp2++; 2133 *d.r++ = *d2.r++;
2202 } 2134 }
2203 2135
2204 if (len == -1) 2136 if (len == -1)
2205 len = row; 2137 len = row;
2206 2138
… …
2211 2143
2212 if (len != -1) 2144 if (len != -1)
2213 { 2145 {
2214 /* also comes here at end if needed because of >= above */ 2146 /* also comes here at end if needed because of >= above */
2215 if (wlen < len) 2147 if (wlen < len)
2216 SWAP_IT (wlen, len, int); 2148 ::swap (wlen, len);
2217 2149
2218 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2150 XCopyArea (display->display, vt, vt,
2219 TermWin.gc, 0, Row2Pixel (len + i), 2151 gc, 0, Row2Pixel (len + i),
2220 (unsigned int)TermWin_TotalWidth (), 2152 (unsigned int)this->width,
2221 (unsigned int)Height2Pixel (wlen - len + 1), 2153 (unsigned int)Height2Pixel (wlen - len + 1),
2222 0, Row2Pixel (len)); 2154 0, Row2Pixel (len));
2223 len = -1; 2155 len = -1;
2224 } 2156 }
2225 } 2157 }
… …
2227#endif 2159#endif
2228 2160
2229 /* 2161 /*
2230 * E: main pass across every character 2162 * E: main pass across every character
2231 */ 2163 */
2232 for (row = 0; row < TermWin.nrow; row++) 2164 for (row = 0; row < nrow; row++)
2233 { 2165 {
2234 text_t *stp = screen.text[row + row_offset]; 2166 text_t *stp = ROW(view_start + row).t;
2235 rend_t *srp = screen.rend[row + row_offset]; 2167 rend_t *srp = ROW(view_start + row).r;
2236 text_t *dtp = drawn_text[row]; 2168 text_t *dtp = drawn_buf[row].t;
2237 rend_t *drp = drawn_rend[row]; 2169 rend_t *drp = drawn_buf[row].r;
2238 2170
2239 /* 2171 /*
2240 * E2: OK, now the real pass 2172 * E2: OK, now the real pass
2241 */ 2173 */
2242 int ypixel = (int)Row2Pixel (row); 2174 int ypixel = (int)Row2Pixel (row);
2243 2175
2244 for (col = 0; col < TermWin.ncol; col++) 2176 for (col = 0; col < ncol; col++)
2245 { 2177 {
2246 /* compare new text with old - if exactly the same then continue */ 2178 /* compare new text with old - if exactly the same then continue */
2247 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2179 if (stp[col] == dtp[col] /* Must match characters to skip. */
2248 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2180 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2249 || (stp[col] == ' ' /* space w/ no background change */ 2181 || (stp[col] == ' ' /* space w/ no background change */
… …
2263 dtp[col] = stp[col]; 2195 dtp[col] = stp[col];
2264 drp[col] = rend; 2196 drp[col] = rend;
2265 2197
2266 int xpixel = Col2Pixel (col); 2198 int xpixel = Col2Pixel (col);
2267 2199
2268 for (i = 0; ++col < TermWin.ncol; ) 2200 for (i = 0; ++col < ncol; )
2269 { 2201 {
2270 if (stp[col] == NOCHAR) 2202 if (stp[col] == NOCHAR)
2271 { 2203 {
2272 dtp[col] = stp[col]; 2204 dtp[col] = stp[col];
2273 drp[col] = rend; 2205 drp[col] = rend;
… …
2301 2233
2302 // sometimes we optimize away the trailing NOCHAR's, add them back 2234 // sometimes we optimize away the trailing NOCHAR's, add them back
2303 while (i && text[count] == NOCHAR) 2235 while (i && text[count] == NOCHAR)
2304 count++, i--; 2236 count++, i--;
2305 2237
2306#if ENABLE_STYLES
2307 // force redraw after "careful" characters to avoid pixel droppings
2308 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2309 drp[col + 1] = ~srp[col + 1];
2310
2311 // include previous careful character(s) if possible, looks nicer (best effort...)
2312 while (text > stp
2313 && srp[text - stp - 1] & RS_Careful
2314 && RS_SAME (rend, srp[text - stp - 1]))
2315 text--, count++, xpixel -= TermWin.fwidth;
2316#endif
2317
2318 /* 2238 /*
2319 * Determine the attributes for the string 2239 * Determine the attributes for the string
2320 */ 2240 */
2321 int fore = GET_FGCOLOR (rend); // desired foreground 2241 int fore = fgcolor_of (rend); // desired foreground
2322 int back = GET_BGCOLOR (rend); // desired background 2242 int back = bgcolor_of (rend); // desired background
2323 2243
2324 // only do special processing if ana attributes are set, which is rare 2244 // only do special processing if any attributes are set, which is unlikely
2325 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2326 { 2246 {
2247#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251
2252 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth;
2257#endif
2258
2327 bool invert = rend & RS_RVid; 2259 bool invert = rend & RS_RVid;
2328 2260
2329#ifndef NO_BOLD_UNDERLINE_REVERSE 2261#ifndef NO_BOLD_UNDERLINE_REVERSE
2330 if (rend & RS_Bold 2262 if (rend & RS_Bold
2331 && fore == Color_fg) 2263 && fore == Color_fg)
… …
2353 fore = Color_UL; 2285 fore = Color_UL;
2354#endif 2286#endif
2355 2287
2356 if (invert) 2288 if (invert)
2357 { 2289 {
2358 SWAP_IT (fore, back, int); 2290 ::swap (fore, back);
2359 2291
2360#ifndef NO_BOLD_UNDERLINE_REVERSE 2292#ifndef NO_BOLD_UNDERLINE_REVERSE
2361 if (ISSET_PIXCOLOR (Color_RV)) 2293 if (ISSET_PIXCOLOR (Color_RV))
2362 back = Color_RV; 2294 back = Color_RV;
2295
2296 if (fore == back)
2297 {
2298 fore = Color_bg;
2299 back = Color_fg;
2300 }
2363#endif 2301#endif
2364 } 2302 }
2365 2303
2366#ifdef TEXT_BLINK 2304#ifdef TEXT_BLINK
2367 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2305 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2378 } 2316 }
2379 2317
2380 /* 2318 /*
2381 * Actually do the drawing of the string here 2319 * Actually do the drawing of the string here
2382 */ 2320 */
2383 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384 2322
2385 if (back == fore) 2323 if (back == fore)
2386 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2324 font->clear_rect (*drawable, xpixel, ypixel,
2387 TermWin.fwidth * count, TermWin.fheight, 2325 fwidth * count, fheight,
2388 back); 2326 back);
2389 else if (back == Color_bg) 2327 else if (back == Color_bg)
2390 { 2328 {
2391 if (must_clear) 2329 if (must_clear)
2392 { 2330 {
2393 CLEAR_CHARS (xpixel, ypixel, count); 2331 CLEAR_CHARS (xpixel, ypixel, count);
2394 2332
2395 for (i = 0; i < count; i++) /* don't draw empty strings */ 2333 for (i = 0; i < count; i++) /* don't draw empty strings */
2396 if (text[i] != ' ') 2334 if (text[i] != ' ')
2397 { 2335 {
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2336 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2399 break; 2337 break;
2400 } 2338 }
2401 } 2339 }
2402 else 2340 else
2403 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2341 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2404 } 2342 }
2405 else 2343 else
2406 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2407 2345
2408 if (rend & RS_Uline && font->descent > 1 && fore != back) 2346 if (rend & RS_Uline && font->descent > 1 && fore != back)
2409 { 2347 {
2410#if ENABLE_FRILLS 2348#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline)) 2349 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2350 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2413 else 2351 else
2414#endif 2352#endif
2415 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2353 XSetForeground (display->display, gc, pix_colors[fore]);
2416 2354
2417 XDrawLine (display->display, drawBuffer, TermWin.gc, 2355 XDrawLine (display->display, drawBuffer, gc,
2418 xpixel, ypixel + font->ascent + 1, 2356 xpixel, ypixel + font->ascent + 1,
2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2420 } 2358 }
2421 } /* for (col....) */ 2359 } /* for (col....) */
2422 } /* for (row....) */ 2360 } /* for (row....) */
2423 2361
2424#if ENABLE_OVERLAY 2362#if ENABLE_OVERLAY
2425 scr_swap_overlay (); 2363 scr_swap_overlay ();
2426#endif 2364#endif
2365 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2427 2366
2428 /* 2367 /*
2429 * G: cleanup cursor and display outline cursor if necessary 2368 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2369 */
2431 if (showcursor) 2370 if (showcursor)
2432 { 2371 {
2433 if (TermWin.focus) 2372 if (focus)
2373 {
2374 if (OPTION (Opt_cursorUnderline))
2375 *crp ^= RS_Uline;
2376 else
2434 { 2377 {
2435 *crp ^= RS_RVid; 2378 *crp ^= RS_RVid;
2436#ifndef NO_CURSORCOLOR 2379#ifndef NO_CURSORCOLOR
2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2380 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2438#endif 2381#endif
2382 }
2439 } 2383 }
2440 else if (oldcursor.row >= 0) 2384 else if (oldcursor.row >= 0)
2441 { 2385 {
2386 int cursorwidth = 1;
2387 int col = oldcursor.col;
2388
2389 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2390 col--;
2391
2392 while (col + cursorwidth < ncol
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++;
2395
2442#ifndef NO_CURSORCOLOR 2396#ifndef NO_CURSORCOLOR
2443 if (ISSET_PIXCOLOR (Color_cursor)) 2397 if (ISSET_PIXCOLOR (Color_cursor))
2444 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2445#endif 2399#endif
2446 int cursorwidth = 1;
2447 while (oldcursor.col + cursorwidth < TermWin.ncol
2448 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2449 cursorwidth++;
2450 2400
2451 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2401 XDrawRectangle (display->display, drawBuffer, gc,
2452 Col2Pixel (oldcursor.col), 2402 Col2Pixel (col),
2453 Row2Pixel (oldcursor.row), 2403 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2404 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2456 } 2406 }
2457 } 2407 }
2458 2408
2459 /* 2409 /*
2460 * H: cleanup selection 2410 * H: cleanup selection
2461 */ 2411 */
2462 scr_reverse_selection (); 2412 scr_reverse_selection ();
2463 2413
2464 if (refresh_type & SMOOTH_REFRESH)
2465 XFlush (display->display);
2466
2467 num_scr = 0; 2414 num_scr = 0;
2468 num_scr_allow = 1; 2415 num_scr_allow = 1;
2469} 2416}
2470 2417
2471void 2418void
2472rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2419rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2473{ 2420{
2474 if (!rp || !tp) 2421 if (!l.t)
2475 return; 2422 return;
2476 2423
2477 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2424 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2425
2426 for (int i = ncol; i--; )
2478 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2427 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2479} 2428}
2480 2429
2481void 2430void
2482rxvt_term::scr_remap_chars () 2431rxvt_term::scr_remap_chars () NOTHROW
2483{ 2432{
2484 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2433 for (int i = total_rows; i--; )
2485 scr_remap_chars (screen.text[i], screen.rend[i]); 2434 scr_remap_chars (row_buf [i]);
2486 2435
2487 for (int i = TermWin.nrow; i--; ) 2436 for (int i = nrow; i--; )
2488 {
2489 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2490 scr_remap_chars (swap.text[i], swap.rend[i]);
2491 } 2437 {
2438 scr_remap_chars (drawn_buf [i]);
2439 scr_remap_chars (swap_buf [i]);
2440 }
2492} 2441}
2493 2442
2494void 2443void
2495rxvt_term::scr_recolour () 2444rxvt_term::scr_recolour () NOTHROW
2496{ 2445{
2497 if (1 2446 if (1
2498#if TRANSPARENT 2447#if TRANSPARENT
2499 && !am_transparent 2448 && !am_transparent
2500#endif 2449#endif
2501#if XPM_BACKGROUND 2450#if XPM_BACKGROUND
2502 && !bgPixmap.pixmap 2451 && !bgPixmap.pixmap
2503#endif 2452#endif
2504 ) 2453 )
2505 { 2454 {
2506 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2507 XClearWindow (display->display, TermWin.parent[0]); 2456 XClearWindow (display->display, parent[0]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2509#if HAVE_SCROLLBARS 2458#if HAVE_SCROLLBARS
2510 if (scrollBar.win) 2459 if (scrollBar.win)
2511 { 2460 {
2512 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2513 scrollBar.setIdle (); 2462 scrollBar.setIdle ();
… …
2521 want_refresh = 1; 2470 want_refresh = 1;
2522} 2471}
2523 2472
2524/* ------------------------------------------------------------------------- */ 2473/* ------------------------------------------------------------------------- */
2525void 2474void
2526rxvt_term::scr_clear (bool really) 2475rxvt_term::scr_clear (bool really) NOTHROW
2527{ 2476{
2528 if (!TermWin.mapped) 2477 if (!mapped)
2529 return; 2478 return;
2530 2479
2531 num_scr_allow = 0; 2480 num_scr_allow = 0;
2532 want_refresh = 1; 2481 want_refresh = 1;
2533 2482
2534#if TRANSPARENT
2535 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2536 {
2537 int i;
2538
2539 if (!(options & Opt_transparent_all))
2540 i = 0;
2541 else
2542 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2543
2544 while (i--)
2545 if (TermWin.parent[i] != None)
2546 XClearWindow (display->display, TermWin.parent[i]);
2547 }
2548#endif
2549
2550 if (really) 2483 if (really)
2551 XClearWindow (display->display, TermWin.vt); 2484 XClearWindow (display->display, vt);
2552} 2485}
2553 2486
2554/* ------------------------------------------------------------------------- */
2555void 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
2556rxvt_term::scr_reverse_selection () 2537rxvt_term::scr_reverse_selection () NOTHROW
2557{ 2538{
2539 if (selection.op
2558 if (selection.op && current_screen == selection.screen) 2540 && current_screen == selection.screen
2541 && selection.end.row >= view_start)
2559 { 2542 {
2560 int end_row = TermWin.saveLines - TermWin.view_start;
2561 int i = selection.beg.row + TermWin.saveLines;
2562 int col, row = selection.end.row + TermWin.saveLines;
2563 rend_t *srp;
2564
2565#if ENABLE_FRILLS 2543#if ENABLE_FRILLS
2566 if (selection.rect) 2544 if (selection.rect)
2567 { 2545 scr_xor_rect (selection.beg.row, selection.beg.col,
2568 end_row += TermWin.nrow; 2546 selection.end.row, selection.end.col,
2569 2547 RS_RVid, RS_RVid | RS_Uline);
2570 for (; i <= row && i <= end_row; i++)
2571 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2572 srp[col] ^= RS_RVid;
2573 }
2574 else 2548 else
2575#endif 2549#endif
2576 { 2550 scr_xor_span (selection.beg.row, selection.beg.col,
2577 if (i >= end_row) 2551 selection.end.row, selection.end.col,
2578 col = selection.beg.col; 2552 RS_RVid);
2579 else
2580 {
2581 col = 0;
2582 i = end_row;
2583 }
2584
2585 end_row += TermWin.nrow;
2586
2587 for (; i < row && i < end_row; i++, col = 0)
2588 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2589 srp[col] ^= RS_RVid;
2590
2591 if (i == row && i < end_row)
2592 for (srp = screen.rend[i]; col < selection.end.col; col++)
2593 srp[col] ^= RS_RVid;
2594 }
2595 } 2553 }
2596} 2554}
2597 2555
2598/* ------------------------------------------------------------------------- */ 2556/* ------------------------------------------------------------------------- */
2599/* 2557/*
2600 * Dump the whole scrollback and screen to the passed filedescriptor. The 2558 * Dump the whole scrollback and screen to the passed filedescriptor. The
2601 * invoking routine must close the fd. 2559 * invoking routine must close the fd.
2602 */ 2560 */
2603#if 0 2561#if 0
2604void 2562void
2605rxvt_term::scr_dump (int fd) 2563rxvt_term::scr_dump (int fd) NOTHROW
2606{ 2564{
2607 int row, wrote; 2565 int row, wrote;
2608 unsigned int width, towrite; 2566 unsigned int width, towrite;
2609 char r1[] = "\n"; 2567 char r1[] = "\n";
2610 2568
2611 for (row = TermWin.saveLines - TermWin.nscrolled; 2569 for (row = saveLines - nsaved;
2612 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2570 row < saveLines + nrow - 1; row++)
2613 { 2571 {
2614 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2572 width = row_buf[row].l >= 0 ? row_buf[row].l
2615 : TermWin.ncol; 2573 : ncol;
2616 for (towrite = width; towrite; towrite -= wrote) 2574 for (towrite = width; towrite; towrite -= wrote)
2617 { 2575 {
2618 wrote = write (fd, & (screen.text[row][width - towrite]), 2576 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2619 towrite); 2577 towrite);
2620 if (wrote < 0) 2578 if (wrote < 0)
2621 return; /* XXX: death, no report */ 2579 return; /* XXX: death, no report */
2622 } 2580 }
2623 if (screen.tlen[row] >= 0) 2581 if (row_buf[row].l >= 0)
2624 if (write (fd, r1, 1) <= 0) 2582 if (write (fd, r1, 1) <= 0)
2625 return; /* XXX: death, no report */ 2583 return; /* XXX: death, no report */
2626 } 2584 }
2627} 2585}
2628#endif 2586#endif
2629 2587
2630/* ------------------------------------------------------------------------- * 2588/* ------------------------------------------------------------------------- *
2631 * CHARACTER SELECTION * 2589 * CHARACTER SELECTION *
2632 * ------------------------------------------------------------------------- */ 2590 * ------------------------------------------------------------------------- */
2633
2634/*
2635 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2636 */
2637void 2591void
2638rxvt_term::selection_check (int check_more) 2592rxvt_term::selection_check (int check_more) NOTHROW
2639{ 2593{
2640 row_col_t pos; 2594 row_col_t pos;
2641 2595
2642 if (!selection.op) 2596 if (!selection.op)
2643 return; 2597 return;
2644 2598
2645 pos.row = pos.col = 0; 2599 pos.row = pos.col = 0;
2646 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2600 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2647 || (selection.beg.row >= TermWin.nrow) 2601 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2648 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2602 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2649 || (selection.mark.row >= TermWin.nrow)
2650 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2651 || (selection.end.row >= TermWin.nrow)
2652 || (check_more == 1 2603 || (check_more == 1
2653 && current_screen == selection.screen 2604 && current_screen == selection.screen
2654 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2605 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2655 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2606 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2656 || (check_more == 2 2607 || (check_more == 2
… …
2658 && ROWCOL_IS_AFTER (selection.end, pos)) 2609 && ROWCOL_IS_AFTER (selection.end, pos))
2659 || (check_more == 3 2610 || (check_more == 3
2660 && ROWCOL_IS_AFTER (selection.end, pos)) 2611 && ROWCOL_IS_AFTER (selection.end, pos))
2661 || (check_more == 4 /* screen width change */ 2612 || (check_more == 4 /* screen width change */
2662 && (selection.beg.row != selection.end.row 2613 && (selection.beg.row != selection.end.row
2663 || selection.end.col > TermWin.ncol))) 2614 || selection.end.col > ncol)))
2664 CLEAR_SELECTION (); 2615 CLEAR_SELECTION ();
2665} 2616}
2666 2617
2667/* ------------------------------------------------------------------------- */ 2618/* ------------------------------------------------------------------------- */
2668/* 2619/*
2669 * Paste a selection direct to the command fd 2620 * Paste a selection direct to the command fd
2670 */ 2621 */
2671void 2622void
2672rxvt_term::paste (unsigned char *data, unsigned int len) 2623rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2624{
2674 /* convert normal newline chars into common keyboard Return key sequence */ 2625 /* convert normal newline chars into common keyboard Return key sequence */
2675 for (unsigned int i = 0; i < len; i++) 2626 for (unsigned int i = 0; i < len; i++)
2676 if (data[i] == C0_LF) 2627 if (data[i] == C0_LF)
2677 data[i] = C0_CR; 2628 data[i] = C0_CR;
… …
2683/* 2634/*
2684 * Respond to a notification that a primary selection has been sent 2635 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify 2636 * EXT: SelectionNotify
2686 */ 2637 */
2687void 2638void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2639rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2689{ 2640{
2690 if (prop == None) /* check for failed XConvertSelection */ 2641 if (prop == None) /* check for failed XConvertSelection */
2691 { 2642 {
2692 if ((selection_type & Sel_CompoundText)) 2643 if ((selection_type & Sel_CompoundText))
2693 { 2644 {
… …
2821 { 2772 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w); 2774 char *s = rxvt_wcstombs (w);
2824 free (w); 2775 free (w);
2825 // TODO: strlen == only the first element will be converted. well... 2776 // TODO: strlen == only the first element will be converted. well...
2826 paste ((unsigned char *)s, strlen (s)); 2777 paste (s, strlen (s));
2827 free (s); 2778 free (s);
2828 } 2779 }
2829 else 2780 else
2830#endif 2781#endif
2831 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2832 && cl) 2783 && cl)
2833 { 2784 {
2834 for (int i = 0; i < cr; i++) 2785 for (int i = 0; i < cr; i++)
2835 paste ((unsigned char *)cl[i], strlen (cl[i])); 2786 paste (cl[i], strlen (cl[i]));
2836 2787
2837 XFreeStringList (cl); 2788 XFreeStringList (cl);
2838 } 2789 }
2839 else 2790 else
2840 paste (ct.value, ct.nitems); // paste raw 2791 paste ((char *)ct.value, ct.nitems); // paste raw
2841 2792
2842bailout: 2793bailout:
2843 XFree (ct.value); 2794 XFree (ct.value);
2844 2795
2845 if (selection_wait == Sel_normal) 2796 if (selection_wait == Sel_normal)
2846 selection_wait = Sel_none; 2797 selection_wait = Sel_none;
2847} 2798}
2848 2799
2849void 2800void
2850rxvt_term::incr_cb (time_watcher &w) 2801rxvt_term::incr_cb (time_watcher &w) NOTHROW
2851{ 2802{
2852 selection_wait = Sel_none; 2803 selection_wait = Sel_none;
2853 2804
2854 incr_buf_size = 0; 2805 incr_buf_size = 0;
2855 free (incr_buf); 2806 free (incr_buf);
2856 2807
2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2808 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2858} 2809}
2859 2810
2860void 2811void
2861rxvt_term::selection_property (Window win, Atom prop) 2812rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2862{ 2813{
2863 if (prop == None || selection_wait != Sel_incr) 2814 if (prop == None || selection_wait != Sel_incr)
2864 return; 2815 return;
2865 2816
2866 selection_paste (win, prop, true); 2817 selection_paste (win, prop, true);
… …
2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2876 * will auto fallback to CUT_BUFFER0 2827 * will auto fallback to CUT_BUFFER0
2877 * EXT: button 2 release 2828 * EXT: button 2 release
2878 */ 2829 */
2879void 2830void
2880rxvt_term::selection_request (Time tm, int x, int y) 2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2881{ 2832{
2882 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2833 if (selection.text && selnum == Sel_Primary)
2883 return; /* outside window */
2884
2885 if (selection.text)
2886 { /* internal selection */ 2834 { /* internal selection */
2887 char *str = rxvt_wcstombs (selection.text, selection.len); 2835 char *str = rxvt_wcstombs (selection.text, selection.len);
2888 paste ((unsigned char *)str, strlen (str)); 2836 paste (str, strlen (str));
2889 free (str); 2837 free (str);
2890 return; 2838 return;
2891 } 2839 }
2892 else 2840 else
2893 { 2841 {
2894 int i;
2895
2896 selection_request_time = tm; 2842 selection_request_time = tm;
2897 selection_wait = Sel_normal; 2843 selection_wait = Sel_normal;
2898 2844
2899 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2900 {
2901#if X_HAVE_UTF8_STRING 2845#if X_HAVE_UTF8_STRING
2902 selection_type = Sel_UTF8String; 2846 selection_type = Sel_UTF8String;
2903 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2847 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2904 return; 2848 return;
2905#else 2849#else
2906 selection_type = Sel_CompoundText; 2850 selection_type = Sel_CompoundText;
2907 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2851 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2908 return; 2852 return;
2909#endif 2853#endif
2910 }
2911 } 2854 }
2912 2855
2913 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2856 selection_wait = Sel_none; /* don't loop in selection_paste () */
2914 selection_paste (display->root, XA_CUT_BUFFER0, false); 2857 selection_paste (display->root, XA_CUT_BUFFER0, false);
2915} 2858}
2916 2859
2917int 2860int
2918rxvt_term::selection_request_other (Atom target, int selnum) 2861rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2919{ 2862{
2920 Atom sel; 2863 Atom sel;
2921#ifdef DEBUG_SELECT
2922 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2923#endif
2924 2864
2925 selection_type |= selnum; 2865 selection_type |= selnum;
2926 2866
2927 if (selnum == Sel_Primary) 2867 if (selnum == Sel_Primary)
2928 sel = XA_PRIMARY; 2868 sel = XA_PRIMARY;
… …
2932 sel = xa[XA_CLIPBOARD]; 2872 sel = xa[XA_CLIPBOARD];
2933 2873
2934 if (XGetSelectionOwner (display->display, sel) != None) 2874 if (XGetSelectionOwner (display->display, sel) != None)
2935 { 2875 {
2936 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2937 TermWin.vt, selection_request_time); 2877 vt, selection_request_time);
2938 return 1; 2878 return 1;
2939 } 2879 }
2940 2880
2941 return 0; 2881 return 0;
2942} 2882}
… …
2945/* 2885/*
2946 * Clear all selected text 2886 * Clear all selected text
2947 * EXT: SelectionClear 2887 * EXT: SelectionClear
2948 */ 2888 */
2949void 2889void
2950rxvt_term::selection_clear () 2890rxvt_term::selection_clear () NOTHROW
2951{ 2891{
2952 want_refresh = 1; 2892 want_refresh = 1;
2953 free (selection.text); 2893 free (selection.text);
2954 selection.text = NULL; 2894 selection.text = NULL;
2955 selection.len = 0; 2895 selection.len = 0;
… …
2965 * EXT: button 1 or 3 release 2905 * EXT: button 1 or 3 release
2966 */ 2906 */
2967void 2907void
2968rxvt_term::selection_make (Time tm) 2908rxvt_term::selection_make (Time tm)
2969{ 2909{
2970 int i, col, end_col, row, end_row; 2910 int i;
2971 wchar_t *new_selection_text; 2911 wchar_t *new_selection_text;
2972 text_t *t; 2912 text_t *t;
2973 2913
2974 switch (selection.op) 2914 switch (selection.op)
2975 { 2915 {
… …
2988 selection.op = SELECTION_DONE; 2928 selection.op = SELECTION_DONE;
2989 2929
2990 if (selection.clicks == 4) 2930 if (selection.clicks == 4)
2991 return; /* nothing selected, go away */ 2931 return; /* nothing selected, go away */
2992 2932
2933 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2934 return;
2935
2993 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2936 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2994 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));
2995 2938
2996 col = selection.beg.col;
2997 row = selection.beg.row + TermWin.saveLines;
2998 end_row = selection.end.row + TermWin.saveLines;
2999 int ofs = 0; 2939 int ofs = 0;
3000 int extra = 0; 2940 int extra = 0;
3001 2941
2942 int col = selection.beg.col;
2943 int row = selection.beg.row;
2944
2945 int end_col;
2946
3002 for (; row <= end_row; row++, col = 0) 2947 for (; row <= selection.end.row; row++, col = 0)
3003 { 2948 {
3004 end_col = screen.tlen[row];
3005
3006#if ENABLE_FRILLS 2949#if ENABLE_FRILLS
3007 if (selection.rect) 2950 if (selection.rect)
3008 { 2951 {
3009 col = selection.beg.col; 2952 col = selection.beg.col;
3010 end_col = TermWin.ncol + 1; 2953 end_col = ncol + 1;
2954 }
2955 else
2956#endif
2957 end_col = ROW(row).l;
2958
2959 col = max (col, 0);
2960
2961 if (row == selection.end.row
2962#if ENABLE_FRILLS
2963 || selection.rect
2964#endif
3011 } 2965 )
3012#endif
3013
3014 MAX_IT (col, 0);
3015
3016 if (end_col == -1)
3017 end_col = TermWin.ncol;
3018
3019 if (row == end_row || selection.rect)
3020 MIN_IT (end_col, selection.end.col); 2966 min_it (end_col, selection.end.col);
3021 2967
3022 t = &screen.text[row][col]; 2968 t = ROW(row).t + col;
2969
3023 for (; col < end_col; col++) 2970 for (; col < end_col; col++)
3024 { 2971 {
3025 if (*t == NOCHAR) 2972 if (*t == NOCHAR)
3026 t++; 2973 t++;
3027#if ENABLE_COMBINING 2974#if ENABLE_COMBINING
… …
3043#endif 2990#endif
3044 else 2991 else
3045 new_selection_text[ofs++] = *t++; 2992 new_selection_text[ofs++] = *t++;
3046 } 2993 }
3047 2994
3048 if (screen.tlen[row] != -1 && 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
3049 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;
3050 } 3009 }
3051 3010
3052 if (end_col != selection.end.col) 3011 if (end_col != selection.end.col)
3053 new_selection_text[ofs++] = C0_LF; 3012 new_selection_text[ofs++] = C0_LF;
3054 3013
… …
3064 3023
3065 // 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
3066 selection.len = ofs; 3025 selection.len = ofs;
3067 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));
3068 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
3069 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3070 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3041 {
3071 display->set_selection_owner (this); 3042 display->set_selection_owner (this);
3043 return true;
3044 }
3072 else 3045 else
3073 rxvt_warn ("can't get primary selection, ignoring.\n"); 3046 {
3047 selection_clear ();
3048 return false;
3049 }
3074 3050
3075#if 0 3051#if 0
3076 XTextProperty ct; 3052 XTextProperty ct;
3077 3053
3078 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3079 { 3055 {
3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3081 XFree (ct.value); 3057 XFree (ct.value);
3082 } 3058 }
3083#endif 3059#endif
3084
3085 selection_time = tm;
3086} 3060}
3087 3061
3088/* ------------------------------------------------------------------------- */ 3062/* ------------------------------------------------------------------------- */
3089/* 3063/*
3090 * 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
3091 * EXT: button 1 press 3065 * EXT: button 1 press
3092 */ 3066 */
3093void 3067void
3094rxvt_term::selection_click (int clicks, int x, int y) 3068rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3095{ 3069{
3096 clicks = ((clicks - 1) % 3) + 1; 3070 clicks = ((clicks - 1) % 3) + 1;
3097 selection.clicks = clicks; /* save clicks so extend will work */ 3071 selection.clicks = clicks; /* save clicks so extend will work */
3098 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
3099 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3082 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3100 3083
3101 if (clicks == 2 || clicks == 3) 3084 if (clicks == 2 || clicks == 3)
3102 selection_extend_colrow (selection.mark.col, 3085 selection_extend_colrow (selection.mark.col,
3103 selection.mark.row + TermWin.view_start, 3086 selection.mark.row - view_start,
3104 0, /* button 3 */ 3087 0, /* button 3 */
3105 1, /* button press */ 3088 1, /* button press */
3106 0); /* click change */ 3089 0); /* click change */
3107} 3090}
3108 3091
3109/* ------------------------------------------------------------------------- */ 3092/* ------------------------------------------------------------------------- */
3110/* 3093/*
3111 * Mark a selection at the specified col/row 3094 * Mark a selection at the specified col/row
3112 */ 3095 */
3113void 3096void
3114rxvt_term::selection_start_colrow (int col, int row) 3097rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3115{ 3098{
3116 want_refresh = 1; 3099 want_refresh = 1;
3100
3101 selection.mark.row = row + view_start;
3117 selection.mark.col = col; 3102 selection.mark.col = col;
3118 selection.mark.row = row - TermWin.view_start;
3119 3103
3120 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3104 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3121 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3105 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3122 MAX_IT (selection.mark.col, 0);
3123 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3124 3106
3125 while (selection.mark.col > 0 3107 while (selection.mark.col > 0
3126 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3108 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3127 --selection.mark.col; 3109 --selection.mark.col;
3128 3110
3129 if (selection.op) 3111 if (selection.op)
3130 { /* clear the old selection */ 3112 { /* clear the old selection */
3131 selection.beg.row = selection.end.row = selection.mark.row; 3113 selection.beg.row = selection.end.row = selection.mark.row;
… …
3146#define DELIMIT_TEXT(x) \ 3128#define DELIMIT_TEXT(x) \
3147 (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)))
3148#define DELIMIT_REND(x) 1 3130#define DELIMIT_REND(x) 1
3149 3131
3150void 3132void
3151rxvt_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
3152{ 3134{
3153 int col, row, dirnadd, tcol, trow, w1, w2; 3135 int col, row, dirnadd, tcol, trow, w1, w2;
3154 row_col_t bound; 3136 row_col_t bound;
3155 text_t *stp; 3137 text_t *stp;
3156 rend_t *srp; 3138 rend_t *srp;
3157 3139
3158 if (dirn == UP) 3140 if (dirn == UP)
3159 { 3141 {
3160 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3142 bound.row = top_row - 1;
3161 bound.col = 0; 3143 bound.col = 0;
3162 dirnadd = -1; 3144 dirnadd = -1;
3163 } 3145 }
3164 else 3146 else
3165 { 3147 {
3166 bound.row = TermWin.saveLines + TermWin.nrow; 3148 bound.row = nrow;
3167 bound.col = TermWin.ncol - 1; 3149 bound.col = ncol - 1;
3168 dirnadd = 1; 3150 dirnadd = 1;
3169 } 3151 }
3170 3152
3171 row = mark->row + TermWin.saveLines; 3153 row = mark->row;
3172 col = mark->col; 3154 col = max (mark->col, 0);
3173 MAX_IT (col, 0); 3155
3174 /* find the edge of a word */ 3156 /* find the edge of a word */
3175 stp = &screen.text[row][col]; 3157 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3176 w1 = DELIMIT_TEXT (*stp); 3158 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3177
3178 srp = &screen.rend[row][col];
3179 w2 = DELIMIT_REND (*srp);
3180 3159
3181 for (;;) 3160 for (;;)
3182 { 3161 {
3183 for (; col != bound.col; col += dirnadd) 3162 for (; col != bound.col; col += dirnadd)
3184 { 3163 {
… …
3194 break; 3173 break;
3195 } 3174 }
3196 3175
3197 if ((col == bound.col) && (row != bound.row)) 3176 if ((col == bound.col) && (row != bound.row))
3198 { 3177 {
3199 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3178 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3200 { 3179 {
3201 trow = row + dirnadd; 3180 trow = row + dirnadd;
3202 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3181 tcol = dirn == UP ? ncol - 1 : 0;
3203 3182
3204 if (screen.text[trow] == NULL) 3183 if (!ROW(trow).t)
3205 break; 3184 break;
3206 3185
3207 stp = & (screen.text[trow][tcol]); 3186 stp = ROW(trow).t + tcol;
3208 srp = & (screen.rend[trow][tcol]); 3187 srp = ROW(trow).r + tcol;
3209 3188
3210 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3189 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3211 break; 3190 break;
3212 3191
3213 row = trow; 3192 row = trow;
… …
3216 } 3195 }
3217 } 3196 }
3218 break; 3197 break;
3219 } 3198 }
3220 3199
3221Old_Word_Selection_You_Die:
3222 if (dirn == DN) 3200 if (dirn == DN)
3223 col++; /* put us on one past the end */ 3201 col++; /* put us on one past the end */
3224 3202
3225 /* Poke the values back in */ 3203 /* Poke the values back in */
3226 ret->row = row - TermWin.saveLines; 3204 ret->row = row;
3227 ret->col = col; 3205 ret->col = col;
3228} 3206}
3229 3207
3230/* ------------------------------------------------------------------------- */ 3208/* ------------------------------------------------------------------------- */
3231/* 3209/*
… …
3234 * flag == 0 ==> button 1 3212 * flag == 0 ==> button 1
3235 * flag == 1 ==> button 3 press 3213 * flag == 1 ==> button 3 press
3236 * flag == 2 ==> button 3 motion 3214 * flag == 2 ==> button 3 motion
3237 */ 3215 */
3238void 3216void
3239rxvt_term::selection_extend (int x, int y, int flag) 3217rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3240{ 3218{
3241 int col, row; 3219 int col = clamp (Pixel2Col (x), 0, ncol);
3242 3220 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3243 col = Pixel2Col (x);
3244 row = Pixel2Row (y);
3245 MAX_IT (row, 0);
3246 MIN_IT (row, (int)TermWin.nrow - 1);
3247 MAX_IT (col, 0);
3248 MIN_IT (col, (int)TermWin.ncol);
3249 3221
3250 /* 3222 /*
3251 * 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
3252 * 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
3253 * 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
3254 * be _past_ a character for it to be selected. 3226 * be _past_ a character for it to be selected.
3255 */ 3227 */
3256 if (((selection.clicks % 3) == 1) && !flag 3228 if (((selection.clicks % 3) == 1) && !flag
3257 && (col == selection.mark.col 3229 && (col == selection.mark.col
3258 && (row == selection.mark.row + TermWin.view_start))) 3230 && (row == selection.mark.row - view_start)))
3259 { 3231 {
3260 /* select nothing */ 3232 /* select nothing */
3261 selection.beg.row = selection.end.row = 0; 3233 selection.beg.row = selection.end.row = 0;
3262 selection.beg.col = selection.end.col = 0; 3234 selection.beg.col = selection.end.col = 0;
3263 selection.clicks = 4; 3235 selection.clicks = 4;
… …
3276/* ------------------------------------------------------------------------- */ 3248/* ------------------------------------------------------------------------- */
3277/* 3249/*
3278 * Extend the selection to the specified col/row 3250 * Extend the selection to the specified col/row
3279 */ 3251 */
3280void 3252void
3281rxvt_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
3282{ 3254{
3283 int16_t ncol = TermWin.ncol;
3284 int end_col;
3285 row_col_t pos; 3255 row_col_t pos;
3286 enum { 3256 enum {
3287 LEFT, RIGHT 3257 LEFT, RIGHT
3288 } closeto = RIGHT; 3258 } closeto = RIGHT;
3289 3259
… …
3320 selection.beg.col = selection.end.col = selection.mark.col; 3290 selection.beg.col = selection.end.col = selection.mark.col;
3321 selection.beg.row = selection.end.row = selection.mark.row; 3291 selection.beg.row = selection.end.row = selection.mark.row;
3322 } 3292 }
3323 3293
3324 pos.col = col; 3294 pos.col = col;
3325 pos.row = row; 3295 pos.row = view_start + row;
3326
3327 pos.row -= TermWin.view_start; /* adjust for scroll */
3328 3296
3329 /* 3297 /*
3330 * 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
3331 * in the way button3 drag extension works. 3299 * in the way button3 drag extension works.
3332 * We're either doing: button1 drag; button3 press; or button3 drag 3300 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3391 } 3359 }
3392 } 3360 }
3393 3361
3394 if (selection.clicks == 1) 3362 if (selection.clicks == 1)
3395 { 3363 {
3396 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3397 3365 && !ROW(selection.beg.row).is_longer ()
3398 if (selection.beg.col > end_col
3399 && end_col != -1
3400#if ENABLE_FRILLS 3366#if ENABLE_FRILLS
3401 && !selection.rect 3367 && !selection.rect
3402#endif 3368#endif
3403 ) 3369 )
3404 selection.beg.col = ncol; 3370 selection.beg.col = ncol;
3405 3371
3406 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3407
3408 if ( 3372 if (
3409 selection.end.col > end_col 3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3410 && end_col != -1 3374 && !ROW(selection.end.row).is_longer ()
3411#if ENABLE_FRILLS 3375#if ENABLE_FRILLS
3412 && !selection.rect 3376 && !selection.rect
3413#endif 3377#endif
3414 ) 3378 )
3415 selection.end.col = ncol; 3379 selection.end.col = ncol;
… …
3423 selection_delimit_word (DN, &selection.end, &selection.end); 3387 selection_delimit_word (DN, &selection.end, &selection.end);
3424 } 3388 }
3425 else if (selection.clicks == 3) 3389 else if (selection.clicks == 3)
3426 { 3390 {
3427#if ENABLE_FRILLS 3391#if ENABLE_FRILLS
3428 if (options & Opt_tripleclickwords) 3392 if (OPTION (Opt_tripleclickwords))
3429 { 3393 {
3430 int end_row;
3431
3432 selection_delimit_word (UP, &selection.beg, &selection.beg); 3394 selection_delimit_word (UP, &selection.beg, &selection.beg);
3433 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3434 3395
3435 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3396 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3436 { 3397 {
3437 end_col = screen.tlen[end_row + TermWin.saveLines]; 3398 if (!ROW(end_row).is_longer ())
3438
3439 if (end_col != -1)
3440 { 3399 {
3441 selection.end.row = end_row; 3400 selection.end.row = end_row;
3442 selection.end.col = end_col; 3401 selection.end.col = ROW(end_row).l;
3443 selection_remove_trailing_spaces (); 3402 selection_remove_trailing_spaces ();
3444 break; 3403 break;
3445 } 3404 }
3446 } 3405 }
3447 } 3406 }
… …
3453 3412
3454 selection.beg.col = 0; 3413 selection.beg.col = 0;
3455 selection.end.col = ncol; 3414 selection.end.col = ncol;
3456 3415
3457 // select a complete logical line 3416 // select a complete logical line
3458 while (selection.beg.row > -TermWin.saveLines 3417 while (selection.beg.row > -saveLines
3459 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3418 && ROW(selection.beg.row - 1).is_longer ())
3460 selection.beg.row--; 3419 selection.beg.row--;
3461 3420
3462 while (selection.end.row < TermWin.nrow 3421 while (selection.end.row < nrow
3463 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3422 && ROW(selection.end.row).is_longer ())
3464 selection.end.row++; 3423 selection.end.row++;
3465 } 3424 }
3466 } 3425 }
3467 3426
3468 if (button3 && buttonpress) 3427 if (button3 && buttonpress)
… …
3479 } 3438 }
3480 } 3439 }
3481 3440
3482#if ENABLE_FRILLS 3441#if ENABLE_FRILLS
3483 if (selection.rect && selection.beg.col > selection.end.col) 3442 if (selection.rect && selection.beg.col > selection.end.col)
3484 SWAP_IT (selection.beg.col, selection.end.col, int); 3443 ::swap (selection.beg.col, selection.end.col);
3485#endif 3444#endif
3486} 3445}
3487 3446
3488#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3489void 3448void
3490rxvt_term::selection_remove_trailing_spaces () 3449rxvt_term::selection_remove_trailing_spaces () NOTHROW
3491{ 3450{
3492 int32_t end_col, end_row; 3451 int32_t end_col, end_row;
3493 text_t *stp; 3452 text_t *stp;
3494 3453
3495 end_col = selection.end.col; 3454 end_col = selection.end.col;
3496 end_row = selection.end.row; 3455 end_row = selection.end.row;
3497 3456
3498 for ( ; end_row >= selection.beg.row; ) 3457 for (; end_row >= selection.beg.row; )
3499 { 3458 {
3500 stp = screen.text[end_row + TermWin.saveLines]; 3459 stp = ROW(end_row).t;
3501 3460
3502 while (--end_col >= 0) 3461 while (--end_col >= 0)
3503 { 3462 {
3504 if (stp[end_col] != ' ' 3463 if (stp[end_col] != NOCHAR
3505 && stp[end_col] != '\t' 3464 && !unicode::is_space (stp[end_col]))
3506 && stp[end_col] != NOCHAR)
3507 break; 3465 break;
3508 } 3466 }
3509 3467
3510 if (end_col >= 0 3468 if (end_col >= 0
3511 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3469 || !ROW(end_row - 1).is_longer ())
3512 { 3470 {
3513 selection.end.col = end_col + 1; 3471 selection.end.col = end_col + 1;
3514 selection.end.row = end_row; 3472 selection.end.row = end_row;
3515 break; 3473 break;
3516 } 3474 }
3517 3475
3518 end_row--; 3476 end_row--;
3519 end_col = TermWin.ncol; 3477 end_col = ncol;
3520 } 3478 }
3521 3479
3522 if (selection.mark.row > selection.end.row) 3480 if (selection.mark.row > selection.end.row)
3523 { 3481 {
3524 selection.mark.row = selection.end.row; 3482 selection.mark.row = selection.end.row;
… …
3534/* 3492/*
3535 * Double click on button 3 when already selected 3493 * Double click on button 3 when already selected
3536 * EXT: button 3 double click 3494 * EXT: button 3 double click
3537 */ 3495 */
3538void 3496void
3539rxvt_term::selection_rotate (int x, int y) 3497rxvt_term::selection_rotate (int x, int y) NOTHROW
3540{ 3498{
3541 selection.clicks = selection.clicks % 3 + 1; 3499 selection.clicks = selection.clicks % 3 + 1;
3542 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3500 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3543} 3501}
3544 3502
… …
3546/* 3504/*
3547 * Respond to a request for our current selection 3505 * Respond to a request for our current selection
3548 * EXT: SelectionRequest 3506 * EXT: SelectionRequest
3549 */ 3507 */
3550void 3508void
3551rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3552{ 3510{
3553 XSelectionEvent ev; 3511 XSelectionEvent ev;
3554 dDisp; 3512 dDisp;
3555 3513
3556 ev.type = SelectionNotify; 3514 ev.type = SelectionNotify;
… …
3684 3642
3685/* 3643/*
3686 * return col/row values corresponding to x/y pixel values 3644 * return col/row values corresponding to x/y pixel values
3687 */ 3645 */
3688void 3646void
3689rxvt_term::pixel_position (int *x, int *y) 3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3690{ 3648{
3691 *x = Pixel2Col (*x); 3649 *x = Pixel2Col (*x);
3692 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3693 *y = Pixel2Row (*y); 3651 *y = Pixel2Row (*y);
3694 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3695} 3653}
3696 3654
3697/* ------------------------------------------------------------------------- */ 3655/* ------------------------------------------------------------------------- */
3698#ifdef USE_XIM 3656#ifdef USE_XIM
3699void 3657void
3700rxvt_term::im_set_position (XPoint &pos) 3658rxvt_term::im_set_position (XPoint &pos) NOTHROW
3701{ 3659{
3702 XWindowAttributes xwa; 3660 XWindowAttributes xwa;
3703 3661
3704 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3662 XGetWindowAttributes (display->display, vt, &xwa);
3705 3663
3706 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3664 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3707 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3708} 3666}
3709#endif 3667#endif
3710 3668
3711#if ENABLE_OVERLAY 3669#if ENABLE_OVERLAY
3712void 3670void
3713rxvt_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
3714{ 3672{
3715 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3673 if (nrow < 1 || ncol < 1)
3716 return; 3674 return;
3717 3675
3718 want_refresh = 1; 3676 want_refresh = 1;
3719 3677
3720 scr_overlay_off (); 3678 scr_overlay_off ();
3721 3679
3722 if (x < 0) x = TermWin.ncol - w; 3680 if (x < 0) x = ncol - w;
3723 if (y < 0) y = TermWin.nrow - h; 3681 if (y < 0) y = nrow - h;
3724 3682
3725 // make space for border 3683 // make space for border
3726 w += 2; MIN_IT (w, TermWin.ncol); 3684 w += 2; min_it (w, ncol);
3727 h += 2; MIN_IT (h, TermWin.nrow); 3685 h += 2; min_it (h, nrow);
3728 3686
3729 x -= 1; MAX_IT (x, 0); 3687 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; MAX_IT (y, 0); 3688 y -= 1; clamp_it (y, 0, nrow - h);
3731
3732 MIN_IT (x, TermWin.ncol - w);
3733 MIN_IT (y, TermWin.nrow - h);
3734 3689
3735 ov_x = x; ov_y = y; 3690 ov_x = x; ov_y = y;
3736 ov_w = w; ov_h = h; 3691 ov_w = w; ov_h = h;
3737 3692
3738 ov_text = new text_t *[h]; 3693 ov_text = new text_t *[h];
… …
3766 *rp = r; 3721 *rp = r;
3767 } 3722 }
3768} 3723}
3769 3724
3770void 3725void
3771rxvt_term::scr_overlay_off () 3726rxvt_term::scr_overlay_off () NOTHROW
3772{ 3727{
3773 if (!ov_text) 3728 if (!ov_text)
3774 return; 3729 return;
3775 3730
3776 want_refresh = 1; 3731 want_refresh = 1;
… …
3784 delete [] ov_text; ov_text = 0; 3739 delete [] ov_text; ov_text = 0;
3785 delete [] ov_rend; ov_rend = 0; 3740 delete [] ov_rend; ov_rend = 0;
3786} 3741}
3787 3742
3788void 3743void
3789rxvt_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
3790{ 3745{
3791 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3746 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3792 return; 3747 return;
3793 3748
3794 x++, y++; 3749 x++, y++;
… …
3796 ov_text[y][x] = text; 3751 ov_text[y][x] = text;
3797 ov_rend[y][x] = rend; 3752 ov_rend[y][x] = rend;
3798} 3753}
3799 3754
3800void 3755void
3801rxvt_term::scr_overlay_set (int x, int y, const char *s) 3756rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3802{ 3757{
3803 while (*s) 3758 while (*s)
3804 scr_overlay_set (x++, y, *s++); 3759 scr_overlay_set (x++, y, *s++);
3805} 3760}
3806 3761
3807void 3762void
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{
3765 while (*s)
3766 {
3767 text_t t = *s++;
3768 int width = wcwidth (t);
3769
3770 while (width--)
3771 {
3772 scr_overlay_set (x++, y, t);
3773 t = NOCHAR;
3774 }
3775 }
3776}
3777
3778void
3808rxvt_term::scr_swap_overlay () 3779rxvt_term::scr_swap_overlay () NOTHROW
3809{ 3780{
3810 if (!ov_text) 3781 if (!ov_text)
3811 return; 3782 return;
3812 3783
3813 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3814
3815 // swap screen mem with overlay 3784 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3785 for (int y = ov_h; y--; )
3817 { 3786 {
3818 text_t *t1 = ov_text[y]; 3787 text_t *t1 = ov_text[y];
3819 rend_t *r1 = ov_rend[y]; 3788 rend_t *r1 = ov_rend[y];
3820 3789
3821 text_t *t2 = screen.text[y + row_offset] + ov_x; 3790 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3822 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3791 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3823 3792
3824 for (int x = ov_w; x--; ) 3793 for (int x = ov_w; x--; )
3825 { 3794 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3795 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 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));
… …
3829 } 3798 }
3830} 3799}
3831 3800
3832#endif 3801#endif
3833/* ------------------------------------------------------------------------- */ 3802/* ------------------------------------------------------------------------- */
3803

Diff Legend

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