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

Diff Legend

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