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

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

Diff Legend

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