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

Diff Legend

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