ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.191 by root, Thu Dec 22 18:36:55 2005 UTC vs.
Revision 1.356 by sf-exg, Tue Dec 21 10:37:42 2010 UTC

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

Diff Legend

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