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.129 by root, Wed Aug 25 03:52:09 2004 UTC vs.
Revision 1.179 by root, Tue Dec 20 22:47:14 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);
… …
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 SWAP_IT (scrn, current_screen, int);
549
550 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
551 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
552 MAX_IT (screen.cur.row, 0);
553 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
554 MAX_IT (screen.cur.col, 0);
555 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
556
571#if NSCREENS 557#if NSCREENS
572 if (options & Opt_secondaryScreen) 558 if (options & Opt_secondaryScreen)
573 { 559 {
574 num_scr = 0; 560 num_scr = 0;
575 offset = TermWin.saveLines; 561
576 for (i = prev_nrow; i--;) 562 for (int i = nrow; i--; )
577 { 563 SWAP_IT (ROW(i), swap_save[i], line_t);
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 564
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 565 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 566 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
597 } 569 }
598 else 570 else
599#endif 571#endif
600 if (options & Opt_secondaryScroll) 572 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574
603 return scrn; 575 return scrn;
604} 576}
605 577
606// clear WrapNext indicator, solidifying position on next line 578// clear WrapNext indicator, solidifying position on next line
607void 579void
… …
613 screen.flags &= ~Screen_WrapNext; 585 screen.flags &= ~Screen_WrapNext;
614 586
615 screen.cur.col = 0; 587 screen.cur.col = 0;
616 588
617 if (screen.cur.row == screen.bscroll) 589 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 590 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
619 else if (screen.cur.row < TermWin.nrow - 1) 591 else if (screen.cur.row < nrow - 1)
620 screen.cur.row++; 592 screen.cur.row++;
621} 593}
622 594
623/* ------------------------------------------------------------------------- */ 595/* ------------------------------------------------------------------------- */
624/* 596/*
… …
654/* ------------------------------------------------------------------------- */ 626/* ------------------------------------------------------------------------- */
655/* 627/*
656 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
657 * count positive ==> scroll up 629 * count positive ==> scroll up
658 * count negative ==> scroll down 630 * count negative ==> scroll down
659 * spec == 0 for normal routines
660 */ 631 */
661int 632int
662rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 633rxvt_term::scr_scroll_text (int row1, int row2, int count)
663{ 634{
664 int i, j;
665 long nscrolled;
666
667 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
668 return 0; 636 return 0;
669 637
670 want_refresh = 1; 638 want_refresh = 1;
639 num_scr += count;
671 640
672 if (row1 == 0 && count > 0 641 if (count > 0
642 && row1 == 0
643 && row2 == nrow - 1
673 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 644 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
674 { 645 {
675 nscrolled = (long)TermWin.nscrolled + (long)count; 646 nsaved = min (nsaved + count, saveLines);
647 term_start = (term_start + count) % total_rows;
676 648
677 if (nscrolled > (long)TermWin.saveLines) 649 if (selection.op && current_screen == selection.screen)
678 TermWin.nscrolled = TermWin.saveLines; 650 {
651 selection.beg.row -= count;
652 selection.end.row -= count;
653 selection.mark.row -= count;
654
655 selection_check (0);
656 }
657
658 for (int i = count; i--; )
659 scr_blank_screen_mem (ROW(row2 - i), rstyle);
679 else 660
680 TermWin.nscrolled = (unsigned int)nscrolled;
681
682 if ((options & Opt_scrollWithBuffer) 661 if ((options & Opt_scrollWithBuffer)
683 && TermWin.view_start != 0 662 && view_start != 0
684 && TermWin.view_start != TermWin.saveLines) 663 && view_start != saveLines)
685 scr_page (UP, count); 664 scr_page (UP, count);
686 } 665 }
687 else if (!spec) 666 else
688 row1 += TermWin.saveLines; 667 {
689
690 row2 += TermWin.saveLines;
691
692 if (selection.op && current_screen == selection.screen) 668 if (selection.op && current_screen == selection.screen)
693 { 669 {
694 i = selection.beg.row + TermWin.saveLines; 670 int i = selection.beg.row;
695 j = selection.end.row + TermWin.saveLines; 671 int j = selection.end.row;
672
696 if ((i < row1 && j > row1) 673 if ((i < row1 && j > row1)
697 || (i < row2 && j > row2) 674 || (i < row2 && j > row2)
698 || (i - count < row1 && i >= row1) 675 || (i - count < row1 && i >= row1)
699 || (i - count > row2 && i <= row2) 676 || (i - count > row2 && i <= row2)
700 || (j - count < row1 && j >= row1) 677 || (j - count < row1 && j >= row1)
701 || (j - count > row2 && j <= row2)) 678 || (j - count > row2 && j <= row2))
702 { 679 {
703 CLEAR_ALL_SELECTION (); 680 CLEAR_ALL_SELECTION ();
704 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 681 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
705 } 682 }
706 else if (j >= row1 && j <= row2) 683 else if (j >= row1 && j <= row2)
707 { 684 {
708 /* move selected region too */ 685 /* move selected region too */
709 selection.beg.row -= count; 686 selection.beg.row -= count;
710 selection.end.row -= count; 687 selection.end.row -= count;
711 selection.mark.row -= count; 688 selection.mark.row -= count;
689
690 selection_check (0);
712 } 691 }
713 }
714
715 selection_check (0); /* _after_ TermWin.nscrolled update */
716
717 num_scr += count;
718 j = count;
719
720 if (count < 0)
721 count = -count;
722
723 i = row2 - row1 + 1;
724 MIN_IT (count, i);
725
726 if (j > 0)
727 {
728 /* A: scroll up */
729
730 /* A1: Copy lines that will get clobbered by the rotation */
731 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
732 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
733
734 /* A2: Rotate lines */
735 i = row2 - row1 - count + 1;
736 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
737 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
738 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
739
740 j = row2 - count + 1, i = count;
741 }
742 else /* if (j < 0) */
743 {
744 /* B: scroll down */
745
746 /* B1: Copy lines that will get clobbered by the rotation */
747 for (i = 0, j = row2; i < count; i++, j--)
748 { 692 }
749 buf_text[i] = screen.text[j]; 693
750 buf_rend[i] = screen.rend[j]; 694 // use a simple and robust scrolling algorithm, this
695 // part of scr_scroll_text is not time-critical.
696
697 int rows = row2 - row1 + 1;
698
699 for (int row = 0; row < rows; row++)
751 } 700 {
701 buf [row] = ROW(row1 + (row + count + rows) % rows);
752 702
753 /* B2: Rotate lines */ 703 if (!IN_RANGE_EXC (row + count, 0, rows))
754 for (j = row2, i = j - count; i >= row1; i--, j--) 704 scr_blank_screen_mem (buf [row], rstyle);
755 { 705 }
756 screen.tlen[j] = screen.tlen[i];
757 screen.text[j] = screen.text[i];
758 screen.rend[j] = screen.rend[i];
759 }
760 706
761 j = row1, i = count; 707 for (int row = 0; row < rows; row++)
762 count = -count; 708 ROW(row1 + row) = buf [row];
763 } 709 }
764
765 /* C: Resurrect lines */
766 memset (screen.tlen + j, 0, i * sizeof (int16_t));
767 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
768 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
769 if (!spec) /* line length may not equal TermWin.ncol */
770 for (; i--; j++)
771 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
772 710
773 return count; 711 return count;
774} 712}
775 713
776/* ------------------------------------------------------------------------- */ 714/* ------------------------------------------------------------------------- */
… …
778 * Add text given in <str> of length <len> to screen struct 716 * Add text given in <str> of length <len> to screen struct
779 */ 717 */
780void 718void
781rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 719rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
782{ 720{
721 if (len <= 0) /* sanity */
722 return;
723
783 unsigned char checksel; 724 unsigned char checksel;
784 unicode_t c; 725 unicode_t c;
785 int i, row, last_col; 726 int row, last_col;
786 text_t *stp; 727 const unicode_t *strend = str + len;
787 rend_t *srp;
788
789 if (len <= 0) /* sanity */
790 return;
791 728
792 want_refresh = 1; 729 want_refresh = 1;
793 ZERO_SCROLLBACK (); 730 ZERO_SCROLLBACK ();
794 last_col = TermWin.ncol; 731 last_col = ncol;
795 732
796 if (nlines > 0) 733 if (nlines > 0)
797 { 734 {
798 nlines += screen.cur.row - screen.bscroll; 735 nlines += screen.cur.row - screen.bscroll;
799 if ((nlines > 0) 736 if ((nlines > 0)
800 && (screen.tscroll == 0) 737 && (screen.tscroll == 0)
801 && (screen.bscroll == (TermWin.nrow - 1))) 738 && (screen.bscroll == (nrow - 1)))
802 { 739 {
803 /* _at least_ this many lines need to be scrolled */ 740 /* _at least_ this many lines need to be scrolled */
804 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 741 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
805 screen.cur.row -= nlines; 742 screen.cur.row -= nlines;
806 } 743 }
807 } 744 }
808 745
809#ifdef DEBUG_STRICT 746#ifdef DEBUG_STRICT
810 assert (screen.cur.col < last_col); 747 assert (screen.cur.col < last_col);
811 assert ((screen.cur.row < TermWin.nrow) 748 assert ((screen.cur.row < nrow)
812 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 749 && (screen.cur.row >= - (int32_t)nsaved));
813#else /* drive with your eyes closed */ 750#else /* drive with your eyes closed */
814 MIN_IT (screen.cur.col, last_col - 1); 751 MIN_IT (screen.cur.col, last_col - 1);
815 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 752 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
816 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 753 MAX_IT (screen.cur.row, - (int32_t)nsaved);
817#endif 754#endif
818 row = screen.cur.row + TermWin.saveLines; 755 row = screen.cur.row;
819 756
820 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 757 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
821 758
822 stp = screen.text[row]; 759 line_t *line = &ROW(row);
823 srp = screen.rend[row];
824 760
825 while (len--) 761 while (str < strend)
826 { 762 {
827 c = *str++; 763 c = *str++;
828 764
829 if (c < 0x20) 765 if (c < 0x20)
830 switch (c) 766 if (c == C0_LF)
767 {
768 if (!line->is_longer ()) /* XXX: think about this */
769 MAX_IT (line->l, screen.cur.col);
770
771 screen.flags &= ~Screen_WrapNext;
772
773 if (screen.cur.row == screen.bscroll)
774 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
775 else if (screen.cur.row < (nrow - 1))
776 row = ++screen.cur.row;
777
778 line = &ROW(row); /* _must_ refresh */
779 continue;
780 }
781 else if (c == C0_CR)
831 { 782 {
832 case C0_HT: 783 if (!line->is_longer ()) /* XXX: think about this */
833 scr_tab (1, true);
834 continue;
835
836 case C0_LF:
837 if (screen.tlen[row] != -1) /* XXX: think about this */
838 MAX_IT (screen.tlen[row], screen.cur.col); 784 MAX_IT (line->l, screen.cur.col);
839 785
840 screen.flags &= ~Screen_WrapNext; 786 screen.flags &= ~Screen_WrapNext;
841
842 if (screen.cur.row == screen.bscroll)
843 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
844 else if (screen.cur.row < (TermWin.nrow - 1))
845 row = (++screen.cur.row) + TermWin.saveLines;
846
847 stp = screen.text[row]; /* _must_ refresh */
848 srp = screen.rend[row]; /* _must_ refresh */
849 continue;
850
851 case C0_CR:
852 if (screen.tlen[row] != -1) /* XXX: think about this */
853 MAX_IT (screen.tlen[row], screen.cur.col);
854
855 screen.flags &= ~Screen_WrapNext;
856 screen.cur.col = 0; 787 screen.cur.col = 0;
857 continue; 788 continue;
789 }
790 else if (c == C0_HT)
791 {
792 scr_tab (1, true);
793 continue;
858 } 794 }
859 795
860 if (checksel /* see if we're writing within selection */ 796 if (checksel /* see if we're writing within selection */
861 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 797 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
862 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 798 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
870 CLEAR_SELECTION (); 806 CLEAR_SELECTION ();
871 } 807 }
872 808
873 if (screen.flags & Screen_WrapNext) 809 if (screen.flags & Screen_WrapNext)
874 { 810 {
875 screen.tlen[row] = -1; 811 line->set_is_longer ();
876 812
877 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 813 scr_do_wrap ();
878
879 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */
881 } 814
815 row = screen.cur.row;
816 line = &ROW(row); /* _must_ refresh */
817 }
882 818
883 if (screen.flags & Screen_Insert) 819 // some utf-8 decoders "decode" surrogate characters: let's fix this.
884 scr_insdel_chars (1, INSERT); 820 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
821 c = 0xfffd;
885 822
886 // rely on wcwidth to tell us the character width, at least for non-latin1 823 // rely on wcwidth to tell us the character width, at least for non-latin1
887 // do wcwidth before further replacements, as wcwidth says that line-drawing 824 // do wcwidth before further replacements, as wcwidth might return -1
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 825 // for the line drawing characters below as they might be invalid in the current
826 // locale.
889 int width = c < 0x100 ? 1 : wcwidth (c); 827 int width = c < 0x100 ? 1 : wcwidth (c);
890 828
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 829 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 830 {
893 // vt100 special graphics and line drawing 831 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 832 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 833 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 834 static uint16_t vt100_0[62] = { // 41 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 835 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 836 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 837 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 838 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 839 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 840 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 841 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 842 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
905 }; 843 };
906 844
907 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 845 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
908 { 846 {
909 c = vt100_0[c - 0x40]; 847 c = vt100_0[c - 0x41];
910 width = 1; 848 width = 1; // vt100 line drawing characters are always single-width
911 } 849 }
912 } 850 }
913 851
852 if (screen.flags & Screen_Insert)
853 scr_insdel_chars (width, INSERT);
854
914 if (width != 0) 855 if (width != 0)
915 { 856 {
916 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd;
919
920#if !UNICODE_3 857#if !UNICODE_3
921 // trim characters we can't store directly :( 858 // trim characters we can't store directly :(
922 if (c >= 0x10000) 859 if (c >= 0x10000)
923# if ENABLE_COMBINING 860# if ENABLE_COMBINING
924 c = rxvt_composite.compose (c); // map to lower 16 bits 861 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
926 c = 0xfffd; 863 c = 0xfffd;
927# endif 864# endif
928#endif 865#endif
929 866
930 // nuke the character at this position, if required 867 // nuke the character at this position, if required
931 if (stp[screen.cur.col] == NOCHAR 868 if (line->t[screen.cur.col] == NOCHAR
932 || (screen.cur.col < TermWin.ncol - 1 869 || (screen.cur.col < ncol - 1
933 && stp[screen.cur.col + 1] == NOCHAR)) 870 && line->t[screen.cur.col + 1] == NOCHAR))
934 { 871 {
935 int col = screen.cur.col; 872 int col = screen.cur.col;
936 873
937 // find begin 874 // find begin
938 while (col > 0 && stp[col] == NOCHAR) 875 while (col > 0 && line->t[col] == NOCHAR)
939 col--; 876 col--;
940 877
941 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 878 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
942 879
943 // found begin, nuke 880 // found begin, nuke
944 do { 881 do {
945 stp[col] = ' '; 882 line->t[col] = ' ';
946 srp[col] = rend; 883 line->r[col] = rend;
947 col++; 884 col++;
948 } while (col < TermWin.ncol && stp[col] == NOCHAR); 885 } while (col < ncol && line->t[col] == NOCHAR);
949 } 886 }
950 887
951 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 888 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
889
890 // if the character doesn't fit into the remaining columns...
891 if (screen.cur.col > last_col - width && last_col >= width)
892 {
893 // ...output spaces
894 c = ' ';
895 // and try the same character next loop iteration
896 --str;
897 }
952 898
953 do 899 do
954 { 900 {
955 stp[screen.cur.col] = c; 901 line->t[screen.cur.col] = c;
956 srp[screen.cur.col] = rend; 902 line->r[screen.cur.col] = rend;
957 903
958 if (screen.cur.col < last_col - 1) 904 if (screen.cur.col < last_col - 1)
959 screen.cur.col++; 905 screen.cur.col++;
960 else 906 else
961 { 907 {
962 screen.tlen[row] = last_col; 908 line->l = last_col;
963 if (screen.flags & Screen_Autowrap) 909 if (screen.flags & Screen_Autowrap)
964 screen.flags |= Screen_WrapNext; 910 screen.flags |= Screen_WrapNext;
965 break; 911 break;
966 } 912 }
967 913
968 c = NOCHAR; 914 c = NOCHAR;
969 } 915 }
970 while (--width > 0); 916 while (--width > 0);
971 917
972 // pad with spaces when overwriting wide character with smaller one 918 // pad with spaces when overwriting wide character with smaller one
919 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 920 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
974 { 921 {
975 stp[c] = ' '; 922 line->t[c] = ' ';
976 srp[c] = rend; 923 line->r[c] = rend;
977 } 924 }
978 } 925 }
979 else if (width == 0) 926 else // width == 0
980 { 927 {
981#if ENABLE_COMBINING 928#if ENABLE_COMBINING
982 // handle combining characters 929 // handle combining characters
983 // we just tag the accent on the previous on-screen character. 930 // we just tag the accent on the previous on-screen character.
984 // this is arguably not correct, but also arguably not wrong. 931 // this is arguably not correct, but also arguably not wrong.
985 // we don't handle double-width characters nicely yet. 932 // we don't handle double-width characters nicely yet.
986
987 text_t *tp; 933 text_t *tp;
988 rend_t *rp; 934 rend_t *rp;
989 935
990 if (screen.cur.col > 0) 936 if (screen.cur.col > 0)
991 { 937 {
992 tp = stp + screen.cur.col - 1; 938 tp = line->t + screen.cur.col - 1;
993 rp = srp + screen.cur.col - 1; 939 rp = line->r + screen.cur.col - 1;
940
941 while (*tp == NOCHAR && tp > line->t)
942 tp--, rp--;
994 } 943 }
995 else if (screen.cur.row > 0 944 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 945 && ROW(screen.cur.row - 1).is_longer ())
997 { 946 {
998 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 947 line_t *line = &ROW(screen.cur.row - 1);
999 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 948
949 tp = line->t + last_col - 1;
950 rp = line->r + last_col - 1;
951
952 while (*tp == NOCHAR && tp > line->t)
953 tp--, rp--;
1000 } 954 }
1001 else 955 else
1002 continue; 956 continue;
1003
1004 // handle double-width-chars by making them look extremely ugly
1005 if (*tp == NOCHAR)
1006 {
1007 // hack //D //TODO //--tp, --rp;
1008 *tp = ' ';
1009 *rp &= ~RS_baseattrMask;
1010 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1011 }
1012 957
1013 // first try to find a precomposed character 958 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c); 959 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR) 960 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c); 961 n = rxvt_composite.compose (*tp, c);
… …
1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 964 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1020#endif 965#endif
1021 } 966 }
1022 } 967 }
1023 968
1024 if (screen.tlen[row] != -1) /* XXX: think about this */ 969 if (!line->is_longer ()) /* XXX: think about this */
1025 MAX_IT (screen.tlen[row], screen.cur.col); 970 MAX_IT (line->l, screen.cur.col);
1026 971
1027#ifdef DEBUG_STRICT 972#ifdef DEBUG_STRICT
1028 assert (screen.cur.row >= 0); 973 assert (screen.cur.row >= 0);
1029#else /* drive with your eyes closed */ 974#else /* drive with your eyes closed */
1030 MAX_IT (screen.cur.row, 0); 975 MAX_IT (screen.cur.row, 0);
… …
1044 if (screen.cur.col == 0) 989 if (screen.cur.col == 0)
1045 { 990 {
1046 if (screen.cur.row > 0) 991 if (screen.cur.row > 0)
1047 { 992 {
1048#ifdef TERMCAP_HAS_BW 993#ifdef TERMCAP_HAS_BW
1049 screen.cur.col = TermWin.ncol - 1; 994 screen.cur.col = ncol - 1;
1050 screen.cur.row--; 995 screen.cur.row--;
1051 return; 996 return;
1052#endif 997#endif
1053 } 998 }
1054 } 999 }
… …
1074 1019
1075 if (count == 0) 1020 if (count == 0)
1076 return; 1021 return;
1077 else if (count > 0) 1022 else if (count > 0)
1078 { 1023 {
1079 int row = TermWin.saveLines + screen.cur.row; 1024 int row = screen.cur.row;
1080 text_t *tp = screen.text[row]; 1025
1081 rend_t *rp = screen.rend[row]; 1026 line_t &l = ROW(row);
1082 rend_t base_rend = rp[i]; 1027 rend_t base_rend = l.r[i];
1083 ht &= tp[i] == ' '; 1028 ht &= l.t[i] == ' ';
1084 1029
1085 for (; ++i < TermWin.ncol; ) 1030 for (; ++i < ncol; )
1086 if (tabs[i]) 1031 if (tabs[i])
1087 { 1032 {
1088 x = i; 1033 x = i;
1089 if (!--count) 1034 if (!--count)
1090 break; 1035 break;
1091 } 1036 }
1092 else 1037 else
1093 ht &= tp[i] == ' ' 1038 ht &= l.t[i] == ' '
1094 && RS_SAME (rp[i], base_rend); 1039 && RS_SAME (l.r[i], base_rend);
1095 1040
1096 if (count) 1041 if (count)
1097 x = TermWin.ncol - 1; 1042 x = ncol - 1;
1098 1043
1099 // store horizontal tab commands as characters inside the text 1044 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted. 1045 // buffer so they can be selected and pasted.
1101 if (ht) 1046 if (ht && options & Opt_pastableTabs)
1102 { 1047 {
1103 base_rend = SET_FONT (base_rend, 0); 1048 base_rend = SET_FONT (base_rend, 0);
1104 1049
1105 if (screen.tlen[row] != -1) /* XXX: think about this */ 1050 if (!l.is_longer ()) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x); 1051 MAX_IT (l.l, x);
1107 1052
1108 i = screen.cur.col; 1053 i = screen.cur.col;
1109 1054
1110 tp[i] = '\t'; 1055 l.t[i] = '\t';
1111 rp[i] = base_rend; 1056 l.r[i] = base_rend;
1112 1057
1113 while (++i < x) 1058 while (++i < x)
1114 { 1059 {
1115 tp[i] = NOCHAR; 1060 l.t[i] = NOCHAR;
1116 rp[i] = base_rend; 1061 l.r[i] = base_rend;
1117 } 1062 }
1118 } 1063 }
1119 } 1064 }
1120 else /* if (count < 0) */ 1065 else /* if (count < 0) */
1121 { 1066 {
… …
1147rxvt_term::scr_backindex () 1092rxvt_term::scr_backindex ()
1148{ 1093{
1149 if (screen.cur.col > 0) 1094 if (screen.cur.col > 0)
1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1151 else 1096 else
1152 {
1153 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1154 return; /* um, yeah? */
1155
1156 scr_insdel_chars (1, INSERT); 1097 scr_insdel_chars (1, INSERT);
1157 }
1158} 1098}
1159#endif 1099#endif
1160/* ------------------------------------------------------------------------- */ 1100/* ------------------------------------------------------------------------- */
1161/* 1101/*
1162 * Process DEC Forward Index 1102 * Process DEC Forward Index
… …
1166 */ 1106 */
1167#if ENABLE_FRILLS 1107#if ENABLE_FRILLS
1168void 1108void
1169rxvt_term::scr_forwardindex () 1109rxvt_term::scr_forwardindex ()
1170{ 1110{
1171 int row; 1111 int row;
1172 1112
1173 if (screen.cur.col < TermWin.ncol - 1) 1113 if (screen.cur.col < ncol - 1)
1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1175 else 1115 else
1176 { 1116 {
1177 row = screen.cur.row + TermWin.saveLines; 1117 row = screen.cur.row;
1178 1118
1179 if (screen.tlen[row] == 0) 1119 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1180 return; /* um, yeah? */ 1120 ROW(row).l = ncol;
1181 else if (screen.tlen[row] == -1)
1182 screen.tlen[row] = TermWin.ncol;
1183 1121
1184 scr_gotorc (0, 0, R_RELATIVE); 1122 scr_gotorc (0, 0, R_RELATIVE);
1185 scr_insdel_chars (1, DELETE); 1123 scr_insdel_chars (1, DELETE);
1186 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1124 scr_gotorc (0, ncol - 1, R_RELATIVE);
1187 } 1125 }
1188} 1126}
1189#endif 1127#endif
1190 1128
1191/* ------------------------------------------------------------------------- */ 1129/* ------------------------------------------------------------------------- */
… …
1198 want_refresh = 1; 1136 want_refresh = 1;
1199 ZERO_SCROLLBACK (); 1137 ZERO_SCROLLBACK ();
1200 1138
1201 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1139 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1202 MAX_IT (screen.cur.col, 0); 1140 MAX_IT (screen.cur.col, 0);
1203 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1141 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1204 1142
1205 screen.flags &= ~Screen_WrapNext; 1143 screen.flags &= ~Screen_WrapNext;
1206 1144
1207 if (relative & R_RELATIVE) 1145 if (relative & R_RELATIVE)
1208 { 1146 {
… …
1233 else 1171 else
1234 screen.cur.row = row; 1172 screen.cur.row = row;
1235 } 1173 }
1236 1174
1237 MAX_IT (screen.cur.row, 0); 1175 MAX_IT (screen.cur.row, 0);
1238 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1176 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1239} 1177}
1240 1178
1241/* ------------------------------------------------------------------------- */ 1179/* ------------------------------------------------------------------------- */
1242/* 1180/*
1243 * direction should be UP or DN 1181 * direction should be UP or DN
… …
1254 1192
1255 screen.flags &= ~Screen_WrapNext; 1193 screen.flags &= ~Screen_WrapNext;
1256 1194
1257 if ((screen.cur.row == screen.bscroll && direction == UP) 1195 if ((screen.cur.row == screen.bscroll && direction == UP)
1258 || (screen.cur.row == screen.tscroll && direction == DN)) 1196 || (screen.cur.row == screen.tscroll && direction == DN))
1259 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1197 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1260 else 1198 else
1261 screen.cur.row += dirn; 1199 screen.cur.row += dirn;
1262 1200
1263 MAX_IT (screen.cur.row, 0); 1201 MAX_IT (screen.cur.row, 0);
1264 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1202 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1265 selection_check (0); 1203 selection_check (0);
1266} 1204}
1267 1205
1268/* ------------------------------------------------------------------------- */ 1206/* ------------------------------------------------------------------------- */
1269/* 1207/*
… …
1280 want_refresh = 1; 1218 want_refresh = 1;
1281 ZERO_SCROLLBACK (); 1219 ZERO_SCROLLBACK ();
1282 1220
1283 selection_check (1); 1221 selection_check (1);
1284 1222
1285 row = TermWin.saveLines + screen.cur.row; 1223 row = screen.cur.row;
1224
1286 switch (mode) 1225 switch (mode)
1287 { 1226 {
1288 case 0: /* erase to end of line */ 1227 case 0: /* erase to end of line */
1289 col = screen.cur.col; 1228 col = screen.cur.col;
1290 num = TermWin.ncol - col; 1229 num = ncol - col;
1291 MIN_IT (screen.tlen[row], (int16_t)col); 1230 MIN_IT (ROW(row).l, (int16_t)col);
1292 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1231 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1293 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1232 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1294 CLEAR_SELECTION (); 1233 CLEAR_SELECTION ();
1295 break; 1234 break;
1296 case 1: /* erase to beginning of line */ 1235 case 1: /* erase to beginning of line */
… …
1300 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1239 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1301 CLEAR_SELECTION (); 1240 CLEAR_SELECTION ();
1302 break; 1241 break;
1303 case 2: /* erase whole line */ 1242 case 2: /* erase whole line */
1304 col = 0; 1243 col = 0;
1305 num = TermWin.ncol; 1244 num = ncol;
1306 screen.tlen[row] = 0; 1245 ROW(row).l = 0;
1307 if (selection.beg.row <= screen.cur.row 1246 if (selection.beg.row <= screen.cur.row
1308 && selection.end.row >= screen.cur.row) 1247 && selection.end.row >= screen.cur.row)
1309 CLEAR_SELECTION (); 1248 CLEAR_SELECTION ();
1310 break; 1249 break;
1311 default: 1250 default:
1312 return; 1251 return;
1313 } 1252 }
1314 1253
1315 if (screen.text[row]) 1254 scr_blank_line (ROW(row), col, num, rstyle);
1316 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1317 else
1318 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1319} 1255}
1320 1256
1321/* ------------------------------------------------------------------------- */ 1257/* ------------------------------------------------------------------------- */
1322/* 1258/*
1323 * Erase part of whole of the screen 1259 * Erase part of whole of the screen
… …
1327 */ 1263 */
1328void 1264void
1329rxvt_term::scr_erase_screen (int mode) 1265rxvt_term::scr_erase_screen (int mode)
1330{ 1266{
1331 int num; 1267 int num;
1332 int32_t row, row_offset; 1268 int32_t row;
1333 rend_t ren; 1269 rend_t ren;
1334 XGCValues gcvalue; 1270 XGCValues gcvalue;
1335 1271
1336 want_refresh = 1; 1272 want_refresh = 1;
1337 ZERO_SCROLLBACK (); 1273 ZERO_SCROLLBACK ();
1338
1339 row_offset = (int32_t)TermWin.saveLines;
1340 1274
1341 switch (mode) 1275 switch (mode)
1342 { 1276 {
1343 case 0: /* erase to end of screen */ 1277 case 0: /* erase to end of screen */
1344 selection_check (1); 1278 selection_check (1);
1345 scr_erase_line (0); 1279 scr_erase_line (0);
1346 row = screen.cur.row + 1; /* possible OOB */ 1280 row = screen.cur.row + 1; /* possible OOB */
1347 num = TermWin.nrow - row; 1281 num = nrow - row;
1348 break; 1282 break;
1349 case 1: /* erase to beginning of screen */ 1283 case 1: /* erase to beginning of screen */
1350 selection_check (3); 1284 selection_check (3);
1351 scr_erase_line (1); 1285 scr_erase_line (1);
1352 row = 0; 1286 row = 0;
1353 num = screen.cur.row; 1287 num = screen.cur.row;
1354 break; 1288 break;
1355 case 2: /* erase whole screen */ 1289 case 2: /* erase whole screen */
1356 selection_check (3); 1290 selection_check (3);
1357 row = 0; 1291 row = 0;
1358 num = TermWin.nrow; 1292 num = nrow;
1359 break; 1293 break;
1360 default: 1294 default:
1361 return; 1295 return;
1362 } 1296 }
1363 1297
… …
1365 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1366 || (selection.end.row >= row 1300 || (selection.end.row >= row
1367 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1368 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1369 1303
1370 if (row >= TermWin.nrow) /* Out Of Bounds */ 1304 if (row >= nrow) /* Out Of Bounds */
1371 return; 1305 return;
1372 1306
1373 MIN_IT (num, (TermWin.nrow - row)); 1307 MIN_IT (num, (nrow - row));
1374 1308
1375 if (rstyle & (RS_RVid | RS_Uline)) 1309 if (rstyle & (RS_RVid | RS_Uline))
1376 ren = (rend_t) ~RS_None; 1310 ren = (rend_t) ~RS_None;
1377 else if (GET_BASEBG (rstyle) == Color_bg) 1311 else if (GET_BASEBG (rstyle) == Color_bg)
1378 { 1312 {
1379 ren = DEFAULT_RSTYLE; 1313 ren = DEFAULT_RSTYLE;
1380 CLEAR_ROWS (row, num); 1314 CLEAR_ROWS (row, num);
1381 } 1315 }
1382 else 1316 else
1383 { 1317 {
1384 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1318 ren = rstyle & (RS_fgMask | RS_bgMask);
1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1319 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1387 ERASE_ROWS (row, num); 1321 ERASE_ROWS (row, num);
1388 gcvalue.foreground = pix_colors[Color_fg]; 1322 gcvalue.foreground = pix_colors[Color_fg];
1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1323 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1390 } 1324 }
1391 1325
1392 for (; num--; row++) 1326 for (; num--; row++)
1393 { 1327 {
1394 scr_blank_screen_mem (screen.text, screen.rend, 1328 scr_blank_screen_mem (ROW (row), rstyle);
1395 (unsigned int) (row + row_offset), rstyle); 1329 ROW (row).l = 0;
1396 screen.tlen[row + row_offset] = 0; 1330 scr_blank_line (drawn[row], 0, ncol, ren);
1397 scr_blank_line (drawn_text[row], drawn_rend[row],
1398 (unsigned int)TermWin.ncol, ren);
1399 } 1331 }
1400} 1332}
1333
1334#if ENABLE_FRILLS
1335void
1336rxvt_term::scr_erase_savelines ()
1337{
1338 want_refresh = 1;
1339 ZERO_SCROLLBACK ();
1340
1341 nsaved = 0;
1342}
1343#endif
1401 1344
1402/* ------------------------------------------------------------------------- */ 1345/* ------------------------------------------------------------------------- */
1403/* 1346/*
1404 * Fill the screen with `E's 1347 * Fill the screen with `E's
1405 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1348 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1406 */ 1349 */
1407void 1350void
1408rxvt_term::scr_E () 1351rxvt_term::scr_E ()
1409{ 1352{
1410 int i, j, k; 1353 rend_t fs;
1411 rend_t *r1, fs;
1412 1354
1413 want_refresh = 1; 1355 want_refresh = 1;
1414 ZERO_SCROLLBACK (); 1356 ZERO_SCROLLBACK ();
1415 1357
1416 num_scr_allow = 0; 1358 num_scr_allow = 0;
1417 selection_check (3); 1359 selection_check (3);
1418 1360
1419 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1361 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1420 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1362 for (int row = nrow; row--; )
1421 { 1363 {
1422 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1364 line_t &line = ROW(row);
1365
1423 fill_text (screen.text[k], 'E', TermWin.ncol); 1366 fill_text (line.t, 'E', ncol);
1424 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1367 rend_t *r1 = line.r;
1368
1369 for (int j = ncol; j--; )
1425 *r1++ = fs; 1370 *r1++ = fs;
1371
1372 line.l = ncol; /* make the `E's selectable */
1426 } 1373 }
1427} 1374}
1428 1375
1429/* ------------------------------------------------------------------------- */ 1376/* ------------------------------------------------------------------------- */
1430/* 1377/*
… …
1451 count = end; 1398 count = end;
1452 } 1399 }
1453 1400
1454 scr_do_wrap (); 1401 scr_do_wrap ();
1455 1402
1456 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1403 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1457} 1404}
1458 1405
1459/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1460/* 1407/*
1461 * Insert/Delete <count> characters from the current position 1408 * Insert/Delete <count> characters from the current position
… …
1463void 1410void
1464rxvt_term::scr_insdel_chars (int count, int insdel) 1411rxvt_term::scr_insdel_chars (int count, int insdel)
1465{ 1412{
1466 int col, row; 1413 int col, row;
1467 rend_t tr; 1414 rend_t tr;
1468 text_t *stp;
1469 rend_t *srp;
1470 int16_t *slp;
1471 1415
1472 want_refresh = 1; 1416 want_refresh = 1;
1473 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1474 1418
1475 if (count <= 0) 1419 if (count <= 0)
1476 return; 1420 return;
1477 1421
1478 scr_do_wrap (); 1422 scr_do_wrap ();
1479 1423
1480 selection_check (1); 1424 selection_check (1);
1481 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1425 MIN_IT (count, (ncol - screen.cur.col));
1482 1426
1483 row = screen.cur.row + TermWin.saveLines;
1484
1485 stp = screen.text[row];
1486 srp = screen.rend[row]; 1427 row = screen.cur.row;
1487 slp = &screen.tlen[row]; 1428
1429 line_t *line = &ROW(row);
1488 1430
1489 switch (insdel) 1431 switch (insdel)
1490 { 1432 {
1491 case INSERT: 1433 case INSERT:
1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1434 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1493 col--)
1494 { 1435 {
1495 stp[col] = stp[col - count]; 1436 line->t[col] = line->t[col - count];
1496 srp[col] = srp[col - count]; 1437 line->r[col] = line->r[col - count];
1497 } 1438 }
1498 1439
1499 if (*slp != -1) 1440 if (!line->is_longer ())
1500 { 1441 {
1501 *slp += count; 1442 line->l += count;
1502 MIN_IT (*slp, TermWin.ncol); 1443 MIN_IT (line->l, ncol);
1503 } 1444 }
1504 1445
1505 if (selection.op && current_screen == selection.screen 1446 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1448 {
1508 if (selection.end.row != screen.cur.row 1449 if (selection.end.row != screen.cur.row
1509 || (selection.end.col + count >= TermWin.ncol)) 1450 || (selection.end.col + count >= ncol))
1510 CLEAR_SELECTION (); 1451 CLEAR_SELECTION ();
1511 else 1452 else
1512 { /* shift selection */ 1453 { /* shift selection */
1513 selection.beg.col += count; 1454 selection.beg.col += count;
1514 selection.mark.col += count; /* XXX: yes? */ 1455 selection.mark.col += count; /* XXX: yes? */
1515 selection.end.col += count; 1456 selection.end.col += count;
1516 } 1457 }
1517 } 1458 }
1518 1459
1519 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1460 scr_blank_line (*line, screen.cur.col, count, rstyle);
1520 (unsigned int)count, rstyle);
1521 break; 1461 break;
1522 1462
1523 case ERASE: 1463 case ERASE:
1524 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1464 screen.cur.col += count; /* don't worry if > ncol */
1525 selection_check (1); 1465 selection_check (1);
1526 screen.cur.col -= count; 1466 screen.cur.col -= count;
1527 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1467 scr_blank_line (*line, screen.cur.col, count, rstyle);
1528 (unsigned int)count, rstyle);
1529 break; 1468 break;
1530 1469
1531 case DELETE: 1470 case DELETE:
1532 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1471 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1533 1472
1534 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1473 for (col = screen.cur.col; (col + count) < ncol; col++)
1535 { 1474 {
1536 stp[col] = stp[col + count]; 1475 line->t[col] = line->t[col + count];
1537 srp[col] = srp[col + count]; 1476 line->r[col] = line->r[col + count];
1538 } 1477 }
1539 1478
1540 scr_blank_line (& (stp[TermWin.ncol - count]), 1479 scr_blank_line (*line, ncol - count, count, tr);
1541 & (srp[TermWin.ncol - count]),
1542 (unsigned int)count, tr);
1543 1480
1544 if (*slp == -1) /* break line continuation */ 1481 if (line->is_longer ()) /* break line continuation */
1545 *slp = TermWin.ncol; 1482 line->l = ncol;
1546 1483
1547 *slp -= count; 1484 line->l = max (line->l - count, 0);
1548 MAX_IT (*slp, 0);
1549 1485
1550 if (selection.op && current_screen == selection.screen 1486 if (selection.op && current_screen == selection.screen
1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1487 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1552 { 1488 {
1553 if (selection.end.row != screen.cur.row 1489 if (selection.end.row != screen.cur.row
1554 || (screen.cur.col >= selection.beg.col - count) 1490 || (screen.cur.col >= selection.beg.col - count)
1555 || selection.end.col >= TermWin.ncol) 1491 || selection.end.col >= ncol)
1556 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1557 else 1493 else
1558 { 1494 {
1559 /* shift selection */ 1495 /* shift selection */
1560 selection.beg.col -= count; 1496 selection.beg.col -= count;
1561 selection.mark.col -= count; /* XXX: yes? */ 1497 selection.mark.col -= count; /* XXX: yes? */
1562 selection.end.col -= count; 1498 selection.end.col -= count;
1563 } 1499 }
1564 } 1500 }
1565 1501
1566 break; 1502 break;
1567 } 1503 }
… …
1574 */ 1510 */
1575void 1511void
1576rxvt_term::scr_scroll_region (int top, int bot) 1512rxvt_term::scr_scroll_region (int top, int bot)
1577{ 1513{
1578 MAX_IT (top, 0); 1514 MAX_IT (top, 0);
1579 MIN_IT (bot, (int)TermWin.nrow - 1); 1515 MIN_IT (bot, (int)nrow - 1);
1580 1516
1581 if (top > bot) 1517 if (top > bot)
1582 return; 1518 return;
1583 1519
1584 screen.tscroll = top; 1520 screen.tscroll = top;
… …
1663 */ 1599 */
1664void 1600void
1665rxvt_term::scr_set_tab (int mode) 1601rxvt_term::scr_set_tab (int mode)
1666{ 1602{
1667 if (mode < 0) 1603 if (mode < 0)
1668 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1604 memset (tabs, 0, ncol * sizeof (char));
1669 else if (screen.cur.col < TermWin.ncol) 1605 else if (screen.cur.col < ncol)
1670 tabs[screen.cur.col] = (mode ? 1 : 0); 1606 tabs[screen.cur.col] = (mode ? 1 : 0);
1671} 1607}
1672 1608
1673/* ------------------------------------------------------------------------- */ 1609/* ------------------------------------------------------------------------- */
1674/* 1610/*
… …
1689 if (bgPixmap.pixmap == None) 1625 if (bgPixmap.pixmap == None)
1690#endif 1626#endif
1691#if TRANSPARENT 1627#if TRANSPARENT
1692 if (! (options & Opt_transparent) || am_transparent == 0) 1628 if (! (options & Opt_transparent) || am_transparent == 0)
1693#endif 1629#endif
1694 XSetWindowBackground (display->display, TermWin.vt, 1630 XSetWindowBackground (display->display, vt,
1695 pix_colors[Color_bg]); 1631 pix_colors[Color_bg]);
1696 1632
1697 gcvalue.foreground = pix_colors[Color_fg]; 1633 gcvalue.foreground = pix_colors[Color_fg];
1698 gcvalue.background = pix_colors[Color_bg]; 1634 gcvalue.background = pix_colors[Color_bg];
1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1635 XChangeGC (display->display, gc, GCBackground | GCForeground,
1700 &gcvalue); 1636 &gcvalue);
1701 scr_clear (); 1637 scr_clear ();
1702 scr_touch (true); 1638 scr_touch (true);
1703 } 1639 }
1704} 1640}
… …
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1687 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1688 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1689 */
1754void 1690void
1755rxvt_term::scr_charset_choose (int set) 1691rxvt_term::scr_charset_choose (int set)
1756 { 1692{
1757 screen.charset = set; 1693 screen.charset = set;
1758 set_font_style (); 1694 set_font_style ();
1759 } 1695}
1760 1696
1761/* ------------------------------------------------------------------------- */ 1697/* ------------------------------------------------------------------------- */
1762/* 1698/*
1763 * Set a font 1699 * Set a font
1764 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1700 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1767 * XTERM_SEQ: Set G3 character set: ESC + <C> 1703 * XTERM_SEQ: Set G3 character set: ESC + <C>
1768 * See set_font_style for possible values for <C> 1704 * See set_font_style for possible values for <C>
1769 */ 1705 */
1770void 1706void
1771rxvt_term::scr_charset_set (int set, unsigned int ch) 1707rxvt_term::scr_charset_set (int set, unsigned int ch)
1772 { 1708{
1773 charsets[set] = (unsigned char)ch; 1709 charsets[set] = (unsigned char)ch;
1774 set_font_style (); 1710 set_font_style ();
1775 } 1711}
1776 1712
1777 1713
1778/* ------------------------------------------------------------------------- * 1714/* ------------------------------------------------------------------------- *
1779 * MAJOR SCREEN MANIPULATION * 1715 * MAJOR SCREEN MANIPULATION *
1780 * ------------------------------------------------------------------------- */ 1716 * ------------------------------------------------------------------------- */
… …
1785bool 1721bool
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1722rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1787{ 1723{
1788 bool found = false; 1724 bool found = false;
1789 1725
1790 for (int i = 0; i < TermWin.nrow; i++) 1726 for (int i = 0; i < nrow; i++)
1791 { 1727 {
1792 int col = 0; 1728 int col = 0;
1793 rend_t *drp = drawn_rend [i]; 1729 rend_t *drp = drawn[i].r;
1794 1730
1795 for (; col < TermWin.ncol; col++, drp++) 1731 for (; col < ncol; col++, drp++)
1796 if ((*drp & mask) == value) 1732 if ((*drp & mask) == value)
1797 { 1733 {
1798 found = true; 1734 found = true;
1799 *drp = ~value; 1735 *drp = ~value;
1800 } 1736 }
… …
1811 PART_END, 1747 PART_END,
1812 RC_COUNT 1748 RC_COUNT
1813}; 1749};
1814 1750
1815void 1751void
1816rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1752rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1817{ 1753{
1818 int i; 1754 int i;
1819 row_col_t rc[RC_COUNT]; 1755 row_col_t rc[RC_COUNT];
1820 1756
1821 if (drawn_text == NULL) /* sanity check */ 1757 if (!drawn) /* sanity check */
1822 return; 1758 return;
1823 1759
1824#ifndef NO_SLOW_LINK_SUPPORT 1760#ifndef NO_SLOW_LINK_SUPPORT
1825 if (refresh_type == FAST_REFRESH && !display->is_local) 1761 if (refresh_type == FAST_REFRESH && !display->is_local)
1826 { 1762 {
1827 y = 0; 1763 y = 0;
1828 height = TermWin.height; 1764 eheight = height;
1829 } 1765 }
1830#endif 1766#endif
1831 1767
1832#ifdef DEBUG_STRICT 1768#ifdef DEBUG_STRICT
1833 x = max (x, 0); 1769 x = max (x, 0);
1834 x = min (x, (int)TermWin.width); 1770 x = min (x, (int)width);
1835 y = max (y, 0); 1771 y = max (y, 0);
1836 y = min (y, (int)TermWin.height); 1772 y = min (y, (int)height);
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
1969 want_refresh = 0; /* screen is current */
1970
2041 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1971 if (refresh_type == NO_REFRESH || !mapped)
2042 return; 1972 return;
2043 1973
2044 /* 1974 /*
2045 * A: set up vars 1975 * A: set up vars
2046 */ 1976 */
2047 must_clear = 0; 1977 must_clear = 0;
2048 refresh_count = 0; 1978 refresh_count = 0;
2049 1979
2050 row_offset = TermWin.saveLines - TermWin.view_start;
2051
2052#if XPM_BACKGROUND 1980#if XPM_BACKGROUND
2053 must_clear |= (bgPixmap.pixmap != None); 1981 must_clear |= bgPixmap.pixmap != None;
2054#endif 1982#endif
2055#if TRANSPARENT 1983#if TRANSPARENT
2056 must_clear |= ((options & Opt_transparent) && am_transparent); 1984 must_clear |= (options & Opt_transparent) && am_transparent;
2057#endif 1985#endif
2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1986 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059 1987
2060 /* 1988 /*
2061 * B: reverse any characters which are selected 1989 * B: reverse any characters which are selected
… …
2078 2006
2079 if (showcursor) 2007 if (showcursor)
2080 { 2008 {
2081 int col = screen.cur.col; 2009 int col = screen.cur.col;
2082 2010
2083 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2011 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2084 col--; 2012 col--;
2085 2013
2086 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2014 crp = &ROW(screen.cur.row).r[col];
2087 2015
2088 if (showcursor && TermWin.focus) 2016 if (showcursor && focus)
2089 { 2017 {
2018 if (options & Opt_cursorUnderline)
2019 *crp ^= RS_Uline;
2020 else
2021 {
2090 *crp ^= RS_RVid; 2022 *crp ^= RS_RVid;
2023
2091#ifndef NO_CURSORCOLOR 2024#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask); 2025 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor)) 2026 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor; 2027 ccol1 = Color_cursor;
2095 else 2028 else
2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2029#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2097 ccol1 = GET_FGCOLOR (rstyle); 2030 ccol1 = GET_FGCOLOR (rstyle);
2098#else 2031#else
2099 ccol1 = Color_fg; 2032 ccol1 = Color_fg;
2100#endif 2033#endif
2101 if (ISSET_PIXCOLOR (Color_cursor2)) 2034 if (ISSET_PIXCOLOR (Color_cursor2))
2102 ccol2 = Color_cursor2; 2035 ccol2 = Color_cursor2;
2103 else 2036 else
2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2105 ccol2 = GET_BGCOLOR (rstyle); 2038 ccol2 = GET_BGCOLOR (rstyle);
2106#else 2039#else
2107 ccol2 = Color_bg; 2040 ccol2 = Color_bg;
2108#endif 2041#endif
2109 *crp = SET_FGCOLOR (*crp, ccol1); 2042 *crp = SET_FGCOLOR (*crp, ccol1);
2110 *crp = SET_BGCOLOR (*crp, ccol2); 2043 *crp = SET_BGCOLOR (*crp, ccol2);
2111#endif 2044#endif
2045 }
2112 } 2046 }
2113 } 2047 }
2114 2048
2115 /* make sure no outline cursor is left around */ 2049 /* make sure no outline cursor is left around */
2116 setoldcursor = 0; 2050 setoldcursor = 0;
2117 if (ocrow != -1) 2051 if (ocrow != -1)
2118 { 2052 {
2119 if (screen.cur.row + TermWin.view_start != ocrow 2053 if (screen.cur.row + view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2054 || screen.cur.col != oldcursor.col)
2121 { 2055 {
2122 if (ocrow < TermWin.nrow 2056 if (ocrow < nrow
2123 && oldcursor.col < TermWin.ncol) 2057 && oldcursor.col < ncol)
2124 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2058 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2059
2126 if (TermWin.focus || !showcursor) 2060 if (focus || !showcursor)
2127 oldcursor.row = -1; 2061 oldcursor.row = -1;
2128 else 2062 else
2129 setoldcursor = 1; 2063 setoldcursor = 1;
2130 } 2064 }
2131 } 2065 }
2132 else if (!TermWin.focus) 2066 else if (!focus)
2133 setoldcursor = 1; 2067 setoldcursor = 1;
2134 2068
2135 if (setoldcursor) 2069 if (setoldcursor)
2136 { 2070 {
2137 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2071 if (screen.cur.row + view_start >= nrow)
2138 oldcursor.row = -1; 2072 oldcursor.row = -1;
2139 else 2073 else
2140 { 2074 {
2141 oldcursor.row = screen.cur.row + TermWin.view_start; 2075 oldcursor.row = screen.cur.row + view_start;
2142 oldcursor.col = screen.cur.col; 2076 oldcursor.col = screen.cur.col;
2143 } 2077 }
2144 } 2078 }
2145 } 2079 }
2146 2080
2147#if ENABLE_OVERLAY 2081#if ENABLE_OVERLAY
2148 scr_swap_overlay (); 2082 scr_swap_overlay ();
2149#endif 2083#endif
2150
2151 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2152 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2153 2084
2154#ifndef NO_SLOW_LINK_SUPPORT 2085#ifndef NO_SLOW_LINK_SUPPORT
2155 /* 2086 /*
2156 * D: CopyArea pass - very useful for slower links 2087 * D: CopyArea pass - very useful for slower links
2157 * This has been deliberately kept simple. 2088 * This has been deliberately kept simple.
2158 */ 2089 */
2159 i = num_scr; 2090 i = num_scr;
2160 if (!display->is_local 2091 if (!display->is_local
2161 && refresh_type == FAST_REFRESH && num_scr_allow && i 2092 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2162 && abs (i) < TermWin.nrow && !must_clear) 2093 && abs (num_scr) < nrow && !must_clear)
2163 { 2094 {
2164 int16_t nits; 2095 int16_t nits;
2165 int j; 2096 int j;
2166 int len, wlen; 2097 int len, wlen;
2167 2098
2168 j = TermWin.nrow; 2099 j = nrow;
2169 wlen = len = -1; 2100 wlen = len = -1;
2170 row = i > 0 ? 0 : j - 1; 2101 row = i > 0 ? 0 : j - 1;
2171 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2102 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2172 { 2103 {
2173 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2104 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2174 { 2105 {
2175 text_t *stp = screen.text[row + row_offset]; 2106 line_t s = ROW(row - view_start);
2176 rend_t *srp = screen.rend[row + row_offset];
2177 text_t *dtp = drawn_text[row]; 2107 line_t d = drawn[row];
2178 text_t *dtp2 = drawn_text[row + i]; 2108 line_t d2 = drawn[row + i];
2179 rend_t *drp = drawn_rend[row];
2180 rend_t *drp2 = drawn_rend[row + i];
2181 2109
2182 for (nits = 0, col = TermWin.ncol; col--; ) 2110 for (nits = 0, col = ncol; col--; )
2183 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2111 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2184 nits--; 2112 nits--;
2185 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])
2186 nits++; 2114 nits++;
2187 2115
2188 if (nits > 8) /* XXX: arbitrary choice */ 2116 if (nits > 8) /* XXX: arbitrary choice */
2189 { 2117 {
2190 for (col = TermWin.ncol; col--; ) 2118 for (col = ncol; col--; )
2191 { 2119 {
2192 *dtp++ = *dtp2++; 2120 *d.t++ = *d2.t++;
2193 *drp++ = *drp2++; 2121 *d.r++ = *d2.r++;
2194 } 2122 }
2195 2123
2196 if (len == -1) 2124 if (len == -1)
2197 len = row; 2125 len = row;
2198 2126
… …
2205 { 2133 {
2206 /* also comes here at end if needed because of >= above */ 2134 /* also comes here at end if needed because of >= above */
2207 if (wlen < len) 2135 if (wlen < len)
2208 SWAP_IT (wlen, len, int); 2136 SWAP_IT (wlen, len, int);
2209 2137
2210 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2138 XCopyArea (display->display, vt, vt,
2211 TermWin.gc, 0, Row2Pixel (len + i), 2139 gc, 0, Row2Pixel (len + i),
2212 (unsigned int)TermWin_TotalWidth (), 2140 (unsigned int)TermWin_TotalWidth (),
2213 (unsigned int)Height2Pixel (wlen - len + 1), 2141 (unsigned int)Height2Pixel (wlen - len + 1),
2214 0, Row2Pixel (len)); 2142 0, Row2Pixel (len));
2215 len = -1; 2143 len = -1;
2216 } 2144 }
… …
2219#endif 2147#endif
2220 2148
2221 /* 2149 /*
2222 * E: main pass across every character 2150 * E: main pass across every character
2223 */ 2151 */
2224 for (row = 0; row < TermWin.nrow; row++) 2152 for (row = 0; row < nrow; row++)
2225 { 2153 {
2226 text_t *stp = screen.text[row + row_offset]; 2154 text_t *stp = ROW(row - view_start).t;
2227 rend_t *srp = screen.rend[row + row_offset]; 2155 rend_t *srp = ROW(row - view_start).r;
2228 text_t *dtp = drawn_text[row]; 2156 text_t *dtp = drawn[row].t;
2229 rend_t *drp = drawn_rend[row]; 2157 rend_t *drp = drawn[row].r;
2230 2158
2231 /* 2159 /*
2232 * E2: OK, now the real pass 2160 * E2: OK, now the real pass
2233 */ 2161 */
2234 int ypixel = (int)Row2Pixel (row); 2162 int ypixel = (int)Row2Pixel (row);
2235 2163
2236 for (col = 0; col < TermWin.ncol; col++) 2164 for (col = 0; col < ncol; col++)
2237 { 2165 {
2238 /* compare new text with old - if exactly the same then continue */ 2166 /* compare new text with old - if exactly the same then continue */
2239 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2167 if (stp[col] == dtp[col] /* Must match characters to skip. */
2240 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2168 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2241 || (stp[col] == ' ' /* space w/ no background change */ 2169 || (stp[col] == ' ' /* space w/ no background change */
2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2170 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2243 continue; 2171 continue;
2244 2172
2245 // redraw one or more characters 2173 // redraw one or more characters
2246 2174
2247 // seek to the beginning if wide characters 2175 // seek to the beginning of wide characters
2248 while (stp[col] == NOCHAR && col > 0) 2176 while (stp[col] == NOCHAR && col > 0)
2249 --col; 2177 --col;
2250 2178
2251 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2179 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2252 text_t *text = stp + col; 2180 text_t *text = stp + col;
… …
2255 dtp[col] = stp[col]; 2183 dtp[col] = stp[col];
2256 drp[col] = rend; 2184 drp[col] = rend;
2257 2185
2258 int xpixel = Col2Pixel (col); 2186 int xpixel = Col2Pixel (col);
2259 2187
2260 for (i = 0; ++col < TermWin.ncol; ) 2188 for (i = 0; ++col < ncol; )
2261 { 2189 {
2262 if (stp[col] == NOCHAR) 2190 if (stp[col] == NOCHAR)
2263 { 2191 {
2264 dtp[col] = stp[col]; 2192 dtp[col] = stp[col];
2265 drp[col] = rend; 2193 drp[col] = rend;
… …
2293 2221
2294 // sometimes we optimize away the trailing NOCHAR's, add them back 2222 // sometimes we optimize away the trailing NOCHAR's, add them back
2295 while (i && text[count] == NOCHAR) 2223 while (i && text[count] == NOCHAR)
2296 count++, i--; 2224 count++, i--;
2297 2225
2298#if ENABLE_STYLES
2299 // force redraw after "careful" characters to avoid pixel droppings
2300 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2301 drp[col + 1] = ~srp[col + 1];
2302
2303 // include previous careful character(s) if possible, looks nicer (best effort...)
2304 while (text > stp
2305 && srp[text - stp - 1] & RS_Careful
2306 && RS_SAME (rend, srp[text - stp - 1]))
2307 text--, count++, xpixel -= TermWin.fwidth;
2308#endif
2309
2310 /* 2226 /*
2311 * Determine the attributes for the string 2227 * Determine the attributes for the string
2312 */ 2228 */
2313 int fore = GET_FGCOLOR (rend); // desired foreground 2229 int fore = GET_FGCOLOR (rend); // desired foreground
2314 int back = GET_BGCOLOR (rend); // desired background 2230 int back = GET_BGCOLOR (rend); // desired background
2315 2231
2316 // 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
2317 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))
2318 { 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
2319 bool invert = rend & RS_RVid; 2247 bool invert = rend & RS_RVid;
2320 2248
2321#ifndef NO_BOLD_UNDERLINE_REVERSE 2249#ifndef NO_BOLD_UNDERLINE_REVERSE
2322 if (rend & RS_Bold 2250 if (rend & RS_Bold
2323 && fore == Color_fg) 2251 && fore == Color_fg)
… …
2350 SWAP_IT (fore, back, int); 2278 SWAP_IT (fore, back, int);
2351 2279
2352#ifndef NO_BOLD_UNDERLINE_REVERSE 2280#ifndef NO_BOLD_UNDERLINE_REVERSE
2353 if (ISSET_PIXCOLOR (Color_RV)) 2281 if (ISSET_PIXCOLOR (Color_RV))
2354 back = Color_RV; 2282 back = Color_RV;
2283
2284 if (fore == back)
2285 {
2286 fore = Color_bg;
2287 back = Color_fg;
2288 }
2355#endif 2289#endif
2356 } 2290 }
2357 2291
2358#ifdef TEXT_BLINK 2292#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2293 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2370 } 2304 }
2371 2305
2372 /* 2306 /*
2373 * Actually do the drawing of the string here 2307 * Actually do the drawing of the string here
2374 */ 2308 */
2375 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2309 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376 2310
2377 if (back == fore) 2311 if (back == fore)
2378 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2312 font->clear_rect (*drawable, xpixel, ypixel,
2379 TermWin.fwidth * count, TermWin.fheight, 2313 fwidth * count, fheight,
2380 back); 2314 back);
2381 else if (back == Color_bg) 2315 else if (back == Color_bg)
2382 { 2316 {
2383 if (must_clear) 2317 if (must_clear)
2384 { 2318 {
2385 CLEAR_CHARS (xpixel, ypixel, count); 2319 CLEAR_CHARS (xpixel, ypixel, count);
2386 2320
2387 for (i = 0; i < count; i++) /* don't draw empty strings */ 2321 for (i = 0; i < count; i++) /* don't draw empty strings */
2388 if (text[i] != ' ') 2322 if (text[i] != ' ')
2389 { 2323 {
2390 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2324 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2391 break; 2325 break;
2392 } 2326 }
2393 } 2327 }
2394 else 2328 else
2395 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2329 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2396 } 2330 }
2397 else 2331 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2399 2333
2400 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
2401 XDrawLine (display->display, drawBuffer, TermWin.gc, 2343 XDrawLine (display->display, drawBuffer, gc,
2402 xpixel, ypixel + font->ascent + 1, 2344 xpixel, ypixel + font->ascent + 1,
2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2345 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2346 }
2404 } /* for (col....) */ 2347 } /* for (col....) */
2405 } /* for (row....) */ 2348 } /* for (row....) */
2406 2349
2407#if ENABLE_OVERLAY 2350#if ENABLE_OVERLAY
2408 scr_swap_overlay (); 2351 scr_swap_overlay ();
… …
2411 /* 2354 /*
2412 * G: cleanup cursor and display outline cursor if necessary 2355 * G: cleanup cursor and display outline cursor if necessary
2413 */ 2356 */
2414 if (showcursor) 2357 if (showcursor)
2415 { 2358 {
2416 if (TermWin.focus) 2359 if (focus)
2360 {
2361 if (options & Opt_cursorUnderline)
2362 *crp ^= RS_Uline;
2363 else
2417 { 2364 {
2418 *crp ^= RS_RVid; 2365 *crp ^= RS_RVid;
2419#ifndef NO_CURSORCOLOR 2366#ifndef NO_CURSORCOLOR
2420 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2367 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2421#endif 2368#endif
2369 }
2422 } 2370 }
2423 else if (oldcursor.row >= 0) 2371 else if (oldcursor.row >= 0)
2424 { 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
2425#ifndef NO_CURSORCOLOR 2383#ifndef NO_CURSORCOLOR
2426 if (ISSET_PIXCOLOR (Color_cursor)) 2384 if (ISSET_PIXCOLOR (Color_cursor))
2427 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2385 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2428#endif 2386#endif
2429 int cursorwidth = 1;
2430 while (oldcursor.col + cursorwidth < TermWin.ncol
2431 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2432 cursorwidth++;
2433 2387
2434 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2388 XDrawRectangle (display->display, drawBuffer, gc,
2435 Col2Pixel (oldcursor.col), 2389 Col2Pixel (col),
2436 Row2Pixel (oldcursor.row), 2390 Row2Pixel (oldcursor.row),
2437 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2391 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2438 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2392 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2439 } 2393 }
2440 } 2394 }
2441 2395
2442 /* 2396 /*
2443 * H: cleanup selection 2397 * H: cleanup selection
… …
2447 if (refresh_type & SMOOTH_REFRESH) 2401 if (refresh_type & SMOOTH_REFRESH)
2448 XFlush (display->display); 2402 XFlush (display->display);
2449 2403
2450 num_scr = 0; 2404 num_scr = 0;
2451 num_scr_allow = 1; 2405 num_scr_allow = 1;
2452 want_refresh = 0; /* screen is current */
2453} 2406}
2454 2407
2455void 2408void
2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2409rxvt_term::scr_remap_chars (const line_t &l)
2457{ 2410{
2458 if (!rp || !tp) 2411 if (!l.t)
2459 return; 2412 return;
2460 2413
2461 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2414 for (int i = ncol; i--; )
2462 *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]));
2463} 2416}
2464 2417
2465void 2418void
2466rxvt_term::scr_remap_chars () 2419rxvt_term::scr_remap_chars ()
2467{ 2420{
2468 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2421 for (int i = total_rows; i--; )
2469 scr_remap_chars (screen.text[i], screen.rend[i]); 2422 scr_remap_chars (save[i]);
2470 2423
2471 for (int i = TermWin.nrow; i--; ) 2424 for (int i = nrow; i--; )
2472 { 2425 {
2473 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2426 scr_remap_chars (drawn[i]);
2474 scr_remap_chars (swap.text[i], swap.rend[i]); 2427 scr_remap_chars (swap_save[i]);
2475 } 2428 }
2476} 2429}
2477 2430
2478void 2431void
2479rxvt_term::scr_recolour () 2432rxvt_term::scr_recolour ()
… …
2485#if XPM_BACKGROUND 2438#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap 2439 && !bgPixmap.pixmap
2487#endif 2440#endif
2488 ) 2441 )
2489 { 2442 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2443 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]); 2444 XClearWindow (display->display, parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2445 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS 2446#if HAVE_SCROLLBARS
2494 if (scrollBar.win) 2447 if (scrollBar.win)
2495 { 2448 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2449 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle (); 2450 scrollBar.setIdle ();
… …
2507 2460
2508/* ------------------------------------------------------------------------- */ 2461/* ------------------------------------------------------------------------- */
2509void 2462void
2510rxvt_term::scr_clear (bool really) 2463rxvt_term::scr_clear (bool really)
2511{ 2464{
2512 if (!TermWin.mapped) 2465 if (!mapped)
2513 return; 2466 return;
2514 2467
2515 num_scr_allow = 0; 2468 num_scr_allow = 0;
2516 want_refresh = 1; 2469 want_refresh = 1;
2517 2470
2518#if TRANSPARENT 2471 if (really)
2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0)) 2472 XClearWindow (display->display, vt);
2520 { 2473}
2521 int i;
2522 2474
2523 if (!(options & Opt_transparent_all)) 2475/* ------------------------------------------------------------------------- */
2524 i = 0; 2476void
2477rxvt_term::scr_reverse_selection ()
2478{
2479 if (selection.op
2480 && current_screen == selection.screen
2481 && selection.end.row >= -view_start)
2482 {
2483 int view_end = -view_start + nrow;
2484 int row, col;
2485
2486#if ENABLE_FRILLS
2487 if (selection.rect)
2488 {
2489 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2490 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2491 srp[col] ^= RS_RVid;
2492 }
2525 else 2493 else
2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2527
2528 while (i--)
2529 if (TermWin.parent[i] != None)
2530 XClearWindow (display->display, TermWin.parent[i]);
2531 }
2532#endif 2494#endif
2533 2495 {
2534 if (really) 2496 if (selection.beg.row >= -view_start)
2535 XClearWindow (display->display, TermWin.vt); 2497 {
2536}
2537
2538/* ------------------------------------------------------------------------- */
2539void
2540rxvt_term::scr_reverse_selection ()
2541{
2542 if (selection.op && current_screen == selection.screen)
2543 {
2544 int end_row = TermWin.saveLines - TermWin.view_start;
2545 int i = selection.beg.row + TermWin.saveLines;
2546 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp;
2548
2549 if (i >= end_row)
2550 col = selection.beg.col; 2498 col = selection.beg.col;
2499 row = selection.beg.row;
2500 }
2551 else 2501 else
2552 { 2502 {
2553 col = 0; 2503 col = 0;
2554 i = end_row; 2504 row = view_start;
2555 } 2505 }
2556 2506
2557 end_row += TermWin.nrow; 2507 for (; row < min (selection.end.row, view_end); row++, col = 0)
2558 for (; i < row && i < end_row; i++, col = 0) 2508 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2559 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2560 srp[col] ^= RS_RVid; 2509 srp[col] ^= RS_RVid;
2561 2510
2562 if (i == row && i < end_row) 2511 if (row == selection.end.row)
2563 for (srp = screen.rend[i]; col < selection.end.col; col++) 2512 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2564 srp[col] ^= RS_RVid; 2513 srp[col] ^= RS_RVid;
2514 }
2565 } 2515 }
2566} 2516}
2567 2517
2568/* ------------------------------------------------------------------------- */ 2518/* ------------------------------------------------------------------------- */
2569/* 2519/*
… …
2576{ 2526{
2577 int row, wrote; 2527 int row, wrote;
2578 unsigned int width, towrite; 2528 unsigned int width, towrite;
2579 char r1[] = "\n"; 2529 char r1[] = "\n";
2580 2530
2581 for (row = TermWin.saveLines - TermWin.nscrolled; 2531 for (row = saveLines - nsaved;
2582 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2532 row < saveLines + nrow - 1; row++)
2583 { 2533 {
2584 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2534 width = save[row].l >= 0 ? save[row].l
2585 : TermWin.ncol; 2535 : ncol;
2586 for (towrite = width; towrite; towrite -= wrote) 2536 for (towrite = width; towrite; towrite -= wrote)
2587 { 2537 {
2588 wrote = write (fd, & (screen.text[row][width - towrite]), 2538 wrote = write (fd, & (save[row].t[width - towrite]),
2589 towrite); 2539 towrite);
2590 if (wrote < 0) 2540 if (wrote < 0)
2591 return; /* XXX: death, no report */ 2541 return; /* XXX: death, no report */
2592 } 2542 }
2593 if (screen.tlen[row] >= 0) 2543 if (save[row].l >= 0)
2594 if (write (fd, r1, 1) <= 0) 2544 if (write (fd, r1, 1) <= 0)
2595 return; /* XXX: death, no report */ 2545 return; /* XXX: death, no report */
2596 } 2546 }
2597} 2547}
2598#endif 2548#endif
2599 2549
2600/* ------------------------------------------------------------------------- * 2550/* ------------------------------------------------------------------------- *
2601 * CHARACTER SELECTION * 2551 * CHARACTER SELECTION *
2602 * ------------------------------------------------------------------------- */ 2552 * ------------------------------------------------------------------------- */
2603
2604/*
2605 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2606 */
2607void 2553void
2608rxvt_term::selection_check (int check_more) 2554rxvt_term::selection_check (int check_more)
2609{ 2555{
2610 row_col_t pos; 2556 row_col_t pos;
2611 2557
2612 if (!selection.op) 2558 if (!selection.op)
2613 return; 2559 return;
2614 2560
2615 pos.row = pos.col = 0; 2561 pos.row = pos.col = 0;
2616 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2562 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2617 || (selection.beg.row >= TermWin.nrow) 2563 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2618 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2564 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2619 || (selection.mark.row >= TermWin.nrow)
2620 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2621 || (selection.end.row >= TermWin.nrow)
2622 || (check_more == 1 2565 || (check_more == 1
2623 && current_screen == selection.screen 2566 && current_screen == selection.screen
2624 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2567 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2625 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2568 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2626 || (check_more == 2 2569 || (check_more == 2
… …
2628 && ROWCOL_IS_AFTER (selection.end, pos)) 2571 && ROWCOL_IS_AFTER (selection.end, pos))
2629 || (check_more == 3 2572 || (check_more == 3
2630 && ROWCOL_IS_AFTER (selection.end, pos)) 2573 && ROWCOL_IS_AFTER (selection.end, pos))
2631 || (check_more == 4 /* screen width change */ 2574 || (check_more == 4 /* screen width change */
2632 && (selection.beg.row != selection.end.row 2575 && (selection.beg.row != selection.end.row
2633 || selection.end.col > TermWin.ncol))) 2576 || selection.end.col > ncol)))
2634 CLEAR_SELECTION (); 2577 CLEAR_SELECTION ();
2635} 2578}
2636 2579
2637/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2638/* 2581/*
2639 * Paste a selection direct to the command fd 2582 * Paste a selection direct to the command fd
2640 */ 2583 */
2641void 2584void
2642rxvt_term::paste (const unsigned char *data, unsigned int len) 2585rxvt_term::paste (unsigned char *data, unsigned int len)
2643{ 2586{
2644 unsigned int i, j, n;
2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2646
2647 /* convert normal newline chars into common keyboard Return key sequence */ 2587 /* convert normal newline chars into common keyboard Return key sequence */
2648 for (i = 0; i < len; i += PROP_SIZE) 2588 for (unsigned int i = 0; i < len; i++)
2649 {
2650 n = min (len - i, PROP_SIZE);
2651 memcpy (ds, data + i, n);
2652
2653 for (j = 0; j < n; j++)
2654 if (ds[j] == C0_LF) 2589 if (data[i] == C0_LF)
2655 ds[j] = C0_CR; 2590 data[i] = C0_CR;
2656 2591
2657 tt_write (ds, (int)n); 2592 tt_write (data, len);
2658 }
2659
2660 free (ds);
2661} 2593}
2662 2594
2663/* ------------------------------------------------------------------------- */ 2595/* ------------------------------------------------------------------------- */
2664/* 2596/*
2665 * Respond to a notification that a primary selection has been sent 2597 * Respond to a notification that a primary selection has been sent
2666 * EXT: SelectionNotify 2598 * EXT: SelectionNotify
2667 */ 2599 */
2668int 2600void
2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2601rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2670{ 2602{
2671 long nread = 0;
2672 unsigned long bytes_after;
2673 XTextProperty ct;
2674
2675 if (prop == None) /* check for failed XConvertSelection */ 2603 if (prop == None) /* check for failed XConvertSelection */
2676 { 2604 {
2677 if ((selection_type & Sel_CompoundText)) 2605 if ((selection_type & Sel_CompoundText))
2678 { 2606 {
2679 int selnum = selection_type & Sel_whereMask; 2607 int selnum = selection_type & Sel_whereMask;
… …
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2620 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else 2621 else
2694 selection_type = 0; 2622 selection_type = 0;
2695 } 2623 }
2696 2624
2697 return 0; 2625 return;
2698 }
2699
2700 for (;;)
2701 { 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
2702 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2650 if (XGetWindowProperty (display->display, win, prop,
2703 (long) (PROP_SIZE / 4), delete_prop, 2651 ct.nitems / 4, (bytes_after + 3) / 4,
2652 delete_prop, AnyPropertyType,
2704 AnyPropertyType, &ct.encoding, &ct.format, 2653 &ct2.encoding, &ct2.format,
2705 &ct.nitems, &bytes_after, 2654 &ct2.nitems, &bytes_after,
2706 &ct.value) != Success) 2655 &ct2.value) != Success)
2707 break; 2656 goto bailout;
2708 2657
2709 if (ct.encoding == 0) 2658 // realloc should be compatible to XFree, here, and elsewhere, too
2710 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;
2711 2662
2663 XFree (ct2.value);
2664 }
2665
2666 if (ct.value == 0)
2667 goto bailout;
2668
2712 if (ct.encoding == xa[XA_INCR]) 2669 if (ct.encoding == xa[XA_INCR])
2713 { 2670 {
2714 // INCR selection, start handshake 2671 // INCR selection, start handshake
2672 if (!delete_prop)
2715 XDeleteProperty (display->display, win, prop); 2673 XDeleteProperty (display->display, win, prop);
2674
2716 selection_wait = Sel_incr; 2675 selection_wait = Sel_incr;
2676 incr_buf_fill = 0;
2717 incr_ev.start (NOW + 10); 2677 incr_ev.start (NOW + 10);
2718 break;
2719 }
2720 2678
2721 if (ct.value == NULL) 2679 goto bailout;
2722 continue; 2680 }
2723 2681
2724 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 ();
2725 { 2695 }
2696 else
2697 {
2726 if (selection_wait == Sel_normal && nread == 0 2698 if (selection_wait == Sel_normal
2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2699 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2728 { 2700 {
2729 /* 2701 /*
2730 * pass through again trying CUT_BUFFER0 if we've come from 2702 * pass through again trying CUT_BUFFER0 if we've come from
2731 * XConvertSelection () but nothing was presented 2703 * XConvertSelection () but nothing was presented
2732 */ 2704 */
2733 selection_paste (display->root, XA_CUT_BUFFER0, False); 2705 selection_paste (display->root, XA_CUT_BUFFER0, False);
2734 } 2706 }
2735 2707
2736 nread = -1; /* discount any previous stuff */ 2708 goto bailout;
2737 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)
2738 } 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 }
2739 2720
2721 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2740 nread += ct.nitems; 2722 incr_buf_fill += ct.nitems;
2741 2723
2724 goto bailout;
2725 }
2726
2742 char **cl; 2727 char **cl;
2743 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
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 { 2745 && cl)
2746 {
2746 for (int i = 0; i < cr; i++) 2747 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2748 paste ((unsigned char *)cl[i], strlen (cl[i]));
2748 2749
2749 XFreeStringList (cl); 2750 XFreeStringList (cl);
2750 } 2751 }
2751 else 2752 else
2752 paste (ct.value, ct.nitems); 2753 paste (ct.value, ct.nitems); // paste raw
2753 2754
2754 if (bytes_after == 0) 2755bailout:
2755 break;
2756
2757 XFree (ct.value);
2758 }
2759
2760 if (ct.value)
2761 XFree (ct.value); 2756 XFree (ct.value);
2762 2757
2763 if (selection_wait == Sel_normal) 2758 if (selection_wait == Sel_normal)
2764 selection_wait = Sel_none; 2759 selection_wait = Sel_none;
2765
2766 return (int)nread;
2767} 2760}
2768 2761
2769void 2762void
2770rxvt_term::incr_cb (time_watcher &w) 2763rxvt_term::incr_cb (time_watcher &w)
2771{ 2764{
2772 selection_wait = Sel_none; 2765 selection_wait = Sel_none;
2773 2766
2767 incr_buf_size = 0;
2768 free (incr_buf);
2769
2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2770 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2775} 2771}
2776 2772
2777/*
2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2779 */
2780void 2773void
2781rxvt_term::selection_property (Window win, Atom prop) 2774rxvt_term::selection_property (Window win, Atom prop)
2782{ 2775{
2783 if (prop == None || selection_wait != Sel_incr) 2776 if (prop == None || selection_wait != Sel_incr)
2784 return; 2777 return;
2785 2778
2786 if (selection_paste (win, prop, 1) > 0) 2779 selection_paste (win, prop, true);
2787 incr_ev.start (NOW + 10);
2788 else
2789 {
2790 selection_wait = Sel_none;
2791 incr_ev.stop ();
2792 }
2793} 2780}
2794 2781
2795/* ------------------------------------------------------------------------- */ 2782/* ------------------------------------------------------------------------- */
2796/* 2783/*
2797 * Request the current selection: 2784 * Request the current selection:
… …
2803 * EXT: button 2 release 2790 * EXT: button 2 release
2804 */ 2791 */
2805void 2792void
2806rxvt_term::selection_request (Time tm, int x, int y) 2793rxvt_term::selection_request (Time tm, int x, int y)
2807{ 2794{
2808 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2795 if (x < 0 || x >= width || y < 0 || y >= height)
2809 return; /* outside window */ 2796 return; /* outside window */
2810 2797
2811 if (selection.text) 2798 if (selection.text)
2812 { /* internal selection */ 2799 { /* internal selection */
2813 char *str = rxvt_wcstombs (selection.text, selection.len); 2800 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2831#else 2818#else
2832 selection_type = Sel_CompoundText; 2819 selection_type = Sel_CompoundText;
2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2820 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2834 return; 2821 return;
2835#endif 2822#endif
2836
2837 } 2823 }
2838 } 2824 }
2839 2825
2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2826 selection_wait = Sel_none; /* don't loop in selection_paste () */
2841 selection_paste (display->root, XA_CUT_BUFFER0, False); 2827 selection_paste (display->root, XA_CUT_BUFFER0, false);
2842} 2828}
2843 2829
2844int 2830int
2845rxvt_term::selection_request_other (Atom target, int selnum) 2831rxvt_term::selection_request_other (Atom target, int selnum)
2846{ 2832{
2847 Atom sel; 2833 Atom sel;
2848#ifdef DEBUG_SELECT
2849 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2850#endif
2851 2834
2852 selection_type |= selnum; 2835 selection_type |= selnum;
2853 2836
2854 if (selnum == Sel_Primary) 2837 if (selnum == Sel_Primary)
2855 sel = XA_PRIMARY; 2838 sel = XA_PRIMARY;
… …
2859 sel = xa[XA_CLIPBOARD]; 2842 sel = xa[XA_CLIPBOARD];
2860 2843
2861 if (XGetSelectionOwner (display->display, sel) != None) 2844 if (XGetSelectionOwner (display->display, sel) != None)
2862 { 2845 {
2863 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2846 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2864 TermWin.vt, selection_request_time); 2847 vt, selection_request_time);
2865 return 1; 2848 return 1;
2866 } 2849 }
2867 2850
2868 return 0; 2851 return 0;
2869} 2852}
… …
2892 * EXT: button 1 or 3 release 2875 * EXT: button 1 or 3 release
2893 */ 2876 */
2894void 2877void
2895rxvt_term::selection_make (Time tm) 2878rxvt_term::selection_make (Time tm)
2896{ 2879{
2897 int i, col, end_col, row, end_row; 2880 int i;
2898 wchar_t *new_selection_text; 2881 wchar_t *new_selection_text;
2899 text_t *t; 2882 text_t *t;
2900 2883
2901 switch (selection.op) 2884 switch (selection.op)
2902 { 2885 {
… …
2915 selection.op = SELECTION_DONE; 2898 selection.op = SELECTION_DONE;
2916 2899
2917 if (selection.clicks == 4) 2900 if (selection.clicks == 4)
2918 return; /* nothing selected, go away */ 2901 return; /* nothing selected, go away */
2919 2902
2920 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2921 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));
2922 2905
2923 col = selection.beg.col;
2924 MAX_IT (col, 0);
2925 row = selection.beg.row + TermWin.saveLines;
2926 end_row = selection.end.row + TermWin.saveLines;
2927 int ofs = 0; 2906 int ofs = 0;
2928 int extra = 0; 2907 int extra = 0;
2929 2908
2909 int col = selection.beg.col;
2910 int row = selection.beg.row;
2911
2912 int end_col;
2913
2930 for (; row <= end_row; row++, col = 0) 2914 for (; row <= selection.end.row; row++, col = 0)
2931 { 2915 {
2932 t = &screen.text[row][col]; 2916#if ENABLE_FRILLS
2933 2917 if (selection.rect)
2934 end_col = screen.tlen[row]; 2918 {
2935 2919 col = selection.beg.col;
2936 if (end_col == -1)
2937 end_col = TermWin.ncol; 2920 end_col = ncol + 1;
2921 }
2922 else
2923#endif
2924 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2938 2925
2939 if (row == end_row) 2926 col = max (col, 0);
2927
2928 if (row == selection.end.row || selection.rect)
2940 MIN_IT (end_col, selection.end.col); 2929 end_col = min (end_col, selection.end.col);
2941 2930
2931 t = ROW(row).t + col;
2942 for (; col < end_col; col++) 2932 for (; col < end_col; col++)
2943 { 2933 {
2944 if (*t == NOCHAR) 2934 if (*t == NOCHAR)
2945 t++; 2935 t++;
2946#if ENABLE_COMBINING 2936#if ENABLE_COMBINING
… …
2962#endif 2952#endif
2963 else 2953 else
2964 new_selection_text[ofs++] = *t++; 2954 new_selection_text[ofs++] = *t++;
2965 } 2955 }
2966 2956
2967 if (screen.tlen[row] != -1 && row != end_row) 2957 if (!ROW(row).is_longer () && row != selection.end.row)
2968 new_selection_text[ofs++] = C0_LF; 2958 new_selection_text[ofs++] = C0_LF;
2969 } 2959 }
2970 2960
2971 if (end_col != selection.end.col) 2961 if (end_col != selection.end.col)
2972 new_selection_text[ofs++] = C0_LF; 2962 new_selection_text[ofs++] = C0_LF;
… …
2983 2973
2984 // 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
2985 selection.len = ofs; 2975 selection.len = ofs;
2986 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));
2987 2977
2988 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2978 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2989 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2979 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2990 display->set_selection_owner (this); 2980 display->set_selection_owner (this);
2991 else 2981 else
2992 rxvt_warn ("can't get primary selection, ignoring.\n"); 2982 rxvt_warn ("can't get primary selection, ignoring.\n");
2993 2983
2994#if 0 2984#if 0
2995 XTextProperty ct; 2985 XTextProperty ct;
2996 2986
2997 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2987 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2998 { 2988 {
2999 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2989 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3000 PropModeReplace, ct.value, ct.nitems);
3001 XFree (ct.value); 2990 XFree (ct.value);
3002 } 2991 }
3003#endif 2992#endif
3004 2993
3005 selection_time = tm; 2994 selection_time = tm;
… …
3018 3007
3019 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3008 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3020 3009
3021 if (clicks == 2 || clicks == 3) 3010 if (clicks == 2 || clicks == 3)
3022 selection_extend_colrow (selection.mark.col, 3011 selection_extend_colrow (selection.mark.col,
3023 selection.mark.row + TermWin.view_start, 3012 selection.mark.row + view_start,
3024 0, /* button 3 */ 3013 0, /* button 3 */
3025 1, /* button press */ 3014 1, /* button press */
3026 0); /* click change */ 3015 0); /* click change */
3027} 3016}
3028 3017
… …
3032 */ 3021 */
3033void 3022void
3034rxvt_term::selection_start_colrow (int col, int row) 3023rxvt_term::selection_start_colrow (int col, int row)
3035{ 3024{
3036 want_refresh = 1; 3025 want_refresh = 1;
3026
3027 selection.mark.row = row - view_start;
3037 selection.mark.col = col; 3028 selection.mark.col = col;
3038 selection.mark.row = row - TermWin.view_start;
3039 3029
3040 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3030 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3041 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3031 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3042 MAX_IT (selection.mark.col, 0);
3043 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3044 3032
3045 while (selection.mark.col > 0 3033 while (selection.mark.col > 0
3046 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3034 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3047 --selection.mark.col; 3035 --selection.mark.col;
3048 3036
3049 if (selection.op) 3037 if (selection.op)
3050 { /* clear the old selection */ 3038 { /* clear the old selection */
3051 selection.beg.row = selection.end.row = selection.mark.row; 3039 selection.beg.row = selection.end.row = selection.mark.row;
… …
3075 text_t *stp; 3063 text_t *stp;
3076 rend_t *srp; 3064 rend_t *srp;
3077 3065
3078 if (dirn == UP) 3066 if (dirn == UP)
3079 { 3067 {
3080 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3068 bound.row = - nsaved - 1;
3081 bound.col = 0; 3069 bound.col = 0;
3082 dirnadd = -1; 3070 dirnadd = -1;
3083 } 3071 }
3084 else 3072 else
3085 { 3073 {
3086 bound.row = TermWin.saveLines + TermWin.nrow; 3074 bound.row = nrow;
3087 bound.col = TermWin.ncol - 1; 3075 bound.col = ncol - 1;
3088 dirnadd = 1; 3076 dirnadd = 1;
3089 } 3077 }
3090 3078
3091 row = mark->row + TermWin.saveLines; 3079 row = mark->row;
3092 col = mark->col; 3080 col = max (mark->col, 0);
3093 MAX_IT (col, 0); 3081
3094 /* find the edge of a word */ 3082 /* find the edge of a word */
3095 stp = &screen.text[row][col]; 3083 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3096 w1 = DELIMIT_TEXT (*stp); 3084 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3097
3098 srp = &screen.rend[row][col];
3099 w2 = DELIMIT_REND (*srp);
3100 3085
3101 for (;;) 3086 for (;;)
3102 { 3087 {
3103 for (; col != bound.col; col += dirnadd) 3088 for (; col != bound.col; col += dirnadd)
3104 { 3089 {
… …
3114 break; 3099 break;
3115 } 3100 }
3116 3101
3117 if ((col == bound.col) && (row != bound.row)) 3102 if ((col == bound.col) && (row != bound.row))
3118 { 3103 {
3119 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3104 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3120 { 3105 {
3121 trow = row + dirnadd; 3106 trow = row + dirnadd;
3122 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3107 tcol = dirn == UP ? ncol - 1 : 0;
3123 3108
3124 if (screen.text[trow] == NULL) 3109 if (!ROW(trow).t)
3125 break; 3110 break;
3126 3111
3127 stp = & (screen.text[trow][tcol]); 3112 stp = ROW(trow).t + tcol;
3128 srp = & (screen.rend[trow][tcol]); 3113 srp = ROW(trow).r + tcol;
3129 3114
3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3115 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3131 break; 3116 break;
3132 3117
3133 row = trow; 3118 row = trow;
… …
3141Old_Word_Selection_You_Die: 3126Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3127 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3128 col++; /* put us on one past the end */
3144 3129
3145 /* Poke the values back in */ 3130 /* Poke the values back in */
3146 ret->row = row - TermWin.saveLines; 3131 ret->row = row;
3147 ret->col = col; 3132 ret->col = col;
3148} 3133}
3149 3134
3150/* ------------------------------------------------------------------------- */ 3135/* ------------------------------------------------------------------------- */
3151/* 3136/*
… …
3156 * flag == 2 ==> button 3 motion 3141 * flag == 2 ==> button 3 motion
3157 */ 3142 */
3158void 3143void
3159rxvt_term::selection_extend (int x, int y, int flag) 3144rxvt_term::selection_extend (int x, int y, int flag)
3160{ 3145{
3161 int col, row; 3146 int col = min (max (Pixel2Col (x), 0), ncol);
3162 3147 int row = min (max (Pixel2Row (y), 0), nrow - 1);
3163 col = Pixel2Col (x);
3164 row = Pixel2Row (y);
3165 MAX_IT (row, 0);
3166 MIN_IT (row, (int)TermWin.nrow - 1);
3167 MAX_IT (col, 0);
3168 MIN_IT (col, (int)TermWin.ncol);
3169 3148
3170 /* 3149 /*
3171 * 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
3172 * 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
3173 * 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
3174 * be _past_ a character for it to be selected. 3153 * be _past_ a character for it to be selected.
3175 */ 3154 */
3176 if (((selection.clicks % 3) == 1) && !flag 3155 if (((selection.clicks % 3) == 1) && !flag
3177 && (col == selection.mark.col 3156 && (col == selection.mark.col
3178 && (row == selection.mark.row + TermWin.view_start))) 3157 && (row == selection.mark.row + view_start)))
3179 { 3158 {
3180 /* select nothing */ 3159 /* select nothing */
3181 selection.beg.row = selection.end.row = 0; 3160 selection.beg.row = selection.end.row = 0;
3182 selection.beg.col = selection.end.col = 0; 3161 selection.beg.col = selection.end.col = 0;
3183 selection.clicks = 4; 3162 selection.clicks = 4;
… …
3198 * Extend the selection to the specified col/row 3177 * Extend the selection to the specified col/row
3199 */ 3178 */
3200void 3179void
3201rxvt_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)
3202{ 3181{
3203 int16_t ncol = TermWin.ncol;
3204 int end_col;
3205 row_col_t pos; 3182 row_col_t pos;
3206 enum { 3183 enum {
3207 LEFT, RIGHT 3184 LEFT, RIGHT
3208 } closeto = RIGHT; 3185 } closeto = RIGHT;
3209 3186
3210 want_refresh = 1; 3187 want_refresh = 1;
3188
3211 switch (selection.op) 3189 switch (selection.op)
3212 { 3190 {
3213 case SELECTION_INIT: 3191 case SELECTION_INIT:
3214 CLEAR_SELECTION (); 3192 CLEAR_SELECTION ();
3215 selection.op = SELECTION_BEGIN; 3193 selection.op = SELECTION_BEGIN;
… …
3228 selection_start_colrow (col, row); 3206 selection_start_colrow (col, row);
3229 /* FALLTHROUGH */ 3207 /* FALLTHROUGH */
3230 default: 3208 default:
3231 return; 3209 return;
3232 } 3210 }
3211
3233 if (selection.beg.col == selection.end.col 3212 if (selection.beg.col == selection.end.col
3234 && selection.beg.col != selection.mark.col 3213 && selection.beg.col != selection.mark.col
3235 && selection.beg.row == selection.end.row 3214 && selection.beg.row == selection.end.row
3236 && selection.beg.row != selection.mark.row) 3215 && selection.beg.row != selection.mark.row)
3237 { 3216 {
3238 selection.beg.col = selection.end.col = selection.mark.col; 3217 selection.beg.col = selection.end.col = selection.mark.col;
3239 selection.beg.row = selection.end.row = selection.mark.row; 3218 selection.beg.row = selection.end.row = selection.mark.row;
3240 } 3219 }
3241 3220
3242 pos.col = col; 3221 pos.col = col;
3243 pos.row = row; 3222 pos.row = row - view_start;
3244
3245 pos.row -= TermWin.view_start; /* adjust for scroll */
3246 3223
3247 /* 3224 /*
3248 * 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
3249 * in the way button3 drag extension works. 3226 * in the way button3 drag extension works.
3250 * We're either doing: button1 drag; button3 press; or button3 drag 3227 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3287 } 3264 }
3288 else 3265 else
3289 { /* button1 drag or button3 drag */ 3266 { /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3267 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 { 3268 {
3292 if ((selection.mark.row == selection.end.row) 3269 if (selection.mark.row == selection.end.row
3293 && (selection.mark.col == selection.end.col) 3270 && selection.mark.col == selection.end.col
3271 && clickchange
3294 && clickchange && selection.clicks == 2) 3272 && selection.clicks == 2)
3295 selection.mark.col--; 3273 selection.mark.col--;
3296 3274
3297 selection.beg.row = pos.row; 3275 selection.beg.row = pos.row;
3298 selection.beg.col = pos.col; 3276 selection.beg.col = pos.col;
3299 selection.end.row = selection.mark.row; 3277 selection.end.row = selection.mark.row;
… …
3308 } 3286 }
3309 } 3287 }
3310 3288
3311 if (selection.clicks == 1) 3289 if (selection.clicks == 1)
3312 { 3290 {
3313 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3291 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3314 3292 && !ROW(selection.beg.row).is_longer ()
3315 if (end_col != -1 && selection.beg.col > end_col) 3293#if ENABLE_FRILLS
3294 && !selection.rect
3295#endif
3316 { 3296 )
3317#if 1
3318 selection.beg.col = ncol; 3297 selection.beg.col = ncol;
3319#else 3298
3320 if (selection.beg.row != selection.end.row) 3299 if (
3321 selection.beg.col = ncol; 3300 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3322 else 3301 && !ROW(selection.end.row).is_longer ()
3323 selection.beg.col = selection.mark.col; 3302#if ENABLE_FRILLS
3303 && !selection.rect
3324#endif 3304#endif
3325 } 3305 )
3326
3327 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3328
3329 if (end_col != -1 && selection.end.col > end_col)
3330 selection.end.col = ncol; 3306 selection.end.col = ncol;
3331 } 3307 }
3332 else if (selection.clicks == 2) 3308 else if (selection.clicks == 2)
3333 { 3309 {
3334 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3310 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3335 selection.end.col--; 3311 selection.end.col--;
3336 3312
3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3338 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3313 selection_delimit_word (UP, &selection.beg, &selection.beg);
3314 selection_delimit_word (DN, &selection.end, &selection.end);
3339 } 3315 }
3340 else if (selection.clicks == 3) 3316 else if (selection.clicks == 3)
3341 { 3317 {
3342#if ENABLE_FRILLS 3318#if ENABLE_FRILLS
3343 if ((options & Opt_tripleclickwords)) 3319 if (options & Opt_tripleclickwords)
3344 { 3320 {
3345 int end_row; 3321 selection_delimit_word (UP, &selection.beg, &selection.beg);
3346 3322
3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3349
3350 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++)
3351 { 3324 {
3352 end_col = screen.tlen[end_row + TermWin.saveLines]; 3325 if (!ROW(end_row).is_longer ())
3353
3354 if (end_col != -1)
3355 { 3326 {
3356 selection.end.row = end_row; 3327 selection.end.row = end_row;
3357 selection.end.col = end_col; 3328 selection.end.col = ROW(end_row).l;
3358 selection_remove_trailing_spaces (); 3329 selection_remove_trailing_spaces ();
3359 break; 3330 break;
3360 } 3331 }
3361 } 3332 }
3362 } 3333 }
3363 else 3334 else
3364#endif 3335#endif
3365 { 3336 {
3366 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3337 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3367 selection.mark.col++; 3338 selection.mark.col++;
3339
3368 selection.beg.col = 0; 3340 selection.beg.col = 0;
3369 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++;
3370 } 3351 }
3371 } 3352 }
3372 3353
3373 if (button3 && buttonpress) 3354 if (button3 && buttonpress)
3374 { /* mark may need to be changed */ 3355 { /* mark may need to be changed */
… …
3381 { 3362 {
3382 selection.mark.row = selection.beg.row; 3363 selection.mark.row = selection.beg.row;
3383 selection.mark.col = selection.beg.col; 3364 selection.mark.col = selection.beg.col;
3384 } 3365 }
3385 } 3366 }
3386}
3387 3367
3388#if ENABLE_FRILLS 3368#if ENABLE_FRILLS
3369 if (selection.rect && selection.beg.col > selection.end.col)
3370 SWAP_IT (selection.beg.col, selection.end.col, int);
3371#endif
3372}
3373
3374#if ENABLE_FRILLS
3389void 3375void
3390rxvt_term::selection_remove_trailing_spaces () 3376rxvt_term::selection_remove_trailing_spaces ()
3391{ 3377{
3392 int32_t end_col, end_row; 3378 int32_t end_col, end_row;
3393 text_t *stp; 3379 text_t *stp;
3394 3380
3395 end_col = selection.end.col; 3381 end_col = selection.end.col;
3396 end_row = selection.end.row; 3382 end_row = selection.end.row;
3383
3397 for ( ; end_row >= selection.beg.row; ) 3384 for (; end_row >= selection.beg.row; )
3398 { 3385 {
3399 stp = screen.text[end_row + TermWin.saveLines]; 3386 stp = ROW(end_row).t;
3387
3400 while (--end_col >= 0) 3388 while (--end_col >= 0)
3401 { 3389 {
3402 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3390 if (stp[end_col] != ' '
3391 && stp[end_col] != '\t'
3392 && stp[end_col] != NOCHAR)
3403 break; 3393 break;
3404 } 3394 }
3395
3405 if (end_col >= 0 3396 if (end_col >= 0
3406 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3397 || !ROW(end_row - 1).is_longer ())
3407 { 3398 {
3408 selection.end.col = end_col + 1; 3399 selection.end.col = end_col + 1;
3409 selection.end.row = end_row; 3400 selection.end.row = end_row;
3410 break; 3401 break;
3411 } 3402 }
3403
3412 end_row--; 3404 end_row--;
3413 end_col = TermWin.ncol; 3405 end_col = ncol;
3414 } 3406 }
3407
3415 if (selection.mark.row > selection.end.row) 3408 if (selection.mark.row > selection.end.row)
3416 { 3409 {
3417 selection.mark.row = selection.end.row; 3410 selection.mark.row = selection.end.row;
3418 selection.mark.col = selection.end.col; 3411 selection.mark.col = selection.end.col;
3419 } 3412 }
… …
3435 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3428 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3436} 3429}
3437 3430
3438/* ------------------------------------------------------------------------- */ 3431/* ------------------------------------------------------------------------- */
3439/* 3432/*
3440 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3441 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3442 * the X11 protocol.
3443 */
3444typedef CARD32 Atom32;
3445
3446/* ------------------------------------------------------------------------- */
3447/*
3448 * Respond to a request for our current selection 3433 * Respond to a request for our current selection
3449 * EXT: SelectionRequest 3434 * EXT: SelectionRequest
3450 */ 3435 */
3451void 3436void
3452rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3437rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3453{ 3438{
3454 XSelectionEvent ev; 3439 XSelectionEvent ev;
3455 XTextProperty ct; 3440 dDisp;
3456 XICCEncodingStyle style;
3457 Atom target;
3458 3441
3459 ev.type = SelectionNotify; 3442 ev.type = SelectionNotify;
3460 ev.property = None; 3443 ev.property = None;
3461 ev.display = rq.display; 3444 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3445 ev.requestor = rq.requestor;
… …
3464 ev.target = rq.target; 3447 ev.target = rq.target;
3465 ev.time = rq.time; 3448 ev.time = rq.time;
3466 3449
3467 if (rq.target == xa[XA_TARGETS]) 3450 if (rq.target == xa[XA_TARGETS])
3468 { 3451 {
3469 Atom32 target_list[6]; 3452 Atom target_list[6];
3470 Atom32 *target = target_list; 3453 Atom *target = target_list;
3471 3454
3472 *target++ = (Atom32) xa[XA_TARGETS]; 3455 *target++ = xa[XA_TARGETS];
3473 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3456 *target++ = xa[XA_TIMESTAMP];
3474 *target++ = (Atom32) XA_STRING; 3457 *target++ = XA_STRING;
3475 *target++ = (Atom32) xa[XA_TEXT]; 3458 *target++ = xa[XA_TEXT];
3476 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3459 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3460#if X_HAVE_UTF8_STRING
3478 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3461 *target++ = xa[XA_UTF8_STRING];
3479#endif 3462#endif
3480 3463
3481 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3464 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3482 (8 * sizeof (target_list[0])), PropModeReplace, 3465 32, PropModeReplace,
3483 (unsigned char *)target_list, 3466 (unsigned char *)target_list, target - target_list);
3484 target - target_list);
3485 ev.property = rq.property; 3467 ev.property = rq.property;
3486 } 3468 }
3487#if TODO // TODO 3469#if TODO // TODO
3488 else if (rq.target == xa[XA_MULTIPLE]) 3470 else if (rq.target == xa[XA_MULTIPLE])
3489 { 3471 {
3490 /* TODO: Handle MULTIPLE */ 3472 /* TODO: Handle MULTIPLE */
3491 } 3473 }
3492#endif 3474#endif
3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3475 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3494 { 3476 {
3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3477 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3496 (8 * sizeof (Time)), PropModeReplace,
3497 (unsigned char *)&selection_time, 1); 3478 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3498 ev.property = rq.property; 3479 ev.property = rq.property;
3499 } 3480 }
3500 else if (rq.target == XA_STRING 3481 else if (rq.target == XA_STRING
3501 || rq.target == xa[XA_TEXT] 3482 || rq.target == xa[XA_TEXT]
3502 || rq.target == xa[XA_COMPOUND_TEXT] 3483 || rq.target == xa[XA_COMPOUND_TEXT]
3503 || rq.target == xa[XA_UTF8_STRING] 3484 || rq.target == xa[XA_UTF8_STRING]
3504 ) 3485 )
3505 { 3486 {
3487 XTextProperty ct;
3488 Atom target = rq.target;
3506 short freect = 0; 3489 short freect = 0;
3507 int selectlen; 3490 int selectlen;
3508 wchar_t *cl; 3491 wchar_t *cl;
3509 3492 enum {
3510 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;
3511 3502
3512 if (target == XA_STRING) 3503 if (target == XA_STRING)
3513 // 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
3514 // will ask for another format anyways. 3505 // will ask for another format anyways.
3515 style = XStringStyle; 3506 style = enc_string;
3516 else if (target == xa[XA_TEXT]) 3507 else if (target == xa[XA_TEXT])
3517 style = XStdICCTextStyle; 3508 style = enc_text;
3518 else if (target == xa[XA_COMPOUND_TEXT]) 3509 else if (target == xa[XA_COMPOUND_TEXT])
3519 style = XCompoundTextStyle; 3510 style = enc_compound_text;
3520#if X_HAVE_UTF8_STRING 3511#if ENABLE_FRILLS
3521 else if (target == xa[XA_UTF8_STRING]) 3512 else if (target == xa[XA_UTF8_STRING])
3522 style = XUTF8StringStyle; 3513 style = enc_utf8;
3523#endif 3514#endif
3524 else 3515 else
3525 { 3516 {
3526 target = xa[XA_COMPOUND_TEXT]; 3517 target = xa[XA_COMPOUND_TEXT];
3527 style = XCompoundTextStyle; 3518 style = enc_compound_text;
3528 } 3519 }
3529 3520
3530 if (selection.text) 3521 if (selection.text)
3531 { 3522 {
3532 cl = selection.text; 3523 cl = selection.text;
… …
3536 { 3527 {
3537 cl = L""; 3528 cl = L"";
3538 selectlen = 0; 3529 selectlen = 0;
3539 } 3530 }
3540 3531
3541 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3532#if ENABLE_FRILLS
3542 // 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
3543 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3545 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3544 freect = 1; 3546 freect = 1;
3545 else 3547 else
3546 { 3548 {
3547 /* if we failed to convert then send it raw */ 3549 /* if we failed to convert then send it raw */
3548 ct.value = (unsigned char *)cl; 3550 ct.value = (unsigned char *)cl;
3549 ct.nitems = selectlen; 3551 ct.nitems = selectlen;
3552 ct.encoding = target;
3550 } 3553 }
3551 3554
3552 XChangeProperty (display->display, rq.requestor, rq.property, 3555 XChangeProperty (disp, rq.requestor, rq.property,
3553 target, 8, PropModeReplace, 3556 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3557 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3558 ev.property = rq.property;
3556 3559
3557 if (freect) 3560 if (freect)
3558 XFree (ct.value); 3561 XFree (ct.value);
3559 } 3562 }
3560 3563
3561 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3564 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3562} 3565}
3563 3566
3564/* ------------------------------------------------------------------------- * 3567/* ------------------------------------------------------------------------- *
3565 * MOUSE ROUTINES * 3568 * MOUSE ROUTINES *
3566 * ------------------------------------------------------------------------- */ 3569 * ------------------------------------------------------------------------- */
… …
3570 */ 3573 */
3571void 3574void
3572rxvt_term::pixel_position (int *x, int *y) 3575rxvt_term::pixel_position (int *x, int *y)
3573{ 3576{
3574 *x = Pixel2Col (*x); 3577 *x = Pixel2Col (*x);
3575 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3578 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3576 *y = Pixel2Row (*y); 3579 *y = Pixel2Row (*y);
3577 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3580 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3578} 3581}
3579 3582
3580/* ------------------------------------------------------------------------- */ 3583/* ------------------------------------------------------------------------- */
3581#ifdef USE_XIM 3584#ifdef USE_XIM
3582void 3585void
3583rxvt_term::im_set_position (XPoint &pos) 3586rxvt_term::im_set_position (XPoint &pos)
3584{ 3587{
3585 XWindowAttributes xwa; 3588 XWindowAttributes xwa;
3586 3589
3587 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3590 XGetWindowAttributes (display->display, vt, &xwa);
3588 3591
3589 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3592 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3590 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3593 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3591} 3594}
3592#endif 3595#endif
3593 3596
3594#if ENABLE_OVERLAY 3597#if ENABLE_OVERLAY
3595void 3598void
3596rxvt_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)
3597{ 3600{
3598 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3601 if (nrow < 3 || ncol < 3)
3599 return; 3602 return;
3600 3603
3601 want_refresh = 1; 3604 want_refresh = 1;
3602 3605
3603 scr_overlay_off (); 3606 scr_overlay_off ();
3604 3607
3605 if (x < 0) x = TermWin.ncol - w; 3608 if (x < 0) x = ncol - w;
3606 if (y < 0) y = TermWin.nrow - h; 3609 if (y < 0) y = nrow - h;
3607 3610
3608 // make space for border 3611 // make space for border
3609 w += 2; MIN_IT (w, TermWin.ncol); 3612 w += 2; MIN_IT (w, ncol);
3610 h += 2; MIN_IT (h, TermWin.nrow); 3613 h += 2; MIN_IT (h, nrow);
3611 3614
3612 x -= 1; MAX_IT (x, 0); 3615 x -= 1; MAX_IT (x, 0);
3613 y -= 1; MAX_IT (y, 0); 3616 y -= 1; MAX_IT (y, 0);
3614 3617
3615 MIN_IT (x, TermWin.ncol - w); 3618 MIN_IT (x, ncol - w);
3616 MIN_IT (y, TermWin.nrow - h); 3619 MIN_IT (y, nrow - h);
3617 3620
3618 ov_x = x; ov_y = y; 3621 ov_x = x; ov_y = y;
3619 ov_w = w; ov_h = h; 3622 ov_w = w; ov_h = h;
3620 3623
3621 ov_text = new text_t *[h]; 3624 ov_text = new text_t *[h];
… …
3686 while (*s) 3689 while (*s)
3687 scr_overlay_set (x++, y, *s++); 3690 scr_overlay_set (x++, y, *s++);
3688} 3691}
3689 3692
3690void 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
3691rxvt_term::scr_swap_overlay () 3710rxvt_term::scr_swap_overlay ()
3692{ 3711{
3693 if (!ov_text) 3712 if (!ov_text)
3694 return; 3713 return;
3695 3714
3696 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3697
3698 // swap screen mem with overlay 3715 // swap screen mem with overlay
3699 for (int y = ov_h; y--; ) 3716 for (int y = ov_h; y--; )
3700 { 3717 {
3701 text_t *t1 = ov_text[y]; 3718 text_t *t1 = ov_text[y];
3702 rend_t *r1 = ov_rend[y]; 3719 rend_t *r1 = ov_rend[y];
3703 3720
3704 text_t *t2 = screen.text[y + row_offset] + ov_x; 3721 text_t *t2 = ROW(y - view_start).t + ov_x;
3705 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3722 rend_t *r2 = ROW(y - view_start).r + ov_x;
3706 3723
3707 for (int x = ov_w; x--; ) 3724 for (int x = ov_w; x--; )
3708 { 3725 {
3709 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3726 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3710 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));
… …
3712 } 3729 }
3713} 3730}
3714 3731
3715#endif 3732#endif
3716/* ------------------------------------------------------------------------- */ 3733/* ------------------------------------------------------------------------- */
3734

Diff Legend

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