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

Diff Legend

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