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

Diff Legend

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