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

Diff Legend

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