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

Diff Legend

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