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.184 by root, Wed Dec 21 14:23:30 2005 UTC vs.
Revision 1.271 by sasha, Fri Aug 3 22:40:10 2007 UTC

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

Diff Legend

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