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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.189 by root, Thu Dec 22 15:28:15 2005 UTC

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

Diff Legend

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