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

Diff Legend

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