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

Diff Legend

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