ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.172 by root, Sun Dec 18 00:59:42 2005 UTC

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

Diff Legend

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