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

Diff Legend

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