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.129 by root, Wed Aug 25 03:52:09 2004 UTC vs.
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC

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

Diff Legend

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