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