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