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

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

Diff Legend

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