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

Diff Legend

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