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