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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.176 by root, Tue Dec 20 20:58:31 2005 UTC

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

Diff Legend

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