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

Diff Legend

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