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

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

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

Diff Legend

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