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