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

Diff Legend

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