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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.183 by root, Wed Dec 21 14:19:19 2005 UTC

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

Diff Legend

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