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

Diff Legend

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