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.139 by root, Sun Nov 21 18:51:13 2004 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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