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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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