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.171 by root, Fri Dec 16 13:05:49 2005 UTC vs.
Revision 1.172 by root, Sun Dec 18 00:59:42 2005 UTC

… …
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
52 TermWin.view_start = 0 52 view_start = 0
53#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
… …
88/* 88/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 92 */
93#define drawBuffer TermWin.vt 93#define drawBuffer vt
94 94
95#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 96 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 97 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 99 (unsigned int)Height2Pixel (num), False)
100 100
101#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 102 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 104 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 105 (unsigned int)Height2Pixel (1), False)
106 106
107#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 109 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 110 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
112 112
113/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116 116
117/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
118void 118void
119rxvt_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)
120{ 120{
121 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 123
124 text_t *et = l.t + col;
125 rend_t *er = l.r + col;
126
124 while (width--) 127 while (width--)
125 { 128 {
126 *et++ = ' '; 129 *et++ = ' ';
127 *er++ = efs; 130 *er++ = efs;
128 } 131 }
129} 132}
130 133
131/* ------------------------------------------------------------------------- */ 134/* ------------------------------------------------------------------------- */
132/* 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 */
133void 136void
134rxvt_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)
135{ 138{
136#ifdef DEBUG_STRICT 139 if (!l.t)
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); 140 lalloc (l);
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144 141
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 142 scr_blank_line (l, 0, ncol, efs);
146} 143}
147 144
148/* ------------------------------------------------------------------------- * 145/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 146 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 147 * ------------------------------------------------------------------------- */
151void 148void
152rxvt_term::scr_reset () 149rxvt_term::scr_reset ()
153{ 150{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q; 151 unsigned int p, q;
156 int k; 152 int k;
157 rend_t setrstyle;
158 153
159#if ENABLE_OVERLAY 154#if ENABLE_OVERLAY
160 scr_overlay_off (); 155 scr_overlay_off ();
161#endif 156#endif
162 157
163 TermWin.view_start = 0; 158 view_start = 0;
164 num_scr = 0; 159 num_scr = 0;
165 160
166 if (TermWin.ncol == 0) 161 if (ncol == 0)
167 TermWin.ncol = 80; 162 ncol = 80;
168 163
169 if (TermWin.nrow == 0) 164 if (nrow == 0)
170 TermWin.nrow = 24; 165 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 166
175 if (ncol == prev_ncol && nrow == prev_nrow) 167 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 168 return;
177 169
178 // we need at least two lines for wrapping to work correctly 170 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 171 if (nrow + saveLines < 2)
180 { 172 {
181 TermWin.saveLines++; 173 saveLines++;
182 prev_nrow--; 174 prev_nrow--;
183 TermWin.nscrolled++; 175 nscrolled++;
184 } 176 }
185 177
186 want_refresh = 1; 178 want_refresh = 1;
187 179
188 prev_total_rows = prev_nrow + TermWin.saveLines; 180 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 181 int total_rows = nrow + saveLines;
190 182
191 screen.tscroll = 0; 183 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 184 screen.bscroll = nrow - 1;
193 185
194 if (!talloc) 186 if (!save)
195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 { 187 {
202 /* 188 /*
203 * 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
204 * 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
205 */ 191 */
192 nscrolled = 0; /* no saved lines */
193 term_start = 0;
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));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
203
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 205
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 206 scr_update_term ();
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213 207
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++) 208 for (p = nrow; p--; )
220 { 209 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226 } 213 }
227 214
228 memset (charsets, 'B', sizeof (charsets)); 215 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 216 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 217 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 218 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 219 screen.charset = 0;
234 current_screen = PRIMARY; 220 current_screen = PRIMARY;
… …
254 else 240 else
255 { 241 {
256 /* 242 /*
257 * add or delete rows as appropriate 243 * add or delete rows as appropriate
258 */ 244 */
259 setrstyle = DEFAULT_RSTYLE; 245
246 rxvt_salloc *old_ta;
247 rxvt_salloc *old_ra;
260 248
261 if (nrow < prev_nrow) 249 if (nrow < prev_nrow)
262 { 250 {
263 /* delete rows */ 251 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow); 252 k = min (nscrolled, prev_nrow - nrow);
265 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO 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 265
… …
302 else if (nrow > prev_nrow) 268 else if (nrow > prev_nrow)
303 { 269 {
304 /* add rows */ 270 /* add rows */
305 scr_reset_realloc (); /* realloc _first_ */ 271 scr_reset_realloc (); /* realloc _first_ */
306 272
273 int ocol = ncol;
307 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
308 275
309 k = min (TermWin.nscrolled, nrow - prev_nrow); 276 k = min (nscrolled, nrow - prev_nrow);
310 277
311 for (p = prev_total_rows; p < total_rows; p++) 278 for (p = prev_total_rows; p < total_rows; p++)
312 { 279 save[p].clear ();
313 screen.tlen[p] = 0;
314 screen.text[p] = NULL;
315 screen.rend[p] = NULL;
316 }
317 280
318 for (p = prev_total_rows; p < total_rows - k; p++) 281 for (p = prev_total_rows; p < total_rows - k; p++)
319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); 282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
320 285
321 for (p = prev_nrow; p < nrow; p++) 286 for (p = prev_nrow; p < nrow; p++)
322 { 287 {
323 swap.tlen[p] = 0; 288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
324 swap.text[p] = NULL; 289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
325 swap.rend[p] = NULL;
326 drawn_text[p] = NULL;
327 drawn_rend[p] = NULL;
328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
330 } 290 }
331 291
332 if (k > 0) 292 if (k > 0)
333 { 293 {
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 295 screen.cur.row += k;
336 screen.s_cur.row += k; 296 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 297 nscrolled -= k;
338 } 298 }
339 299
340#ifdef DEBUG_STRICT 300#ifdef DEBUG_STRICT
341 assert (screen.cur.row < TermWin.nrow); 301 assert (screen.cur.row < nrow);
342#else /* drive with your eyes closed */ 302#else /* drive with your eyes closed */
343 MIN_IT (screen.cur.row, nrow - 1); 303 MIN_IT (screen.cur.row, nrow - 1);
344#endif 304#endif
345 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
346 } 306 }
347 307
348 /* resize columns */ 308 /* resize columns */
349 if (ncol != prev_ncol) 309 if (ncol != prev_ncol)
350 { 310 {
351 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
352 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
353 313
354 for (p = 0; p < total_rows; p++) 314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
355 { 318 {
356 if (screen.text[p]) 319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l;
352
353 assert (llen >= 0);
354
355 while (p && save[p - 1].l < 0)
357 { 356 {
358 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); 357 --p;
359 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
360
361 MIN_IT (screen.tlen[p], (int16_t)ncol);
362
363 if (ncol > prev_ncol) 358 llen += prev_ncol;
364 scr_blank_line (&screen.text[p][prev_ncol], 359 }
365 &screen.rend[p][prev_ncol], 360
366 ncol - prev_ncol, setrstyle); 361 int qlines = llen / ncol + 1;
362 int lofs = 0;
363
364 q -= qlines;
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++)
370 {
371 if (qrow >= 0)
372 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = -1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p;
382 int pcol = lofs % prev_ncol;
383
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
403
404 lofs += len;
405 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 }
411 else
412 lofs += ncol;
367 } 413 }
368 } 414 }
369
370 for (p = 0; p < nrow; p++)
371 {
372 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
373 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
374
375 if (ncol > prev_ncol)
376 scr_blank_line (&drawn_text[p][prev_ncol],
377 &drawn_rend[p][prev_ncol],
378 ncol - prev_ncol, setrstyle);
379
380 if (swap.text[p])
381 {
382 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
383 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
384
385 MIN_IT (swap.tlen[p], (int16_t)ncol);
386
387 if (ncol > prev_ncol)
388 scr_blank_line (&swap.text[p][prev_ncol],
389 &swap.rend[p][prev_ncol],
390 ncol - prev_ncol, setrstyle);
391 }
392
393 } 415 }
394 416
395 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 417 free (screen.text); screen.text = tp;
418 free (screen.rend); screen.rend = rp;
419 free (screen.tlen); screen.tlen = tl;
396 420
397 delete talloc; talloc = ta; 421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
398 delete ralloc; ralloc = ra; 422#endif
399 }
400 423
401 if (tabs) 424 if (tabs)
402 free (tabs); 425 free (tabs);
403 } 426 }
404 427
… …
414} 437}
415 438
416void 439void
417rxvt_term::scr_reset_realloc () 440rxvt_term::scr_reset_realloc ()
418{ 441{
419 unsigned int total_rows, nrow; 442 unsigned int total_rows = nrow + saveLines;
420 443
421 nrow = TermWin.nrow;
422 total_rows = nrow + TermWin.saveLines;
423 /* *INDENT-OFF* */
424 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
425 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
426 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
427 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); 445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
428 446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
429 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));
430 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));
431
432 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
433 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
434 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
435 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
436 /* *INDENT-ON* */
437} 449}
438 450
439/* ------------------------------------------------------------------------- */ 451/* ------------------------------------------------------------------------- */
440/* 452/*
441 * Free everything. That way malloc debugging can find leakage. 453 * Free everything. That way malloc debugging can find leakage.
… …
443void 455void
444rxvt_term::scr_release () 456rxvt_term::scr_release ()
445{ 457{
446 unsigned int total_rows; 458 unsigned int total_rows;
447 459
448 total_rows = TermWin.nrow + TermWin.saveLines; 460 total_rows = nrow + saveLines;
449 461
450 delete talloc; talloc = 0; 462 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 463 delete ralloc; ralloc = 0;
452 464
453 free (screen.text);
454 free (screen.tlen); 465 free (screen.line);
455 free (screen.rend); 466 free (save);
467 free (swap_save);
456 free (drawn_text); 468 free (drawn);
457 free (drawn_rend);
458 free (swap.text);
459 free (swap.tlen);
460 free (swap.rend);
461 free (buf_text); 469 free (buf);
462 free (buf_rend);
463 free (tabs); 470 free (tabs);
464
465 /* NULL these so if anything tries to use them, we'll know about it */
466 screen.text = drawn_text = swap.text = NULL;
467 screen.rend = drawn_rend = swap.rend = NULL;
468 screen.tlen = swap.tlen = NULL;
469 buf_text = NULL;
470 buf_rend = NULL;
471 tabs = NULL;
472} 471}
473 472
474/* ------------------------------------------------------------------------- */ 473/* ------------------------------------------------------------------------- */
475/* 474/*
476 * Hard reset 475 * Hard reset
… …
527 set_font_style (); 526 set_font_style ();
528 break; 527 break;
529 } 528 }
530 529
531 /* boundary check in case screen size changed between SAVE and RESTORE */ 530 /* boundary check in case screen size changed between SAVE and RESTORE */
532 MIN_IT (s->cur.row, TermWin.nrow - 1); 531 MIN_IT (s->cur.row, nrow - 1);
533 MIN_IT (s->cur.col, TermWin.ncol - 1); 532 MIN_IT (s->cur.col, ncol - 1);
534#ifdef DEBUG_STRICT 533#ifdef DEBUG_STRICT
535 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
536 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
537#else /* drive with your eyes closed */ 536#else /* drive with your eyes closed */
538 MAX_IT (s->cur.row, 0); 537 MAX_IT (s->cur.row, 0);
… …
554 int offset; 553 int offset;
555#endif 554#endif
556 555
557 want_refresh = 1; 556 want_refresh = 1;
558 557
559 TermWin.view_start = 0; 558 view_start = 0;
560 559
561 if (current_screen == scrn) 560 if (current_screen == scrn)
562 return scrn; 561 return scrn;
563 562
564 selection_check (2); /* check for boundary cross */ 563 selection_check (2); /* check for boundary cross */
… …
574 573
575#if NSCREENS 574#if NSCREENS
576 if (options & Opt_secondaryScreen) 575 if (options & Opt_secondaryScreen)
577 { 576 {
578 num_scr = 0; 577 num_scr = 0;
579 offset = TermWin.saveLines; 578 offset = saveLines;
580 579
581 for (i = prev_nrow; i--;) 580 for (i = prev_nrow; i--;)
582 {
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 }
587 582
588 SWAP_IT (screen.charset, swap.charset, int16_t); 583 SWAP_IT (screen.charset, swap.charset, int16_t);
589 SWAP_IT (screen.flags, swap.flags, int); 584 SWAP_IT (screen.flags, swap.flags, int);
590 screen.flags |= Screen_VisibleCursor; 585 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 586 swap.flags |= Screen_VisibleCursor;
… …
609 604
610 screen.cur.col = 0; 605 screen.cur.col = 0;
611 606
612 if (screen.cur.row == screen.bscroll) 607 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
614 else if (screen.cur.row < TermWin.nrow - 1) 609 else if (screen.cur.row < nrow - 1)
615 screen.cur.row++; 610 screen.cur.row++;
616} 611}
617 612
618/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
619/* 614/*
… …
644 rstyle = DEFAULT_RSTYLE; 639 rstyle = DEFAULT_RSTYLE;
645 else 640 else
646 rstyle &= ~style; 641 rstyle &= ~style;
647 } 642 }
648 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
649/* ------------------------------------------------------------------------- */ 652/* ------------------------------------------------------------------------- */
650/* 653/*
651 * Scroll text between <row1> and <row2> inclusive, by <count> lines 654 * Scroll text between <row1> and <row2> inclusive, by <count> lines
652 * count positive ==> scroll up 655 * count positive ==> scroll up
653 * count negative ==> scroll down 656 * count negative ==> scroll down
… …
655 */ 658 */
656int 659int
657rxvt_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)
658{ 661{
659 int i, j; 662 int i, j;
660 long nscrolled;
661 663
662 if (count == 0 || (row1 > row2)) 664 if (count == 0 || (row1 > row2))
663 return 0; 665 return 0;
664 666
665 want_refresh = 1; 667 want_refresh = 1;
666 668
667 if (row1 == 0 && count > 0 669 if (row1 == 0 && count > 0
668 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 670 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
669 { 671 {
670 nscrolled = (long)TermWin.nscrolled + (long)count; 672 nscrolled += count;
671 673
672 if (nscrolled > (long)TermWin.saveLines) 674 if (nscrolled > saveLines)
673 TermWin.nscrolled = TermWin.saveLines; 675 nscrolled = saveLines;
674 else
675 TermWin.nscrolled = (unsigned int)nscrolled;
676 676
677 if ((options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
678 && TermWin.view_start != 0 678 && view_start != 0
679 && TermWin.view_start != TermWin.saveLines) 679 && view_start != saveLines)
680 scr_page (UP, count); 680 scr_page (UP, count);
681 } 681 }
682 else if (!spec) 682 else if (!spec)
683 row1 += TermWin.saveLines; 683 row1 += saveLines;
684 684
685 row2 += TermWin.saveLines; 685 row2 += saveLines;
686 686
687 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
688 { 688 {
689 i = selection.beg.row + TermWin.saveLines; 689 i = selection.beg.row + saveLines;
690 j = selection.end.row + TermWin.saveLines; 690 j = selection.end.row + saveLines;
691
691 if ((i < row1 && j > row1) 692 if ((i < row1 && j > row1)
692 || (i < row2 && j > row2) 693 || (i < row2 && j > row2)
693 || (i - count < row1 && i >= row1) 694 || (i - count < row1 && i >= row1)
694 || (i - count > row2 && i <= row2) 695 || (i - count > row2 && i <= row2)
695 || (j - count < row1 && j >= row1) 696 || (j - count < row1 && j >= row1)
… …
705 selection.end.row -= count; 706 selection.end.row -= count;
706 selection.mark.row -= count; 707 selection.mark.row -= count;
707 } 708 }
708 } 709 }
709 710
710 selection_check (0); /* _after_ TermWin.nscrolled update */ 711 selection_check (0); /* _after_ nscrolled update */
711 712
712 num_scr += count; 713 num_scr += count;
713 j = count; 714 j = count;
714 715
715 if (count < 0) 716 if (count < 0)
… …
721 if (j > 0) 722 if (j > 0)
722 { 723 {
723 /* scroll up */ 724 /* scroll up */
724 725
725 /* Copy lines that will get clobbered by the rotation */ 726 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 727 memcpy (buf, save + row1, count * sizeof (line_t));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728 728
729 /* Rotate lines */ 729 /* Rotate lines */
730 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734 732
735 j = row2 - count + 1, i = count; 733 j = row2 - count + 1, i = count;
736 } 734 }
737 else /* if (j < 0) */ 735 else /* if (j < 0) */
738 { 736 {
739 /* scroll down */ 737 /* scroll down */
740 738
741 /* Copy lines that will get clobbered by the rotation */ 739 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--) 740 for (i = 0, j = row2; i < count; i++, j--)
743 { 741 buf[i] = save[j];
744 buf_text[i] = screen.text[j];
745 buf_rend[i] = screen.rend[j];
746 }
747 742
748 /* Rotate lines */ 743 /* Rotate lines */
749 for (j = row2, i = j - count; i >= row1; i--, j--) 744 for (j = row2, i = j - count; i >= row1; i--, j--)
750 { 745 save[j] = save[i];
751 screen.tlen[j] = screen.tlen[i];
752 screen.text[j] = screen.text[i];
753 screen.rend[j] = screen.rend[i];
754 }
755 746
756 j = row1, i = count; 747 j = row1, i = count;
757 count = -count; 748 count = -count;
758 } 749 }
759 750
760 /* Resurrect lines */ 751 /* Resurrect lines */
761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 752 memcpy (save + j, buf, i * sizeof (line_t));
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 753
754 scr_update_term ();
755
764 if (!spec) /* line length may not equal TermWin.ncol */ 756 if (!spec) /* line length may not equal ncol */
765 for (; i--; j++) 757 for (; i--; j++)
766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 758 scr_blank_screen_mem (save[j], rstyle);
767 759
768 return count; 760 return count;
769} 761}
770 762
771/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
… …
779 return; 771 return;
780 772
781 unsigned char checksel; 773 unsigned char checksel;
782 unicode_t c; 774 unicode_t c;
783 int row, last_col; 775 int row, last_col;
784 text_t *stp;
785 rend_t *srp;
786 const unicode_t *strend = str + len; 776 const unicode_t *strend = str + len;
787 777
788 want_refresh = 1; 778 want_refresh = 1;
789 ZERO_SCROLLBACK (); 779 ZERO_SCROLLBACK ();
790 last_col = TermWin.ncol; 780 last_col = ncol;
791 781
792 if (nlines > 0) 782 if (nlines > 0)
793 { 783 {
794 nlines += screen.cur.row - screen.bscroll; 784 nlines += screen.cur.row - screen.bscroll;
795 if ((nlines > 0) 785 if ((nlines > 0)
796 && (screen.tscroll == 0) 786 && (screen.tscroll == 0)
797 && (screen.bscroll == (TermWin.nrow - 1))) 787 && (screen.bscroll == (nrow - 1)))
798 { 788 {
799 /* _at least_ this many lines need to be scrolled */ 789 /* _at least_ this many lines need to be scrolled */
800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
801 screen.cur.row -= nlines; 791 screen.cur.row -= nlines;
802 } 792 }
803 } 793 }
804 794
805#ifdef DEBUG_STRICT 795#ifdef DEBUG_STRICT
806 assert (screen.cur.col < last_col); 796 assert (screen.cur.col < last_col);
807 assert ((screen.cur.row < TermWin.nrow) 797 assert ((screen.cur.row < nrow)
808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 798 && (screen.cur.row >= - (int32_t)nscrolled));
809#else /* drive with your eyes closed */ 799#else /* drive with your eyes closed */
810 MIN_IT (screen.cur.col, last_col - 1); 800 MIN_IT (screen.cur.col, last_col - 1);
811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 801 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 802 MAX_IT (screen.cur.row, - (int32_t)nscrolled);
813#endif 803#endif
814 row = screen.cur.row + TermWin.saveLines; 804 row = screen.cur.row + saveLines;
815 805
816 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 806 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817 807
818 stp = screen.text[row]; 808 line_t *line = save + row;
819 srp = screen.rend[row];
820 809
821 while (str < strend) 810 while (str < strend)
822 { 811 {
823 c = *str++; 812 c = *str++;
824 813
825 if (c < 0x20) 814 if (c < 0x20)
826 if (c == C0_LF) 815 if (c == C0_LF)
827 { 816 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */ 817 if (line->l != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col); 818 MAX_IT (line->l, screen.cur.col);
830 819
831 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
832 821
833 if (screen.cur.row == screen.bscroll) 822 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1)) 824 else if (screen.cur.row < (nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines; 825 row = (++screen.cur.row) + saveLines;
837 826
838 stp = screen.text[row]; /* _must_ refresh */ 827 line = save + row; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue; 828 continue;
841 } 829 }
842 else if (c == C0_CR) 830 else if (c == C0_CR)
843 { 831 {
844 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (line->l != -1) /* XXX: think about this */
845 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (line->l, screen.cur.col);
846 834
847 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
848 screen.cur.col = 0; 836 screen.cur.col = 0;
849 continue; 837 continue;
850 } 838 }
… …
867 CLEAR_SELECTION (); 855 CLEAR_SELECTION ();
868 } 856 }
869 857
870 if (screen.flags & Screen_WrapNext) 858 if (screen.flags & Screen_WrapNext)
871 { 859 {
872 screen.tlen[row] = -1; 860 line->l = -1;
873 861
874 scr_do_wrap (); 862 scr_do_wrap ();
875 863
876 row = screen.cur.row + TermWin.saveLines; 864 row = screen.cur.row + saveLines;
877 stp = screen.text[row]; /* _must_ refresh */ 865 line = save + row; /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */
879 } 866 }
880 867
881 // some utf-8 decoders "decode" surrogate characters: let's fix this. 868 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff)) 869 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd; 870 c = 0xfffd;
… …
925 c = 0xfffd; 912 c = 0xfffd;
926# endif 913# endif
927#endif 914#endif
928 915
929 // nuke the character at this position, if required 916 // nuke the character at this position, if required
930 if (stp[screen.cur.col] == NOCHAR 917 if (line->t[screen.cur.col] == NOCHAR
931 || (screen.cur.col < TermWin.ncol - 1 918 || (screen.cur.col < ncol - 1
932 && stp[screen.cur.col + 1] == NOCHAR)) 919 && line->t[screen.cur.col + 1] == NOCHAR))
933 { 920 {
934 int col = screen.cur.col; 921 int col = screen.cur.col;
935 922
936 // find begin 923 // find begin
937 while (col > 0 && stp[col] == NOCHAR) 924 while (col > 0 && line->t[col] == NOCHAR)
938 col--; 925 col--;
939 926
940 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 (' '));
941 928
942 // found begin, nuke 929 // found begin, nuke
943 do { 930 do {
944 stp[col] = ' '; 931 line->t[col] = ' ';
945 srp[col] = rend; 932 line->r[col] = rend;
946 col++; 933 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR); 934 } while (col < ncol && line->t[col] == NOCHAR);
948 } 935 }
949 936
950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 937 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951 938
952 // if the character doesn't fit into the remaining columns... 939 // if the character doesn't fit into the remaining columns...
… …
958 --str; 945 --str;
959 } 946 }
960 947
961 do 948 do
962 { 949 {
963 stp[screen.cur.col] = c; 950 line->t[screen.cur.col] = c;
964 srp[screen.cur.col] = rend; 951 line->r[screen.cur.col] = rend;
965 952
966 if (screen.cur.col < last_col - 1) 953 if (screen.cur.col < last_col - 1)
967 screen.cur.col++; 954 screen.cur.col++;
968 else 955 else
969 { 956 {
970 screen.tlen[row] = last_col; 957 line->l = last_col;
971 if (screen.flags & Screen_Autowrap) 958 if (screen.flags & Screen_Autowrap)
972 screen.flags |= Screen_WrapNext; 959 screen.flags |= Screen_WrapNext;
973 break; 960 break;
974 } 961 }
975 962
… …
977 } 964 }
978 while (--width > 0); 965 while (--width > 0);
979 966
980 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
981 if (!width) 968 if (!width)
982 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++)
983 { 970 {
984 stp[c] = ' '; 971 line->t[c] = ' ';
985 srp[c] = rend; 972 line->r[c] = rend;
986 } 973 }
987 } 974 }
988 else // width == 0 975 else // width == 0
989 { 976 {
990#if ENABLE_COMBINING 977#if ENABLE_COMBINING
… …
995 text_t *tp; 982 text_t *tp;
996 rend_t *rp; 983 rend_t *rp;
997 984
998 if (screen.cur.col > 0) 985 if (screen.cur.col > 0)
999 { 986 {
1000 tp = stp + screen.cur.col - 1; 987 tp = line->t + screen.cur.col - 1;
1001 rp = srp + screen.cur.col - 1; 988 rp = line->r + screen.cur.col - 1;
1002 989
1003 while (*tp == NOCHAR && tp > stp) 990 while (*tp == NOCHAR && tp > line->t)
1004 tp--, rp--; 991 tp--, rp--;
1005 } 992 }
1006 else if (screen.cur.row > 0 993 else if (screen.cur.row > 0
1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 994 && save [screen.cur.row - 1 + saveLines].l == -1)
1008 { 995 {
1009 int line = screen.cur.row - 1 + TermWin.saveLines; 996 line_t *line = save + (screen.cur.row - 1 + saveLines);
1010 997
1011 tp = screen.text[line] + last_col - 1; 998 tp = line->t + last_col - 1;
1012 rp = screen.rend[line] + last_col - 1; 999 rp = line->r + last_col - 1;
1013 1000
1014 while (*tp == NOCHAR && tp > screen.text[line]) 1001 while (*tp == NOCHAR && tp > line->t)
1015 tp--, rp--; 1002 tp--, rp--;
1016 } 1003 }
1017 else 1004 else
1018 continue; 1005 continue;
1019 1006
… …
1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1027#endif 1014#endif
1028 } 1015 }
1029 } 1016 }
1030 1017
1031 if (screen.tlen[row] != -1) /* XXX: think about this */ 1018 if (line->l != -1) /* XXX: think about this */
1032 MAX_IT (screen.tlen[row], screen.cur.col); 1019 MAX_IT (line->l, screen.cur.col);
1033 1020
1034#ifdef DEBUG_STRICT 1021#ifdef DEBUG_STRICT
1035 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
1036#else /* drive with your eyes closed */ 1023#else /* drive with your eyes closed */
1037 MAX_IT (screen.cur.row, 0); 1024 MAX_IT (screen.cur.row, 0);
… …
1051 if (screen.cur.col == 0) 1038 if (screen.cur.col == 0)
1052 { 1039 {
1053 if (screen.cur.row > 0) 1040 if (screen.cur.row > 0)
1054 { 1041 {
1055#ifdef TERMCAP_HAS_BW 1042#ifdef TERMCAP_HAS_BW
1056 screen.cur.col = TermWin.ncol - 1; 1043 screen.cur.col = ncol - 1;
1057 screen.cur.row--; 1044 screen.cur.row--;
1058 return; 1045 return;
1059#endif 1046#endif
1060 } 1047 }
1061 } 1048 }
… …
1081 1068
1082 if (count == 0) 1069 if (count == 0)
1083 return; 1070 return;
1084 else if (count > 0) 1071 else if (count > 0)
1085 { 1072 {
1086 int row = TermWin.saveLines + screen.cur.row; 1073 int row = saveLines + screen.cur.row;
1087 text_t *tp = screen.text[row]; 1074
1088 rend_t *rp = screen.rend[row]; 1075 line_t &l = save[row];
1089 rend_t base_rend = rp[i]; 1076 rend_t base_rend = l.r[i];
1090 ht &= tp[i] == ' '; 1077 ht &= l.t[i] == ' ';
1091 1078
1092 for (; ++i < TermWin.ncol; ) 1079 for (; ++i < ncol; )
1093 if (tabs[i]) 1080 if (tabs[i])
1094 { 1081 {
1095 x = i; 1082 x = i;
1096 if (!--count) 1083 if (!--count)
1097 break; 1084 break;
1098 } 1085 }
1099 else 1086 else
1100 ht &= tp[i] == ' ' 1087 ht &= l.t[i] == ' '
1101 && RS_SAME (rp[i], base_rend); 1088 && RS_SAME (l.r[i], base_rend);
1102 1089
1103 if (count) 1090 if (count)
1104 x = TermWin.ncol - 1; 1091 x = ncol - 1;
1105 1092
1106 // store horizontal tab commands as characters inside the text 1093 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted. 1094 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs) 1095 if (ht && options & Opt_pastableTabs)
1109 { 1096 {
1110 base_rend = SET_FONT (base_rend, 0); 1097 base_rend = SET_FONT (base_rend, 0);
1111 1098
1112 if (screen.tlen[row] != -1) /* XXX: think about this */ 1099 if (l.l != -1) /* XXX: think about this */
1113 MAX_IT (screen.tlen[row], x); 1100 MAX_IT (l.l, x);
1114 1101
1115 i = screen.cur.col; 1102 i = screen.cur.col;
1116 1103
1117 tp[i] = '\t'; 1104 l.t[i] = '\t';
1118 rp[i] = base_rend; 1105 l.r[i] = base_rend;
1119 1106
1120 while (++i < x) 1107 while (++i < x)
1121 { 1108 {
1122 tp[i] = NOCHAR; 1109 l.t[i] = NOCHAR;
1123 rp[i] = base_rend; 1110 l.r[i] = base_rend;
1124 } 1111 }
1125 } 1112 }
1126 } 1113 }
1127 else /* if (count < 0) */ 1114 else /* if (count < 0) */
1128 { 1115 {
… …
1155{ 1142{
1156 if (screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1158 else 1145 else
1159 { 1146 {
1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1147 if (save[screen.cur.row + saveLines].l == 0)
1161 return; /* um, yeah? */ 1148 return; /* um, yeah? */
1162 1149
1163 scr_insdel_chars (1, INSERT); 1150 scr_insdel_chars (1, INSERT);
1164 } 1151 }
1165} 1152}
… …
1175void 1162void
1176rxvt_term::scr_forwardindex () 1163rxvt_term::scr_forwardindex ()
1177{ 1164{
1178 int row; 1165 int row;
1179 1166
1180 if (screen.cur.col < TermWin.ncol - 1) 1167 if (screen.cur.col < ncol - 1)
1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1182 else 1169 else
1183 { 1170 {
1184 row = screen.cur.row + TermWin.saveLines; 1171 row = screen.cur.row + saveLines;
1185 1172
1186 if (screen.tlen[row] == 0) 1173 if (save[row].l == 0)
1187 return; /* um, yeah? */ 1174 return; /* um, yeah? */
1188 else if (screen.tlen[row] == -1) 1175 else if (save[row].l == -1)
1189 screen.tlen[row] = TermWin.ncol; 1176 save[row].l = ncol;
1190 1177
1191 scr_gotorc (0, 0, R_RELATIVE); 1178 scr_gotorc (0, 0, R_RELATIVE);
1192 scr_insdel_chars (1, DELETE); 1179 scr_insdel_chars (1, DELETE);
1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1180 scr_gotorc (0, ncol - 1, R_RELATIVE);
1194 } 1181 }
1195} 1182}
1196#endif 1183#endif
1197 1184
1198/* ------------------------------------------------------------------------- */ 1185/* ------------------------------------------------------------------------- */
… …
1205 want_refresh = 1; 1192 want_refresh = 1;
1206 ZERO_SCROLLBACK (); 1193 ZERO_SCROLLBACK ();
1207 1194
1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1209 MAX_IT (screen.cur.col, 0); 1196 MAX_IT (screen.cur.col, 0);
1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1211 1198
1212 screen.flags &= ~Screen_WrapNext; 1199 screen.flags &= ~Screen_WrapNext;
1213 1200
1214 if (relative & R_RELATIVE) 1201 if (relative & R_RELATIVE)
1215 { 1202 {
… …
1240 else 1227 else
1241 screen.cur.row = row; 1228 screen.cur.row = row;
1242 } 1229 }
1243 1230
1244 MAX_IT (screen.cur.row, 0); 1231 MAX_IT (screen.cur.row, 0);
1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1246} 1233}
1247 1234
1248/* ------------------------------------------------------------------------- */ 1235/* ------------------------------------------------------------------------- */
1249/* 1236/*
1250 * direction should be UP or DN 1237 * direction should be UP or DN
… …
1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1267 else 1254 else
1268 screen.cur.row += dirn; 1255 screen.cur.row += dirn;
1269 1256
1270 MAX_IT (screen.cur.row, 0); 1257 MAX_IT (screen.cur.row, 0);
1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1272 selection_check (0); 1259 selection_check (0);
1273} 1260}
1274 1261
1275/* ------------------------------------------------------------------------- */ 1262/* ------------------------------------------------------------------------- */
1276/* 1263/*
… …
1287 want_refresh = 1; 1274 want_refresh = 1;
1288 ZERO_SCROLLBACK (); 1275 ZERO_SCROLLBACK ();
1289 1276
1290 selection_check (1); 1277 selection_check (1);
1291 1278
1292 row = TermWin.saveLines + screen.cur.row; 1279 row = saveLines + screen.cur.row;
1280
1293 switch (mode) 1281 switch (mode)
1294 { 1282 {
1295 case 0: /* erase to end of line */ 1283 case 0: /* erase to end of line */
1296 col = screen.cur.col; 1284 col = screen.cur.col;
1297 num = TermWin.ncol - col; 1285 num = ncol - col;
1298 MIN_IT (screen.tlen[row], (int16_t)col); 1286 MIN_IT (save[row].l, (int16_t)col);
1299 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1300 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1301 CLEAR_SELECTION (); 1289 CLEAR_SELECTION ();
1302 break; 1290 break;
1303 case 1: /* erase to beginning of line */ 1291 case 1: /* erase to beginning of line */
… …
1307 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1308 CLEAR_SELECTION (); 1296 CLEAR_SELECTION ();
1309 break; 1297 break;
1310 case 2: /* erase whole line */ 1298 case 2: /* erase whole line */
1311 col = 0; 1299 col = 0;
1312 num = TermWin.ncol; 1300 num = ncol;
1313 screen.tlen[row] = 0; 1301 save[row].l = 0;
1314 if (selection.beg.row <= screen.cur.row 1302 if (selection.beg.row <= screen.cur.row
1315 && selection.end.row >= screen.cur.row) 1303 && selection.end.row >= screen.cur.row)
1316 CLEAR_SELECTION (); 1304 CLEAR_SELECTION ();
1317 break; 1305 break;
1318 default: 1306 default:
1319 return; 1307 return;
1320 } 1308 }
1321 1309
1322 if (screen.text[row]) 1310 if (save[row].t)
1323 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); 1311 scr_blank_line (save[row], col, num, rstyle);
1324 else 1312 else
1325 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1313 scr_blank_screen_mem (save[row], rstyle);
1326} 1314}
1327 1315
1328/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1329/* 1317/*
1330 * Erase part of whole of the screen 1318 * Erase part of whole of the screen
… …
1341 XGCValues gcvalue; 1329 XGCValues gcvalue;
1342 1330
1343 want_refresh = 1; 1331 want_refresh = 1;
1344 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1345 1333
1346 row_offset = (int32_t)TermWin.saveLines; 1334 row_offset = (int32_t)saveLines;
1347 1335
1348 switch (mode) 1336 switch (mode)
1349 { 1337 {
1350 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1351 selection_check (1); 1339 selection_check (1);
1352 scr_erase_line (0); 1340 scr_erase_line (0);
1353 row = screen.cur.row + 1; /* possible OOB */ 1341 row = screen.cur.row + 1; /* possible OOB */
1354 num = TermWin.nrow - row; 1342 num = nrow - row;
1355 break; 1343 break;
1356 case 1: /* erase to beginning of screen */ 1344 case 1: /* erase to beginning of screen */
1357 selection_check (3); 1345 selection_check (3);
1358 scr_erase_line (1); 1346 scr_erase_line (1);
1359 row = 0; 1347 row = 0;
1360 num = screen.cur.row; 1348 num = screen.cur.row;
1361 break; 1349 break;
1362 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1363 selection_check (3); 1351 selection_check (3);
1364 row = 0; 1352 row = 0;
1365 num = TermWin.nrow; 1353 num = nrow;
1366 break; 1354 break;
1367 default: 1355 default:
1368 return; 1356 return;
1369 } 1357 }
1370 1358
… …
1372 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1360 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1373 || (selection.end.row >= row 1361 || (selection.end.row >= row
1374 && selection.end.row <= row + num))) 1362 && selection.end.row <= row + num)))
1375 CLEAR_SELECTION (); 1363 CLEAR_SELECTION ();
1376 1364
1377 if (row >= TermWin.nrow) /* Out Of Bounds */ 1365 if (row >= nrow) /* Out Of Bounds */
1378 return; 1366 return;
1379 1367
1380 MIN_IT (num, (TermWin.nrow - row)); 1368 MIN_IT (num, (nrow - row));
1381 1369
1382 if (rstyle & (RS_RVid | RS_Uline)) 1370 if (rstyle & (RS_RVid | RS_Uline))
1383 ren = (rend_t) ~RS_None; 1371 ren = (rend_t) ~RS_None;
1384 else if (GET_BASEBG (rstyle) == Color_bg) 1372 else if (GET_BASEBG (rstyle) == Color_bg)
1385 { 1373 {
… …
1388 } 1376 }
1389 else 1377 else
1390 { 1378 {
1391 ren = rstyle & (RS_fgMask | RS_bgMask); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1381 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1394 ERASE_ROWS (row, num); 1382 ERASE_ROWS (row, num);
1395 gcvalue.foreground = pix_colors[Color_fg]; 1383 gcvalue.foreground = pix_colors[Color_fg];
1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1384 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1397 } 1385 }
1398 1386
1399 for (; num--; row++) 1387 for (; num--; row++)
1400 { 1388 {
1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1389 scr_blank_screen_mem (save[row + row_offset], rstyle);
1402 screen.tlen[row + row_offset] = 0; 1390 save[row + row_offset].l = 0;
1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1391 scr_blank_line (drawn[row], 0, ncol, ren);
1404 } 1392 }
1405} 1393}
1406 1394
1407#if ENABLE_FRILLS 1395#if ENABLE_FRILLS
1408void 1396void
1409rxvt_term::scr_erase_savelines () 1397rxvt_term::scr_erase_savelines ()
1410{ 1398{
1411 want_refresh = 1; 1399 want_refresh = 1;
1412 ZERO_SCROLLBACK (); 1400 ZERO_SCROLLBACK ();
1413 1401
1414 TermWin.nscrolled = 0; 1402 nscrolled = 0;
1415} 1403}
1416#endif 1404#endif
1417 1405
1418/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1419/* 1407/*
… …
1431 1419
1432 num_scr_allow = 0; 1420 num_scr_allow = 0;
1433 selection_check (3); 1421 selection_check (3);
1434 1422
1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1424 for (k = saveLines, i = nrow; i--; k++)
1437 { 1425 {
1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1426 save[k].l = ncol; /* make the `E's selectable */
1439 fill_text (screen.text[k], 'E', TermWin.ncol); 1427 fill_text (save[k].t, 'E', ncol);
1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1428 for (r1 = save[k].r, j = ncol; j--; )
1441 *r1++ = fs; 1429 *r1++ = fs;
1442 } 1430 }
1443} 1431}
1444 1432
1445/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
… …
1479void 1467void
1480rxvt_term::scr_insdel_chars (int count, int insdel) 1468rxvt_term::scr_insdel_chars (int count, int insdel)
1481{ 1469{
1482 int col, row; 1470 int col, row;
1483 rend_t tr; 1471 rend_t tr;
1484 text_t *stp;
1485 rend_t *srp;
1486 int16_t *slp;
1487 1472
1488 want_refresh = 1; 1473 want_refresh = 1;
1489 ZERO_SCROLLBACK (); 1474 ZERO_SCROLLBACK ();
1490 1475
1491 if (count <= 0) 1476 if (count <= 0)
1492 return; 1477 return;
1493 1478
1494 scr_do_wrap (); 1479 scr_do_wrap ();
1495 1480
1496 selection_check (1); 1481 selection_check (1);
1497 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1482 MIN_IT (count, (ncol - screen.cur.col));
1498 1483
1499 row = screen.cur.row + TermWin.saveLines; 1484 row = screen.cur.row + saveLines;
1500 1485
1501 stp = screen.text[row]; 1486 line_t *line = save + row;
1502 srp = screen.rend[row];
1503 slp = &screen.tlen[row];
1504 1487
1505 switch (insdel) 1488 switch (insdel)
1506 { 1489 {
1507 case INSERT: 1490 case INSERT:
1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1509 { 1492 {
1510 stp[col] = stp[col - count]; 1493 line->t[col] = line->t[col - count];
1511 srp[col] = srp[col - count]; 1494 line->r[col] = line->r[col - count];
1512 } 1495 }
1513 1496
1514 if (*slp != -1) 1497 if (line->l != -1)
1515 { 1498 {
1516 *slp += count; 1499 line->l += count;
1517 MIN_IT (*slp, TermWin.ncol); 1500 MIN_IT (line->l, ncol);
1518 } 1501 }
1519 1502
1520 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1521 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1522 { 1505 {
1523 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
1524 || (selection.end.col + count >= TermWin.ncol)) 1507 || (selection.end.col + count >= ncol))
1525 CLEAR_SELECTION (); 1508 CLEAR_SELECTION ();
1526 else 1509 else
1527 { /* shift selection */ 1510 { /* shift selection */
1528 selection.beg.col += count; 1511 selection.beg.col += count;
1529 selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1530 selection.end.col += count; 1513 selection.end.col += count;
1531 } 1514 }
1532 } 1515 }
1533 1516
1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1517 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1535 (unsigned int)count, rstyle);
1536 break; 1518 break;
1537 1519
1538 case ERASE: 1520 case ERASE:
1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1540 selection_check (1); 1522 selection_check (1);
1541 screen.cur.col -= count; 1523 screen.cur.col -= count;
1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1524 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1543 (unsigned int)count, rstyle);
1544 break; 1525 break;
1545 1526
1546 case DELETE: 1527 case DELETE:
1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1548 1529
1549 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1530 for (col = screen.cur.col; (col + count) < ncol; col++)
1550 { 1531 {
1551 stp[col] = stp[col + count]; 1532 line->t[col] = line->t[col + count];
1552 srp[col] = srp[col + count]; 1533 line->r[col] = line->r[col + count];
1553 } 1534 }
1554 1535
1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1536 scr_blank_line (*line, ncol - count, count, tr);
1556 (unsigned int)count, tr);
1557 1537
1558 if (*slp == -1) /* break line continuation */ 1538 if (line->l == -1) /* break line continuation */
1559 *slp = TermWin.ncol; 1539 line->l = ncol;
1560 1540
1561 *slp -= count; 1541 line->l -= count;
1562 MAX_IT (*slp, 0); 1542 MAX_IT (line->l, 0);
1563 1543
1564 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1565 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1566 { 1546 {
1567 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
1568 || (screen.cur.col >= selection.beg.col - count) 1548 || (screen.cur.col >= selection.beg.col - count)
1569 || selection.end.col >= TermWin.ncol) 1549 || selection.end.col >= ncol)
1570 CLEAR_SELECTION (); 1550 CLEAR_SELECTION ();
1571 else 1551 else
1572 { 1552 {
1573 /* shift selection */ 1553 /* shift selection */
1574 selection.beg.col -= count; 1554 selection.beg.col -= count;
… …
1588 */ 1568 */
1589void 1569void
1590rxvt_term::scr_scroll_region (int top, int bot) 1570rxvt_term::scr_scroll_region (int top, int bot)
1591{ 1571{
1592 MAX_IT (top, 0); 1572 MAX_IT (top, 0);
1593 MIN_IT (bot, (int)TermWin.nrow - 1); 1573 MIN_IT (bot, (int)nrow - 1);
1594 1574
1595 if (top > bot) 1575 if (top > bot)
1596 return; 1576 return;
1597 1577
1598 screen.tscroll = top; 1578 screen.tscroll = top;
… …
1677 */ 1657 */
1678void 1658void
1679rxvt_term::scr_set_tab (int mode) 1659rxvt_term::scr_set_tab (int mode)
1680{ 1660{
1681 if (mode < 0) 1661 if (mode < 0)
1682 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1662 memset (tabs, 0, ncol * sizeof (char));
1683 else if (screen.cur.col < TermWin.ncol) 1663 else if (screen.cur.col < ncol)
1684 tabs[screen.cur.col] = (mode ? 1 : 0); 1664 tabs[screen.cur.col] = (mode ? 1 : 0);
1685} 1665}
1686 1666
1687/* ------------------------------------------------------------------------- */ 1667/* ------------------------------------------------------------------------- */
1688/* 1668/*
… …
1703 if (bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1704#endif 1684#endif
1705#if TRANSPARENT 1685#if TRANSPARENT
1706 if (! (options & Opt_transparent) || am_transparent == 0) 1686 if (! (options & Opt_transparent) || am_transparent == 0)
1707#endif 1687#endif
1708 XSetWindowBackground (display->display, TermWin.vt, 1688 XSetWindowBackground (display->display, vt,
1709 pix_colors[Color_bg]); 1689 pix_colors[Color_bg]);
1710 1690
1711 gcvalue.foreground = pix_colors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
1712 gcvalue.background = pix_colors[Color_bg]; 1692 gcvalue.background = pix_colors[Color_bg];
1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1693 XChangeGC (display->display, gc, GCBackground | GCForeground,
1714 &gcvalue); 1694 &gcvalue);
1715 scr_clear (); 1695 scr_clear ();
1716 scr_touch (true); 1696 scr_touch (true);
1717 } 1697 }
1718} 1698}
… …
1799bool 1779bool
1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1780rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1801{ 1781{
1802 bool found = false; 1782 bool found = false;
1803 1783
1804 for (int i = 0; i < TermWin.nrow; i++) 1784 for (int i = 0; i < nrow; i++)
1805 { 1785 {
1806 int col = 0; 1786 int col = 0;
1807 rend_t *drp = drawn_rend [i]; 1787 rend_t *drp = drawn[i].r;
1808 1788
1809 for (; col < TermWin.ncol; col++, drp++) 1789 for (; col < ncol; col++, drp++)
1810 if ((*drp & mask) == value) 1790 if ((*drp & mask) == value)
1811 { 1791 {
1812 found = true; 1792 found = true;
1813 *drp = ~value; 1793 *drp = ~value;
1814 } 1794 }
… …
1825 PART_END, 1805 PART_END,
1826 RC_COUNT 1806 RC_COUNT
1827}; 1807};
1828 1808
1829void 1809void
1830rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1831{ 1811{
1832 int i; 1812 int i;
1833 row_col_t rc[RC_COUNT]; 1813 row_col_t rc[RC_COUNT];
1834 1814
1835 if (drawn_text == NULL) /* sanity check */ 1815 if (!drawn) /* sanity check */
1836 return; 1816 return;
1837 1817
1838#ifndef NO_SLOW_LINK_SUPPORT 1818#ifndef NO_SLOW_LINK_SUPPORT
1839 if (refresh_type == FAST_REFRESH && !display->is_local) 1819 if (refresh_type == FAST_REFRESH && !display->is_local)
1840 { 1820 {
1841 y = 0; 1821 y = 0;
1842 height = TermWin.height; 1822 eheight = height;
1843 } 1823 }
1844#endif 1824#endif
1845 1825
1846#ifdef DEBUG_STRICT 1826#ifdef DEBUG_STRICT
1847 x = max (x, 0); 1827 x = max (x, 0);
1848 x = min (x, (int)TermWin.width); 1828 x = min (x, (int)width);
1849 y = max (y, 0); 1829 y = max (y, 0);
1850 y = min (y, (int)TermWin.height); 1830 y = min (y, (int)height);
1851#endif 1831#endif
1852 1832
1853 /* round down */ 1833 /* round down */
1854 rc[PART_BEG].col = Pixel2Col (x); 1834 rc[PART_BEG].col = Pixel2Col (x);
1855 rc[PART_BEG].row = Pixel2Row (y); 1835 rc[PART_BEG].row = Pixel2Row (y);
1856 /* round up */ 1836 /* round up */
1857 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1837 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1858 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1859 1839
1860 /* sanity checks */ 1840 /* sanity checks */
1861 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1862 { 1842 {
1863 MIN_IT (rc[i].col, TermWin.ncol - 1); 1843 MIN_IT (rc[i].col, ncol - 1);
1864 MIN_IT (rc[i].row, TermWin.nrow - 1); 1844 MIN_IT (rc[i].row, nrow - 1);
1865 } 1845 }
1866 1846
1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1868 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1869 1849
1870 if (refresh) 1850 if (refresh)
1871 scr_refresh (SLOW_REFRESH); 1851 scr_refresh (SLOW_REFRESH);
1872} 1852}
1873 1853
… …
1876 * Refresh the entire screen 1856 * Refresh the entire screen
1877 */ 1857 */
1878void 1858void
1879rxvt_term::scr_touch (bool refresh) 1859rxvt_term::scr_touch (bool refresh)
1880{ 1860{
1881 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1861 scr_expose (0, 0, width, height, refresh);
1882} 1862}
1883 1863
1884/* ------------------------------------------------------------------------- */ 1864/* ------------------------------------------------------------------------- */
1885/* 1865/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1866 * Move the display so that the line represented by scrollbar value Y is at
… …
1890rxvt_term::scr_move_to (int y, int len) 1870rxvt_term::scr_move_to (int y, int len)
1891{ 1871{
1892 long p = 0; 1872 long p = 0;
1893 unsigned int oldviewstart; 1873 unsigned int oldviewstart;
1894 1874
1895 oldviewstart = TermWin.view_start; 1875 oldviewstart = view_start;
1896 1876
1897 if (y < len) 1877 if (y < len)
1898 { 1878 {
1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1879 p = (nrow + nscrolled) * (len - y) / len;
1900 p -= (long) (TermWin.nrow - 1); 1880 p -= (long) (nrow - 1);
1901 p = max (p, 0); 1881 p = max (p, 0);
1902 } 1882 }
1903 1883
1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1884 view_start = (unsigned int)min (p, nscrolled);
1905 1885
1906 return scr_changeview (oldviewstart); 1886 return scr_changeview (oldviewstart);
1907} 1887}
1908 1888
1909/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
… …
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) 1895rxvt_term::scr_page (enum page_dirn direction, int nlines)
1916{ 1896{
1917 int n; 1897 int n;
1918 unsigned int oldviewstart; 1898 unsigned int oldviewstart;
1919 1899
1920 oldviewstart = TermWin.view_start; 1900 oldviewstart = view_start;
1921 1901
1922 if (direction == UP) 1902 if (direction == UP)
1923 { 1903 {
1924 n = TermWin.view_start + nlines; 1904 n = view_start + nlines;
1925 TermWin.view_start = min (n, TermWin.nscrolled); 1905 view_start = min (n, nscrolled);
1926 } 1906 }
1927 else 1907 else
1928 { 1908 {
1929 n = TermWin.view_start - nlines; 1909 n = view_start - nlines;
1930 TermWin.view_start = max (n, 0); 1910 view_start = max (n, 0);
1931 } 1911 }
1932 1912
1933 return scr_changeview (oldviewstart); 1913 return scr_changeview (oldviewstart);
1934} 1914}
1935 1915
1936int 1916int
1937rxvt_term::scr_changeview (unsigned int oldviewstart) 1917rxvt_term::scr_changeview (unsigned int oldviewstart)
1938{ 1918{
1939 if (TermWin.view_start != oldviewstart) 1919 if (view_start != oldviewstart)
1940 { 1920 {
1941 want_refresh = 1; 1921 want_refresh = 1;
1942 num_scr -= (TermWin.view_start - oldviewstart); 1922 num_scr -= (view_start - oldviewstart);
1943 } 1923 }
1944 1924
1945 return (int) (TermWin.view_start - oldviewstart); 1925 return (int) (view_start - oldviewstart);
1946} 1926}
1947 1927
1948/* ------------------------------------------------------------------------- */ 1928/* ------------------------------------------------------------------------- */
1949void 1929void
1950rxvt_term::scr_bell () 1930rxvt_term::scr_bell ()
… …
1953 1933
1954# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1955# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1956 if (options & Opt_mapAlert) 1936 if (options & Opt_mapAlert)
1957# endif 1937# endif
1958 XMapWindow (display->display, TermWin.parent[0]); 1938 XMapWindow (display->display, parent[0]);
1959# endif 1939# endif
1960 1940
1961 if (options & Opt_visualBell) 1941 if (options & Opt_visualBell)
1962 { 1942 {
1963 scr_rvideo_mode (!rvideo); /* refresh also done */ 1943 scr_rvideo_mode (!rvideo); /* refresh also done */
… …
1980 FILE *fd; 1960 FILE *fd;
1981 1961
1982 if ((fd = popen_printer ()) == NULL) 1962 if ((fd = popen_printer ()) == NULL)
1983 return; 1963 return;
1984 1964
1985 nrows = TermWin.nrow; 1965 nrows = nrow;
1986 row_offset = TermWin.saveLines; 1966 row_offset = saveLines;
1987 1967
1988 if (!fullhist) 1968 if (!fullhist)
1989 row_offset -= TermWin.view_start; 1969 row_offset -= view_start;
1990 else 1970 else
1991 { 1971 {
1992 nrows += TermWin.nscrolled; 1972 nrows += nscrolled;
1993 row_offset -= TermWin.nscrolled; 1973 row_offset -= nscrolled;
1994 } 1974 }
1995 1975
1996 wctomb (0, 0); 1976 wctomb (0, 0);
1997 1977
1998 for (r1 = 0; r1 < nrows; r1++) 1978 for (r1 = 0; r1 < nrows; r1++)
1999 { 1979 {
2000 text_t *tp = screen.text[r1 + row_offset]; 1980 text_t *tp = save[r1 + row_offset].t;
2001 int len = screen.tlen[r1 + row_offset]; 1981 int len = save[r1 + row_offset].l;
2002 1982
2003 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1983 for (i = len >= 0 ? len : ncol - 1; i--; )
2004 { 1984 {
2005 char mb[MB_LEN_MAX]; 1985 char mb[MB_LEN_MAX];
2006 text_t t = *tp++; 1986 text_t t = *tp++;
2007 if (t == NOCHAR) 1987 if (t == NOCHAR)
2008 continue; 1988 continue;
… …
2045#endif 2025#endif
2046 rend_t *crp; // cursor rendition pointer 2026 rend_t *crp; // cursor rendition pointer
2047 2027
2048 want_refresh = 0; /* screen is current */ 2028 want_refresh = 0; /* screen is current */
2049 2029
2050 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2030 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 2031 return;
2052 2032
2053 /* 2033 /*
2054 * A: set up vars 2034 * A: set up vars
2055 */ 2035 */
2056 must_clear = 0; 2036 must_clear = 0;
2057 refresh_count = 0; 2037 refresh_count = 0;
2058 2038
2059 row_offset = TermWin.saveLines - TermWin.view_start; 2039 row_offset = saveLines - view_start;
2060 2040
2061#if XPM_BACKGROUND 2041#if XPM_BACKGROUND
2062 must_clear |= bgPixmap.pixmap != None; 2042 must_clear |= bgPixmap.pixmap != None;
2063#endif 2043#endif
2064#if TRANSPARENT 2044#if TRANSPARENT
… …
2087 2067
2088 if (showcursor) 2068 if (showcursor)
2089 { 2069 {
2090 int col = screen.cur.col; 2070 int col = screen.cur.col;
2091 2071
2092 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)
2093 col--; 2073 col--;
2094 2074
2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2075 crp = &screen.line[screen.cur.row]->r[col];
2096 2076
2097 if (showcursor && TermWin.focus) 2077 if (showcursor && focus)
2098 { 2078 {
2099 if (options & Opt_cursorUnderline) 2079 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline; 2080 *crp ^= RS_Uline;
2101 else 2081 else
2102 { 2082 {
… …
2129 2109
2130 /* make sure no outline cursor is left around */ 2110 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2111 setoldcursor = 0;
2132 if (ocrow != -1) 2112 if (ocrow != -1)
2133 { 2113 {
2134 if (screen.cur.row + TermWin.view_start != ocrow 2114 if (screen.cur.row + view_start != ocrow
2135 || screen.cur.col != oldcursor.col) 2115 || screen.cur.col != oldcursor.col)
2136 { 2116 {
2137 if (ocrow < TermWin.nrow 2117 if (ocrow < nrow
2138 && oldcursor.col < TermWin.ncol) 2118 && oldcursor.col < ncol)
2139 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140 2120
2141 if (TermWin.focus || !showcursor) 2121 if (focus || !showcursor)
2142 oldcursor.row = -1; 2122 oldcursor.row = -1;
2143 else 2123 else
2144 setoldcursor = 1; 2124 setoldcursor = 1;
2145 } 2125 }
2146 } 2126 }
2147 else if (!TermWin.focus) 2127 else if (!focus)
2148 setoldcursor = 1; 2128 setoldcursor = 1;
2149 2129
2150 if (setoldcursor) 2130 if (setoldcursor)
2151 { 2131 {
2152 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2132 if (screen.cur.row + view_start >= nrow)
2153 oldcursor.row = -1; 2133 oldcursor.row = -1;
2154 else 2134 else
2155 { 2135 {
2156 oldcursor.row = screen.cur.row + TermWin.view_start; 2136 oldcursor.row = screen.cur.row + view_start;
2157 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2158 } 2138 }
2159 } 2139 }
2160 } 2140 }
2161 2141
… …
2169 * This has been deliberately kept simple. 2149 * This has been deliberately kept simple.
2170 */ 2150 */
2171 i = num_scr; 2151 i = num_scr;
2172 if (!display->is_local 2152 if (!display->is_local
2173 && refresh_type == FAST_REFRESH && num_scr_allow && i 2153 && refresh_type == FAST_REFRESH && num_scr_allow && i
2174 && abs (i) < TermWin.nrow && !must_clear) 2154 && abs (i) < nrow && !must_clear)
2175 { 2155 {
2176 int16_t nits; 2156 int16_t nits;
2177 int j; 2157 int j;
2178 int len, wlen; 2158 int len, wlen;
2179 2159
2180 j = TermWin.nrow; 2160 j = nrow;
2181 wlen = len = -1; 2161 wlen = len = -1;
2182 row = i > 0 ? 0 : j - 1; 2162 row = i > 0 ? 0 : j - 1;
2183 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2184 { 2164 {
2185 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2186 { 2166 {
2187 text_t *stp = screen.text[row + row_offset]; 2167 line_t s = save[row + row_offset];
2188 rend_t *srp = screen.rend[row + row_offset];
2189 text_t *dtp = drawn_text[row]; 2168 line_t d = drawn[row];
2190 text_t *dtp2 = drawn_text[row + i]; 2169 line_t d2 = drawn[row + i];
2191 rend_t *drp = drawn_rend[row];
2192 rend_t *drp2 = drawn_rend[row + i];
2193 2170
2194 for (nits = 0, col = TermWin.ncol; col--; ) 2171 for (nits = 0, col = ncol; col--; )
2195 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2196 nits--; 2173 nits--;
2197 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2198 nits++; 2175 nits++;
2199 2176
2200 if (nits > 8) /* XXX: arbitrary choice */ 2177 if (nits > 8) /* XXX: arbitrary choice */
2201 { 2178 {
2202 for (col = TermWin.ncol; col--; ) 2179 for (col = ncol; col--; )
2203 { 2180 {
2204 *dtp++ = *dtp2++; 2181 *d.t++ = *d2.t++;
2205 *drp++ = *drp2++; 2182 *d.r++ = *d2.r++;
2206 } 2183 }
2207 2184
2208 if (len == -1) 2185 if (len == -1)
2209 len = row; 2186 len = row;
2210 2187
… …
2217 { 2194 {
2218 /* also comes here at end if needed because of >= above */ 2195 /* also comes here at end if needed because of >= above */
2219 if (wlen < len) 2196 if (wlen < len)
2220 SWAP_IT (wlen, len, int); 2197 SWAP_IT (wlen, len, int);
2221 2198
2222 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2199 XCopyArea (display->display, vt, vt,
2223 TermWin.gc, 0, Row2Pixel (len + i), 2200 gc, 0, Row2Pixel (len + i),
2224 (unsigned int)TermWin_TotalWidth (), 2201 (unsigned int)TermWin_TotalWidth (),
2225 (unsigned int)Height2Pixel (wlen - len + 1), 2202 (unsigned int)Height2Pixel (wlen - len + 1),
2226 0, Row2Pixel (len)); 2203 0, Row2Pixel (len));
2227 len = -1; 2204 len = -1;
2228 } 2205 }
… …
2231#endif 2208#endif
2232 2209
2233 /* 2210 /*
2234 * E: main pass across every character 2211 * E: main pass across every character
2235 */ 2212 */
2236 for (row = 0; row < TermWin.nrow; row++) 2213 for (row = 0; row < nrow; row++)
2237 { 2214 {
2238 text_t *stp = screen.text[row + row_offset]; 2215 text_t *stp = save[row + row_offset].t;
2239 rend_t *srp = screen.rend[row + row_offset]; 2216 rend_t *srp = save[row + row_offset].r;
2240 text_t *dtp = drawn_text[row]; 2217 text_t *dtp = drawn[row].t;
2241 rend_t *drp = drawn_rend[row]; 2218 rend_t *drp = drawn[row].r;
2242 2219
2243 /* 2220 /*
2244 * E2: OK, now the real pass 2221 * E2: OK, now the real pass
2245 */ 2222 */
2246 int ypixel = (int)Row2Pixel (row); 2223 int ypixel = (int)Row2Pixel (row);
2247 2224
2248 for (col = 0; col < TermWin.ncol; col++) 2225 for (col = 0; col < ncol; col++)
2249 { 2226 {
2250 /* compare new text with old - if exactly the same then continue */ 2227 /* compare new text with old - if exactly the same then continue */
2251 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2228 if (stp[col] == dtp[col] /* Must match characters to skip. */
2252 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2229 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2253 || (stp[col] == ' ' /* space w/ no background change */ 2230 || (stp[col] == ' ' /* space w/ no background change */
… …
2267 dtp[col] = stp[col]; 2244 dtp[col] = stp[col];
2268 drp[col] = rend; 2245 drp[col] = rend;
2269 2246
2270 int xpixel = Col2Pixel (col); 2247 int xpixel = Col2Pixel (col);
2271 2248
2272 for (i = 0; ++col < TermWin.ncol; ) 2249 for (i = 0; ++col < ncol; )
2273 { 2250 {
2274 if (stp[col] == NOCHAR) 2251 if (stp[col] == NOCHAR)
2275 { 2252 {
2276 dtp[col] = stp[col]; 2253 dtp[col] = stp[col];
2277 drp[col] = rend; 2254 drp[col] = rend;
… …
2316 // only do special processing if any attributes are set, which is rare 2293 // only do special processing if any attributes are set, which is rare
2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2294 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2318 { 2295 {
2319#if ENABLE_STYLES 2296#if ENABLE_STYLES
2320 // force redraw after "careful" characters to avoid pixel droppings 2297 // force redraw after "careful" characters to avoid pixel droppings
2321 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) 2298 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2322 drp[col + 1] = ~srp[col + 1]; 2299 drp[col + 1] = ~srp[col + 1];
2323 2300
2324 // include previous careful character(s) if possible, looks nicer (best effort...) 2301 // include previous careful character(s) if possible, looks nicer (best effort...)
2325 while (text > stp 2302 while (text > stp
2326 && srp[text - stp - 1] & RS_Careful 2303 && srp[text - stp - 1] & RS_Careful
2327 && RS_SAME (rend, srp[text - stp - 1])) 2304 && RS_SAME (rend, srp[text - stp - 1]))
2328 text--, count++, xpixel -= TermWin.fwidth; 2305 text--, count++, xpixel -= fwidth;
2329#endif 2306#endif
2330 2307
2331 bool invert = rend & RS_RVid; 2308 bool invert = rend & RS_RVid;
2332 2309
2333#ifndef NO_BOLD_UNDERLINE_REVERSE 2310#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2388 } 2365 }
2389 2366
2390 /* 2367 /*
2391 * Actually do the drawing of the string here 2368 * Actually do the drawing of the string here
2392 */ 2369 */
2393 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2370 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2371
2395 if (back == fore) 2372 if (back == fore)
2396 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2373 font->clear_rect (*drawable, xpixel, ypixel,
2397 TermWin.fwidth * count, TermWin.fheight, 2374 fwidth * count, fheight,
2398 back); 2375 back);
2399 else if (back == Color_bg) 2376 else if (back == Color_bg)
2400 { 2377 {
2401 if (must_clear) 2378 if (must_clear)
2402 { 2379 {
2403 CLEAR_CHARS (xpixel, ypixel, count); 2380 CLEAR_CHARS (xpixel, ypixel, count);
2404 2381
2405 for (i = 0; i < count; i++) /* don't draw empty strings */ 2382 for (i = 0; i < count; i++) /* don't draw empty strings */
2406 if (text[i] != ' ') 2383 if (text[i] != ' ')
2407 { 2384 {
2408 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2385 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2409 break; 2386 break;
2410 } 2387 }
2411 } 2388 }
2412 else 2389 else
2413 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2390 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2414 } 2391 }
2415 else 2392 else
2416 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2393 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2417 2394
2418 if (rend & RS_Uline && font->descent > 1 && fore != back) 2395 if (rend & RS_Uline && font->descent > 1 && fore != back)
2419 { 2396 {
2420#if ENABLE_FRILLS 2397#if ENABLE_FRILLS
2421 if (ISSET_PIXCOLOR (Color_underline)) 2398 if (ISSET_PIXCOLOR (Color_underline))
2422 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2399 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2423 else 2400 else
2424#endif 2401#endif
2425 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2402 XSetForeground (display->display, gc, pix_colors[fore]);
2426 2403
2427 XDrawLine (display->display, drawBuffer, TermWin.gc, 2404 XDrawLine (display->display, drawBuffer, gc,
2428 xpixel, ypixel + font->ascent + 1, 2405 xpixel, ypixel + font->ascent + 1,
2429 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2406 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2430 } 2407 }
2431 } /* for (col....) */ 2408 } /* for (col....) */
2432 } /* for (row....) */ 2409 } /* for (row....) */
… …
2438 /* 2415 /*
2439 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2440 */ 2417 */
2441 if (showcursor) 2418 if (showcursor)
2442 { 2419 {
2443 if (TermWin.focus) 2420 if (focus)
2444 { 2421 {
2445 if (options & Opt_cursorUnderline) 2422 if (options & Opt_cursorUnderline)
2446 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2447 else 2424 else
2448 { 2425 {
… …
2455 else if (oldcursor.row >= 0) 2432 else if (oldcursor.row >= 0)
2456 { 2433 {
2457 int cursorwidth = 1; 2434 int cursorwidth = 1;
2458 int col = oldcursor.col; 2435 int col = oldcursor.col;
2459 2436
2460 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)
2461 col--; 2438 col--;
2462 2439
2463 while (col + cursorwidth < TermWin.ncol 2440 while (col + cursorwidth < ncol
2464 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) 2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2465 cursorwidth++; 2442 cursorwidth++;
2466 2443
2467#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2468 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2469 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2470#endif 2447#endif
2471 2448
2472 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2449 XDrawRectangle (display->display, drawBuffer, gc,
2473 Col2Pixel (col), 2450 Col2Pixel (col),
2474 Row2Pixel (oldcursor.row), 2451 Row2Pixel (oldcursor.row),
2475 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2452 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2476 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2453 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2477 } 2454 }
2478 } 2455 }
2479 2456
2480 /* 2457 /*
2481 * H: cleanup selection 2458 * H: cleanup selection
… …
2488 num_scr = 0; 2465 num_scr = 0;
2489 num_scr_allow = 1; 2466 num_scr_allow = 1;
2490} 2467}
2491 2468
2492void 2469void
2493rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2470rxvt_term::scr_remap_chars (const line_t &l)
2494{ 2471{
2495 if (!rp || !tp) 2472 if (!l.t)
2496 return; 2473 return;
2497 2474
2498 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2475 for (int i = ncol; i--; )
2499 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2476 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500} 2477}
2501 2478
2502void 2479void
2503rxvt_term::scr_remap_chars () 2480rxvt_term::scr_remap_chars ()
2504{ 2481{
2505 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2482 for (int i = nrow + saveLines; i--; )
2506 scr_remap_chars (screen.text[i], screen.rend[i]); 2483 scr_remap_chars (save[i]);
2507 2484
2508 for (int i = TermWin.nrow; i--; ) 2485 for (int i = nrow; i--; )
2509 { 2486 {
2510 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2487 scr_remap_chars (drawn[i]);
2511 scr_remap_chars (swap.text[i], swap.rend[i]); 2488 scr_remap_chars (swap_save[i]);
2512 } 2489 }
2513} 2490}
2514 2491
2515void 2492void
2516rxvt_term::scr_recolour () 2493rxvt_term::scr_recolour ()
… …
2522#if XPM_BACKGROUND 2499#if XPM_BACKGROUND
2523 && !bgPixmap.pixmap 2500 && !bgPixmap.pixmap
2524#endif 2501#endif
2525 ) 2502 )
2526 { 2503 {
2527 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2504 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2528 XClearWindow (display->display, TermWin.parent[0]); 2505 XClearWindow (display->display, parent[0]);
2529 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2506 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2530#if HAVE_SCROLLBARS 2507#if HAVE_SCROLLBARS
2531 if (scrollBar.win) 2508 if (scrollBar.win)
2532 { 2509 {
2533 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2510 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2534 scrollBar.setIdle (); 2511 scrollBar.setIdle ();
… …
2544 2521
2545/* ------------------------------------------------------------------------- */ 2522/* ------------------------------------------------------------------------- */
2546void 2523void
2547rxvt_term::scr_clear (bool really) 2524rxvt_term::scr_clear (bool really)
2548{ 2525{
2549 if (!TermWin.mapped) 2526 if (!mapped)
2550 return; 2527 return;
2551 2528
2552 num_scr_allow = 0; 2529 num_scr_allow = 0;
2553 want_refresh = 1; 2530 want_refresh = 1;
2554 2531
2555 if (really) 2532 if (really)
2556 XClearWindow (display->display, TermWin.vt); 2533 XClearWindow (display->display, vt);
2557} 2534}
2558 2535
2559/* ------------------------------------------------------------------------- */ 2536/* ------------------------------------------------------------------------- */
2560void 2537void
2561rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection ()
2562{ 2539{
2563 if (selection.op && current_screen == selection.screen) 2540 if (selection.op && current_screen == selection.screen)
2564 { 2541 {
2565 int end_row = TermWin.saveLines - TermWin.view_start; 2542 int end_row = saveLines - view_start;
2566 int i = selection.beg.row + TermWin.saveLines; 2543 int i = selection.beg.row + saveLines;
2567 int col, row = selection.end.row + TermWin.saveLines; 2544 int col, row = selection.end.row + saveLines;
2568 rend_t *srp; 2545 rend_t *srp;
2569 2546
2570#if ENABLE_FRILLS 2547#if ENABLE_FRILLS
2571 if (selection.rect) 2548 if (selection.rect)
2572 { 2549 {
2573 end_row += TermWin.nrow; 2550 end_row += nrow;
2574 2551
2575 for (; i <= row && i <= end_row; i++) 2552 for (; i <= row && i <= end_row; i++)
2576 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
2577 srp[col] ^= RS_RVid; 2554 srp[col] ^= RS_RVid;
2578 } 2555 }
2579 else 2556 else
2580#endif 2557#endif
2581 { 2558 {
… …
2585 { 2562 {
2586 col = 0; 2563 col = 0;
2587 i = end_row; 2564 i = end_row;
2588 } 2565 }
2589 2566
2590 end_row += TermWin.nrow; 2567 end_row += nrow;
2591 2568
2592 for (; i < row && i < end_row; i++, col = 0) 2569 for (; i < row && i < end_row; i++, col = 0)
2593 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2570 for (srp = save[i].r; col < ncol; col++)
2594 srp[col] ^= RS_RVid; 2571 srp[col] ^= RS_RVid;
2595 2572
2596 if (i == row && i < end_row) 2573 if (i == row && i < end_row)
2597 for (srp = screen.rend[i]; col < selection.end.col; col++) 2574 for (srp = save[i].r; col < selection.end.col; col++)
2598 srp[col] ^= RS_RVid; 2575 srp[col] ^= RS_RVid;
2599 } 2576 }
2600 } 2577 }
2601} 2578}
2602 2579
… …
2611{ 2588{
2612 int row, wrote; 2589 int row, wrote;
2613 unsigned int width, towrite; 2590 unsigned int width, towrite;
2614 char r1[] = "\n"; 2591 char r1[] = "\n";
2615 2592
2616 for (row = TermWin.saveLines - TermWin.nscrolled; 2593 for (row = saveLines - nscrolled;
2617 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2594 row < saveLines + nrow - 1; row++)
2618 { 2595 {
2619 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2596 width = save[row].l >= 0 ? save[row].l
2620 : TermWin.ncol; 2597 : ncol;
2621 for (towrite = width; towrite; towrite -= wrote) 2598 for (towrite = width; towrite; towrite -= wrote)
2622 { 2599 {
2623 wrote = write (fd, & (screen.text[row][width - towrite]), 2600 wrote = write (fd, & (save[row].t[width - towrite]),
2624 towrite); 2601 towrite);
2625 if (wrote < 0) 2602 if (wrote < 0)
2626 return; /* XXX: death, no report */ 2603 return; /* XXX: death, no report */
2627 } 2604 }
2628 if (screen.tlen[row] >= 0) 2605 if (save[row].l >= 0)
2629 if (write (fd, r1, 1) <= 0) 2606 if (write (fd, r1, 1) <= 0)
2630 return; /* XXX: death, no report */ 2607 return; /* XXX: death, no report */
2631 } 2608 }
2632} 2609}
2633#endif 2610#endif
… …
2635/* ------------------------------------------------------------------------- * 2612/* ------------------------------------------------------------------------- *
2636 * CHARACTER SELECTION * 2613 * CHARACTER SELECTION *
2637 * ------------------------------------------------------------------------- */ 2614 * ------------------------------------------------------------------------- */
2638 2615
2639/* 2616/*
2640 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2617 * -nscrolled <= (selection row) <= nrow - 1
2641 */ 2618 */
2642void 2619void
2643rxvt_term::selection_check (int check_more) 2620rxvt_term::selection_check (int check_more)
2644{ 2621{
2645 row_col_t pos; 2622 row_col_t pos;
2646 2623
2647 if (!selection.op) 2624 if (!selection.op)
2648 return; 2625 return;
2649 2626
2650 pos.row = pos.col = 0; 2627 pos.row = pos.col = 0;
2651 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2628 if ((selection.beg.row < - (int32_t)nscrolled)
2652 || (selection.beg.row >= TermWin.nrow) 2629 || (selection.beg.row >= nrow)
2653 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2630 || (selection.mark.row < - (int32_t)nscrolled)
2654 || (selection.mark.row >= TermWin.nrow) 2631 || (selection.mark.row >= nrow)
2655 || (selection.end.row < - (int32_t)TermWin.nscrolled) 2632 || (selection.end.row < - (int32_t)nscrolled)
2656 || (selection.end.row >= TermWin.nrow) 2633 || (selection.end.row >= nrow)
2657 || (check_more == 1 2634 || (check_more == 1
2658 && current_screen == selection.screen 2635 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2661 || (check_more == 2 2638 || (check_more == 2
… …
2663 && ROWCOL_IS_AFTER (selection.end, pos)) 2640 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3 2641 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos)) 2642 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */ 2643 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row 2644 && (selection.beg.row != selection.end.row
2668 || selection.end.col > TermWin.ncol))) 2645 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2646 CLEAR_SELECTION ();
2670} 2647}
2671 2648
2672/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2673/* 2650/*
… …
2882 * EXT: button 2 release 2859 * EXT: button 2 release
2883 */ 2860 */
2884void 2861void
2885rxvt_term::selection_request (Time tm, int x, int y) 2862rxvt_term::selection_request (Time tm, int x, int y)
2886{ 2863{
2887 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2864 if (x < 0 || x >= width || y < 0 || y >= height)
2888 return; /* outside window */ 2865 return; /* outside window */
2889 2866
2890 if (selection.text) 2867 if (selection.text)
2891 { /* internal selection */ 2868 { /* internal selection */
2892 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2934 sel = xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2935 2912
2936 if (XGetSelectionOwner (display->display, sel) != None) 2913 if (XGetSelectionOwner (display->display, sel) != None)
2937 { 2914 {
2938 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2915 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2939 TermWin.vt, selection_request_time); 2916 vt, selection_request_time);
2940 return 1; 2917 return 1;
2941 } 2918 }
2942 2919
2943 return 0; 2920 return 0;
2944} 2921}
… …
2990 selection.op = SELECTION_DONE; 2967 selection.op = SELECTION_DONE;
2991 2968
2992 if (selection.clicks == 4) 2969 if (selection.clicks == 4)
2993 return; /* nothing selected, go away */ 2970 return; /* nothing selected, go away */
2994 2971
2995 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2997 2974
2998 col = selection.beg.col; 2975 col = selection.beg.col;
2999 row = selection.beg.row + TermWin.saveLines; 2976 row = selection.beg.row + saveLines;
3000 end_row = selection.end.row + TermWin.saveLines; 2977 end_row = selection.end.row + saveLines;
3001 int ofs = 0; 2978 int ofs = 0;
3002 int extra = 0; 2979 int extra = 0;
3003 2980
3004 for (; row <= end_row; row++, col = 0) 2981 for (; row <= end_row; row++, col = 0)
3005 { 2982 {
3006 end_col = screen.tlen[row]; 2983 end_col = save[row].l;
3007 2984
3008#if ENABLE_FRILLS 2985#if ENABLE_FRILLS
3009 if (selection.rect) 2986 if (selection.rect)
3010 { 2987 {
3011 col = selection.beg.col; 2988 col = selection.beg.col;
3012 end_col = TermWin.ncol + 1; 2989 end_col = ncol + 1;
3013 } 2990 }
3014#endif 2991#endif
3015 2992
3016 MAX_IT (col, 0); 2993 MAX_IT (col, 0);
3017 2994
3018 if (end_col == -1) 2995 if (end_col == -1)
3019 end_col = TermWin.ncol; 2996 end_col = ncol;
3020 2997
3021 if (row == end_row || selection.rect) 2998 if (row == end_row || selection.rect)
3022 MIN_IT (end_col, selection.end.col); 2999 MIN_IT (end_col, selection.end.col);
3023 3000
3024 t = &screen.text[row][col]; 3001 t = &save[row].t[col];
3025 for (; col < end_col; col++) 3002 for (; col < end_col; col++)
3026 { 3003 {
3027 if (*t == NOCHAR) 3004 if (*t == NOCHAR)
3028 t++; 3005 t++;
3029#if ENABLE_COMBINING 3006#if ENABLE_COMBINING
… …
3045#endif 3022#endif
3046 else 3023 else
3047 new_selection_text[ofs++] = *t++; 3024 new_selection_text[ofs++] = *t++;
3048 } 3025 }
3049 3026
3050 if (screen.tlen[row] != -1 && row != end_row) 3027 if (save[row].l != -1 && row != end_row)
3051 new_selection_text[ofs++] = C0_LF; 3028 new_selection_text[ofs++] = C0_LF;
3052 } 3029 }
3053 3030
3054 if (end_col != selection.end.col) 3031 if (end_col != selection.end.col)
3055 new_selection_text[ofs++] = C0_LF; 3032 new_selection_text[ofs++] = C0_LF;
… …
3066 3043
3067 // we usually allocate much more than necessary, so realloc it smaller again 3044 // we usually allocate much more than necessary, so realloc it smaller again
3068 selection.len = ofs; 3045 selection.len = ofs;
3069 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3046 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3070 3047
3071 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3048 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3072 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3049 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3073 display->set_selection_owner (this); 3050 display->set_selection_owner (this);
3074 else 3051 else
3075 rxvt_warn ("can't get primary selection, ignoring.\n"); 3052 rxvt_warn ("can't get primary selection, ignoring.\n");
3076 3053
3077#if 0 3054#if 0
… …
3100 3077
3101 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3078 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3102 3079
3103 if (clicks == 2 || clicks == 3) 3080 if (clicks == 2 || clicks == 3)
3104 selection_extend_colrow (selection.mark.col, 3081 selection_extend_colrow (selection.mark.col,
3105 selection.mark.row + TermWin.view_start, 3082 selection.mark.row + view_start,
3106 0, /* button 3 */ 3083 0, /* button 3 */
3107 1, /* button press */ 3084 1, /* button press */
3108 0); /* click change */ 3085 0); /* click change */
3109} 3086}
3110 3087
… …
3115void 3092void
3116rxvt_term::selection_start_colrow (int col, int row) 3093rxvt_term::selection_start_colrow (int col, int row)
3117{ 3094{
3118 want_refresh = 1; 3095 want_refresh = 1;
3119 selection.mark.col = col; 3096 selection.mark.col = col;
3120 selection.mark.row = row - TermWin.view_start; 3097 selection.mark.row = row - view_start;
3121 3098
3122 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3099 MAX_IT (selection.mark.row, - (int32_t)nscrolled);
3123 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3100 MIN_IT (selection.mark.row, (int32_t)nrow - 1);
3124 MAX_IT (selection.mark.col, 0); 3101 MAX_IT (selection.mark.col, 0);
3125 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3102 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3126 3103
3127 while (selection.mark.col > 0 3104 while (selection.mark.col > 0
3128 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3105 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)
3129 --selection.mark.col; 3106 --selection.mark.col;
3130 3107
3131 if (selection.op) 3108 if (selection.op)
3132 { /* clear the old selection */ 3109 { /* clear the old selection */
3133 selection.beg.row = selection.end.row = selection.mark.row; 3110 selection.beg.row = selection.end.row = selection.mark.row;
… …
3157 text_t *stp; 3134 text_t *stp;
3158 rend_t *srp; 3135 rend_t *srp;
3159 3136
3160 if (dirn == UP) 3137 if (dirn == UP)
3161 { 3138 {
3162 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3139 bound.row = saveLines - nscrolled - 1;
3163 bound.col = 0; 3140 bound.col = 0;
3164 dirnadd = -1; 3141 dirnadd = -1;
3165 } 3142 }
3166 else 3143 else
3167 { 3144 {
3168 bound.row = TermWin.saveLines + TermWin.nrow; 3145 bound.row = saveLines + nrow;
3169 bound.col = TermWin.ncol - 1; 3146 bound.col = ncol - 1;
3170 dirnadd = 1; 3147 dirnadd = 1;
3171 } 3148 }
3172 3149
3173 row = mark->row + TermWin.saveLines; 3150 row = mark->row + saveLines;
3174 col = mark->col; 3151 col = mark->col;
3175 MAX_IT (col, 0); 3152 MAX_IT (col, 0);
3176 /* find the edge of a word */ 3153 /* find the edge of a word */
3177 stp = &screen.text[row][col]; 3154 stp = &save[row].t[col];
3178 w1 = DELIMIT_TEXT (*stp); 3155 w1 = DELIMIT_TEXT (*stp);
3179 3156
3180 srp = &screen.rend[row][col]; 3157 srp = &save[row].r[col];
3181 w2 = DELIMIT_REND (*srp); 3158 w2 = DELIMIT_REND (*srp);
3182 3159
3183 for (;;) 3160 for (;;)
3184 { 3161 {
3185 for (; col != bound.col; col += dirnadd) 3162 for (; col != bound.col; col += dirnadd)
… …
3196 break; 3173 break;
3197 } 3174 }
3198 3175
3199 if ((col == bound.col) && (row != bound.row)) 3176 if ((col == bound.col) && (row != bound.row))
3200 { 3177 {
3201 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3178 if (save[ (row - (dirn == UP ? 1 : 0))].l == -1)
3202 { 3179 {
3203 trow = row + dirnadd; 3180 trow = row + dirnadd;
3204 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3181 tcol = dirn == UP ? ncol - 1 : 0;
3205 3182
3206 if (screen.text[trow] == NULL) 3183 if (save[trow].t == NULL)
3207 break; 3184 break;
3208 3185
3209 stp = & (screen.text[trow][tcol]); 3186 stp = & (save[trow].t[tcol]);
3210 srp = & (screen.rend[trow][tcol]); 3187 srp = & (save[trow].r[tcol]);
3211 3188
3212 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3189 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3213 break; 3190 break;
3214 3191
3215 row = trow; 3192 row = trow;
… …
3223Old_Word_Selection_You_Die: 3200Old_Word_Selection_You_Die:
3224 if (dirn == DN) 3201 if (dirn == DN)
3225 col++; /* put us on one past the end */ 3202 col++; /* put us on one past the end */
3226 3203
3227 /* Poke the values back in */ 3204 /* Poke the values back in */
3228 ret->row = row - TermWin.saveLines; 3205 ret->row = row - saveLines;
3229 ret->col = col; 3206 ret->col = col;
3230} 3207}
3231 3208
3232/* ------------------------------------------------------------------------- */ 3209/* ------------------------------------------------------------------------- */
3233/* 3210/*
… …
3243 int col, row; 3220 int col, row;
3244 3221
3245 col = Pixel2Col (x); 3222 col = Pixel2Col (x);
3246 row = Pixel2Row (y); 3223 row = Pixel2Row (y);
3247 MAX_IT (row, 0); 3224 MAX_IT (row, 0);
3248 MIN_IT (row, (int)TermWin.nrow - 1); 3225 MIN_IT (row, (int)nrow - 1);
3249 MAX_IT (col, 0); 3226 MAX_IT (col, 0);
3250 MIN_IT (col, (int)TermWin.ncol); 3227 MIN_IT (col, (int)ncol);
3251 3228
3252 /* 3229 /*
3253 * If we're selecting characters (single click) then we must check first 3230 * If we're selecting characters (single click) then we must check first
3254 * if we are at the same place as the original mark. If we are then 3231 * if we are at the same place as the original mark. If we are then
3255 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
3256 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
3257 */ 3234 */
3258 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
3259 && (col == selection.mark.col 3236 && (col == selection.mark.col
3260 && (row == selection.mark.row + TermWin.view_start))) 3237 && (row == selection.mark.row + view_start)))
3261 { 3238 {
3262 /* select nothing */ 3239 /* select nothing */
3263 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
3264 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
3265 selection.clicks = 4; 3242 selection.clicks = 4;
… …
3280 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
3281 */ 3258 */
3282void 3259void
3283rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3284{ 3261{
3285 int16_t ncol = TermWin.ncol;
3286 int end_col; 3262 int end_col;
3287 row_col_t pos; 3263 row_col_t pos;
3288 enum { 3264 enum {
3289 LEFT, RIGHT 3265 LEFT, RIGHT
3290 } closeto = RIGHT; 3266 } closeto = RIGHT;
… …
3324 } 3300 }
3325 3301
3326 pos.col = col; 3302 pos.col = col;
3327 pos.row = row; 3303 pos.row = row;
3328 3304
3329 pos.row -= TermWin.view_start; /* adjust for scroll */ 3305 pos.row -= view_start; /* adjust for scroll */
3330 3306
3331 /* 3307 /*
3332 * This is mainly xterm style selection with a couple of differences, mainly 3308 * This is mainly xterm style selection with a couple of differences, mainly
3333 * in the way button3 drag extension works. 3309 * in the way button3 drag extension works.
3334 * We're either doing: button1 drag; button3 press; or button3 drag 3310 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3393 } 3369 }
3394 } 3370 }
3395 3371
3396 if (selection.clicks == 1) 3372 if (selection.clicks == 1)
3397 { 3373 {
3398 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3374 end_col = save[selection.beg.row + saveLines].l;
3399 3375
3400 if (selection.beg.col > end_col 3376 if (selection.beg.col > end_col
3401 && end_col != -1 3377 && end_col != -1
3402#if ENABLE_FRILLS 3378#if ENABLE_FRILLS
3403 && !selection.rect 3379 && !selection.rect
3404#endif 3380#endif
3405 ) 3381 )
3406 selection.beg.col = ncol; 3382 selection.beg.col = ncol;
3407 3383
3408 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3384 end_col = save[selection.end.row + saveLines].l;
3409 3385
3410 if ( 3386 if (
3411 selection.end.col > end_col 3387 selection.end.col > end_col
3412 && end_col != -1 3388 && end_col != -1
3413#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
… …
3430 if (options & Opt_tripleclickwords) 3406 if (options & Opt_tripleclickwords)
3431 { 3407 {
3432 int end_row; 3408 int end_row;
3433 3409
3434 selection_delimit_word (UP, &selection.beg, &selection.beg); 3410 selection_delimit_word (UP, &selection.beg, &selection.beg);
3435 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3411 end_row = save[selection.mark.row + saveLines].l;
3436 3412
3437 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3413 for (end_row = selection.mark.row; end_row < nrow; end_row++)
3438 { 3414 {
3439 end_col = screen.tlen[end_row + TermWin.saveLines]; 3415 end_col = save[end_row + saveLines].l;
3440 3416
3441 if (end_col != -1) 3417 if (end_col != -1)
3442 { 3418 {
3443 selection.end.row = end_row; 3419 selection.end.row = end_row;
3444 selection.end.col = end_col; 3420 selection.end.col = end_col;
… …
3455 3431
3456 selection.beg.col = 0; 3432 selection.beg.col = 0;
3457 selection.end.col = ncol; 3433 selection.end.col = ncol;
3458 3434
3459 // select a complete logical line 3435 // select a complete logical line
3460 while (selection.beg.row > -TermWin.saveLines 3436 while (selection.beg.row > -saveLines
3461 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3437 && save[selection.beg.row - 1 + saveLines].l == -1)
3462 selection.beg.row--; 3438 selection.beg.row--;
3463 3439
3464 while (selection.end.row < TermWin.nrow 3440 while (selection.end.row < nrow
3465 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3441 && save[selection.end.row + saveLines].l == -1)
3466 selection.end.row++; 3442 selection.end.row++;
3467 } 3443 }
3468 } 3444 }
3469 3445
3470 if (button3 && buttonpress) 3446 if (button3 && buttonpress)
… …
3497 end_col = selection.end.col; 3473 end_col = selection.end.col;
3498 end_row = selection.end.row; 3474 end_row = selection.end.row;
3499 3475
3500 for ( ; end_row >= selection.beg.row; ) 3476 for ( ; end_row >= selection.beg.row; )
3501 { 3477 {
3502 stp = screen.text[end_row + TermWin.saveLines]; 3478 stp = save[end_row + saveLines].t;
3503 3479
3504 while (--end_col >= 0) 3480 while (--end_col >= 0)
3505 { 3481 {
3506 if (stp[end_col] != ' ' 3482 if (stp[end_col] != ' '
3507 && stp[end_col] != '\t' 3483 && stp[end_col] != '\t'
3508 && stp[end_col] != NOCHAR) 3484 && stp[end_col] != NOCHAR)
3509 break; 3485 break;
3510 } 3486 }
3511 3487
3512 if (end_col >= 0 3488 if (end_col >= 0
3513 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3489 || save[end_row - 1 + saveLines].l != -1)
3514 { 3490 {
3515 selection.end.col = end_col + 1; 3491 selection.end.col = end_col + 1;
3516 selection.end.row = end_row; 3492 selection.end.row = end_row;
3517 break; 3493 break;
3518 } 3494 }
3519 3495
3520 end_row--; 3496 end_row--;
3521 end_col = TermWin.ncol; 3497 end_col = ncol;
3522 } 3498 }
3523 3499
3524 if (selection.mark.row > selection.end.row) 3500 if (selection.mark.row > selection.end.row)
3525 { 3501 {
3526 selection.mark.row = selection.end.row; 3502 selection.mark.row = selection.end.row;
… …
3689 */ 3665 */
3690void 3666void
3691rxvt_term::pixel_position (int *x, int *y) 3667rxvt_term::pixel_position (int *x, int *y)
3692{ 3668{
3693 *x = Pixel2Col (*x); 3669 *x = Pixel2Col (*x);
3694 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3670 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3695 *y = Pixel2Row (*y); 3671 *y = Pixel2Row (*y);
3696 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3672 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3697} 3673}
3698 3674
3699/* ------------------------------------------------------------------------- */ 3675/* ------------------------------------------------------------------------- */
3700#ifdef USE_XIM 3676#ifdef USE_XIM
3701void 3677void
3702rxvt_term::im_set_position (XPoint &pos) 3678rxvt_term::im_set_position (XPoint &pos)
3703{ 3679{
3704 XWindowAttributes xwa; 3680 XWindowAttributes xwa;
3705 3681
3706 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3682 XGetWindowAttributes (display->display, vt, &xwa);
3707 3683
3708 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3684 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3709 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3685 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3710} 3686}
3711#endif 3687#endif
3712 3688
3713#if ENABLE_OVERLAY 3689#if ENABLE_OVERLAY
3714void 3690void
3715rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3691rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3716{ 3692{
3717 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3693 if (nrow < 3 || ncol < 3)
3718 return; 3694 return;
3719 3695
3720 want_refresh = 1; 3696 want_refresh = 1;
3721 3697
3722 scr_overlay_off (); 3698 scr_overlay_off ();
3723 3699
3724 if (x < 0) x = TermWin.ncol - w; 3700 if (x < 0) x = ncol - w;
3725 if (y < 0) y = TermWin.nrow - h; 3701 if (y < 0) y = nrow - h;
3726 3702
3727 // make space for border 3703 // make space for border
3728 w += 2; MIN_IT (w, TermWin.ncol); 3704 w += 2; MIN_IT (w, ncol);
3729 h += 2; MIN_IT (h, TermWin.nrow); 3705 h += 2; MIN_IT (h, nrow);
3730 3706
3731 x -= 1; MAX_IT (x, 0); 3707 x -= 1; MAX_IT (x, 0);
3732 y -= 1; MAX_IT (y, 0); 3708 y -= 1; MAX_IT (y, 0);
3733 3709
3734 MIN_IT (x, TermWin.ncol - w); 3710 MIN_IT (x, ncol - w);
3735 MIN_IT (y, TermWin.nrow - h); 3711 MIN_IT (y, nrow - h);
3736 3712
3737 ov_x = x; ov_y = y; 3713 ov_x = x; ov_y = y;
3738 ov_w = w; ov_h = h; 3714 ov_w = w; ov_h = h;
3739 3715
3740 ov_text = new text_t *[h]; 3716 ov_text = new text_t *[h];
… …
3826rxvt_term::scr_swap_overlay () 3802rxvt_term::scr_swap_overlay ()
3827{ 3803{
3828 if (!ov_text) 3804 if (!ov_text)
3829 return; 3805 return;
3830 3806
3831 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; 3807 int row_offset = ov_y + saveLines - view_start;
3832 3808
3833 // swap screen mem with overlay 3809 // swap screen mem with overlay
3834 for (int y = ov_h; y--; ) 3810 for (int y = ov_h; y--; )
3835 { 3811 {
3836 text_t *t1 = ov_text[y]; 3812 text_t *t1 = ov_text[y];
3837 rend_t *r1 = ov_rend[y]; 3813 rend_t *r1 = ov_rend[y];
3838 3814
3839 text_t *t2 = screen.text[y + row_offset] + ov_x; 3815 text_t *t2 = save[y + row_offset].t + ov_x;
3840 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3816 rend_t *r2 = save[y + row_offset].r + ov_x;
3841 3817
3842 for (int x = ov_w; x--; ) 3818 for (int x = ov_w; x--; )
3843 { 3819 {
3844 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3820 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3845 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3821 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