ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.160 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.176 by root, Tue Dec 20 20:58:31 2005 UTC

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

Diff Legend

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