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.177 by root, Tue Dec 20 21:49:55 2005 UTC

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

Diff Legend

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