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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.176 by root, Tue Dec 20 20:58:31 2005 UTC

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

Diff Legend

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