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.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC

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

Diff Legend

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