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.150 by root, Mon Dec 13 19:16:36 2004 UTC vs.
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC

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

Diff Legend

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