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

Diff Legend

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