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.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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