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.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.206 by root, Tue Jan 3 17:34:44 2006 UTC

… …
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#include <wchar.h>
34 34
35#include "salloc.C" // HACK, should be a seperate compile! 35#include "salloc.C" // HACK, should be a seperate compile!
36 36
37inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
38{ 38{
… …
47 47
48/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
52 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
53 TermWin.view_start = 0 53 view_start = 0
54#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
58 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
… …
89/* 89/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * 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
93 */ 93 */
94#define drawBuffer TermWin.vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (TermWin.mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (TermWin.mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_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)
121{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
122 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 131
132 text_t *et = l.t + col;
133 rend_t *er = l.r + col;
134
125 while (width--) 135 while (width--)
126 { 136 {
127 *et++ = ' '; 137 *et++ = ' ';
128 *er++ = efs; 138 *er++ = efs;
129 } 139 }
130} 140}
131 141
132/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
133/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
134void 144void
135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
136{ 146{
137#ifdef DEBUG_STRICT 147 scr_blank_line (l, 0, ncol, efs);
138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
139#endif
140 if (tp[row] == NULL)
141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145
146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
147} 148}
148 149
149/* ------------------------------------------------------------------------- * 150/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 151 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 152 * ------------------------------------------------------------------------- */
153
152void 154void
153rxvt_term::scr_reset () 155rxvt_term::scr_reset ()
154{ 156{
155 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q;
157 int k;
158 rend_t setrstyle;
159
160#if ENABLE_OVERLAY 157#if ENABLE_OVERLAY
161 scr_overlay_off (); 158 scr_overlay_off ();
162#endif 159#endif
163 160
164 TermWin.view_start = 0; 161 view_start = 0;
165 num_scr = 0; 162 num_scr = 0;
166 163
167 if (TermWin.ncol == 0) 164 if (ncol == 0)
168 TermWin.ncol = 80; 165 ncol = 80;
169 166
170 if (TermWin.nrow == 0) 167 if (nrow == 0)
171 TermWin.nrow = 24; 168 nrow = 24;
172
173 ncol = TermWin.ncol;
174 nrow = TermWin.nrow;
175 169
176 if (ncol == prev_ncol && nrow == prev_nrow) 170 if (ncol == prev_ncol && nrow == prev_nrow)
177 return; 171 return;
178 172
179 // we need at least two lines for wrapping to work correctly 173 // we need at least two lines for wrapping to work correctly
180 if (nrow + TermWin.saveLines < 2) 174 if (nrow + saveLines < 2)
181 { 175 {
176 //TODO//FIXME
182 TermWin.saveLines++; 177 saveLines++;
183 prev_nrow--; 178 prev_nrow--;
184 TermWin.nscrolled++; 179 nsaved++;
185 } 180 }
186 181
187 want_refresh = 1; 182 want_refresh = 1;
188 183
189 prev_total_rows = prev_nrow + TermWin.saveLines; 184 int prev_total_rows = prev_nrow + saveLines;
190 total_rows = nrow + TermWin.saveLines; 185 total_rows = nrow + saveLines;
191 186
192 screen.tscroll = 0; 187 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
194 189
195 if (!talloc) 190 if (!row_buf)
196 {
197 talloc = new rxvt_salloc (ncol * sizeof (text_t));
198 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
199 }
200
201 if (!screen.text)
202 { 191 {
203 /* 192 /*
204 * first time called so just malloc everything: don't rely on realloc 193 * first time called so just malloc everything: don't rely on realloc
205 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
206 */ 195 */
196 nsaved = 0; /* no saved lines */
197 term_start = 0;
198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
207 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
208 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
211
212 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214 206
215 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 207 for (int row = nrow; row--; )
216 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
217 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
219
220 for (p = 0; p < nrow; p++)
221 { 208 {
222 q = p + TermWin.saveLines;
223 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
224 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
225 screen.tlen[q] = swap.tlen[p] = 0;
226 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
227 } 212 }
228 213
229 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
230 TermWin.nscrolled = 0; /* no saved lines */
231 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
232 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
233 screen.cur.row = screen.cur.col = 0; 217 screen.cur.row = screen.cur.col = 0;
234 screen.charset = 0; 218 screen.charset = 0;
235 current_screen = PRIMARY; 219 current_screen = PRIMARY;
… …
255 else 239 else
256 { 240 {
257 /* 241 /*
258 * add or delete rows as appropriate 242 * add or delete rows as appropriate
259 */ 243 */
260 setrstyle = DEFAULT_RSTYLE;
261 244
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
262 if (nrow < prev_nrow) 249 if (nrow < prev_nrow)
263 { 250 {
264 /* delete rows */
265 k = min (TermWin.nscrolled, prev_nrow - nrow);
266 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
267
268 for (p = nrow; p < prev_nrow; p++) 251 for (int row = nrow; row < prev_nrow; row++)
269 { 252 {
270 q = p + TermWin.saveLines; 253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
271 258
272 if (screen.text[q]) 259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263 for (int row = min (nrow, prev_nrow); row--; )
264 {
265 lresize (drawn_buf[row]);
266 lresize (swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
276
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row
280
281 if (nsaved)
282 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm.
285
286 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288
289 do
290 {
291 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295
296 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l;
298
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
273 { 300 {
274#ifdef DEBUG_STRICT 301 p = MOD (p - 1, prev_total_rows);
275 assert (screen.rend[q]); 302
276#endif 303 plines++;
277 talloc->free (screen.text[q]); 304 llen += prev_ncol;
278 ralloc->free (screen.rend[q]);
279 } 305 }
280 306
281 if (swap.text[p]) 307 int qlines = max (0, (llen - 1) / ncol) + 1;
308
309 // drop partial lines completely
310 if (q < qlines)
311 break;
312
313 q -= qlines;
314
315 int lofs = 0;
316 line_t *qline;
317
318 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++)
282 { 320 {
283#ifdef DEBUG_STRICT 321 qline = row_buf + qrow;
322 lalloc (*qline);
323 qline->set_is_longer ();
324
325 int qcol = 0;
326
327 // fill a single destination line
328 while (lofs < llen && qcol < ncol)
329 {
330 int prow = lofs / prev_ncol;
331 int pcol = lofs % prev_ncol;
332
333 prow = MOD (p + prow, prev_total_rows);
334
335 // we only adjust the cursor _row_ and put it into
336 // the topmost line of "long line" it was in, as
337 // this seems to upset applications/shells/readline
338 // least.
339 if (prow == ocur.row)
340 screen.cur.row = q - (total_rows - nrow);
341
342 line_t &pline = old_buf [prow];
343
344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
345
284 assert (swap.rend[p]); 346 assert (len);
285#endif 347 assert (pline.t);
286 talloc->free (swap.text[p]); 348
287 ralloc->free (swap.rend[p]); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
351
352 lofs += len;
353 qcol += len;
354 }
288 } 355 }
289 356
290#ifdef DEBUG_STRICT 357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
291 assert (drawn_text[p] && drawn_rend[p]); 358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
292#endif 364#endif
293 talloc->free (drawn_text[p]); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
294 ralloc->free (drawn_rend[p]);
295 } 366 }
367 while (p != pend && q > 0);
296 368
297 /* we have fewer rows so fix up cursor position */ 369 term_start = total_rows - nrow;
298 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 370 nsaved = term_start - q;
371
372 // make sure all terminal lines exist
373 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
299 375
300 scr_reset_realloc (); /* realloc _last_ */
301 }
302 else if (nrow > prev_nrow)
303 { 376 }
304 /* add rows */ 377 else
305 scr_reset_realloc (); /* realloc _first_ */ 378 {
306 379 // if no scrollback exists (yet), wing, instead of wrap
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 380
308 381 for (int row = min (nrow, prev_nrow); row--; )
309 k = min (TermWin.nscrolled, nrow - prev_nrow);
310
311 for (p = prev_total_rows; p < total_rows; p++)
312 { 382 {
313 screen.tlen[p] = 0; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
314 screen.text[p] = NULL; 384 line_t &qline = row_buf [row];
315 screen.rend[p] = NULL; 385
386 qline = pline;
387 lresize (qline);
316 } 388 }
317 389
318 for (p = prev_total_rows; p < total_rows - k; p++)
319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
320
321 for (p = prev_nrow; p < nrow; p++) 390 for (int row = prev_nrow; row < nrow; row++)
322 { 391 {
323 swap.tlen[p] = 0; 392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
324 swap.text[p] = NULL;
325 swap.rend[p] = NULL;
326 drawn_text[p] = NULL;
327 drawn_rend[p] = NULL;
328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
330 } 393 }
331 394
332 if (k > 0) 395 term_start = 0;
333 {
334 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k;
336 screen.s_cur.row += k;
337 TermWin.nscrolled -= k;
338 }
339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow);
341#else /* drive with your eyes closed */
342
343 MIN_IT (screen.cur.row, nrow - 1);
344#endif
345 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
346 }
347
348 /* resize columns */
349 if (ncol != prev_ncol)
350 { 396 }
351 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
352 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
353 397
354 for (p = 0; p < total_rows; p++) 398#ifdef DEBUG_STRICT //TODO: remove
355 { 399 for (int i = -nsaved; i < nrow; i++)
356 if (screen.text[p]) 400 assert (ROW (i).t);
357 { 401#endif
358 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
359 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
360 402
361 MIN_IT (screen.tlen[p], (int16_t)ncol); 403 free (old_buf);
404 delete old_ta;
405 delete old_ra;
362 406
363 if (ncol > prev_ncol) 407 clamp_it (screen.cur.row, 0, nrow - 1);
364 scr_blank_line (&screen.text[p][prev_ncol], 408 clamp_it (screen.cur.col, 0, ncol - 1);
365 &screen.rend[p][prev_ncol],
366 ncol - prev_ncol, setrstyle);
367 }
368 }
369
370 for (p = 0; p < nrow; p++)
371 {
372 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
373 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
374
375 if (ncol > prev_ncol)
376 scr_blank_line (&drawn_text[p][prev_ncol],
377 &drawn_rend[p][prev_ncol],
378 ncol - prev_ncol, setrstyle);
379
380 if (swap.text[p])
381 {
382 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
383 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
384
385 MIN_IT (swap.tlen[p], (int16_t)ncol);
386
387 if (ncol > prev_ncol)
388 scr_blank_line (&swap.text[p][prev_ncol],
389 &swap.rend[p][prev_ncol],
390 ncol - prev_ncol, setrstyle);
391 }
392
393 }
394
395 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
396
397 delete talloc; talloc = ta;
398 delete ralloc; ralloc = ra;
399 }
400 409
401 if (tabs) 410 if (tabs)
402 free (tabs); 411 free (tabs);
403 } 412 }
404 413
405 prev_nrow = nrow; 414 prev_nrow = nrow;
406 prev_ncol = ncol; 415 prev_ncol = ncol;
407 416
408 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 417 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
409 418
410 for (p = 0; p < ncol; p++) 419 for (int col = ncol; col--; )
411 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 420 tabs [col] = col % TABSIZE == 0;
412 421
413 tt_winch (); 422 tt_winch ();
414}
415 423
416void 424 PERL_INVOKE ((this, HOOK_RESET, DT_END));
417rxvt_term::scr_reset_realloc ()
418{
419 unsigned int total_rows, nrow;
420
421 nrow = TermWin.nrow;
422 total_rows = nrow + TermWin.saveLines;
423 /* *INDENT-OFF* */
424 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
425 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
426 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
427 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
428
429 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
430 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
431
432 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
433 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
434 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
435 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
436 /* *INDENT-ON* */
437} 425}
438 426
439/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
440/* 428/*
441 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
442 */ 430 */
443void 431void
444rxvt_term::scr_release () 432rxvt_term::scr_release ()
445{ 433{
446 unsigned int total_rows;
447 int i;
448
449 total_rows = TermWin.nrow + TermWin.saveLines;
450
451 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
453 436
454 free (screen.text); 437 free (row_buf);
455 free (screen.tlen); 438 free (swap_buf);
456 free (screen.rend);
457 free (drawn_text); 439 free (drawn_buf);
458 free (drawn_rend); 440 free (temp_buf);
459 free (swap.text);
460 free (swap.tlen);
461 free (swap.rend);
462 free (buf_text);
463 free (buf_rend);
464 free (tabs); 441 free (tabs);
465 442
466 /* NULL these so if anything tries to use them, we'll know about it */ 443 row_buf = 0; // signal that we freed all the arrays
467 screen.text = drawn_text = swap.text = NULL;
468 screen.rend = drawn_rend = swap.rend = NULL;
469 screen.tlen = swap.tlen = NULL;
470 buf_text = NULL;
471 buf_rend = NULL;
472 tabs = NULL;
473} 444}
474 445
475/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
476/* 447/*
477 * Hard reset 448 * Hard reset
… …
528 set_font_style (); 499 set_font_style ();
529 break; 500 break;
530 } 501 }
531 502
532 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
533 MIN_IT (s->cur.row, TermWin.nrow - 1); 504 min_it (s->cur.row, nrow - 1);
534 MIN_IT (s->cur.col, TermWin.ncol - 1); 505 min_it (s->cur.col, ncol - 1);
535#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
536 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
537 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
538#else /* drive with your eyes closed */
539 MAX_IT (s->cur.row, 0);
540 MAX_IT (s->cur.col, 0);
541#endif 509#endif
542} 510}
543 511
544/* ------------------------------------------------------------------------- */ 512/* ------------------------------------------------------------------------- */
545/* 513/*
… …
548 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 516 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
549 */ 517 */
550int 518int
551rxvt_term::scr_change_screen (int scrn) 519rxvt_term::scr_change_screen (int scrn)
552{ 520{
553 int i;
554#if NSCREENS
555 int offset;
556#endif
557
558 want_refresh = 1; 521 want_refresh = 1;
559
560 TermWin.view_start = 0; 522 view_start = 0;
561 523
562 if (current_screen == scrn) 524 if (current_screen == scrn)
563 return scrn; 525 return scrn;
564 526
565 selection_check (2); /* check for boundary cross */ 527 selection_check (2); /* check for boundary cross */
566 528
567 i = current_screen; current_screen = scrn; scrn = i; 529 int i = current_screen; current_screen = scrn; scrn = i;
568 530
569 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 531 ::swap (screen.cur.row, swap.cur.row);
570 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 532 ::swap (screen.cur.col, swap.cur.col);
571 MAX_IT (screen.cur.row, 0); 533
572 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
573 MAX_IT (screen.cur.col, 0); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
574 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
575 536
576#if NSCREENS 537#if NSCREENS
577 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
578 { 539 {
579 num_scr = 0; 540 num_scr = 0;
580 offset = TermWin.saveLines;
581 541
582 for (i = prev_nrow; i--;) 542 for (int i = prev_nrow; i--; )
583 { 543 ::swap (ROW(i), swap_buf [i]);
584 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
585 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
586 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
587 }
588 544
589 SWAP_IT (screen.charset, swap.charset, int16_t); 545 ::swap (screen.charset, swap.charset);
590 SWAP_IT (screen.flags, swap.flags, int); 546 ::swap (screen.flags, swap.flags);
591 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
592 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
593 } 549 }
594 else 550 else
595#endif 551#endif
596 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
597 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
598 554
599 return scrn; 555 return scrn;
600} 556}
601 557
602// clear WrapNext indicator, solidifying position on next line 558// clear WrapNext indicator, solidifying position on next line
… …
609 screen.flags &= ~Screen_WrapNext; 565 screen.flags &= ~Screen_WrapNext;
610 566
611 screen.cur.col = 0; 567 screen.cur.col = 0;
612 568
613 if (screen.cur.row == screen.bscroll) 569 if (screen.cur.row == screen.bscroll)
614 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 570 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
615 else if (screen.cur.row < TermWin.nrow - 1) 571 else if (screen.cur.row < nrow - 1)
616 screen.cur.row++; 572 screen.cur.row++;
617} 573}
618 574
619/* ------------------------------------------------------------------------- */ 575/* ------------------------------------------------------------------------- */
620/* 576/*
… …
650/* ------------------------------------------------------------------------- */ 606/* ------------------------------------------------------------------------- */
651/* 607/*
652 * Scroll text between <row1> and <row2> inclusive, by <count> lines 608 * Scroll text between <row1> and <row2> inclusive, by <count> lines
653 * count positive ==> scroll up 609 * count positive ==> scroll up
654 * count negative ==> scroll down 610 * count negative ==> scroll down
655 * spec == 0 for normal routines
656 */ 611 */
657int 612int
658rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 613rxvt_term::scr_scroll_text (int row1, int row2, int count)
659{ 614{
660 int i, j;
661 long nscrolled;
662
663 if (count == 0 || (row1 > row2)) 615 if (count == 0 || (row1 > row2))
664 return 0; 616 return 0;
665 617
666 want_refresh = 1; 618 want_refresh = 1;
619 num_scr += count;
667 620
668 if (row1 == 0 && count > 0 621 if (count > 0
622 && row1 == 0
623 && row2 == nrow - 1
669 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
670 { 625 {
671 nscrolled = (long)TermWin.nscrolled + (long)count; 626 nsaved = min (nsaved + count, saveLines);
672 627
673 if (nscrolled > (long)TermWin.saveLines) 628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
674 TermWin.nscrolled = TermWin.saveLines;
675 else 629
676 TermWin.nscrolled = (unsigned int)nscrolled; 630 term_start = (term_start + count) % total_rows;
677 631
632 if (selection.op && current_screen == selection.screen)
633 {
634 selection.beg.row -= count;
635 selection.end.row -= count;
636 selection.mark.row -= count;
637
638 if (selection.beg.row < -nsaved
639 || selection.end.row < -nsaved
640 || selection.mark.row < -nsaved)
641 {
642 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR;
644 }
645 }
646
647 for (int i = count; i--; )
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
678 if ((options & Opt_scrollWithBuffer) 653 if (OPTION (Opt_scrollWithBuffer)
679 && TermWin.view_start != 0 654 && view_start != 0
680 && TermWin.view_start != TermWin.saveLines) 655 && view_start != saveLines)
681 scr_page (UP, count); 656 scr_page (UP, count);
682 } 657 }
683 else if (!spec) 658 else
684 row1 += TermWin.saveLines; 659 {
685
686 row2 += TermWin.saveLines;
687
688 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
689 { 661 {
690 i = selection.beg.row + TermWin.saveLines; 662 if ((selection.beg.row < row1 && selection.end.row > row1)
691 j = selection.end.row + TermWin.saveLines; 663 || (selection.beg.row < row2 && selection.end.row > row2)
692 if ((i < row1 && j > row1) 664 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
693 || (i < row2 && j > row2) 665 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
694 || (i - count < row1 && i >= row1) 666 || (selection.end.row - count < row1 && selection.end.row >= row1)
695 || (i - count > row2 && i <= row2) 667 || (selection.end.row - count > row2 && selection.end.row <= row2))
696 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2))
698 { 668 {
699 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
701 } 671 }
702 else if (j >= row1 && j <= row2) 672 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 673 {
704 /* move selected region too */ 674 /* move selected region too */
705 selection.beg.row -= count; 675 selection.beg.row -= count;
706 selection.end.row -= count; 676 selection.end.row -= count;
707 selection.mark.row -= count; 677 selection.mark.row -= count;
678
679 selection_check (0);
708 } 680 }
709 }
710
711 selection_check (0); /* _after_ TermWin.nscrolled update */
712
713 num_scr += count;
714 j = count;
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 {
724 /* A: scroll up */
725
726 /* A1: Copy lines that will get clobbered by the rotation */
727 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
728 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
729
730 /* A2: Rotate lines */
731 i = row2 - row1 - count + 1;
732 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
733 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
734 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
735
736 j = row2 - count + 1, i = count;
737 }
738 else /* if (j < 0) */
739 {
740 /* B: scroll down */
741
742 /* B1: Copy lines that will get clobbered by the rotation */
743 for (i = 0, j = row2; i < count; i++, j--)
744 { 681 }
745 buf_text[i] = screen.text[j]; 682
746 buf_rend[i] = screen.rend[j]; 683 // use a simple and robust scrolling algorithm, this
684 // part of scr_scroll_text is not time-critical.
685
686 int rows = row2 - row1 + 1;
687
688 min_it (count, rows);
689
690 for (int row = 0; row < rows; row++)
747 } 691 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 693
749 /* B2: Rotate lines */ 694 if (!IN_RANGE_EXC (row + count, 0, rows))
750 for (j = row2, i = j - count; i >= row1; i--, j--) 695 scr_blank_screen_mem (temp_buf [row], rstyle);
751 { 696 }
752 screen.tlen[j] = screen.tlen[i];
753 screen.text[j] = screen.text[i];
754 screen.rend[j] = screen.rend[i];
755 }
756 697
757 j = row1, i = count; 698 for (int row = 0; row < rows; row++)
758 count = -count; 699 ROW(row1 + row) = temp_buf [row];
759 } 700 }
760
761 /* C: Resurrect lines */
762 memset (screen.tlen + j, 0, i * sizeof (int16_t));
763 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
764 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
765 if (!spec) /* line length may not equal TermWin.ncol */
766 for (; i--; j++)
767 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
768 701
769 return count; 702 return count;
770} 703}
771 704
772/* ------------------------------------------------------------------------- */ 705/* ------------------------------------------------------------------------- */
… …
774 * Add text given in <str> of length <len> to screen struct 707 * Add text given in <str> of length <len> to screen struct
775 */ 708 */
776void 709void
777rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
778{ 711{
712 if (len <= 0) /* sanity */
713 return;
714
779 unsigned char checksel; 715 unsigned char checksel;
780 unicode_t c; 716 unicode_t c;
781 int i, row, last_col; 717 int last_col;
782 text_t *stp; 718 const unicode_t *strend = str + len;
783 rend_t *srp;
784
785 if (len <= 0) /* sanity */
786 return;
787 719
788 want_refresh = 1; 720 want_refresh = 1;
789 ZERO_SCROLLBACK (); 721 ZERO_SCROLLBACK ();
790 last_col = TermWin.ncol; 722 last_col = ncol;
791 723
792 if (nlines > 0) 724 if (nlines > 0)
793 { 725 {
794 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
795 if ((nlines > 0) 727 if (nlines > 0
796 && (screen.tscroll == 0) 728 && screen.tscroll == 0
797 && (screen.bscroll == (TermWin.nrow - 1))) 729 && screen.bscroll == (nrow - 1))
798 { 730 {
799 /* _at least_ this many lines need to be scrolled */ 731 /* _at least_ this many lines need to be scrolled */
800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
801 screen.cur.row -= nlines; 733 screen.cur.row -= nlines;
802 } 734 }
803 } 735 }
804 736
805#ifdef DEBUG_STRICT 737#ifdef DEBUG_STRICT
806 assert (screen.cur.col < last_col); 738 assert (screen.cur.col < last_col);
807 assert ((screen.cur.row < TermWin.nrow) 739 assert (screen.cur.row < nrow
808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 740 && screen.cur.row >= -nsaved);
809#else /* drive with your eyes closed */
810 MIN_IT (screen.cur.col, last_col - 1);
811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
813#endif 741#endif
814 row = screen.cur.row + TermWin.saveLines; 742 int row = screen.cur.row;
815 743
816 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 744 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817 745
818 stp = screen.text[row]; 746 line_t *line = &ROW(row);
819 srp = screen.rend[row];
820 747
821 while (len--) 748 while (str < strend)
822 { 749 {
823 c = *str++; 750 c = *str++;
824 751
825 if (c < 0x20) 752 if (c < 0x20)
826 switch (c) 753 if (c == C0_LF)
827 { 754 {
828 case C0_HT: 755 if (!line->is_longer ()) /* XXX: think about this */
829 scr_tab (1, true); 756 max_it (line->l, screen.cur.col);
830 continue;
831 757
832 case C0_LF:
833 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col);
835
836 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
837 759
838 if (screen.cur.row == screen.bscroll) 760 if (screen.cur.row == screen.bscroll)
839 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 761 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
840 else if (screen.cur.row < (TermWin.nrow - 1)) 762 else if (screen.cur.row < (nrow - 1))
841 row = (++screen.cur.row) + TermWin.saveLines; 763 row = ++screen.cur.row;
842 764
843 stp = screen.text[row]; /* _must_ refresh */ 765 line = &ROW(row); /* _must_ refresh */
844 srp = screen.rend[row]; /* _must_ refresh */
845 continue; 766 continue;
767 }
768 else if (c == C0_CR)
769 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col);
846 772
847 case C0_CR:
848 if (screen.tlen[row] != -1) /* XXX: think about this */
849 MAX_IT (screen.tlen[row], screen.cur.col);
850
851 screen.flags &= ~Screen_WrapNext; 773 screen.flags &= ~Screen_WrapNext;
852 screen.cur.col = 0; 774 screen.cur.col = 0;
853 continue; 775 continue;
776 }
777 else if (c == C0_HT)
778 {
779 scr_tab (1, true);
780 continue;
854 } 781 }
855 782
856 if (checksel /* see if we're writing within selection */ 783 if (checksel /* see if we're writing within selection */
857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 784 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 785 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
866 CLEAR_SELECTION (); 793 CLEAR_SELECTION ();
867 } 794 }
868 795
869 if (screen.flags & Screen_WrapNext) 796 if (screen.flags & Screen_WrapNext)
870 { 797 {
871 screen.tlen[row] = -1; 798 line->set_is_longer ();
872 799
873 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 800 scr_do_wrap ();
874
875 stp = screen.text[row]; /* _must_ refresh */
876 srp = screen.rend[row]; /* _must_ refresh */
877 } 801
802 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */
804 }
805
806 // some utf-8 decoders "decode" surrogate characters: let's fix this.
807 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
808 c = 0xfffd;
878 809
879 // rely on wcwidth to tell us the character width, at least for non-latin1 810 // rely on wcwidth to tell us the character width, at least for non-latin1
880 // do wcwidth before further replacements, as wcwidth says that line-drawing 811 // do wcwidth before further replacements, as wcwidth might return -1
881 // characters have width -1 (DOH!) on GNU/Linux sometimes. 812 // for the line drawing characters below as they might be invalid in the current
813 // locale.
882 int width = c < 0x100 ? 1 : wcwidth (c); 814 int width = c < 0x100 ? 1 : wcwidth (c);
883 815
884 if (charsets[screen.charset] == '0') // DEC SPECIAL 816 if (charsets[screen.charset] == '0') // DEC SPECIAL
885 { 817 {
886 // vt100 special graphics and line drawing 818 // vt100 special graphics and line drawing
887 // 5f-7e standard vt100 819 // 5f-7e standard vt100
888 // 40-5e rxvt extension for extra curses acs chars 820 // 40-5e rxvt extension for extra curses acs chars
889 static uint16_t vt100_0[63] = { // 40 .. 7e 821 static uint16_t vt100_0[62] = { // 41 .. 7e
890 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 822 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 823 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 824 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
893 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 825 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
894 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 826 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
895 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 827 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
896 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 828 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
897 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 829 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
898 }; 830 };
899 831
900 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 832 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
901 { 833 {
902 c = vt100_0[c - 0x40]; 834 c = vt100_0[c - 0x41];
903 width = 1; 835 width = 1; // vt100 line drawing characters are always single-width
904 } 836 }
905 } 837 }
906 838
907 if (screen.flags & Screen_Insert) 839 if (screen.flags & Screen_Insert)
908 scr_insdel_chars (width, INSERT); 840 scr_insdel_chars (width, INSERT);
909 841
910 if (width != 0) 842 if (width != 0)
911 { 843 {
912 // some utf-8 decoders decode surrogate characters.
913 if (0xd800 <= c && c <= 0xdfff)
914 c = 0xfffd;
915
916#if !UNICODE_3 844#if !UNICODE_3
917 // trim characters we can't store directly :( 845 // trim characters we can't store directly :(
918 if (c >= 0x10000) 846 if (c >= 0x10000)
919# if ENABLE_COMBINING 847# if ENABLE_COMBINING
920 c = rxvt_composite.compose (c); // map to lower 16 bits 848 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
922 c = 0xfffd; 850 c = 0xfffd;
923# endif 851# endif
924#endif 852#endif
925 853
926 // nuke the character at this position, if required 854 // nuke the character at this position, if required
927 if (stp[screen.cur.col] == NOCHAR 855 if (line->t[screen.cur.col] == NOCHAR
928 || (screen.cur.col < TermWin.ncol - 1 856 || (screen.cur.col < ncol - 1
929 && stp[screen.cur.col + 1] == NOCHAR)) 857 && line->t[screen.cur.col + 1] == NOCHAR))
930 { 858 {
931 int col = screen.cur.col; 859 int col = screen.cur.col;
932 860
933 // find begin 861 // find begin
934 while (col > 0 && stp[col] == NOCHAR) 862 while (col > 0 && line->t[col] == NOCHAR)
935 col--; 863 col--;
936 864
937 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 865 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
938 866
939 // found begin, nuke 867 // found begin, nuke
940 do { 868 do {
941 stp[col] = ' '; 869 line->t[col] = ' ';
942 srp[col] = rend; 870 line->r[col] = rend;
943 col++; 871 col++;
944 } while (col < TermWin.ncol && stp[col] == NOCHAR); 872 } while (col < ncol && line->t[col] == NOCHAR);
945 } 873 }
946 874
947 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876
877 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width)
879 {
880 // ...output spaces
881 c = ' ';
882 // and try the same character next loop iteration
883 --str;
884 }
948 885
949 do 886 do
950 { 887 {
951 stp[screen.cur.col] = c; 888 line->t[screen.cur.col] = c;
952 srp[screen.cur.col] = rend; 889 line->r[screen.cur.col] = rend;
953 890
954 if (screen.cur.col < last_col - 1) 891 if (screen.cur.col < last_col - 1)
955 screen.cur.col++; 892 screen.cur.col++;
956 else 893 else
957 { 894 {
958 screen.tlen[row] = last_col; 895 line->l = last_col;
959 if (screen.flags & Screen_Autowrap) 896 if (screen.flags & Screen_Autowrap)
960 screen.flags |= Screen_WrapNext; 897 screen.flags |= Screen_WrapNext;
961 break; 898 break;
962 } 899 }
963 900
… …
965 } 902 }
966 while (--width > 0); 903 while (--width > 0);
967 904
968 // pad with spaces when overwriting wide character with smaller one 905 // pad with spaces when overwriting wide character with smaller one
969 if (!width) 906 if (!width)
970 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
971 { 908 {
972 stp[c] = ' '; 909 line->t[c] = ' ';
973 srp[c] = rend; 910 line->r[c] = rend;
974 } 911 }
975 } 912 }
976 else if (width == 0) 913 else // width == 0
977 { 914 {
978#if ENABLE_COMBINING 915#if ENABLE_COMBINING
979 // handle combining characters 916 // handle combining characters
980 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
983
984 text_t *tp; 920 text_t *tp;
985 rend_t *rp; 921 rend_t *rp;
986 922
987 if (screen.cur.col > 0) 923 if (screen.cur.col > 0)
988 { 924 {
989 tp = stp + screen.cur.col - 1; 925 tp = line->t + screen.cur.col - 1;
990 rp = srp + screen.cur.col - 1; 926 rp = line->r + screen.cur.col - 1;
991 927
992 while (*tp == NOCHAR && tp > stp) 928 while (*tp == NOCHAR && tp > line->t)
993 tp--, rp--; 929 tp--, rp--;
994 } 930 }
995 else if (screen.cur.row > 0 931 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 932 && ROW(screen.cur.row - 1).is_longer ())
997 { 933 {
998 int line = screen.cur.row - 1 + TermWin.saveLines; 934 line_t *line = &ROW(screen.cur.row - 1);
999 935
1000 tp = screen.text[line] + last_col - 1; 936 tp = line->t + last_col - 1;
1001 rp = screen.rend[line] + last_col - 1; 937 rp = line->r + last_col - 1;
1002 938
1003 while (*tp == NOCHAR && tp > screen.text[line]) 939 while (*tp == NOCHAR && tp > line->t)
1004 tp--, rp--; 940 tp--, rp--;
1005 } 941 }
1006 else 942 else
1007 continue; 943 continue;
1008 944
… …
1015 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1016#endif 952#endif
1017 } 953 }
1018 } 954 }
1019 955
1020 if (screen.tlen[row] != -1) /* XXX: think about this */ 956 if (!line->is_longer ()) /* XXX: think about this */
1021 MAX_IT (screen.tlen[row], screen.cur.col); 957 max_it (line->l, screen.cur.col);
1022 958
1023#ifdef DEBUG_STRICT 959#ifdef DEBUG_STRICT
1024 assert (screen.cur.row >= 0); 960 assert (screen.cur.row >= 0);
1025#else /* drive with your eyes closed */
1026 MAX_IT (screen.cur.row, 0);
1027#endif 961#endif
1028} 962}
1029 963
1030/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
1031/* 965/*
… …
1040 if (screen.cur.col == 0) 974 if (screen.cur.col == 0)
1041 { 975 {
1042 if (screen.cur.row > 0) 976 if (screen.cur.row > 0)
1043 { 977 {
1044#ifdef TERMCAP_HAS_BW 978#ifdef TERMCAP_HAS_BW
1045 screen.cur.col = TermWin.ncol - 1; 979 screen.cur.col = ncol - 1;
1046 screen.cur.row--; 980 screen.cur.row--;
1047 return; 981 return;
1048#endif 982#endif
1049 } 983 }
1050 } 984 }
… …
1070 1004
1071 if (count == 0) 1005 if (count == 0)
1072 return; 1006 return;
1073 else if (count > 0) 1007 else if (count > 0)
1074 { 1008 {
1075 int row = TermWin.saveLines + screen.cur.row; 1009 line_t &l = ROW(screen.cur.row);
1076 text_t *tp = screen.text[row];
1077 rend_t *rp = screen.rend[row];
1078 rend_t base_rend = rp[i]; 1010 rend_t base_rend = l.r[i];
1079 ht &= tp[i] == ' '; 1011 ht &= l.t[i] == ' ';
1080 1012
1081 for (; ++i < TermWin.ncol; ) 1013 for (; ++i < ncol; )
1082 if (tabs[i]) 1014 if (tabs[i])
1083 { 1015 {
1084 x = i; 1016 x = i;
1085 if (!--count) 1017 if (!--count)
1086 break; 1018 break;
1087 } 1019 }
1088 else 1020 else
1089 ht &= tp[i] == ' ' 1021 ht &= l.t[i] == ' '
1090 && RS_SAME (rp[i], base_rend); 1022 && RS_SAME (l.r[i], base_rend);
1091 1023
1092 if (count) 1024 if (count)
1093 x = TermWin.ncol - 1; 1025 x = ncol - 1;
1094 1026
1095 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1096 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1097 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1098 { 1030 {
1099 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1100 1032
1101 if (screen.tlen[row] != -1) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1102 MAX_IT (screen.tlen[row], x); 1034 max_it (l.l, x);
1103 1035
1104 i = screen.cur.col; 1036 i = screen.cur.col;
1105 1037
1106 tp[i] = '\t'; 1038 l.t[i] = '\t';
1107 rp[i] = base_rend; 1039 l.r[i] = base_rend;
1108 1040
1109 while (++i < x) 1041 while (++i < x)
1110 { 1042 {
1111 tp[i] = NOCHAR; 1043 l.t[i] = NOCHAR;
1112 rp[i] = base_rend; 1044 l.r[i] = base_rend;
1113 } 1045 }
1114 } 1046 }
1115 } 1047 }
1116 else /* if (count < 0) */ 1048 else /* if (count < 0) */
1117 { 1049 {
… …
1143rxvt_term::scr_backindex () 1075rxvt_term::scr_backindex ()
1144{ 1076{
1145 if (screen.cur.col > 0) 1077 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1079 else
1148 {
1149 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1150 return; /* um, yeah? */
1151
1152 scr_insdel_chars (1, INSERT); 1080 scr_insdel_chars (1, INSERT);
1153 }
1154} 1081}
1155#endif 1082#endif
1156/* ------------------------------------------------------------------------- */ 1083/* ------------------------------------------------------------------------- */
1157/* 1084/*
1158 * Process DEC Forward Index 1085 * Process DEC Forward Index
… …
1162 */ 1089 */
1163#if ENABLE_FRILLS 1090#if ENABLE_FRILLS
1164void 1091void
1165rxvt_term::scr_forwardindex () 1092rxvt_term::scr_forwardindex ()
1166{ 1093{
1167 int row;
1168
1169 if (screen.cur.col < TermWin.ncol - 1) 1094 if (screen.cur.col < ncol - 1)
1170 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1171 else 1096 else
1172 { 1097 {
1173 row = screen.cur.row + TermWin.saveLines; 1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1174 1099 ROW(screen.cur.row).l = ncol;
1175 if (screen.tlen[row] == 0)
1176 return; /* um, yeah? */
1177 else if (screen.tlen[row] == -1)
1178 screen.tlen[row] = TermWin.ncol;
1179 1100
1180 scr_gotorc (0, 0, R_RELATIVE); 1101 scr_gotorc (0, 0, R_RELATIVE);
1181 scr_insdel_chars (1, DELETE); 1102 scr_insdel_chars (1, DELETE);
1182 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1103 scr_gotorc (0, ncol - 1, R_RELATIVE);
1183 } 1104 }
1184} 1105}
1185#endif 1106#endif
1186 1107
1187/* ------------------------------------------------------------------------- */ 1108/* ------------------------------------------------------------------------- */
… …
1193{ 1114{
1194 want_refresh = 1; 1115 want_refresh = 1;
1195 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1196 1117
1197 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1198 MAX_IT (screen.cur.col, 0); 1119 clamp_it (screen.cur.col, 0, ncol - 1);
1199 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1200 1120
1201 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1202 1122
1203 if (relative & R_RELATIVE) 1123 if (relative & R_RELATIVE)
1204 { 1124 {
… …
1222 else 1142 else
1223 { 1143 {
1224 if (screen.flags & Screen_Relative) 1144 if (screen.flags & Screen_Relative)
1225 { /* relative origin mode */ 1145 { /* relative origin mode */
1226 screen.cur.row = row + screen.tscroll; 1146 screen.cur.row = row + screen.tscroll;
1227 MIN_IT (screen.cur.row, screen.bscroll); 1147 min_it (screen.cur.row, screen.bscroll);
1228 } 1148 }
1229 else 1149 else
1230 screen.cur.row = row; 1150 screen.cur.row = row;
1231 } 1151 }
1232 1152
1233 MAX_IT (screen.cur.row, 0); 1153 clamp_it (screen.cur.row, 0, nrow - 1);
1234 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1235} 1154}
1236 1155
1237/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1238/* 1157/*
1239 * direction should be UP or DN 1158 * direction should be UP or DN
… …
1250 1169
1251 screen.flags &= ~Screen_WrapNext; 1170 screen.flags &= ~Screen_WrapNext;
1252 1171
1253 if ((screen.cur.row == screen.bscroll && direction == UP) 1172 if ((screen.cur.row == screen.bscroll && direction == UP)
1254 || (screen.cur.row == screen.tscroll && direction == DN)) 1173 || (screen.cur.row == screen.tscroll && direction == DN))
1255 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1174 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1256 else 1175 else
1257 screen.cur.row += dirn; 1176 screen.cur.row += dirn;
1258 1177
1259 MAX_IT (screen.cur.row, 0); 1178 clamp_it (screen.cur.row, 0, nrow - 1);
1260 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1261 selection_check (0); 1179 selection_check (0);
1262} 1180}
1263 1181
1264/* ------------------------------------------------------------------------- */ 1182/* ------------------------------------------------------------------------- */
1265/* 1183/*
… …
1269 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1270 */ 1188 */
1271void 1189void
1272rxvt_term::scr_erase_line (int mode) 1190rxvt_term::scr_erase_line (int mode)
1273{ 1191{
1274 unsigned int row, col, num; 1192 unsigned int col, num;
1275 1193
1276 want_refresh = 1; 1194 want_refresh = 1;
1277 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1278 1196
1279 selection_check (1); 1197 selection_check (1);
1280 1198
1281 row = TermWin.saveLines + screen.cur.row; 1199 line_t &line = ROW(screen.cur.row);
1200
1282 switch (mode) 1201 switch (mode)
1283 { 1202 {
1284 case 0: /* erase to end of line */ 1203 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1204 col = screen.cur.col;
1286 num = TermWin.ncol - col; 1205 num = ncol - col;
1287 MIN_IT (screen.tlen[row], (int16_t)col); 1206 min_it (line.l, col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1209 CLEAR_SELECTION ();
1291 break; 1210 break;
1292 case 1: /* erase to beginning of line */ 1211 case 1: /* erase to beginning of line */
… …
1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1215 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1297 CLEAR_SELECTION (); 1216 CLEAR_SELECTION ();
1298 break; 1217 break;
1299 case 2: /* erase whole line */ 1218 case 2: /* erase whole line */
1300 col = 0; 1219 col = 0;
1301 num = TermWin.ncol; 1220 num = ncol;
1302 screen.tlen[row] = 0; 1221 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1222 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1223 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1224 CLEAR_SELECTION ();
1306 break; 1225 break;
1307 default: 1226 default:
1308 return; 1227 return;
1309 } 1228 }
1310 1229
1311 if (screen.text[row]) 1230 scr_blank_line (line, col, num, rstyle);
1312 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1313 else
1314 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1315} 1231}
1316 1232
1317/* ------------------------------------------------------------------------- */ 1233/* ------------------------------------------------------------------------- */
1318/* 1234/*
1319 * Erase part of whole of the screen 1235 * Erase part of whole of the screen
… …
1323 */ 1239 */
1324void 1240void
1325rxvt_term::scr_erase_screen (int mode) 1241rxvt_term::scr_erase_screen (int mode)
1326{ 1242{
1327 int num; 1243 int num;
1328 int32_t row, row_offset; 1244 int32_t row;
1329 rend_t ren; 1245 rend_t ren;
1330 XGCValues gcvalue; 1246 XGCValues gcvalue;
1331 1247
1332 want_refresh = 1; 1248 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)TermWin.saveLines;
1336 1250
1337 switch (mode) 1251 switch (mode)
1338 { 1252 {
1339 case 0: /* erase to end of screen */ 1253 case 0: /* erase to end of screen */
1340 selection_check (1); 1254 selection_check (1);
1341 scr_erase_line (0); 1255 scr_erase_line (0);
1342 row = screen.cur.row + 1; /* possible OOB */ 1256 row = screen.cur.row + 1; /* possible OOB */
1343 num = TermWin.nrow - row; 1257 num = nrow - row;
1344 break; 1258 break;
1345 case 1: /* erase to beginning of screen */ 1259 case 1: /* erase to beginning of screen */
1346 selection_check (3); 1260 selection_check (3);
1347 scr_erase_line (1); 1261 scr_erase_line (1);
1348 row = 0; 1262 row = 0;
1349 num = screen.cur.row; 1263 num = screen.cur.row;
1350 break; 1264 break;
1351 case 2: /* erase whole screen */ 1265 case 2: /* erase whole screen */
1352 selection_check (3); 1266 selection_check (3);
1353 row = 0; 1267 row = 0;
1354 num = TermWin.nrow; 1268 num = nrow;
1355 break; 1269 break;
1356 default: 1270 default:
1357 return; 1271 return;
1358 } 1272 }
1359 1273
… …
1361 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1275 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1362 || (selection.end.row >= row 1276 || (selection.end.row >= row
1363 && selection.end.row <= row + num))) 1277 && selection.end.row <= row + num)))
1364 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1365 1279
1366 if (row >= TermWin.nrow) /* Out Of Bounds */ 1280 if (row >= nrow) /* Out Of Bounds */
1367 return; 1281 return;
1368 1282
1369 MIN_IT (num, (TermWin.nrow - row)); 1283 min_it (num, nrow - row);
1370 1284
1371 if (rstyle & (RS_RVid | RS_Uline)) 1285 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1286 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1287 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1288 {
… …
1376 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1377 } 1291 }
1378 else 1292 else
1379 { 1293 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386 } 1300 }
1387 1301
1388 for (; num--; row++) 1302 for (; num--; row++)
1389 { 1303 {
1390 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1304 ROW (row).l = 0;
1391 screen.tlen[row + row_offset] = 0; 1305 scr_blank_screen_mem (ROW (row), rstyle);
1392 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1307 }
1394} 1308}
1309
1310#if ENABLE_FRILLS
1311void
1312rxvt_term::scr_erase_savelines ()
1313{
1314 want_refresh = 1;
1315 ZERO_SCROLLBACK ();
1316
1317 nsaved = 0;
1318}
1319#endif
1395 1320
1396/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1397/* 1322/*
1398 * Fill the screen with `E's 1323 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1325 */
1401void 1326void
1402rxvt_term::scr_E () 1327rxvt_term::scr_E ()
1403{ 1328{
1404 int i, j, k; 1329 rend_t fs;
1405 rend_t *r1, fs;
1406 1330
1407 want_refresh = 1; 1331 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1409 1333
1410 num_scr_allow = 0; 1334 num_scr_allow = 0;
1411 selection_check (3); 1335 selection_check (3);
1412 1336
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1337 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1338 for (int row = nrow; row--; )
1415 { 1339 {
1416 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1340 line_t &line = ROW(row);
1341
1417 fill_text (screen.text[k], 'E', TermWin.ncol); 1342 fill_text (line.t, 'E', ncol);
1418 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1343 rend_t *r1 = line.r;
1344
1345 for (int j = ncol; j--; )
1419 *r1++ = fs; 1346 *r1++ = fs;
1347
1348 line.l = ncol; /* make the `E's selectable */
1420 } 1349 }
1421} 1350}
1422 1351
1423/* ------------------------------------------------------------------------- */ 1352/* ------------------------------------------------------------------------- */
1424/* 1353/*
… …
1445 count = end; 1374 count = end;
1446 } 1375 }
1447 1376
1448 scr_do_wrap (); 1377 scr_do_wrap ();
1449 1378
1450 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1451} 1380}
1452 1381
1453/* ------------------------------------------------------------------------- */ 1382/* ------------------------------------------------------------------------- */
1454/* 1383/*
1455 * Insert/Delete <count> characters from the current position 1384 * Insert/Delete <count> characters from the current position
… …
1457void 1386void
1458rxvt_term::scr_insdel_chars (int count, int insdel) 1387rxvt_term::scr_insdel_chars (int count, int insdel)
1459{ 1388{
1460 int col, row; 1389 int col, row;
1461 rend_t tr; 1390 rend_t tr;
1462 text_t *stp;
1463 rend_t *srp;
1464 int16_t *slp;
1465 1391
1466 want_refresh = 1; 1392 want_refresh = 1;
1467 ZERO_SCROLLBACK (); 1393 ZERO_SCROLLBACK ();
1468 1394
1469 if (count <= 0) 1395 if (count <= 0)
1470 return; 1396 return;
1471 1397
1472 scr_do_wrap (); 1398 scr_do_wrap ();
1473 1399
1474 selection_check (1); 1400 selection_check (1);
1475 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1401 min_it (count, ncol - screen.cur.col);
1476 1402
1477 row = screen.cur.row + TermWin.saveLines;
1478
1479 stp = screen.text[row];
1480 srp = screen.rend[row]; 1403 row = screen.cur.row;
1481 slp = &screen.tlen[row]; 1404
1405 line_t *line = &ROW(row);
1482 1406
1483 switch (insdel) 1407 switch (insdel)
1484 { 1408 {
1485 case INSERT: 1409 case INSERT:
1486 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1487 { 1411 {
1488 stp[col] = stp[col - count]; 1412 line->t[col] = line->t[col - count];
1489 srp[col] = srp[col - count]; 1413 line->r[col] = line->r[col - count];
1490 } 1414 }
1491 1415
1492 if (*slp != -1) 1416 if (!line->is_longer ())
1493 { 1417 {
1494 *slp += count; 1418 line->l += count;
1495 MIN_IT (*slp, TermWin.ncol); 1419 min_it (line->l, ncol);
1496 } 1420 }
1497 1421
1498 if (selection.op && current_screen == selection.screen 1422 if (selection.op && current_screen == selection.screen
1499 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1500 { 1424 {
1501 if (selection.end.row != screen.cur.row 1425 if (selection.end.row != screen.cur.row
1502 || (selection.end.col + count >= TermWin.ncol)) 1426 || (selection.end.col + count >= ncol))
1503 CLEAR_SELECTION (); 1427 CLEAR_SELECTION ();
1504 else 1428 else
1505 { /* shift selection */ 1429 { /* shift selection */
1506 selection.beg.col += count; 1430 selection.beg.col += count;
1507 selection.mark.col += count; /* XXX: yes? */ 1431 selection.mark.col += count; /* XXX: yes? */
1508 selection.end.col += count; 1432 selection.end.col += count;
1509 } 1433 }
1510 } 1434 }
1511 1435
1512 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1436 scr_blank_line (*line, screen.cur.col, count, rstyle);
1513 (unsigned int)count, rstyle);
1514 break; 1437 break;
1515 1438
1516 case ERASE: 1439 case ERASE:
1517 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1440 screen.cur.col += count; /* don't worry if > ncol */
1518 selection_check (1); 1441 selection_check (1);
1519 screen.cur.col -= count; 1442 screen.cur.col -= count;
1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1443 scr_blank_line (*line, screen.cur.col, count, rstyle);
1521 (unsigned int)count, rstyle);
1522 break; 1444 break;
1523 1445
1524 case DELETE: 1446 case DELETE:
1525 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1526 1448
1527 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1449 for (col = screen.cur.col; (col + count) < ncol; col++)
1528 { 1450 {
1529 stp[col] = stp[col + count]; 1451 line->t[col] = line->t[col + count];
1530 srp[col] = srp[col + count]; 1452 line->r[col] = line->r[col + count];
1531 } 1453 }
1532 1454
1533 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1455 scr_blank_line (*line, ncol - count, count, tr);
1534 (unsigned int)count, tr);
1535 1456
1536 if (*slp == -1) /* break line continuation */ 1457 if (line->is_longer ()) /* break line continuation */
1537 *slp = TermWin.ncol; 1458 line->l = ncol;
1538 1459
1539 *slp -= count; 1460 line->l = max (line->l - count, 0);
1540 MAX_IT (*slp, 0);
1541 1461
1542 if (selection.op && current_screen == selection.screen 1462 if (selection.op && current_screen == selection.screen
1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1544 { 1464 {
1545 if (selection.end.row != screen.cur.row 1465 if (selection.end.row != screen.cur.row
1546 || (screen.cur.col >= selection.beg.col - count) 1466 || (screen.cur.col >= selection.beg.col - count)
1547 || selection.end.col >= TermWin.ncol) 1467 || selection.end.col >= ncol)
1548 CLEAR_SELECTION (); 1468 CLEAR_SELECTION ();
1549 else 1469 else
1550 { 1470 {
1551 /* shift selection */ 1471 /* shift selection */
1552 selection.beg.col -= count; 1472 selection.beg.col -= count;
… …
1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1566 */ 1486 */
1567void 1487void
1568rxvt_term::scr_scroll_region (int top, int bot) 1488rxvt_term::scr_scroll_region (int top, int bot)
1569{ 1489{
1570 MAX_IT (top, 0); 1490 max_it (top, 0);
1571 MIN_IT (bot, (int)TermWin.nrow - 1); 1491 min_it (bot, nrow - 1);
1572 1492
1573 if (top > bot) 1493 if (top > bot)
1574 return; 1494 return;
1575 1495
1576 screen.tscroll = top; 1496 screen.tscroll = top;
… …
1655 */ 1575 */
1656void 1576void
1657rxvt_term::scr_set_tab (int mode) 1577rxvt_term::scr_set_tab (int mode)
1658{ 1578{
1659 if (mode < 0) 1579 if (mode < 0)
1660 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1580 memset (tabs, 0, ncol * sizeof (char));
1661 else if (screen.cur.col < TermWin.ncol) 1581 else if (screen.cur.col < ncol)
1662 tabs[screen.cur.col] = (mode ? 1 : 0); 1582 tabs[screen.cur.col] = (mode ? 1 : 0);
1663} 1583}
1664 1584
1665/* ------------------------------------------------------------------------- */ 1585/* ------------------------------------------------------------------------- */
1666/* 1586/*
… …
1674 XGCValues gcvalue; 1594 XGCValues gcvalue;
1675 1595
1676 if (rvideo != mode) 1596 if (rvideo != mode)
1677 { 1597 {
1678 rvideo = mode; 1598 rvideo = mode;
1679 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1680#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1681 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1682#endif 1602#endif
1683#if TRANSPARENT 1603#if TRANSPARENT
1684 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1685#endif 1605#endif
1686 XSetWindowBackground (display->display, TermWin.vt, 1606 XSetWindowBackground (display->display, vt,
1687 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1688 1608
1689 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
1690 gcvalue.background = pix_colors[Color_bg]; 1610 gcvalue.background = pix_colors[Color_bg];
1691 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1611 XChangeGC (display->display, gc, GCBackground | GCForeground,
1692 &gcvalue); 1612 &gcvalue);
1693 scr_clear (); 1613 scr_clear ();
1694 scr_touch (true); 1614 scr_touch (true);
1695 } 1615 }
1696} 1616}
… …
1777bool 1697bool
1778rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1779{ 1699{
1780 bool found = false; 1700 bool found = false;
1781 1701
1782 for (int i = 0; i < TermWin.nrow; i++) 1702 for (int i = 0; i < nrow; i++)
1783 { 1703 {
1784 int col = 0; 1704 int col = 0;
1785 rend_t *drp = drawn_rend [i]; 1705 rend_t *drp = drawn_buf[i].r;
1786 1706
1787 for (; col < TermWin.ncol; col++, drp++) 1707 for (; col < ncol; col++, drp++)
1788 if ((*drp & mask) == value) 1708 if ((*drp & mask) == value)
1789 { 1709 {
1790 found = true; 1710 found = true;
1791 *drp = ~value; 1711 *drp = ~value;
1792 } 1712 }
… …
1803 PART_END, 1723 PART_END,
1804 RC_COUNT 1724 RC_COUNT
1805}; 1725};
1806 1726
1807void 1727void
1808rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1809{ 1729{
1810 int i; 1730 int i;
1811 row_col_t rc[RC_COUNT]; 1731 row_col_t rc[RC_COUNT];
1812 1732
1813 if (drawn_text == NULL) /* sanity check */ 1733 if (!drawn_buf) /* sanity check */
1814 return; 1734 return;
1815 1735
1816#ifndef NO_SLOW_LINK_SUPPORT 1736#ifndef NO_SLOW_LINK_SUPPORT
1817 if (refresh_type == FAST_REFRESH && !display->is_local) 1737 if (refresh_type == FAST_REFRESH && !display->is_local)
1818 { 1738 {
1819 y = 0; 1739 y = 0;
1820 height = TermWin.height; 1740 eheight = height;
1821 } 1741 }
1822#endif
1823
1824#ifdef DEBUG_STRICT
1825 x = max (x, 0);
1826 x = min (x, (int)TermWin.width);
1827 y = max (y, 0);
1828 y = min (y, (int)TermWin.height);
1829#endif 1742#endif
1830 1743
1831 /* round down */ 1744 /* round down */
1832 rc[PART_BEG].col = Pixel2Col (x); 1745 rc[PART_BEG].col = Pixel2Col (x);
1833 rc[PART_BEG].row = Pixel2Row (y); 1746 rc[PART_BEG].row = Pixel2Row (y);
1834 /* round up */ 1747 /* round up */
1835 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1748 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1836 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1749 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1837 1750
1838 /* sanity checks */ 1751 /* sanity checks */
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1752 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1753 {
1841 MIN_IT (rc[i].col, TermWin.ncol - 1); 1754 min_it (rc[i].col, ncol - 1);
1842 MIN_IT (rc[i].row, TermWin.nrow - 1); 1755 min_it (rc[i].row, nrow - 1);
1843 } 1756 }
1844 1757
1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1846 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1847 1760
1848 if (refresh) 1761 if (refresh)
1849 scr_refresh (SLOW_REFRESH); 1762 scr_refresh (SLOW_REFRESH);
1850} 1763}
1851 1764
… …
1854 * Refresh the entire screen 1767 * Refresh the entire screen
1855 */ 1768 */
1856void 1769void
1857rxvt_term::scr_touch (bool refresh) 1770rxvt_term::scr_touch (bool refresh)
1858{ 1771{
1859 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1772 scr_expose (0, 0, width, height, refresh);
1860} 1773}
1861 1774
1862/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1863/* 1776/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1777 * Move the display so that the line represented by scrollbar value Y is at
… …
1868rxvt_term::scr_move_to (int y, int len) 1781rxvt_term::scr_move_to (int y, int len)
1869{ 1782{
1870 long p = 0; 1783 long p = 0;
1871 unsigned int oldviewstart; 1784 unsigned int oldviewstart;
1872 1785
1873 oldviewstart = TermWin.view_start; 1786 oldviewstart = view_start;
1874 1787
1875 if (y < len) 1788 if (y < len)
1876 { 1789 {
1877 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1790 p = (nrow + nsaved) * (len - y) / len;
1878 p -= (long) (TermWin.nrow - 1); 1791 p -= (long) (nrow - 1);
1879 p = max (p, 0); 1792 p = max (p, 0);
1880 } 1793 }
1881 1794
1882 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1795 view_start = (unsigned int)min (p, nsaved);
1883 1796
1884 return scr_changeview (oldviewstart); 1797 return scr_changeview (oldviewstart);
1885} 1798}
1886 1799
1887/* ------------------------------------------------------------------------- */ 1800/* ------------------------------------------------------------------------- */
… …
1893rxvt_term::scr_page (enum page_dirn direction, int nlines) 1806rxvt_term::scr_page (enum page_dirn direction, int nlines)
1894{ 1807{
1895 int n; 1808 int n;
1896 unsigned int oldviewstart; 1809 unsigned int oldviewstart;
1897 1810
1898#ifdef DEBUG_STRICT
1899 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1900#endif
1901 oldviewstart = TermWin.view_start; 1811 oldviewstart = view_start;
1812
1902 if (direction == UP) 1813 if (direction == UP)
1903 { 1814 {
1904 n = TermWin.view_start + nlines; 1815 n = view_start + nlines;
1905 TermWin.view_start = min (n, TermWin.nscrolled); 1816 view_start = min (n, nsaved);
1906 } 1817 }
1907 else 1818 else
1908 { 1819 {
1909 n = TermWin.view_start - nlines; 1820 n = view_start - nlines;
1910 TermWin.view_start = max (n, 0); 1821 view_start = max (n, 0);
1911 } 1822 }
1823
1912 return scr_changeview (oldviewstart); 1824 return scr_changeview (oldviewstart);
1913} 1825}
1914 1826
1915int 1827int
1916rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1917{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1918 if (TermWin.view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1919 { 1833 {
1920 want_refresh = 1; 1834 want_refresh = 1;
1921 num_scr -= (TermWin.view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1922 } 1836 }
1923 1837
1924 return (int) (TermWin.view_start - oldviewstart); 1838 return (int) (view_start - oldviewstart);
1925} 1839}
1926 1840
1927/* ------------------------------------------------------------------------- */ 1841/* ------------------------------------------------------------------------- */
1928void 1842void
1929rxvt_term::scr_bell () 1843rxvt_term::scr_bell ()
1930{ 1844{
1931#ifndef NO_BELL 1845#ifndef NO_BELL
1846
1932# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1933# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1934 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1935# endif 1850# endif
1936 XMapWindow (display->display, TermWin.parent[0]); 1851 XMapWindow (display->display, parent[0]);
1937# endif 1852# endif
1938 if (options & Opt_visualBell) 1853
1854 if (OPTION (Opt_visualBell))
1939 { 1855 {
1940 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1857 rxvt_usleep (VISUAL_BELL_DURATION);
1941 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1942 } 1859 }
1943 else 1860 else
1944 XBell (display->display, 0); 1861 XBell (display->display, 0);
1862
1945#endif 1863#endif
1946} 1864}
1947 1865
1948/* ------------------------------------------------------------------------- */ 1866/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */ 1867/* ARGSUSED */
1950void 1868void
1951rxvt_term::scr_printscreen (int fullhist) 1869rxvt_term::scr_printscreen (int fullhist)
1952{ 1870{
1953#ifdef PRINTPIPE 1871#ifdef PRINTPIPE
1954 int i, r1, nrows, row_offset; 1872 int nrows, row_start;
1955 FILE *fd; 1873 FILE *fd;
1956 1874
1957 if ((fd = popen_printer ()) == NULL) 1875 if ((fd = popen_printer ()) == NULL)
1958 return; 1876 return;
1959 1877
1960 nrows = TermWin.nrow;
1961 row_offset = TermWin.saveLines;
1962
1963 if (!fullhist) 1878 if (fullhist)
1964 row_offset -= TermWin.view_start; 1879 {
1880 nrows = nrow + nsaved;
1881 row_start = -nsaved;
1882 }
1965 else 1883 else
1966 { 1884 {
1967 nrows += TermWin.nscrolled; 1885 nrows = nrow;
1968 row_offset -= TermWin.nscrolled; 1886 row_start = -view_start;
1969 } 1887 }
1970 1888
1971 wctomb (0, 0); 1889 wctomb (0, 0);
1972 1890
1973 for (r1 = 0; r1 < nrows; r1++) 1891 for (int r1 = 0; r1 < nrows; r1++)
1974 { 1892 {
1975 text_t *tp = screen.text[r1 + row_offset]; 1893 text_t *tp = ROW(r1).t;
1976 int len = screen.tlen[r1 + row_offset]; 1894 int len = ROW(r1).l;
1977 1895
1978 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1896 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1979 { 1897 {
1980 char mb[MB_LEN_MAX]; 1898 char mb[MB_LEN_MAX];
1981 text_t t = *tp++; 1899 text_t t = *tp++;
1982 if (t == NOCHAR) 1900 if (t == NOCHAR)
1983 continue; 1901 continue;
… …
2004/* 1922/*
2005 * Refresh the screen 1923 * Refresh the screen
2006 * drawn_text/drawn_rend contain the screen information before the update. 1924 * drawn_text/drawn_rend contain the screen information before the update.
2007 * screen.text/screen.rend contain what the screen will change to. 1925 * screen.text/screen.rend contain what the screen will change to.
2008 */ 1926 */
2009
2010#define FONT_WIDTH(X, Y) \
2011 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2012#define FONT_RBEAR(X, Y) \
2013 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2014#define FONT_LBEAR(X, Y) \
2015 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2016#define IS_FONT_CHAR(X, Y) \
2017 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2018
2019void 1927void
2020rxvt_term::scr_refresh (unsigned char refresh_type) 1928rxvt_term::scr_refresh (unsigned char refresh_type)
2021{ 1929{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1930 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 1931 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1932 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1933 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1934 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1935#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1936 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1937#endif
2031 rend_t *crp; // cursor rendition pointer 1938 rend_t *crp; // cursor rendition pointer
2032 1939
2033 want_refresh = 0; /* screen is current */ 1940 want_refresh = 0; /* screen is current */
2034 1941
2035 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1942 if (refresh_type == NO_REFRESH || !mapped)
2036 return; 1943 return;
2037 1944
2038 /* 1945 /*
2039 * A: set up vars 1946 * A: set up vars
2040 */ 1947 */
2041 must_clear = 0; 1948 must_clear = 0;
2042 refresh_count = 0; 1949 refresh_count = 0;
2043 1950
2044 row_offset = TermWin.saveLines - TermWin.view_start;
2045
2046#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
2047 must_clear |= (bgPixmap.pixmap != None); 1952 must_clear |= bgPixmap.pixmap != None;
2048#endif 1953#endif
2049#if TRANSPARENT 1954#if TRANSPARENT
2050 must_clear |= ((options & Opt_transparent) && am_transparent); 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
2051#endif 1956#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 1958
2054 /* 1959 /*
2055 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
… …
2072 1977
2073 if (showcursor) 1978 if (showcursor)
2074 { 1979 {
2075 int col = screen.cur.col; 1980 int col = screen.cur.col;
2076 1981
2077 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 1982 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 1983 col--;
2079 1984
2080 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 1985 crp = &ROW(screen.cur.row).r[col];
2081 1986
2082 if (showcursor && TermWin.focus) 1987 if (showcursor && focus)
2083 { 1988 {
1989 if (OPTION (Opt_cursorUnderline))
1990 *crp ^= RS_Uline;
1991 else
1992 {
2084 *crp ^= RS_RVid; 1993 *crp ^= RS_RVid;
1994
2085#ifndef NO_CURSORCOLOR 1995#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask); 1996 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 1997 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 1998 ccol1 = Color_cursor;
2089 else 1999 else
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol1 = GET_FGCOLOR (rstyle); 2001 ccol1 = fgcolor_of (rstyle);
2092#else 2002#else
2093 ccol1 = Color_fg; 2003 ccol1 = Color_fg;
2094#endif 2004#endif
2095 if (ISSET_PIXCOLOR (Color_cursor2)) 2005 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2; 2006 ccol2 = Color_cursor2;
2097 else 2007 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol2 = GET_BGCOLOR (rstyle); 2009 ccol2 = bgcolor_of (rstyle);
2100#else 2010#else
2101 ccol2 = Color_bg; 2011 ccol2 = Color_bg;
2102#endif 2012#endif
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2013 *crp = SET_FGCOLOR (*crp, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2014 *crp = SET_BGCOLOR (*crp, ccol2);
2105#endif 2015#endif
2016 }
2106 } 2017 }
2107 } 2018 }
2108 2019
2109 /* make sure no outline cursor is left around */ 2020 /* make sure no outline cursor is left around */
2110 setoldcursor = 0; 2021 setoldcursor = 0;
2111 if (ocrow != -1) 2022 if (ocrow != -1)
2112 { 2023 {
2113 if (screen.cur.row + TermWin.view_start != ocrow 2024 if (screen.cur.row + view_start != ocrow
2114 || screen.cur.col != oldcursor.col) 2025 || screen.cur.col != oldcursor.col)
2115 { 2026 {
2116 if (ocrow < TermWin.nrow 2027 if (ocrow < nrow
2117 && oldcursor.col < TermWin.ncol) 2028 && oldcursor.col < ncol)
2118 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2119 2030
2120 if (TermWin.focus || !showcursor) 2031 if (focus || !showcursor)
2121 oldcursor.row = -1; 2032 oldcursor.row = -1;
2122 else 2033 else
2123 setoldcursor = 1; 2034 setoldcursor = 1;
2124 } 2035 }
2125 } 2036 }
2126 else if (!TermWin.focus) 2037 else if (!focus)
2127 setoldcursor = 1; 2038 setoldcursor = 1;
2128 2039
2129 if (setoldcursor) 2040 if (setoldcursor)
2130 { 2041 {
2131 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2042 if (screen.cur.row + view_start >= nrow)
2132 oldcursor.row = -1; 2043 oldcursor.row = -1;
2133 else 2044 else
2134 { 2045 {
2135 oldcursor.row = screen.cur.row + TermWin.view_start; 2046 oldcursor.row = screen.cur.row + view_start;
2136 oldcursor.col = screen.cur.col; 2047 oldcursor.col = screen.cur.col;
2137 } 2048 }
2138 } 2049 }
2139 } 2050 }
2140 2051
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2141#if ENABLE_OVERLAY 2053#if ENABLE_OVERLAY
2142 scr_swap_overlay (); 2054 scr_swap_overlay ();
2143#endif 2055#endif
2144
2145 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2146 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2147 2056
2148#ifndef NO_SLOW_LINK_SUPPORT 2057#ifndef NO_SLOW_LINK_SUPPORT
2149 /* 2058 /*
2150 * D: CopyArea pass - very useful for slower links 2059 * D: CopyArea pass - very useful for slower links
2151 * This has been deliberately kept simple. 2060 * This has been deliberately kept simple.
2152 */ 2061 */
2153 i = num_scr; 2062 i = num_scr;
2154 if (!display->is_local 2063 if (!display->is_local
2155 && refresh_type == FAST_REFRESH && num_scr_allow && i 2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2156 && abs (i) < TermWin.nrow && !must_clear) 2065 && abs (num_scr) < nrow && !must_clear)
2157 { 2066 {
2158 int16_t nits; 2067 int16_t nits;
2159 int j; 2068 int j;
2160 int len, wlen; 2069 int len, wlen;
2161 2070
2162 j = TermWin.nrow; 2071 j = nrow;
2163 wlen = len = -1; 2072 wlen = len = -1;
2164 row = i > 0 ? 0 : j - 1; 2073 row = i > 0 ? 0 : j - 1;
2165 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2166 { 2075 {
2167 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2168 { 2077 {
2169 text_t *stp = screen.text[row + row_offset]; 2078 line_t s = ROW(row - view_start);
2170 rend_t *srp = screen.rend[row + row_offset];
2171 text_t *dtp = drawn_text[row]; 2079 line_t d = drawn_buf[row];
2172 text_t *dtp2 = drawn_text[row + i]; 2080 line_t d2 = drawn_buf[row + i];
2173 rend_t *drp = drawn_rend[row];
2174 rend_t *drp2 = drawn_rend[row + i];
2175 2081
2176 for (nits = 0, col = TermWin.ncol; col--; ) 2082 for (nits = 0, col = ncol; col--; )
2177 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2084 nits--;
2179 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2085 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2180 nits++; 2086 nits++;
2181 2087
2182 if (nits > 8) /* XXX: arbitrary choice */ 2088 if (nits > 8) /* XXX: arbitrary choice */
2183 { 2089 {
2184 for (col = TermWin.ncol; col--; ) 2090 for (col = ncol; col--; )
2185 { 2091 {
2186 *dtp++ = *dtp2++; 2092 *d.t++ = *d2.t++;
2187 *drp++ = *drp2++; 2093 *d.r++ = *d2.r++;
2188 } 2094 }
2189 2095
2190 if (len == -1) 2096 if (len == -1)
2191 len = row; 2097 len = row;
2192 2098
… …
2197 2103
2198 if (len != -1) 2104 if (len != -1)
2199 { 2105 {
2200 /* also comes here at end if needed because of >= above */ 2106 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2107 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2108 ::swap (wlen, len);
2203 2109
2204 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2110 XCopyArea (display->display, vt, vt,
2205 TermWin.gc, 0, Row2Pixel (len + i), 2111 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2112 (unsigned int)TermWin_TotalWidth (),
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2113 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2114 0, Row2Pixel (len));
2209 len = -1; 2115 len = -1;
2210 } 2116 }
… …
2213#endif 2119#endif
2214 2120
2215 /* 2121 /*
2216 * E: main pass across every character 2122 * E: main pass across every character
2217 */ 2123 */
2218 for (row = 0; row < TermWin.nrow; row++) 2124 for (row = 0; row < nrow; row++)
2219 { 2125 {
2220 text_t *stp = screen.text[row + row_offset]; 2126 text_t *stp = ROW(row - view_start).t;
2221 rend_t *srp = screen.rend[row + row_offset]; 2127 rend_t *srp = ROW(row - view_start).r;
2222 text_t *dtp = drawn_text[row]; 2128 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn_rend[row]; 2129 rend_t *drp = drawn_buf[row].r;
2224 2130
2225 /* 2131 /*
2226 * E2: OK, now the real pass 2132 * E2: OK, now the real pass
2227 */ 2133 */
2228 int ypixel = (int)Row2Pixel (row); 2134 int ypixel = (int)Row2Pixel (row);
2229 2135
2230 for (col = 0; col < TermWin.ncol; col++) 2136 for (col = 0; col < ncol; col++)
2231 { 2137 {
2232 /* compare new text with old - if exactly the same then continue */ 2138 /* compare new text with old - if exactly the same then continue */
2233 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2139 if (stp[col] == dtp[col] /* Must match characters to skip. */
2234 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2140 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2235 || (stp[col] == ' ' /* space w/ no background change */ 2141 || (stp[col] == ' ' /* space w/ no background change */
… …
2249 dtp[col] = stp[col]; 2155 dtp[col] = stp[col];
2250 drp[col] = rend; 2156 drp[col] = rend;
2251 2157
2252 int xpixel = Col2Pixel (col); 2158 int xpixel = Col2Pixel (col);
2253 2159
2254 for (i = 0; ++col < TermWin.ncol; ) 2160 for (i = 0; ++col < ncol; )
2255 { 2161 {
2256 if (stp[col] == NOCHAR) 2162 if (stp[col] == NOCHAR)
2257 { 2163 {
2258 dtp[col] = stp[col]; 2164 dtp[col] = stp[col];
2259 drp[col] = rend; 2165 drp[col] = rend;
… …
2287 2193
2288 // sometimes we optimize away the trailing NOCHAR's, add them back 2194 // sometimes we optimize away the trailing NOCHAR's, add them back
2289 while (i && text[count] == NOCHAR) 2195 while (i && text[count] == NOCHAR)
2290 count++, i--; 2196 count++, i--;
2291 2197
2292#if ENABLE_STYLES
2293 // force redraw after "careful" characters to avoid pixel droppings
2294 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2295 drp[col + 1] = ~srp[col + 1];
2296
2297 // include previous careful character(s) if possible, looks nicer (best effort...)
2298 while (text > stp
2299 && srp[text - stp - 1] & RS_Careful
2300 && RS_SAME (rend, srp[text - stp - 1]))
2301 text--, count++, xpixel -= TermWin.fwidth;
2302#endif
2303
2304 /* 2198 /*
2305 * Determine the attributes for the string 2199 * Determine the attributes for the string
2306 */ 2200 */
2307 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2308 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2309 2203
2310 // only do special processing if ana attributes are set, which is rare 2204 // only do special processing if any attributes are set, which is unlikely
2311 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2312 { 2206 {
2207#if ENABLE_STYLES
2208 // force redraw after "careful" characters to avoid pixel droppings
2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2210 drp[col + 1] = ~srp[col + 1];
2211
2212 // include previous careful character(s) if possible, looks nicer (best effort...)
2213 while (text > stp
2214 && srp[text - stp - 1] & RS_Careful
2215 && RS_SAME (rend, srp[text - stp - 1]))
2216 text--, count++, xpixel -= fwidth;
2217#endif
2218
2313 bool invert = rend & RS_RVid; 2219 bool invert = rend & RS_RVid;
2314 2220
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2221#ifndef NO_BOLD_UNDERLINE_REVERSE
2316 if (rend & RS_Bold 2222 if (rend & RS_Bold
2317 && fore == Color_fg) 2223 && fore == Color_fg)
… …
2339 fore = Color_UL; 2245 fore = Color_UL;
2340#endif 2246#endif
2341 2247
2342 if (invert) 2248 if (invert)
2343 { 2249 {
2344 SWAP_IT (fore, back, int); 2250 ::swap (fore, back);
2345 2251
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2252#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV)) 2253 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2254 back = Color_RV;
2255
2256 if (fore == back)
2257 {
2258 fore = Color_bg;
2259 back = Color_fg;
2260 }
2349#endif 2261#endif
2350 } 2262 }
2351 2263
2352#ifdef TEXT_BLINK 2264#ifdef TEXT_BLINK
2353 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2265 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2364 } 2276 }
2365 2277
2366 /* 2278 /*
2367 * Actually do the drawing of the string here 2279 * Actually do the drawing of the string here
2368 */ 2280 */
2369 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2281 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2370 2282
2371 if (back == fore) 2283 if (back == fore)
2372 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2284 font->clear_rect (*drawable, xpixel, ypixel,
2373 TermWin.fwidth * count, TermWin.fheight, 2285 fwidth * count, fheight,
2374 back); 2286 back);
2375 else if (back == Color_bg) 2287 else if (back == Color_bg)
2376 { 2288 {
2377 if (must_clear) 2289 if (must_clear)
2378 { 2290 {
2379 CLEAR_CHARS (xpixel, ypixel, count); 2291 CLEAR_CHARS (xpixel, ypixel, count);
2380 2292
2381 for (i = 0; i < count; i++) /* don't draw empty strings */ 2293 for (i = 0; i < count; i++) /* don't draw empty strings */
2382 if (text[i] != ' ') 2294 if (text[i] != ' ')
2383 { 2295 {
2384 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2296 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2385 break; 2297 break;
2386 } 2298 }
2387 } 2299 }
2388 else 2300 else
2389 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2301 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2390 } 2302 }
2391 else 2303 else
2392 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2393 2305
2394 if (rend & RS_Uline && font->descent > 1 && fore != back) 2306 if (rend & RS_Uline && font->descent > 1 && fore != back)
2395 { 2307 {
2396#if ENABLE_FRILLS 2308#if ENABLE_FRILLS
2397 if (ISSET_PIXCOLOR (Color_underline)) 2309 if (ISSET_PIXCOLOR (Color_underline))
2398 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2310 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2399 else 2311 else
2400#endif 2312#endif
2401 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2313 XSetForeground (display->display, gc, pix_colors[fore]);
2402 2314
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2315 XDrawLine (display->display, drawBuffer, gc,
2404 xpixel, ypixel + font->ascent + 1, 2316 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2317 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2318 }
2407 } /* for (col....) */ 2319 } /* for (col....) */
2408 } /* for (row....) */ 2320 } /* for (row....) */
2409 2321
2410#if ENABLE_OVERLAY 2322#if ENABLE_OVERLAY
2411 scr_swap_overlay (); 2323 scr_swap_overlay ();
2412#endif 2324#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2413 2326
2414 /* 2327 /*
2415 * G: cleanup cursor and display outline cursor if necessary 2328 * G: cleanup cursor and display outline cursor if necessary
2416 */ 2329 */
2417 if (showcursor) 2330 if (showcursor)
2418 { 2331 {
2419 if (TermWin.focus) 2332 if (focus)
2333 {
2334 if (OPTION (Opt_cursorUnderline))
2335 *crp ^= RS_Uline;
2336 else
2420 { 2337 {
2421 *crp ^= RS_RVid; 2338 *crp ^= RS_RVid;
2422#ifndef NO_CURSORCOLOR 2339#ifndef NO_CURSORCOLOR
2423 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2340 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2424#endif 2341#endif
2342 }
2425 } 2343 }
2426 else if (oldcursor.row >= 0) 2344 else if (oldcursor.row >= 0)
2427 { 2345 {
2346 int cursorwidth = 1;
2347 int col = oldcursor.col;
2348
2349 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2350 col--;
2351
2352 while (col + cursorwidth < ncol
2353 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2354 cursorwidth++;
2355
2428#ifndef NO_CURSORCOLOR 2356#ifndef NO_CURSORCOLOR
2429 if (ISSET_PIXCOLOR (Color_cursor)) 2357 if (ISSET_PIXCOLOR (Color_cursor))
2430 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2358 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2431#endif 2359#endif
2432 int cursorwidth = 1;
2433 while (oldcursor.col + cursorwidth < TermWin.ncol
2434 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2435 cursorwidth++;
2436 2360
2437 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2361 XDrawRectangle (display->display, drawBuffer, gc,
2438 Col2Pixel (oldcursor.col), 2362 Col2Pixel (col),
2439 Row2Pixel (oldcursor.row), 2363 Row2Pixel (oldcursor.row),
2440 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2364 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2441 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2365 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2442 } 2366 }
2443 } 2367 }
2444 2368
2445 /* 2369 /*
2446 * H: cleanup selection 2370 * H: cleanup selection
… …
2453 num_scr = 0; 2377 num_scr = 0;
2454 num_scr_allow = 1; 2378 num_scr_allow = 1;
2455} 2379}
2456 2380
2457void 2381void
2458rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2382rxvt_term::scr_remap_chars (const line_t &l)
2459{ 2383{
2460 if (!rp || !tp) 2384 if (!l.t)
2461 return; 2385 return;
2462 2386
2463 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2387 for (int i = ncol; i--; )
2464 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2465} 2389}
2466 2390
2467void 2391void
2468rxvt_term::scr_remap_chars () 2392rxvt_term::scr_remap_chars ()
2469{ 2393{
2470 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2394 for (int i = total_rows; i--; )
2471 scr_remap_chars (screen.text[i], screen.rend[i]); 2395 scr_remap_chars (row_buf [i]);
2472 2396
2473 for (int i = TermWin.nrow; i--; ) 2397 for (int i = nrow; i--; )
2474 { 2398 {
2475 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2399 scr_remap_chars (drawn_buf [i]);
2476 scr_remap_chars (swap.text[i], swap.rend[i]); 2400 scr_remap_chars (swap_buf [i]);
2477 } 2401 }
2478} 2402}
2479 2403
2480void 2404void
2481rxvt_term::scr_recolour () 2405rxvt_term::scr_recolour ()
… …
2487#if XPM_BACKGROUND 2411#if XPM_BACKGROUND
2488 && !bgPixmap.pixmap 2412 && !bgPixmap.pixmap
2489#endif 2413#endif
2490 ) 2414 )
2491 { 2415 {
2492 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2416 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2493 XClearWindow (display->display, TermWin.parent[0]); 2417 XClearWindow (display->display, parent[0]);
2494 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2418 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2495#if HAVE_SCROLLBARS 2419#if HAVE_SCROLLBARS
2496 if (scrollBar.win) 2420 if (scrollBar.win)
2497 { 2421 {
2498 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2422 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2499 scrollBar.setIdle (); 2423 scrollBar.setIdle ();
… …
2509 2433
2510/* ------------------------------------------------------------------------- */ 2434/* ------------------------------------------------------------------------- */
2511void 2435void
2512rxvt_term::scr_clear (bool really) 2436rxvt_term::scr_clear (bool really)
2513{ 2437{
2514 if (!TermWin.mapped) 2438 if (!mapped)
2515 return; 2439 return;
2516 2440
2517 num_scr_allow = 0; 2441 num_scr_allow = 0;
2518 want_refresh = 1; 2442 want_refresh = 1;
2519 2443
2520#if TRANSPARENT
2521 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2522 {
2523 int i;
2524
2525 if (!(options & Opt_transparent_all))
2526 i = 0;
2527 else
2528 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2529
2530 while (i--)
2531 if (TermWin.parent[i] != None)
2532 XClearWindow (display->display, TermWin.parent[i]);
2533 }
2534#endif
2535
2536 if (really) 2444 if (really)
2537 XClearWindow (display->display, TermWin.vt); 2445 XClearWindow (display->display, vt);
2538} 2446}
2539 2447
2540/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2541void 2449void
2542rxvt_term::scr_reverse_selection () 2450rxvt_term::scr_reverse_selection ()
2543{ 2451{
2452 if (selection.op
2544 if (selection.op && current_screen == selection.screen) 2453 && current_screen == selection.screen
2454 && selection.end.row >= -view_start)
2545 { 2455 {
2546 int end_row = TermWin.saveLines - TermWin.view_start; 2456 int view_end = -view_start + nrow;
2547 int i = selection.beg.row + TermWin.saveLines; 2457 int row, col;
2548 int col, row = selection.end.row + TermWin.saveLines;
2549 rend_t *srp;
2550 2458
2551#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2552 if (selection.rect) 2460 if (selection.rect)
2553 { 2461 {
2554 end_row += TermWin.nrow; 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2555 2466
2556 for (; i <= row && i <= end_row; i++)
2557 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2558 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2559 } 2476 }
2560 else 2477 else
2561#endif 2478#endif
2562 { 2479 {
2563 if (i >= end_row) 2480 if (selection.beg.row >= -view_start)
2481 {
2564 col = selection.beg.col; 2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2565 else 2485 else
2566 { 2486 {
2567 col = 0; 2487 col = 0;
2568 i = end_row; 2488 row = -view_start;
2569 } 2489 }
2570 2490
2571 end_row += TermWin.nrow; 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2572 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2573 for (; i < row && i < end_row; i++, col = 0)
2574 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2575 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
2576 2494
2577 if (i == row && i < end_row) 2495 if (row == selection.end.row)
2578 for (srp = screen.rend[i]; col < selection.end.col; col++) 2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2579 srp[col] ^= RS_RVid; 2497 srp[col] ^= RS_RVid;
2580 } 2498 }
2581 } 2499 }
2582} 2500}
2583 2501
… …
2592{ 2510{
2593 int row, wrote; 2511 int row, wrote;
2594 unsigned int width, towrite; 2512 unsigned int width, towrite;
2595 char r1[] = "\n"; 2513 char r1[] = "\n";
2596 2514
2597 for (row = TermWin.saveLines - TermWin.nscrolled; 2515 for (row = saveLines - nsaved;
2598 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2516 row < saveLines + nrow - 1; row++)
2599 { 2517 {
2600 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2601 : TermWin.ncol; 2519 : ncol;
2602 for (towrite = width; towrite; towrite -= wrote) 2520 for (towrite = width; towrite; towrite -= wrote)
2603 { 2521 {
2604 wrote = write (fd, & (screen.text[row][width - towrite]), 2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2605 towrite); 2523 towrite);
2606 if (wrote < 0) 2524 if (wrote < 0)
2607 return; /* XXX: death, no report */ 2525 return; /* XXX: death, no report */
2608 } 2526 }
2609 if (screen.tlen[row] >= 0) 2527 if (row_buf[row].l >= 0)
2610 if (write (fd, r1, 1) <= 0) 2528 if (write (fd, r1, 1) <= 0)
2611 return; /* XXX: death, no report */ 2529 return; /* XXX: death, no report */
2612 } 2530 }
2613} 2531}
2614#endif 2532#endif
2615 2533
2616/* ------------------------------------------------------------------------- * 2534/* ------------------------------------------------------------------------- *
2617 * CHARACTER SELECTION * 2535 * CHARACTER SELECTION *
2618 * ------------------------------------------------------------------------- */ 2536 * ------------------------------------------------------------------------- */
2619
2620/*
2621 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2622 */
2623void 2537void
2624rxvt_term::selection_check (int check_more) 2538rxvt_term::selection_check (int check_more)
2625{ 2539{
2626 row_col_t pos; 2540 row_col_t pos;
2627 2541
2628 if (!selection.op) 2542 if (!selection.op)
2629 return; 2543 return;
2630 2544
2631 pos.row = pos.col = 0; 2545 pos.row = pos.col = 0;
2632 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2633 || (selection.beg.row >= TermWin.nrow) 2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2634 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2635 || (selection.mark.row >= TermWin.nrow)
2636 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2637 || (selection.end.row >= TermWin.nrow)
2638 || (check_more == 1 2549 || (check_more == 1
2639 && current_screen == selection.screen 2550 && current_screen == selection.screen
2640 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2641 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2642 || (check_more == 2 2553 || (check_more == 2
… …
2644 && ROWCOL_IS_AFTER (selection.end, pos)) 2555 && ROWCOL_IS_AFTER (selection.end, pos))
2645 || (check_more == 3 2556 || (check_more == 3
2646 && ROWCOL_IS_AFTER (selection.end, pos)) 2557 && ROWCOL_IS_AFTER (selection.end, pos))
2647 || (check_more == 4 /* screen width change */ 2558 || (check_more == 4 /* screen width change */
2648 && (selection.beg.row != selection.end.row 2559 && (selection.beg.row != selection.end.row
2649 || selection.end.col > TermWin.ncol))) 2560 || selection.end.col > ncol)))
2650 CLEAR_SELECTION (); 2561 CLEAR_SELECTION ();
2651} 2562}
2652 2563
2653/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2654/* 2565/*
… …
2863 * EXT: button 2 release 2774 * EXT: button 2 release
2864 */ 2775 */
2865void 2776void
2866rxvt_term::selection_request (Time tm, int x, int y) 2777rxvt_term::selection_request (Time tm, int x, int y)
2867{ 2778{
2868 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2779 if (x < 0 || x >= width || y < 0 || y >= height)
2869 return; /* outside window */ 2780 return; /* outside window */
2870 2781
2871 if (selection.text) 2782 if (selection.text)
2872 { /* internal selection */ 2783 { /* internal selection */
2873 char *str = rxvt_wcstombs (selection.text, selection.len); 2784 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2902 2813
2903int 2814int
2904rxvt_term::selection_request_other (Atom target, int selnum) 2815rxvt_term::selection_request_other (Atom target, int selnum)
2905{ 2816{
2906 Atom sel; 2817 Atom sel;
2907#ifdef DEBUG_SELECT
2908 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2909#endif
2910 2818
2911 selection_type |= selnum; 2819 selection_type |= selnum;
2912 2820
2913 if (selnum == Sel_Primary) 2821 if (selnum == Sel_Primary)
2914 sel = XA_PRIMARY; 2822 sel = XA_PRIMARY;
… …
2918 sel = xa[XA_CLIPBOARD]; 2826 sel = xa[XA_CLIPBOARD];
2919 2827
2920 if (XGetSelectionOwner (display->display, sel) != None) 2828 if (XGetSelectionOwner (display->display, sel) != None)
2921 { 2829 {
2922 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2830 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2923 TermWin.vt, selection_request_time); 2831 vt, selection_request_time);
2924 return 1; 2832 return 1;
2925 } 2833 }
2926 2834
2927 return 0; 2835 return 0;
2928} 2836}
… …
2951 * EXT: button 1 or 3 release 2859 * EXT: button 1 or 3 release
2952 */ 2860 */
2953void 2861void
2954rxvt_term::selection_make (Time tm) 2862rxvt_term::selection_make (Time tm)
2955{ 2863{
2956 int i, col, end_col, row, end_row; 2864 int i;
2957 wchar_t *new_selection_text; 2865 wchar_t *new_selection_text;
2958 text_t *t; 2866 text_t *t;
2959 2867
2960 switch (selection.op) 2868 switch (selection.op)
2961 { 2869 {
… …
2974 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2975 2883
2976 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2977 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2978 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2979 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2980 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2981 2892
2982 col = selection.beg.col;
2983 row = selection.beg.row + TermWin.saveLines;
2984 end_row = selection.end.row + TermWin.saveLines;
2985 int ofs = 0; 2893 int ofs = 0;
2986 int extra = 0; 2894 int extra = 0;
2987 2895
2896 int col = selection.beg.col;
2897 int row = selection.beg.row;
2898
2899 int end_col;
2900
2988 for (; row <= end_row; row++, col = 0) 2901 for (; row <= selection.end.row; row++, col = 0)
2989 { 2902 {
2990 end_col = screen.tlen[row];
2991
2992#if ENABLE_FRILLS 2903#if ENABLE_FRILLS
2993 if (selection.rect) 2904 if (selection.rect)
2994 { 2905 {
2995 col = selection.beg.col; 2906 col = selection.beg.col;
2996 end_col = TermWin.ncol + 1; 2907 end_col = ncol + 1;
2908 }
2909 else
2910#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2912
2913 col = max (col, 0);
2914
2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2997 } 2919 )
2998#endif
2999
3000 MAX_IT (col, 0);
3001
3002 if (end_col == -1)
3003 end_col = TermWin.ncol;
3004
3005 if (row == end_row || selection.rect)
3006 MIN_IT (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
3007 2921
3008 t = &screen.text[row][col]; 2922 t = ROW(row).t + col;
3009 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
3010 { 2924 {
3011 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
3012 t++; 2926 t++;
3013#if ENABLE_COMBINING 2927#if ENABLE_COMBINING
… …
3029#endif 2943#endif
3030 else 2944 else
3031 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
3032 } 2946 }
3033 2947
3034 if (screen.tlen[row] != -1 && row != end_row) 2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
3035 new_selection_text[ofs++] = C0_LF; 2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2960 if (!ROW(row).is_longer () && row != selection.end.row)
2961 new_selection_text[ofs++] = C0_LF;
3036 } 2962 }
3037 2963
3038 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
3040 2966
… …
3050 2976
3051 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
3052 selection.len = ofs; 2978 selection.len = ofs;
3053 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3054 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
3055 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3056 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
3057 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
3058 else 2998 else
3059 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
3060 3000
3061#if 0 3001#if 0
3062 XTextProperty ct; 3002 XTextProperty ct;
3063 3003
3064 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3065 { 3005 {
3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3067 XFree (ct.value); 3007 XFree (ct.value);
3068 } 3008 }
3069#endif 3009#endif
3070
3071 selection_time = tm;
3072} 3010}
3073 3011
3074/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
3075/* 3013/*
3076 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3084 3022
3085 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3086 3024
3087 if (clicks == 2 || clicks == 3) 3025 if (clicks == 2 || clicks == 3)
3088 selection_extend_colrow (selection.mark.col, 3026 selection_extend_colrow (selection.mark.col,
3089 selection.mark.row + TermWin.view_start, 3027 selection.mark.row + view_start,
3090 0, /* button 3 */ 3028 0, /* button 3 */
3091 1, /* button press */ 3029 1, /* button press */
3092 0); /* click change */ 3030 0); /* click change */
3093} 3031}
3094 3032
… …
3098 */ 3036 */
3099void 3037void
3100rxvt_term::selection_start_colrow (int col, int row) 3038rxvt_term::selection_start_colrow (int col, int row)
3101{ 3039{
3102 want_refresh = 1; 3040 want_refresh = 1;
3041
3042 selection.mark.row = row - view_start;
3103 selection.mark.col = col; 3043 selection.mark.col = col;
3104 selection.mark.row = row - TermWin.view_start;
3105 3044
3106 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3107 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 MAX_IT (selection.mark.col, 0);
3109 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3110 3047
3111 while (selection.mark.col > 0 3048 while (selection.mark.col > 0
3112 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3113 --selection.mark.col; 3050 --selection.mark.col;
3114 3051
3115 if (selection.op) 3052 if (selection.op)
3116 { /* clear the old selection */ 3053 { /* clear the old selection */
3117 selection.beg.row = selection.end.row = selection.mark.row; 3054 selection.beg.row = selection.end.row = selection.mark.row;
… …
3141 text_t *stp; 3078 text_t *stp;
3142 rend_t *srp; 3079 rend_t *srp;
3143 3080
3144 if (dirn == UP) 3081 if (dirn == UP)
3145 { 3082 {
3146 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3083 bound.row = - nsaved - 1;
3147 bound.col = 0; 3084 bound.col = 0;
3148 dirnadd = -1; 3085 dirnadd = -1;
3149 } 3086 }
3150 else 3087 else
3151 { 3088 {
3152 bound.row = TermWin.saveLines + TermWin.nrow; 3089 bound.row = nrow;
3153 bound.col = TermWin.ncol - 1; 3090 bound.col = ncol - 1;
3154 dirnadd = 1; 3091 dirnadd = 1;
3155 } 3092 }
3156 3093
3157 row = mark->row + TermWin.saveLines; 3094 row = mark->row;
3158 col = mark->col; 3095 col = max (mark->col, 0);
3159 MAX_IT (col, 0); 3096
3160 /* find the edge of a word */ 3097 /* find the edge of a word */
3161 stp = &screen.text[row][col]; 3098 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3162 w1 = DELIMIT_TEXT (*stp); 3099 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3163
3164 srp = &screen.rend[row][col];
3165 w2 = DELIMIT_REND (*srp);
3166 3100
3167 for (;;) 3101 for (;;)
3168 { 3102 {
3169 for (; col != bound.col; col += dirnadd) 3103 for (; col != bound.col; col += dirnadd)
3170 { 3104 {
… …
3180 break; 3114 break;
3181 } 3115 }
3182 3116
3183 if ((col == bound.col) && (row != bound.row)) 3117 if ((col == bound.col) && (row != bound.row))
3184 { 3118 {
3185 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3119 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3186 { 3120 {
3187 trow = row + dirnadd; 3121 trow = row + dirnadd;
3188 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3122 tcol = dirn == UP ? ncol - 1 : 0;
3189 3123
3190 if (screen.text[trow] == NULL) 3124 if (!ROW(trow).t)
3191 break; 3125 break;
3192 3126
3193 stp = & (screen.text[trow][tcol]); 3127 stp = ROW(trow).t + tcol;
3194 srp = & (screen.rend[trow][tcol]); 3128 srp = ROW(trow).r + tcol;
3195 3129
3196 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3197 break; 3131 break;
3198 3132
3199 row = trow; 3133 row = trow;
… …
3207Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
3208 if (dirn == DN) 3142 if (dirn == DN)
3209 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3210 3144
3211 /* Poke the values back in */ 3145 /* Poke the values back in */
3212 ret->row = row - TermWin.saveLines; 3146 ret->row = row;
3213 ret->col = col; 3147 ret->col = col;
3214} 3148}
3215 3149
3216/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
3217/* 3151/*
… …
3222 * flag == 2 ==> button 3 motion 3156 * flag == 2 ==> button 3 motion
3223 */ 3157 */
3224void 3158void
3225rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
3226{ 3160{
3227 int col, row; 3161 int col = clamp (Pixel2Col (x), 0, ncol);
3228 3162 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3229 col = Pixel2Col (x);
3230 row = Pixel2Row (y);
3231 MAX_IT (row, 0);
3232 MIN_IT (row, (int)TermWin.nrow - 1);
3233 MAX_IT (col, 0);
3234 MIN_IT (col, (int)TermWin.ncol);
3235 3163
3236 /* 3164 /*
3237 * If we're selecting characters (single click) then we must check first 3165 * If we're selecting characters (single click) then we must check first
3238 * if we are at the same place as the original mark. If we are then 3166 * if we are at the same place as the original mark. If we are then
3239 * select nothing. Otherwise, if we're to the right of the mark, you have to 3167 * select nothing. Otherwise, if we're to the right of the mark, you have to
3240 * be _past_ a character for it to be selected. 3168 * be _past_ a character for it to be selected.
3241 */ 3169 */
3242 if (((selection.clicks % 3) == 1) && !flag 3170 if (((selection.clicks % 3) == 1) && !flag
3243 && (col == selection.mark.col 3171 && (col == selection.mark.col
3244 && (row == selection.mark.row + TermWin.view_start))) 3172 && (row == selection.mark.row + view_start)))
3245 { 3173 {
3246 /* select nothing */ 3174 /* select nothing */
3247 selection.beg.row = selection.end.row = 0; 3175 selection.beg.row = selection.end.row = 0;
3248 selection.beg.col = selection.end.col = 0; 3176 selection.beg.col = selection.end.col = 0;
3249 selection.clicks = 4; 3177 selection.clicks = 4;
… …
3264 * Extend the selection to the specified col/row 3192 * Extend the selection to the specified col/row
3265 */ 3193 */
3266void 3194void
3267rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3268{ 3196{
3269 int16_t ncol = TermWin.ncol;
3270 int end_col;
3271 row_col_t pos; 3197 row_col_t pos;
3272 enum { 3198 enum {
3273 LEFT, RIGHT 3199 LEFT, RIGHT
3274 } closeto = RIGHT; 3200 } closeto = RIGHT;
3275 3201
… …
3306 selection.beg.col = selection.end.col = selection.mark.col; 3232 selection.beg.col = selection.end.col = selection.mark.col;
3307 selection.beg.row = selection.end.row = selection.mark.row; 3233 selection.beg.row = selection.end.row = selection.mark.row;
3308 } 3234 }
3309 3235
3310 pos.col = col; 3236 pos.col = col;
3311 pos.row = row; 3237 pos.row = row - view_start;
3312
3313 pos.row -= TermWin.view_start; /* adjust for scroll */
3314 3238
3315 /* 3239 /*
3316 * This is mainly xterm style selection with a couple of differences, mainly 3240 * This is mainly xterm style selection with a couple of differences, mainly
3317 * in the way button3 drag extension works. 3241 * in the way button3 drag extension works.
3318 * We're either doing: button1 drag; button3 press; or button3 drag 3242 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3377 } 3301 }
3378 } 3302 }
3379 3303
3380 if (selection.clicks == 1) 3304 if (selection.clicks == 1)
3381 { 3305 {
3382 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3383 3307 && !ROW(selection.beg.row).is_longer ()
3384 if (selection.beg.col > end_col
3385 && end_col != -1
3386#if ENABLE_FRILLS 3308#if ENABLE_FRILLS
3387 && !selection.rect 3309 && !selection.rect
3388#endif 3310#endif
3389 ) 3311 )
3390 selection.beg.col = ncol; 3312 selection.beg.col = ncol;
3391 3313
3392 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3393
3394 if ( 3314 if (
3395 selection.end.col > end_col 3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3396 && end_col != -1 3316 && !ROW(selection.end.row).is_longer ()
3397#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3398 && !selection.rect 3318 && !selection.rect
3399#endif 3319#endif
3400 ) 3320 )
3401 selection.end.col = ncol; 3321 selection.end.col = ncol;
… …
3403 else if (selection.clicks == 2) 3323 else if (selection.clicks == 2)
3404 { 3324 {
3405 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3406 selection.end.col--; 3326 selection.end.col--;
3407 3327
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3408 selection_delimit_word (UP, &selection.beg, &selection.beg); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3409 selection_delimit_word (DN, &selection.end, &selection.end); 3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3410 } 3333 }
3411 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3412 { 3335 {
3413#if ENABLE_FRILLS 3336#if ENABLE_FRILLS
3414 if ((options & Opt_tripleclickwords)) 3337 if (OPTION (Opt_tripleclickwords))
3415 { 3338 {
3416 int end_row;
3417
3418 selection_delimit_word (UP, &selection.beg, &selection.beg); 3339 selection_delimit_word (UP, &selection.beg, &selection.beg);
3419 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3420 3340
3421 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3422 { 3342 {
3423 end_col = screen.tlen[end_row + TermWin.saveLines]; 3343 if (!ROW(end_row).is_longer ())
3424
3425 if (end_col != -1)
3426 { 3344 {
3427 selection.end.row = end_row; 3345 selection.end.row = end_row;
3428 selection.end.col = end_col; 3346 selection.end.col = ROW(end_row).l;
3429 selection_remove_trailing_spaces (); 3347 selection_remove_trailing_spaces ();
3430 break; 3348 break;
3431 } 3349 }
3432 } 3350 }
3433 } 3351 }
… …
3437 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3355 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3438 selection.mark.col++; 3356 selection.mark.col++;
3439 3357
3440 selection.beg.col = 0; 3358 selection.beg.col = 0;
3441 selection.end.col = ncol; 3359 selection.end.col = ncol;
3360
3361 // select a complete logical line
3362 while (selection.beg.row > -saveLines
3363 && ROW(selection.beg.row - 1).is_longer ())
3364 selection.beg.row--;
3365
3366 while (selection.end.row < nrow
3367 && ROW(selection.end.row).is_longer ())
3368 selection.end.row++;
3442 } 3369 }
3443 } 3370 }
3444 3371
3445 if (button3 && buttonpress) 3372 if (button3 && buttonpress)
3446 { /* mark may need to be changed */ 3373 { /* mark may need to be changed */
… …
3456 } 3383 }
3457 } 3384 }
3458 3385
3459#if ENABLE_FRILLS 3386#if ENABLE_FRILLS
3460 if (selection.rect && selection.beg.col > selection.end.col) 3387 if (selection.rect && selection.beg.col > selection.end.col)
3461 SWAP_IT (selection.beg.col, selection.end.col, int); 3388 ::swap (selection.beg.col, selection.end.col);
3462#endif 3389#endif
3463} 3390}
3464 3391
3465#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3466void 3393void
… …
3470 text_t *stp; 3397 text_t *stp;
3471 3398
3472 end_col = selection.end.col; 3399 end_col = selection.end.col;
3473 end_row = selection.end.row; 3400 end_row = selection.end.row;
3474 3401
3475 for ( ; end_row >= selection.beg.row; ) 3402 for (; end_row >= selection.beg.row; )
3476 { 3403 {
3477 stp = screen.text[end_row + TermWin.saveLines]; 3404 stp = ROW(end_row).t;
3478 3405
3479 while (--end_col >= 0) 3406 while (--end_col >= 0)
3480 { 3407 {
3481 if (stp[end_col] != ' ' 3408 if (stp[end_col] != NOCHAR
3482 && stp[end_col] != '\t' 3409 && !unicode::is_space (stp[end_col]))
3483 && stp[end_col] != NOCHAR)
3484 break; 3410 break;
3485 } 3411 }
3486 3412
3487 if (end_col >= 0 3413 if (end_col >= 0
3488 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3414 || !ROW(end_row - 1).is_longer ())
3489 { 3415 {
3490 selection.end.col = end_col + 1; 3416 selection.end.col = end_col + 1;
3491 selection.end.row = end_row; 3417 selection.end.row = end_row;
3492 break; 3418 break;
3493 } 3419 }
3494 3420
3495 end_row--; 3421 end_row--;
3496 end_col = TermWin.ncol; 3422 end_col = ncol;
3497 } 3423 }
3498 3424
3499 if (selection.mark.row > selection.end.row) 3425 if (selection.mark.row > selection.end.row)
3500 { 3426 {
3501 selection.mark.row = selection.end.row; 3427 selection.mark.row = selection.end.row;
… …
3526 */ 3452 */
3527void 3453void
3528rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3454rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3529{ 3455{
3530 XSelectionEvent ev; 3456 XSelectionEvent ev;
3457 dDisp;
3531 3458
3532 ev.type = SelectionNotify; 3459 ev.type = SelectionNotify;
3533 ev.property = None; 3460 ev.property = None;
3534 ev.display = rq.display; 3461 ev.display = rq.display;
3535 ev.requestor = rq.requestor; 3462 ev.requestor = rq.requestor;
… …
3549 *target++ = xa[XA_COMPOUND_TEXT]; 3476 *target++ = xa[XA_COMPOUND_TEXT];
3550#if X_HAVE_UTF8_STRING 3477#if X_HAVE_UTF8_STRING
3551 *target++ = xa[XA_UTF8_STRING]; 3478 *target++ = xa[XA_UTF8_STRING];
3552#endif 3479#endif
3553 3480
3554 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3481 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3555 32, PropModeReplace, 3482 32, PropModeReplace,
3556 (unsigned char *)target_list, target - target_list); 3483 (unsigned char *)target_list, target - target_list);
3557 ev.property = rq.property; 3484 ev.property = rq.property;
3558 } 3485 }
3559#if TODO // TODO 3486#if TODO // TODO
… …
3562 /* TODO: Handle MULTIPLE */ 3489 /* TODO: Handle MULTIPLE */
3563 } 3490 }
3564#endif 3491#endif
3565 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3492 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3566 { 3493 {
3567 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3494 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3568 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3495 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3569 ev.property = rq.property; 3496 ev.property = rq.property;
3570 } 3497 }
3571 else if (rq.target == XA_STRING 3498 else if (rq.target == XA_STRING
3572 || rq.target == xa[XA_TEXT] 3499 || rq.target == xa[XA_TEXT]
… …
3630 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3557 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3631 ct.nitems = strlen ((char *)ct.value); 3558 ct.nitems = strlen ((char *)ct.value);
3632 } 3559 }
3633 else 3560 else
3634#endif 3561#endif
3635 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3562 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3636 freect = 1; 3563 freect = 1;
3637 else 3564 else
3638 { 3565 {
3639 /* if we failed to convert then send it raw */ 3566 /* if we failed to convert then send it raw */
3640 ct.value = (unsigned char *)cl; 3567 ct.value = (unsigned char *)cl;
3641 ct.nitems = selectlen; 3568 ct.nitems = selectlen;
3642 ct.encoding = target; 3569 ct.encoding = target;
3643 } 3570 }
3644 3571
3645 XChangeProperty (display->display, rq.requestor, rq.property, 3572 XChangeProperty (disp, rq.requestor, rq.property,
3646 ct.encoding, 8, PropModeReplace, 3573 ct.encoding, 8, PropModeReplace,
3647 ct.value, (int)ct.nitems); 3574 ct.value, (int)ct.nitems);
3648 ev.property = rq.property; 3575 ev.property = rq.property;
3649 3576
3650 if (freect) 3577 if (freect)
3651 XFree (ct.value); 3578 XFree (ct.value);
3652 } 3579 }
3653 3580
3654 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3581 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3655} 3582}
3656 3583
3657/* ------------------------------------------------------------------------- * 3584/* ------------------------------------------------------------------------- *
3658 * MOUSE ROUTINES * 3585 * MOUSE ROUTINES *
3659 * ------------------------------------------------------------------------- */ 3586 * ------------------------------------------------------------------------- */
… …
3663 */ 3590 */
3664void 3591void
3665rxvt_term::pixel_position (int *x, int *y) 3592rxvt_term::pixel_position (int *x, int *y)
3666{ 3593{
3667 *x = Pixel2Col (*x); 3594 *x = Pixel2Col (*x);
3668 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3669 *y = Pixel2Row (*y); 3596 *y = Pixel2Row (*y);
3670 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3671} 3598}
3672 3599
3673/* ------------------------------------------------------------------------- */ 3600/* ------------------------------------------------------------------------- */
3674#ifdef USE_XIM 3601#ifdef USE_XIM
3675void 3602void
3676rxvt_term::im_set_position (XPoint &pos) 3603rxvt_term::im_set_position (XPoint &pos)
3677{ 3604{
3678 XWindowAttributes xwa; 3605 XWindowAttributes xwa;
3679 3606
3680 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3607 XGetWindowAttributes (display->display, vt, &xwa);
3681 3608
3682 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3609 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3683 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3610 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3684} 3611}
3685#endif 3612#endif
3686 3613
3687#if ENABLE_OVERLAY 3614#if ENABLE_OVERLAY
3688void 3615void
3689rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3616rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3690{ 3617{
3691 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3618 if (nrow < 1 || ncol < 1)
3692 return; 3619 return;
3693 3620
3694 want_refresh = 1; 3621 want_refresh = 1;
3695 3622
3696 scr_overlay_off (); 3623 scr_overlay_off ();
3697 3624
3698 if (x < 0) x = TermWin.ncol - w; 3625 if (x < 0) x = ncol - w;
3699 if (y < 0) y = TermWin.nrow - h; 3626 if (y < 0) y = nrow - h;
3700 3627
3701 // make space for border 3628 // make space for border
3702 w += 2; MIN_IT (w, TermWin.ncol); 3629 w += 2; min_it (w, ncol);
3703 h += 2; MIN_IT (h, TermWin.nrow); 3630 h += 2; min_it (h, nrow);
3704 3631
3705 x -= 1; MAX_IT (x, 0); 3632 x -= 1; clamp_it (x, 0, ncol - w);
3706 y -= 1; MAX_IT (y, 0); 3633 y -= 1; clamp_it (y, 0, nrow - h);
3707
3708 MIN_IT (x, TermWin.ncol - w);
3709 MIN_IT (y, TermWin.nrow - h);
3710 3634
3711 ov_x = x; ov_y = y; 3635 ov_x = x; ov_y = y;
3712 ov_w = w; ov_h = h; 3636 ov_w = w; ov_h = h;
3713 3637
3714 ov_text = new text_t *[h]; 3638 ov_text = new text_t *[h];
… …
3779 while (*s) 3703 while (*s)
3780 scr_overlay_set (x++, y, *s++); 3704 scr_overlay_set (x++, y, *s++);
3781} 3705}
3782 3706
3783void 3707void
3708rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3709{
3710 while (*s)
3711 {
3712 text_t t = *s++;
3713 int width = wcwidth (t);
3714
3715 while (width--)
3716 {
3717 scr_overlay_set (x++, y, t);
3718 t = NOCHAR;
3719 }
3720 }
3721}
3722
3723void
3784rxvt_term::scr_swap_overlay () 3724rxvt_term::scr_swap_overlay ()
3785{ 3725{
3786 if (!ov_text) 3726 if (!ov_text)
3787 return; 3727 return;
3788 3728
3789 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3790
3791 // swap screen mem with overlay 3729 // swap screen mem with overlay
3792 for (int y = ov_h; y--; ) 3730 for (int y = ov_h; y--; )
3793 { 3731 {
3794 text_t *t1 = ov_text[y]; 3732 text_t *t1 = ov_text[y];
3795 rend_t *r1 = ov_rend[y]; 3733 rend_t *r1 = ov_rend[y];
3796 3734
3797 text_t *t2 = screen.text[y + row_offset] + ov_x; 3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3798 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3799 3737
3800 for (int x = ov_w; x--; ) 3738 for (int x = ov_w; x--; )
3801 { 3739 {
3802 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3803 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3805 } 3743 }
3806} 3744}
3807 3745
3808#endif 3746#endif
3809/* ------------------------------------------------------------------------- */ 3747/* ------------------------------------------------------------------------- */
3748

Diff Legend

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