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

Diff Legend

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