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

Diff Legend

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