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

Diff Legend

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