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

Diff Legend

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