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

Diff Legend

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